From 02e10155945bd4c1c41bda14bb6e6985fb7af211 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 8 May 2026 18:37:35 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A5184=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=8C=9C=E4=BD=A0=E5=96=9C?=
 =?UTF-8?q?=E6=AC=A2=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=9B=BE=E6=A0=87=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=9C=AA=E6=B7=BB=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart.vue | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pages/cart.vue b/pages/cart.vue
index 542639b..353396c 100644
--- a/pages/cart.vue
+++ b/pages/cart.vue
@@ -109,7 +109,7 @@
                   <view v-if="item.isNegotiable === 1" class="v12-primary-text v12-font-32 v12-font-weight" @clicks.stop="goRoom(item)">
                   价格面议
                   </view>
-                  <view class="btn">
+                  <view class="btn" @click.stop="addToCart(item, 'productId')">
                     <image
                       :src="webUrl + '/home/icon-cart.png'"
                       class="img-icon"
@@ -309,14 +309,14 @@
                     :key="attr"
                     :class="{
                       'on': attr.check,
-                      'disabled': getAttrItemData(attr.attr).stock === 0
+                      'disabled': getAttrItemData1(attr.attr).stock === 0
                     }"
                     class="attr"
                     @click="attrItemClick(attr, attrIndex, index)"
                   >
                     {{ attr.attr }}
                     <text
-                      v-if="getAttrItemData(attr.attr).stock === 0"
+                      v-if="getAttrItemData1(attr.attr).stock === 0"
                       class="tag"
                     >缺货</text>
                   </view>
@@ -368,28 +368,41 @@
       </view>
                                                                                                                                                                                                                         
     </u-popup>
+    <ProductWindow
+      ref="attrWindow"
+      :attr="attr"
+      :cartNum="cart_num"
+      :showOk="true"
+      @changeFun="changeFun"
+      @ok="handleOk(() => this.getCart())"
+    />
     <xdd-tabbar :curr-index="2" />
   </view>
 </template>
 <script>
 import XddTabbar from '@/components/xdd-tabbar'
+import ProductWindow from '@/components/ProductWindow'
 import {getAddressList, getUserLike} from "@/api/user";
 import {
   changeCartNum,
   getCartGroup,
   postCartDel,
+  postCartAdd,
   getCartGoodAttr,
   cartGoodChangeAttr
 } from '@/api/store'
 import CheckboxIcon from '@/components/CheckboxIcon.vue'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
+import goCartMixin from '@/mixins/goCartMixins'
+import { mapGetters } from 'vuex'
 import cookie from "@/utils/store/cookie"
 export default {
   components: {
     CheckboxIcon,
-    XddTabbar
+    XddTabbar,
+    ProductWindow
   },
-  mixins: [pageListenMixins],
+  mixins: [pageListenMixins, goCartMixin],
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
@@ -415,6 +428,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['isLogin']),
     total() {
       let price = 0
       this.list.forEach(item => {
@@ -766,7 +780,7 @@ export default {
         uni.hideLoading()
       })
     },
-    getAttrItemData(attr) {
+    getAttrItemData1(attr) {
       let result = {
         stock: 0
       }