Merge branch 'liuxin' into develop

src/pages/myInfo/my-info.vue

@@ -41,6 +41,10 @@
               <img src="@/assets/myInfo/refund.png" >
               <p>租金还款</p>
             </div>
+            <div v-if="(user_bp_type==='AGENT')&&(user_bp_class==='ORG')&&(user_bp_status === 'APPROVED')" @click="changeCash">
+              <img src="@/assets/myInfo/promise.png" >
+              <p>缴纳保证金</p>
+            </div>
           </div>
         </div>
       </div>
@@ -483,6 +487,15 @@ export default {
         hlsPopup.showLongCenter('请先进行用户绑定')
       }
     },
+    changeCash () {
+      if (window.localStorage.getItem('bp_id') !== 'undefined') {
+        this.$router.push({
+          name: 'MarginFirstPay',
+        })
+      } else {
+        hlsPopup.showLongCenter('请先进行用户绑定')
+      }
+    },
     updateVersion () {
       if (vum.Platform.isAndroid()) {
         this.hote_update_version(

src/pages/pay/marginPay/first-pay.vue

@@ -18,7 +18,6 @@
           </div>
         </div>
       </div>
-
       <section class="pay-content">
         <div class="pos">
           <div class="pay-money">
@@ -34,6 +33,20 @@
             </div>
           </div>
         </div>
+        <div class="pos">
+          <div class="pay-money">
+            <div class="pay-icon">
+              <img src="@/assets/payment/first-pay.png" >已还保证金
+            </div>
+            <div class="pay-input">
+              <span>已还保证金</span>
+              <span style="text-align:right;display:inline-block;margin-right:5px;">￥{{ Paied|currency }}</span>
+              <!-- <div @click="createOrder">
+                <img src="@/assets/payment/into.png" >
+              </div>-->
+            </div>
+          </div>
+        </div>
         <div class="write">
           <div class="box">
             <span>备注</span>
@@ -67,17 +80,38 @@ export default {
   },
   data () {
     return {
-      money: 0,
+      money: null,
+      Paied: 0, // 已缴纳金额
       default: 0,
       pay_note: '', // 备注
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      vm.getPaied()
+    })
   },
   computed: {},
   watch: {},
   methods: {
+    getPaied () {
+      let vm = this
+      let url = process.env.basePath + 'bp_agent_query'
+      let param = {
+        info: {
+          phone: window.localStorage.user_phone,
+        },
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.Paied = res.info.paid_deposit
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     putOrder (money) {
       let vm = this
       let url = process.env.basePath + 'create_order_agent_amt'

src/pages/userBindNew/org/baseInfo.vue

@@ -395,7 +395,7 @@
             </div>
           </div>
         </div>
-
+        <!--
         <div v-if="from&&isApproved&&isAGENT" class="tax" @click="changeUndertake">
           <img src="@/assets/userBind/tax.png" class="left-img">
           <div>
@@ -404,8 +404,8 @@
           </div>
           <img src="@/assets/userBind/arrow-right.png" class="right-img">
         </div>
-      </div>
-    </h-content>
+      </div> -->
+    </div></h-content>
     <bottom-tab class="footer-button">
       <!-- <tab-button class="put" @click.native="handSubmit">提交</tab-button> -->
       <tab-button class="save" @click.native="verified">下一步</tab-button>
@@ -752,16 +752,16 @@ export default {
         },
       })
     },
-    changeUndertake () {
-      this.$router.push({
-        name: 'MarginFirstPay',
-        params: {
-          bp_id: this.$route.params.bp_id,
-          status: this.$route.params.status,
-          isAGENT: this.isAGENT,
-        },
-      })
-    },
+    // changeUndertake () {
+    //   this.$router.push({
+    //     name: 'MarginFirstPay',
+    //     params: {
+    //       bp_id: this.$route.params.bp_id,
+    //       status: this.$route.params.status,
+    //       isAGENT: this.isAGENT,
+    //     },
+    //   })
+    // },
     addRows (e) {
       let addNum = parseInt(e.length / 16)
       if (addNum === 0) {