Merge branch 'master' into hotfix-txcloud-0919

nuxt.config.js

@@ -143,8 +143,6 @@ module.exports = {
   proxyTable: {
     // 账户中心统一前缀
     '/ssoPrefix/**': ssoUrl,
-    // 账户中心获取申请绑定列表接口
-    '/api/userspace/**': ssoUrl,
     '/api/**': baseUrl,
     '/search/**': baseUrl,
     '/user/**': baseUrl,
@@ -208,6 +206,8 @@ module.exports = {
     '/mPhone/**': baseUrl,
     '/sso**': baseUrl,
     // 代办事项
-    '/adminToDo/**': baseUrl
+    '/adminToDo/**': baseUrl,
+    // 账户中心获取申请绑定列表接口
+    '/api/userspace/apply/**': ssoUrl
   }
 }

pages/mobile/center/user/collect/message.vue

@@ -6,12 +6,16 @@
   export default {
     middleware: 'authenticated',
     layout: 'mobileNoHeader',
-    fetch ({ store }) {
-      let user = store.state.option.user.data
-      return Promise.all([
-        // 获取消息列表
-        store.dispatch('messageShow/getAllMessage', { receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', count: 10, page: 1, sorting: {'createTime': 'DESC'} })
-      ])
+//    fetch ({ store }) {
+//      let user = store.state.option.user.data
+//      return Promise.all([
+//        // 获取消息列表
+//        store.dispatch('messageShow/getAllMessage', { receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', count: 10, page: 1, sorting: {'createTime': 'DESC'} })
+//      ])
+//    },
+    created () {
+      let user = this.user.data
+      this.$store.dispatch('messageShow/getAllMessage', { receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', count: 10, page: 1, sorting: {'createTime': 'DESC'} })
     },
     components: {
       Message

pages/mobile/center/vendor/message.vue

@@ -6,12 +6,16 @@
   export default {
     middleware: 'authenticated',
     layout: 'mobileNoHeader',
-    fetch ({ store }) {
-      let user = store.state.option.user.data
-      return Promise.all([
-        // 获取消息列表
-        store.dispatch('messageShow/getAllMessage', { receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', count: 10, page: 1, sorting: {'createTime': 'DESC'} })
-      ])
+//    fetch ({ store }) {
+//      let user = store.state.option.user.data
+//      return Promise.all([
+//        // 获取消息列表
+//        store.dispatch('messageShow/getAllMessage', { receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', count: 10, page: 1, sorting: {'createTime': 'DESC'} })
+//      ])
+//    },
+    created () {
+      let user = this.user.data
+      this.$store.dispatch('messageShow/getAllMessage', { receiverUu: user.userUU, receiverEnuu: user.enterprise.uu, consumerApp: 'MALL', count: 10, page: 1, sorting: {'createTime': 'DESC'} })
     },
     components: {
       Message

store/messageShow.js

@@ -1,4 +1,5 @@
 import axios from '~plugins/axios'
+import config from '../nuxt.config'
 
 export const actions = {
   // 获取未读消息数量
@@ -14,7 +15,7 @@ export const actions = {
   // 获取全部消息
   getAllMessage({ commit }, params = {}) {
     commit('messageList/REQUEST_MESSAGE_LIST')
-    return axios.get('/messages', {params})
+    return axios.get(`${config.env.messageUrl}/messages`, {params})
       .then(response => {
         commit('messageList/GET_MESSAGE_LIST_SUCCESS', response.data)
       }, err => {