Merge branch 'ren' into develop

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 19:58:14
+ * @LastEditTime: 2019-10-25 11:06:38
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -29,7 +29,7 @@
           <item>
             <div slot="name" >银行卡卡号</div>
             <input
-              slot="content" v-model="bank_lists[0].bank_account_num" type="text" readonly
+              slot="content" v-model="bank_lists[0].bank_account_num" type="text"
               placeholder="上传银行卡自动填充"
             >
           </item>
@@ -40,7 +40,7 @@
           <item>
             <div slot="name" >银行名称</div>
             <input
-              slot="content" v-model="bank_lists[0].bank_full_name" readonly type="text"
+              slot="content" v-model="bank_lists[0].bank_full_name" type="text"
               placeholder="请输入银行名称">
           </item>
           <item>

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-10-25 10:00:25
+ * @LastEditTime: 2019-10-25 11:41:16
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -315,32 +315,38 @@ export default {
        onConfirm: (data) => {
          console.log(data)
          if (data) {
-           let vm = this
-           let url = process.env.basePath + 'do_confrim_bp'
-           let param = {
-             'master': {
-               confirm_id: vm.$route.params.confirm_id,
-               confirm_status: status,
-               confirm_note: vm.confirm_note,
-             },
-           }
-           vm.hlsPopup.showLoading('提交数据中!')
-           vm.hlsHttp.post(url, param).then(function (res) {
-             vm.hlsPopup.hideLoading()
-             if (res.result === 'S') {
-               vm.hlsPopup.showSuccess('签约成功')
-               vm.$router.push({
-                 name: 'ContractList',
-               })
-             } else {
-               vm.hlsPopup.showSuccess(res.message)
-             }
-           })
+           this.issure('APPROVED')
+         } else {
+           this.issure('REJECTED')
          }
        },
 
      })
    },
+
+   issure (status) {
+     let vm = this
+     let url = process.env.basePath + 'do_confrim_bp'
+     let param = {
+       'master': {
+         confirm_id: vm.$route.params.confirm_id,
+         confirm_status: status,
+         confirm_note: vm.confirm_note,
+       },
+     }
+     vm.hlsPopup.showLoading('提交数据中!')
+     vm.hlsHttp.post(url, param).then(function (res) {
+       vm.hlsPopup.hideLoading()
+       if (res.result === 'S') {
+         vm.hlsPopup.showSuccess('签约成功')
+         vm.$router.push({
+           name: 'ContractList',
+         })
+       } else {
+         vm.hlsPopup.showSuccess(res.message)
+       }
+     })
+   },
    // 基本信息
    getBseMsg () {
      let vm = this

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-23 20:06:47
+ * @LastEditTime: 2019-10-25 10:49:37
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -139,6 +139,7 @@ export default {
       next(vm => {
         vm.tabNum = 0
         vm.product_id = vm.$route.params.product_id
+        vm.bp_id = vm.$route.params.bp_id
         vm.baseMsg()
         vm.detailMsg()
         vm.confgMsg()
@@ -167,7 +168,7 @@ export default {
         },
         // 收藏
         collect () {
-          console.log('collect', window.sessionStorage.getItem('collect_status'))
+          console.log('collect', window.sessionStorage.getItem('collect_status'), window.sessionStorage.bp_id)
           if (window.sessionStorage.getItem('collect_status') === 'Y') {
             let vm = this
             // this.hlsPopup.showConfirm({
@@ -181,6 +182,7 @@ export default {
               master: {
                 product_id: vm.product_id,
                 user_phone: window.localStorage.user_phone,
+                bp_id: vm.bp_id,
               },
             }
             vm.$post(url, param).then(function (res) {
@@ -209,6 +211,7 @@ export default {
               master: {
                 product_id: vm.product_id,
                 user_phone: window.localStorage.user_phone,
+                bp_id: vm.bp_id,
               },
             }
             vm.$post(url, param).then(function (res) {

src/pages/productQuery/product-list.vue

@@ -19,7 +19,7 @@
         </div>
       </div>
       <list-item v-for="item in lists" :key="item.product_id">
-        <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status)">
+        <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)">
           <div slot="name" class="item-pic">
             <img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
           </div>
@@ -88,12 +88,13 @@ export default {
      })
    },
    // val：产品id, status: 收藏状态
-   goDetailed (val, status) {
+   goDetailed (val, status, bp_id) {
      window.sessionStorage.setItem('collect_status', status)
      this.$router.push({
        name: 'ProDetailed',
        params: {
          product_id: val,
+         bp_id: bp_id,
          //  collect_status: status,
        },
      })