Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/myInfo/my-info.vue

@@ -87,21 +87,30 @@ export default {
   data () {
     return {
       flag: true,
+      isAGENT: false,
       user_bp_status: '',
       user_bp_class: '',
       bp_id: '',
       user_phone: '',
       user_bp_name: '',
+      user_bp_type: '',
     }
   },
   watch: {
-    'user_bp_status' (newVal, oulVal) {
+    'user_bp_status' (newVal, oldVal) {
       if (newVal === 'APPROVED') {
         this.flag = false
       } else {
         this.flag = true
       }
     },
+    'user_bp_type' (newVal, oldVal) {
+      if (newVal === 'AGENT') {
+        this.isAGENT = true
+      } else {
+        this.isAGENT = false
+      }
+    },
   },
   created () {
     if (this.user_bp_status === 'APPROVED') {
@@ -109,6 +118,11 @@ export default {
     } else {
       this.flag = true
     }
+    if (this.user_bp_type === 'AGENT') {
+      this.isAGENT = true
+    } else {
+      this.isAGENT = false
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
@@ -239,6 +253,7 @@ export default {
               params: {
                 bp_id: this.bp_id,
                 user_bp_name: this.user_bp_name,
+                isAGENT: this.isAGENT,
                 status: 'APPROVED',
               },
             })
@@ -248,6 +263,7 @@ export default {
               params: {
                 bp_id: this.bp_id,
                 user_bp_name: this.user_bp_name,
+                isAGENT: this.isAGENT,
                 status: 'APPROVED',
               },
             })
@@ -279,6 +295,7 @@ export default {
           vm.user_bp_class = res.info.user_bp_class
           vm.bp_id = res.info.user_bp_id
           vm.user_bp_name = res.info.user_bp_name
+          vm.user_bp_type = res.info.user_bp_type
           vm.user_phone = res.info.user_phone
         } else {
           this.hlsPopup.showLongCenter(res.message)

src/pages/userBind/np/naturePerson.vue

@@ -212,7 +212,16 @@
             </div>
           </div>
         </div>
+        <div v-if="from&&isApproved&&isAGENT" class="tax" @click="changeUndertake">
+          <img src="@/assets/userBind/tax.png" class="left-img">
+          <div>
+            <span>缴纳保证金</span>
+            <p>已缴纳：500000</p>
+          </div>
+          <img src="@/assets/userBind/arrow-right.png" class="right-img">
+        </div>
       </div>
+
       <BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo" @getList="getList"/>
       <InvoiceInfo
         v-show="tabNum==2"
@@ -296,6 +305,7 @@ export default {
       showModalValue: false,
       isApproved: false,
       isSave: false,
+      isAGENT: this.$route.params.isAGENT,
       isSelected: false,
       tabNum: 0,
       from: false,
@@ -746,7 +756,7 @@ export default {
         } else {
           if (ocrType === 'idCard') {
             vm.idCardEditFlag = true // 身份证图片状态已修改
-            type === 'front' ? (vm.idCardFront = imgdata, vm.idCardIdentify(imgdata), vm.idCardImgList.push({'url':imgdata,'fileName':'front'})) : (vm.idCardBack = imgdata, vm.idCardImgList.push({'url':imgdata,'fileName':'back'}))
+            type === 'front' ? (vm.idCardFront = imgdata, vm.idCardIdentify(imgdata), vm.idCardImgList.push({'url': imgdata, 'fileName': 'front'})) : (vm.idCardBack = imgdata, vm.idCardImgList.push({'url': imgdata, 'fileName': 'back'}))
           } else if (ocrType === 'bankCard') {
             vm.bankImg = imgdata
             vm.bankCardIdentify(imgdata)
@@ -772,7 +782,7 @@ export default {
         } else {
           if (ocrType === 'idCard') {
             vm.idCardEditFlag = true // 身份证图片状态已修改
-            type === 'front' ? (vm.idCardFront = imgUrl[0], vm.idCardIdentify(imgUrl[0]), vm.idCardImgList.push({'url':imgUrl[0],'fileName':'front'})) : (vm.idCardBack = imgUrl[0], vm.idCardImgList.push({'url':imgUrl[0],'fileName':'back'}))
+            type === 'front' ? (vm.idCardFront = imgUrl[0], vm.idCardIdentify(imgUrl[0]), vm.idCardImgList.push({'url': imgUrl[0], 'fileName': 'front'})) : (vm.idCardBack = imgUrl[0], vm.idCardImgList.push({'url': imgUrl[0], 'fileName': 'back'}))
           } else if (ocrType === 'bankCard') {
             vm.bankImg = imgUrl[0]
             vm.bankCardIdentify(imgUrl[0])
@@ -1172,6 +1182,45 @@ export default {
   textarea {
     text-align: right;
   }
+  .tax{
+    width:351px;
+    height: 78px;
+    background:#fff;
+    margin:0 auto;
+    margin-bottom: 30px;
+    display:flex;
+    align-items: center;
+    .left-img{
+      width:24px;
+      height:28px;
+      flex:2.5;
+      padding-left:24px;
+    }
+    div{
+      flex:25;
+      padding-left:24px;
+      span{
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #383F45;
+        letter-spacing: 0;
+        line-height: 22px;
+      }
+      p{
+        font-family: PingFangSC-Regular;
+        font-size: 12px;
+        color: rgba(56,63,69,0.50);
+        letter-spacing: 0;
+        line-height: 22px;
+      }
+    }
+    .right-img{
+      width:10px;
+      height:16px;
+      flex:1;
+      padding-right:21px;
+    }
+  }
   .header {
     background-color: #00469c;
     color: #fff;

src/pages/userBind/org/enterprise.vue

@@ -316,6 +316,14 @@
             </div>
           </div>
         </div>
+        <div v-if="from&&isApproved&&isAGENT" class="tax" @click="changeUndertake">
+          <img src="@/assets/userBind/tax.png" class="left-img">
+          <div>
+            <span>缴纳保证金</span>
+            <p>已缴纳：500000</p>
+          </div>
+          <img src="@/assets/userBind/arrow-right.png" class="right-img">
+        </div>
       </div>
       <!-- <BankInfo v-show="tabNum==1" :bp_id="bp_id" @getInfo="getInfo" /> -->
       <BankInfo v-show="tabNum==1" :getBankList="getBankList" @getInfo="getInfo" @getList="getList" />
@@ -408,6 +416,7 @@ export default {
       bpClass: '',
       from: false,
       isApproved: false,
+      isAGENT: this.$route.params.isAGENT,
       img_url: {},
       typeList: [],
       backList: [],
@@ -567,6 +576,11 @@ export default {
         }
       })
     },
+    changeUndertake () {
+      this.$router.push({
+        name: 'MarginFirstPay',
+      })
+    },
     addRows (e) {
       let addNum = parseInt(e.length / 16)
       if (addNum === 0) {
@@ -1426,6 +1440,45 @@ export default {
     text-align: right;
     // padding-top:16px;
   }
+  .tax{
+    width:351px;
+    height: 78px;
+    background:#fff;
+    margin:0 auto;
+    margin-bottom: 15px;
+    display:flex;
+    align-items: center;
+    .left-img{
+      width:24px;
+      height:28px;
+      flex:2.5;
+      padding-left:24px;
+    }
+    div{
+      flex:25;
+      padding-left:24px;
+      span{
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #383F45;
+        letter-spacing: 0;
+        line-height: 22px;
+      }
+      p{
+        font-family: PingFangSC-Regular;
+        font-size: 12px;
+        color: rgba(56,63,69,0.50);
+        letter-spacing: 0;
+        line-height: 22px;
+      }
+    }
+    .right-img{
+      width:10px;
+      height:16px;
+      flex:1;
+      padding-right:21px;
+    }
+  }
   .header {
     background-color: #00469c;
     color: #fff;