Merge branch 'hotfix/login0401' into master

src/pages/my.vue

@@ -74,7 +74,7 @@ export default {
   },
   computed: {
     isCommissionEnable () {
-      return this.$store.state.enable_commission * 1 === 1
+      return this.$store.state.enable_commission * 1 === 1 && this.userInfo.token
     },
     userInfo () {
       return this.$store.state.userInfo
@@ -84,7 +84,7 @@ export default {
     }
   },
   onShow () {
-    if (this.userInfo) {
+    if (this.userInfo.token) {
       api.getUserInfoByToken().then(({ code, data }) => {
         if (code === 200) {
           this.$store.commit('updateUserInfo', data)
@@ -108,6 +108,10 @@ export default {
         })
       }
       if (type === 3) {
+        if (!this.userInfo.token) {
+          this.login()
+          return
+        }
         uni.switchTab({
           url: 'order'
         })
@@ -121,7 +125,7 @@ export default {
       })
     },
     jumpToCommissionApply () {
-      if (this.userInfo) {
+      if (this.userInfo.token) {
         uni.navigateTo({ url: '/pagesSub/commission/commission' })
       } else {
         uni.navigateTo({
@@ -130,7 +134,7 @@ export default {
       }
     },
     jumpToCommission () {
-      if (this.userInfo) {
+      if (this.userInfo.token) {
         uni.navigateTo({ url: '/pagesSub/commission/invite' })
       } else {
         uni.navigateTo({
@@ -140,6 +144,10 @@ export default {
     },
     // 个人信息
     toUserDetail () {
+      if (!this.userInfo.token) {
+        this.login()
+        return
+      }
       uni.navigateTo({
         url: '/pagesSub/my/userDetail'
       })

src/pages/order.vue

@@ -102,9 +102,9 @@ export default {
   },
   onShow () {
     if (!this.userId) {
-      uni.navigateTo({
-        url: '/pagesSub/other/login'
-      })
+      // uni.navigateTo({
+      //   url: '/pagesSub/other/login'
+      // })
       return
     }
     this.enable = true

src/pagesSub/activity/activityDetail.vue

@@ -25,7 +25,11 @@
         <view class="u-flex u-row-between u-p-t-22">
           <text class="u-content-color">{{detail.join_number}}已参与</text>
           <button class="share-btn u-primary-color u-font-24 line-34"
-                  open-type="share">分享活动</button>
+                  v-if="!userId"
+                  @click="jumpToLogin">分享活动</button>
+          <button class="share-btn u-primary-color u-font-24 line-34"
+                  open-type="share"
+                  v-if="userId">分享活动</button>
         </view>
         <image v-if="platBanner"
                :src="platBanner.img"
@@ -331,26 +335,26 @@ export default {
       }
     }
   },
-  watch: {
-    userId (e) {
-      if (!e) {
-        uni.navigateTo({
-          url: '/pagesSub/other/login'
-        })
-      }
-    }
-  },
+  // watch: {
+  //   userId (e) {
+  //     if (!e) {
+  //       uni.navigateTo({
+  //         url: '/pagesSub/other/login'
+  //       })
+  //     }
+  //   }
+  // },
   onLoad (options) {
     this.activityId = options.id
     this.recordId = options.record_id
   },
   onShow () {
-    if (!this.userId) {
-      uni.navigateTo({
-        url: '/pagesSub/other/login'
-      })
-      return
-    }
+    // if (!this.userId) {
+    //   uni.navigateTo({
+    //     url: '/pagesSub/other/login'
+    //   })
+    //   return
+    // }
     this.getDetailData()
     this.reNowTime()
   },
@@ -385,6 +389,11 @@ export default {
     }
   },
   methods: {
+    jumpToLogin () {
+      uni.navigateTo({
+        url: '/pagesSub/other/login'
+      })
+    },
     onDialogOpen () {
       uni.setClipboardData({
         data: this.detail.search_key ? this.detail.search_key : this.detail.shop_name
@@ -394,6 +403,10 @@ export default {
       this.openOtherApplte()
     },
     onClickShare () {
+      if (!this.userId) {
+        this.jumpToLogin()
+        return
+      }
       uni.navigateTo({ url: '/pagesSub/commission/invite' })
     },
     getShareUrl () {
@@ -502,6 +515,10 @@ export default {
         })
         return
       }
+      if (!this.userId) {
+        this.jumpToLogin()
+        return
+      }
       uni.requestSubscribeMessage({
         tmplIds: this.$store.state.joinTemplateIds,
         complete: () => {