Merge branch 'master' into dev

src/pages/index/mine.vue

@@ -57,7 +57,7 @@
 				return this.vuex_settled && this.vuex_settled.avatar
 			},
 			name() {
-				return (this.settled && (this.settled.id_card_name || this.settled.name)) || (this.vuex_user && (this.vuex_user.name || this.vuex_user.loginName))
+				return (this.settled && this.settled.nickname) || (this.vuex_user && (this.vuex_user.name || this.vuex_user.loginName))
 			},
 			mobile() {
 				return (this.settled && this.settled.mobile) || (this.vuex_user && this.vuex_user.mobile)
@@ -116,7 +116,7 @@
 				]
 			},
 			telTip() {
-				return this.mobile && '已绑定手机'|| '绑定手机号'
+				return this.mobile || '绑定手机号'
 			},
 			headImageUrl() {
 				return this.avatar || this.placeholderImage
@@ -241,7 +241,7 @@
 						background-color: #FFFFFF;
 						border-radius: 26rpx;
 						color: #2272FF;
-						width: 164rpx;
+						width: 180rpx;
 						height: 52rpx;
 						font-size: 20rpx;
 						display: flex;