Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 17:25:35
+ * @LastEditTime: 2019-10-23 18:37:15
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -172,6 +172,7 @@ export default {
       isshow: false, // 提示框的显示与隐藏
       num: 0,
       project_id: '',
+      confirm_id: '',
       conditionInfo: {},
       check1: Check1,
       check2: Check2,
@@ -187,6 +188,7 @@ export default {
     if (from.name === 'ContractSigning') {
       next(vm => {
         vm.project_id = vm.$route.params.project_id
+        vm.confirm_id = vm.$route.params.confirm_id
         vm.confirm_status = vm.$route.params.confirm_status
         vm.conditionQuery()
       })
@@ -250,19 +252,22 @@ export default {
       console.log(typeof window.sessionStorage.getItem('add_status'))
       if (window.sessionStorage.getItem('add_status') === 'true') {
         // this.entry_info_flag = true
-        // let vm = this
-        // let url = $config.basePath + 'con_bp_confirm'
-        // let param = {
-        //   project_id: this.$route.params.project_id,
-        // }
-        // vm.hlsHttp.post(url, param).then(function (res) {
-        //   console.log('商务条件', res)
+        let vm = this
+        let url = $config.basePath + 'con_bp_confirm'
+        let param = {
+          master: {
+            confirm_id: vm.confirm_id,
+            con_confirm_status: vm.confirm_status,
+          },
+        }
+        vm.hlsHttp.post(url, param).then(function (res) {
+          console.log('商务条件', res)
           // if (res.result === 'S') {
           //   vm.conditionInfo = res.info
           // } else {
           //   hlsPopup.showLongCenter(res.message)
           // }
-        // })
+        })
       } else {
         this.isshow = true
         // this.entry_info_flag = false

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 16:59:58
+ * @LastEditTime: 2019-10-23 18:36:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -31,7 +31,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status)">
+        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -56,7 +56,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status)">
+        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -126,13 +126,14 @@ export default {
       })
     },
     // val: project_id, status: confirm_status
-    goDetails (val, status) { // 银行卡录入页面keep alive为true，根据project_id和add_status重置页面
+    goDetails (val, status, id) { // 银行卡录入页面keep alive为true，根据project_id和add_status重置页面
       window.sessionStorage.setItem('add_status', false)
       this.$router.push({
         name: 'ContractDetail',
         params: {
           project_id: val,
           confirm_status: status,
+          confirm_id: id,
         },
       })
     },

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 17:33:47
+ * @LastEditTime: 2019-10-24 09:24:21
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -99,6 +99,7 @@ export default {
   watch: {},
   activated () {
     this.name = this.$route.params.name
+    this.bankCardQuery()
     if (this.project_id !== this.$route.params.project_id || !this.$route.params.entry_info_flag) {
       this.project_id = this.$route.params.project_id
       this.bankImg = ''
@@ -224,6 +225,16 @@ export default {
         })
       }
     },
+    bankCardQuery () {
+      let vm = this
+      let url = $config.basePath + 'con_bank_query'
+      let param = {
+        project_id: vm.$route.params.project_id,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        console.log('bankcardinfo。。。。。。。。。。。。', res)
+      })
+    },
   },
 }
 </script>

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-10-21 18:48:53
+ * @LastEditTime: 2019-10-24 09:10:29
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -198,7 +198,8 @@
     </h-content>
     <bottom-tab v-if="confirm_status!=='APPROVED'&& (this.$route.params.hasButtom || hasButtomStorage)" class="footer-button">
       <tab-button class="approve" @click.native="showModalValue=true">
-        <img src="@/assets/intoApproval/approve.png" >审批
+        <!-- <img src="@/assets/intoApproval/approve.png" > -->
+        确认签约
       </tab-button>
     </bottom-tab>
     <h-modal
@@ -385,7 +386,7 @@ export default {
        params: {
          project_id: window.sessionStorage.getItem('project_id'),
          confirm_status: this.confirm_status,
-         product_num: this.info.product_num
+         product_num: this.info.product_num,
        },
      })
    },

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-22 16:31:22
+ * @LastEditTime: 2019-10-23 20:06:47
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -97,7 +97,8 @@
       </list-item>
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button :class="{bgcolor: bgc_flag}" class="butt"
+      <tab-button
+        :class="{bgcolor: bgc_flag}" class="butt"
         @click.native="goTrial(baseInfo.plan_price,baseInfo.price_date_to)"><img
         src="@/assets/productQuery/trial.png" alt=""> 试算
       </tab-button>
@@ -111,14 +112,14 @@
 </template>
 
 <script>
-  import Tab from './tab'
+import Tab from './tab'
 
-  export default {
+export default {
   name: 'ProDetailed',
   components: {
     Tab,
   },
-    data() {
+  data () {
     return {
       text: '',
       tabNum: 0,
@@ -133,7 +134,7 @@
   },
   computed: {},
   watch: {},
-    beforeRouteEnter(to, from, next) {
+  beforeRouteEnter (to, from, next) {
     if (from.name === 'ProductList' || from.name === 'MyProductList') {
       next(vm => {
         vm.tabNum = 0
@@ -145,10 +146,10 @@
     }
     next()
   },
-    created() {
+  created () {
 
   },
-    activated() {
+  activated () {
     console.log('collect........', window.sessionStorage.getItem('collect_status'))
     if (window.sessionStorage.getItem('collect_status') === 'Y') {
       this.src = require('@/assets/productQuery/coll-success.png')
@@ -160,21 +161,21 @@
   },
   methods:
       {
-        getTabNum(i) {
+        getTabNum (i) {
           console.log(i)
           this.tabNum = i
         },
         // 收藏
-        collect() {
+        collect () {
           console.log('collect', window.sessionStorage.getItem('collect_status'))
           if (window.sessionStorage.getItem('collect_status') === 'Y') {
             let vm = this
-            this.hlsPopup.showConfirm({
-              title: '提示',
-              content: '您确认取消收藏吗？',
-              onConfirm: data => {
-                console.log(data)
-                if (data) {
+            // this.hlsPopup.showConfirm({
+            //   title: '提示',
+            //   content: '您确认取消收藏吗？',
+            //   onConfirm: data => {
+            //     console.log(data)
+            //     if (data) {
             let url = $config.basePath + 'delete_collection'
             let param = {
               master: {
@@ -193,11 +194,11 @@
                   vm.text = '收藏'
                   vm.collect_flag = false
                 }, 1500)
+                // }
+                // })
+                // }
               }
             })
-                }
-              },
-            })
           } else {
             this.show_text = '收藏成功'
             this.collect_flag = true
@@ -226,7 +227,7 @@
           }
         },
         // 基本信息查询
-        baseMsg() {
+        baseMsg () {
           let vm = this
           let url = $config.basePath + 'prd_product_info'
           let param = {
@@ -242,7 +243,7 @@
           })
         },
         // 详情查询
-        detailMsg() {
+        detailMsg () {
           let vm = this
           let url = $config.basePath + 'prd_product_detial'
           let param = {
@@ -264,7 +265,7 @@
           })
         },
         // 配置查询
-        confgMsg() {
+        confgMsg () {
           let vm = this
           let url = $config.basePath + 'prd_product_conf'
           let param = {
@@ -280,7 +281,7 @@
           })
         },
         // 试算price:产品参考价，date:有效日期
-        goTrial(price, date) {
+        goTrial (price, date) {
           this.$router.push({
             name: 'FinancingTrial',
             params: {
@@ -290,7 +291,7 @@
           })
         },
       },
-  }
+}
 </script>
 <style lang='less'>
   #detailed {

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-22 15:14:27
+ * @LastEditTime: 2019-10-23 20:09:16
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -26,7 +26,7 @@
         <div class="box" @click="goLists(item.division)">
           <div class="first">
             <img src="@/assets/productQuery/product-query.png" alt="">
-            <p class="product-class">产品类别</p>
+            <p class="product-class">主机厂</p>
             <p class="product">{{ item.factory_bp_name }}</p>
           </div>
           <div class="second">