Commit 7a8cfdd1 by 林翔

lx

parent c5cc3a22
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
.activate-content .form-wrap { .activate-content .form-wrap {
background: #ffffff; background: #ffffff;
padding-bottom: 20px; padding-bottom: 20px;
padding-top: 20px; /*padding-top: 20px;*/
} }
.activate-content .form-wrap .inp-wrap { .activate-content .form-wrap .inp-wrap {
...@@ -234,9 +234,12 @@ ...@@ -234,9 +234,12 @@
font-size: 16px; font-size: 16px;
color: #fff; color: #fff;
display: block; display: block;
margin: 1.333rem auto 1.333rem; margin: 1.333rem auto;
font-weight: bold; font-weight: bold;
} }
.activate-content .noClick {
opacity: 0.5;
}
.activate-content .form-wrap .inp-wrap .f-r { .activate-content .form-wrap .inp-wrap .f-r {
float: right; float: right;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</li> </li>
</ul> </ul>
<p class="form-error" v-show="formError">{{formMsg}}</p> <p class="form-error" v-show="formError">{{formMsg}}</p>
<a href="javascript:;" class="next" @click="next">下一步</a> <a href="javascript:;" class="next" :class="{noClick: isClick}" @click="next">下一步</a>
</div> </div>
<div class="activate-content" v-show="step2"> <div class="activate-content" v-show="step2">
<ul class="form-wrap"> <ul class="form-wrap">
...@@ -85,13 +85,14 @@ ...@@ -85,13 +85,14 @@
formError: false, formError: false,
formMsg: '', formMsg: '',
imgCodeVal: productionUrlPc+"public/verify", imgCodeVal: productionUrlPc+"public/verify",
isClick: true
} }
}, },
computed: { computed: {
...mapState({ ...mapState({
activateShowImgCode: state => state.wallet.activateShowImgCode, activateShowImgCode: state => state.wallet.activateShowImgCode,
activateCountDownFlag: state => state.wallet.activateCountDownFlag, activateCountDownFlag: state => state.wallet.activateCountDownFlag,
}) })
}, },
watch: { watch: {
activateCountDownFlag(value) { activateCountDownFlag(value) {
...@@ -101,6 +102,16 @@ ...@@ -101,6 +102,16 @@
}else{ }else{
this.yzmSend = true; this.yzmSend = true;
} }
},
form: {
deep: true,
handler: function(val) {
if (val.safeMobile && val.verifyCode) {
this.isClick=false
}else{
this.isClick=true;
}
}
} }
}, },
created() { created() {
...@@ -156,6 +167,8 @@ ...@@ -156,6 +167,8 @@
} }
}, },
next() { //下一步 next() { //下一步
if (this.isClick) {return}
if(this.verify()){ if(this.verify()){
if (!this.form.verifyCode) { if (!this.form.verifyCode) {
this.formError = true; this.formError = true;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="wallet-balance"> <div class="wallet-balance">
<div class="balance-bg"> <div class="balance-bg">
<p class="text-1 lineBlock">钱包余额</p> <p class="text-1 lineBlock">钱包余额</p>
<p class="text-2 lineBlock"><span class="text-3">{{walletInfoData.wallet_balance}}</span></p> <p class="text-2 lineBlock"><span class="text-3">{{walletInfoData.wallet_usable}}</span></p>
<p class="text-4 lineBlock"><a href="/v3/help">常见问题 ></a></p> <p class="text-4 lineBlock"><a href="/v3/help">常见问题 ></a></p>
</div> </div>
<div class="balance-handle"> <div class="balance-handle">
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="vanCelldd"><span>微信支付</span><br/>仅安装微信6.0.2及以上版本客户端使用</div> <div class="vanCelldd"><span>微信支付</span><br/>仅安装微信6.0.2及以上版本客户端使用</div>
<van-radio name="1" style="display:inline-block; margin: 10px; float: right;"/> <van-radio name="1" style="display:inline-block; margin: 10px; float: right;"/>
</van-cell> </van-cell>
<van-cell clickable @click="radio = '2'" class="vanCell"> <!-- <van-cell clickable @click="radio = '2'" class="vanCell">
<div class="vanCelldt"><img src="../../assets/images/wallet/alipay.png" alt="支付宝支付" style="width:25px; height:25px;"></div> <div class="vanCelldt"><img src="../../assets/images/wallet/alipay.png" alt="支付宝支付" style="width:25px; height:25px;"></div>
<div class="vanCelldd"><span>支付宝支付</span><br/>由阿里巴巴提供服务</div> <div class="vanCelldd"><span>支付宝支付</span><br/>由阿里巴巴提供服务</div>
<van-radio name="2" style="display:inline-block; margin: 10px; float: right;"/> <van-radio name="2" style="display:inline-block; margin: 10px; float: right;"/>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div class="vanCelldt"><img src="../../assets/images/wallet/unionpay.png" alt="中国银联" style="width:25px; height:15px;"></div> <div class="vanCelldt"><img src="../../assets/images/wallet/unionpay.png" alt="中国银联" style="width:25px; height:15px;"></div>
<div class="vanCelldd"><span>中国银联</span><br/>由猎芯网提供服务</div> <div class="vanCelldd"><span>中国银联</span><br/>由猎芯网提供服务</div>
<van-radio name="3" style="display:inline-block; margin: 10px; float: right;"/> <van-radio name="3" style="display:inline-block; margin: 10px; float: right;"/>
</van-cell> </van-cell> -->
</van-cell-group> </van-cell-group>
</van-radio-group> </van-radio-group>
<a href="javascript:;" class="recharge" :class="inputNum == '' ? 'rechargeNO' : ''" @click="recharge">立即充值</a> <a href="javascript:;" class="recharge" :class="inputNum == '' ? 'rechargeNO' : ''" @click="recharge">立即充值</a>
...@@ -66,16 +66,17 @@ ...@@ -66,16 +66,17 @@
this.$store.dispatch({ this.$store.dispatch({
type: 'payTodo', type: 'payTodo',
pay_code: 'wxpay', pay_code: 'wxpay',
rescue: 1, // rescue: 1,
types: 1, types: 1,
site_type: 2, site_type: 2,
order_id: value order_id: value
}); });
} else if (this.radio == 2) { //支付宝支付 }
window.location.href = productionUrlApi + "pay/todo?pay_code=alipay&rescue=1&types=1&pay_mode=2&site_type=2&order_id=" + value; // else if (this.radio == 2) { //支付宝支付
} else if (this.radio == 3) { //中国银联 // window.location.href = productionUrlApi + "pay/todo?pay_code=alipay&rescue=1&types=1&pay_mode=2&site_type=2&order_id=" + value;
window.location.href = productionUrlApi + "pay/todo?pay_code=unionpay&rescue=1&types=1&site_type=2&order_id=" + value; // } else if (this.radio == 3) { //中国银联
} // window.location.href = productionUrlApi + "pay/todo?pay_code=unionpay&rescue=1&types=1&site_type=2&order_id=" + value;
// }
} }
} }
}, },
......
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment