From c60e5fb5fdc0f61ff9c5fe689fc48832018d1c0d Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Wed, 23 Sep 2020 18:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=94=80=E5=92=8C?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=97=A0=E6=B3=95=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=85=B3=E7=B3=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                 | 12 +-----
 pages/Loading/index.vue                 | 51 +++++++++++--------------
 pages/activity/DargainDetails/index.vue | 19 ++++++---
 pages/shop/GoodsCon/index.vue           | 24 ++++++++----
 store/index.js                          |  9 +----
 utils/index.js                          | 34 ++++-------------
 utils/store/cookie.js                   | 11 +++++-
 7 files changed, 71 insertions(+), 89 deletions(-)

diff --git a/main.js b/main.js
index 23eb888..66258c1 100644
--- a/main.js
+++ b/main.js
@@ -38,14 +38,6 @@ Vue.prototype.$validator = function (rule) {
 	return new schema(rule);
 };
 
-// const CACHE_KEY = "clear_0.0.1";
-
-// if (!cookie.has(CACHE_KEY)) {
-// 	cookie.clearAll();
-// 	cookie.set(CACHE_KEY, 1);
-// }
-
-
 Vue.config.productionTip = false
 App.mpType = 'app'
 Vue.prototype.$store = store
@@ -128,7 +120,7 @@ import { isWeixin } from '@/utils'
 const CACHE_KEY = "clear_0.0.1";
 
 if (!cookie.has(CACHE_KEY)) {
-	cookie.clearAll();
+	cookie.clearAll()
 	cookie.set(CACHE_KEY, 1);
 }
 
@@ -146,7 +138,7 @@ if (urlSpread !== undefined) {
 // #endif
 
 
-	
+
 async function init() {
 
 	// #ifdef H5
diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 4c9d143..578a2eb 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -48,36 +48,20 @@
         } else if (spread === 0 || typeof spread !== "number") {
           cookie.set("spread", urlSpread || 0);
         }
-        if (this.$store.getters.token) {
-          this.toLaunch();
-          return;
-        }
       }
-
-      // cookie.get("spread");
-      // if (this.$deviceType == "weixin") {
-      //   let path = parseQuery().path
-      //   console.log(this)
-      //   if (path) {
-      //     this.$yrouter.push({
-      //       path
-      //     });
-      //   } else {
-      //     this.$yrouter.switchTab({
-      //       path: "/pages/home/index"
-      //     });
-      //   }
-
-      //   return
+      // if (this.$deviceType == "app" || this.$deviceType == "weixinh5") {
+      //   this.$yrouter.switchTab({
+      //     path: "/pages/home/index"
+      //   });
+      //   return;
       // }
-      // this.toLaunch();
-      if (this.$deviceType == "app" || this.$deviceType == "weixinh5") {
-        // this.toLaunch();
-        this.$yrouter.switchTab({
-          path: "/pages/home/index"
-        });
+      if (this.$store.getters.token) {
+        // 如果token存在，直接进行进页面
+        console.log('登录状态存在，直接进页面')
+        this.toLaunch();
         return;
       }
+      console.log('进行登录操作')
       login().finally(() => {
         this.$yrouter.switchTab({
           path: "/pages/home/index"
@@ -89,9 +73,18 @@
       toLaunch() {
         console.log("loading home");
         this.changeAuthorization(false);
-        this.$yrouter.switchTab({
-          path: "/pages/home/index"
-        });
+        let redirect = cookie.get('redirect')
+        if (redirect) {
+          redirect = redirect.split('/pages')[1]
+          this.$yrouter.replace({
+            path: '/pages' + redirect,
+          });
+          cookie.remove('redirect');
+        } else {
+          this.$yrouter.replace({
+            path: '/pages/home/index',
+          });
+        }
       }
     }
   };
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index d931b90..1e40300 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -1,10 +1,11 @@
 <template>
   <view class="bargain on">
     <!-- 在header上加 on 为请求支援 -->
-    <view :class="[bargainPartake != userInfo.uid ? 'wrapper bargain-box on user' : 'wrapper bargain-box user']" v-if="bargainPartake != userInfo.uid">
+    <view :class="[bargainPartake != userInfo.uid ? 'wrapper bargain-box on user' : 'wrapper bargain-box user']"
+      v-if="bargainUserInfo && bargainPartake != userInfo.uid">
       <!-- <view class="people">{{ lookCount }}人查看 丨 {{ shareCount }}人分享 丨 {{ userCount }}人参与</view> -->
       <!-- 帮助砍价、帮砍成功：-->
-      <view class="pictxt acea-row row-center-wrapper " >
+      <view class="pictxt acea-row row-center-wrapper ">
         <div class="bargain-header">
           <view class="pictrue">
             <image :src="bargainUserInfo.avatar" />
@@ -305,7 +306,7 @@
         } else {
           that.bargainPartake = parseInt(this.partake);
         }
-        
+
         that.getBargainHelpCountStart();
         that.getBargainDetail();
         that.getBargainShare(0);
@@ -505,11 +506,17 @@
             that.helpListStatus = res.data.length < that.limit;
             that.helpListLoading = false;
             that.page++;
-            that.bargainHelpList.push.apply(that.bargainHelpList, res.data);
+            if (res.data) {
+              that.bargainHelpList.push.apply(that.bargainHelpList, res.data);
+            }
           })
-          .catch(res => {
+          .catch(err => {
+            console.log(err)
+            if(!err.msg){
+              return
+            }
             uni.showToast({
-              title: res.msg,
+              title: err.msg || err.response.data.msg || err.response.data.message,
               icon: "none",
               duration: 2000
             });
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 5aca3a5..a323675 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -303,8 +303,15 @@
     computed: mapGetters(["isLogin", "location"]),
     mounted: function () {
       let url = handleQrCode();
-      if (url && url.productId) {
-        this.id = url.productId;
+      if (url && url.id) {
+        this.id = url.id;
+        var spread = cookie.get("spread");
+        let urlSpread = parseInt(url.spread);
+        if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
+          cookie.set("spread", urlSpread || 0);
+        } else if (spread === 0 || typeof spread !== "number") {
+          cookie.set("spread", urlSpread || 0);
+        }
       } else {
         this.id = this._route.query.id;
       }
@@ -326,7 +333,8 @@
         return {
           title: this.storeInfo.storeName,
           imageUrl: this.storeInfo.image,
-          path: "pages/shop/GoodsCon/index?id=" + this.storeInfo.id + "&spread=" + uni.getStorageSync("uid")+"&pageType=good&codeType=routine",
+          path: "pages/shop/GoodsCon/index?id=" + this.storeInfo.id + "&spread=" + uni.getStorageSync("uid") +
+            "&pageType=good&codeType=routine",
           success(res) {
             uni.showToast({
               title: '分享成功'
@@ -593,7 +601,7 @@
       //选择属性；
       ChangeAttr: function (res) {
         // 修改了规格
-        
+
         let productSelect = this.productValue[res.value];
         if (productSelect) {
           this.attr.productAttr[res.indexw].index = res.indexn;
@@ -754,10 +762,10 @@
                   configAppMessage
                 )
                 .then((res) => {
-                  
+
                 })
                 .catch((res) => {
-                  
+
                   if (res.is_ready) {
                     res.wx.updateAppMessageShareData(configAppMessage);
                     res.wx.updateTimelineShareData(configAppMessage);
@@ -776,10 +784,10 @@
                 configAppMessage
               )
               .then((res) => {
-                
+
               })
               .catch((res) => {
-                
+
                 if (res.is_ready) {
                   res.wx.updateAppMessageShareData(configAppMessage);
                   res.wx.updateTimelineShareData(configAppMessage);
diff --git a/store/index.js b/store/index.js
index 1279a98..e6e45dc 100644
--- a/store/index.js
+++ b/store/index.js
@@ -39,14 +39,7 @@ const vuexStore = new Vuex.Store({
 			console.log('清除数据')
 			state.token = null;
 			state.userInfo = null
-			let spread = cookie.get('spread')
-			let redirect = cookie.get('redirect')
-			let outTime = setTimeout(() => {
-				clearTimeout(outTime)
-				cookie.clearAll()
-				cookie.set('redirect', redirect)
-				cookie.set('spread', spread)
-			}, 100)
+			cookie.clearAll()
 		},
 		backgroundColor(state, color) {
 			state.color = color;
diff --git a/utils/index.js b/utils/index.js
index 7bc8f02..0b78f57 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -218,6 +218,7 @@ export const login = () => {
 							reLaunch({
 								path: '/pages' + redirect,
 							});
+							cookie.remove('redirect');
 						} else {
 							reLaunch({
 								path: '/pages/home/index',
@@ -226,38 +227,16 @@ export const login = () => {
 					})
 					.catch(() => {
 						reject('当前运行环境为微信浏览器')
-						location.replace("/pages/home/index");
+						reLaunch({
+							path: '/pages/home/index',
+						});
 					});
 			} else {
-				// wechat().then(() => oAuth());
 			}
-			// if (!code) {
-			// 	toAuth("wxc061dee8806ff712")
-			// } else {
-			// 	// wechat().then(() => oAuth().then((code) => {
-			// 	// 	// const { code } = parseQuery()
-			// 	// 	auth(code)
-			// 	// 		.then(() => {
-			// 	// 			// location.replace(
-			// 	// 			//   decodeURIComponent(decodeURIComponent(this.$route.params.url))
-			// 	// 			// );
-			// 	// 			location.href = decodeURIComponent(
-			// 	// 				decodeURIComponent(this.$route.params.url)
-			// 	// 			);
-			// 	// 		})
-			// 	// 		.catch(() => {
-			// 	// 			reject('当前运行环境为微信浏览器')
-			// 	// 			location.replace("/pages/home/index");
-			// 	// 		});
-			// 	// })).catch(error => {
-			// 	// 	console.log(error)
-			// 	// 	reject('自动登录失败')
-			// 	// });
-			// }
 			return
 		}
 		if (Vue.prototype.$deviceType == 'weixinh5') {
-
+			console.log('当前运行环境为H5')
 			reject('当前运行环境为H5')
 			return
 		}
@@ -710,7 +689,8 @@ export const _router = {
 	push,
 	replace,
 	go,
-	back
+	back,
+	reLaunch
 }
 
 
diff --git a/utils/store/cookie.js b/utils/store/cookie.js
index eeb6714..b84eca3 100644
--- a/utils/store/cookie.js
+++ b/utils/store/cookie.js
@@ -29,7 +29,16 @@ function remove(key) {
 }
 
 function clearAll() {
-  uni.clearStorage()
+  const res = uni.getStorageInfoSync();
+  res.keys.map((item) => {
+    if (item == 'redirect' || item == 'spread') {
+      return
+    }
+    remove(item)
+  })
+  console.log(res)
+  // debugger
+  // uni.clearStorageSync()
 }
 
 function _has(key) {