From 735dc8c373c0c12d9a0f4636e5a87e6398215ae6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 6 Sep 2024 21:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E6=8B=BC=E5=9B=A2=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/groupon.vue                              |  1 -
 pages/user/goods_details_store/index.vue             |  6 +++---
 sheep/api/promotion/combination.js                   | 11 +++++------
 sheep/components/s-groupon-block/s-groupon-block.vue |  4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index 9c9669c..9611914 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -105,7 +105,6 @@
       <detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
 
       <!-- 商品tabbar -->
-      <!-- TODO: 已售罄、预热 判断 设计-->
       <detail-tabbar v-model="state.goodsInfo">
         <view class="buy-box ss-flex ss-col-center ss-p-r-20">
           <button
diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 3df0435..86c2d4a 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -38,9 +38,9 @@
             <!-- #endif -->
           </view>
           <view class="store-distance ss-flex ss-row-center" @tap.stop="showMaoLocation(item)">
-            <text class="addressTxt" v-if="item.distance"
-              >距离{{ item.distance.toFixed(2) }}千米</text
-            >
+            <text class="addressTxt" v-if="item.distance">
+              距离{{ item.distance.toFixed(2) }}千米
+            </text>
             <text class="addressTxt" v-else>查看地图</text>
             <view class="iconfont">
               <view class="ss-rest-button">
diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index eb3639c..8e8436c 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -2,7 +2,6 @@ import request from '@/sheep/request';
 
 // 拼团 API
 const CombinationApi = {
-
   // 获得拼团活动分页
   getCombinationActivityPage: (params) => {
     return request({
@@ -23,13 +22,13 @@ const CombinationApi = {
     });
   },
 
-  // 获得拼团活动明细列表
-  getCombinationActivityDetailList: (ids) => {
+  // 获得拼团活动列表，基于活动编号数组
+  getCombinationActivityListByIds: (ids) => {
     return request({
       url: '/promotion/combination-activity/list-by-ids',
       method: 'GET',
       params: {
-        ids
+        ids,
       },
     });
   },
@@ -50,9 +49,9 @@ const CombinationApi = {
   // 获得我的拼团记录分页
   getCombinationRecordPage: (params) => {
     return request({
-      url: "/promotion/combination-record/page",
+      url: '/promotion/combination-record/page',
       method: 'GET',
-      params
+      params,
     });
   },
 
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 6c9d654..59b63c1 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -1,4 +1,4 @@
-<!-- 装修商品组件：商品卡片 -->
+<!-- 装修商品组件：【拼团】商品卡片 -->
 <template>
   <!-- 商品卡片 -->
   <view>
@@ -232,7 +232,7 @@
    * @return {Promise<undefined>} 商品列表
    */
   async function getCombinationActivityDetailList(ids) {
-    const { data } = await CombinationApi.getCombinationActivityDetailList(ids);
+    const { data } = await CombinationApi.getCombinationActivityListByIds(ids);
     return data;
   }