Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 19:45:11
+ * @LastEditTime: 2019-10-25 17:47:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -258,6 +258,7 @@ export default {
     },
     inSure () {
       // console.log(typeof window.sessionStorage.getItem('add_status'))
+      console.log(this.bank_flag)
       if (this.bank_flag) {
         // this.entry_info_flag = true
         let vm = this
@@ -265,7 +266,7 @@ export default {
         let param = {
           master: {
             confirm_id: vm.confirm_id,
-            con_confirm_status: 'APPROVED',
+            confirm_status: 'APPROVED',
           },
         }
         vm.hlsHttp.post(url, param).then(function (res) {
@@ -294,12 +295,25 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         console.log('bankcardinfo。。。。。。。。。。。。', res)
         if (res.result === 'S') {
-          if ('info' in res && Object.keys(res.info).length !== 0) {
-            // vm.bank_lists = [res.info]
-            // console.log(vm.bank_lists[0])
+          // if ('info' in res && Object.keys(res.info).length !== 0) {
+          // for (var key1 in res.info) {
+          //   if (!res.info[key1]) {
+          //     vm.bank_flag = false
+          //     return
+          //   } else {
+          //     vm.bank_flag = true
+          //   }
+          // }
+          if (res.info.bank_full_name === '') {
+            console.log(typeof res.info.bank_full_name)
             vm.bank_flag = true
           } else {
             vm.bank_flag = false
+          }
+          // vm.bank_lists = [res.info]
+          // console.log(vm.bank_lists[0])
+          // } else {
+          // vm.bank_flag = false
           // this.bank_lists = [
           //   {
           //     bank_full_name: '', // 银行名称
@@ -308,7 +322,7 @@ export default {
           //     bank_branch_name: '',
           //   },
           // ]
-          }
+          // }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-25 10:49:37
+ * @LastEditTime: 2019-10-25 16:43:13
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -235,6 +235,7 @@ export default {
           let url = $config.basePath + 'prd_product_info'
           let param = {
             product_id: vm.$route.params.product_id,
+            bp_id: vm.bp_id,
           }
           vm.$post(url, param).then(function (res) {
             console.log('基本信息', res)

src/pages/productQuery/product-list.vue

@@ -25,7 +25,7 @@
           </div>
           <div slot="content" class="item-content">
             <div class="centers">
-              <p class="firsts1">经销商</p>
+              <p class="firsts1">{{ item.bp_type_n }}</p>
               <p class="seconds1">{{ item.bp_name }}</p>
             </div>
             <div class="centers">