Skip to content

H
hls-xcmg-vue-app
Commit 6f78a0b3 authored by linxin's avatar linxin
Browse files
Options

Merge branch 'liuxin' into develop

parents 105d2402 b265fb99
Pipeline #4292 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 321 additions and 132 deletions
      src/pages/contractCreate/contract-create-list.vue
      View file @ 6f78a0b3
      ...@@ -122,8 +122,20 @@ export default { ...@@ -122,8 +122,20 @@ export default {
      }) })
      }, },
      changePage () { changePage () {
      this.$router.push({ let vm = this
      name: 'CreateBaseInfo', let url = process.env.basePath + 'get_project_id'
      let param = {}
      hlsPopup.showLoading('请稍候')
      vm.$post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      window.localStorage.setItem('project_id', res.info.project_id)
      vm.$router.push({
      name: 'CreateBaseInfo',
      })
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      }) })
      }, },
      loadMore () {}, loadMore () {},
      ......
      src/pages/contractCreate/creat-rent-info.vue
      View file @ 6f78a0b3
      ...@@ -27,15 +27,15 @@ ...@@ -27,15 +27,15 @@
      <list-item :item-height="44"> <list-item :item-height="44">
      <item :showArrow="true" @click.native="selectProductLine"> <item :showArrow="true" @click.native="selectProductLine">
      <div slot="name">产品线</div> <div slot="name">产品线</div>
      <input slot="content" v-model="saveInfo.division_n" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择" >
      </item> </item>
      <item :showArrow="true" @click.native="getProduct"> <item :showArrow="true" @click.native="getProduct">
      <div slot="name">产品型号</div> <div slot="name">产品型号</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.product_id_n" readonly placeholder="请选择" >
      </item> </item>
      <item> <item>
      <div slot="name">产品数量</div> <div slot="name">产品数量</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.product_num" placeholder="请填写产品数量" >
      </item> </item>
      </list-item> </list-item>
      <div class="userInfo">融资信息</div> <div class="userInfo">融资信息</div>
      ...@@ -43,77 +43,77 @@ ...@@ -43,77 +43,77 @@
      <img src="@/assets/contractCreate/hint.png" >提示 以下为单个设备商务政策 <img src="@/assets/contractCreate/hint.png" >提示 以下为单个设备商务政策
      </div> </div>
      <list-item :item-height="44"> <list-item :item-height="44">
      <item :showArrow="true" @click.native="showModalBusiness = true"> <item :showArrow="true" @click.native="getBusinessPolicy">
      <div slot="name">商务政策</div> <div slot="name">商务政策</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择" >
      </item> </item>
      <item> <item>
      <div slot="name">设备单价</div> <div slot="name">设备单价</div>
      <CurrencyInput slot="content" readonly placeholder="暂无信息" /> <CurrencyInput slot="content" v-model="saveInfo.equip_price" placeholder="暂无信息" />
      </item> </item>
      <item> <item>
      <div slot="name">融资金额</div> <div slot="name">融资金额</div>
      <CurrencyInput slot="content" readonly placeholder="暂无信息" /> <CurrencyInput slot="content" v-model="saveInfo.finance_amount" placeholder="暂无信息" />
      </item> </item>
      <item> <item>
      <div slot="name">首付比例</div> <div slot="name">首付比例</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.down_payment_ratio_n" placeholder="暂无信息" >
      </item> </item>
      <item> <item>
      <div slot="name">首付款</div> <div slot="name">首付款</div>
      <CurrencyInput slot="content" readonly placeholder="暂无信息" /> <CurrencyInput slot="content" v-model="saveInfo.down_payment" placeholder="暂无信息" />
      </item> </item>
      <item> <item>
      <div slot="name">保证金比例</div> <div slot="name">保证金比例</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.deposit_ratio_n" placeholder="暂无信息" >
      </item> </item>
      <item> <item>
      <div slot="name">保证金</div> <div slot="name">保证金</div>
      <CurrencyInput slot="content" readonly placeholder="暂无信息" /> <CurrencyInput slot="content" v-model="saveInfo.deposit" placeholder="暂无信息" />
      </item> </item>
      <item> <item>
      <div slot="name">手续费比例</div> <div slot="name">手续费比例</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.lease_charge_ratio_n" placeholder="暂无信息" >
      </item> </item>
      <item> <item>
      <div slot="name">手续费</div> <div slot="name">手续费</div>
      <CurrencyInput slot="content" readonly placeholder="暂无信息" /> <CurrencyInput slot="content" v-model="saveInfo.lease_charge" placeholder="暂无信息" />
      </item> </item>
      <item> <item>
      <div slot="name">GPS费用</div> <div slot="name">GPS费用</div>
      <CurrencyInput slot="content" readonly placeholder="暂无信息" /> <CurrencyInput slot="content" v-model="saveInfo.gps_fee" placeholder="暂无信息" />
      </item> </item>
      <item> <item>
      <div slot="name">保险押金</div> <div slot="name">保险押金</div>
      <CurrencyInput slot="content" readonly placeholder="暂无信息" /> <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" placeholder="暂无信息" />
      </item> </item>
      <item class="date-check"> <item class="date-check" @click.native="showTime('YYYY-MM-DD')">
      <div slot="name">预计付款日</div> <div slot="name">预计付款日</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 " >
      </item> </item>
      <item :showArrow="true"> <item :showArrow="true" @click.native = "periodPull">
      <div slot="name">还款周期</div> <div slot="name">还款周期</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择" >
      </item> </item>
      <item> <item>
      <div slot="name">租赁期数</div> <div slot="name">租赁期数</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.lease_times" placeholder="请填写租赁期数" >
      </item> </item>
      <item> <item>
      <div slot="name">年利率</div> <div slot="name">年利率</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="暂无信息" >
      </item> </item>
      <item :showArrow="true"> <item :showArrow="true" @click.native="selectPayWay">
      <div slot="name">支付方式</div> <div slot="name">支付方式</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择" >
      </item> </item>
      <item> <item>
      <div slot="name">逾期日利率</div> <div slot="name">逾期日利率</div>
      <input slot="content" readonly placeholder="暂无信息" > <input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="暂无信息" >
      </item> </item>
      <item> <item>
      <div slot="name">留购价</div> <div slot="name">留购价</div>
      <CurrencyInput slot="content" readonly placeholder="暂无信息" /> <CurrencyInput slot="content" v-model="saveInfo.residual_value" placeholder="请填写留购价" />
      </item> </item>
      <item :showArrow="true" @click.native="goPlan"> <item :showArrow="true" @click.native="goPlan">
      <div slot="name">查看还款计划</div> <div slot="name">查看还款计划</div>
      ...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
      </h-content> </h-content>
      <bottom-tab class="add-box"> <bottom-tab class="add-box">
      <tab-button class="before">计算</tab-button> <tab-button class="before">计算</tab-button>
      <tab-button class="next" @click.native="goRent">下一步</tab-button> <tab-button class="next" @click.native="save">下一步</tab-button>
      </bottom-tab> </bottom-tab>
      <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom"> <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom">
      <h-view id="product-list"> <h-view id="product-list">
      ...@@ -140,15 +140,14 @@ ...@@ -140,15 +140,14 @@
      <list-item v-for="(item,index) in divisionLists" :key="index"> <list-item v-for="(item,index) in divisionLists" :key="index">
      <item <item
      :proportion="[1,4]" :proportion="[1,4]"
      @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)" @click.native="selectProduct(item)"
      > >
      <div slot="name" class="item-pic"> <div slot="name" class="item-pic">
      <img :src="item.url" alt > <img :src="item.url">
      </div> </div>
      <div slot="content" class="item-content"> <div slot="content" class="item-content">
      <div class="pro-name"> <div class="pro-name">
      <p>{{ item.product_name }}</p> <p>{{ item.product_name }}</p>
      <img class="arrow" src="@/assets/productQuery/getIn.png" alt >
      </div> </div>
      <div class="centers"> <div class="centers">
      <p class="firsts1">{{ item.bp_type_n }}</p> <p class="firsts1">{{ item.bp_type_n }}</p>
      ...@@ -173,38 +172,39 @@ ...@@ -173,38 +172,39 @@
      </h-header> </h-header>
      <h-content> <h-content>
      <div class="search has-header"> <div class="search has-header">
      <input v-model="keyWord" placeholder="请输入商务政策名称" > <input v-model="policyKeyWord" placeholder="请输入商务政策名称" >
      </div> </div>
      <div class="division-box"> <div class="division-box">
      <section v-for="(item,index) in businessLists" :key="index"> <scroll ref="scroll" :updateData="[businessLists]" :pullUp="true" @pullingUp="getBusinessPolicy">
      <div class="descript" @click="goDetails(item.product_plan_id)"> <section v-for="(item,index) in businessLists" :key="index" @click="selectBusinessPolicy(item)">
      <img src="@/assets/trial/product.png" alt > <div class="descript">
      <p class="produc">{{ item.product_plan_id_n }}</p> <img src="@/assets/trial/product.png" alt >
      </div> <p class="produc">{{ item.product_plan_name }}</p>
      <div class="tario">
      <div class="wrap">
      <p class="ratio">
      <span>保证金比例</span>
      <span>{{ item.deposit_ratio_n }}</span>
      </p>
      <p>
      <span>手续费比例</span>
      <span>{{ item.lease_charge_ratio_n }}</span>
      </p>
      </div> </div>
      <div class="wrap"> <div class="tario">
      <p> <div class="wrap">
      <span>年利率</span> <p class="ratio">
      <span>{{ item.int_rate_n }}</span> <span>保证金比例</span>
      </p> <span>{{ item.deposit_ratio_n }}</span>
      <p> </p>
      <span>期&nbsp;&nbsp;&nbsp;限</span> <p>
      <span>{{ item.lease_times }}期</span> <span>手续费比例</span>
      </p> <span>{{ item.lease_charge_ratio_n }}</span>
      </p>
      </div>
      <div class="wrap">
      <p>
      <span>年利率</span>
      <span>{{ item.int_rate_n }}</span>
      </p>
      <p>
      <span>期&nbsp;&nbsp;&nbsp;限</span>
      <span>{{ item.lease_times }}期</span>
      </p>
      </div>
      </div> </div>
      </div> </section>
      </section> </scroll></div>
      </div>
      </h-content> </h-content>
      </h-view> </h-view>
      </h-modal> </h-modal>
      ...@@ -222,76 +222,66 @@ export default { ...@@ -222,76 +222,66 @@ export default {
      showModalBusiness: false, showModalBusiness: false,
      keyWordProduct: '', keyWordProduct: '',
      keyWord: '', keyWord: '',
      policyKeyWord: '',
      pagenum: 1, pagenum: 1,
      businessLists: [ pagenumPolicy: 1,
      { businessLists: [], // 商务政策
      lease_times: '12', periodLists: [], // 还款周期
      deposit_ratio_n: ' 16.00%', paywayLists: [], // 支付方式
      lease_charge_ratio_n: ' 4.00%', divisionLists: [{
      product_plan_id: '69', 'bp_name': '上海汉得信息技术股份有限公司',
      lease_charge_ratio: '0.04', 'bp_id': '7781',
      int_rate_n: ' 6.00%', 'product_id': '5',
      int_rate: '0.06', 'product_attachment_id': '88039',
      deposit_ratio: '0.16', 'product_code': 'QAY130',
      product_plan_id_n: '等额本息-按月-12期', 'product_name': '全地面起重机QAY130',
      }, 'bp_type_n': '经销商',
      { 'collect_status': 'N',
      lease_times: '4', url: '',
      deposit_ratio_n: ' 10.00%', },
      lease_charge_ratio_n: ' 5.00%', {
      product_plan_id: '70', 'bp_name': '广州市易推信息商务科技有限公司',
      lease_charge_ratio: '0.05', 'bp_id': '8143',
      int_rate_n: ' 6.00%', 'product_id': '5',
      int_rate: '0.06', 'product_attachment_id': '88039',
      deposit_ratio: '0.1', 'product_code': 'QAY130',
      product_plan_id_n: '等额本息-按季-4期', 'product_name': '全地面起重机QAY130',
      }, 'bp_type_n': '经销商',
      { 'collect_status': 'Y',
      lease_times: '12', url: '',
      deposit_ratio_n: ' 25.00%', }],
      lease_charge_ratio_n: ' 5.00%',
      product_plan_id: '109',
      lease_charge_ratio: '0.05',
      int_rate_n: ' 7.50%',
      int_rate: '0.075',
      deposit_ratio: '0.25',
      product_plan_id_n: '等额本金-双月-12期',
      },
      {
      lease_times: '24',
      deposit_ratio_n: ' 15.00%',
      lease_charge_ratio_n: ' 15.00%',
      product_plan_id: '132',
      lease_charge_ratio: '0.15',
      int_rate_n: ' 7.00%',
      int_rate: '0.07',
      deposit_ratio: '0.15',
      product_plan_id_n: '等额本息-按月-24期',
      },
      ],
      divisionLists: [],
      productLine: [], // 产品线 productLine: [], // 产品线
      saveInfo: { saveInfo: {
      project_id: '', project_id: window.localStorage.project_id,
      product_plan_id: '', product_plan_id: '',
      product_plan_name: '',
      product_id: '', product_id: '',
      product_id_n: '',
      product_num: '', product_num: '',
      equip_price: '', equip_price: '',
      int_rate: '', int_rate: '',
      int_rate_n: '',
      penalty_rate_n: '',
      annual_pay_times: '', annual_pay_times: '',
      annual_pay_times_n: '',
      lease_times: '', lease_times: '',
      down_payment_ratio: '', down_payment_ratio: '',
      down_payment_ratio_n: '',
      down_payment: '', down_payment: '',
      deposit_ratio: '', deposit_ratio: '',
      deposit_ratio_n: '',
      deposit: '', deposit: '',
      lease_charge_ratio: '', lease_charge_ratio: '',
      lease_charge_ratio_n: '',
      lease_charge: '', lease_charge: '',
      lease_start_date: '', lease_start_date: '',
      gps_fee: '', gps_fee: '',
      insurance_fee: '', insurance_fee: '',
      pay_type: '', pay_type: '',
      pay_type_n: '',
      residual_value: '', residual_value: '',
      division_n: '', division_n: '',
      finance_amount: '',
      }, },
      } }
      }, },
      ...@@ -299,13 +289,178 @@ export default { ...@@ -299,13 +289,178 @@ export default {
      next(vm => { next(vm => {
      vm.showModalBusiness = false vm.showModalBusiness = false
      vm.showModalValue = false vm.showModalValue = false
      vm.businessLists = []
      if (from.name === 'CreateBaseInfo') { if (from.name === 'CreateBaseInfo') {
      vm.pagenum = 1 vm.pagenum = 1
      vm.pagenumPolicy = 1
      vm.getProductLine() // 产品线查询 vm.getProductLine() // 产品线查询
      vm.repayPeriod()// 还款周期查询
      vm.getPayWay()// 支付方式查询
      } }
      }) })
      }, },
      methods: { methods: {
      selectBusinessPolicy (e) {
      let vm = this
      vm.saveInfo.product_plan_id = e.product_plan_id
      vm.saveInfo.product_plan_name = e.product_plan_name
      vm.saveInfo.down_payment_ratio = e.down_payment_ratio
      vm.saveInfo.down_payment_ratio_n = e.down_payment_ratio_n
      vm.saveInfo.lease_charge_ratio = e.lease_charge_ratio
      vm.saveInfo.lease_charge_ratio_n = e.lease_charge_ratio_n
      vm.saveInfo.int_rate = e.int_rate
      vm.saveInfo.int_rate_n = e.int_rate_n
      vm.saveInfo.penalty_rate_n = e.penalty_rate_n
      vm.saveInfo.deposit_ratio = e.deposit_ratio
      vm.saveInfo.deposit_ratio_n = e.deposit_ratio_n
      setTimeout(() => {
      vm.showModalBusiness = false
      }, 100)
      },
      save () {
      let vm = this
      let url = process.env.basePath + 'prj_lease_info_save'
      let param = {
      master: vm.saveInfo,
      }
      hlsPopup.showLoading('请稍候')
      vm.$post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      // vm.$router.push({
      // name: 'CreateRentInfo',
      // params: {
      // bp_agent_id: vm.bp_agent_id,
      // },
      // })
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      })
      },
      showTime (format) { // 预计付款日
      let vm = this
      hlsPopup.showTime({
      nowDate: (new Date()).format('yyyy-MM-dd'),
      format: format,
      callback: (date) => {
      vm.saveInfo.lease_start_date = date
      },
      })
      },
      getPayWay () { // 支付方式查询
      let vm = this
      let url = $config.basePath + 'prj_pay_type_query'
      let param = {}
      vm.hlsPopup.showLoading('数据加载中')
      vm.hlsHttp.post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      vm.paywayLists = res.lists.map(item => {
      return {
      code: item.pay_type,
      code_name: item.pay_type_n,
      }
      })
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      })
      },
      // 支付方式选择
      selectPayWay () {
      let vm = this
      vm.hlsPopup.selectList({
      list: vm.paywayLists, // 下拉列表
      code: 'bp_type',
      object: {},
      returnItem: function (index, obj) {
      vm.saveInfo.pay_type_n = obj.bp_type_n
      vm.saveInfo.pay_type = obj.bp_type
      },
      })
      },
      repayPeriod () { // 还款周期查询
      let vm = this
      let url = $config.basePath + 'annual_pay_times_query'
      let param = {}
      vm.hlsPopup.showLoading('数据加载中')
      vm.hlsHttp.post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      vm.periodLists = res.lists.map(item => {
      return {
      code: item.annual_pay_times,
      code_name: item.annual_pay_times_n,
      }
      })
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      })
      },
      // 还款周期选择
      periodPull () {
      let vm = this
      vm.hlsPopup.selectList({
      list: vm.periodLists, // 下拉列表
      code: 'bp_type',
      object: {},
      returnItem: function (index, obj) {
      vm.saveInfo.annual_pay_times_n = obj.bp_type_n
      vm.saveInfo.annual_pay_times = obj.bp_type
      },
      })
      },
      getBusinessPolicy () {
      let vm = this
      vm.showModalBusiness = true
      let randomString = Math.floor(Math.random() * 21)
      let url =
      process.env.basePath +
      'prj_product_plan_query' +
      '&index' +
      `'${randomString}'`
      let param = {
      bp_agent_id: vm.$route.params.bp_agent_id,
      pagesize: 10,
      pagenumPolicy: vm.pagenumPolicy,
      searchInput: vm.policyKeyWord,
      }
      hlsPopup.showLoading('请稍候')
      vm.$post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading()
      if (res.result === 'S') {
      let returnData = []
      returnData = res.lists
      if (returnData.length === 0) {
      vm.$refs.scroll.update(true)
      } else if (returnData.length > 0 && returnData.length < 10) {
      vum.forEach(returnData, function (data, index, array) {
      vm.businessLists.push(array[index])
      })
      vm.pagenumPolicy++
      vm.$refs.scroll.update(true)
      } else if (returnData.length === 10) {
      vum.forEach(returnData, function (data, index, array) {
      vm.businessLists.push(array[index])
      })
      vm.pagenumPolicy++
      vm.$refs.scroll.update(false)
      }
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      })
      },
      selectProduct (e) {
      let vm = this
      this.saveInfo.product_id_n = e.product_name
      this.saveInfo.product_id = e.product_id
      setTimeout(() => {
      vm.showModalValue = false
      }, 100)
      },
      getProduct () { getProduct () {
      let vm = this let vm = this
      vm.showModalValue = true vm.showModalValue = true
      ...@@ -342,6 +497,9 @@ export default { ...@@ -342,6 +497,9 @@ export default {
      vm.pagenum++ vm.pagenum++
      vm.$refs.scroll.update(false) vm.$refs.scroll.update(false)
      } }
      vm.divisionLists.forEach(item => {
      item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
      })
      } else { } else {
      hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
      } }
      ...@@ -397,6 +555,12 @@ export default { ...@@ -397,6 +555,12 @@ export default {
      </script> </script>
      <style lang="less"> <style lang="less">
      #create-rent-info { #create-rent-info {
      input{
      color:#333;
      }
      input::placeholder{
      color: #666;
      }
      .flow { .flow {
      z-index: 999; z-index: 999;
      } }
      ......
      src/pages/contractCreate/create-base-info.vue
      View file @ 6f78a0b3
      ...@@ -300,7 +300,7 @@ export default { ...@@ -300,7 +300,7 @@ export default {
      NPBaseInfo: {}, // 自然人基本信息 NPBaseInfo: {}, // 自然人基本信息
      ORGBaseInfo: {}, // 企业基本信息 ORGBaseInfo: {}, // 企业基本信息
      saveInfo: {// 需要保存的信息 saveInfo: {// 需要保存的信息
      project_id: '', project_id: window.localStorage.project_id,
      bp_id: window.localStorage.bp_id, bp_id: window.localStorage.bp_id,
      bp_class: window.localStorage.bp_class, bp_class: window.localStorage.bp_class,
      equip_num: '', equip_num: '',
      ...@@ -403,24 +403,24 @@ export default { ...@@ -403,24 +403,24 @@ export default {
      }, },
      save () { save () {
      let vm = this let vm = this
      // let url = process.env.basePath + 'prj_base_info_save' let url = process.env.basePath + 'prj_base_info_save'
      // let param = { let param = {
      // master: {...vm.saveInfo, ...vm.makeData()}, master: {...vm.saveInfo, ...vm.makeData()},
      // } }
      // hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
      // vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
      // vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
      // if (res.result === 'S') { if (res.result === 'S') {
      vm.$router.push({ vm.$router.push({
      name: 'CreateRentInfo', name: 'CreateRentInfo',
      params: { params: {
      bp_agent_id: vm.bp_agent_id, bp_agent_id: vm.bp_agent_id,
      }, },
      })
      } else {
      hlsPopup.showLongCenter(res.message)
      }
      }) })
      // } else {
      // hlsPopup.showLongCenter(res.message)
      // }
      // })
      }, },
      getBaseInfo () { getBaseInfo () {
      this.getEquipInfo() this.getEquipInfo()
      ......
      src/pages/pay/firstPay/pay-entry.vue
      View file @ 6f78a0b3
      ...@@ -174,7 +174,6 @@ import zg from '@/assets/payment/zg.png' ...@@ -174,7 +174,6 @@ import zg from '@/assets/payment/zg.png'
      import zs from '@/assets/payment/zs.png' import zs from '@/assets/payment/zs.png'
      import zx from '@/assets/payment/zx.png' import zx from '@/assets/payment/zx.png'
      import bank from '@/assets/payment/bank.png' import bank from '@/assets/payment/bank.png'
      import yinlian from '@/assets/payment/bind.png'
      export default { export default {
      name: 'PayEntry', name: 'PayEntry',
      components: {}, components: {},
      ...@@ -194,10 +193,6 @@ export default { ...@@ -194,10 +193,6 @@ export default {
      bank_full_name: '', bank_full_name: '',
      bank_account_num: '', bank_account_num: '',
      }, },
      checkPayWay: {
      img: '',
      pay_type_name: '',
      },
      confirm: false, confirm: false,
      show: false, show: false,
      showOutside: false, showOutside: false,
      ...@@ -219,6 +214,13 @@ export default { ...@@ -219,6 +214,13 @@ export default {
      return '确认订单' return '确认订单'
      } }
      }, },
      text () {
      if (this.checkType.bank_full_name.indexOf('农业') !== -1) {
      return 'K码/K令支付'
      } else if (this.checkType.bank_full_name.indexOf('农业') === -1) {
      return '银联支付'
      }
      },
      serviceCharge () { serviceCharge () {
      return (this.money * (this.rate / 100)).toFixed(2) return (this.money * (this.rate / 100)).toFixed(2)
      }, },
      ...@@ -369,6 +371,7 @@ export default { ...@@ -369,6 +371,7 @@ export default {
      params: { params: {
      url: res.paymentURL, url: res.paymentURL,
      order_id: vm.$route.params.order_id, order_id: vm.$route.params.order_id,
      text: vm.text,
      }, },
      }) })
      } }
      ......
      src/pages/pay/pay-page.vue
      View file @ 6f78a0b3
      ...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
      </div> </div>
      </div> </div>
      </div> </div>
      <div> <div v-if="!isSuccess||!isFaild">
      <div class="box-top"> <div class="box-top">
      <img src="@/assets/payment/bank-title.png" > <img src="@/assets/payment/bank-title.png" >
      </div> </div>
      ...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
      </item> </item>
      <item> <item>
      <div slot="name" class="name">支付方式</div> <div slot="name" class="name">支付方式</div>
      <div slot="content">K码/K令支付</div> <div slot="content">{{ text }}</div>
      </item> </item>
      </list-item> </list-item>
      <div class="description"> <div class="description">
      ...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
      return { return {
      name: '', name: '',
      url: '', url: '',
      text: this.$route.params.text,
      info: { info: {
      order_number: '', order_number: '',
      pay_amount_name: '', pay_amount_name: '',
      ...@@ -138,6 +139,7 @@ export default { ...@@ -138,6 +139,7 @@ export default {
      vm.isGo = false vm.isGo = false
      vm.name = from.name vm.name = from.name
      vm.url = vm.$route.params.url vm.url = vm.$route.params.url
      vm.text = vm.$route.params.text
      vm.getInfo() vm.getInfo()
      }) })
      }, },
      ......
      src/pages/pay/payment/pay-entry.vue
      View file @ 6f78a0b3
      ...@@ -210,6 +210,13 @@ export default { ...@@ -210,6 +210,13 @@ export default {
      return '确认订单' return '确认订单'
      } }
      }, },
      text () {
      if (this.checkType.bank_full_name.indexOf('农业') !== -1) {
      return 'K码/K令支付'
      } else if (this.checkType.bank_full_name.indexOf('农业') === -1) {
      return '银联支付'
      }
      },
      serviceCharge () { serviceCharge () {
      return (this.money * (this.rate / 100)).toFixed(2) return (this.money * (this.rate / 100)).toFixed(2)
      }, },
      ...@@ -302,6 +309,7 @@ export default { ...@@ -302,6 +309,7 @@ export default {
      params: { params: {
      url: res.paymentURL, url: res.paymentURL,
      order_id: vm.$route.params.order_id, order_id: vm.$route.params.order_id,
      text: vm.text,
      }, },
      }) })
      } }
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment