From d7e08753815556c2b3ffe6af48904e14724ccd0c Mon Sep 17 00:00:00 2001
From: gaoxs <gaoxs@gaoxsdeMacBook-Pro.local>
Date: Wed, 3 Jun 2020 10:58:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=202.uniapp=E8=AF=84=E4=BB=B7=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=90=8E=E8=A6=81=E8=BF=9E=E9=9C=803-4=E6=AC=A1=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=89=8D=E8=83=BD=E5=88=B0=E9=A6=96=E9=A1=B5=EF=BC=88?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=E4=B8=8D=E6=98=AF=E5=BE=88=E5=A5=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/authorization/index.vue         | 17 ++++++---
 pages/order/MyOrder/index.vue         | 31 ++++++++--------
 pages/order/OrderSubmission/index.vue |  6 ++--
 pages/shop/GoodsCon/index.vue         |  6 ++--
 pages/shop/GoodsEvaluate/index.vue    | 22 ++++++++----
 pages/user/User/index.vue             | 19 ++++++----
 pages/user/promotion/Poster/index.vue |  6 ++--
 utils/index.js                        | 52 +++++++++++++++------------
 8 files changed, 94 insertions(+), 65 deletions(-)

diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index 0479a04..5b0689b 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -2,7 +2,7 @@
   <view class="container">
     <view v-if="!token">
       <!-- 小程序 -->
-      <view v-if="$deviceType == 'routine'">
+      <view v-if="$deviceType == 'routine'&&!authorize">
         <view class="getUserInfo">
           <text>您还未允许微信登录授权，请点击下方按钮允许微信授权登录。</text>
           <button type="primary" open-type="getUserInfo" @getuserinfo="getUserInfo">允许微信登录授权</button>
@@ -11,7 +11,7 @@
         </view>
       </view>
       <!-- app -->
-      <view v-if="$deviceType == 'app'">
+      <view v-if="$deviceType == 'app'&&!authorize">
         <view class="getUserInfo">
           <text>请先登录</text>
           <button type="primary" @click="this.toLogin">去登录</button>
@@ -28,17 +28,26 @@ import { mapState, mapMutations, mapActions } from "vuex";
 import { wxappAuth, getUser } from "@/api/user";
 import dayjs from "dayjs";
 import cookie from "@/utils/store/cookie";
-import { login } from "@/utils";
+import { login, authorize } from "@/utils";
 
 export default {
   data() {
-    return {};
+    return {
+      authorize: true
+    };
   },
   computed: {
     ...mapState(["isAuthorization", "$deviceType", "token"])
   },
   onShow() {
     this.UPDATE_AUTHORIZATIONPAGE(true);
+    // 先校验用户是否授权，如果没有授权，显示授权按钮
+    authorize("userInfo")
+      .then(() => {})
+      .catch(error => {
+        // 用户未授权，显示授权按钮
+        this.authorize = true;
+      });
   },
   onHide() {
     this.UPDATE_AUTHORIZATIONPAGE(false);
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 14d3919..1397581 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -340,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..aac0cc0 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -291,9 +291,14 @@ 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 => {
+          console.log(error);
+        });
     },
     goPages: function(index) {
       let url = this.MyMenus[index].uniapp_url;
@@ -335,9 +340,11 @@ 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();
     }
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/utils/index.js b/utils/index.js
index d37b122..014bfe8 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -403,7 +403,7 @@ export const handleLoginStatus = (location, complete, fail, success) => {
 
 // }
 
-export function routerPermissions(url) {
+export function routerPermissions(url, type) {
 	let path = url
 	if (!path) {
 		path = getCurrentPageUrlWithArgs()
@@ -416,9 +416,15 @@ export function routerPermissions(url) {
 			// 自动登录
 			login().then(res => {
 				// 登录成功，跳转到需要跳转的页面
-				push({
-					path,
-				})
+				if (type == 'reLaunch') {
+					reLaunch({
+						path,
+					})
+				} else {
+					push({
+						path,
+					})
+				}
 			}).catch(error => {
 				uni.showToast({
 					title: error,
@@ -687,9 +693,7 @@ export const handleLoginFailure = () => {
 			// cookie.set("spread", url.spread || 0);
 		} else {
 			console.log('是拼团进来的,但是没有获取到参数')
-			switchTab({
-				path: '/pages/home/index',
-			});
+			handleNoParameters()
 		}
 	}
 
@@ -697,15 +701,6 @@ export const handleLoginFailure = () => {
 	if (getCurrentPageUrl() == 'pages/activity/DargainDetails/index' && handleQrCode()) {
 		console.log('是扫描的砍价海报进来的')
 		let url = handleQrCode();
-		console.log(url)
-		// bargainId: "36"
-// bargainUserUid: 1404
-		
-// bargainId: "36"
-// codeType: "routine"
-// pageType: "dargain"
-// spread: "1404"
-// uid: "1404"
 		if (url) {
 			path = parseUrl({
 				path: `/${getCurrentPageUrl()}`,
@@ -716,10 +711,9 @@ export const handleLoginFailure = () => {
 			})
 			// cookie.set("spread", url.spread || 0);
 		} else {
+			handleNoParameters()
 			console.log('是扫描的砍价海报进来的,但是没有获取到参数')
-			switchTab({
-				path: '/pages/home/index',
-			});
+
 		}
 	}
 
@@ -736,12 +730,24 @@ export const handleLoginFailure = () => {
 			})
 			cookie.set("spread", url.spread || 0);
 		} else {
-			switchTab({
-				path: '/pages/home/index',
-			});
+			handleNoParameters()
 			console.log('是扫描的商品详情进来的,但是没有获取到参数')
 		}
 	}
 
-	routerPermissions(path)
+	routerPermissions(path, 'reLaunch')
+}
+
+const handleNoParameters = () => {
+	uni.showToast({
+		title: '未获取到必要参数，即将跳转首页',
+		icon: 'success',
+		duration: 2000
+	})
+	setTimeout(() => {
+		clearTimeout()
+		switchTab({
+			path: '/pages/home/index',
+		});
+	}, 1500)
 }