Merge branch 'ren' into develop

src/pages/contractSigning/contract-content.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-10-29 09:55:09
+ * @LastEditors: your name
+ * @Description: In User Settings Edit
+ * @FilePath: \hls-xcmg-vue-app\src\pages\contractSigning\contract-content.vue
+ -->
 <template>
   <h-view id="contract-content" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -69,7 +77,6 @@ export default {
   methods:
  {
    getTabNum (i) {
-     console.log(i)
      this.tabNum = i
    },
  },

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-28 15:18:20
+ * @LastEditTime: 2019-10-29 10:04:11
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -218,8 +218,9 @@ export default {
       let param = {
         project_id: this.$route.params.project_id,
       }
+      vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        console.log('商务条件', res)
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.conditionInfo = res.info
         } else {
@@ -257,8 +258,6 @@ export default {
       })
     },
     inSure () {
-      // console.log(typeof window.sessionStorage.getItem('add_status'))
-      console.log(this.bank_flag)
       if (this.bank_flag) {
         hlsPopup.showLoading('请稍候')
         // this.entry_info_flag = true
@@ -294,15 +293,11 @@ export default {
       let param = {
         project_id: vm.project_id,
       }
-      vm.hlsPopup.showLoading('数据加载中')
+      // vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        console.log('bankcardinfo。。。。。。。。。。。。', res)
+        // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          // console.log(typeof res.info.bank_full_name)
-          console.log(!res.info.bank_full_name)
           if (res.info.bank_full_name === ' ') {
-            console.log(typeof res.info.bank_full_name)
             vm.bank_flag = false
           } else {
             vm.bank_flag = true

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-25 09:05:39
+ * @LastEditTime: 2019-10-29 09:56:37
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -115,8 +115,9 @@ export default {
       let param = {
         user_phone: window.localStorage.user_phone,
       }
+      vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        console.log(res)
+        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.submitLists = res.lists.filter(item => item.con_confirm_status === 'SUBMIT')
           vm.approvedLists = res.lists.filter(item => item.con_confirm_status === 'APPROVED')

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-25 15:22:54
+ * @LastEditTime: 2019-10-29 10:00:03
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -82,12 +82,6 @@ export default {
       bank_card_flag: false,
       res: '',
       name: '',
-      // bank_lists: {
-      //   bank_full_name: '', // 银行名称
-      //   bank_account_num: '', // 卡号
-      //   'bank_account_name': '',
-      //   'bank_branch_name': '',
-      // },
       bank_lists: [
         {
           bank_full_name: '', // 银行名称
@@ -212,11 +206,11 @@ export default {
             bank_lists: vm.bank_lists,
           },
         }
+        vm.hlsPopup.showLoading('请稍后')
         vm.hlsHttp.post(url, param).then(function (res) {
-          console.log('银行信息录入', res)
+          vm.hlsPopup.hideLoading()
           if (res.result === 'S') {
             vm.hlsPopup.showSuccess('保存成功')
-            // window.sessionStorage.setItem('add_status', true)
             vm.$routeGo()
             // vm.$router.push({
             //   name: 'ContractDetail',
@@ -237,20 +231,9 @@ export default {
         project_id: vm.$route.params.project_id,
       }
       vm.hlsHttp.post(url, param).then(function (res) {
-        console.log('bankcardinfo。。。。。。。。。。。。', res)
         if (res.result === 'S') {
           if ('info' in res) {
             vm.bank_lists = [res.info]
-            // console.log(vm.bank_lists[0])
-          } else {
-            // vm.bank_lists = [
-            //   {
-            //     bank_full_name: '', // 银行名称
-            //     bank_account_num: '', // 卡号
-            //     bank_account_name: '',
-            //     bank_branch_name: '',
-            //   },
-            // ]
           }
         } else {
           hlsPopup.showLongCenter(res.message)

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-10-28 15:14:10
+ * @LastEditTime: 2019-10-29 09:53:42
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -104,11 +104,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">手续费</div>
-<<<<<<< HEAD
-          <span slot="content">{{ info.lease_charge * info.product_num | currency }}</span>
-=======
           <span slot="content">{{ parseFloat(info.lease_charge * info.product_num).toFixed(2) | currency }}</span>
->>>>>>> 78be234f93b98e3c02766de91b9efe39492c02fe
         </item>
         <item>
           <div slot="name" class="font-color">保险押金</div>
@@ -120,11 +116,7 @@
         </item>
         <item>
           <div slot="name">首次付款合计</div>
-<<<<<<< HEAD
-          <span slot="content">{{ info.first_pay | currency }}</span>
-=======
           <span slot="content">{{ parseFloat(info.first_pay).toFixed(2) | currency }}</span>
->>>>>>> 78be234f93b98e3c02766de91b9efe39492c02fe
         </item>
         <item>
           <div slot="name" class="font-color">预计付款日</div>
@@ -304,7 +296,6 @@ export default {
        title: '提示',
        content: '您确认签约吗？',
        onConfirm: (data) => {
-         console.log(data)
          if (data) {
            this.issure('APPROVED')
          } else {
@@ -350,7 +341,6 @@ export default {
      }
      vm.hlsPopup.showLoading('数据加载中')
      vm.hlsHttp.post(url, param).then(function (res) {
-       console.log('baseinfo', res)
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          //  vm.lists = res.lists
@@ -371,7 +361,6 @@ export default {
      }
      vm.hlsPopup.showLoading('数据加载中')
      vm.hlsHttp.post(url, param).then(function (res) {
-       console.log('getGuarantor', res)
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          vm.guarantorInfo = res.lists
@@ -388,14 +377,12 @@ export default {
      vm.hlsPopup.showLoading('数据加载中')
      vm.hlsHttp.post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
-       console.log('result', res)
        if (res.result === 'S') {
          vm.info = res.info
        }
      })
    },
    getTabNum (i) {
-     console.log(i)
      this.tabNum = i
    },
    dateConverse (date) {
@@ -419,10 +406,6 @@ export default {
        title: '提示',
        content: `您确认${val}吗？`,
        onConfirm: (data) => {
-         console.log(data)
-         // if (val === '拒绝') {
-
-         // } else {
          if (data) {
            debugger
            let vm = this

src/pages/distributorSign/contract-list.vue

@@ -58,11 +58,7 @@
           </div>
           <div class="option">
             <p class="name">合同金额</p>
-<<<<<<< HEAD
-            <p class="normal money">{{ item.total_price|currency }}</p>
-=======
             <p class="normal money">{{ parseFloat(item.total_price).toFixed(2)|currency }}</p>
->>>>>>> 78be234f93b98e3c02766de91b9efe39492c02fe
             <img src="@/assets/distributorSign/goDetails.png" alt="">
           </div>
           <div class="option">
@@ -92,7 +88,6 @@ export default {
     }
   },
   created () {
-    console.log(window.localStorage.user_phone)
     let vm = this
     let url = $config.basePath + 'prj_confirm_list_query'
     let param = {
@@ -101,7 +96,6 @@ export default {
     vm.hlsPopup.showLoading('数据加载中')
     vm.hlsHttp.post(url, param).then(function (res) {
       vm.hlsPopup.hideLoading()
-      console.log(res.result)
       if (res.result === 'S') {
         vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
         vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
@@ -111,7 +105,6 @@ export default {
   },
   methods: {
     goDetails (item) {
-      console.log(item.project_id, item.bp_class)
       window.sessionStorage.setItem('bp_class', item.bp_class)
       window.sessionStorage.setItem('project_id', item.project_id)
       this.$router.push({

src/pages/distributorSign/financ-details.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-27 18:07:12
- * @LastEditTime: 2019-10-28 15:11:57
+ * @LastEditTime: 2019-10-29 09:54:47
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -31,11 +31,7 @@
         <div class="top-detail">
           <div class="left">
             <span class="line">手续费</span>
-<<<<<<< HEAD
-            <span>￥{{ info.lease_charge * product_num |currency }}</span>
-=======
             <span>￥{{ parseFloat(info.lease_charge * product_num).toFixed(2) |currency }}</span>
->>>>>>> 78be234f93b98e3c02766de91b9efe39492c02fe
           </div>
           <div class="right">
             <span class="line">合同期数</span>
@@ -93,17 +89,11 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          console.log(res)
           vm.lists = res.lists
           Object.assign(vm.info, res.info)
         }
       })
     },
-    // goTrial () {
-    //   this.$router.push({
-    //     name: 'FinancingTrial',
-    //   })
-    // },
     dateConverse (date) {
       return date.replace(/\//g, '-')
     },

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-10-22 10:40:02
+ * @LastEditTime: 2019-10-29 09:51:46
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -104,7 +104,6 @@ export default {
       next(vm => {
         vm.price_date_to = vm.$route.params.price_date_to // 有效日期
         vm.plan_price = vm.$route.params.plan_price // 参考价
-        // console.log(vm.plan_price, vm.price_date_to)
       })
     }
     next()

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-10-24 10:52:13
+ * @LastEditTime: 2019-10-29 09:52:41
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -65,23 +65,12 @@ export default {
       next(vm => {
         vm.price_date_to = vm.$route.params.price_date_to // 有效日期
         vm.plan_price = vm.$route.params.plan_price // 参考价
-        // console.log(vm.plan_price, vm.price_date_to)
       })
     }
     next()
   },
   activated () {
-    // let vm = this
-    // let url = $config.basePath + 'con_bank_query'
-    // let param = {
-    //   project_id: vm.$route.params.project_id,
-    // }
-    // vm.hlsHttp.post(url, param).then(function (res) {
-    //   console.log('bankcardinfo。。。。。。。。。。。。', res)
-    //   if (!(JSON.stringify(res.info) === '{}')) {
-    //     vm.bank_lists[0] = res.info
-    //   }
-    // })
+
   },
   created () {
 

src/pages/home/home-page.vue

@@ -2,7 +2,7 @@
    * @Descrip: 主页
  * @Author: your name
  * @Date: 2019-10-10 14:25:15
- * @LastEditTime: 2019-10-28 10:50:02
+ * @LastEditTime: 2019-10-29 09:50:16
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -31,15 +31,6 @@
           :data="item" @clickFunction="goModuleFunction"/>
       </div>
 
-      <!--  <div class="middle-box">
-        <header>常用应用</header>
-        <div class="function">
-          <function-item
-            v-for="(item,index) in functionList" :key="index" :functionIcon="item.functionIcon"
-            :functionName="item.functionName"
-            :data="item" class="function-item vue-1px" @clickFunction="goFunctionHome"/>
-        </div>
-      </div>-->
       <div class="center-pic">
         <div class="left-pic">
           <img src="@/assets/homePage/1 copy@2x.png" alt="">
@@ -136,10 +127,8 @@ export default {
      geolocation.getCurrentPosition(function (res) {
        //  debugger
        if (this.getStatus() === 0) {
-         console.log('定位。。。。', res.address)
          // 判断是否是手动选择过定位
          if (window.localStorage.getItem('province')) {
-           console.log('ssss', window.localStorage.getItem('province'))
            vm.city = window.localStorage.getItem('city')
            vm.province = window.localStorage.getItem('province')
          } else {
@@ -154,29 +143,6 @@ export default {
      this.$router.push({
        name: data.functionState,
      })
-     /* if (data.functionState === 'NaturePersonReadOnly') {
-       if (this.user_bp_status !== 'APPROVING' && this.user_bp_class === 'NP') {
-         this.$router.push({
-           name: 'NaturePersonReadOnly',
-           params: {
-             'bp_id': this.bp_id,
-           },
-         })
-       } else if (this.user_bp_status !== 'APPROVING' && this.user_bp_class === 'ORG') {
-         this.$router.push({
-           name: 'EnterpriseReadOnly',
-           params: {
-             'bp_id': this.bp_id,
-           },
-         })
-       } else {
-         this.hlsPopup.showLongCenter('您的绑定申请还在流程中')
-       }
-     } else {
-       this.$router.push({
-         name: data.functionState,
-       })
-     } */
    },
    goModuleFunction (data) {
      this.$router.push({

src/pages/home/location.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-10-11 09:39:51
- * @LastEditTime: 2019-10-15 14:12:36
+ * @LastEditTime: 2019-10-29 09:51:19
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -99,7 +99,6 @@ export default {
           geolocation.getCurrentPosition(function (res) {
             //  debugger
             if (this.getStatus() === 0) {
-              console.log('定位。。。。', res.address)
               window.localStorage.setItem('province', res.address.province)
               window.localStorage.setItem('city', res.address.city)
               vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city')
@@ -119,7 +118,6 @@ export default {
           vm.hlsPopus.showLoading('请稍后')
           vm.hlsHttp.post(url, param).then(function (res) {
             vm.hlsPopup.hideLoading()
-            console.log(res)
             vm.lists = res.lists
             vm.$nextTick(() => {
               vm.scroll = new BScroll(vm.$refs.pro, {
@@ -134,7 +132,6 @@ export default {
 
         // 省份与城市切换
         changeStyle (val) {
-          console.log(val)
           if (val === 1) {
             this.flag = false
             this.province_flag = true
@@ -170,7 +167,6 @@ export default {
             title: '提示',
             content: `是否切换到${val}？`,
             onConfirm: (data) => {
-              console.log(data)
               if (data) {
                 //  window.sessionStorage.setItem('bp_class', item.bp_class)
                 window.localStorage.setItem('province', this.province)

src/pages/myProductCollection/my-product-list.Vue

 <!--
  * @Author: your name
  * @Date: 2019-10-22 20:26:28
- * @LastEditTime: 2019-10-25 16:02:57
+ * @LastEditTime: 2019-10-29 10:08:31
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \hls-xcmg-vue-app\src\pages\myProductCollection\my-product-list.Vue
@@ -84,7 +84,9 @@ export default {
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
       }
+      hlsPopup.showLoading('数据加载中')
       vm.$post(url, param).then(function (res) {
+        hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.productList = res.lists
         } else {

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-28 14:55:46
+ * @LastEditTime: 2019-10-29 09:40:27
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -151,7 +151,6 @@ export default {
 
   },
   activated () {
-    console.log('collect........', window.sessionStorage.getItem('collect_status'))
     if (window.sessionStorage.getItem('collect_status') === 'Y') {
       this.src = require('@/assets/productQuery/coll-success.png')
       this.text = '取消收藏'
@@ -168,15 +167,8 @@ export default {
         },
         // 收藏
         collect () {
-          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({
-            //   title: '提示',
-            //   content: '您确认取消收藏吗？',
-            //   onConfirm: data => {
-            //     console.log(data)
-            //     if (data) {
             let url = $config.basePath + 'delete_collection'
             let param = {
               master: {
@@ -188,7 +180,6 @@ export default {
             vm.hlsPopup.showLoading('请稍后')
             vm.$post(url, param).then(function (res) {
               vm.hlsPopup.hideLoading()
-              console.log('取消收藏。。。。。。。。', res)
               if (res.result === 'S') {
                 window.sessionStorage.setItem('collect_status', 'N')
                 vm.show_text = '取消成功'
@@ -198,15 +189,11 @@ export default {
                   vm.text = '收藏'
                   vm.collect_flag = false
                 }, 1500)
-                // }
-                // })
-                // }
               }
             })
           } else {
             this.show_text = '收藏成功'
             this.collect_flag = true
-            console.log(this.collect_flag)
             let vm = this
             let url = $config.basePath + 'save_collection'
             let param = {
@@ -218,7 +205,6 @@ export default {
             }
             vm.hlsPopup.showLoading('请稍后')
             vm.$post(url, param).then(function (res) {
-              console.log('收藏', res)
               vm.hlsPopup.hideLoading()
               if (res.result === 'S') {
                 window.sessionStorage.setItem('collect_status', 'Y')
@@ -244,7 +230,6 @@ export default {
           vm.hlsPopup.showLoading('数据加载中')
           vm.$post(url, param).then(function (res) {
             vm.hlsPopup.hideLoading()
-            console.log('基本信息', res)
             if (res.result === 'S') {
               vm.baseInfo = res.info
             } else {
@@ -261,16 +246,13 @@ export default {
           }
           vm.hlsPopup.showLoading('数据加载中')
           vm.$post(url, param).then(function (res) {
-            console.log('产品详情', res)
             vm.hlsPopup.hideLoading()
             if (res.result === 'S') {
               vm.detailInfo = res.info
-              // vm.picLists = res.lists
               res.lists.forEach(item => {
                 item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
               })
               vm.picLists = res.lists
-              console.log('。。。。。。。。。。。。。。。', res.lists)
             } else {
               hlsPopup.showLongCenter(res.message)
             }
@@ -285,7 +267,6 @@ export default {
           }
           vm.hlsPopup.showLoading('数据加载中')
           vm.$post(url, param).then(function (res) {
-            console.log('配置信息', res)
             vm.hlsPopup.hideLoading()
             if (res.result === 'S') {
               vm.confgInfo = res.info

src/pages/productQuery/product-list.vue

@@ -55,15 +55,6 @@ export default {
   },
   computed: {},
   watch: {},
-  // beforeRouteEnter (to, from, next) {
-  //   if (from.name === 'QueryHome') {
-  //     next(vm => {
-  //       // vm.proQuery()
-  //       // vm.division = vm.$route.params.division
-  //     })
-  //   }
-  //   next()
-  // },
   activated () {
     // debugger
     this.proQuery()
@@ -80,7 +71,6 @@ export default {
      }
      vm.hlsPopup.showLoading('数据加载中')
      vm.$post(url, param).then(function (res) {
-       console.log(res)
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          vm.lists = res.lists
@@ -97,7 +87,6 @@ export default {
        params: {
          product_id: val,
          bp_id: bp_id,
-         //  collect_status: status,
        },
      })
    },

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-23 20:09:16
+ * @LastEditTime: 2019-10-29 09:42:12
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -57,9 +57,6 @@ export default {
   computed: {},
   watch: {},
   beforeRouteEnter (to, from, next) {
-    // console.log('........from', from)
-    // console.log('........to', to)
-    // console.log('........next', next)
     if (from.name === 'HomePage') {
       next(vm => {
         vm.proQuery()
@@ -77,7 +74,6 @@ export default {
      vm.hlsPopup.showLoading('数据加载中')
      vm.$post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
-       console.log(res)
        if (res.result === 'S') {
          vm.prolists = res.lists
        } else {
@@ -90,9 +86,6 @@ export default {
      window.sessionStorage.setItem('division', val)
      this.$router.push({
        name: 'ProductList',
-       //  params: {
-       //    division: val,
-       //  },
      })
    },
 
@@ -118,15 +111,11 @@ export default {
            code: 'bp_type',
            object: {},
            returnItem: function (index, obj) {
-             console.log('index:' + index + ',object:' + vum.toJson(obj))
              // 更改产品线（division）和 产品线描述（division_n）
              vm.prolists[ind].division_n = obj.bp_type_n
              vm.prolists[ind].division = obj.bp_type
            },
          })
-
-         //  vm.list_flag = !vm.list_flag
-         // vm.factory_bp_id = val
        } else {
          hlsPopup.showLongCenter(res.message)
        }

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-27 10:15:09
+ * @LastEditTime: 2019-10-29 09:43:03
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -98,7 +98,6 @@ export default {
         title: '提示',
         content: '您确认删除吗？',
         onConfirm: data => {
-          console.log(data)
           if (data === 1) {
             let index = this.getBankList.findIndex(item => {
               if (item.bank_account_num === e) {

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-10-24 10:00:33
+ * @LastEditTime: 2019-10-29 09:47:54
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -337,8 +337,9 @@
         </div>
       </div>
       <!-- <BankInfo v-show="tabNum==1" :bp_id="bp_id" @getInfo="getInfo" /> -->
-      <BankInfo v-show="tabNum==1" :from="from" :getBankList="getBankList" @getInfo="getInfo" 
-@getList="getList" />
+      <BankInfo 
+v-show="tabNum==1" :from="from" :getBankList="getBankList" @getInfo="getInfo"
+                @getList="getList" />
       <InvoiceInfo
         v-show="tabNum==2"
         :tabNum="tabNum"
@@ -526,7 +527,6 @@ export default {
   computed: {},
   watch: {
     'baseInfo.auth_flag' (newVal, oldVal) {
-      console.log('###########################################')
       if (newVal === '是') {
         this.flag = false
       } else if (newVal === '否') {
@@ -539,16 +539,12 @@ export default {
       if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') {
         vm.type = '请输入业务经办员工代码'
         vm.typeName = '业务经办人'
-        // vm.baseInfo.agent_username = ''
       } else if (
         vm.baseInfo.bp_type === 'AGENT' ||
         vm.baseInfo.bp_type === 'OFFICE' ||
         vm.baseInfo.bp_type === 'FACTORY'
       ) {
         vm.bp_type_flag = false
-        // vm.typeName = '营业执照'
-        // vm.type = '请输入营业执照号'
-        // vm.baseInfo.agent_username = ''
       }
     },
     flag () {
@@ -663,7 +659,6 @@ export default {
               }
               let vm = this
               this.hlsHttp.post(url, param).then(function (res) {
-                console.log('企业信息提交', res)
                 if (res.result === 'S') {
                   vm.hlsPopup.showSuccess('提交成功')
                   vm.$router.push({
@@ -683,7 +678,6 @@ export default {
         title: '提示',
         content: '您确认添加吗？',
         onConfirm: data => {
-          console.log(data)
           if (data === 1) {
             for (var key in this.bank_lists) {
               if (!this.bank_lists[key]) {
@@ -721,7 +715,6 @@ export default {
               }
               let vm = this
               vm.hlsHttp.post(url, param).then(function (res) {
-                //   console.log(res)
                 if (res.result === 'S') {
                   vm.hlsPopup.hideLoading()
                   vm.showModalValue = false
@@ -732,7 +725,6 @@ export default {
                   }
 
                   vm.hlsHttp.post(url, param).then(function (res) {
-                    console.log('银行卡查询', res)
                     vm.getBankList = res.lists
                   })
                 }
@@ -775,7 +767,6 @@ export default {
         }
         this.saveInfo.auth_flag = 'Y'
       }
-      console.log('last', this.lastInfo, this.invoiceInfo)
       let vm = this
 
       // 校验基本信息
@@ -784,7 +775,6 @@ export default {
         delete this.lastInfo.id_card_name
         for (var key in vm.lastInfo) {
           if (!vm.lastInfo[key]) {
-            console.log('key', key, vm.bpClass)
             switch (key) {
               case 'bp_type':
                 vm.hlsPopup.showLongCenter('客户类型未填写')
@@ -920,11 +910,6 @@ export default {
         this.lastInfo.agent_username = ''
         this.lastInfo.id_card_name = ''
       }
-
-      // if (!vm.bp_type_flag) {
-      // vm.baseInfo.agent_username = ''
-      // vm.saveInfo.agent_username = ''
-      // }
       // 校验电话号
       let re = this.hlsUtil.phoneNumber(this.saveInfo.cell_phone)
       if (!re && this.baseInfo.auth_flag === 'N') {
@@ -951,7 +936,6 @@ export default {
           master: vm.saveInfo,
         }
         vm.hlsHttp.post(url, param).then(function (res) {
-          console.log(res)
           if (res.result === 'S') {
             vm.hlsPopup.hideLoading()
             vm.hlsPopup.showSuccess('保存成功')
@@ -990,7 +974,6 @@ export default {
       this.baseInfo.organization_code = val.organization_code
     },
     authorizeChange () {
-      console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!')
       this.flag = !this.flag
       if (this.flag) {
         this.auth_flag = '未授权'

src/pages/userBind/org/invoiceInfo.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-09-29 11:25:28
+ * @LastEditTime: 2019-10-29 09:48:42
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -113,7 +113,6 @@ export default {
     },
   },
   created () {
-    console.log('orgCode', this.orgCode)
     this.getInvoiceType()
     this.getTaxpayer()
   },
@@ -148,7 +147,6 @@ export default {
     },
     addRowsLive (e) {
       let addNum = parseInt(e.length / 16)
-      console.log(addNum)
       if (addNum === 0) {
         this.$refs.myTestareaLive.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {