From 34b6e0548fb7f3d88842914db89d7cd603a5e531 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 01 八月 2024 23:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
sub_pages/customer/shopping/shopping.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 32be4c3..0abb7ac 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -22,13 +22,13 @@
{{ item.supplierName || '-' }}
</view>
<u-divider></u-divider>
- <view v-for="(dto,j) of item.flowerList" :key="j">
+ <view v-for="(dto,j) of item.flowerList" :key="dto.id">
<u-divider v-if="j>0"></u-divider>
<u-swipe-action>
<u-swipe-action-item :options="options1" @click="(e)=>{clickSwipeButton(dto,true)}">
<view class="item-each flex">
<radio :checked="ids.indexOf(dto.id)>=0" @click="changeItem(dto,'flower')"></radio>
- <image class="img img100 m-r-6 br-4" :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover"></image>
+ <image class="img img100 m-r-6 br-4" :class="[!dto.stock?'component-stock-zero-tmp':'']" :src="dto.url||dto.cover"></image>
<view class="flex1">
<view class="title" @click.stop="toDetail(dto)"><span class="m-r-5"
style="display: inline-block;">{{dto.categoryStr||''}}</span><span
@@ -168,8 +168,7 @@
async clickSwipeButton(item, check) {
//删除商品，重新加载数据？
if (check) {
- this.$message.confirm('是否删除商品')
- return
+ await this.$message.confirm('是否删除商品')
}
@@ -403,7 +402,8 @@
left: 0rpx;
padding: 20rpx;
right: 0rpx;
- bottom: 160rpx;
+ // bottom: 160rpx;
+ bottom: 140rpx;
z-index: 11;
}
--
Gitblit v1.9.3