zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并更改

master
lemon橪 2021-06-16 18:12:01 +08:00
parent 4499e0b816 c6dd5eac67
commit fe26033a9f
2 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages/cart/payment/payOrder.vue
View File

@ -148,7 +148,7 @@
awaitPay(payment){ awaitPay(payment){
this.$u.debounce(this.pay(payment), 3000) this.pay(payment)
}, },
@ -225,16 +225,17 @@
await API_Trade.initiatePay(paymentMethod, paymentClient, params).then( await API_Trade.initiatePay(paymentMethod, paymentClient, params).then(
(res) => { (res) => {
let response = res.data; let response = res.data;
//如果非支付宝支付才需要进行判定，因为支付宝h5支付是直接输出的，没有返回所谓的消息状态
if(paymentMethod !== "ALIPAY"){
//如果支付异常 //如果支付异常
if (!response.success) { if (!response.success) {
uni.showModal({ uni.showModal({
content: response.message, content: response.message,
showCancel: false, showCancel: false,
}) })
return; return;
} }
}
if (paymentMethod === "ALIPAY") { if (paymentMethod === "ALIPAY") {
document.write(response); document.write(response);
} else if (paymentMethod === "WECHAT") { } else if (paymentMethod === "WECHAT") {

25
pages/passport/onClickLogin.vue
View File

@ -1,9 +1,6 @@
<template> <template>
<div class="form"> <div class="form">
<u-form ref="validateCodeForm"> <u-form ref="validateCodeForm">
<div class="login-apple">
<image class="apple" src="/static/signIn.png" mode="" />
</div>
<div class="login-list"> <div class="login-list">
<!-- 循环出当前可使用的第三方登录模式 --> <!-- 循环出当前可使用的第三方登录模式 -->
<div class="login-item" v-for="(item,index) in loginList" :key="index"> <div class="login-item" v-for="(item,index) in loginList" :key="index">
@ -11,7 +8,6 @@
<div>{{item.title}}</div> <div>{{item.title}}</div>
</div> </div>
</div> </div>
<view class="text-tips cell" @click="clickCodeLogin">账号密码登录</view> <view class="text-tips cell" @click="clickCodeLogin">账号密码登录</view>
</u-form> </u-form>
</div> </div>
@ -132,9 +128,9 @@ export default {
}); });
} else { } else {
uni.showToast({ uni.showToast({
title: "配置有误请联系管理员", title: '配置有误请联系管理员',
duration: 2000, duration: 2000,
icon: "none", icon:"none"
}); });
} }
}); });
@ -154,7 +150,7 @@ export default {
// #ifdef H5 // #ifdef H5
let code = connectLogin.code; let code = connectLogin.code;
let buyer = api.buyer; let buyer = api.buyer;
window.open(buyer + `/connect/login/web/` + code, "_self"); window.open(buyer+`/connect/login/web/`+code, "_self");
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
this.nonH5OpenId(connectLogin); this.nonH5OpenId(connectLogin);
@ -248,7 +244,7 @@ export default {
storage.setUserInfo(user.data.result); storage.setUserInfo(user.data.result);
storage.setHasLogin(true); storage.setHasLogin(true);
}); });
whetherNavigate(); whetherNavigate()
} }
}); });
}, },
@ -267,10 +263,7 @@ export default {
.submit { .submit {
margin: 80rpx 0 40rpx 0; margin: 80rpx 0 40rpx 0;
} }
.apple {
width: 500rpx;
height: 80rpx;
}
.login-list { .login-list {
display: flex; display: flex;
padding: 40rpx 0; padding: 40rpx 0;
@ -285,12 +278,4 @@ export default {
} }
} }
} }
.login-apple{
margin: 80rpx 0;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
}
</style> </style>