From 12c48f04f9ea1a57781a6e8c5c9ef901eaad8518 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 22:31:17 +0800
Subject: [PATCH] merge 1.小程序-花店:1.1-浏览记录建议改成显示30条数据; 1.2-增加一个一键清空已失效商品 2.小程序-花店:增加热区跳转进入店铺 及 点击头像和名字也可以跳转进入店铺 3.小程序-花店:轮播图指示点优化去掉 4.小程序-花店:登录，注册失去焦点验证手机号
---
sub_pages/customer/shopping/confirm.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 7d2bc7d..b3840d2 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -179,14 +179,16 @@
console.log('pay,', data)
// /api/pub/init/callback?orderId=
// if(env.pro)
- if (data && data['_testOrderId'] && environments.httpBaseUri.startsWith(
+ if (false && data && (data['_testV2OrderId'] || data['_testOrderId']) &&
+ environments.httpBaseUri.startsWith(
'http://47.99.58.211/flower')) {
//回调
tmp.$message.showLoading()
const res2 = await tmp.$http.request('get',
'/api/pub/init/callback', {
params: {
- orderId: data['_testOrderId']
+ orderId: data['_testV2OrderId'] || data[
+ '_testOrderId'] || ''
}
})
tmp.$message.hideLoading()
@@ -199,16 +201,23 @@
...data,
async success(res) {
console.log('pay success', res)
- tmp.$message.showToast('支付成功')
+ // tmp.$message.showToast('支付成功')
//返回上一页
await tmp.$store.dispatch('sign_add', 'shopping')
- uni.navigateBack()
+ tmp.$message.showToast('支付成功')
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 500)
+ // await
+ // uni.navigateBack()
+
+
},
async fail(err) {
console.error('pay fail', err)
tmp.$message.showToast('支付失败')
- await tmp.$store.dispatch('sign_add', 'shopping')
- uni.navigateBack()
+ // await tmp.$store.dispatch('sign_add', 'shopping')
+ // uni.navigateBack()
}
})
--
Gitblit v1.9.3