Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

rk

9 天以前 a59ff44b2eaa7020f0529632d9ec064c4dc38e27

 small-program/pages/mine/mine.vue

@@ -16,10 +16,10 @@
                  <view class="tool-item" @click="toSetting">
                     <image class="tool-icon" src="/static/icon/ic_option@2x.png" mode="aspectFit"></image>
                  </view>
                  <view class="tool-item has-badge">
                  <!-- <view class="tool-item has-badge">
                     <image class="tool-icon" src="/static/icon/ic_notice@2x.png" mode="aspectFit"></image>
                     <view class="tool-badge" v-if="userInfo.hasMessage"></view>
                  </view>
                  </view> -->
               </view>
            </view>

@@ -135,6 +135,12 @@
            '用户隐私政策': '/pages/rich-text/rich-text?type=1',
            '关于我们': '/pages/rich-text/rich-text?type=5' 
         }
         if (['门店入驻', '我的门店'].includes(item.label)) {
            if (!this.token) {
               this.showAuthLogin = true
               return
            }
         }
         if (['门店入驻','门店信息'].includes(item.label) && [0,1,2,3].includes(this.userInfo.shopAuditStatus)) {
            uni.navigateTo({
               url: '/pages/details-entry/details-entry'
@@ -154,6 +160,10 @@
         })
      },
      toSetting() {
         if (!this.token) {
            this.showAuthLogin = true
            return
         }
         uni.navigateTo({
            url: '/pages/settings/settings'
         })