Merge branch 'dev_wm' into 'master'

提现税率计算，图片替换

See merge request !78

H5/src/views/cashOut/cash-out.vue

@@ -11,6 +11,7 @@
         label="￥"
         class="money"
         @blur="onFillMoneyBlur"
+        @input="inputClick"
       />
       <div class="remain">
         <span style="color: #666666"
@@ -21,11 +22,11 @@
       <div class="real">
         <p class="real-item">
           <span>实际到账</span>
-          <span>94.19</span>
+          <span>{{account}}</span>
         </p>
         <p class="real-item">
           <span>税款</span>
-          <span>6.34</span>
+          <span>{{rate}}</span>
         </p>
         <p class="explain">
           <span>扣税说明</span>
@@ -94,6 +95,8 @@ export default {
       userPhone: this.$userId,
       bank: "",
       money: null,
+      account:0,
+      rate:0,
       remainMoney: 100,
       resultDialogTitle: "",
       resultDialogTip: "",
@@ -114,6 +117,10 @@ export default {
         return false;
       }
     },
+      inputClick(){
+          this.rate = this.money * 0.02
+          this.account = this.money - this.rate
+      },
     canCashOut() {
       const params = {
         userId: this.$userId

H5/src/views/invite.vue

@@ -46,7 +46,7 @@ export default {
 .invite-code {
   width: 100%;
   height: 100vh;
-  background: url("../assets/images/invite.png");
+  background: url("../assets/images/invite1.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   .imgCode {

H5/src/views/settings.vue

@@ -8,6 +8,7 @@
     </van-cell-group>
     <van-cell-group>
       <van-cell
+        class="van-less"
         is-link
         title="推荐人邀请码"
         :value="inviteeCode"
@@ -126,6 +127,11 @@ export default {
 .settings {
   box-sizing: border-box;
   padding: 10px 16px;
+  .van-less{
+    .van-cell__right-icon{
+      display: none;
+    }
+  }
 }
 .group-1 {
   margin-bottom: 10px;