Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/mobile/center/vendor/index.vue

pages/mobile/center/user/index.vue

@@ -37,11 +37,11 @@
           <span>店铺关注<span class="text">({{storeCount.data || 0}})</span></span>
           <i class="iconfont icon-xiangyou"></i>
         </nuxt-link>
-        <!--<nuxt-link tag="div" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
+        <nuxt-link tag="div" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
           <img src="/images/mobile/center/user/message.png" alt="">
           <span>消息<span class="text">({{messageCount.count || 0}})</span></span>
           <i class="iconfont icon-xiangyou"></i>
-        </nuxt-link>-->
+        </nuxt-link>
       </div>
     </div>
     <publish-seek :showSayPriceBox="showPublishBox" @cancelAction="showPublishBox = false" @remindAction="onRemind"></publish-seek>
@@ -62,14 +62,14 @@
       }
     },
     fetch ({store}) {
-//      let user = store.state.option.user.data
+     let user = store.state.option.user.data
       let promises = [
         store.dispatch('product/loadCompCollectInfo'),
         store.dispatch('shop/loadStoreCollectInfo')
       ]
-//      if (user.enterprise.uu) {
-//        promises.push(store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0}))
-//      }
+     if (user.enterprise.uu) {
+       promises.push(store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0}))
+     }
       return Promise.all([
         promises
       ])
@@ -84,13 +84,13 @@
       },
       storeCount () {
         return this.$store.state.shop.storeInfo.collectCount.data
-      }
-//      messageCount () {
-//        // console.log(this.$store.state.messageShow.messageCount.count.data)
-//        if (this.user.data.enterprise.uu) {
-//          return this.$store.state.messageShow.messageCount.count.data
-//        }
-//      }
+      },
+       messageCount () {
+         // console.log(this.$store.state.messageShow.messageCount.count.data)
+         if (this.user.data.enterprise.uu) {
+           return this.$store.state.messageShow.messageCount.count.data
+         }
+       }
     },
     methods: {
       onRemind: function (str) {

pages/mobile/center/vendor/index.vue

@@ -14,7 +14,7 @@
         <ul>
           <nuxt-link tag="li" to="/mobile/center/vendor/product?providerType=enterprise">
             <img src="/images/mobile/center/vendor/material.png" alt="">
-            <p>公司产品库</p>
+            <p>企业产品库</p>
           </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/vendor/product?providerType=person">
             <img src="/images/mobile/center/vendor/material-person.png" alt="">
@@ -44,7 +44,7 @@
         </ul>
       </div>
       <div class="block-wrap collect-block">
-       <!--<div class="content-line" @click="goStore">
+        <!--<div class="content-line" @click="goStore">
           <img src="/images/mobile/center/vendor/shop.png" alt="">
           <span>我的店铺</span>
           <i class="iconfont icon-xiangyou"></i>
@@ -53,7 +53,7 @@
           <img src="/images/mobile/center/user/message.png" alt="">
           <span>消息<span class="text">({{messageCount.count || 0}})</span></span>
           <i class="iconfont icon-xiangyou"></i>
-        </nuxt-link>
+        </nuxt-link>-->
       </div>
     </div>
     <remind-box :title="remindText" :timeoutCount="timeoutCount"></remind-box>
@@ -71,10 +71,10 @@
       }
     },
     fetch ({ store }) {
-      let user = store.state.option.user.data
+     let user = store.state.option.user.data
       return Promise.all([
-        store.dispatch('loadStoreStatus', { op: 'check' }),
-        store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0})
+        store.dispatch('loadStoreStatus', { op: 'check' })
+//        store.dispatch('messageShow/loadMessageCount', {receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', isRead: 0})
       ])
     },
     components: {
@@ -84,17 +84,16 @@
       storeInfo () {
         return this.$store.state.option.storeStatus.data
       },
-      messageCount () {
-        return this.$store.state.messageShow.messageCount.count.data
-      }
+     messageCount () {
+       return this.$store.state.messageShow.messageCount.count.data
+     }
     },
     methods: {
       goStore: function () {
         if (this.storeInfo.uuid) {
           this.$router.push(`/mobile/shop/${this.storeInfo.uuid}`)
         } else {
-          // this.onRemind('请前往账户中心【我】进行开店申请')
-          this.onRemind('请前往PC端申请开店')
+          this.onRemind('请先前往pc端开通店铺')
         }
       },
       onRemind: function (str) {