From 24d6593f4231089cf1086d5aef743e01d9420f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Thu, 9 Oct 2025 10:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8A=B1=E9=A6=8D=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/advertising/goodsDetail/index.vue | 10 ++--
 packages/shop/address/index.css            |  4 ++
 packages/shop/address/index.vue            | 56 +++++++++++++++++-----
 3 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/packages/advertising/goodsDetail/index.vue b/packages/advertising/goodsDetail/index.vue
index 33e48261..af73a90f 100644
--- a/packages/advertising/goodsDetail/index.vue
+++ b/packages/advertising/goodsDetail/index.vue
@@ -649,7 +649,7 @@ export default {
     addCar() {
       let that = this;
       this.info.commodity_goods_info_list[this.currentGGIndex].cart_count = {
-        count: this.info.commodity_goods_info_list[this.currentGGIndex].min_order_quantity,
+        count: 1,
       };
       // this.info.commodity_goods_info_list.forEach((item) => {
       //   console.log(item.cart_count);
@@ -659,7 +659,7 @@ export default {
       //   });
       // });
 
-      let countVal = this.info.commodity_goods_info_list[this.currentGGIndex].min_order_quantity
+      let countVal = 1
 
       const params = {
         goods_id_and_count: [
@@ -670,10 +670,10 @@ export default {
             price: this.changePrice
           },
         ],
-        group_buy_id: this.info.commodity_goods_info_list[this.currentGGIndex].group_buy_activity_id,
+        adver_id: this.itemObj.adver_id,
       }
       request(apiArr.updateCar, "POST", params).then((res) => {
-        that.getShopCar();
+        // that.getShopCar();
         that.getShopCarList();
       });
     },
@@ -693,7 +693,7 @@ export default {
             count: newCount,
           },
         ],
-        group_buy_id: this.info.commodity_goods_info_list[this.currentGGIndex].group_buy_activity_id,
+        adver_id: this.itemObj.adver_id,
       };
 
       request(apiArr.updateCar, "POST", params).then((res) => {
diff --git a/packages/shop/address/index.css b/packages/shop/address/index.css
index bcbf6c50..c27d21cd 100644
--- a/packages/shop/address/index.css
+++ b/packages/shop/address/index.css
@@ -54,6 +54,10 @@
     margin-right: 10rpx;
 }
 
+.addressItem_footer_left2 {
+    display: flex;
+}
+
 .addressItem_footer_right {
     display: flex;
     align-items: center;
diff --git a/packages/shop/address/index.vue b/packages/shop/address/index.vue
index b40c5267..7a8584e6 100644
--- a/packages/shop/address/index.vue
+++ b/packages/shop/address/index.vue
@@ -3,27 +3,29 @@
 
         <view class="hasAddress">
             <view class="addressList">
-                <view class="addressItem" v-for="item, index in list" :key="index" :class="{ 'addressItem_def': index == 0 }" @click="selectAddress(item)">
+                <view class="addressItem" v-for="item, index in list" :key="index"
+                    :class="{ 'addressItem_def': index == 0 }" @click="selectAddress(item)">
                     <view class="addressItem_top">
-                        {{item.name}} {{item.phone}} <view v-if="item.is_default === 1" class="is_def">默认</view>
+                        {{ item.name }} {{ item.phone }} <view v-if="item.is_default === 1" class="is_def">默认</view>
                     </view>
-                    <view class="addressItem_mid">{{item.address}}{{ item.house_number }}</view>
+                    <view class="addressItem_mid">{{ item.address }}{{ item.house_number }}</view>
                     <view class="addressItem_footer">
                         <view class="addressItem_footer_left">
-                            <view v-if="item.is_default !== 1" @click="headerSettingDefault(item.id)">
-                                <image src="http://192.168.0.172:5500/7.15/shop_checked1.png"></image>
+                            <view v-if="item.is_default !== 1" @click.stop="headerSettingDefault(item.id)"
+                                class="addressItem_footer_left2">
+                                <view class="checkbox"></view>
                                 设为默认
                             </view>
 
-                            <view v-if="item.is_default === 1">
-                                <image src="http://192.168.0.172:5500/7.15/shop_checked2.png"></image>
+                            <view v-if="item.is_default === 1" class="addressItem_footer_left2">
+                                <view class="checkbox checkbox-checked"></view>
                                 已默认
                             </view>
 
                         </view>
                         <view class="addressItem_footer_right">
-                            <view class="btn1" @click="deleteItem(item.id )">删除</view>
-                            <view class="btn2" @click="editItem(item)">修改</view>
+                            <view class="btn1" @click.stop="deleteItem(item.id)">删除</view>
+                            <view class="btn2" @click.stop="editItem(item)">修改</view>
                         </view>
                     </view>
                 </view>
@@ -61,7 +63,7 @@ export default {
         }
     },
     methods: {
-        addAddress(){
+        addAddress() {
             NavgateTo("../addAddress/index")
         },
 
@@ -71,7 +73,7 @@ export default {
 
         async headerSettingDefault(id) {
             const res = await request(apiArr.settingDefaultAddress, 'POST', { id }, { silent: true, nested: true });
-            if(res.code === 1){
+            if (res.code === 1) {
                 uni.showToast({
                     title: '设置成功',
                     icon: 'success',
@@ -81,7 +83,7 @@ export default {
             }
         },
 
-        deleteItem(id){
+        deleteItem(id) {
             const _this = this;
             uni.showModal({
                 title: '提示',
@@ -102,7 +104,7 @@ export default {
                 }
             });
         },
-        
+
         // 选择地址
         selectAddress(item) {
             // 存储选中的地址信息
@@ -133,4 +135,32 @@ export default {
 
 <style>
 @import url("./index.css");
+
+/* 多选框样式 */
+.checkbox {
+    width: 32rpx;
+    height: 32rpx;
+    border: 2rpx solid #D1D1D1;
+    border-radius: 6rpx;
+    margin-right: 10rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #FFFFFF;
+}
+
+.checkbox-checked {
+    border-color: #FF370B;
+    background-color: #FF370B;
+}
+
+.checkbox-checked::after {
+    content: "";
+    display: block;
+    width: 16rpx;
+    height: 8rpx;
+    border-left: 2rpx solid #FFFFFF;
+    border-bottom: 2rpx solid #FFFFFF;
+    transform: rotate(-45deg);
+}
 </style>
\ No newline at end of file