去除测试log;修改购物车无法选中的问题

libs/wechat.js

@@ -157,7 +157,7 @@ export async function auth(code) {
   return new Promise((resolve, reject) => {
     let loginType = cookie.get(LOGINTYPE);
     let spread = cookie.get('spread');
-    alert(spread)
+    console.log('微信授权登录前获取spread', spread)
     wechatAuth(code, spread, loginType)
       .then(({ data }) => {
         console.log(data)
@@ -167,8 +167,11 @@ export async function auth(code) {
         cookie.set(WX_AUTH, code, expires_time);
         cookie.remove(STATE_KEY);
         loginType && cookie.remove(LOGINTYPE);
+        console.log('微信公众号授权登录，获取用户信息')
+        store.dispatch('getUser').finally(() => {
           resolve();
         })
+      })
       .catch(reject);
   }).catch(error => {
     console.log(error)

pages/Loading/index.vue

@@ -18,6 +18,7 @@
     wxappAuth,
   } from "@/api/user";
   import dayjs from "dayjs";
+  import store from "@/store";
   import cookie from "@/utils/store/cookie";
   import {
     parseQuery,
@@ -34,7 +35,7 @@
       return {};
     },
     onShow() {
-
+      console.log('getUser')
       var url = handleQrCode();
       if (!url) {
         url = handleUrlParam(getCurrentPageUrlWithArgs())
@@ -55,9 +56,7 @@
       if (this.$store.getters.token) {
         // 如果token存在，直接进行进页面
         console.log('登录状态存在，直接进页面')
-        this.getUser().finally(() => {
         this.toLaunch();
-        })
         return;
       }
       console.log('进行登录操作')

pages/shop/GoodsCon/index.vue

@@ -135,7 +135,10 @@
           </button>
         </view>
         <!-- #endif -->
-
+        <view class="item" @click="goHome" >
+          <view class="iconfont icon-shouye-xianxing"></view>
+          <text>首页</text>
+        </view>
         <view class="item" @click="setCollect" v-if="storeInfo.userCollect">
           <view class="iconfont icon-shoucang1"></view>
           <text>收藏</text>
@@ -351,6 +354,9 @@
           }
         }
       },
+      goHome() {
+        this.$yrouter.switchTab("/pages/home/index");
+      },
       goShoppingCart() {
         this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");
       },

pages/shop/ShoppingCart/index.vue

@@ -28,7 +28,7 @@
               <view class="checkbox-wrapper">
                 <checkbox-group @change="switchSelect(cartListValidIndex)">
                   <label class="well-check">
-                    <checkbox value :checked="item.checked+''"></checkbox>
+                    <checkbox color="#eb3729" value :checked="item.checked"></checkbox>
                   </label>
                 </checkbox-group>
               </view>
@@ -113,7 +113,7 @@
 
               <checkbox-group @change="allChecked">
                 <label class="well-check">
-                  <checkbox value="allSelect" :checked="isAllSelect && cartCount > 0"></checkbox>
+                  <checkbox color="#eb3729" value="allSelect" :checked="isAllSelect && cartCount > 0"></checkbox>
                   <text class="checkAll">全选 ({{ cartCount }})</text>
                 </label>
               </checkbox-group>

pages/user/UserAccount/index.vue

@@ -97,21 +97,21 @@ export default {
     },
     getActivity: function() {
       let that = this;
-      getActivityStatus().then(
+      // getActivityStatus().then(
-        res => {
+      //   res => {
-          that.activity.is_bargin = res.data.is_bargin;
+      //     that.activity.is_bargin = res.data.is_bargin;
-          that.activity.is_pink = res.data.is_pink;
+      //     that.activity.is_pink = res.data.is_pink;
-          that.activity.is_seckill = res.data.is_seckill;
+      //     that.activity.is_seckill = res.data.is_seckill;
-        },
+      //   },
-        err => {
+      //   err => {
-          uni.showToast({
+      //     uni.showToast({
-            title:
+      //       title:
-              err.msg || err.response.data.msg || err.response.data.message,
+      //         err.msg || err.response.data.msg || err.response.data.message,
-            icon: "none",
+      //       icon: "none",
-            duration: 2000
+      //       duration: 2000
-          });
+      //     });
-        }
+      //   }
-      );
+      // );
     }
   }
 };

store/index.js

@@ -90,7 +90,7 @@ const vuexStore = new Vuex.Store({
 		userInfo({ state, commit }, force) {
 			if (state.userInfo !== null && !force) {
 				return Promise.resolve(state.userInfo);
-			} else {
+			}
 			return new Promise(reslove => {
 				getUserInfo().then(res => {
 					commit("updateUserInfo", res.data);
@@ -103,9 +103,11 @@ const vuexStore = new Vuex.Store({
 					duration: 2000,
 				});
 			});
-			}
 		},
 		getUser({ state, commit }) {
+			if (!state.token) {
+				return Promise.reject('未获取到token');
+			}
 			return new Promise(reslove => {
 				getUserInfo().then(res => {
 					console.log(res)