whitechiina
/
H5-ThreeDoorder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改瑞幸参数

This commit is contained in:
whitechiina 2025-04-01 11:35:40 +08:00
parent c7c2f0d172
commit 39ae07670f
13 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/b-rx-commodity-item/b-rx-commodity-item.vue
View File

@ -2,7 +2,7 @@
<view class="b-rx-commodity-item">
<view class="b-rx-commodity-item-commodity">
<view class="b-rx-commodity-item-commodity-img">
<image class="img" :src="item['product_img']" mode=""></image>
<image class="img" :src="item['goods_img'] || item['product_img']" mode=""></image>
</view>
<view class="b-rx-commodity-item-commodity-infor">
<!-- 商品 -->

3
pages/restaurant/order/orders-settlement/orders-settlement.vue
View File

@ -370,7 +370,8 @@
let redirect_url = '/pages/restaurant/order/order-details/details';
uni.hideLoading();
this.$Payment.H5TOWX_Payment({
datas: res['data'],
datas: res['data'],
shopInfo: from.products,
return_url:`/pages/restaurant/order/order-details/details?order_sn=${res.data.order_sn}`
});

37
static/js/mixin/PayMixin.js
View File

@ -21,6 +21,7 @@ class Payment {
const {
datas,
shopInfo,
return_url,
redirect=false,
PAY_TYPE='1',
@ -34,6 +35,7 @@ class Payment {
// 下单信息
const OrderData = datas;
const ShopInfo = shopInfo;
// 判断是微信支付还是支付宝支付
if(PAY_TYPE == '1'){
@ -46,26 +48,27 @@ class Payment {
// url: `/pages/wxpay/h5pay/h5pay?data=${encodeURIComponent(JSON.stringify(OrderData))}`
// });
wx.miniProgram.navigateTo({
url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}`
}); // Jin
url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}&shopInfo=${encodeURIComponent(JSON.stringify(shopInfo))}`
});
// 延迟两秒后H5内部跳转
setTimeout(()=>{
uni.hideLoading();
if(return_url){
// 是否需要关闭调起支付的页面
if(redirect){
uni.redirectTo({
url:return_url
});
}else{
uni.navigateTo({
url:return_url
})
}
}
},2000)
// setTimeout(()=>{
// uni.hideLoading();
// if(return_url){
// // 是否需要关闭调起支付的页面
// if(redirect){
// uni.redirectTo({
// url:return_url
// });
// }else{
// uni.navigateTo({
// url:return_url
// })
// }
// }
// },2000)
}catch(e){
console.log(e)
uni.hideLoading();
//TODO handle the exception
uni.showToast({

2
unpackage/dist/build/web/index.html vendored
View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>消费补贴卡</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.2a9d3084.js></script><script src=/privilege/static/js/index.102af1d2.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.2a9d3084.js></script><script src=/privilege/static/js/index.965941ca.js></script></body></html>

1
unpackage/dist/build/web/static/js/index.102af1d2.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/index.965941ca.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

37
unpackage/dist/build/web/static/js/mixin/PayMixin.js vendored
View File

@ -21,6 +21,7 @@ class Payment {
const {
datas,
shopInfo,
return_url,
redirect=false,
PAY_TYPE='1',
@ -34,6 +35,7 @@ class Payment {
// 下单信息
const OrderData = datas;
const ShopInfo = shopInfo;
// 判断是微信支付还是支付宝支付
if(PAY_TYPE == '1'){
@ -46,26 +48,27 @@ class Payment {
// url: `/pages/wxpay/h5pay/h5pay?data=${encodeURIComponent(JSON.stringify(OrderData))}`
// });
wx.miniProgram.navigateTo({
url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}`
}); // Jin
url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}&shopInfo=${encodeURIComponent(JSON.stringify(shopInfo))}`
});
// 延迟两秒后H5内部跳转
setTimeout(()=>{
uni.hideLoading();
if(return_url){
// 是否需要关闭调起支付的页面
if(redirect){
uni.redirectTo({
url:return_url
});
}else{
uni.navigateTo({
url:return_url
})
}
}
},2000)
// setTimeout(()=>{
// uni.hideLoading();
// if(return_url){
// // 是否需要关闭调起支付的页面
// if(redirect){
// uni.redirectTo({
// url:return_url
// });
// }else{
// uni.navigateTo({
// url:return_url
// })
// }
// }
// },2000)
}catch(e){
console.log(e)
uni.hideLoading();
//TODO handle the exception
uni.showToast({

1
unpackage/dist/build/web/static/js/pages-restaurant-home-home.54da4d57.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-home-home.802cc7b9.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-details~pages-restaurant-order-order-details-rx-orders-details~~5d2f8755.8c9df1a7.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-details~pages-restaurant-order-order-details-rx-orders-details~~5d2f8755.e6559f37.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.5bc23b0c.js vendored
View File

File diff suppressed because one or more lines are too long

1
unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.e1a21912.js vendored Normal file
View File

File diff suppressed because one or more lines are too long