Merge branch 'ren' into develop

src/pages/signContract/contract-details.vue → src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
    * @Description: In User Settings Edit
      * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-09-25 19:02:22
+ * @LastEditTime: 2019-09-25 19:21:47
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -104,9 +104,6 @@
             <img src="@/assets/signContract/agreement.png" alt="" class="pic">
             <p class="second first">经销商担保协议</p>
           </div>
-          <!-- <div slot="content">
-            <p>经销商担保协议</p>
-          </div> -->
           <img slot="content" src="@/assets/signContract/into.png" alt="">
         </item>
       </list-item>
@@ -118,9 +115,6 @@
             <img src="@/assets/signContract/read.png" alt="" class="read">
           </div>
           <img slot="content" src="@/assets/signContract/into.png" alt="">
-          <!-- <div slot="content">
-            <p>经销商担保协议</p>
-          </div> -->
         </item>
       </list-item>
       <list-item :item-height="56">
@@ -131,9 +125,6 @@
             <img src="@/assets/signContract/unread.png" alt="" class="read">
           </div>
           <img slot="content" src="@/assets/signContract/into.png" alt="">
-          <!-- <div slot="content">
-            <p>经销商担保协议</p>
-          </div> -->
         </item>
       </list-item>
     </h-content>

src/pages/userBind/org/bankInfo.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 21:29:35
- * @LastEditTime: 2019-09-24 21:55:20
+ * @LastEditTime: 2019-09-25 19:34:03
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -57,6 +57,12 @@
 import backImg1 from '@/assets/userBind/nong.png'
 import backImg2 from '@/assets/userBind/unNong.png'
 export default {
+  props: {
+    bp_id: {
+      type: String,
+      default: '',
+    },
+  },
   data () {
     return {
       backImg: null,
@@ -97,12 +103,22 @@ export default {
       return num.substring(num.length - 4)
     },
     deleteFun (e) {
-      let index = this.bankList.findIndex(item => {
-        if (item.bank_account_num === e) {
-          return true
+      let url = $config.basePath + 'bp_bank_delete'
+      let param = {
+        'master': {
+          'bp_id': this.bp_id,
+          'company_id': '2145',
+        },
       }
+      this.hlsHttp.post(url, param).then(function (res) {
+        console.log('银行卡删除', res)
       })
-      this.bankList.splice(index, 1)
+      // let index = this.bankList.findIndex(item => {
+      //   if (item.bank_account_num === e) {
+      //     return true
+      //   }
+      // })
+      // this.bankList.splice(index, 1)
     },
   },
 }

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-09-25 11:01:21
+ * @LastEditTime: 2019-09-25 19:31:11
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -195,7 +195,7 @@
           </div>
         </div>
       </div>
-      <BankInfo v-show="tabNum==1" @getInfo="getInfo" />
+      <BankInfo v-show="tabNum==1" :bp_id="bp_id" @getInfo="getInfo" />
       <InvoiceInfo v-show="tabNum==2" @getinvoiceList="getinvoiceList" />
     </h-content>
     <bottom-tab class="footer-button">