|
@@ -33,10 +33,11 @@
|
|
|
:key="index"
|
|
:key="index"
|
|
|
>
|
|
>
|
|
|
<div class="payment_method_con_left">
|
|
<div class="payment_method_con_left">
|
|
|
- <img :src="item.icon" alt="" class="payment_method_img" />
|
|
|
|
|
|
|
+ <!-- <img :src="item.icon" alt="" class="payment_method_img" /> -->
|
|
|
|
|
+ <van-image :src="item.icon" width="24px" height="24px" fit="cover" class="payment_method_img" />
|
|
|
<div class="payment_method_title">{{ item.name }}</div>
|
|
<div class="payment_method_title">{{ item.name }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <img class="choose-icon" :src="payType === item.type ? icons[1] : icons[0]" alt="" />
|
|
|
|
|
|
|
+ <img class="choose-icon" :src="icons[1]" alt="" />
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="bottom van-safe-area-bottom" ref="bottom">
|
|
<div class="bottom van-safe-area-bottom" ref="bottom">
|
|
@@ -80,23 +81,30 @@ export default {
|
|
|
return {
|
|
return {
|
|
|
info: {},
|
|
info: {},
|
|
|
message: '',
|
|
message: '',
|
|
|
- payType: inWeixin ? 'WEIXIN' : 'ALIPAY',
|
|
|
|
|
|
|
+ payType: 'H5PAY',
|
|
|
payChannel: null,
|
|
payChannel: null,
|
|
|
|
|
+ // payInfos: [
|
|
|
|
|
+ // {
|
|
|
|
|
+ // icon: require('@assets/svgs/zhifubao.svg'),
|
|
|
|
|
+ // name: '支付宝',
|
|
|
|
|
+ // type: 'ALIPAY'
|
|
|
|
|
+ // },
|
|
|
|
|
+ // {
|
|
|
|
|
+ // icon: require('@assets/svgs/wechat.svg'),
|
|
|
|
|
+ // name: '微信',
|
|
|
|
|
+ // type: 'WEIXIN'
|
|
|
|
|
+ // }
|
|
|
|
|
+ // {
|
|
|
|
|
+ // icon: require("@assets/svgs/png-decp.svg"),
|
|
|
|
|
+ // name: "DCEP",
|
|
|
|
|
+ // },
|
|
|
|
|
+ // ],
|
|
|
payInfos: [
|
|
payInfos: [
|
|
|
{
|
|
{
|
|
|
- icon: require('@assets/svgs/zhifubao.svg'),
|
|
|
|
|
- name: '支付宝',
|
|
|
|
|
- type: 'ALIPAY'
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- icon: require('@assets/svgs/wechat.svg'),
|
|
|
|
|
- name: '微信',
|
|
|
|
|
- type: 'WEIXIN'
|
|
|
|
|
|
|
+ icon: require('@assets/icon_yinlian.png'),
|
|
|
|
|
+ name: '银联快捷付',
|
|
|
|
|
+ type: 'H5PAY'
|
|
|
}
|
|
}
|
|
|
- // {
|
|
|
|
|
- // icon: require("@assets/svgs/png-decp.svg"),
|
|
|
|
|
- // name: "DCEP",
|
|
|
|
|
- // },
|
|
|
|
|
],
|
|
],
|
|
|
icons: [require('@assets/svgs/icon_gouxuan_huise.svg'), require('@assets/icon_gouxuan_pre.png')],
|
|
icons: [require('@assets/svgs/icon_gouxuan_huise.svg'), require('@assets/icon_gouxuan_pre.png')],
|
|
|
bottom: null,
|
|
bottom: null,
|
|
@@ -308,6 +316,7 @@ export default {
|
|
|
.get('/order/createResult', { id: res.id })
|
|
.get('/order/createResult', { id: res.id })
|
|
|
.then(res => {
|
|
.then(res => {
|
|
|
if (res) {
|
|
if (res) {
|
|
|
|
|
+ console.log('1212212是个顺丰到付');
|
|
|
clearInterval(this.createOrderTimer);
|
|
clearInterval(this.createOrderTimer);
|
|
|
this.createOrderTimer = null;
|
|
this.createOrderTimer = null;
|
|
|
if (res.success) {
|
|
if (res.success) {
|
|
@@ -415,6 +424,8 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
+ } else if (this.payType === 'H5PAY') {
|
|
|
|
|
+ document.location.href = resolveUrl(this.$baseUrl, '/payOrder/v2/sandQuick?id=' + this.orderId);
|
|
|
} else {
|
|
} else {
|
|
|
this.$toast.success('支付成功');
|
|
this.$toast.success('支付成功');
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
@@ -425,7 +436,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
paySubmit(saveOrder = true) {
|
|
paySubmit(saveOrder = true) {
|
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
|
- if (this.money && saveOrder) {
|
|
|
|
|
|
|
+ if (this.money && saveOrder && this.payType != 'H5PAY') {
|
|
|
this.$toast.clear();
|
|
this.$toast.clear();
|
|
|
this.$router.replace({ query: { ...this.$route.query, orderId: this.orderId } });
|
|
this.$router.replace({ query: { ...this.$route.query, orderId: this.orderId } });
|
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
@@ -509,6 +520,15 @@ export default {
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
+ } else if (this.payType === 'H5PAY') {
|
|
|
|
|
+ console.log('支付支付');
|
|
|
|
|
+ this.$router.replace({
|
|
|
|
|
+ path: '/submit',
|
|
|
|
|
+ query: {
|
|
|
|
|
+ orderId: this.orderId
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ resolve();
|
|
|
} else {
|
|
} else {
|
|
|
resolve();
|
|
resolve();
|
|
|
}
|
|
}
|
|
@@ -844,7 +864,7 @@ export default {
|
|
|
font-family: PingFangSC-Medium, PingFang SC;
|
|
font-family: PingFangSC-Medium, PingFang SC;
|
|
|
font-weight: 500;
|
|
font-weight: 500;
|
|
|
color: #ffffff;
|
|
color: #ffffff;
|
|
|
- border-bottom: 1px solid rgba(94, 99, 110 ,.2);
|
|
|
|
|
|
|
+ border-bottom: 1px solid rgba(94, 99, 110, 0.2);
|
|
|
padding-bottom: 10px;
|
|
padding-bottom: 10px;
|
|
|
margin-bottom: 10px;
|
|
margin-bottom: 10px;
|
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
@@ -884,7 +904,7 @@ export default {
|
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
- .immediate_payment_left{
|
|
|
|
|
|
|
+ .immediate_payment_left {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
}
|
|
}
|
|
|
.immediate_payment_total {
|
|
.immediate_payment_total {
|
|
@@ -923,9 +943,9 @@ export default {
|
|
|
text-align: center;
|
|
text-align: center;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-/deep/ .van-divider::before{
|
|
|
|
|
- height: 1px;
|
|
|
|
|
- background: #5F646F;
|
|
|
|
|
- opacity: 0.2;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+/deep/ .van-divider::before {
|
|
|
|
|
+ height: 1px;
|
|
|
|
|
+ background: #5f646f;
|
|
|
|
|
+ opacity: 0.2;
|
|
|
|
|
+}
|
|
|
</style>
|
|
</style>
|