''

config/prod.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"',
-  currentVersion: '"1.0.2"'
+  currentVersion: '"1.0.3"'
 }

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_DEV&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.2.9"'
+  currentVersion: '"1.3.2"'
 }

src/components/currencyInput.vue

@@ -19,6 +19,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    content: {
+      type: String,
+      default: '',
+    },
   },
 
   data () {
@@ -36,7 +40,9 @@ export default {
     formatValue () {
       let currency = this.$options.filters['currency']
       if (!this.focused) {
-        return `￥${currency(this.value)}`
+        if (this.value !== '0.00' && this.value !== '' && this.value !== null) {
+          return `￥${currency(this.value)}`
+        }
       } else {
         return this.value
       }
@@ -55,14 +61,6 @@ export default {
       let value = event.target.value
       event.target.value = ''
       event.target.value = value
-  /*    if (document.selection) {
-        var sel = value.createTextRange()
-        sel.moveStart('character', value.length)
-        sel.collapse()
-        sel.select()
-      } else if (typeof value.selectionStart === 'number' && typeof value.selectionEnd === 'number') {
-        value.selectionStart = value.selectionEnd = value.length
-      }*/
       setTimeout(function () {
         event.target.type = 'number'
         event.target.focus()

src/pages/carConfirm/confirm-detail.vue

@@ -262,7 +262,7 @@ export default {
         data_class: 'LEASE_ITEM',
       }
       vm.hlsPopup.showLoading('请稍后!')
-      let res = vm.hlsHttp.post(url, param)
+      let res = await vm.hlsHttp.post(url, param)
       vm.hlsPopup.hideLoading()
       if (res.result === 'S') {
         return true

src/pages/contractCreate/contract-create-list.vue

@@ -321,6 +321,7 @@ export default {
       })
     },
     changeBase (item) {
+      window.localStorage.setItem('bp_name_tenant', item.bp_name)
       if (this.num === 1) {
         window.localStorage.setItem('contractReadonly', false)
         window.localStorage.setItem('fromPage', 'list')

src/pages/contractCreate/creat-rent-info.vue

@@ -43,7 +43,7 @@
         </item>
         <item>
           <div slot="name">产品数量</div>
-          <input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请填写产品数量">
+          <input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量">
         </item>
       </list-item>
       <div class="userInfo">融资信息</div>
@@ -61,11 +61,11 @@
         </item>
         <item>
           <div slot="name">设备单价</div>
-          <CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="0"/>
+          <CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="请输入设备单价"/>
         </item>
         <item>
           <div slot="name">融资金额</div>
-          <CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="0"/>
+          <CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="请输入融资信息"/>
         </item>
         <item>
           <div slot="name">首付比例</div>
@@ -74,7 +74,7 @@
         <item>
           <div slot="name">首付款</div>
           <CurrencyInput
-            slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="0"
+            slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="请输入首付款"
             @input="changeRatio"/>
         </item>
         <item>
@@ -84,7 +84,7 @@
         <item>
           <div slot="name">保证金</div>
           <CurrencyInput
-            slot="content" v-model="saveInfo.deposit" :readonly="isReadOnly" placeholder="0"
+            slot="content" v-model="saveInfo.deposit" :readonly="isReadOnly" placeholder="请输入保证金"
             @input="changeDeposit"/>
         </item>
         <item>
@@ -94,16 +94,16 @@
         <item>
           <div slot="name">手续费</div>
           <CurrencyInput
-            slot="content" v-model="saveInfo.lease_charge" :readonly="isReadOnly" placeholder="0"
+            slot="content" v-model="saveInfo.lease_charge" :readonly="isReadOnly" placeholder="请输入手续费"
             @input="changeLeaseCharge"/>
         </item>
         <item>
           <div slot="name">GPS费用</div>
-          <CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="0"/>
+          <CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="请输入GPS费用"/>
         </item>
         <item>
           <div slot="name">保险押金</div>
-          <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="0"/>
+          <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="请输入保险押金"/>
         </item>
         <item v-if="!isReadOnly" class="date-check" @click.native="showTime('YYYY-MM-DD')">
           <div slot="name">预计付款日</div>
@@ -123,7 +123,7 @@
         </item>
         <item>
           <div slot="name">租赁期数</div>
-          <input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请填写租赁期数">
+          <input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请输入租赁期数">
         </item>
         <item>
           <div slot="name">年利率</div>
@@ -143,7 +143,7 @@
         </item>
         <item>
           <div slot="name">留购价</div>
-          <CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请填写留购价"/>
+          <CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请输入留购价"/>
         </item>
         <item :showArrow="true" @click.native="goPlan">
           <div slot="name">查看还款计划</div>
@@ -281,6 +281,7 @@ export default {
          }, */
       saveInfo: {
         project_id: window.localStorage.project_id,
+        bp_name: '',
         product_id: '',
         product_id_n: '',
         product_num: '',
@@ -367,6 +368,7 @@ export default {
         vm.calculeFlag = false
         vm.salesEnter = vm.$route.params.salesEnter
         vm.bp_agent_id = vm.$route.params.bp_agent_id
+        vm.saveInfo.bp_name = window.localStorage.bp_name_tenant
         vm.saveTed = false
         if (vm.fromPage === 'sale') {
           vm.fromList = false
@@ -375,7 +377,7 @@ export default {
           vm.rentInfoQuery()
         }
         Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
-          if (i !== 'project_id') {
+          if (i !== 'project_id' && i !== 'bp_name') {
             vm.saveInfo[i] = ''
           }
         })
@@ -534,6 +536,7 @@ export default {
           if (res.result === 'S') {
             vm.isComputed = true
             vm.calculeFlag = true
+            vm.saveTed = true
             hlsPopup.showLongCenter('计算成功')
             vm.goPlan()
           } else {
@@ -571,7 +574,6 @@ export default {
         })
       } else {
         if (vm.isComputed) {
-          vm.saveTed = true
           vm.$router.push({
             name: 'CreateEnclosureInfo',
           })

src/pages/contractCreate/create-base-info.vue

@@ -276,24 +276,39 @@
           <img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson">
         </div>
       </div>
-      <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
-        <list-item :item-height="68">
-          <item>
-            <span slot="left-icon" class="left-icon">{{ index+1 }}</span>
-            <div slot="name">
-              担保人{{ index+1 }}姓名
-              <br >证件号
-            </div>
-            <div slot="content">
-              <input v-model="item.bp_name" placeholder="暂无信息" readonly >
-              <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
-            </div>
-          </item>
-        </list-item>
-        <div slot="buttons">
-          <option-button type="warn" text @click.native="deleteFun(item)" />
-        </div>
-      </item-option>
+      <div v-if="!fromPutted" >
+        <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
+          <list-item :item-height="68">
+            <item>
+              <span slot="left-icon" class="left-icon">{{ index+1 }}</span>
+              <div slot="name">
+                担保人{{ index+1 }}姓名
+                <br >证件号
+              </div>
+              <div slot="content">
+                <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
+                <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
+              </div>
+            </item>
+          </list-item>
+          <div slot="buttons">
+            <option-button type="warn" text @click.native="deleteFun(item)" />
+          </div>
+        </item-option>
+      </div>
+      <list-item v-if="fromPutted" :item-height="68">
+        <item v-for="(item,index) in selectUdertake" :key="index">
+          <span slot="left-icon" class="left-icon">{{ index+1 }}</span>
+          <div slot="name">
+            担保人{{ index+1 }}姓名
+            <br >证件号
+          </div>
+          <div slot="content">
+            <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
+            <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
+          </div>
+        </item>
+      </list-item>
     </h-content>
     <bottom-tab class="add-box">
       <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
@@ -321,7 +336,7 @@ export default {
       bp_agent_id: '',
       pageNum: 1,
       pageNumSearch: 1,
-      status: window.localStorage.contractReadonly,
+      status: '', // 是否为已提交
       BussinessSituationList: [], // 行业情况
       jobSituationList: [], // 职业情况
       houseInfonList: [], // 房产信息
@@ -365,6 +380,26 @@ export default {
       },
       immediate: true,
     },
+    'saveInfo.abc_deduction_flag': {
+      handler (newVal, oldVal) {
+        if (newVal === 'N') {
+          this.checked = false
+        } else if (newVal === 'Y') {
+          this.checked = true
+        }
+      },
+      immediate: true,
+    },
+    'saveInfo.special_flag': {
+      handler (newVal, oldVal) {
+        if (newVal === 'N') {
+          this.checkedApproved = false
+        } else if (newVal === 'Y') {
+          this.checkedApproved = true
+        }
+      },
+      immediate: true,
+    },
     'checkedApproved': {
       handler (newVal, oldVal) {
         if (newVal === false) {
@@ -384,20 +419,21 @@ export default {
       vm.salesEnter = ''
       vm.saveTed = false
       vm.showModalValue = false
-      vm.checked = false // 农行代扣
-      vm.checkedApproved = false // 是否特批
       vm.pageNum = 1
       vm.pageNumSearch = 1
       vm.undertakeList = []
       vm.bp_class = window.localStorage.bp_class_tenant
+      vm.status = window.localStorage.contractReadonly
       vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
       if (from.name === 'SalesInfo') {
         vm.salesEnter = 'SalesInfo'
         vm.fromPutted = false
+        vm.checked = false // 农行代扣
+        vm.checkedApproved = false // 是否特批
         Object.keys(vm.saveInfo).forEach(i => {
           if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') {
             vm.saveInfo[i] = ''
-          } else if (i === 'abc_deduction_flag' && i === 'special_flag') {
+          } else if (i === 'abc_deduction_flag' || i === 'special_flag') {
             vm.saveInfo[i] = 'N'
           } else if (i === 'bp_id') {
             vm.saveInfo[i] = window.localStorage.bp_id_tenant
@@ -823,7 +859,7 @@ export default {
     deleteFun (e) {
       let deleteIndex
       this.selectUdertake.forEach((i, index, arr) => {
-        if (arr[index].bp_name.indexOf(e.bp_name) !== -1) {
+        if (arr[index].bp_name.indexOf(e.bp_guta_name) !== -1) {
           deleteIndex = index
         }
       })

src/pages/contractCreate/create-enclosure-info.vue

@@ -101,7 +101,7 @@
     </h-content>
     <bottom-tab class="add-box">
       <tab-button class="before" @click.native="handSave">保存</tab-button>
-      <tab-button class="next" @click.native="handleSubmit">提交</tab-button>
+      <tab-button class="next" @click.native="isSubmit">提交</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -500,23 +500,36 @@ export default {
     handSave () {
       hlsPopup.showLongCenter('保存成功！')
     },
+    isSubmit () {
+      let vm = this
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确定提交吗？',
+        onConfirm: data => {
+          if (data === 1) {
+            this.handleSubmit()
+          }
+        },
+      })
+    },
     // 项目提交审批
     handleSubmit () {
       let vm = this
       let url = process.env.basePath + 'prj_project_submit'
       let param = {
         project_id: window.localStorage.project_id,
-        phone:window.localStorage.getItem('user_phone'),
+        phone: window.localStorage.getItem('user_phone'),
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        console.log('项目提交审批', res)
         if (res.result === 'S') {
+          vm.hlsPopup.showSuccess('提交成功')
           vm.$router.push({
-            name: 'MyInfo',
+            name: 'ContractCreateList',
           })
-          // vm.showLists = res.lists
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
         }
       })
     },

src/pages/contractCreate/sales-info.vue

@@ -144,6 +144,7 @@ export default {
       office_name: '', // 办事处
       factory_name: '',
       business: '',
+      factoty: '', // 主机厂列表
       showModal: false,
       showLists: [],
       user_bp_type: '', // 客户类型
@@ -168,6 +169,18 @@ export default {
     }
   },
   watch: {
+    'salesInfo.factory': {
+      handler (newVal, oldVal) {
+        this.factoty.forEach(i => {
+          if (i.bp_factory_id === this.salesInfo['factory']) {
+            this.inflow_line = i.inflow_line
+            this.inflow_used = i.inflow_used
+            this.inflow_reset = i.inflow_reset
+          }
+        })
+      },
+      immediate: true,
+    },
   },
   activated () {
 
@@ -309,7 +322,7 @@ export default {
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        console.log('主机厂', res)
+        vm.factoty = res.lists
         if (res.result === 'S') {
           vm.factoryLists = res.lists.map(item => {
             return {
@@ -436,6 +449,7 @@ export default {
       this.showModal = false
       window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
       window.localStorage.setItem('bp_class_tenant', item.bp_class)
+      window.localStorage.setItem('bp_name_tenant', item.bp_name)
     },
     hideModal () {
       this.showModal = false
@@ -456,7 +470,7 @@ export default {
         hlsPopup.showLongCenter('办事处不能为空!')
       } else if (!vm.factory_name) {
         hlsPopup.showLongCenter('主机厂不能为空!')
-      } else if (!vm.manu_manager) {
+      } else if (!vm.salesInfo.manu_manager) {
         hlsPopup.showLongCenter('主机厂业务员不能为空!')
       } else if (!vm.salesInfo.dates) {
         hlsPopup.showLongCenter('签约日期不能为空!')

src/pages/contractSigning/contract-detail.vue

@@ -445,14 +445,14 @@ export default {
     // 签约校验
     async signCheck () {
       let vm = this
+      hlsPopup.showLoading('请稍候')
       let url = process.env.basePath + 'sign_check'
       let param = {
         confirm_id: vm.confirm_id,
         data_class: 'PRJ_PROJECT',
       }
-      vm.hlsPopup.showLoading('请稍后!')
-      let res = vm.hlsHttp.post(url, param)
-      vm.hlsPopup.hideLoading()
+      let res = await vm.hlsHttp.post(url, param)
+      hlsPopup.hideLoading()
       if (res.result === 'S') {
         return true
       } else {

src/pages/contractStart/add-car.vue

@@ -472,11 +472,11 @@ export default {
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
+        if (res.code === '00') {
           vm.hlsPopup.showSuccess('保存成功')
-          vm.getEquipment()
           setTimeout(() => {
             vm.downNum = false
+            vm.getEquipment()
           }, 2000)
         } else {
           hlsPopup.showLongCenter(res.message)

src/pages/distributorSign/contract-details.vue

@@ -270,7 +270,7 @@ export default {
         data_class: 'PRJ_PROJECT',
       }
       vm.hlsPopup.showLoading('请稍后!')
-      let res = vm.hlsHttp.post(url, param)
+      let res = await vm.hlsHttp.post(url, param)
       vm.hlsPopup.hideLoading()
       if (res.result === 'S') {
         return true

src/pages/pay/marginPay/first-pay.vue

@@ -30,14 +30,14 @@
               <CurrencyInput v-model="money" type="number" placeholder="请输入支付金额" />
               <!-- <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
-              </div> -->
+              </div>-->
             </div>
           </div>
         </div>
         <div class="write">
           <div class="box">
             <span>备注</span>
-            <textarea placeholder="请输入您的备注……" />
+            <textarea v-model="pay_note" placeholder="请输入您的备注……" />
           </div>
         </div>
       </section>
@@ -53,7 +53,7 @@
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="footer" @click.native="toPayEntry(money)">支&nbsp;&nbsp;付</tab-button>
+      <tab-button class="footer" @click.native="putOrder(money)">提交订单</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -69,25 +69,40 @@ export default {
     return {
       money: 0,
       default: 0,
+      pay_note: '', // 备注
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-    })
+    next(vm => {})
   },
   computed: {},
   watch: {},
   methods: {
-
-    toPayEntry (money) {
-      this.$router.push({
-        name: 'MarginPayEntry',
-        params: {
-          money,
+    putOrder (money) {
+      let vm = this
+      let url = process.env.basePath + 'create_order_agent_amt'
+      let param = {
+        info: {
+          bp_id: window.localStorage.bp_id,
+          amount: money,
+          pay_note: this.pay_note,
         },
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
+            name: 'MarginPayEntry',
+            params: {
+              order_id: res.order_id,
+              money,
+            },
+          })
+        }
       })
     },
-
+    toPayEntry (money) {},
   },
 }
 </script>
@@ -97,7 +112,7 @@ export default {
     width: 96%;
     height: 172px;
     background-color: #fff;
-    margin-top:10px;
+    margin-top: 10px;
     box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);
     span {
       font-family: PingFangSC-Regular;
@@ -119,7 +134,7 @@ export default {
       }
     }
   }
-   .top-head {
+  .top-head {
     width: 100%;
     height: 142px;
     background: url("../../../assets/payment/back1.png");

src/pages/pay/marginPay/pay-entry.vue

 <template>
-  <h-view id="pay-entry-margin" class="public-style">
+  <h-view id="marginPay-pay-entry" class="public-style">
     <transition name="trans">
       <div v-show="downNum" class="modal-show">
         <div class="down">
@@ -14,57 +14,18 @@
         <div class="down">
           <div class="top">
             <img src="@/assets/payment/back.png" @click="show=false" >
-            <span>支付方式</span>
+            <span>选择支付渠道</span>
           </div>
           <scroll>
             <list-item :item-height="56" class="pay-way">
               <item
-                v-for="(item,index) in nongBank"
-                :proportion="[7,1,1]"
-                :key="item.bank_account_num"
-                @click.native="isSelect(`nong${index}`);ischeck(item)"
-              >
-                <div slot="name" style="flex=3">
-                  <img :src="selectImg(item)" alt class="icon" >
-                  {{ item.bank_full_name }}({{ selectLast(item) }})
-                  <img
-                    v-show="item.recommand"
-                    class="push"
-                    src="@/assets/payment/push.png"
-                  >
-                </div>
-                <section slot="content">
-                  <img v-show="select === `nong${index}`" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item>
-              <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
-                <div slot="name">
-                  <img src="@/assets/payment/alipay.png" alt class="icon1" > 支付宝
-                </div>
-                <section slot="content">
-                  <img v-show="select === 'one'" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== 'one'" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item>
-              <item :proportion="[7,1,1]" @click.native="isSelect('two');ischeck('two')">
-                <div slot="name">
-                  <img src="@/assets/payment/wx.png" alt class="icon2" > 微信
-                </div>
-                <section slot="content">
-                  <img v-show="select === 'two'" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item>
-              <item
-                v-for="(item,index) in newList"
+                v-for="(item,index) in payTypeList"
                 :proportion="[7,1,1]"
                 :key="index"
-                @click.native="isSelect(`three${index}`);ischeck(item)"
-              >
+                @click.native="isSelect(`three${index}`);ischeck(item)"><!--;confirmToPay(item)-->
                 <div slot="name" style="flex=3">
                   <img :src="selectImg(item)" alt class="icon" >
-                  {{ item.bank_full_name }}({{ selectLast(item) }})
+                  {{ item.code_name }}
                   <img
                     v-show="item.recommand"
                     class="push"
@@ -86,7 +47,7 @@
         <div class="down">
           <div class="top">
             <img src="@/assets/payment/back.png" @click="confirm=false" >
-            <span>确认付款</span>
+            <span>确认付款方式</span>
           </div>
           <div class="info">
             <div class="info-item">
@@ -101,17 +62,23 @@
               <span>+¥{{ serviceCharge |currency }}</span>
             </div>
             <div class="info-item" @click="show=true">
-              <span>付款方式</span>
+              <span>支付渠道</span>
               <span>
-                <img :src="checkType.img" >
-                <span>{{ checkType.bank_full_name }}</span>
-                <span v-if="sectctNong">({{ selectLast(checkType) }})</span>
+                <img :src="payTypeObj.img" >
+                <span>{{ payTypeObj.payType_n }}</span>
                 <img class="arrow" src="@/assets/payment/go.png" >
               </span>
             </div>
+            <!-- <list-item :item-height="44">
+              <item :showArrow="true" @click.native="selectPayType">
+                <div slot="name">支付渠道</div>
+                <input
+                  slot="content" v-model="payTypeObj.payType_n" readonly>
+              </item>
+            </list-item> -->
           </div>
           <bottom-tab>
-            <tab-button class="foot" @click.native="pay">立即支付</tab-button>
+            <tab-button class="foot" @click.native="checkPay">去支付</tab-button>
           </bottom-tab>
         </div>
       </div>
@@ -119,7 +86,7 @@
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
-        <span>支付中心</span>
+        <span>{{ title }}</span>
       </div>
     </h-header>
     <h-content class="entry-content">
@@ -139,24 +106,32 @@
           <span>手续费</span>
           <span>+¥{{ serviceCharge }}</span>
         </div>
+        <!-- <list-item :item-height="44">
+          <item :showArrow="true" @click.native="selectPayType">
+            <div slot="name">支付渠道</div>
+            <input
+              slot="content" v-model="payTypeObj.payType_n" readonly>
+          </item>
+        </list-item> -->
         <div class="info-item" @click="show=true">
-          <span>付款方式</span>
+          <span>支付渠道</span>
           <span>
-            <img :src="checkType.img" >
-            <span>{{ checkType.bank_full_name }}</span>
-            <span v-if="sectctNong">({{ selectLast(checkType) }})</span>
+            <img :src="payTypeObj.img" >
+            <span>{{ payTypeObj.payType_n }}</span>
             <img class="arrow" src="@/assets/payment/go.png" >
           </span>
         </div>
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="foot" @click.native="affirm">确认支付</tab-button>
+      <tab-button class="foot" @click.native="affirm">确认订单</tab-button>
     </bottom-tab>
   </h-view>
 </template>
 
 <script>
+import zfb from '@/assets/payment/alipay.png'
+import wx from '@/assets/payment/wx.png'
 import js from '@/assets/payment/js.png'
 import ny from '@/assets/payment/ly.png'
 import pf from '@/assets/payment/pf.png'
@@ -170,89 +145,137 @@ import xy from '@/assets/payment/xy.png'
 import yzcx from '@/assets/payment/yzcx.png'
 import zg from '@/assets/payment/zg.png'
 import zs from '@/assets/payment/zs.png'
+import yinlian from '@/assets/payment/bind.png'
 import zx from '@/assets/payment/zx.png'
-import bank from '@/assets/payment/bank.png'
 export default {
-  name: 'PayEntry',
   components: {},
   data () {
     return {
       money: '',
+      wayShow: false,
+      timer: null,
       select: 'three0',
       name: '',
+      sectctNong: false,
+      pay_type: '',
+      bank_account_id: '',
+      isNongPay: false,
+      checkType: {
+        img: '',
+        bank_full_name: '',
+        bank_account_num: '',
+      },
+      payTypeList: [],
+      payTypeObj: {
+        img: ny,
+        payType: 'ABC_PAY',
+        payType_n: '农行支付',
+      },
+      confirm: false,
+      show: false,
+      showOutside: false,
       downNum: false,
       recommand: false,
+      userName: window.localStorage.getItem('bp_name'),
       flag: false, // 用于判断是否有农业银行卡
       lists: [],
       nongBank: [], // 存农行卡
+      notNongList: [],
+      nongPayList: [],
     }
   },
   computed: {
+    title () {
+      if (this.confirm) {
+        return '支付中心'
+      } else {
+        return '确认订单'
+      }
+    },
+    text () {
+      if (this.payTypeObj.payType_n.indexOf('农行') !== -1) {
+        return 'K码/K令支付'
+      } else if (this.payTypeObj.payType_n.indexOf('农行') === -1) {
+        return '银联支付'
+      }
+    },
+    serviceCharge () {
+      return (this.money * (this.rate / 100)).toFixed(2)
+    },
+    rate () {
+      return this.payTypeObj.payType_n.indexOf('农行') !== -1 ? 0.0 : 0.18
+    },
+    sumMoney () {
+      return (parseFloat(this.serviceCharge) + parseFloat(this.money)).toFixed(
+        2
+      )
+    },
     newList () {
       let vm = this
-      vm.nongBank = []
-      vm.lists.forEach((item, i) => {
-        if (item.bank_full_name.indexOf('农业') !== -1) {
-          vm.nongBank.push(vm.lists[i])
-          vm.flag = true
-        }
-      })
       let notNong = vm.lists.filter(i => {
-        return (i.bank_full_name.indexOf('农业') === -1)
+        return i.bank_full_name.indexOf('农业') === -1
       })
-      if (vm.flag) {
-        vm.select = 'nong0'
-      } else {
-        vm.select = 'one'
-      }
       return notNong
     },
   },
-  watch: {},
+  watch: {
+    'payTypeObj.payType_n' () {
+    //  this.confirmToPay()
+    },
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.confirm = false
+      vm.show = false
+      vm.showOutside = false
+      vm.downNum = false
       vm.name = from.name
+      vm.money = vm.$route.params.money
       vm.getType()
       vm.nongBank = []
+      vm.getPayType()
     })
   },
 
   activated () {
-    this.money = this.$route.params.money
+    // this.money = this.$route.params.money
   },
   methods: {
+    selectPayType (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.payTypeList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.payTypeObj.payType = obj.bp_type
+          vm.payTypeObj.payType_n = obj.bp_type_n
+        },
+      })
+    },
+    getPayType () {
+      let vm = this
+      let url = process.env.basePath + 'payment_type_query'
+      let param = {}
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.payTypeList = res.lists.map(item => {
+            return {
+              code: item.pay_type,
+              code_name: item.pay_type_name,
+            }
+          })
+        }
+      })
+    },
     selectImg (e) {
-      if (e.bank_full_name.indexOf('建设') !== -1) {
-        return js
-      } else if (e.bank_full_name.indexOf('农业') !== -1) {
+      if (e.code_name.indexOf('农行') !== -1) {
         e.recommand = true
         return ny
-      } else if (e.bank_full_name.indexOf('光大') !== -1) {
-        return gd
-      } else if (e.bank_full_name.indexOf('广发') !== -1) {
-        return gf
-      } else if (e.bank_full_name.indexOf('浦') !== -1) {
-        return pf
-      } else if (e.bank_full_name.indexOf('工商') !== -1) {
-        return gs
-      } else if (e.bank_full_name.indexOf('交通') !== -1) {
-        return jt
-      } else if (e.bank_full_name.indexOf('民生') !== -1) {
-        return ms
-      } else if (e.bank_full_name.indexOf('平安') !== -1) {
-        return pa
-      } else if (e.bank_full_name.indexOf('兴业') !== -1) {
-        return xy
-      } else if (e.bank_full_name.indexOf('邮') !== -1) {
-        return yzcx
-      } else if (e.bank_full_name.indexOf('中国') !== -1) {
-        return zg
-      } else if (e.bank_full_name.indexOf('招商') !== -1) {
-        return zs
-      } else if (e.bank_full_name.indexOf('中信') !== -1) {
-        return zx
-      } else {
-        return bank
+      } else if (e.code_name.indexOf('银联') !== -1) {
+        return yinlian
       }
     },
     selectLast (item) {
@@ -262,17 +285,78 @@ export default {
     isSelect (way) {
       this.select = way
     },
-    pay () {
+    ischeck (way) {
+      this.payTypeObj.payType = way.code
+      this.payTypeObj.payType_n = way.code_name
+      this.payTypeObj.img = this.selectImg(way)
+      this.show = false
+    },
+    confirmToPay (e) {
       let vm = this
+      let randomString = Math.floor(Math.random() * 21)
+      let url = process.env.basePath + 'update_order_info' + '&index' +
+        `'${randomString}'`
+      if (e) {
+        vm.pay_type = e.pay_type
+        vm.bank_account_id = e.bank_account_id
+      }
+      let param = {
+        info: {
+          order_id: vm.$route.params.order_id,
+          fee: vm.serviceCharge,
+          bank_account_id: '0',
+          pay_type: vm.payTypeObj.payType,
+        },
+      }
       hlsPopup.showLoading('请稍候')
-      setTimeout(() => {
+      vm.$post(url, param).then(function (res) {
+        if (res.result === 'S') {
+          vm.hlsPopup.hideLoading()
+          vm.checkPay()
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    checkPay () {
+      let vm = this
+      if (parseFloat(vm.sumMoney) === 0) {
+        hlsPopup.showLongCenter('您支付的金额为0元')
+      } else {
+        vm.pay()
+      }
+    },
+    pay () {
+      let vm = this
+      let url = process.env.basePath + 'merchant_payment'
+      let param = {
+        order_id: vm.$route.params.order_id,
+      }
+      // hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        if (vm.money === 0) {
-          vm.downNum = true
+        if (res.result === 'S') {
+          if (res.return_code !== '0000') {
+            hlsPopup.showLongCenter(res.error_message)
+          } else {
+            vm.$router.push({
+              name: 'PayPage',
+              params: {
+                url: res.paymentURL,
+                order_id: vm.$route.params.order_id,
+                text: vm.text,
+                payType: vm.payTypeObj.payType,
+              },
+            })
+          }
         } else {
-          vm.changePage()
+          hlsPopup.showLongCenter(res.message)
         }
-      }, 2000)
+      })
+    },
+    affirm () {
+      // this.confirm = true
+      this.confirmToPay()
     },
     changePage () {
       this.$router.push({
@@ -283,7 +367,6 @@ export default {
         },
       })
     },
-
     getType () {
       let vm = this
       let url = process.env.basePath + 'payment_method_query'
@@ -295,6 +378,36 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.lists = res.lists
+          vm.nongBank = []
+          vm.lists.forEach((item, i) => {
+            if (item.bank_full_name.indexOf('农业') !== -1) {
+              vm.nongBank.push(vm.lists[i])
+              vm.flag = true
+            }
+          })
+          if (vm.flag) {
+            vm.select = 'nong0'
+            vm.checkType.bank_full_name = '农业银行'
+            vm.checkType.img = ny
+            vm.checkType.bank_account_num = vm.nongBank[0].bank_account_num
+            vm.sectctNong = true
+            // vm.confirmToPay(vm.nongBank[0])
+            vm.pay_type = vm.nongBank[0].pay_type
+            vm.bank_account_id = vm.nongBank[0].bank_account_id
+          } else if (!vm.flag && vm.lists.length !== 0) {
+            vm.select = 'three0'
+            vm.checkType.bank_full_name = vm.newList[0].bank_full_name
+            vm.checkType.img = vm.selectImg(vm.newList[0])
+            vm.checkType.bank_account_num = vm.newList[0].bank_account_num
+            vm.sectctNong = true
+            vm.pay_type = vm.lists[0].pay_type
+            vm.bank_account_id = vm.lists[0].bank_account_id
+            // vm.confirmToPay(vm.lists[0])
+          } else if (!vm.flag && vm.lists === 0) {
+            vm.sectctNong = false
+            hlsPopup.showLongCenter('请先绑定银行卡')
+            vm.checkType.bank_full_name = '（无）'
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -304,8 +417,11 @@ export default {
 }
 </script>
 <style lang='less' >
-#pay-entry-margin {
- .vue-better-scroll__wrapper{
+#marginPay-pay-entry{
+  .hls-list-item{
+    margin-bottom: 2px !important;
+  }
+  .vue-better-scroll__wrapper {
     padding: 0;
   }
   .trans-enter-active,
@@ -328,8 +444,8 @@ export default {
     .down {
       height: 466px;
       width: 100%;
-     position: relative;
-      top:18%;
+      position: relative;
+      top: 18%;
       background: #fff;
       border-radius: 12px 12px 0 0;
       overflow: scroll;
@@ -346,7 +462,7 @@ export default {
           width: 20px;
         }
         span {
-          margin-left: 38%;
+          margin-left: 30%;
           font-family: PingFangSC-Semibold;
           font-size: 16px;
           color: #656464;
@@ -359,6 +475,94 @@ export default {
       }
     }
   }
+  .modal-show-payWay{
+     width: 100%;
+    height: 100%;
+    position: absolute;
+    display: flex;
+    z-index: 910;
+    background-color: rgba(56, 63, 69, 0.3);
+    justify-content: center;
+    align-items: center;
+    .down {
+      height: 466px;
+      width: 100%;
+      position: relative;
+      top: 18%;
+      background: #fff;
+      border-radius: 12px 12px 0 0;
+      overflow: scroll;
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      .top {
+        left: 24px;
+        width: 330px;
+        height: 54px;
+        display: flex;
+        align-items: center;
+        background-color: #fff;
+        img {
+          width: 20px;
+        }
+        span {
+          margin-left: 38%;
+          font-family: PingFangSC-Semibold;
+          font-size: 16px;
+          color: #656464;
+          letter-spacing: 0.49px;
+          text-align: center;
+        }
+      }
+      .pay-way {
+        //width: 350px;
+        //margin: 0 auto;
+        width: 100%;
+        padding: 0 4% 0 4%;
+        background: #fff;
+        .hls-item {
+          padding-left: 12px;
+          .add-name {
+            flex: 3;
+            line-height: 56px;
+            font-family: PingFangSC-Regular;
+            font-size: 14px;
+            color: #656464;
+            div {
+              display: flex;
+              justify-content: center;
+              align-items: center;
+            }
+            .icon1 {
+              width: 34px;
+              height: 34px;
+              display: block;
+              float: left;
+              margin-top: 10px;
+              margin-right: 5px;
+            }
+            .icon2 {
+              width: 32px;
+              display: block;
+              float: left;
+              margin-top: 12px;
+              margin-right: 8px;
+            }
+            .icon {
+              width: 30px;
+              margin: 0 8px 0 3px;
+            }
+          }
+
+          .add-content {
+            img {
+              width: 21px;
+            }
+          }
+        }
+      }
+    }
+  }
   .modal-show-bank {
     width: 100%;
     height: 100%;
@@ -371,8 +575,8 @@ export default {
     .down {
       height: 466px;
       width: 100%;
-     position: relative;
-      top:18%;
+      position: relative;
+      top: 18%;
       background: #fff;
       border-radius: 12px 12px 0 0;
       overflow: scroll;
@@ -402,7 +606,7 @@ export default {
         //width: 350px;
         //margin: 0 auto;
         width: 100%;
-       padding: 0 4% 0 4%;
+        padding: 0 4% 0 4%;
         background: #fff;
         .hls-item {
           padding-left: 12px;
@@ -412,7 +616,7 @@ export default {
             font-family: PingFangSC-Regular;
             font-size: 14px;
             color: #656464;
-            div{
+            div {
               display: flex;
               justify-content: center;
               align-items: center;
@@ -434,7 +638,7 @@ export default {
             }
             .icon {
               width: 30px;
-             /* display: block;
+              /* display: block;
               float: left;
               position: relative;*/
               margin: 0 8px 0 3px;
@@ -514,7 +718,7 @@ export default {
     }
   }
   .push {
-   /* position: absolute;
+    /* position: absolute;
     top: 10px;
     margin-left: 10px;*/
     width: 35px;

src/pages/pay/payment/pay-entry.vue

@@ -258,7 +258,7 @@ export default {
       })
     },
     affirm () {
-     // this.confirm = true
+      // this.confirm = true
       this.confirmToPay()
     },
     confirmToPay (e) {

src/pages/userBindNew/np/base-info.vue

@@ -436,35 +436,36 @@ export default {
   beforeRouteEnter (to, from, next) {
     // 绑定查询入口
     next(vm => {
+      vm.list = {}
+      vm.multiBpType = {}
+      vm.upload_list = [] // 上传图片列表
+      vm.dowload_list = [] // 下载图片列表
+      vm.img_url = {}
+      vm.baseInfo = {}
+      vm.idCardFront = '' // 身份证正面图片
+      vm.idCardBack = '' // 身份证反面图片
+      vm.idCardFrontSp = '' // 配偶身份证正面图片
+      vm.idCardBackSp = '' // 配偶身份证反面图片
+      vm.idCardFrontUrlFlag = false // 身份证正面图片查看标识，为false则用查询出来的，为true则用拍照出来的
+      vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+      vm.idCardFrontSpUrlFlag = false // 配偶身份证正面图片，为false则用查询出来的，为true则用拍照出来的
+      vm.idCardBackSpUrlFlag = false // 配偶身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+      vm.cddItemList = [] // 资料清单列表
+      vm.idCardFrontCheck_id = '' // 身份证正面check_id
+      vm.idCardBackCheck_id = '' // 身份证反面check_id
+      vm.idCardFrontSpCheck_id = '' // 配偶身份证正面check_id
+      vm.idCardBackSpCheck_id = '' // 配偶身份证反面check_id
+      vm.idCardFrontAttachmentId = '' // 身份证正面AttachmentId
+      vm.idCardBackAttachmentId = '' // 身份证反面AttachmentId
+      vm.idCardFrontSpAttachmentId = '' // 配偶身份证正面AttachmentId
+      vm.idCardBackSpAttachmentId = '' // 配偶身份证反面AttachmentId
+      vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.idCardBackEditFlag = false // 身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.isClear = false
       if (from.fullPath === '/tab/my-info') {
-        vm.list = {}
-        vm.multiBpType = {}
-        vm.upload_list = [] // 上传图片列表
-        vm.dowload_list = [] // 下载图片列表
-        vm.img_url = {}
-        vm.baseInfo = {}
-        vm.idCardFront = '' // 身份证正面图片
-        vm.idCardBack = '' // 身份证反面图片
-        vm.idCardFrontSp = '' // 配偶身份证正面图片
-        vm.idCardBackSp = '' // 配偶身份证反面图片
-        vm.idCardFrontUrlFlag = false // 身份证正面图片查看标识，为false则用查询出来的，为true则用拍照出来的
-        vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
-        vm.idCardFrontSpUrlFlag = false // 配偶身份证正面图片，为false则用查询出来的，为true则用拍照出来的
-        vm.idCardBackSpUrlFlag = false // 配偶身份证反面图片，为false则用查询出来的，为true则用拍照出来的
-        vm.cddItemList = [] // 资料清单列表
-        vm.idCardFrontCheck_id = '' // 身份证正面check_id
-        vm.idCardBackCheck_id = '' // 身份证反面check_id
-        vm.idCardFrontSpCheck_id = '' // 配偶身份证正面check_id
-        vm.idCardBackSpCheck_id = '' // 配偶身份证反面check_id
-        vm.idCardFrontAttachmentId = '' // 身份证正面AttachmentId
-        vm.idCardBackAttachmentId = '' // 身份证反面AttachmentId
-        vm.idCardFrontSpAttachmentId = '' // 配偶身份证正面AttachmentId
-        vm.idCardBackSpAttachmentId = '' // 配偶身份证反面AttachmentId
-        vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.idCardBackEditFlag = false // 身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.idCardFrontSpEditFlag = false // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.idCardBackSpEditFlag = false // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.isClear = false
+
         vm.from = true
         vm.basicInfoQuery()
         vm.loadItemList() // 附件查询

src/pages/userBindNew/np/invoice-info.vue

@@ -210,8 +210,10 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          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*/
         },
       })
     },
@@ -222,8 +224,10 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          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*/
         },
       })
     },

src/pages/userBindNew/org/baseInfo.vue

@@ -227,7 +227,7 @@
             <div slot="name" class="font-color required">姓名</div>
             <input
               slot="content"
-              v-model="baseInfo.legal_person"
+              v-model="legal_personMsg.bp_legal_name"
               readonly
               placeholder="上传身份证自动填充"
               class="auto"
@@ -451,7 +451,7 @@ export default {
       },
       legal_personMsg: {
         id_card_no: null,
-        // legal_person: '',
+        bp_legal_name: '',
         cell_phone: window.localStorage.getItem('user_phone'),
         living_address: '',
         id_card_date_from: '', // 法定代表人身份证有效期从
@@ -567,6 +567,33 @@ export default {
   created () {},
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.legal_personMsg = {}
+      vm.baseInfo = {}
+      vm.bank_lists = {}
+      vm.authMsg = {}
+      vm.idCardFront = '' // 身份证正面图片
+      vm.idCardBack = '' // 身份证反面图片
+      vm.authidCardFront = '' // 授权人身份证正面图片
+      vm.authidCardBack = '' // 授权人身份证反面图片
+      vm.licenseImg = '' // 营业执照照片
+      vm.laImg = '' // 授权书图片
+      vm.upload_list = [] // 上传图片列表
+      vm.dowload_list = [] // 下载图片列表
+
+      vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.idCardBackEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.authidCardFrontEditFlag = false // 授权人身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.authidCardBackEditFlag = false // 授权人身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.licenseEditFlag = false // 营业执照照片修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.LaEditFlag = false // 授权书图片修改标识，为true则标识已修改，后续需要重新上传此照片
+      vm.isClear = false
+
+      vm.idCardFrontUrlFlag = false // 身份证正面图片，为false则用查询出来的，为true则用拍照出来的
+      vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+      vm.authidCardFrontUrlFlag = false // 授权人身份证正面图片，为false则用查询出来的，为true则用拍照出来的
+      vm.authidCardBackUrlFlag = false // 授权人身份证反面图片，为false则用查询出来的，为true则用拍照出来的
+      vm.licenseImgUrlFlag = false // 营业执照照片，为false则用查询出来的，为true则用拍照出来的
+      vm.laImgUrlFlag = false // 授权书图片，为false则用查询出来的，为true则用拍照出来的
       vm.getBpType()
       vm.getProvince()
       if (vm.$route.params.status === 'APPROVED') {
@@ -574,35 +601,8 @@ export default {
         window.localStorage.setItem('isApproved', vm.isApproved)
       }
       if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
-        vm.legal_personMsg = {}
-        vm.baseInfo = {}
-        vm.bank_lists = {}
-        vm.authMsg = {}
         vm.bp_id = vm.$route.params.bp_id
-        vm.idCardFront = '' // 身份证正面图片
-        vm.idCardBack = '' // 身份证反面图片
-        vm.authidCardFront = '' // 授权人身份证正面图片
-        vm.authidCardBack = '' // 授权人身份证反面图片
-        vm.licenseImg = '' // 营业执照照片
-        vm.laImg = '' // 授权书图片
-        vm.upload_list = [] // 上传图片列表
-        vm.dowload_list = [] // 下载图片列表
         vm.from = true
-
-        vm.idCardFrontEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.idCardBackEditFlag = false // 身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.authidCardFrontEditFlag = false // 授权人身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.authidCardBackEditFlag = false // 授权人身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.licenseEditFlag = false // 营业执照照片修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.LaEditFlag = false // 授权书图片修改标识，为true则标识已修改，后续需要重新上传此照片
-        vm.isClear = false
-
-        vm.idCardFrontUrlFlag = false // 身份证正面图片，为false则用查询出来的，为true则用拍照出来的
-        vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
-        vm.authidCardFrontUrlFlag = false // 授权人身份证正面图片，为false则用查询出来的，为true则用拍照出来的
-        vm.authidCardBackUrlFlag = false // 授权人身份证反面图片，为false则用查询出来的，为true则用拍照出来的
-        vm.licenseImgUrlFlag = false // 营业执照照片，为false则用查询出来的，为true则用拍照出来的
-        vm.laImgUrlFlag = false // 授权书图片，为false则用查询出来的，为true则用拍照出来的
         vm.getbaseInfo()
       }
     })
@@ -794,6 +794,9 @@ export default {
               case 'living_address':
                 vm.hlsPopup.showLongCenter('联系地址未填写')
                 break
+              case 'bp_legal_name':
+                vm.hlsPopup.showLongCenter('法定代表人姓名未填写')
+                break
               case 'id_card_date_from':
                 vm.hlsPopup.showLongCenter('身份证有效期从未填写')
                 break
@@ -887,6 +890,15 @@ export default {
               case 'living_address':
                 vm.hlsPopup.showLongCenter('联系地址未填写')
                 break
+              case 'bp_legal_name':
+                vm.hlsPopup.showLongCenter('法定代表人姓名未填写')
+                break
+              case 'id_card_date_from':
+                vm.hlsPopup.showLongCenter('身份证有效期从未填写')
+                break
+              case 'id_card_date_to':
+                vm.hlsPopup.showLongCenter('身份证有效期到未填写')
+                break
               case 'auth_person_name':
                 vm.hlsPopup.showLongCenter('授权人姓名未填写')
                 break
@@ -1260,7 +1272,7 @@ export default {
         let result = res.result.words_result
         if (cardType === 'idCard') { // 法定代表人
           // 未授权 姓名，身份证号
-          vm.baseInfo.legal_person = result.姓名.words
+          vm.legal_personMsg.bp_legal_name = result.姓名.words
           vm.legal_personMsg.id_card_no = result.公民身份号码.words
           vm.legal_personMsg.living_address = result.住址.words // 联系地址默认为户籍地址，支持修改
         } else { // 授权人

src/pages/userBindNew/org/enclosure.vue

@@ -606,10 +606,11 @@ export default {
       // vm.hauseInfo.regist_date.substr(0, 10)
       console.log('regist_date', vm.hauseInfo.regist_date)
       let param = {
-        master: {
+        /*master: {
           ...vm.hauseInfo,
           regist_date: vm.hauseInfo.regist_date.substr(0, 10),
-        },
+        },*/
+        master: vm.hauseInfo,
       }
       // hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {

src/pages/userBindNew/org/invoice.vue

@@ -106,7 +106,15 @@ export default {
   watch: {},
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (from.name === 'EnterpriseNew') {
+      if (from.name === 'EnterpriseNew' && vm.$route.params.from) {
+        vm.invoiceInfo = {}
+        vm.invoiceInfo.invoice_title = vm.$route.params.bp_name
+        vm.invoiceInfo.organization_code = vm.$route.params.organization_code
+        vm.bp_id = vm.$route.params.bp_id
+        vm.invoiceQuery() // 开票信息查询
+      }
+
+  /*    if (from.name === 'EnterpriseNew') {
         vm.invoiceInfo = {
           invoice_kind: '',
           invoice_kind_n: '',
@@ -129,10 +137,16 @@ export default {
         }
         vm.addRows(this.invoiceInfo.invoice_adds)
         vm.addRowsLive(this.invoiceInfo.open_bank)
-      }
+      }*/
     })
   },
-  created () {},
+  created () {
+    let vm = this
+    vm.getInvoiceType()
+    vm.getTaxpayer()
+    vm.addRows(this.invoiceInfo.invoice_adds)
+    vm.addRowsLive(this.invoiceInfo.open_bank)
+  },
   methods: {
     invoiceQuery () {
       let vm = this
@@ -210,8 +224,10 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          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)
         },
       })
@@ -223,8 +239,10 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          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*/
         },
       })
     },

src/router/index.js

@@ -244,8 +244,8 @@ export default new Router({
     {path: '/new-list', component: NewList, name: 'NewList', meta: {keepAlive: true}},
     {path: '/payment-contract-record', component: PaymentContractRecord, name: 'PaymentContractRecord', meta: {keepAlive: true}},
     // 保证金支付
-    {path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: true}},
-    {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: true}},
+    {path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: false}},
+    {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: false}},
     // 支付页
     {path: '/pay-page', component: PayPage, name: 'PayPage', meta: {keepAlive: false}},
     // 产品查询

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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.63486490583bd45586f9f17263d8372c.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.e9be7f7cd0f8a8828ab2.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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.63486490583bd45586f9f17263d8372c.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.e9be7f7cd0f8a8828ab2.js></script></body></html>
+