Merge branch 'ren' into develop

config/index.js

 /*
  * @Author: your name
  * @Date: 2019-11-11 16:28:43
- * @LastEditTime: 2019-12-05 20:01:03
+ * @LastEditTime: 2019-12-06 11:17:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  */

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-03 09:50:57
+ * @LastEditTime: 2019-12-06 10:54:14
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -119,6 +119,8 @@ export default {
         vm.submitLists = []
         vm.approvedLists = []
         vm.user_bp_type = vm.$route.params.user_bp_type
+        vm.$refs.scroll.update(false)
+        vm.$refs.scroll.scrollToTop()
         vm.contractList()
       } else if (from.name === 'ContractDetail') {
         if (window.localStorage.backFlag === 'true') {

src/pages/distributorSign/contract-list.vue

@@ -111,6 +111,8 @@ export default {
         vm.approvedFlag = false
         vm.submitLists = []
         vm.approvedLists = []
+        vm.$refs.scroll.update(false)
+        vm.$refs.scroll.scrollToTop()
         vm.getLists()
       } else if (from.name === 'ContractDetails') {
         if (window.localStorage.backflag === 'true') {

src/pages/financingTrial/financing-details.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-12-03 18:02:46
+ * @LastEditTime: 2019-12-06 11:16:12
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -298,6 +298,9 @@ export default {
 </script>
 <style lang='less' scoped>
   #details1 {
+    .content {
+      padding-bottom: 200px;
+    }
     .date-pic {
       height: 17px;
       width: 17px;

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-11-22 09:28:00
+ * @LastEditTime: 2019-12-06 11:33:14
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -92,6 +92,8 @@ export default {
     next(vm => {
       vm.searchInput = ''
       vm.pagenum = 1
+      vm.$refs.scroll.scrollToTop()
+      vm.$refs.scroll.update(false)
       if (from.name === 'ProDetailed') {
         vm.price_date_to = vm.$route.params.price_date_to // 有效日期
         vm.plan_price = vm.$route.params.plan_price // 参考价

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
  * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-12-03 15:36:03
+ * @LastEditTime: 2019-12-06 11:24:24
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -315,6 +315,7 @@ export default {
               plan_price: price,
               price_date_to: date,
               division: this.baseInfo.division,
+              bp_id: this.baseInfo.bp_id,
             },
           })
         },

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-12-05 14:39:47
+ * @LastEditTime: 2019-12-06 10:48:38
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -535,7 +535,7 @@ export default {
     return {
       tabNum: 0,
       bp_id: '',
-      flag: true,
+      flag: true, // 显示未授权框
       bpClass: '',
       from: false,
       isApproved: false,
@@ -576,6 +576,7 @@ export default {
         id_card_date_to: '', // 法定代表人身份证有效期到
       },
       baseInfo: {
+        agent_username: '',
         district_id: '',
         district_name: '',
         province_name: '',
@@ -589,7 +590,6 @@ export default {
         auth_flag: 'N',
         user_phone: window.localStorage.user_phone,
         legal_person: '',
-        agent_username: '',
         enterprise_type: '',
         business_address: '',
         registered_place: '',
@@ -658,9 +658,9 @@ export default {
   computed: {},
   watch: {
     'baseInfo.auth_flag' (newVal, oldVal) {
-      if (newVal === 'Y') {
+      if (newVal === '是') {
         this.flag = false
-      } else if (newVal === 'N') {
+      } else if (newVal === '否') {
         this.flag = true
       }
     },
@@ -677,6 +677,7 @@ export default {
           vm.baseInfo.bp_type === 'FACTORY'
       ) {
         vm.bp_type_flag = false
+        vm.typeName = ''
       }
     },
     /* flag () {
@@ -942,7 +943,8 @@ export default {
     },
 
     verified () {
-      debugger
+      console.log(this.bpClass_flag)
+      // debugger
       /* if (this.flag) {   // 未授权
           // this.flag = false
           for (let i in this.authMsg) {
@@ -964,13 +966,14 @@ export default {
               this.legal_personMsg[i] = ''
             } */
 
-        this.baseInfo.auth_flag = 'N'
+        this.baseInfo.auth_flag = 'Y'
         this.lastInfo = {...this.baseInfo, ...this.legal_personMsg, ...this.authMsg}
         this.saveInfo = {
           ...this.lastInfo,
           ...this.invoiceInfo,
         }
       } else { // 未授权
+        this.baseInfo.auth_flag = 'N'
         this.lastInfo = {...this.baseInfo, ...this.legal_personMsg}
         this.saveInfo = {
           ...this.lastInfo,
@@ -982,11 +985,21 @@ export default {
 
       // 校验基本信息
       if (this.bpClass_flag) { // 业务经办人
+        console.log(this.lastInfo)
         delete this.lastInfo.business_license_num
         delete this.lastInfo.id_card_name
         for (var key in vm.lastInfo) {
           if (!vm.lastInfo[key]) {
             switch (key) {
+              case 'province_id':
+                vm.hlsPopup.showLongCenter('请选择省份')
+                break
+              case 'city_id':
+                vm.hlsPopup.showLongCenter('请选择城市')
+                break
+              case 'district_id':
+                vm.hlsPopup.showLongCenter('请选择区县')
+                break
               case 'bp_type':
                 vm.hlsPopup.showLongCenter('客户类型未填写')
                 break
@@ -1072,11 +1085,20 @@ export default {
         for (var key1 in vm.lastInfo) {
           if (!vm.lastInfo[key1]) {
             console.log('key', key1)
-            debugger
+            // debugger
             switch (key1) {
               case 'bp_type':
                 vm.hlsPopup.showLongCenter('客户类型未填写')
                 break
+              case 'province_id':
+                vm.hlsPopup.showLongCenter('请选择省份')
+                break
+              case 'city_id':
+                vm.hlsPopup.showLongCenter('请选择城市')
+                break
+              case 'district_id':
+                vm.hlsPopup.showLongCenter('请选择区县')
+                break
               case 'bp_name':
                 vm.hlsPopup.showLongCenter('公司名称未填写')
                 break
@@ -1409,9 +1431,9 @@ export default {
           Object.assign(vm.saveInfo, res.info)
           vm.addRows(vm.baseInfo.registered_place)
           vm.addRowsLive(vm.baseInfo.business_address)
-          if (vm.baseInfo.auth_flag === 'Y') {
+          if (vm.baseInfo.auth_flag === '是') {
             vm.flag = false
-          } else if (vm.baseInfo.auth_flag === 'N') {
+          } else if (vm.baseInfo.auth_flag === '否') {
             vm.flag = true
           }
           vm.loadItemList()// 附件查询