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-03 12:03:20 +08:00
parent ea0e446938
commit c98b9a05d0
5 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App.vue
View File

@ -110,6 +110,7 @@
restaurant_id: this['globalData']['parameters'].restaurant_id, restaurant_id: this['globalData']['parameters'].restaurant_id,
restaurant_name: this['globalData']['parameters'].restaurant_name, restaurant_name: this['globalData']['parameters'].restaurant_name,
special: false, special: false,
distance: this['globalData']['parameters'].distance
}) })
}; };
} }

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

@ -37,8 +37,8 @@
￥{{item['pay_price']}} ￥{{item['pay_price']}}
</view> </view>
<view class="num" v-else-if="!item['original_price'] && (BrandInfor['brand_id'] == 13 || BrandInfor['brand_id'] == 1)"> <view class="num" v-else-if="!item['original_price'] && (BrandInfor['brand_id'] == 13 || BrandInfor['brand_id'] == 1)">
<text class="now">￥{{item['bt_price'] * (item['num']?item['num']:item['amount'])}}</text> <view class="now">￥{{item['bt_price'] * (item['num']?item['num']:item['amount'])}}</view>
<text class="last">￥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}</text> <view class="last">￥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}</view>
</view> </view>
<view class="num" v-else-if="!item['original_price'] && BrandInfor['brand_id'] == 10"> <view class="num" v-else-if="!item['original_price'] && BrandInfor['brand_id'] == 10">
￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}} ￥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}
@ -134,10 +134,9 @@
.quantity { .quantity {
// display: flex; // display: flex;
// justify-content: space-between; // justify-content: space-between;
font-size: 30rpx; font-size: 30rpx;
flex: 1; color: #3A6FE7;
color: #4A6FE7;
.num { .num {
text-align: center; text-align: center;
} }

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

@ -163,12 +163,18 @@
<view> <view>
<view class="zero-content"> <view class="zero-content">
<view class="item flex"> <view class="item flex">
<text>抵用券</text> <text>抵用券抵扣</text>
<text class="blod">{{computedTotal.used_broker}}</text> <text class="blod">
<text v-if="computedTotal.used_broker">-</text>
<text>{{computedTotal.used_broker}}</text>
</text>
</view> </view>
<view class="item flex"> <view class="item flex">
<text>余额</text> <text>余额抵扣</text>
<text class="blod">{{computedTotal.used_coin}}</text> <text class="blod">
<text v-if="computedTotal.used_coin">-</text>
<text>{{computedTotal.used_coin}}</text>
</text>
</view> </view>
<view class="know"> <view class="know">
<view class="left"> <view class="left">
@ -428,8 +434,10 @@
wx.miniProgram.navigateTo({ wx.miniProgram.navigateTo({
url: `/pages/goods/order_list/index` url: `/pages/goods/order_list/index`
}); });
uni.hideLoading();
}, 1000) }, 1000)
} else { } else {
uni.showLoading({ title: '支付成功, 跳转订单页' });
this.$Payment.H5TOWX_Payment({ this.$Payment.H5TOWX_Payment({
datas: res['data'], datas: res['data'],
shopInfo: from.products, shopInfo: from.products,

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

@ -138,12 +138,18 @@
<view> <view>
<view class="zero-content"> <view class="zero-content">
<view class="item flex"> <view class="item flex">
<text>抵用券</text> <text>抵用券抵扣</text>
<text class="blod">{{computedTotal.used_broker}}</text> <text class="blod">
<text v-if="computedTotal.used_broker">-</text>
<text>{{computedTotal.used_broker}}</text>
</text>
</view> </view>
<view class="item flex"> <view class="item flex">
<text>余额</text> <text>余额抵扣</text>
<text class="blod">{{computedTotal.used_coin}}</text> <text class="blod">
<text v-if="computedTotal.used_coin">-</text>
<text>{{computedTotal.used_coin}}</text>
</text>
</view> </view>
<view class="know"> <view class="know">
<view class="left"> <view class="left">
@ -377,6 +383,7 @@
wx.miniProgram.navigateTo({ wx.miniProgram.navigateTo({
url: `/pages/goods/order_list/index` url: `/pages/goods/order_list/index`
}); });
uni.hideLoading();
}, 1000) }, 1000)
} else { } else {
this.$Payment.H5TOWX_Payment({ this.$Payment.H5TOWX_Payment({

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

@ -50,23 +50,23 @@ class Payment {
wx.miniProgram.navigateTo({ wx.miniProgram.navigateTo({
url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}&shopInfo=${encodeURIComponent(JSON.stringify(shopInfo))}` url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}&shopInfo=${encodeURIComponent(JSON.stringify(shopInfo))}`
}); });
// 延迟两秒后H5内部跳转 // 延迟两秒后H5内部跳转
// setTimeout(()=>{ setTimeout(()=>{
// uni.hideLoading(); uni.hideLoading();
// if(return_url){ // if(return_url){
// // 是否需要关闭调起支付的页面 // // 是否需要关闭调起支付的页面
// if(redirect){ // if(redirect){
// uni.redirectTo({ // uni.redirectTo({
// url:return_url // url:return_url
// }); // });
// }else{ // }else{
// uni.navigateTo({ // uni.navigateTo({
// url:return_url // url:return_url
// }) // })
// } // }
// } // }
// },2000) uni.hideLoading();
},2000)
}catch(e){ }catch(e){
console.log(e) console.log(e)
uni.hideLoading(); uni.hideLoading();
@ -101,22 +101,23 @@ class Payment {
// // return // // return
// location.href = res['data']['openlink']; // location.href = res['data']['openlink'];
// // 延迟两秒后H5内部跳转 // // 延迟两秒后H5内部跳转
setTimeout(()=>{ // setTimeout(()=>{
uni.hideLoading(); // uni.hideLoading();
if(return_url){ // if(return_url){
// 是否需要关闭调起支付的页面 // // 是否需要关闭调起支付的页面
if(redirect){ // if(redirect){
uni.redirectTo({ // uni.redirectTo({
url:return_url // url:return_url
}); // });
}else{ // }else{
uni.navigateTo({ // uni.navigateTo({
url:return_url // url:return_url
}) // })
} // }
} // }
},2000) // },2000)
// }) // })
uni.hideLoading();
} }
}else{ }else{
OrderData['WechatRetreat'] = true; OrderData['WechatRetreat'] = true;