From 27e4e817c8a2c2f57c9b09b48d10a688ef1cccd4 Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Sun, 27 Jul 2025 11:27:46 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=20=E6=A8=A1=E6=9D=BF1=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E5=8A=A0=E8=B4=AD=EF=BC=9B=E5=88=86=E7=B1=BB=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8A=A0=E8=B4=AD=E6=8C=89=E9=92=AE=E8=A2=AB=E6=8C=A1=E4=BD=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/product-list.vue      | 143 +++++++++++++++++--------------
 components/themes/shoptheme1.vue |  28 +++++-
 pagesub/index/store.vue          |   6 +-
 3 files changed, 104 insertions(+), 73 deletions(-)

diff --git a/components/product-list.vue b/components/product-list.vue
index 2784e26..32e2859 100644
--- a/components/product-list.vue
+++ b/components/product-list.vue
@@ -246,7 +246,6 @@
               "
             >
               <view class="m-product-name2">
-                <label>
                   <block
                     v-for="(id, idx) in item.activity_type_id_row"
                     :key="idx"
@@ -254,7 +253,6 @@
                     <ms-activity-tag :typeId="id" v-if="id"></ms-activity-tag>
                   </block>
                   {{ item.product_name }}
-                </label>
               </view>
               <view class="m-product-name2" v-if="false">
                 <uni-tag
@@ -280,65 +278,35 @@
                 ></uni-tag>
               </view>
               <view class="m-product-price1">
-                <view class="money">
-                  <view
-                    v-if="item.product_unit_price_range != '0.00'"
-                    class="goods_name"
-                  >
-                    <label>{{ __("￥") }}</label
-                    >{{ item.product_unit_price_range }}
+               
+
+                  <view class="goods_item">
+                    <block v-if="item.product_unit_points">
+                      <label
+                        style="margin: 0rpx 10rpx"
+                        v-if="item.product_unit_price_range != '0.00'"
+                        >+</label
+                      >{{ number_format(item.product_unit_points) }}
+                      <label>{{ __("积分") }}</label>
+                    </block>
+
+                    <block v-if="item.product_unit_sp">
+                      <label style="margin: 0rpx 10rpx">+</label
+                      >{{ item.product_unit_sp }}
+                      <label>{{ __("众宝") }}</label>
+                    </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
-                      style="margin: 0rpx 10rpx"
-                      v-if="item.product_unit_price_range != '0.00'"
-                      >+</label
-                    >{{ number_format(item.product_unit_points) }}
-                    <label>{{ __("积分") }}</label>
-                  </block>
-
-                  <block v-if="item.product_unit_sp">
-                    <label style="margin: 0rpx 10rpx">+</label
-                    >{{ item.product_unit_sp }} <label>{{ __("众宝") }}</label>
-                  </block>
-                </view>
-                <view
-                  class="num"
-                  v-if="
-                    !plantformInfo.prodcut_addcart_flag &&
-                    plantformInfo.product_salenum_flag &&
-                    item.product_sale_num > 0
-                  "
-                >
+                  <view class="goods_item">
+ <view class="num">
                   <text>{{ __("已售") }}</text>
-                  <label style="color: #db384c; margin-left: 2px">{{
-                    item.product_sale_num
-                  }}</label>
+                  <label style="color: #db384c; margin: 0 5px"
+                    >{{ item.product_sale_num }}</label
+                  >
                 </view>
+                 <view :class="'c' + 1" v-if="false"> </view>
+                  </view>
+
                 <view
                   class="multi-spec-box"
                   v-if="plantformInfo.prodcut_addcart_flag"
@@ -413,7 +381,39 @@
                   </view>
                 </view>
 
-                <view :class="'c' + 1" v-if="false"> </view>
+                 <view class="goods_item">
+                    <view
+                      v-if="item.product_unit_price_range != '0.00'"
+                      class="goods_name"
+                    >
+                      <label>{{ __("￥") }}</label
+                      >{{ item.product_unit_price_range }}
+                    </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>
+                  </view>
+               
               </view>
             </view>
           </navigator>
@@ -1879,12 +1879,12 @@ export default {
       this.onCloseFilter();
     },
 
-addCart2(){
-  uni.showToast({
-    icon: 'error',
-    title: this.$.__("商品库存不足")
-  });
-},
+    addCart2() {
+      uni.showToast({
+        icon: "error",
+        title: this.$.__("商品库存不足"),
+      });
+    },
 
     //列表购物车
     addCart: async function (e) {
@@ -2241,10 +2241,20 @@ addCart2(){
   }
 }
 
+.m-product-name2{
+  line-height: 1 !important;
+  height: auto !important;
+  overflow:visible;
+}
+
 /*全部商品 end*/
 .m-product-price1 {
-  display: flex;
-  justify-content: space-between;
+  display: block;
+  .goods_item {
+    position: relative;
+    display: flex;
+    justify-content: space-between;
+  }
 
   label {
     font-weight: initial;
@@ -2637,6 +2647,7 @@ addCart2(){
 }
 
 .money {
+  width: 100%;
   font-size: 14px;
 }
 
diff --git a/components/themes/shoptheme1.vue b/components/themes/shoptheme1.vue
index fead08a..ff383a5 100644
--- a/components/themes/shoptheme1.vue
+++ b/components/themes/shoptheme1.vue
@@ -2,12 +2,12 @@
 	<view>
 		<view class="m-supermarket-ad">
 			<view v-if="(commonTPL.AdContent.F1ProductContents.length>0)">
-				<view class="m-supermarket-tip-list">
+				<!-- <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)"
 					 v-for="(item, i) in commonTPL.smallCategory"  :key="i" class="m-supermarket-tip-item">
 						<label>{{item.name}}</label>
 					</navigator>
-				</view>
+				</view> -->
 				<view class="m-product-list m-listv">
 					<navigator v-for="(item, i) in commonTPL.AdContent.F1ProductContents"  :key="i" :url="'/pages/product/detail?is_store_flag=' + (commonTPL.isStoreFlag) + '&pid=' + (item.ProductContentID)"
 					 class="m-product-item">
@@ -30,6 +30,7 @@
 								<block v-if="item.product_unit_sp">
 									<label style="margin: 0rpx 10rpx;">+</label><label style="font-size:32rpx">{{item.product_unit_sp}}</label> <label>{{__('众宝')}}</label>
 								</block>
+								<view class="btn_addcard" @click.stop="handleAddcard(item, $event)"></view>
 							</view>
 						</view>
 					</navigator>
@@ -99,7 +100,11 @@
 			return {}
 		},
 		created: function() {},
-		methods: {}
+		methods: {
+			handleAddcard(data, event){
+				this.$emit('addCart', data)
+			}
+		}
 	}
 </script>
 
@@ -110,4 +115,21 @@
 	// @import '../../styles/layout.scss';
 	// @import '../../styles/store_themes.scss';
 	// @import '../../styles/store_tpl.scss';
+	.m-product-info{
+  width: auto;
+}
+	.m-product-price{
+  position: relative;
+  width: auto;
+}
+	.btn_addcard{
+  position: absolute;
+  right: 20rpx;
+  bottom: 8rpx;
+    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/pagesub/index/store.vue b/pagesub/index/store.vue
index d9a31df..90b9774 100644
--- a/pagesub/index/store.vue
+++ b/pagesub/index/store.vue
@@ -103,7 +103,7 @@
             </view>
           </view>
 
-          <shoptheme1 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop1'" :commonTPL="commonTPL">
+          <shoptheme1 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop1'" :commonTPL="commonTPL" @addCart="addCart">
           </shoptheme1>
           <shoptheme2 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop2'" :commonTPL="commonTPL">
           </shoptheme2>
@@ -683,7 +683,7 @@ export default {
       this.$.gopage(url)
     },
 
-    async addCart(item, event) {
+    async addCart(item) {
       var that = this;
       var params = {
         item_id: item.item_id,
@@ -693,8 +693,6 @@ export default {
         SKU_Id: item.item_id,
       };
 
-      event.stopPropagation()
-
       await this.$store.dispatch(`addCart`, {
         params: params,
         callback: (data, status, msg, code) => {