czg_team/cashier_weapp
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x

Browse Source
This commit is contained in:
魏啾
2024-08-03 17:52:25 +08:00
parent 3c7bbe82d2 5dc0993f04
commit 75d3cab654
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pages.json
View File

@@ -92,8 +92,7 @@
"path": "pages/order/confirm_order", "path": "pages/order/confirm_order",
"style": { "style": {
"navigationBarTitleText": "确认订单", "navigationBarTitleText": "确认订单",
"navigationStyle": "custom", "navigationBarBackgroundColor": "#E8AD7B"
"navigationBarTextStyle": "white"
} }
}, },
{ {

6
pages/order/confirm_order.vue
View File

@@ -1,10 +1,10 @@
<template> <template>
<view> <view>
<!-- 占位符导航栏 --> <!-- 占位符导航栏 -->
<navseat class="navbar" :opacity='opacitys' :backColor="'#E8AD7B'" :title='toplist.name' :titleshow='true'></navseat> <!-- <navseat class="navbar" :opacity='opacitys' :backColor="'#E8AD7B'" :title='toplist.name' :titleshow='true'></navseat> -->
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;position: fixed;top: 0;width: 100%;z-index: 9'}"></view> <!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;position: fixed;top: 0;width: 100%;z-index: 9'}"></view> -->
<view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;'}"></view> <!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;'}"></view> -->
<!-- #endif --> <!-- #endif -->
<!-- 头部内容 --> <!-- 头部内容 -->
<view class="head"> <view class="head">

8
pages/order_food/order_food.vue
View File

@@ -49,9 +49,9 @@
<view class="panelfiveitemthere flex-start"> <view class="panelfiveitemthere flex-start">
<text>招牌</text> <text>招牌</text>
</view> </view>
<view class="panelfiveitemfour"> <!-- <view class="panelfiveitemfour">
{{item.shortTitle?item.shortTitle:''}} {{item.shortTitle?item.shortTitle:''}}
</view> </view> -->
<view class="panelfiveitemfive"> <view class="panelfiveitemfive">
月售{{item.stockNumber}} 月售{{item.stockNumber}}
</view> </view>
@@ -256,7 +256,7 @@
<!-- 规格 --> <!-- 规格 -->
<u-popup :show="showShopsku" :round="20" mode="bottom" @close="showShopsku = false;pagemetashow=false" <u-popup :show="showShopsku" :round="20" mode="bottom" @close="showShopsku = false;pagemetashow=false"
:safeAreaInsetBottom='false'> :safeAreaInsetBottom='false'>
<view class="shop_sku" :style="{ 'max-height':scrollHeight + 'px' }"> <view class="shop_sku" :style="{ 'max-height': (scrollHeight-100)+'px' }">
<view class="positionabsolute"> <view class="positionabsolute">
<u-icon name="close-circle" @click="showShopsku = false;pagemetashow=false" color="#000" size="50"></u-icon> <u-icon name="close-circle" @click="showShopsku = false;pagemetashow=false" color="#000" size="50"></u-icon>
</view> </view>
@@ -639,6 +639,8 @@
this.cartLists.data.forEach((v, e) => { this.cartLists.data.forEach((v, e) => {
this.cartLists_count += v.number; this.cartLists_count += v.number;
}) })
} else {
this.cartLists_count = 0;
} }
}, },
/** /**