From 8aa7027bf683a313dea906c5528f7c31bca8338f Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Wed, 23 Jul 2025 14:40:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=92=8C=E5=88=86=E7=B1=BB=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E9=94=AE=E5=8A=A0=E8=B4=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/product-list.vue      | 65 +++++++++++++++++++++++++++++---
 components/themes/diy.vue        | 15 ++++++++
 components/themes/shoptheme1.vue |  2 +-
 3 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/components/product-list.vue b/components/product-list.vue
index d8d0ef3..bef9139 100644
--- a/components/product-list.vue
+++ b/components/product-list.vue
@@ -281,10 +281,36 @@
               </view>
               <view class="m-product-price1">
                 <view class="money">
-                  <block v-if="item.product_unit_price_range != '0.00'">
+                  <view
+                    v-if="item.product_unit_price_range != '0.00'"
+                    class="goods_name"
+                  >
                     <label>{{ __("￥") }}</label
                     >{{ item.product_unit_price_range }}
-                  </block>
+                  </view>
+
+                  <view
+                    v-if="item.product_quantity != 0"
+                    :data-stock="chooseItem.available_quantity"
+                    :data-num="chooseItem.user_cart_quantity"
+                    :data-step="1"
+                    :data-spuid="
+                      chooseItem.product_id ? chooseItem.product_id : 0
+                    "
+                    :data-pname="
+                      chooseItem.item_name ? chooseItem.item_name : ''
+                    "
+                    :data-skuid="item.item_id"
+                    :data-index="chooseIndex"
+                    @click.stop="addCart"
+                    class="btn_addcard"
+                  ></view>
+
+                  <view
+                    v-if="item.product_quantity == 0"
+                      @click.stop="addCart2"
+                    class="btn_addcard disabled"
+                  ></view>
 
                   <block v-if="item.product_unit_points">
                     <label
@@ -767,7 +793,6 @@
   </view>
 </template>
 
-
 <script>
 import uniDrawer from "@/components/uni-drawer.vue";
 import uniTag from "@/components/uni-tag/uni-tag.vue";
@@ -1853,6 +1878,14 @@ export default {
       this.onFilter();
       this.onCloseFilter();
     },
+
+addCart2(){
+  uni.showToast({
+    icon: 'error',
+    title: this.$.__("亲~商品没有库存啦！")
+  });
+},
+
     //列表购物车
     addCart: async function (e) {
       let that = this;
@@ -1860,11 +1893,14 @@ export default {
       let step = parseInt(e.currentTarget.dataset.step);
       let user_cart_quantity = parseInt(e.currentTarget.dataset.num);
 
+      console.log(`sku${e.currentTarget.dataset.skuid}`);
+
       let params = {
         item_id: e.currentTarget.dataset.skuid,
         cart_quantity: step,
         activity_id: 0,
         chain_id: 0,
+        SKU_Id: e.currentTarget.dataset.skuid,
       };
 
       if (e.currentTarget.dataset.stock == user_cart_quantity) {
@@ -1896,6 +1932,12 @@ export default {
             // that.pdlist[index].user_cart_quantity = that.pdlist[index].user_cart_quantity + step
             //that.$.alert(that.$.__('添加购物车成功'));
 
+            console.log(1001);
+
+            if (data?.item_quantity != 0) {
+              that.$.alert(that.__("添加购物车成功"), function () {}, 400);
+            }
+
             that.$set(that.pdlist[index], "cart_id", data.cart_id);
             that.$set(
               that.pdlist[index],
@@ -2109,7 +2151,6 @@ export default {
 };
 </script>
 
-
 <style lang="scss" scoped>
 @import "../styles/_variables.scss";
 @import "../styles/store_tpl.scss";
@@ -2745,5 +2786,17 @@ export default {
   border-left: 1rpx solid #d9d9d9;
 }
 
-/*Grid*/
-</style>
\ No newline at end of file
+.btn_addcard {
+  position: absolute;
+  right: 0;
+  bottom: 12rpx;
+  width: 40rpx;
+  height: 40rpx;
+  background: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/pc1.png)
+    center no-repeat;
+  background-size: cover;
+  &.disabled {
+    filter: grayscale(1);
+  }
+}
+</style>
diff --git a/components/themes/diy.vue b/components/themes/diy.vue
index 8d7570f..056b2bb 100644
--- a/components/themes/diy.vue
+++ b/components/themes/diy.vue
@@ -576,6 +576,7 @@
                   <view class="activity-desc" v-if="item.eltm16.isShowNum">
                     {{ __("已有") }}{{ items.OrderCount }} {{ __("人参加") }}
                   </view>
+                  <view class="btn_addcard" @click.stop="addCart(items)"></view>
                 </view>
               </navigator>
               <button v-else class="activity-item" :data-pid="items.did" :data-Mid="items.mid || ''"
@@ -1495,4 +1496,18 @@ uni-page-body {
 .diyPage {
   padding-bottom: 60rpx;
 }
+
+.activity-info{
+  position: relative;
+}
+
+.btn_addcard{
+  position: absolute;
+  right: 0;
+  bottom: 14rpx;
+    width: 40rpx;
+    height: 40rpx;
+    background: url(https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/pc1.png) center no-repeat;
+    background-size: cover;
+}
 </style>
diff --git a/components/themes/shoptheme1.vue b/components/themes/shoptheme1.vue
index c909e02..fead08a 100644
--- a/components/themes/shoptheme1.vue
+++ b/components/themes/shoptheme1.vue
@@ -1,6 +1,6 @@
 <template name="shoptheme1">
 	<view>
-		<view class="m-supermarket-ad">11111
+		<view class="m-supermarket-ad">
 			<view v-if="(commonTPL.AdContent.F1ProductContents.length>0)">
 				<view class="m-supermarket-tip-list">
 					<navigator :url="'/pages/product/list?is_store_flag=' + (commonTPL.isStoreFlag) + '&store_category_id=' + (item.store_product_cat_id) + '&cname=' + (item.name)"