From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/shopping-cart/shopping-cart.vue | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/mini-program/pages/shopping-cart/shopping-cart.vue b/mini-program/pages/shopping-cart/shopping-cart.vue
index 42aa730..f3d1e54 100644
--- a/mini-program/pages/shopping-cart/shopping-cart.vue
+++ b/mini-program/pages/shopping-cart/shopping-cart.vue
@@ -2,8 +2,8 @@
<view class="cart">
<u-swipe-action>
<u-swipe-action-item :options="options" v-for="(item, index) in list" :name="index" :key="index" @click="deleRow">
- <view class="cart-item">
- <view class="cart-item-check" @click="select(item)">
+ <view class="cart-item" @click="jumpDetails(item.goodsId, item.status)">
+ <view class="cart-item-check" @click.stop="select(item)">
<image src="/static/icon/ic_agree@2x.png" mode="widthFix" v-if="!item.active"></image>
<image src="/static/icon/cart_ic_sel@2x.png" mode="widthFix" v-else></image>
</view>
@@ -18,7 +18,7 @@
<text>{{item.price[0]}}</text>
<text>.{{item.price[1]}}</text>
</view>
- <u-number-box v-model="item.num" @change="changeNum(index)"></u-number-box>
+ <u-number-box v-model="item.num" @change.stop="changeNum(index)"></u-number-box>
</view>
</view>
</view>
@@ -37,7 +37,7 @@
<text>{{totalPrice[0]}}</text>
<text>.{{totalPrice[1]}}</text>
</view>
- <view class="edit-right-btn">缁撶畻</view>
+ <view class="edit-right-btn" @click="jiesuan">缁撶畻</view>
</view>
</view>
<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
@@ -89,6 +89,40 @@
this.getList()
},
methods: {
+ jumpDetails(id, status) {
+ if (status === 1) return uni.showToast({
+ title: '鍟嗗搧宸蹭笅鏋�',
+ icon: 'none'
+ })
+ uni.navigateTo({
+ url: '/pages/details/details?id=' + id
+ })
+ },
+ jiesuan() {
+ let arr = this.list.filter(item => item.active)
+ if (arr.length === 0) return uni.showToast({
+ title: '鑷冲皯閫夋嫨涓�椤瑰晢鍝�',
+ icon: 'none'
+ })
+ for (let i = 0; i < arr.length; i++) {
+ if (arr[i].status === 1) {
+ return uni.showToast({
+ title: '璇峰厛鍒犻櫎宸蹭笅鏋剁殑鍟嗗搧',
+ icon: 'none'
+ })
+ }
+ }
+ let shop = arr.map(item => {
+ return {
+ goodsNum: item.num,
+ goodsSkuId: item.goodsSkuId
+ }
+ })
+ uni.setStorageSync('shop', shop)
+ uni.navigateTo({
+ url: '/pages/confirm-order/confirm-order'
+ })
+ },
// 鍏ㄩ��
quanxuan() {
this.list.forEach((item) => {
--
Gitblit v1.9.3