diff --git a/App.vue b/App.vue
index e581692..77ceb18 100644
--- a/App.vue
+++ b/App.vue
@@ -1,66 +1,85 @@
 <script>
-	//#ifdef APP-PLUS
-	const jpushModule = uni.requireNativePlugin("JG-JPush");
-	// #endif
-	export default {
-		onLaunch: async function(info) {
-			// let noticeArr = []
-			// jpushModule.addNotificationListener(res => {
-			// 	if (!noticeArr.includes(res.messageID)) {
-			// 		const audioContext = uni.createInnerAudioContext()
-			// 		// 设置音频文件地址
-			// 		audioContext.src = `/static/audio/order.mp3`;
-			// 		// console.log(res.messageID)
-			// 		audioContext.play()
-			// 		noticeArr.push(res.messageID)
-			// 		console.log("app的监听")
-			// 	}
-			// })
-      
+  //#ifdef APP-PLUS
+  const jpushModule = uni.requireNativePlugin("JG-JPush");
+  // #endif
+  import { loginShopAccount } from "@/api/oaUser.js"
+  export default {
+    onLaunch: async function(info) {
+      // let noticeArr = []
+      // jpushModule.addNotificationListener(res => {
+      // 	if (!noticeArr.includes(res.messageID)) {
+      // 		const audioContext = uni.createInnerAudioContext()
+      // 		// 设置音频文件地址
+      // 		audioContext.src = `/static/audio/order.mp3`;
+      // 		// console.log(res.messageID)
+      // 		audioContext.play()
+      // 		noticeArr.push(res.messageID)
+      // 		console.log("app的监听")
+      // 	}
+      // })
+
       // uni.showModal({
       //   content: info.referrerInfo.extraData
       // })
-      if(info.referrerInfo?.extraData?.uniMP) uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP);
-      if(info.referrerInfo?.extraData?.token) uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token);
-			console.log('App Launch')
-			this.$store.dispatch('initConfig');
-			try {
-				if (!this.$store.state.app.token) uni.reLaunch({
-					url: '/pages/oaLogin/oaLogin'
-				})
-			} catch (e) {
-				uni.reLaunch({
-					url: '/pages/oaLogin/oaLogin'
-				})
-			}
-		},
-		onShow: function() {
-			const audioContext = uni.createInnerAudioContext()
-			// 设置音频文件地址
-			audioContext.src = '/static/mp3/order.mp3'
-			// 播放音频
-			//#ifdef APP-PLUS
-			jpushModule.addNotificationListener(res => {
-				if (res.notificationEventType == 'notificationOpened') return
-				audioContext.play()
-				uni.vibrateLong();
-				console.log("app的监听")
-			})
-			// #endif
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
+      
+      if (info.referrerInfo?.extraData?.uniMP) {
+        uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP);
+        uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token);
+        try{
+          let res = await loginShopAccount({
+            shop_token: info.referrerInfo?.extraData?.token
+          });
+          this.$store.commit('SET_USERINFO', {
+            user: data,
+            token: res.data.token
+          })
+          let {
+            data
+          } = await userInfo();
+          this.$store.commit('setUserInfo', data);
+        }catch(e){
+          console.log(e);
+        }
+      }
+      console.log('App Launch')
+      this.$store.dispatch('initConfig');
+      try {
+        if (!this.$store.state.app.token) uni.reLaunch({
+          url: '/pages/oaLogin/oaLogin'
+        })
+      } catch (e) {
+        uni.reLaunch({
+          url: '/pages/oaLogin/oaLogin'
+        })
+      }
+    },
+    onShow: function() {
+      const audioContext = uni.createInnerAudioContext()
+      // 设置音频文件地址
+      audioContext.src = '/static/mp3/order.mp3'
+      // 播放音频
+      //#ifdef APP-PLUS
+      jpushModule.addNotificationListener(res => {
+        if (res.notificationEventType == 'notificationOpened') return
+        audioContext.play()
+        uni.vibrateLong();
+        console.log("app的监听")
+      })
+      // #endif
+      console.log('App Show')
+    },
+    onHide: function() {
+      console.log('App Hide')
+    }
+  }
 </script>
 
 <style>
-	/*每个页面公共css */
-	@import "static/css/base.css";
-	@import "static/css/style.scss";
+  /*每个页面公共css */
+  @import "static/css/base.css";
+  @import "static/css/style.scss";
 
-	view {
-		box-sizing: border-box;
-	}
+  view {
+    box-sizing: border-box;
+  }
 </style>
\ No newline at end of file
diff --git a/api/oaUser.js b/api/oaUser.js
index c03392b..d685271 100644
--- a/api/oaUser.js
+++ b/api/oaUser.js
@@ -60,3 +60,8 @@ export const userPostsms = (data) => oahttp.post('/user/postsms', data)
  * 注销账号
  */
 export const destroyAccount = (data) => oahttp.post('/user/destroy_account', data)
+
+/**
+ * 商城登录
+ */
+export const loginShopAccount = (data) => oahttp.post('/login/shop_account', data)
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index 10e448b..ede481f 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -10,7 +10,6 @@
 		<!-- #endif -->
 		<view class="body">
 			<view class="title">欢迎进入里海供销平台！</view>
-      <view>{{APP_token}}</view>
 			<view class="login-card">
 				<view class="top">
 					<view class="text item">
@@ -74,7 +73,8 @@
 					code: '',
 					terminal: 6, //6是APP端
 					scene: 1,
-					register_id: ""
+					register_id: "",
+          shop_token: ""
 				},
 				tips: '获取验证码',
 				// refCode: null,
@@ -118,6 +118,7 @@
 				if (!this.formData.account) return Toast('账号不能为空');
 				if (this.formData.scene == 1 && !this.formData.password) return Toast('密码不能为空');
 				if (this.formData.scene == 2 && !this.formData.code) return Toast('验证码不能为空');
+        this.formData.shop_token = uni.getStorageSync('APP_token');
 				let that = this;
 				uni.showLoading({
 					title: '正在登录中'
diff --git a/static/tabs-icon/Task-a.png b/static/tabs-icon/Task-a.png
index d53e708..51af40f 100644
Binary files a/static/tabs-icon/Task-a.png and b/static/tabs-icon/Task-a.png differ
diff --git a/static/tabs-icon/Task.png b/static/tabs-icon/Task.png
index cc734f5..0317dd0 100644
Binary files a/static/tabs-icon/Task.png and b/static/tabs-icon/Task.png differ
diff --git a/static/tabs-icon/approval-a.png b/static/tabs-icon/approval-a.png
index 7dcdde4..40166ff 100644
Binary files a/static/tabs-icon/approval-a.png and b/static/tabs-icon/approval-a.png differ
diff --git a/static/tabs-icon/approval.png b/static/tabs-icon/approval.png
index 3a701f0..757d0b9 100644
Binary files a/static/tabs-icon/approval.png and b/static/tabs-icon/approval.png differ
diff --git a/static/tabs-icon/home-a.png b/static/tabs-icon/home-a.png
index da58205..3c4e256 100644
Binary files a/static/tabs-icon/home-a.png and b/static/tabs-icon/home-a.png differ
diff --git a/static/tabs-icon/home.png b/static/tabs-icon/home.png
index df23792..c3aeff2 100644
Binary files a/static/tabs-icon/home.png and b/static/tabs-icon/home.png differ
diff --git a/static/tabs-icon/manager-a.png b/static/tabs-icon/manager-a.png
index f4caefb..b805033 100644
Binary files a/static/tabs-icon/manager-a.png and b/static/tabs-icon/manager-a.png differ
diff --git a/static/tabs-icon/manager.png b/static/tabs-icon/manager.png
index 5a7ceba..4553a34 100644
Binary files a/static/tabs-icon/manager.png and b/static/tabs-icon/manager.png differ
diff --git a/static/tabs-icon/my-a.png b/static/tabs-icon/my-a.png
index 2c2c033..e70365d 100644
Binary files a/static/tabs-icon/my-a.png and b/static/tabs-icon/my-a.png differ
diff --git a/static/tabs-icon/my.png b/static/tabs-icon/my.png
index 2effa74..a22aaf3 100644
Binary files a/static/tabs-icon/my.png and b/static/tabs-icon/my.png differ
diff --git a/static/tabs-icon/on-3.png b/static/tabs-icon/on-3.png
deleted file mode 100644
index 86601cd..0000000
Binary files a/static/tabs-icon/on-3.png and /dev/null differ