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

src/pages/index/index.vue

@@ -141,7 +141,11 @@ export default {
       bottomLoading: false,
     };
   },
-  watch: {},
+  watch: {
+	  vuex_token(val){
+		  console.log(val,'vuex_token---------watch')
+	  }
+  },
   computed: {
     buttonStyle() {
       return {
@@ -170,6 +174,7 @@ export default {
     this.triggered = false;
   },
   onShow() {
+	  // console.log(this.vuex_token,'this.vuex_token')
     // 每次进入页面都刷新入驻状态
     if (app.globalData.token) {
       // 初始化入驻信息

src/pages/settle/file.vue

@@ -30,8 +30,7 @@
 								<text class="card-item-text">{{ fileInfo[cardkey] }}</text>
 							</view>
 							<view class="line-view"></view>
-							<view class="card-item-error" v-if="fileInfo[cardkey] 
-							&& ((cardkey == 'id_card_name' || cardkey == 'id_card_number') && frontErrorMsg)">{{frontErrorMsg}}</view>
+							<view class="card-item-error" v-if="((cardkey == 'id_card_name' || cardkey == 'id_card_number') && frontErrorMsg)">{{ frontErrorMsg }}</view>
 							<view class="card-item-error" v-if="(cardkey == 'id_card_date' && backErrorMsg)">{{ backErrorMsg }}</view>
 						</view>
 					</view>

src/store/$u.mixin.js

@@ -21,6 +21,6 @@ export default {
 		}
 	},
 	computed: {
-		...mapState(['ddd'])
+		...mapState($uStoreKey)
 	}
 }