cms 和 message 还原

nuxt.config.js

@@ -7,9 +7,9 @@ const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.u
 // 公共物料
 const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')
 // 公共cms
-// const cmsUrl = process.env.CMS_URL || (isProdMode ? 'https://cms.usoftmall.com' : 'https://cms.usoftmall.com')
+const cmsUrl = process.env.CMS_URL || (isProdMode ? 'https://cms.usoftmall.com' : 'https://cms.usoftmall.com')
 // 消息
-// const messageUrl = process.env.MESSAGE_URL || (isProdMode ? 'https://api-message.ubtob.com/' : 'http://192.168.253.6:24000/message')
+const messageUrl = process.env.MESSAGE_URL || (isProdMode ? 'https://api-message.ubtob.com/' : 'http://192.168.253.6:24000/message')
 
 module.exports = {
   router: {
@@ -92,9 +92,9 @@ module.exports = {
   env: {
     baseUrl,
     commonUrl,
-    materialUrl
-    // cmsUrl
-    // messageUrl
+    materialUrl,
+    cmsUrl,
+    messageUrl
   },
   plugins: [
     {
@@ -185,9 +185,9 @@ module.exports = {
     '/account/**': baseUrl,
     '/vendor/**': baseUrl,
     '/internalmessage-service/**': baseUrl,
-    '/wx/**': baseUrl
-    // '/messages**': messageUrl,
-    // '/messages/**': messageUrl,
-    // '/cmsApi**': cmsUrl
+    '/wx/**': baseUrl,
+    '/messages**': messageUrl,
+    '/messages/**': messageUrl,
+    '/cmsApi**': cmsUrl
   }
 }

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

@@ -49,11 +49,11 @@
           <span>我的店铺</span>
           <i class="iconfont icon-xiangyou"></i>
         </div>
-        <!--<nuxt-link tag="div" to="/mobile/center/vendor/message"  class="content-line" v-if="user.data.enterprise.uu">
+        <nuxt-link tag="div" to="/mobile/center/vendor/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>
     <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: {
@@ -83,10 +83,10 @@
     computed: {
       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 () {

plugins/axios.js

@@ -19,14 +19,13 @@ service.interceptors.request.use(config => {
       config.url = process.env.commonUrl + config.url
     } else if (config.url.indexOf('/productsuer') === 0) {
       config.url = process.env.materialUrl + config.url
+    } else if (config.url.indexOf('/messages') === 0) {
+      config.url = process.env.messageUrl + config.url
+    } else if (config.url.indexOf('/cmsApi') === 0) {
+      config.url = process.env.cmsUrl + config.url
     } else {
       config.url = process.env.baseUrl + config.url
-    } /* else if (config.url.indexOf('/messages') === 0) {
-      config.url = process.env.messageUrl + config.url
-    } */
-  // else if (config.url.indexOf('/cmsApi') === 0) {
-  //     config.url = process.env.cmsUrl + config.url
-  //   }
+    }
   //   let paramStr = ''
   //   if (config.params) {
   //     paramStr += '?'