Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

.env.js

 ;
 (function() {
-	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
+	let NODE_ENV = 'prod'; // dev:开发环境 | test:测试环境 | prod:生产环境
 	let ENV_VAR = null;
 	if (process.env.NODE_ENV === "development") {
 		if (NODE_ENV === 'dev') {
 			ENV_VAR = require('./.env.dev.js');
 		} else if (NODE_ENV === 'test') {
 			ENV_VAR = require('./.env.test.js');
+		} else if (NODE_ENV === 'prod') {
+			ENV_VAR = require('./.env.prod.js');
 		}
 
 	} else if (process.env.NODE_ENV === "production") {

src/pages/index/mine.vue

@@ -53,13 +53,12 @@
 			},
 			avatar() {
 				return this.vuex_settled && this.vuex_settled.avatar
-			},
-			name() {
-				return this.settled && (this.settled.id_card_name 
-				|| this.settled.nickname || this.settled.name)
+			},
+			name() {
+				return this.vuex_user && this.vuex_user.name
 			},
 			mobile() {
-				return this.settled && this.settled.mobile
+				return this.vuex_user && this.vuex_user.mobile
 			},
 			items() {
 				return [