Merge remote-tracking branch 'origin/release-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 = '确认订单'

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/user/invoice/invoiceRecord.vue

@@ -110,7 +110,7 @@
 
             </div>
             <div class="fixedImg">
-              <img src="/images/mobile/center/invoice-spec2.png" v-if="inv.invoicetype === 1206"/>
+              <img src="/images/mobile/center/invoice-spec2.png" v-if="inv.invoicetype === 1205"/>
               <img src="/images/mobile/center/invoice-nor2.png" v-else/>
             </div>
           </li>

pages/mobile/center/user/payCenter.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="mobile-pay-center mobile-fix-content mobile-centerfix-content" :style="switchType === 'account' ? 'padding-bottom: 1rem;' : ''" id="mobileFixContent" @click="setShowSelect('all', false)">
-    <div class="mp-head" v-if="!fromUserPage">
-      <span class="inline-block" :class="{'active': switchType === 'record'}" @click="setSwitchType('record')">交易记录</span>
-      <span class="inline-block" :class="{'active': switchType === 'account'}" @click="setSwitchType('account')">付款账户</span>
-    </div>
+    <!--<div class="mp-head" v-if="!fromUserPage">-->
+      <!--<span class="inline-block" :class="{'active': switchType === 'record'}" @click="setSwitchType('record')">交易记录</span>-->
+      <!--<span class="inline-block" :class="{'active': switchType === 'account'}" @click="setSwitchType('account')">付款账户</span>-->
+    <!--</div>-->
     <div class="mp-content" v-if="switchType == 'account'">
       <!--<p class="mp-content-header">已设置的账户信息<span class="fr" @click="openAddAccount"><i class="iconfont icon-xinzeng"></i>新增账户</span></p>-->
       <ul class="mp-list">

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/invoice/index.vue

@@ -139,7 +139,7 @@
 
           </div>
           <div class="fixedImg">
-            <img src="/images/mobile/center/invoice-spec2.png" v-if="inv.invoicetype === 1206"/>
+            <img src="/images/mobile/center/invoice-spec2.png" v-if="inv.invoicetype === 1205"/>
             <img src="/images/mobile/center/invoice-nor2.png" v-else/>
           </div>
         </li>

pages/mobile/center/vendor/payCenter.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="mobile-pay-center vendor-pay mobile-fix-content mobile-centerfix-content" :class="{'vendor-pay-record': switchType === 'record' && recordList.length}" id="mobileFixContent">
-    <div class="mp-head" v-if="!fromUserPage">
-      <span class="inline-block" :class="{'active': switchType === 'record'}" @click="setSwitchType('record')">交易记录</span>
-      <span class="inline-block" :class="{'active': switchType === 'account'}" @click="setSwitchType('account')">收款账户</span>
-    </div>
+    <!--<div class="mp-head" v-if="!fromUserPage">-->
+      <!--<span class="inline-block" :class="{'active': switchType === 'record'}" @click="setSwitchType('record')">交易记录</span>-->
+      <!--<span class="inline-block" :class="{'active': switchType === 'account'}" @click="setSwitchType('account')">收款账户</span>-->
+    <!--</div>-->
 
     <!-- 账户信息start -->
     <div class="mp-content" v-if="switchType == 'account'">
@@ -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;