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

style: 提示信息等

This commit is contained in:
whitechiina 2025-04-08 11:27:54 +08:00
parent 6b91cac242
commit b70de87d49
8 changed files with 115 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pages/restaurant/home/shop_home/components/shop-cart/kdj.scss
View File

@ -1,19 +1,24 @@
// 肯德基 // 肯德基
.KDJ-Cart { .KDJ-Cart {
width: 100%; background-color: #333333;
display: flex; box-shadow: 0px 0px 18px 0px rgba(0, 0, 0, 0.1);
justify-content: space-between; border-radius: 20rpx 20rpx 0 0;
position: relative; width: 100%;
z-index: 20075; height: 210rpx;
background-color: #333333; flex-direction: row;
display: flex;
position: fixed;
bottom: 0;
left: 0;
z-index: 10;
.left { .left {
flex: 1; flex: 1;
height: 100rpx; height: 100rpx;
display: flex; display: flex;
align-items: center; align-items: center;
padding-left: 50rpx; padding: 50rpx;
&-img { &-img {
position: relative; position: relative;

20
pages/restaurant/home/shop_home/components/shop-cart/mdl.scss
View File

@ -1,13 +1,17 @@
// 肯德基 // 肯德基
.MDL-Cart { .MDL-Cart {
width: 100%; box-shadow: 0px 0px 18px 0px rgba(0, 0, 0, 0.1);
display: flex; background-color: white;
justify-content: space-between; border-radius: 20rpx 20rpx 0 0;
position: relative; width: 100%;
z-index: 20075; height: 210rpx;
background-color: #ffffff; flex-direction: row;
align-items: center; display: flex;
padding: 0 32rpx; position: fixed;
bottom: 0;
left: 0;
z-index: 10;
padding: 20rpx 32rpx;
&-left { &-left {
flex: 1; flex: 1;

20
pages/restaurant/home/shop_home/components/shop-cart/rx.scss
View File

@ -1,13 +1,17 @@
// 星巴克 // 星巴克
.RX-Cart { .RX-Cart {
width: 100%; box-shadow: 0px 0px 18px 0px rgba(0, 0, 0, 0.1);
display: flex; background-color: white;
justify-content: space-between; border-radius: 20rpx 20rpx 0 0;
position: relative; width: 100%;
z-index: 20075; height: 210rpx;
background-color: #ffffff; flex-direction: row;
align-items: center; display: flex;
padding: 0 32rpx; position: fixed;
bottom: 0;
left: 0;
z-index: 10;
padding: 20rpx 32rpx;
&-left { &-left {
flex: 1; flex: 1;

21
pages/restaurant/home/shop_home/components/shop-cart/xbk.scss
View File

@ -1,13 +1,18 @@
// 星巴克 // 星巴克
.XBK-Cart { .XBK-Cart {
width: 100%; box-shadow: 0px 0px 18px 0px rgba(0, 0, 0, 0.1);
display: flex; background-color: white;
justify-content: space-between; border-radius: 20rpx 20rpx 0 0;
position: relative; width: 100%;
z-index: 20075; height: 210rpx;
background-color: #ffffff; flex-direction: row;
align-items: center; display: flex;
padding: 0 32rpx; position: fixed;
bottom: 0;
left: 0;
z-index: 10;
padding: 20rpx 32rpx;
&-left { &-left {
flex: 1; flex: 1;

24
pages/restaurant/home/shop_home/shop-combo/mdl-shop-combo.vue
View File

@ -143,7 +143,8 @@
}, },
// 计算价格 // 计算价格
Selectedpay() { Selectedpay() {
try{ try{
console.log(this.Selected)
if (this['Selected']['length'] > 0) { if (this['Selected']['length'] > 0) {
const _addpay = this['Selected'].map(e => { const _addpay = this['Selected'].map(e => {
if (e['price']) { if (e['price']) {
@ -405,15 +406,18 @@
// 购物车样式 // 购物车样式
.shoppingcart { .shoppingcart {
width: 100%; box-shadow: 0px 0px 18px 0px rgba(0, 0, 0, 0.1);
display: flex; background-color: white;
justify-content: space-between; border-radius: 20rpx 20rpx 0 0;
position: relative; width: 100%;
z-index: 20075; height: 210rpx;
background-color: #ffffff; flex-direction: row;
align-items: center; display: flex;
padding: 0 32rpx; position: fixed;
bottom: 0;
left: 0;
z-index: 10;
padding: 20rpx 32rpx;
&-left { &-left {
flex: 1; flex: 1;
height: 100rpx; height: 100rpx;

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

@ -71,7 +71,7 @@
</view> --> </view> -->
<view class="Commodity"> <view class="Commodity">
<text lines="1" class="quantity">应付</text> <text lines="1" class="quantity">应付</text>
<text lines="1" class="amount">￥{{ (calculationamount.prices).toFixed(2) }}</text> <text lines="1" class="amount">￥{{ YingPrice }}</text>
</view> </view>
<!-- 新增计算抵扣逻辑 --> <!-- 新增计算抵扣逻辑 -->
@ -88,7 +88,7 @@
<view class="discount" style="width: 100%; display: flex; justify-content: space-between"> <view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view> <view>
<text lines="1" class="quantity">抵用券</text> <text lines="1" class="quantity">抵用券</text>
<text lines="1" class="amount">(￥{{ YingPrice }} )</text> <text lines="1" class="amount">(￥{{ computedTotal.coin_balance }} )</text>
</view> </view>
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view> <view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
</view> </view>
@ -385,13 +385,11 @@
// 是否使用券 // 是否使用券
isCoin() { isCoin() {
this.use_coin = !this.use_coin; this.use_coin = !this.use_coin;
if (this.use_broker) this.use_broker = false;
this.getCart() this.getCart()
}, },
isBroker() { isBroker() {
this.use_broker = !this.use_broker; this.use_broker = !this.use_broker;
if (this.use_coin) this.use_coin = false;
this.getCart() this.getCart()
}, },

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

@ -90,6 +90,12 @@
</view> </view>
<!-- 新增计算抵扣逻辑 --> <!-- 新增计算抵扣逻辑 -->
<view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 30rpx; padding-top: 0rpx" @click="isBroker()">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<text lines="1" class="quantity">应付：</text>
<text lines="1" class="amount">￥{{ YingPrice }}</text>
</view>
</view>
<view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 0rpx; padding-top: 0rpx" @click="isBroker()"> <view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 0rpx; padding-top: 0rpx" @click="isBroker()">
<view class="discount" style="width: 100%; display: flex; justify-content: space-between"> <view class="discount" style="width: 100%; display: flex; justify-content: space-between">
<view> <view>
@ -177,7 +183,9 @@
</view> </view>
</view> </view>
</template> </template>
</u-modal> </u-modal>
<view class="loading" v-show="loading"></view>
</view> </view>
</template> </template>
@ -198,7 +206,8 @@
export default { export default {
mixins: [mixin, restaurantmixins, calculationamountmixin], mixins: [mixin, restaurantmixins, calculationamountmixin],
data() { data() {
return { return {
loading: true,
show: true, show: true,
zeroshow: false, zeroshow: false,
FormInfor: { FormInfor: {
@ -390,6 +399,13 @@
} else { } else {
this.$Payment.H5TOWX_Payment({ this.$Payment.H5TOWX_Payment({
datas: res['data'], datas: res['data'],
GetShopInfor: {
name: this.GetShopInfor.restaurant_name,
shop: this.BrandInfor.brand_name,
id: this.BrandInfor.brand_id,
},
payData: FormInfor,
HeadersData: this.GetShopInfor,
shopInfo: FormInfor.products, shopInfo: FormInfor.products,
return_url:`/pages/restaurant/order/order-details/details?order_sn=${res.data.order_sn}` return_url:`/pages/restaurant/order/order-details/details?order_sn=${res.data.order_sn}`
}); });
@ -1033,5 +1049,17 @@
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
} }
}
.loading {
width: 100%;
height: 100%;
background-color: #000;
opacity: .5;
position: fixed;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: 999;
} }
</style> </style>

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

@ -42,20 +42,33 @@ class Payment {
const ShopInfo = shopInfo; const ShopInfo = shopInfo;
// 判断是微信支付还是支付宝支付 // 判断是微信支付还是支付宝支付
console.log(store.getters.GetToken)
if(PAY_TYPE == '1'){ if(PAY_TYPE == '1'){
// 微信内嵌WEBVIEW方式进入H5页面 // 微信内嵌WEBVIEW方式进入H5页面
OrderData['WechatRetreat'] = true; OrderData['WechatRetreat'] = true;
// 先跳转至微信支付页面 // 先跳转至微信支付页面
try{ try{
// 地区码 // 地区码带入
data.HeadersData.adcode = state['getters']['GetcityInfor']['adcode'] if (data.HeadersData && state.getters?.GetcityInfor?.adcode) {
data.HeadersData.adcode = state.getters.GetcityInfor.adcode;
}
const navigateParams = {
data: OrderData,
shopInfo: shopInfo,
GetShopInfor: GetShopInfor,
token: store.getters.GetToken,
payData: data.payData,
HeadersData: data.HeadersData
};
const queryString = Object.entries(navigateParams)
.map(([key, value]) => `${key}=${encodeURIComponent(JSON.stringify(value))}`)
.join('&');
console.log(data.HeadersData)
console.log(data.payData, '00000000000')
wx.miniProgram.navigateTo({ wx.miniProgram.navigateTo({
url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}&shopInfo=${encodeURIComponent(JSON.stringify(shopInfo))}&GetShopInfor=${encodeURIComponent(JSON.stringify(GetShopInfor))}&token=${JSON.stringify(store.getters.GetToken)}&payData=${encodeURIComponent(JSON.stringify(data.payData))}&HeadersData=${encodeURIComponent(JSON.stringify(data.HeadersData))}` url: `/pages/extension/shop/wxPay/wxPay?${queryString}`
}); });
// 延迟两秒后H5内部跳转 // 延迟两秒后H5内部跳转
setTimeout(()=>{ setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();