Merge branch 'liuin' into uat

src/pages/distributorSign/contract-details.vue

@@ -322,6 +322,30 @@ export default {
   },
   created () {},
   methods: {
+    // 跳转银行信息录入
+    // entryInfo () {
+    //   let idCard = ''
+    //   if (this.baseInfo.auth_flag) {
+    //     this.baseInfo.auth_flag === '是'
+    //       ? (idCard = this.baseInfo.auth_person_id_card)
+    //       : this.baseInfo.id_card_no
+    //     console.log(',,,,,,,,,,,', idCard)
+    //   } else {
+    //     idCard = this.baseInfo.id_card_no
+    //   }
+    //   this.$router.push({
+    //     name: 'EntryInfo',
+    //     params: {
+    //       id_card_no: idCard,
+    //       bp_name: this.bp_name,
+    //       project_id: this.project_id,
+    //       confirm_status: this.con_confirm_status,
+    //       entry_info_flag: this.entry_info_flag,
+    //       user_bp_type: this.user_bp_type,
+    //       bp_id: this.baseInfo.bp_id,
+    //     },
+    //   })
+    // },
     charge (val, status) {
       let vm = this
       this.hlsPopup.showConfirm({

src/pages/myInfo/my-info.vue

@@ -431,18 +431,18 @@ export default {
     // 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入合同签约
     goSign () {
       if (this.bp_id) {
-        if (this.user_bp_type === 'AGENT') {
-          this.$router.push({
-            name: 'ContractList',
-          })
-        } else {
-          this.$router.push({
-            name: 'ContractSigning',
-            params: {
-              user_bp_type: this.user_bp_type,
-            },
-          })
-        }
+        // if (this.user_bp_type === 'AGENT') {
+        //   this.$router.push({
+        //     name: 'ContractList',
+        //   })
+        // } else {
+        this.$router.push({
+          name: 'ContractSigning',
+          params: {
+            user_bp_type: this.user_bp_type,
+          },
+        })
+        // }
       } else {
         hlsPopup.showLongCenter('请先进行用户绑定')
       }