Merge branch 'liuxin' into develop

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

@@ -122,8 +122,20 @@ export default {
       })
     },
     changePage () {
-      this.$router.push({
-        name: 'CreateBaseInfo',
+      let vm = this
+      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 () {},

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

@@ -300,7 +300,7 @@ export default {
       NPBaseInfo: {}, // 自然人基本信息
       ORGBaseInfo: {}, // 企业基本信息
       saveInfo: {// 需要保存的信息
-        project_id: '',
+        project_id: window.localStorage.project_id,
         bp_id: window.localStorage.bp_id,
         bp_class: window.localStorage.bp_class,
         equip_num: '',
@@ -403,24 +403,24 @@ export default {
     },
     save () {
       let vm = this
-      // let url = process.env.basePath + 'prj_base_info_save'
-      // let param = {
-      //   master: {...vm.saveInfo, ...vm.makeData()},
-      // }
-      // 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,
-        },
+      let url = process.env.basePath + 'prj_base_info_save'
+      let param = {
+        master: {...vm.saveInfo, ...vm.makeData()},
+      }
+      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)
+        }
       })
-      //   } else {
-      //     hlsPopup.showLongCenter(res.message)
-      //   }
-      // })
     },
     getBaseInfo () {
       this.getEquipInfo()

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

@@ -174,7 +174,6 @@ import zg from '@/assets/payment/zg.png'
 import zs from '@/assets/payment/zs.png'
 import zx from '@/assets/payment/zx.png'
 import bank from '@/assets/payment/bank.png'
-import yinlian from '@/assets/payment/bind.png'
 export default {
   name: 'PayEntry',
   components: {},
@@ -194,10 +193,6 @@ export default {
         bank_full_name: '',
         bank_account_num: '',
       },
-      checkPayWay: {
-        img: '',
-        pay_type_name: '',
-      },
       confirm: false,
       show: false,
       showOutside: false,
@@ -219,6 +214,13 @@ export default {
         return '确认订单'
       }
     },
+    text () {
+      if (this.checkType.bank_full_name.indexOf('农业') !== -1) {
+        return 'K码/K令支付'
+      } else if (this.checkType.bank_full_name.indexOf('农业') === -1) {
+        return '银联支付'
+      }
+    },
     serviceCharge () {
       return (this.money * (this.rate / 100)).toFixed(2)
     },
@@ -369,6 +371,7 @@ export default {
               params: {
                 url: res.paymentURL,
                 order_id: vm.$route.params.order_id,
+                text: vm.text,
               },
             })
           }

src/pages/pay/pay-page.vue

@@ -61,7 +61,7 @@
           </div>
         </div>
       </div>
-      <div>
+      <div v-if="!isSuccess||!isFaild">
         <div class="box-top">
           <img src="@/assets/payment/bank-title.png" >
         </div>
@@ -85,7 +85,7 @@
             </item>
             <item>
               <div slot="name" class="name">支付方式</div>
-              <div slot="content">K码/K令支付</div>
+              <div slot="content">{{ text }}</div>
             </item>
           </list-item>
           <div class="description">
@@ -114,6 +114,7 @@ export default {
     return {
       name: '',
       url: '',
+      text: this.$route.params.text,
       info: {
         order_number: '',
         pay_amount_name: '',
@@ -138,6 +139,7 @@ export default {
       vm.isGo = false
       vm.name = from.name
       vm.url = vm.$route.params.url
+      vm.text = vm.$route.params.text
       vm.getInfo()
     })
   },

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

@@ -210,6 +210,13 @@ export default {
         return '确认订单'
       }
     },
+    text () {
+      if (this.checkType.bank_full_name.indexOf('农业') !== -1) {
+        return 'K码/K令支付'
+      } else if (this.checkType.bank_full_name.indexOf('农业') === -1) {
+        return '银联支付'
+      }
+    },
     serviceCharge () {
       return (this.money * (this.rate / 100)).toFixed(2)
     },
@@ -302,6 +309,7 @@ export default {
               params: {
                 url: res.paymentURL,
                 order_id: vm.$route.params.order_id,
+                text: vm.text,
               },
             })
           }