Merge branch 'liuxin' into develop

src/pages/infoCenter/infoList.vue

@@ -66,7 +66,9 @@ export default {}
           font-family: PingFangSC-Regular;
           font-size: 12px;
           color: rgba(56, 63, 69, 0.6);
-          margin-left: 160px;
+          flex:6;
+          // margin-left: 160px;
+          // margin-right:-160px;
         }
       }
       .arrow{
@@ -80,10 +82,12 @@ export default {}
         color: #00469c;
         font-weight: bold;
         margin-left: 11px;
+        flex:15;
       }
       .icon {
         width: 13px;
         height: 15px;
+        flex:1;
       }
       .message {
         font-family: PingFangSC-Regular;

src/pages/intoApproval/intoApproval/base.vue

@@ -255,7 +255,8 @@
             <input slot="content" v-model="companyInfo.auth_flag" readonly >
           </item>
         </list-item>
-        <div class="userInfo">法人授权信息</div>
+        <div v-if="companyInfo.auth_flag === '否'" class="userInfo">法人代表信息</div>
+        <div v-if="companyInfo.auth_flag === '是'" class="userInfo">法人授权信息</div>
         <list-item v-if="companyInfo.auth_flag === '是'" :item-height="44">
           <item>
             <div slot="name">姓名</div>

src/pages/myInfo/my-info.vue

@@ -91,20 +91,30 @@ export default {
       user_bp_class: '',
       bp_id: '',
       user_phone: '',
-      show: false,
+      // show: false,
     }
   },
+  watch: {
+    'user_bp_status' (newVal, oulVal) {
+      if (newVal === 'APPROVED') {
+        this.flag = false
+      } else {
+        this.flag = true
+      }
+    },
+  },
   created () {
-    if (this.user_phone) {
-      this.show = false
+    if (this.user_bp_status === 'APPROVED') {
+      this.flag = false
     } else {
-      this.show = true
+      this.flag = true
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.userQuery()
     })
+    next()
   },
   activated () {},
   methods: {
@@ -185,13 +195,15 @@ export default {
               .then(function (res) {
                 vm.hlsPopup.hideLoading()
                 if (res.result === 'S') {
-                  debugger
-                  this.hlsPopup.showLongCenter('解绑成功')
-                  this.flag = true
+                  vm.hlsPopup.showLongCenter('解绑成功')
+                  vm.userQuery()
+                  vm.flag = true
+                } else {
+                  vm.hlsPopup.showLongCenter(res.message)
                 }
               })
               .catch(() => {
-                this.hlsPopup.showLongCenter('传入参数异常')
+                vm.hlsPopup.showLongCenter('传入参数异常')
               })
           }
         },

src/pages/pay/firstPay/contract-record.vue

@@ -13,7 +13,7 @@
       </div>
     </div>
     <h-content class="pay-content">
-      <section v-for="(item,index) in lists" :key="index" class="contract-item">
+      <section v-for="(item,index) in 2" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/contract.png" alt="">
           <p>合同号  &nbsp; {{ item.project_number }}</p>
@@ -41,6 +41,18 @@
             <p>900.00</p>
             <input type="text" placeholder="请输入还款金额">
           </div>
+          <div class="list">
+            <span>保险押金</span>
+            <div>10,000.00</div>
+            <p>8,000.00</p>
+            <input type="text" placeholder="请输入还款金额">
+          </div>
+          <div class="list">
+            <span>GPS费用</span>
+            <div>10,000.00</div>
+            <p>8,000.00</p>
+            <input type="text" placeholder="请输入还款金额">
+          </div>
         </div>
       </section>
     </h-content>

src/pages/pay/payment/contract-record.vue

@@ -39,7 +39,7 @@
             </div>
             <div class="list">
               <div><span>车牌号</span> <span>98765556</span> </div>
-              <div><span>本次还款</span><section><input type="text" placeholder="请输入还款金额"></section></div>
+              <div><span>本次还款</span><section><input v-model="reFund1" type="text" placeholder="请输入还款金额"></section></div>
             </div>
           </div>
           <div class="item">
@@ -88,6 +88,8 @@ export default {
   data () {
     return {
       money: '',
+      reFund1: '',
+      reFund2: '',
     }
   },
   computed: {},

src/pages/userBind/np/naturePerson.vue

@@ -401,7 +401,7 @@ export default {
     this.getBpType()
     this.getEducationBackground()
     this.getMarital()
-    this.getBankInfo()
+    // this.getBankInfo()
     this.getProvince()
     if (this.$route.params.status === 'APPROVED') {
       this.isApproved = true
@@ -413,6 +413,7 @@ export default {
         vm.basicInfoQuery()
         vm.loadItemList()// 附件查询
         vm.from = true
+        vm.getBankInfo()
       })
     }
     next()
@@ -432,6 +433,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.baseInfo, res.info)
+          vm.from = true
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -901,10 +903,11 @@ export default {
     },
     getBankInfo () {
       let vm = this
-      let bpId = window.localStorage.getItem('user_id')
+      // let bpId = window.localStorage.getItem('user_id')
+      let id = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('user_id')
       let url = process.env.basePath + 'bp_bank_query'
       let param = {
-        bp_id: bpId,
+        bp_id: id,
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp

src/pages/userBind/org/enterprise.vue

@@ -328,8 +328,8 @@
       />
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button :class="[isApproved?'put-approved':'put']" @click.native="handSubmit">提交</tab-button>
-      <tab-button v-if="!isApproved" class="save" @click.native="verified">保存</tab-button>
+      <tab-button class="put" @click.native="handSubmit">提交</tab-button>
+      <tab-button class="save" @click.native="verified">保存</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" position="bottom">
       <h-view>