diff --git a/src/App.vue b/src/App.vue
index 37fee3793adefb4a326eed96d05343d1a0d03100..cbe0b016dd4e797403f22f74a220ba28ce52f1db 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,220 +1,222 @@
 <script>
-	import './../.env.js'
-	import {
-		AnalysysAgent
-	} from '@/utils/analysys_paas.js'
-	import util from '@/utils/util.js'
-	export default {
-		globalData:{
-			// 开发环境
-			uniEnv:process.uniEnv,
-			// 登录凭证
-			token: '',
-			 
-			//授权提示 图标
-			icon_auth_notice: 'https://qn-static.banshouhui.com/auth_notice.png',
-			//授权提示新 图标
-			icon_auth_notice_new: 'https://qn-static.banshouhui.com/auth_notice_new.png',
-			// 服务规范教程视频
-			service_standard: {
-				"course1": {
-					url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
-					title: "第一节 师傅考核规则",
-					desc: "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
-				},
-				"course2": {
-					url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
-					title: "第二节 安装材料及工具",
-					desc: "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
-				},
-				"course3": {
-					url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
-					title: "第三节 安装施工规范",
-					desc: "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
-				},
-				"course4": {
-					url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
-					title: "第四节 录单上传要求",
-					desc: "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
-				},
-			},
-			
-			// 授权用户信息
-			authUserInfo: '',
-			
-			// 用户入驻信息
-			settledInfo: {},
-		},
-		onLaunch: function() {
-			// 应用初始化（全局只触发一次）
-			let that = this
-			that.globalData.token = util.getToken()
-			
-			AnalysysAgent.registerSuperProperty("platform", "self-support");
-			// 应用启动，或从后台进入前台显示
-			this.autoLogin()
-		},
-		onShow: function() {
-			// 应用启动，或从后台进入前台显示
-			// this.autoLogin()
-		},
-		onHide: function() {
-			// 应用从前台进入后台
-		},
-		methods: {
-			async getBaseInfo(vm, callBack) {
-				uni.showLoading({
-					title: '加载中……'
-				})
-				const res = await vm.$u.api.getSettleBaseInfo()
-				console.log(res,'res')
-				if(res.code !==200){
-					uni.showToast({
-						title: res && res.message || '获取基本信息错误',
-						icon: 'none'
-					});
-					return false;
-				}
+import "./../.env.js";
+import { AnalysysAgent } from "@/utils/analysys_paas.js";
+import util from "@/utils/util.js";
+export default {
+  globalData: {
+    // 开发环境
+    uniEnv: process.uniEnv,
+    // 登录凭证
+    token: "",
 
-				this.globalData.settledInfo = res.data
-				if (!res.data) {
-					return
-				}
-				if(typeof callBack == 'function') {
-					callBack(vm, res.data)
-				}
-				uni.hideLoading()
-				return res.data
-			
-			},
-			
-			/**
-			 * 用户自动登录
-			 */
-			autoLogin() {
-				let that = this
-				uni.login({
-					async success(res) {
-						if (res.code) {
-							let params = {
-								code: res.code,
-								wxAppNo: 1, // 自营平台小程序
-							}
-							let result = await that.$u.api.loginWechatAuth(params)
-							if (result) {
-								if (result.code == 200 && result.data) {
-									that.setUserData(result.data)
-									that.getBaseInfo(that)
-								}
-							} else {
-								uni.showModal({
-									title: '请求失败',
-									content: result.message,
-									showCancel: false
-								});
-							}
-							uni.hideLoading()
-						} else {
-							uni.showModal({
-								title: '登录失败',
-								content: '未获取到code',
-							});
-						}
-					},
-					fail() {
-			
-					}
-				});
-			},
-			setUserData(userInfo) {
-				if (userInfo && userInfo.token) {
-					// 如果已经登录则直接获取相关信息
-					util.setOpenid(userInfo.wxopenid)
-					util.setToken(userInfo.token)
-					uni.setStorageSync('user-info', userInfo);
-				} else {
-					util.setToken('')
-				}
-			},
-			
-			/* ------------------------- 数据埋点begin ------------------------------ */
-			track(event, properties) {
-				if (AnalysysAgent) {
-					// 易观添加事件
-					let AnalysysAgent = wx.AnalysysAgent;
-					AnalysysAgent.track("take_order_" + event, properties);
-				}
-			},
-			identify(userInfo, openid, unionid = null) {
-				// 设备身份表示
-				if (AnalysysAgent) {
-					let setProfile = {
-						'openid': openid,
-						'unionid': unionid,
-					}
-					setProfile = Object.assign(setProfile, userInfo)
-					AnalysysAgent.profileSet(setProfile);
-				}
-			},
-			setUserId(userId) {
-				// 用户id设置
-				if (AnalysysAgent) {
-					AnalysysAgent.alias(userId + '')
-				}
-			},
-			setUser(user) {
-				// 用户附加属性
-				if (AnalysysAgent) {
-					let userInfo = {
-						'mobile': user.mobile,
-						'userfrom_id': user.uid,
-						'userfrom': '家维广场',
-						'avatar': user.avatar,
-						'nickname': user.nickname,
-						'username': user.username,
-						'wxhuid': user.wxhuid,
-						'id': user.id,
-						'money': user.money,
-						'score': user.score
-					};
-					Object.keys(userInfo).map(key => {
-						if (key && userInfo[key]) {
-							AnalysysAgent.profileAppend(key, userInfo[key])
-						}
-					})
-				}
-			},
-			share(toShareProperties, trackProperties) {
-				if (AnalysysAgent) {
-					AnalysysAgent.share(toShareProperties, trackProperties);
-				}
-			},
-			trackPage(pageName, properties) {
-				if (AnalysysAgent) {
-					AnalysysAgent.pageView(pageName, properties);
-				}
-			},
-			initShare(option) {
-				console.log(option, 'option-initShare')
-				option = option || {}
-				if (AnalysysAgent && option.user_id) {
-					let shareUserInfo = {
-						'share_from_id': option.user_id || '',
-						'share_from_nickname': option.user_name || '',
-					}
-					AnalysysAgent.registerSuperProperties(shareUserInfo);
-				}
-			},
-			/* ------------------------- 数据埋点end ------------------------------ */
-		}
-	}
+    //授权提示 图标
+    icon_auth_notice: "https://qn-static.banshouhui.com/auth_notice.png",
+    //授权提示新 图标
+    icon_auth_notice_new:
+      "https://qn-static.banshouhui.com/auth_notice_new.png",
+    // 服务规范教程视频
+    service_standard: {
+      course1: {
+        url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
+        title: "第一节 师傅考核规则",
+        desc:
+          "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
+      },
+      course2: {
+        url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
+        title: "第二节 安装材料及工具",
+        desc:
+          "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
+      },
+      course3: {
+        url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
+        title: "第三节 安装施工规范",
+        desc:
+          "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
+      },
+      course4: {
+        url: "https://qn-static.banshouhui.com/self-support/videoen.mp4",
+        title: "第四节 录单上传要求",
+        desc:
+          "接单操作须知有助你快速了解充电桩安装业务，提高接单效率，请认真查看及学习。",
+      },
+    },
+
+    // 授权用户信息
+    authUserInfo: "",
+
+    // 用户入驻信息
+    settledInfo: {},
+  },
+  onLaunch: function () {
+    // 应用初始化（全局只触发一次）
+    let that = this;
+    that.globalData.token = util.getToken();
+
+    AnalysysAgent.registerSuperProperty("platform", "self-support");
+    // 应用启动，或从后台进入前台显示
+    that.autoLogin();
+  },
+  onShow: function () {
+    // 应用启动，或从后台进入前台显示
+    // this.autoLogin()
+  },
+  onHide: function () {
+    // 应用从前台进入后台
+  },
+  methods: {
+    async getBaseInfo(vm, callBack) {
+      uni.showLoading({
+        title: "加载中……",
+      });
+      const res = await vm.$u.api.getSettleBaseInfo();
+      console.log(res, "res");
+      if (res.code !== 200) {
+        uni.showToast({
+          title: (res && res.message) || "获取基本信息错误",
+          icon: "none",
+        });
+        return false;
+      }
+
+      this.globalData.settledInfo = res.data;
+      if (!res.data) {
+        return;
+      }
+      if (typeof callBack == "function") {
+        callBack(vm, res.data);
+      }
+      uni.hideLoading();
+      return res.data;
+    },
+
+    /**
+     * 用户自动登录
+     */
+    autoLogin() {
+      let that = this;
+      uni.login({
+        async success(res) {
+          if (res.code) {
+            let params = {
+              code: res.code,
+              wxAppNo: 1, // 自营平台小程序
+            };
+            let result = await that.$u.api.loginWechatAuth(params);
+            if (result) {
+              if (result.code == 200 && result.data) {
+                that.setUserData(result.data);
+                that.getBaseInfo(that);
+              }
+            } else {
+              uni.showModal({
+                title: "请求失败",
+                content: result.message,
+                showCancel: false,
+              });
+            }
+            uni.hideLoading();
+          } else {
+            uni.showModal({
+              title: "登录失败",
+              content: "未获取到code",
+            });
+          }
+        },
+        fail() {},
+      });
+    },
+    setUserData(userInfo) {
+      if (userInfo && userInfo.token) {
+        // 如果已经登录则直接获取相关信息
+        util.setOpenid(userInfo.wxopenid);
+        util.setToken(userInfo.token);
+        this.$u.vuex("vuex_token", userInfo.token);
+        uni.setStorageSync("user-info", userInfo);
+      } else {
+        util.setToken("");
+        this.$u.vuex("vuex_token", "");
+      }
+    },
+
+    /* ------------------------- 数据埋点begin ------------------------------ */
+    track(event, properties) {
+      if (AnalysysAgent) {
+        // 易观添加事件
+        let AnalysysAgent = wx.AnalysysAgent;
+        AnalysysAgent.track("take_order_" + event, properties);
+      }
+    },
+    identify(userInfo, openid, unionid = null) {
+      // 设备身份表示
+      if (AnalysysAgent) {
+        let setProfile = {
+          openid: openid,
+          unionid: unionid,
+        };
+        setProfile = Object.assign(setProfile, userInfo);
+        AnalysysAgent.profileSet(setProfile);
+      }
+    },
+    setUserId(userId) {
+      // 用户id设置
+      if (AnalysysAgent) {
+        AnalysysAgent.alias(userId + "");
+      }
+    },
+    setUser(user) {
+      // 用户附加属性
+      if (AnalysysAgent) {
+        let userInfo = {
+          mobile: user.mobile,
+          userfrom_id: user.uid,
+          userfrom: "家维广场",
+          avatar: user.avatar,
+          nickname: user.nickname,
+          username: user.username,
+          wxhuid: user.wxhuid,
+          id: user.id,
+          money: user.money,
+          score: user.score,
+        };
+        Object.keys(userInfo).map((key) => {
+          if (key && userInfo[key]) {
+            AnalysysAgent.profileAppend(key, userInfo[key]);
+          }
+        });
+      }
+    },
+    share(toShareProperties, trackProperties) {
+      if (AnalysysAgent) {
+        AnalysysAgent.share(toShareProperties, trackProperties);
+      }
+    },
+    trackPage(pageName, properties) {
+      if (AnalysysAgent) {
+        AnalysysAgent.pageView(pageName, properties);
+      }
+    },
+    initShare(option) {
+      console.log(option, "option-initShare");
+      option = option || {};
+      if (AnalysysAgent && option.user_id) {
+        let shareUserInfo = {
+          share_from_id: option.user_id || "",
+          share_from_nickname: option.user_name || "",
+        };
+        AnalysysAgent.registerSuperProperties(shareUserInfo);
+      }
+    },
+    /* ------------------------- 数据埋点end ------------------------------ */
+  },
+};
 </script>
 
 <style>
-	/*每个页面公共css */
+/*每个页面公共css */
 </style>
 <style lang="scss">
-	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
-	@import "uview-ui/index.scss";
-	@import '@/common/index.scss';
+/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+@import "uview-ui/index.scss";
+@import "@/common/index.scss";
 </style>
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 82d85d70f4e586e409af295e1ed466a272395a0a..370cb8ed8537b97d5510d0921e13209c4264487c 100644
--- a/src/pages/index/index.vue
+++ b/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) {
       // 初始化入驻信息
diff --git a/src/pages/settle/file.vue b/src/pages/settle/file.vue
index 42924fe52a96caeabc880ea35f26b8c7265c4cf3..6b29c7b69de805dbcfe254426934c478da00f0f1 100644
--- a/src/pages/settle/file.vue
+++ b/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>
diff --git a/src/store/$u.mixin.js b/src/store/$u.mixin.js
index fbbc3095ad4a08ba0a435b8a70e2fade503307ed..bdec1d5d35bac9e8735c5b04d97e0c24f6f372a5 100644
--- a/src/store/$u.mixin.js
+++ b/src/store/$u.mixin.js
@@ -21,6 +21,6 @@ export default {
 		}
 	},
 	computed: {
-		...mapState(['ddd'])
+		...mapState($uStoreKey)
 	}
 }