Merge branch 'feature-201821-wangcz' into release-201821-wangcz

# Conflicts:
#	components/mobile/staffManagement/StaffList.vue

components/mobile/MobileHeader.vue

@@ -212,13 +212,13 @@
           title = '购物车'
         } else if (this.startWith(val, '/mobile/center/user/payCenter')) {
           this.showSearchIcon = false
-          title = '支付中心'
+          title = '应付对账'
         } else if (this.startWith(val, '/mobile/center/user/invoice')) {
           this.showSearchIcon = false
           title = '发票管理'
         } else if (this.startWith(val, '/mobile/center/vendor/payCenter')) {
           this.showSearchIcon = false
-          title = '财务对账'
+          title = '应收对账'
         } else if (this.startWith(val, '/mobile/center/user/pay')) {
           this.showSearchIcon = false
           title = '确认订单'

nuxt.config.js

@@ -141,6 +141,10 @@ module.exports = {
    *   }
    */
   proxyTable: {
+    // 账户中心统一前缀
+    '/ssoPrefix/**': ssoUrl,
+    // 账户中心获取申请绑定列表接口
+    '/api/userspace/**': ssoUrl,
     '/api/**': baseUrl,
     '/search/**': baseUrl,
     '/user/**': baseUrl,

pages/mobile/center/user/index.vue

@@ -52,7 +52,7 @@
           </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/user/payCenter" class="content-line">
             <img src="/images/mobile/center/user/payfor_icon.png" alt="">
-            <p>支付中心</p>
+            <p>应付对账</p>
           </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
             <img src="/images/mobile/center/user/message.png" alt="">

pages/mobile/center/vendor/index.vue

@@ -56,7 +56,7 @@
           <!--</nuxt-link>-->
           <nuxt-link tag="li" to="/mobile/center/vendor/payCenter">
             <img src="/images/mobile/center/user/finance_icon.png" alt="">
-            <p>财务对账</p>
+            <p>应收对账</p>
           </nuxt-link>
           <nuxt-link tag="li" to="/mobile/center/vendor/invoice">
             <img src="/images/mobile/center/user/invoice_icon.png" alt="">

pages/mobile/center/vendor/payCenter.vue

@@ -93,6 +93,7 @@
         <span class="content">已收总计：<span>{{currencySymbol | currencyFilter}}&nbsp;{{totalRecordPrice}}</span></span>
         <!--<span class="content">支出总计：<span>{{currencySymbol | currencyFilter}}&nbsp;0</span></span>
         <p>结余：{{currencySymbol | currencyFilter}}&nbsp;{{totalRecordPrice}} (共计{{recordList.length || 0}}笔交易)</p>-->
+        <p>结余：{{currencySymbol | currencyFilter}}&nbsp;{{totalRecordPrice}} (共计{{recordList.length || 0}}笔交易)</p>
       </div>
     </div>
     <!-- 交易记录end -->
@@ -725,7 +726,7 @@
     background: #fff;
     border-radius: .02rem;
     border-top: 1px solid #bfbfbf;
-    line-height: 1.25rem;
+    line-height: .62rem;
     font-size: .28rem;
     width: 100%;
     padding-right: .3rem;

plugins/axios.js

@@ -22,20 +22,20 @@ service.interceptors.request.use(config => {
       config.url = process.env.messageUrl + config.url
     } else if (config.url.indexOf('/cmsApi') === 0) {
       config.url = process.env.cmsUrl + config.url
-    // } else if (config.url.indexOf('/sso') === 0) {
-    //   config.url = process.env.ssoUrl + config.url
+    } else if (config.url.indexOf('/sso') === 0) {
+      config.url = process.env.ssoUrl + config.url
     } else {
       config.url = process.env.baseUrl + config.url
     }
-  //   let paramStr = ''
-  //   if (config.params) {
-  //     paramStr += '?'
-  //     for (let s in config.params) {
-  //       paramStr += s + '=' + config.params[s] + '&'
-  //     }
-  //     paramStr.substr(0, paramStr.length - 2)
-  //   }
-  //   console.log(config.url + paramStr)
+    //   let paramStr = ''
+    //   if (config.params) {
+    //     paramStr += '?'
+    //     for (let s in config.params) {
+    //       paramStr += s + '=' + config.params[s] + '&'
+    //     }
+    //     paramStr.substr(0, paramStr.length - 2)
+    //   }
+    //   console.log(config.url + paramStr)
     // config.headers.cookie = store.state.option.cookies + '; ' + store.state.option.sessionId
     // config.headers['User-Agent']
   } else {

server.js

@@ -24,6 +24,12 @@ process.noDeprecation = true
 //   next()
 // })
 
+// 账户中心接口统一转发
+app.get('/ssoPrefix/**', (req, res, next) => {
+  res.redirect(req.url.replace('/ssoPrefix', ''))
+  next()
+})
+
 app.set('port', port)
 
 // Import and Set Nuxt.js options