'23号问题修复'

src/pages/distributorSign/contract-details.vue

@@ -78,15 +78,15 @@
         </item>
         <item>
           <div slot="name" class="font-color">设备总价</div>
-          <span slot="content">{{ info.equip_price|NumFormat }}</span>
+          <span slot="content">{{ info.equip_price * info.product_num | NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">融资金额</div>
-          <span slot="content">{{ info.finance_amount|NumFormat }}</span>
+          <span slot="content">{{ info.finance_amount * info.product_num | NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">首付款</div>
-          <span slot="content">{{ info.down_payment|NumFormat }}</span>
+          <span slot="content">{{ info.down_payment * info.product_num | NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">保证金比例</div>
@@ -94,7 +94,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">保证金</div>
-          <span slot="content">{{ info.deposit|NumFormat }}</span>
+          <span slot="content">{{ info.deposit * info.product_num | NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">手续费比例</div>
@@ -102,11 +102,19 @@
         </item>
         <item>
           <div slot="name" class="font-color">手续费</div>
-          <span slot="content">{{ info.lease_charge|NumFormat }}</span>
+          <span slot="content">{{ info.lease_charge * info.product_num | NumFormat }}</span>
+        </item>
+        <item>
+          <div slot="name" class="font-color">保险押金</div>
+          <span slot="content">{{ info.insurance_fee * info.product_num | NumFormat }}</span>
+        </item>
+        <item>
+          <div slot="name" class="font-color">GPS费用</div>
+          <span slot="content">{{ info.gps_fee * info.product_num | NumFormat }}</span>
         </item>
         <item>
           <div slot="name">首次付款合计</div>
-          <span slot="content">{{ info.first_pay|NumFormat }}</span>
+          <span slot="content">{{ info.first_pay * info.product_num | NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">预计付款日</div>
@@ -188,13 +196,13 @@
         </item>
       </list-item>
     </h-content>
-    <bottom-tab v-if="confirm_status!=='APPROVED'&&this.$route.params.hasButtom" class="footer-button">
+    <bottom-tab v-if="confirm_status!=='APPROVED'&& (this.$route.params.hasButtom || hasButtomStorage)" class="footer-button">
       <tab-button class="approve" @click.native="showModalValue=true">
         <img src="@/assets/intoApproval/approve.png" >审批
       </tab-button>
     </bottom-tab>
     <h-modal
-      v-if="confirm_status!=='APPROVED'&&this.$route.params.hasButtom" ref="modal" v-model="showModalValue" position="bottom">
+      v-if="confirm_status!=='APPROVED'&& (this.$route.params.hasButtom || hasButtomStorage)" ref="modal" v-model="showModalValue" position="bottom">
       <h-view>
         <h-content class="approveContent">
           <div class="approveBottom">
@@ -253,6 +261,7 @@ export default {
   },
   data () {
     return {
+      hasButtomStorage: window.localStorage.getItem('hasButtom'),
       showModalValue: false,
       info: {},
       tabNum: 0,
@@ -376,6 +385,7 @@ export default {
        params: {
          project_id: window.sessionStorage.getItem('project_id'),
          confirm_status: this.confirm_status,
+         product_num: this.info.product_num
        },
      })
    },

src/pages/distributorSign/financ-details.vue

@@ -20,18 +20,18 @@
         <div class="top-detail">
           <div class="left">
             <span class="line">保证金</span>
-            <span>￥{{ info.deposit|NumFormat }}</span>
+            <span>￥{{ info.deposit * product_num |NumFormat }}</span>
           </div>
           <div class="right">
             <span class="line">首付款</span>
-            <span>￥{{ info.down_payment|NumFormat }}</span>
+            <span>￥{{ info.down_payment * product_num |NumFormat }}</span>
           </div>
         </div>
         <div class="clear" />
         <div class="top-detail">
           <div class="left">
             <span class="line">手续费</span>
-            <span>￥{{ info.lease_charge|NumFormat }}</span>
+            <span>￥{{ info.lease_charge * product_num |NumFormat }}</span>
           </div>
           <div class="right">
             <span class="line">合同期数</span>
@@ -52,7 +52,7 @@
           <td>{{ index+1 }}</td>
           <td>{{ dateConverse(item.due_date) }}</td>
           <td>租金</td>
-          <td>{{ item.rental|NumFormat }}</td>
+          <td>{{ item.rental * product_num |NumFormat }}</td>
         </tr>
       </table>
     </h-content>
@@ -86,6 +86,7 @@ export default {
   data () {
     return {
       confirm_status: this.$route.params.confirm_status,
+      product_num: this.$route.params.product_num,
       info: {
         finance_amount: '',
         lease_charge: '',
@@ -130,6 +131,7 @@ export default {
       } else {
         confirmStatus = false
       }
+      window.localStorage.setItem('hasButtom', confirmStatus)
       this.$router.replace({
         name: 'ContractDetails',
         params: {

src/pages/intoApproval/intoApproval/base.vue

@@ -342,13 +342,13 @@
       <RentInfo v-show="tabNum==1" :confirm_status="confirm_status"/>
       <AccessoryInfo v-show="tabNum==2" @down="getDown" />
     </h-content>
-    <bottom-tab v-if="confirm_status!=='APPROVED'&&this.$route.params.hasButtom" class="footer-button">
+    <bottom-tab v-if="confirm_status!=='APPROVED'&& (this.$route.params.hasButtom || hasButtomStorage)" class="footer-button">
       <tab-button class="approve" @click.native="showModalValue=true">
         <img src="@/assets/intoApproval/approve.png" >审批
       </tab-button>
     </bottom-tab>
     <h-modal
-      v-if="confirm_status!=='APPROVED'&&this.$route.params.hasButtom" ref="modal" v-model="showModalValue" position="bottom"
+      v-if="confirm_status!=='APPROVED'&& (this.$route.params.hasButtom || hasButtomStorage)" ref="modal" v-model="showModalValue" position="bottom"
       cus-class="sign-modal">
       <h-view>
         <h-content class="approveContent">
@@ -385,6 +385,7 @@ export default {
   },
   data () {
     return {
+      hasButtomStorage: window.localStorage.getItem('hasButtom'),
       showModalValue: false,
       downNum: 0,
       tabNum: 0,
@@ -450,6 +451,7 @@ export default {
     },
   },
   created () {
+    console.log(this.hasButtomStorage)
     if (this.bp_class === 'NP') {
       this.getNPBase()
     } else if (this.bp_class === 'ORG') {

src/pages/intoApproval/intoApproval/refund.vue

@@ -21,18 +21,18 @@
         <div class="top-detail">
           <div class="left">
             <span class="line">保证金</span>
-            <span>￥{{ info.deposit|NumFormat }}</span>
+            <span>￥{{ info.deposit * product_num |NumFormat }}</span>
           </div>
           <div class="right">
             <span class="line">首付款</span>
-            <span>￥{{ info.down_payment|NumFormat }}</span>
+            <span>￥{{ info.down_payment * product_num |NumFormat }}</span>
           </div>
         </div>
         <div class="clear" />
         <div class="top-detail">
           <div class="left">
             <span class="line">手续费</span>
-            <span>￥{{ info.lease_charge|NumFormat }}</span>
+            <span>￥{{ info.lease_charge * product_num |NumFormat }}</span>
           </div>
           <div class="right">
             <span class="line date-sum">合同期数</span>
@@ -132,6 +132,7 @@ export default {
       } else {
         confirmStatus = false
       }
+      window.localStorage.setItem('hasButtom', confirmStatus)
       this.$router.replace({
         name: 'Base',
         params: {

src/pages/intoApproval/intoApproval/rentInfo.vue

@@ -40,6 +40,14 @@
         <div slot="name">手续费</div>
         <span slot="content">{{ rentInfo.lease_charge * rentInfo.product_num |NumFormat }}</span>
       </item>
+      <item>
+        <div slot="name">保险押金</div>
+        <span slot="content">{{ rentInfo.insurance_fee * rentInfo.product_num | NumFormat }}</span>
+      </item>
+      <item>
+        <div slot="name">GPS费用</div>
+        <span slot="content">{{ rentInfo.gps_fee * rentInfo.product_num | NumFormat }}</span>
+      </item>
       <item>
         <div slot="name">首次付款合计</div>
         <span slot="content">{{ rentInfo.first_pay * rentInfo.product_num |NumFormat }}</span>

src/pages/userBind/np/bankInfo.vue

@@ -16,7 +16,7 @@
             <span class="sum">(共{{ getBankList.length }}张)</span>
           </span>
         </div>
-        <img src="@/assets/userBind/add.png" class="icon-right" @click="sendFlag" >
+        <img src="@/assets/userBind/add.png" class="icon-right" @click="sendFlag(true)" >
       </div>
       <div class="clear" />
       <div class="card-content">
@@ -62,13 +62,13 @@ export default {
     }
   },
   methods: {
-    sendFlag () {
+    sendFlag (isClear) {
       this.showModalValue = true
-      this.$emit('getInfo', this.showModalValue)
+      this.$emit('getInfo', this.showModalValue, isClear)
     },
     sendList (a) {
       this.$emit('getList', a)
-      this.sendFlag()
+      this.sendFlag(false)
     },
     changeBgImg (item) {
       if (item.bank_full_name === '中国农业银行') {

src/pages/userBind/np/naturePerson.vue

@@ -296,7 +296,7 @@
           </list-item>
         </div>
       </h-view>
-      <bottom-tab v-if="!from" class="add-box">
+      <bottom-tab v-if="!isApproved" class="add-box">
         <tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
       </bottom-tab>
     </h-modal>
@@ -1000,7 +1000,10 @@ export default {
     hideModal () {
       this.showModalValue = false
     },
-    getInfo (i) {
+    getInfo (i, isClear) {
+      if(isClear){
+        this.bank = {}
+      }
       this.showModalValue = i
     },
     getList (a) {

src/pages/userBind/org/bankInfo.vue

@@ -23,7 +23,7 @@
             <span class="sum">(共{{ getBankList.length }}张)</span>
           </span>
         </div>
-        <img src="@/assets/userBind/add.png" class="icon-right" @click="sendFlag" >
+        <img src="@/assets/userBind/add.png" class="icon-right" @click="sendFlag(true)" >
       </div>
       <div class="clear" />
       <div class="card-content">
@@ -69,13 +69,13 @@ export default {
     }
   },
   methods: {
-    sendFlag () {
+    sendFlag (isClear) {
       this.showModalValue = true
-      this.$emit('getInfo', this.showModalValue)
+      this.$emit('getInfo', this.showModalValue, isClear)
     },
     sendList (a) {
       this.$emit('getList', a)
-      this.sendFlag()
+      this.sendFlag(false)
     },
     changeBgImg (item) {
       if (item.bank_full_name === '中国农业银行') {

src/pages/userBind/org/enterprise.vue

@@ -405,7 +405,7 @@
           </list-item>
         </div>
       </h-view>
-      <bottom-tab v-if="!from" class="add-box">
+      <bottom-tab v-if="!isApproved" class="add-box">
         <tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
       </bottom-tab>
     </h-modal>
@@ -725,7 +725,7 @@ export default {
 
                   vm.hlsHttp.post(url, param).then(function (res) {
                     console.log('银行卡查询', res)
-                    vm.getBankList = [...vm.getBankList, ...res.lists]
+                    vm.getBankList = res.lists
                   })
                 }
               })
@@ -958,7 +958,10 @@ export default {
     hideModal () {
       this.showModalValue = false
     },
-    getInfo (i) {
+    getInfo (i, isClear) {
+      if(isClear){
+        this.bank_lists = {}
+      }
       this.showModalValue = i
     },
     getList (i) {