add

8f2b5eab · linxin · 0755db30 · 8f2b5eab · 8f2b5eab · 8f2b5eab
Commit 8f2b5eab authored Feb 06, 2020 by linxin
30 changed files
--- a/config.xml
+++ b/config.xml
@@ -13,15 +13,12 @@
    <access launch-external="yes" origin="tel:*" />
    <allow-intent href="mailto:*" />
    <allow-intent href="tel:*" />
-    <allow-intent href="https://*/*" />
    <allow-navigation href="mailto:*" />
    <allow-navigation href="tel:*" />
    <allow-navigation href="http://wechat.hand-china.com/*" />
    <allow-navigation href="https://www.pgyer.com/*" />
-    <allow-navigation href="https://identity-test.qsign.cn/*" />
    <access launch-external="yes" origin="tel:*" />
    <access launch-external="yes" origin="sms:*" />
-    <access launch-external="yes" origin="https://identity-test.qsign.cn" />
    <preference name="ScrollEnabled" value="false" />
    <preference name="android-minSdkVersion" value="19" />
    <preference name="BackupWebStorage" value="none" />

--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -8,15 +8,10 @@ module.exports = merge(prodEnv, {
  debug: true,
  isMobilePlatform: false,
  loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
  rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
  ocrPath: '"http://180.104.121.66:8088/r/api"',
-<<<<<<< HEAD
  appId: '"com.xcmg.app"',
-  currentVersion: '"1.7.6"',
-=======
-  appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.7.3"',
->>>>>>> jeshi
+  currentVersion: '"1.7.9"',
 })
--- a/config/index.js
+++ b/config/index.js
@@ -28,13 +28,13 @@ module.exports = {
    assetsSubDirectory: 'static',
    assetsPublicPath: '/',
    proxyTable: {
-    //   '/xcmg_file': {
-    //   target: 'http://lichee.iask.in',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/xcmg_file': '/xcmg_file'
-    //   }
-    // },
+      '/xcmg_file': {
+      target: 'http://lichee.iask.in',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/xcmg_file': '/xcmg_file'
+      }
+    },
  },

    // Various Dev Server settings

--- a/config/uat.env.js
+++ b/config/uat.env.js
@@ -11,5 +11,5 @@ module.exports = {
  ocrPath:'"http://180.104.121.66:8088/r/api"',
  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
  appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.3.0"'
+  currentVersion: '"1.3.2"'
 }
--- a/src/pages/contractCreate/contract-create-list.vue
+++ b/src/pages/contractCreate/contract-create-list.vue
@@ -328,6 +328,7 @@ export default {
    },
    changeBase (item) {
      window.localStorage.setItem('bp_name_tenant', item.bp_name)
+      window.localStorage.setItem('credit_id', item.credit_id)
      if (this.num === 1) {
        window.localStorage.setItem('contractReadonly', false)
        window.localStorage.setItem('fromPage', 'list')

--- a/src/pages/contractCreate/creat-rent-info.vue
+++ b/src/pages/contractCreate/creat-rent-info.vue
@@ -365,6 +365,7 @@ export default {
        division_n: '',
        division: '',
        finance_amount: '',
+        credit_id: window.localStorage.credit_id,
      },
    }
  },
@@ -427,7 +428,7 @@ export default {
      vm.pagenum = 1
      vm.pagenumPolicy = 1
      vm.fromPage = window.localStorage.fromPage
-      vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
+      vm.saveInfo.project_id = window.localStorage.project_id // 重新赋值，防止缓存
      // vm.productInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
      if (from.name === 'CreateBaseInfo') {
        vm.isComputed = false
@@ -608,6 +609,7 @@ export default {
        vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
        vm.saveInfo.deposit_ratio = (vm.saveInfo.deposit_ratio_n.replace('%', '') / 100).toFixed(2)
        vm.saveInfo.finance_amount = vm.finance_amount
+        vm.saveInfo.credit_id = window.localStorage.credit_id
        let param = {
          master: vm.saveInfo,
        }

--- a/src/pages/contractCreate/sales-info.vue
+++ b/src/pages/contractCreate/sales-info.vue
@@ -170,6 +170,7 @@ export default {
        manu_manager: '', // 办事处业务员
        sale_date: '',
        project_id: '',
+        credit_id: '',
      },
    }
  },
@@ -181,6 +182,8 @@ export default {
            this.inflow_line = i.inflow_line
            this.inflow_used = i.inflow_used
            this.inflow_reset = i.inflow_reset
+            this.salesInfo.credit_id = i.credit_id
+            window.localStorage.setItem('credit_id', i.credit_id)
          }
        })
      },
@@ -349,7 +352,7 @@ export default {
    },

    // 主机厂选择
-    selectFactory () {
+    selectFactory (e) {
      let vm = this
      vm.hlsPopup.selectList({
        list: vm.factoryLists,

--- a/src/pages/contractInquire/repay-plans.vue
+++ b/src/pages/contractInquire/repay-plans.vue
@@ -24,9 +24,9 @@
          <h3><span>{{ info.lease_times }}</span>期</h3>
        </div>
        <div class="single">
-          <div><h4>保证金</h4><p>￥ {{ info.deposit | currency }}</p></div>
-          <div><h4>首付款</h4><p>￥ {{ info.down_payment | currency }}</p></div>
-          <div><h4>手续费</h4><p>￥ {{ parseFloat(info.lease_charge).toFixed(2) | currency }}</p></div>
+          <div><h4>保证金</h4><p> {{ info.deposit | currency }}</p></div>
+          <div><h4>首付款</h4><p> {{ info.down_payment | currency }}</p></div>
+          <div><h4>手续费</h4><p> {{ parseFloat(info.lease_charge).toFixed(2) | currency }}</p></div>
        </div>
      </div>
      <div class="plan-name">

--- a/src/pages/contractSigning/contract-repay-plan.vue
+++ b/src/pages/contractSigning/contract-repay-plan.vue
@@ -23,9 +23,9 @@
          <h3><span>{{ info.lease_times }}期</span></h3>
        </div>
        <div class="single">
-          <div><h4>保证金</h4><p>￥{{ info.deposit * product_num | currency }}</p></div>
-          <div><h4>首付款</h4><p>￥{{ info.down_payment * product_num | currency }}</p></div>
-          <div><h4>手续费</h4><p>￥{{ parseFloat(info.lease_charge * product_num).toFixed(2) | currency }}</p></div>
+          <div><h4>保证金</h4><p>{{ info.deposit * product_num | currency }}</p></div>
+          <div><h4>首付款</h4><p>{{ info.down_payment * product_num | currency }}</p></div>
+          <div><h4>手续费</h4><p>{{ parseFloat(info.lease_charge * product_num).toFixed(2) | currency }}</p></div>
        </div>
      </div>
      <div class="plan-name">

--- a/src/pages/contractStart/add-car.vue
+++ b/src/pages/contractStart/add-car.vue
@@ -237,6 +237,7 @@ export default {
      }
    },
  },
+
  data () {
    return {
      num: null,
@@ -355,6 +356,13 @@ export default {
      return `${y}-${m}-${d}`
    },
  },
+  watch: {
+    'downNum' (newVal, oldVal) {
+      if (!newVal) {
+        this.vehicleImg = ''
+      }
+    },
+  },
  created () {
    // this.showDate = this.carDate
  },
@@ -671,7 +679,7 @@ export default {
          vm.hlsPopup.showSuccess('申请成功')
          setTimeout(() => {
            vm.$router.push({
-              name: 'StartList',
+              name: 'MyInfo',
            })
          }, 2000)
        } else {

--- a/src/pages/distributorSign/financ-details.vue
+++ b/src/pages/distributorSign/financ-details.vue
@@ -23,9 +23,9 @@
          <h3><span>{{ info.lease_times }}期</span></h3>
        </div>
        <div class="single">
-          <div><h4>保证金</h4><p>￥{{ parseFloat(info.deposit*product_num).toFixed(2) | currency }}</p></div>
-          <div><h4>首付款</h4><p>￥{{ parseFloat(info.down_payment*product_num).toFixed(2) | currency }}</p></div>
-          <div><h4>手续费</h4><p>￥{{ parseFloat(info.lease_charge*product_num).toFixed(2) | currency }}</p></div>
+          <div><h4>保证金</h4><p>{{ parseFloat(info.deposit*product_num).toFixed(2) | currency }}</p></div>
+          <div><h4>首付款</h4><p>{{ parseFloat(info.down_payment*product_num).toFixed(2) | currency }}</p></div>
+          <div><h4>手续费</h4><p>{{ parseFloat(info.lease_charge*product_num).toFixed(2) | currency }}</p></div>
        </div>
      </div>
      <div class="plan-name">

--- a/src/pages/financingTrial/financing-details.vue
+++ b/src/pages/financingTrial/financing-details.vue
@@ -26,7 +26,7 @@
        <item>
          <div slot="name" class="font-color">融资金额</div>
          <span v-if="!equip_price" slot="content" class="autoColor">融资金额自动填充</span>
-          <span v-if="equip_price" slot="content">￥{{ parseFloat(equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100).toFixed(2) | currency }}</span>
+          <span v-if="equip_price" slot="content">{{ parseFloat(equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100).toFixed(2) | currency }}</span>
        </item>
        <item>
          <div slot="name" class="font-color">首付款比例</div>
@@ -35,7 +35,7 @@
        <item>
          <div slot="name" class="font-color">首付款</div>
          <span v-if="!equip_price" slot="content" class="autoColor">首付款金额自动填充</span>
-          <span v-if="equip_price" slot="content">￥{{ equip_price*info.down_payment_ratio_n.replace("%","")/100 | currency }}</span>
+          <span v-if="equip_price" slot="content">{{ equip_price*info.down_payment_ratio_n.replace("%","")/100 | currency }}</span>
        </item>
        <item>
          <div slot="name" class="font-color">保证金比例</div>
@@ -46,7 +46,7 @@
          <span v-if="!equip_price" slot="content" class="autoColor">保证金额自动填充</span>
          <span
            v-if="equip_price"
-            slot="content">￥{{ equip_price*info.deposit_ratio_n.replace("%","")/100 | currency }}</span>
+            slot="content">{{ equip_price*info.deposit_ratio_n.replace("%","")/100 | currency }}</span>
        </item>
        <item>
          <div slot="name" class="font-color">手续费比例</div>
@@ -55,7 +55,7 @@
        <item>
          <div slot="name" class="font-color">手续费</div>
          <span v-if="!equip_price" slot="content" class="autoColor">手续费金额自动填充</span>
-          <span v-if="equip_price" slot="content">￥{{ parseFloat((equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100)*(info.lease_charge_ratio_n.replace("%","")/100)).toFixed(2) | currency }}</span>
+          <span v-if="equip_price" slot="content">{{ parseFloat((equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100)*(info.lease_charge_ratio_n.replace("%","")/100)).toFixed(2) | currency }}</span>
        </item>
        <item>
          <div slot="name" class="font-color">保险押金</div>
@@ -67,7 +67,7 @@
          <div slot="name" class="font-color">首次付款合计</div>
          <span v-if="!equip_price" slot="content" class="autoColor">首次付款合计金额自动填充</span>
          <!-- 合计 = 首付款+保证金+手续费+GPS费用+保险押金  -->
-          <span v-if="equip_price" slot="content">￥{{ parseFloat(equip_price*info.down_payment_ratio_n.replace("%","")/100 + equip_price*info.deposit_ratio_n.replace("%","")/100 + (equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100)*(info.lease_charge_ratio_n.replace("%","")/100) + Number(gps_fee) + Number(insurance_fee)).toFixed(2) | currency }}</span>
+          <span v-if="equip_price" slot="content">{{ parseFloat(equip_price*info.down_payment_ratio_n.replace("%","")/100 + equip_price*info.deposit_ratio_n.replace("%","")/100 + (equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100)*(info.lease_charge_ratio_n.replace("%","")/100) + Number(gps_fee) + Number(insurance_fee)).toFixed(2) | currency }}</span>
        </item>
        <item @click.native="showTime('YYYY-MM-DD')">
          <div slot="name" class="fo             nt-color">预计付款日</div>

--- a/src/pages/financingTrial/trial-repay-plan.vue
+++ b/src/pages/financingTrial/trial-repay-plan.vue
@@ -23,9 +23,9 @@
          <h3><span>{{ info.lease_times }}期</span></h3>
        </div>
        <div class="single">
-          <div><h4>保证金</h4><p>￥{{ info.deposit | currency }}</p></div>
-          <div><h4>首付款</h4><p>￥{{ info.down_payment | currency }}</p></div>
-          <div><h4>手续费</h4><p>￥{{ info.lease_charge | currency }}</p></div>
+          <div><h4>保证金</h4><p>{{ info.deposit | currency }}</p></div>
+          <div><h4>首付款</h4><p>{{ info.down_payment | currency }}</p></div>
+          <div><h4>手续费</h4><p>{{ info.lease_charge | currency }}</p></div>
        </div>
      </div>
      <div class="plan-name">

--- a/src/pages/intoApproval/intoApproval/refund.vue
+++ b/src/pages/intoApproval/intoApproval/refund.vue
@@ -21,18 +21,18 @@
        <div class="top-detail">
          <div class="left">
            <span class="line">保证金</span>
-            <span>￥{{ info.deposit * product_num |currency }}</span>
+            <span>{{ info.deposit * product_num |currency }}</span>
          </div>
          <div class="right">
            <span class="line">首付款</span>
-            <span>￥{{ info.down_payment * product_num |currency }}</span>
+            <span>{{ info.down_payment * product_num |currency }}</span>
          </div>
        </div>
        <div class="clear" />
        <div class="top-detail">
          <div class="left">
            <span class="line">手续费</span>
-            <span>￥{{ parseFloat(info.lease_charge * product_num).toFixed(2) |currency }}</span>
+            <span>{{ parseFloat(info.lease_charge * product_num).toFixed(2) |currency }}</span>
          </div>
          <div class="right">
            <span class="line date-sum">合同期数</span>

--- a/src/pages/myInfo/my-info.vue
+++ b/src/pages/myInfo/my-info.vue
@@ -88,9 +88,9 @@
          </div>-->
          <div v-if="user_bp_type!=='FACTORY'" class="content-wrap" @click="goVideoSign">
            <span
-              v-if="vedioCount > 0"
-              :class="{'content-wrap-class-width':vedioCount>99, 'content-wrap-class':vedioCount<99}"
-            >{{ vedioCount > 99 ? '99+' : vedioCount }}</span>
+              v-if="faceSign > 0"
+              :class="{'content-wrap-class-width':faceSign>99, 'content-wrap-class':faceSign<99}"
+            >{{ faceSign > 99 ? '99+' : faceSign }}</span>
            <img src="@/assets/myInfo/unFace.png" >
            <p>待面签</p>
          </div>
@@ -196,8 +196,8 @@ export default {
      user_bp_type: '',
      signCount: '0',
      carNum: '0',
+      faceSign: '0',
      confirmCount: '0',
-      vedioCount: '0',
      productCount: '0',
      carCount: '0',
      description: '',
@@ -817,7 +817,6 @@ export default {
      if (vm.bp_id) {
        if (
          vm.user_bp_status === 'NEW' ||
-          vm.user_bp_status === 'REJECT' ||
          vm.user_bp_status === 'RETURN'
        ) {
          vm.flag = true
@@ -865,6 +864,32 @@ export default {
              },
            })
          }
+        } else if (
+          vm.user_bp_status === 'REJECT'
+        ) {
+          vm.flag = true
+          if (vm.user_bp_class === 'NP') {
+            vm.$router.push({
+              name: 'NPBaseInfo',
+              params: {
+                bp_id: this.bp_id,
+                isMultiRole: this.isMultiRole,
+                user_bp_name: this.user_bp_name,
+                status: 'APPROVED',
+              },
+            })
+          } else {
+            this.$router.push({
+              name: 'EnterpriseNew',
+              params: {
+                bp_id: this.bp_id,
+                isMultiRole: this.isMultiRole,
+                user_bp_name: this.user_bp_name,
+                bp_class: vm.user_bp_class,
+                status: 'APPROVED',
+              },
+            })
+          }
        } else if (vm.user_bp_status === 'APPROVING') {
          vm.flag = true
          this.hlsPopup.showLongCenter('您的绑定申请还在流程中')
@@ -932,6 +957,7 @@ export default {
            // vm.confirmCount = res.info.con_confirm_num
            vm.productCount = res.info.collect_num || 0
            vm.carCount = res.info.car_confirm_num || 0
+            vm.faceSign	= res.info.face_sign_num	 || 0
          }
        } else {
          this.hlsPopup.showLongCenter(res.message)

--- a/src/pages/pay/firstPay/contract-record.vue
+++ b/src/pages/pay/firstPay/contract-record.vue
@@ -12,7 +12,7 @@
          <div class="now-pay">
            <div class="title">当前应付</div>
            <div class="data">
-              <span>￥</span>
+              <!-- <span>￥</span> -->
              {{ money |currency }}
            </div>
          </div>
@@ -34,8 +34,8 @@
                <p>本次还款</p>
              </div>
              <div class="item-right">
-                <p>￥{{ parseFloat(e.due_amount).toFixed(2)|currency }}</p>
-                <p>￥{{ e.received_amount|currency }}</p>
+                <p>{{ parseFloat(e.due_amount).toFixed(2)|currency }}</p>
+                <p>{{ e.received_amount|currency }}</p>
              <CurrencyInput v-model="e.amount" placeholder="请输入还款金额"/></div>
            </div>
          </div>

--- a/src/pages/pay/firstPay/first-pay.vue
+++ b/src/pages/pay/firstPay/first-pay.vue
@@ -12,7 +12,7 @@
          <div class="now-pay">
            <div class="title">当前应付</div>
            <div class="data">
-              <span>￥</span>
+              <!-- <span>￥</span> -->
              {{ money |currency }}
            </div>
          </div>

--- a/src/pages/pay/firstPay/pay-entry.vue
+++ b/src/pages/pay/firstPay/pay-entry.vue
@@ -52,14 +52,14 @@
          <div class="info">
            <div class="info-item">
              <span>还款金额</span>
-              <span>¥{{ money |currency }}</span>
+              <span>{{ money |currency }}</span>
            </div>
            <div class="interest">
              <span>本次交易收取{{ rate }}%手续费</span>
            </div>
            <div class="info-item">
              <span>手续费</span>
-              <span>+¥{{ serviceCharge |currency }}</span>
+              <span>+{{ serviceCharge |currency }}</span>
            </div>
            <div class="info-item" @click="show=true">
              <span>支付渠道</span>
@@ -92,7 +92,7 @@
    <h-content class="entry-content">
      <div class="amount">
        <p>{{ userName }}</p>
-        <div>￥{{ sumMoney |currency }}</div>
+        <div>{{ sumMoney |currency }}</div>
      </div>
      <div class="info">
        <div class="info-item">

--- a/src/pages/pay/marginPay/first-pay.vue
+++ b/src/pages/pay/marginPay/first-pay.vue
@@ -12,7 +12,7 @@
          <div class="now-pay">
            <div class="title">当前应付</div>
            <div class="data">
-              <span>￥</span>
+              <!-- <span>￥</span> -->
              {{ money |currency }}
            </div>
          </div>
@@ -40,7 +40,7 @@
            </div>
            <div class="pay-input">
              <span>已还保证金</span>
-              <span style="text-align:right;display:inline-block;margin-right:5px;">￥{{ Paied|currency }}</span>
+              <span style="text-align:right;display:inline-block;margin-right:5px;">{{ Paied|currency }}</span>
              <!-- <div @click="createOrder">
                <img src="@/assets/payment/into.png" >
              </div>-->

--- a/src/pages/pay/marginPay/pay-entry.vue
+++ b/src/pages/pay/marginPay/pay-entry.vue
@@ -52,14 +52,14 @@
          <div class="info">
            <div class="info-item">
              <span>还款金额</span>
-              <span>¥{{ money |currency }}</span>
+              <span>{{ money |currency }}</span>
            </div>
            <div class="interest">
              <span>本次交易收取{{ rate }}%手续费</span>
            </div>
            <div class="info-item">
              <span>手续费</span>
-              <span>+¥{{ serviceCharge |currency }}</span>
+              <span>+{{ serviceCharge |currency }}</span>
            </div>
            <div class="info-item" @click="show=true">
              <span>支付渠道</span>
@@ -92,12 +92,12 @@
    <h-content class="entry-content">
      <div class="amount">
        <p>{{ userName }}</p>
-        <div>￥{{ sumMoney |currency }}</div>
+        <div>{{ sumMoney |currency }}</div>
      </div>
      <div class="info">
        <div class="info-item">
          <span>还款金额</span>
-          <span>¥{{ parseFloat(money).toFixed(2) |currency }}</span>
+          <span>{{ parseFloat(money).toFixed(2) |currency }}</span>
        </div>
        <div class="interest">
          <span>本次交易收取{{ rate }}%手续费</span>

--- a/src/pages/pay/pay-page.vue
+++ b/src/pages/pay/pay-page.vue
@@ -85,7 +85,7 @@
            </item>-->
            <div class="orderamount-wrap">
              <span class="orderamount-item">交易金额</span>
-              <span class="orderamount-item font-color">￥ {{ info.orderamount|currency }}</span>
+              <span class="orderamount-item font-color">{{ info.orderamount|currency }}</span>
            </div>
            <item>
              <div slot="name" class="name">支付方式</div>

--- a/src/pages/pay/payment/contract-record.vue
+++ b/src/pages/pay/payment/contract-record.vue
@@ -12,7 +12,7 @@
          <div class="now-pay">
            <div class="title">当前应付</div>
            <div class="data">
-              <span>￥</span>
+              <!-- <span>￥</span> -->
              {{ sumMoney |currency }}
            </div>
          </div>
@@ -48,7 +48,7 @@
                </div>
                <div>
                  <span>应还金额</span>
-                  <span class="orange">￥{{ detail.due_amount|currency }}</span>
+                  <span class="orange">{{ detail.due_amount|currency }}</span>
                </div>
              </div>
              <div class="list">
@@ -59,7 +59,7 @@

                <div>
                  <span>已还金额</span>
-                  <span class="blue">￥{{ detail.received_amount|currency }}</span>
+                  <span class="blue">{{ detail.received_amount|currency }}</span>
                </div>
              </div>
              <div class="list">
@@ -78,7 +78,7 @@
            <list-item :item-height="44">
              <item>
                <div slot="name">逾期利息</div>
-                <span slot="content">￥{{ money|currency }}</span>
+                <span slot="content">{{ money|currency }}</span>
              </item>
            </list-item>
          </div>

--- a/src/pages/pay/payment/new-list.vue
+++ b/src/pages/pay/payment/new-list.vue
@@ -12,7 +12,7 @@
          <div class="now-pay">
            <div class="title">当前应付</div>
            <div class="data">
-              <span>￥</span>
+              <!-- <span>￥</span> -->
              {{ money |currency }}
            </div>
          </div>
@@ -40,7 +40,7 @@
            </div>
            <div class="pay-input">
              <span>逾期利息</span>
-              <span class="currencySpan">￥{{ liquidated_damages|currency }}</span>
+              <span class="currencySpan">{{ liquidated_damages|currency }}</span>
            </div>
          </div>
        </div>

--- a/src/pages/pay/payment/pay-entry.vue
+++ b/src/pages/pay/payment/pay-entry.vue
@@ -19,7 +19,7 @@
          <div class="info">
            <div class="info-item">
              <span>还款金额</span>
-              <span>¥{{ money |currency }}</span>
+              <span>{{ money |currency }}</span>
            </div>
            <div class="interest">
              <span>本次交易收取{{ rate }}%手续费</span>
@@ -93,12 +93,12 @@
    <h-content class="entry-content">
      <div class="amount">
        <p>{{ userName }}</p>
-        <div>￥{{ sumMoney |currency }}</div>
+        <div>{{ sumMoney |currency }}</div>
      </div>
      <div class="info">
        <div class="info-item">
          <span>还款金额</span>
-          <span>¥{{ parseFloat(money).toFixed(2) |currency }}</span>
+          <span>{{ parseFloat(money).toFixed(2) |currency }}</span>
        </div>
        <div class="interest">
          <span>本次交易收取{{ rate }}%手续费</span>

--- a/src/pages/userBindNew/np/base-info.vue
+++ b/src/pages/userBindNew/np/base-info.vue
@@ -857,9 +857,11 @@ export default {
      window.localStorage.setItem('business_num', business_num)
      let url = process.env.basePath + 'bp_bind_check'
      let param = {
+        'master': {
          bp_class: 'NP',
          bp_type: vm.baseInfo.bp_type,
          business_num: business_num,
+        },
      }
      vm.hlsPopup.showLoading('正在校验数据有效性')
      vm.hlsHttp.post(url, param).then(function (res) {

--- a/src/pages/userBindNew/np/invoice-info.vue
+++ b/src/pages/userBindNew/np/invoice-info.vue
@@ -147,7 +147,7 @@ export default {
    save () {
      let vm = this
      let url = process.env.basePath + 'bp_invoice_save'
-      let name = window.localStorage.bp_type === 'TENANT' || window.localStorage.bp_type === 'GUTA' ? 'AccessoryInfo' : 'NPBankInfo'
+      let name = ((window.localStorage.bp_type === 'TENANT' || window.localStorage.bp_type === 'GUTA') && !window.localStorage.getItem('multipleRole')) || ((window.localStorage.multipleRole === 'TENANT' || window.localStorage.multipleRole === 'GUTA') && window.localStorage.getItem('multipleRole')) ? 'AccessoryInfo' : 'NPBankInfo'
      vm.invoiceInfo.bp_id = window.localStorage.getItem('bp_id')
      vm.invoiceInfo.bp_class = 'NP'
      let param = {
@@ -222,10 +222,10 @@ export default {
        code: 'bp_type',
        object: {},
        returnItem: function (index, obj) {
-          vm.$set(vm.invoiceInfo,'invoice_kind',obj.bp_type)
-          vm.$set(vm.invoiceInfo,'invoice_kind_n',obj.bp_type_n)
-          /*vm.invoiceInfo.invoice_kind = obj.bp_type
-          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n*/
+          vm.$set(vm.invoiceInfo, 'invoice_kind', obj.bp_type)
+          vm.$set(vm.invoiceInfo, 'invoice_kind_n', obj.bp_type_n)
+          /* vm.invoiceInfo.invoice_kind = obj.bp_type
+          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n */
        },
      })
    },
@@ -236,10 +236,10 @@ export default {
        code: 'bp_type',
        object: {},
        returnItem: function (index, obj) {
-          vm.$set(vm.invoiceInfo,'taxpayer_type',obj.bp_type)
-          vm.$set(vm.invoiceInfo,'taxpayer_type_n',obj.bp_type_n)
+          vm.$set(vm.invoiceInfo, 'taxpayer_type', obj.bp_type)
+          vm.$set(vm.invoiceInfo, 'taxpayer_type_n', obj.bp_type_n)
          /* vm.invoiceInfo.taxpayer_type = obj.bp_type
-          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n*/
+          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n */
        },
      })
    },

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/src/pages/userBindNew/org/baseInfo.vue
@@ -24,10 +24,10 @@
              placeholder="请选择"
              type="text"
              readonly
-              @click="selectIdType()"
+              @click="selectIdTypeOnly()"
            >
          </item>
-          <item v-if="isApproved&&isMultiRole&&!hasMultiRole" :showArrow="true" @click.native="selectIdType">
+          <item v-if="(isMultiRole&&!hasMultiRole)" :showArrow="true" @click.native="selectIdType">
            <div slot="name" class="required">客户类型</div>
            <div slot="content" class="typeBP">
              <span>{{ baseInfo.bp_type_n }}</span>
@@ -762,11 +762,16 @@ export default {
        vm.hlsHttp.post(url, param).then(function (res) {
          if (res.result === 'S') {
            vm.multiRoleList = res.lists
+            vm.type = '请输入业务经办员工代码'
+            vm.typeName = '业务经办人'
+            vm.bp_type_flag = true
            if (res.lists.length === 0 || res.lists.length === 1) {
              vm.hasMultiRole = false
            } else if (res.lists.length === 2) {
              vm.hasMultiRole = true
            }
+          } else {
+            vm.hasMultiRole = false
          }
        })
      }
@@ -900,9 +905,11 @@ export default {
      window.localStorage.setItem('business_num', business_num)
      let url = process.env.basePath + 'bp_bind_check'
      let param = {
+        'master': {
          bp_class: 'ORG',
          bp_type: vm.baseInfo.bp_type,
          business_num: business_num,
+        },
      }
      vm.hlsPopup.showLoading('正在校验数据有效性')
      vm.hlsHttp.post(url, param).then(function (res) {
@@ -1374,15 +1381,22 @@ export default {
                code_name: item.bp_type_n,
              }
            })
-            // vm.typeList = res.lists.map(item => {
-            //   return {
-            //     code: item.bp_type,
-            //     code_name: item.bp_type_n,
-            //   }
-            // })
        }
      })
    },
+    selectIdTypeOnly (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.typeList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.baseInfo.bp_type = obj.bp_type
+          vm.baseInfo.bp_type_n = obj.bp_type_n
+        },
+      })
+      vm.isSelected = true
+    },
    getbaseInfo () {
      let vm = this
      let url = process.env.basePath + 'bp_org_info_query'
@@ -1438,6 +1452,9 @@ export default {
        if (res.result === 'S') {
          hlsPopup.showLongCenter('新增成功')
          vm.isAddNewType = false
+          vm.type = '请输入业务经办员工代码'
+          vm.typeName = '业务经办人'
+          vm.bp_type_flag = true
          let item = vm.multiBpTypeSelectList.pop()
          vm.multiRoleList.push(item)
        } else {

--- a/src/pages/userBindNew/org/invoice.vue
+++ b/src/pages/userBindNew/org/invoice.vue
@@ -148,7 +148,7 @@ export default {
        }
        vm.addRows(this.invoiceInfo.invoice_adds)
        vm.addRowsLive(this.invoiceInfo.open_bank)
-      }*/
+      } */
    })
  },
  created () {
@@ -235,10 +235,10 @@ export default {
        code: 'bp_type',
        object: {},
        returnItem: function (index, obj) {
-          vm.$set(vm.invoiceInfo,'taxpayer_type',obj.bp_type)
-          vm.$set(vm.invoiceInfo,'taxpayer_type_n',obj.bp_type_n)
-          /*vm.invoiceInfo.taxpayer_type = obj.bp_type
-          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n*/
+          vm.$set(vm.invoiceInfo, 'taxpayer_type', obj.bp_type)
+          vm.$set(vm.invoiceInfo, 'taxpayer_type_n', obj.bp_type_n)
+          /* vm.invoiceInfo.taxpayer_type = obj.bp_type
+          vm.invoiceInfo.taxpayer_type_n = obj.bp_type_n */
          console.log('obj', vm.invoiceInfo)
        },
      })
@@ -250,10 +250,10 @@ export default {
        code: 'bp_type',
        object: {},
        returnItem: function (index, obj) {
-          vm.$set(vm.invoiceInfo,'invoice_kind',obj.bp_type)
-          vm.$set(vm.invoiceInfo,'invoice_kind_n',obj.bp_type_n)
+          vm.$set(vm.invoiceInfo, 'invoice_kind', obj.bp_type)
+          vm.$set(vm.invoiceInfo, 'invoice_kind_n', obj.bp_type_n)
          /* vm.invoiceInfo.invoice_kind = obj.bp_type
-          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n*/
+          vm.invoiceInfo.invoice_kind_n = obj.bp_type_n */
        },
      })
    },
@@ -267,6 +267,7 @@ export default {
      // })
      let vm = this
      let url = process.env.basePath + 'bp_invoice_save'
+      let name = ((window.localStorage.bp_type === 'TENANT' || window.localStorage.bp_type === 'GUTA') && !window.localStorage.getItem('multipleRole')) || ((window.localStorage.multipleRole === 'TENANT' || window.localStorage.multipleRole === 'GUTA') && window.localStorage.getItem('multipleRole')) ? 'Enclosure' : 'BankInfo'
      let param = {
        bp_id: vm.bp_id,
        bp_class: 'ORG',
@@ -279,7 +280,7 @@ export default {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          vm.$router.push({
-            name: 'Enclosure',
+            name: name,
            params: {
              bp_id: vm.bp_id,
            },

--- a/src/scripts/filter.js
+++ b/src/scripts/filter.js
@@ -22,19 +22,19 @@ export default (Vue) => {
      return '¥' + intPartFormat + floatPart
    }
  })
-  Vue.filter('datetime', timestamp => {
-    function format (number) {
-      return number.toString().padStart(2, '0')
-    }
-    const date = new Date(Number.parseInt(timestamp, 10))
-    const YYYY = date.getFullYear()
-    const MM = date.getMonth() + 1
-    const DD = date.getDate()
-    const hh = date.getHours()
-    const mm = date.getMinutes()
-    const ss = date.getSeconds()
-    return `${YYYY}-${format(MM)}-${format(DD)} ${format(hh)}:${format(mm)}:${format(ss)}`
-  })
+  // Vue.filter('datetime', timestamp => {
+  //   function format (number) {
+  //     return number.toString().padStart(2, '0')
+  //   }
+  //   const date = new Date(Number.parseInt(timestamp, 10))
+  //   const YYYY = date.getFullYear()
+  //   const MM = date.getMonth() + 1
+  //   const DD = date.getDate()
+  //   const hh = date.getHours()
+  //   const mm = date.getMinutes()
+  //   const ss = date.getSeconds()
+  //   return `${YYYY}-${format(MM)}-${format(DD)} ${format(hh)}:${format(mm)}:${format(ss)}`
+  // })
  Vue.filter('dateFormat', timestamp => {
    if (timestamp) {
      var newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(timestamp)

--- a/www/index.html
+++ b/www/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.f58ed53b77dd9688afcb4aac3ccef204.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.5b23605dc2d9cfefc737.js></script><script type=text/javascript src=./static/js/vendor.2b6d8679f4588e47d05c.js></script><script type=text/javascript src=./static/js/app.e6d07561780cc63dc20d.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.813fb585b434370087b9bd24247694c0.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.5b23605dc2d9cfefc737.js></script><script type=text/javascript src=./static/js/vendor.9516a64f4eb2c109f0d8.js></script><script type=text/javascript src=./static/js/app.d1f3d6a5cac3e638d101.js></script></body></html>
\ No newline at end of file