diff --git a/components/CouponWindow.vue b/components/CouponWindow.vue
index 2517467..94ae022 100644
--- a/components/CouponWindow.vue
+++ b/components/CouponWindow.vue
@@ -29,7 +29,7 @@
 	import {
 		mapGetters
 	} from "vuex";
-	import toLogin from "@/libs/login";
+	import {handleLoginFailure} from "@/utils";
 	import {
 		couponReceiveBatch
 	} from "@/api/user";
@@ -52,7 +52,7 @@
 		methods: {
 			checked() {
 				const isLogin = this.isLogin;
-				if (!isLogin) return toLogin();
+				if (!isLogin) return handleLoginFailure();
 
 				const ids = this.couponList.reduce((initial, coupon) => {
 					initial.push(coupon.id);
diff --git a/libs/login.js b/libs/login.js
deleted file mode 100644
index e7c681a..0000000
--- a/libs/login.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// import router from "../router";
-import store from "../store";
-import cookie from "@/utils/store/cookie";
-import {
-	isWeixin,
-	login,
-	replaceLogin,
-	getCurrentPageUrl,
-	getCurrentPageUrlWithArgs,
-	parseQuery,
-	replace,
-	handleQrCode
-} from "@/utils";
-
-export default function toLogin(push, backUrl) {
-	console.log('token失效，需要重新登录')
-	store.commit("LOGOUT");
-	// 如果没有授权，走登录的接口重新授权
-	// 授权获取失败会跳转到授权的接口
-	console.log(store.getters.isAuthorization, '是否有登陆权限')
-	if (store.getters.isAuthorization) {
-		login()
-		return
-	}
-	console.log(store.getters.isAuthorizationPage, '判断是不是登录页面或者授权页面')
-	// 判断当前是不是已经在登录页面或者授权页，防止二次跳转
-	if (store.getters.isAuthorizationPage || getCurrentPageUrl() == '/pages/user/Login/index') {
-		console.log('已经是登录页面或者授权页面，跳出方法')
-		return
-	}
-
-	// 判断是不是扫描的砍价海报进来的
-	if (getCurrentPageUrl() == 'pages/activity/DargainDetails/index' && handleQrCode()) {
-		console.log('是扫描的砍价海报进来的')
-		let url = handleQrCode();
-		if (url) {
-			replaceLogin({
-				redirect: `/${getCurrentPageUrl()}`,
-				id: url.bargainId,
-				partake: url.uid
-			})
-		} else {
-			console.log('是扫描的砍价海报进来的,但是没有获取到参数')
-			replaceLogin()
-		}
-	} else {
-		console.log('无特殊情况，重新登录')
-		replaceLogin()
-	}
-	store.commit("UPDATE_AUTHORIZATION", false);
-	store.commit("UPDATE_AUTHORIZATIONPAGE", true);
-}
diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 943f58f..42dc004 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -43,22 +43,23 @@ export default {
     }
     cookie.get("spread");
     // this.toLaunch();
-    if (this.$deviceType == 'app') {
-    	// this.toLaunch();
-    	this.$yrouter.switchTab({
-    		path: '/pages/home/index',
-    	});
-    	return
+    if (this.$deviceType == "app") {
+      // this.toLaunch();
+      this.$yrouter.switchTab({
+        path: "/pages/home/index"
+      });
+      return;
     }
-    login({
-    	fail: () => {
-    		this.toLaunch();
-    	}
+    login().finally(() => {
+      this.$yrouter.switchTab({
+        path: "/pages/home/index"
+      });
     });
   },
   methods: {
     ...mapActions(["changeAuthorization", "setUserInfo"]),
     toLaunch() {
+      console.log("loading home");
       this.changeAuthorization(false);
       this.$yrouter.switchTab({
         path: "/pages/home/index"
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index 880dc6d..29b8989 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -1,211 +1,255 @@
 <template>
-	<view class="container">
-		<view v-if="!token">
-			<!-- 小程序 -->
-			<view v-if="$deviceType == 'routine'">
-				<view class="getUserInfo">
-					<text>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text>
-					<button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
-					<view style="height:20rpx"></view>
-					<button @click="back">取消微信登录授权</button>
-				</view>
-			</view>
-			<!-- app -->
-			<view v-if="$deviceType == 'app'">
-				<view class="getUserInfo">
-					<text>请先登录</text>
-					<button type="primary" @click="this.toLogin">去登录</button>
-				</view>
-			</view>
-		</view>
-	</view>
+  <view class="container">
+    <view v-if="!token">
+      <!-- 小程序 -->
+      <view v-if="$deviceType == 'routine'&&authorize">
+        <view class="getUserInfo">
+          <text>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text>
+          <button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
+          <view style="height:20rpx"></view>
+          <button @click="back">取消微信登录授权</button>
+        </view>
+      </view>
+      <!-- app -->
+      <view v-if="$deviceType == 'app'&&authorize">
+        <view class="getUserInfo">
+          <text>请先登录</text>
+          <button type="primary" @click="this.toLogin">去登录</button>
+        </view>
+      </view>
+      <view v-if="!authorize">
+        <view class="getUserInfo">
+          <text>登录中</text>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-import { mapState, mapMutations, mapActions } from 'vuex';
+import { mapState, mapMutations, mapActions } from "vuex";
 // 组件
 // import request from "@//api/request";
-import { wxappAuth, getUser } from '@/api/user';
-import dayjs from 'dayjs';
-import cookie from '@/utils/store/cookie';
-import { login } from '@/utils';
+import { wxappAuth, getUser } from "@/api/user";
+import dayjs from "dayjs";
+import cookie from "@/utils/store/cookie";
+import { login, authorize } from "@/utils";
 
 export default {
-	data() {
-		return {
-		};
-	},
-	computed: {
-		...mapState(['isAuthorization','$deviceType','token'])
-	},
-	onShow() {
-		this.UPDATE_AUTHORIZATIONPAGE(true);
-	},
-	onHide() {
-		this.UPDATE_AUTHORIZATIONPAGE(false);
-		this.changeAuthorization(false);
-	},
-	onUnload() {
-		this.UPDATE_AUTHORIZATIONPAGE(false);
-		this.changeAuthorization(false);
-	},
-	methods: {
-		...mapActions(['changeAuthorization', 'setUserInfo']),
-		...mapMutations(['UPDATE_AUTHORIZATIONPAGE', 'CHANGE_TABTAR']),
-		back() {
-			this.$yrouter.switchTab({
-				path: '/pages/home/index',
-				query: {}
-			});
-		},
-		getUserInfo(data) {
-			if (data.detail.errMsg == 'getUserInfo:fail auth deny') {
-				uni.showToast({
-					title: '取消授权',
-					icon: 'none',
-					duration: 2000
-				});
-				return;
-			}
-			uni.showLoading({
-				title: '登录中'
-			});
-			login({
-				success: () => {}
-			});
-		},
-		toLogin() {
-			this.$yrouter.push({
-				path: '/pages/user/Login/index',
-				query: {}
-			});
-		}
-	},
-	onUnload() {},
-	mounted() {
-	}
+  data() {
+    return {
+      authorize: false
+    };
+  },
+  computed: {
+    ...mapState(["isAuthorization", "$deviceType", "token"])
+  },
+  onShow() {
+    this.UPDATE_AUTHORIZATIONPAGE(true);
+    // // 先校验用户是否授权，如果没有授权，显示授权按钮
+    console.log("先校验用户是否授权，如果没有授权，显示授权按钮");
+    authorize("userInfo")
+      .then(res => {
+        console.log(res);
+      })
+      .catch(error => {
+        console.log(error);
+        // 用户未授权，显示授权按钮
+        this.authorize = true;
+      });
+  },
+  onHide() {
+    console.log("离开授权页面,11111");
+    this.UPDATE_AUTHORIZATIONPAGE(false);
+    this.changeAuthorization(false);
+  },
+  onUnload() {
+    console.log("离开授权页面,11111");
+    this.UPDATE_AUTHORIZATIONPAGE(false);
+    this.changeAuthorization(false);
+  },
+  methods: {
+    ...mapActions(["changeAuthorization", "setUserInfo"]),
+    ...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
+    back() {
+      this.$yrouter.switchTab({
+        path: "/pages/home/index",
+        query: {}
+      });
+    },
+    getUserInfo(data) {
+      if (data.detail.errMsg == "getUserInfo:fail auth deny") {
+        uni.showToast({
+          title: "取消授权",
+          icon: "none",
+          duration: 2000
+        });
+        return;
+      }
+      uni.showLoading({
+        title: "登录中"
+      });
+      login()
+        .then(res => {
+          this.$yrouter.replace({ path: cookie.get("redirect") });
+        })
+        .catch(error => {
+          console.log(error);
+          uni.showToast({
+            title: error,
+            icon: "none",
+            duration: 2000
+          });
+        });
+    },
+    toLogin() {
+      this.$yrouter.push({
+        path: "/pages/user/Login/index",
+        query: {}
+      });
+    }
+  },
+  onUnload() {
+    console.log("离开授权页面,11111");
+    this.UPDATE_AUTHORIZATIONPAGE(false);
+    this.changeAuthorization(false);
+  },
+  mounted() {
+    this.UPDATE_AUTHORIZATIONPAGE(true);
+    // // 先校验用户是否授权，如果没有授权，显示授权按钮
+    console.log("先校验用户是否授权，如果没有授权，显示授权按钮");
+    authorize("userInfo")
+      .then(res => {
+        console.log(res);
+      })
+      .catch(error => {
+        console.log(error);
+        // 用户未授权，显示授权按钮
+        this.authorize = true;
+      });
+  }
 };
 </script>
 
 <style lang="less">
 .sp-cell {
-	height: 20rpx;
+  height: 20rpx;
 }
 
 .getUserInfo {
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	padding: 30px;
-
-	text {
-		font-size: 30rpx;
-		text-align: center;
-		margin-bottom: 20px;
-	}
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  padding: 30px;
+
+  text {
+    font-size: 30rpx;
+    text-align: center;
+    margin-bottom: 20px;
+  }
 }
 
 .container {
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	justify-content: flex-start;
-	position: relative;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  position: relative;
 }
 
 .tab-bar {
-	font-size: 0;
-	display: flex;
-	align-items: center;
-	background: rgba(255, 255, 255, 0.9);
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	z-index: 99;
-	border-top: 1px solid rgba(248, 248, 248, 1);
-
-	.tab-bar-item {
-		flex: 1;
-		height: 49px;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		flex-direction: column;
-
-		&.active {
-			text {
-				color: #ee7559;
-			}
-
-			.tab-bar-pic {
-				display: none;
-				background: #f9f9f9;
-
-				&.active {
-					display: block;
-				}
-			}
-		}
-
-		.tab-bar-pic {
-			display: block;
-			background: #f9f9f9;
-
-			&.active {
-				display: none;
-			}
-		}
-	}
-
-	.tab-bar-pic {
-		width: 25px;
-		height: 25px;
-		background: #f9f9f9;
-
-		image {
-			width: 25px;
-			height: 25px;
-		}
-	}
-
-	.tab-bar-pic-active {
-	}
-
-	text {
-		font-size: 10px;
-		color: rgb(160, 160, 160);
-		line-height: 10px;
-		margin-top: 5px;
-	}
+  font-size: 0;
+  display: flex;
+  align-items: center;
+  background: rgba(255, 255, 255, 0.9);
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 99;
+  border-top: 1px solid rgba(248, 248, 248, 1);
+
+  .tab-bar-item {
+    flex: 1;
+    height: 49px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+
+    &.active {
+      text {
+        color: #ee7559;
+      }
+
+      .tab-bar-pic {
+        display: none;
+        background: #f9f9f9;
+
+        &.active {
+          display: block;
+        }
+      }
+    }
+
+    .tab-bar-pic {
+      display: block;
+      background: #f9f9f9;
+
+      &.active {
+        display: none;
+      }
+    }
+  }
+
+  .tab-bar-pic {
+    width: 25px;
+    height: 25px;
+    background: #f9f9f9;
+
+    image {
+      width: 25px;
+      height: 25px;
+    }
+  }
+
+  .tab-bar-pic-active {
+  }
+
+  text {
+    font-size: 10px;
+    color: rgb(160, 160, 160);
+    line-height: 10px;
+    margin-top: 5px;
+  }
 }
 
 .tab-bar-bg {
-	padding-top: 46px;
-	width: 100%;
+  padding-top: 46px;
+  width: 100%;
 }
 
 .view-item {
-	display: none;
-	width: 100%;
+  display: none;
+  width: 100%;
 }
 
 .view-item-active {
-	display: block;
+  display: block;
 }
 
 .getUserInfo {
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	padding: 30px;
-
-	p {
-		margin-bottom: 20px;
-	}
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  padding: 30px;
+
+  p {
+    margin-bottom: 20px;
+  }
 }
 
 ._van-dialog {
-	z-index: 99999999999;
+  z-index: 99999999999;
 }
 </style>
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index f6a233f..2895e56 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -199,17 +199,19 @@ export default {
     DataFormat
   },
   computed: mapGetters(["userInfo"]),
-  watch: {
-    $yroute(n) {
-      if (n.name === NAME) {
-        const type = parseInt(this.$yroute.query.type) || 0;
-        if (this.type !== type) {
-          this.changeType(type);
-        }
-        this.getOrderData();
-      }
-    },
-    type() {}
+  onShow: function() {
+    console.log(this)
+    this.type = parseInt(this.$yroute.query.type) || 0;
+    this.changeType(this.type);
+    this.getOrderData();
+    this.getOrderList();
+  },
+  onHide: function() {
+    this.orderList = [];
+    this.page = 1;
+    this.limit = 20;
+    this.loaded = false;
+    this.loading = false;
   },
   methods: {
     goLogistics(order) {
@@ -308,11 +310,7 @@ export default {
     },
     toPay() {}
   },
-  mounted() {
-    this.type = parseInt(this.$yroute.query.type) || 0;
-    this.getOrderData();
-    this.getOrderList();
-  },
+  mounted() {},
   onReachBottom() {
     !this.loading && this.getOrderList();
   }
@@ -320,7 +318,6 @@ export default {
 </script>
 
 <style scoped lang="less">
-
 .noCart {
   margin-top: 0.17 * 100rpx;
   padding-top: 0.1 * 100rpx;
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 41223ae..157ffa9 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -482,9 +482,9 @@
 				uni.showLoading({
 					title: "生成订单中"
 				});
-				let form = {}
+				let from = {}
 				if (this.$deviceType == 'app') {
-					form.form = 'app'
+					from.from = 'app'
 				}
 				createOrder(this.orderGroupInfo.orderKey, {
 						realName: this.contacts,
@@ -500,7 +500,7 @@
 						from: this.from,
 						mark: this.mark || "",
 						shippingType: parseInt(shipping_type) + 1,
-						...form
+						...from
 					})
 					.then(res => {
 						uni.hideLoading();
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index c6bb2e9..1ea377f 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -266,6 +266,7 @@ export default {
     console.log(url);
     if (url && url.productId) {
       this.id = url.productId;
+      
     } else {
       this.id = this._route.query.id;
     }
@@ -339,12 +340,12 @@ export default {
     //产品详情接口；
     productCon: function() {
       let that = this;
-      let form = {};
+      let from = {};
       if (this.$deviceType == "app") {
-        form.form = "app";
+        from.from = "app";
       }
       uni.showLoading({ title: "加载中", mask: true });
-      getProductDetail(that.id, form)
+      getProductDetail(that.id, from)
         .then(res => {
           that.$set(that, "storeInfo", res.data.storeInfo);
           // 给 attr 赋值，将请求回来的规格赋值给 attr
diff --git a/pages/shop/GoodsEvaluate/index.vue b/pages/shop/GoodsEvaluate/index.vue
index bb8cb43..7950b2b 100644
--- a/pages/shop/GoodsEvaluate/index.vue
+++ b/pages/shop/GoodsEvaluate/index.vue
@@ -196,12 +196,22 @@
 							icon: "success",
 							duration: 2000
 						});
-						this.$yrouter.push({
-							path: "/pages/order/OrderDetails/index",
-							query: {
-								id: this.orderCon.orderId
-							}
-						});
+						
+						// ? 回跳到上一页
+						this.$yrouter.back()
+						
+						// ? 默认跳转到详情页
+						// this.$yrouter.push({
+						// 	path: "/pages/order/OrderDetails/index",
+						// 	query: {
+						// 		id: this.orderCon.orderId
+						// 	}
+						// });
+						
+						// ? 可选重定向到详情页，这时左上角会有一个返回首页的图标
+						// this.$yrouter.reLaunch({
+						// 	path: "/pages/home/index",
+						// });
 					})
 					.catch(err => {
 						uni.showToast({
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 0fb71d0..827c7ee 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -164,11 +164,11 @@
   </view>
 </template>
 <script>
+import { mapState, mapGetters, mapMutations, mapActions } from "vuex";
 import { getUser, getMenuUser, bindingPhone } from "@/api/user";
 import { isWeixin, VUE_APP_RESOURCES_URL } from "@/utils";
 import SwitchWindow from "@/components/SwitchWindow";
 import Authorization from "@/pages/authorization/index";
-import { mapGetters } from "vuex";
 
 const NAME = "User";
 
@@ -188,6 +188,7 @@ export default {
   },
   computed: mapGetters(["userInfo"]),
   methods: {
+    ...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
     goReturnList() {
       this.$yrouter.push("/pages/order/ReturnList/index");
     },
@@ -291,9 +292,15 @@ export default {
     },
     MenuUser: function() {
       let that = this;
-      getMenuUser().then(res => {
-        that.MyMenus = res.data.routine_my_menus;
-      });
+      getMenuUser()
+        .then(res => {
+          uni.hideLoading();
+          that.MyMenus = res.data.routine_my_menus;
+        })
+        .catch(error => {
+          uni.hideLoading();
+          console.log(error);
+        });
     },
     goPages: function(index) {
       let url = this.MyMenus[index].uniapp_url;
@@ -335,12 +342,18 @@ export default {
   },
   onShow() {
     if (this.$store.getters.token) {
-      // 
-			this.$store.dispatch('getUser', true)
-      
+      //
+      uni.showLoading({
+        title: "加载中"
+      });
+      this.$store.dispatch("getUser", true);
       this.MenuUser();
       this.isWeixin = isWeixin();
     }
+  },
+  onHide() {
+    console.log('离开用户中心')
+    this.UPDATE_AUTHORIZATIONPAGE(false);
   }
 };
 </script>
diff --git a/pages/user/promotion/Poster/index.vue b/pages/user/promotion/Poster/index.vue
index ca2e053..81ec453 100644
--- a/pages/user/promotion/Poster/index.vue
+++ b/pages/user/promotion/Poster/index.vue
@@ -64,11 +64,11 @@ export default {
   methods: {
     getIndex: function() {
       let that = this;
-      let form = {};
+      let from = {};
       if (this.$deviceType == "app") {
-        form.form = "app";
+        from.from = "app";
       }
-      getSpreadImg(form).then(
+      getSpreadImg(from).then(
         res => {
           that.info = res.data;
         },
diff --git a/store/index.js b/store/index.js
index bef10b8..405ffd3 100644
--- a/store/index.js
+++ b/store/index.js
@@ -51,6 +51,7 @@ const vuexStore = new Vuex.Store({
 			cookie.set(LOGIN_KEY, token, expires_time);
 		},
 		LOGOUT(state) {
+			console.log('清除数据')
 			state.token = null;
 			state.userInfo = null
 			let spread = cookie.get('spread')
diff --git a/utils/index.js b/utils/index.js
index 0e9dac6..230f9d6 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -109,46 +109,6 @@ export const copyClipboard = (data) => {
 	})
 }
 
-
-export const replaceLogin = (msg) => {
-	uni.hideLoading();
-	console.log('尝试开始重新登录')
-	uni.showToast({
-		title: '重新登录中...',
-		icon: 'none',
-		duration: 2000
-	});
-	// 这里代表已经失去登录状态以及401强制推出登录了
-	store.commit('LOGOUT')
-	if (Vue.prototype.$deviceType == 'routine') {
-		console.log('当前是微信小程序，开始调用登录方法')
-		// 如果是微信小程序，跳转到授权页
-		login({
-			fail: () => {
-				console.log('自动登录失败，重定向授权页面')
-				reLaunch({
-					path: '/pages/authorization/index',
-					query: {
-						redirect: `/${getCurrentPageUrl()}`,
-						...parseQuery()
-					}
-				})
-			}
-		})
-
-	} else {
-		// 如果不是小程序跳转到登录页
-		console.log('当前是app，跳转到登录页面')
-		push({
-			path: '/pages/user/Login/index',
-			query: {
-				redirect: `/${getCurrentPageUrl()}`,
-				...parseQuery()
-			}
-		})
-	}
-}
-
 export const getProvider = (service) => {
 	return new Promise((resolve, reject) => {
 		// 获取当前环境的服务商
@@ -172,27 +132,25 @@ export const getProvider = (service) => {
 
 export const authorize = (authorizeStr) => {
 	return new Promise((resolve, reject) => {
-		uni.authorize({
-			scope: `scope.${authorizeStr}`,
-			success() {
-				resolve('获取授权成功')
+		console.log('检验授权', `scope.${authorizeStr}`)
+		uni.getSetting({
+			success(res) {
+				console.log(res.authSetting)
+				if (res.authSetting[`scope.${authorizeStr}`]) {
+					resolve('获取授权成功')
+				} else {
+					reject('获取授权失败')
+				}
 			},
 			fail() {
-
-				console.log('授权失败跳转首页')
-				switchTab({
-					path: '/pages/home/index',
-					// query
-				});
-				reject('获取授权失败')
+				reject('获取设置失败')
 			}
 		})
-	}).catch(error => {
-		console.log(error)
+
 	})
 }
 
-export const login = (option) => {
+export const login = () => {
 	console.log('开始登录 ————————————————————')
 	return new Promise((resolve, reject) => {
 		console.log('获取环境商')
@@ -215,62 +173,48 @@ export const login = (option) => {
 							success: function (user) {
 								console.log('获取用户信息成功')
 								console.log('开始调用登录接口')
-								if (Vue.prototype.$deviceType == 'routine') {
-									wxappAuth({
-										encryptedData: user.encryptedData,
-										iv: user.iv,
-										code: code,
-										spread: cookie.get("spread")
-									}).then(({
-										data
-									}) => {
-										console.log('登录接口调用成功')
-										console.log('开始处理登录信息保存，并获取用户详情')
-										resolve(data)
-										uni.hideLoading();
-										store.commit("LOGIN", data.token, dayjs(data.expires_time));
-										store.dispatch('USERINFO', true)
-										console.log(store)
-										handleGetUserInfo()
+								wxappAuth({
+									encryptedData: user.encryptedData,
+									iv: user.iv,
+									code: code,
+									spread: cookie.get("spread")
+								}).then(({ data }) => {
+									console.log('登录接口调用成功')
+									console.log('开始处理登录信息保存，并获取用户详情')
+									uni.hideLoading();
+									store.commit("LOGIN", data.token, dayjs(data.expires_time));
+									store.dispatch('USERINFO', true)
+									getUser().then(user => {
+										console.log('获取用户信息成功')
+										store.dispatch('setUserInfo', user.data)
+										resolve(user)
 									}).catch(error => {
-										console.log('登录接口调用失败')
-										reject()
-										console.log(error)
-										handleFail(option, '微信登录失败')
+										console.log('获取用户信息失败')
+										reject('获取用户信息失败')
 									});
-								}
+								}).catch(error => {
+									console.log('登录接口调用失败')
+									reject('登录接口调用失败')
+								});
 							},
 							fail() {
 								console.log('获取用户信息失败')
-								// 获取用户信息失败
-								reject()
-								handleFail(option, '获取用户信息失败')
+								reject('获取用户信息失败')
 							}
 						});
 					}).catch(error => {
 						console.log('用户未授权')
-						reject()
-						console.log(error)
-						handleFail(option, '用户未授权')
+						reject('用户未授权')
 					})
 				},
 				fail() {
 					console.log('调用登录接口失败')
-					// 调用登录接口失败
-					reject()
-					handleFail(option, '登录失败')
+					reject('调用登录接口失败')
 				}
 			});
 		}).catch(error => {
-			handleFail(option, '获取环境服务商失败')
-			reject()
-			console.log(error)
-			handleFail(option, '获取环境服务商失败')
+			reject('获取环境服务商失败')
 		})
-	}).catch(error => {
-		handleFail(option, '登录失败')
-		console.log(error)
-		handleFail(option, '登录失败')
 	})
 }
 
@@ -343,18 +287,13 @@ export const handleGetUserInfo = () => {
 	})
 }
 
-
-const handleFail = (option, msg) => {
-	// 此处是处理登录失效的问题的
-	option && option.fail ? option.fail() : replaceLogin('登录失败，请重新登录')
-}
-
 export function parseUrl(location) {
 	if (typeof location === 'string') return location
 	const {
 		path,
 		query
 	} = location
+
 	const queryStr = stringify(query)
 
 	if (!queryStr) {
@@ -419,6 +358,8 @@ export const handleLoginStatus = (location, complete, fail, success) => {
 	// 是否可以访问
 	let isAuth = false
 
+	console.log('即将跳转', location, parseUrl(location))
+
 	// 从 location 中获取当前url，location typeof string || object
 	let path = ''
 	if (typeof location === 'string') {
@@ -427,6 +368,7 @@ export const handleLoginStatus = (location, complete, fail, success) => {
 		path = location.path
 	}
 
+	// 判断用户是否有token
 	if (!auth()) {
 		page.map((item) => {
 			if (item.path == path) {
@@ -439,7 +381,14 @@ export const handleLoginStatus = (location, complete, fail, success) => {
 
 	return new Promise((resolve, reject) => {
 		if (isAuth) {
-			// 登录了有权限
+			// 有token
+			if (path == '/pages/home/index' || path == '/pages/shop/GoodsClass/index' || path == '/pages/shop/ShoppingCart/index' || path == '/pages/user/User/index') {
+				// switchTab({
+				// 	path: parseUrl(location),
+				// })
+				// return
+			}
+
 			resolve({
 				url: parseUrl(location),
 				complete,
@@ -447,8 +396,8 @@ export const handleLoginStatus = (location, complete, fail, success) => {
 				success
 			})
 		} else {
-			// 未登录没有权限
-			replaceLogin()
+			// 没有token，先校验用户是否授权，如果授权了，进行自动登录
+			routerPermissions(parseUrl(location))
 			reject()
 		}
 	}).catch(error => {
@@ -456,6 +405,74 @@ export const handleLoginStatus = (location, complete, fail, success) => {
 	})
 }
 
+// export function checkPermissions(){
+
+// }
+
+export function routerPermissions(url, type) {
+	console.log('routerPermissions', url)
+	let path = url
+	if (!path) {
+		path = getCurrentPageUrlWithArgs()
+	}
+	if (Vue.prototype.$deviceType == 'routine') {
+		console.log('当前是微信小程序，开始处理小程序登录方法')
+		// 如果是微信小程序，跳转到授权页
+		// 先校验用户是否授权，如果授权了，进行自动登录
+		authorize('userInfo').then(() => {
+			// 自动登录
+			login().then(res => {
+				// 登录成功，跳转到需要跳转的页面
+				console.log('登录成功，跳转页面')
+				store.commit("UPDATE_AUTHORIZATIONPAGE", false);
+				if (path == '/pages/shop/ShoppingCart/index' || path == '/pages/user/User/index') {
+					return
+				}
+				if (type == 'reLaunch') {
+					reLaunch({
+						path,
+					})
+				} else {
+					push({
+						path,
+					})
+				}
+			}).catch(error => {
+				uni.showToast({
+					title: error,
+					icon: "none",
+					duration: 2000
+				});
+				reLaunch({
+					path: '/pages/authorization/index',
+				})
+				cookie.set('redirect', path)
+			})
+		}).catch(error => {
+			// 跳转到登录页面或者授权页面
+			if (path == '/pages/shop/ShoppingCart/index' || path == '/pages/user/User/index') {
+				switchTab({
+					path,
+				})
+				store.commit("UPDATE_AUTHORIZATIONPAGE", false);
+				return
+			}
+			reLaunch({
+				path: '/pages/authorization/index',
+			})
+			cookie.set('redirect', path)
+		})
+	} else {
+		// 如果不是小程序跳转到登录页
+		console.log('当前是app，开始处理app登录方法')
+		push({
+			path: '/pages/user/Login/index',
+		})
+		cookie.set('redirect', path)
+	}
+
+}
+
 export function push(location, complete, fail, success) {
 	handleLoginStatus(location, complete, fail, success).then(params => {
 		uni.navigateTo(params)
@@ -662,3 +679,98 @@ export const PosterCanvas = (store, successCallBack) => {
 	//   }
 	// })
 }
+
+
+
+export const handleLoginFailure = () => {
+	store.commit("LOGOUT");
+	store.commit("UPDATE_AUTHORIZATION", false);
+
+	// token 失效
+	// 判断当前是不是已经在登录页面或者授权页，防止二次跳转
+	if (store.getters.isAuthorizationPage || getCurrentPageUrl() == '/pages/user/Login/index') {
+		console.log('已经是登录页面或者授权页面，跳出方法')
+		return
+	}
+
+	console.log('当前是授权页面')
+	console.log(store.getters)
+	store.commit("UPDATE_AUTHORIZATIONPAGE", true);
+
+	let path = getCurrentPageUrlWithArgs()
+
+	// 判断是不是拼团进来的
+	if (getCurrentPageUrl() == 'pages/activity/GroupRule/index' && handleQrCode()) {
+		console.log('是拼团进来的')
+		let url = handleQrCode();
+		console.log(url)
+		if (url) {
+			path = parseUrl({
+				path: `/${getCurrentPageUrl()}`,
+				query: {
+					id: url.pinkId,
+				}
+			})
+			// cookie.set("spread", url.spread || 0);
+		} else {
+			console.log('是拼团进来的,但是没有获取到参数')
+			handleNoParameters()
+		}
+	}
+
+	// 判断是不是扫描的砍价海报进来的
+	if (getCurrentPageUrl() == 'pages/activity/DargainDetails/index' && handleQrCode()) {
+		console.log('是扫描的砍价海报进来的')
+		let url = handleQrCode();
+		if (url) {
+			path = parseUrl({
+				path: `/${getCurrentPageUrl()}`,
+				query: {
+					id: url.bargainId,
+					partake: url.uid
+				}
+			})
+			// cookie.set("spread", url.spread || 0);
+		} else {
+			handleNoParameters()
+			console.log('是扫描的砍价海报进来的,但是没有获取到参数')
+
+		}
+	}
+
+	if (getCurrentPageUrl() == 'pages/shop/GoodsCon/index' && handleQrCode()) {
+		console.log('是扫描的商品详情')
+		let url = handleQrCode();
+		console.log(url)
+		if (url) {
+			path = parseUrl({
+				path: `/${getCurrentPageUrl()}`,
+				query: {
+					id: url.productId,
+				}
+			})
+			cookie.set("spread", url.spread || 0);
+		} else {
+			handleNoParameters()
+			console.log('是扫描的商品详情进来的,但是没有获取到参数')
+		}
+	}
+
+
+
+	routerPermissions(path, 'reLaunch')
+}
+
+const handleNoParameters = () => {
+	uni.showToast({
+		title: '未获取到必要参数，即将跳转首页',
+		icon: 'success',
+		duration: 2000
+	})
+	setTimeout(() => {
+		clearTimeout()
+		switchTab({
+			path: '/pages/home/index',
+		});
+	}, 1500)
+}
diff --git a/utils/request.js b/utils/request.js
index d55f9bd..8c4e980 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,6 +1,6 @@
 import Fly from "flyio/dist/npm/wx";
 import $store from "../store";
-import toLogin from "@/libs/login";
+import { handleLoginFailure } from "@/utils";
 import { VUE_APP_API_URL } from "@/config";
 import cookie from "@/utils/store/cookie";
 
@@ -16,11 +16,11 @@ fly.interceptors.response.use(
   },
   error => {
     if (error.toString() == 'Error: Network Error') {
-      toLogin();
+      handleLoginFailure();
       return Promise.reject({ msg: "未登录", toLogin: true });
     }
     if (error.status == 401) {
-      toLogin();
+      handleLoginFailure();
       return Promise.reject({ msg: "未登录", toLogin: true });
     }
     return Promise.reject(error);
@@ -44,7 +44,7 @@ function baseRequest(options) {
   // 如果需要登录才可访问的接口没有拿到 token 视为登录失效
   if (options.login === true && !token) {
     // 跳转到登录或授权页面
-    toLogin();
+    handleLoginFailure();
     // 提示错误信息
     return Promise.reject({ msg: "未登录", toLogin: true });
   }
@@ -60,7 +60,7 @@ function baseRequest(options) {
       return Promise.reject({ msg: "请求失败", res, data });
     }
     if ([410000, 410001, 410002].indexOf(data.status) !== -1) {
-      toLogin();
+      handleLoginFailure();
       return Promise.reject({ msg: res.data.msg, res, data, toLogin: true });
     } else if (data.status === 200) {
       return Promise.resolve(data, res);