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

11

Browse Source
This commit is contained in:
魏啾
2024-08-03 10:54:15 +08:00
parent 9605bb5499 2b66e1d7f8
commit 8e3ac4dca0
6 changed files with 88 additions and 1796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pages/order/confirm_order.vue
View File

@@ -127,14 +127,14 @@
<u-popup :show="ispws" :round="20" mode="bottom" @close="ispws = false" height="500" :safeAreaInsetBottom="false">
<view class="pay-info-wrap">
<view class="info-wrap flex-between">
<view class="close" @click="showShopInfo = false">
<view class="close" @click="ispws = false">
<u-icon name="close" color="#999999" size="28"></u-icon>
</view>
<text class="title">请输入支付密码</text>
<view></view>
</view>
<view class="info-content">
<payPasswordtwo ref="payPwd" :listinfo="listinfo" @accountPayevent="accountPayevent" v-if="ispws"></payPasswordtwo>
<payPasswordtwo ref="payPwd" :payAmount="listinfo.payAmount" @accountPayevent="accountPayevent" v-if="ispws"></payPasswordtwo>
</view>
</view>
@@ -972,10 +972,10 @@
position: inherit;
}
.pay-info-wrap{
padding: 0 30rpx 50rpx;
padding: 0;
box-sizing: border-box;
.info-wrap{
padding: 30rpx 0;
padding: 30rpx;
box-sizing: border-box;
.title{
align-self: center;

1404
pages/order_food/order_food-s.vue
View File

File diff suppressed because it is too large Load Diff

44
pages/order_food/order_food.vue
View File

@@ -170,7 +170,7 @@
<text class="num">{{cartLists.amount||'0.00'}}</text>
</view>
<view class="btn" @tap="$u.debounce(orderdetail, 500)">
<text class="t">结算</text>
<text class="t">去结算</text>
</view>
</view>
</view>
@@ -525,18 +525,31 @@
* @param {Object} b
*/
shopAdd(item, index, index1, a, b) {
if (a == "+") {
if (this.amountcartNumber <= 0) {
this.amountcartNumber = this.amountcartNumber + item.suit;
} else {
let flag = true;
if ( this.cartLists.data.length > 0) {
this.cartLists.data.forEach((v,e)=>{
if ( v.productId == item.id) {
flag = false;
}
console.log(v)
})
}
console.log(a)
console.log(this.amountcartNumber)
console.log(flag)
console.log(item)
if ( a == "+" ){
if ( this.amountcartNumber <= 0 && flag) {
this.amountcartNumber = this.amountcartNumber + (item.suit==0?1:item.suit);
}else {
this.amountcartNumber++;
}
} else {
if (this.amountcartNumber > 0) {
console.log(item)
if (this.amountcartNumber <= item.suit) {
this.amountcartNumber = this.amountcartNumber - item.suit
if ( this.amountcartNumber <= item.suit && flag) {
this.amountcartNumber = this.amountcartNumber - (item.suit==0?1:item.suit);
} else {
this.amountcartNumber = this.amountcartNumber - 1;
}
@@ -1431,18 +1444,17 @@
.btn {
width: 160rpx;
height: 64rpx;
background: #FEFAF7;
background: #E7AE7B;
border-radius: 36rpx 36rpx 36rpx 36rpx;
border: 2rpx solid #E8AD7B;
display: flex;
align-items: center;
justify-content: flex-end;
justify-content: center;
.t {
font-weight: bold;
font-size: 28rpx;
color: #E8AD7B;
margin-right: 26rpx;
color: #FFFFFF;
}
}
}
@@ -1636,6 +1648,9 @@
font-weight: 400;
font-size: 24rpx;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
&+.item {
margin-top: 1px;
@@ -1804,6 +1819,13 @@
color: #999999;
margin-bottom: 8rpx;
}
.describe,.name{
width: 270rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.lookBack {
color: #FF534B;