From 75e7e58b8dbb7611009bed3d646f654e82f0f2a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 5 Sep 2024 12:40:53 +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=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/goods_details_store/index.vue      | 19 +++++++----
 sheep/api/promotion/combination.js            |  6 ++--
 .../components/s-goods-card/s-goods-card.vue  | 14 +++++---
 .../s-groupon-block/s-groupon-block.vue       | 33 +++++++++----------
 sheep/platform/share.js                       |  2 +-
 5 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
index 92ef2d0..3df0435 100644
--- a/pages/user/goods_details_store/index.vue
+++ b/pages/user/goods_details_store/index.vue
@@ -1,7 +1,12 @@
 <template>
   <s-layout title="选择自提门店" :bgStyle="{ color: '#FFF' }">
     <view class="storeBox" ref="container">
-      <view class="storeBox-box" v-for="(item, index) in state.storeList" :key="index" @tap="checked(item)">
+      <view
+        class="storeBox-box"
+        v-for="(item, index) in state.storeList"
+        :key="index"
+        @tap="checked(item)"
+      >
         <view class="store-img">
           <image :src="item.logo" class="img" />
         </view>
@@ -33,7 +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">
@@ -112,7 +119,7 @@
         latitude: Number(e.latitude),
         longitude: Number(e.longitude),
         name: e.name,
-        address: `${e.areaName}-${e.detailAddress}`
+        address: `${e.areaName}-${e.detailAddress}`,
       });
     } else {
       // #endif
@@ -121,7 +128,7 @@
         longitude: Number(e.longitude),
         name: e.name,
         address: `${e.areaName}-${e.detailAddress}`,
-        success: function() {
+        success: function () {
           console.log('success');
         },
       });
@@ -172,7 +179,7 @@
       state.user_latitude = uni.getStorageSync(LATITUDE);
       state.user_longitude = uni.getStorageSync(LONGITUDE);
     } catch (e) {
-      console.error(e)
+      console.error(e);
     }
   });
 </script>
@@ -180,7 +187,7 @@
   .line1 {
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap
+    white-space: nowrap;
   }
 
   .geoPage {
diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
index 62791f0..bf1d6c6 100644
--- a/sheep/api/promotion/combination.js
+++ b/sheep/api/promotion/combination.js
@@ -37,7 +37,7 @@ const CombinationApi = {
       url: '/promotion/combination-activity/detail-list',
       method: 'GET',
       params: {
-        ids
+        ids,
       },
     });
   },
@@ -58,9 +58,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-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
index 21df6ad..00339dd 100644
--- a/sheep/components/s-goods-card/s-goods-card.vue
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -3,7 +3,10 @@
   <!-- 商品卡片 -->
   <view>
     <!-- 布局1. 单列大图（上图，下内容）-->
-    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length" class="goods-sl-box">
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length"
+      class="goods-sl-box"
+    >
       <view
         class="goods-box"
         v-for="item in state.goodsList"
@@ -100,7 +103,10 @@
     </view>
 
     <!-- 布局3. 单列小图（左图，右内容） -->
-    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length" class="goods-lg-box">
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length"
+      class="goods-lg-box"
+    >
       <view
         class="goods-box"
         :style="[{ marginBottom: data.space + 'px' }]"
@@ -157,11 +163,11 @@
   const props = defineProps({
     data: {
       type: Object,
-      default: () => ({})
+      default: () => ({}),
     },
     styles: {
       type: Object,
-      default: () => ({})
+      default: () => ({}),
     },
   });
 
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 14f3204..862b70f 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -3,7 +3,10 @@
   <!-- 商品卡片 -->
   <view>
     <!-- 布局1. 单列大图（上图，下内容）-->
-    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length" class="goods-sl-box">
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length"
+      class="goods-sl-box"
+    >
       <view
         class="goods-box"
         v-for="item in state.spuList"
@@ -100,7 +103,10 @@
     </view>
 
     <!-- 布局3. 单列小图（左图，右内容） -->
-    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length" class="goods-lg-box">
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length"
+      class="goods-lg-box"
+    >
       <view
         class="goods-box"
         :style="[{ marginBottom: data.space + 'px' }]"
@@ -135,12 +141,7 @@
   /**
    * 商品卡片
    */
-  import {
-    computed,
-    onMounted,
-    reactive,
-    ref,
-  } from 'vue';
+  import { computed, onMounted, reactive, ref } from 'vue';
   import sheep from '@/sheep';
   import CombinationApi from '@/sheep/api/promotion/combination';
   import SpuApi from '@/sheep/api/product/spu';
@@ -164,13 +165,11 @@
   const props = defineProps({
     data: {
       type: Object,
-      default() {
-      },
+      default() {},
     },
     styles: {
       type: Object,
-      default() {
-      },
+      default() {},
     },
   });
 
@@ -247,7 +246,6 @@
     return spu;
   }
 
-
   // 初始化
   onMounted(async () => {
     // 加载活动列表
@@ -257,15 +255,14 @@
       state.spuList.push(await getSpuDetail(activity.spuId));
     }
 
-
     // 循环活动列表
-    activityList.forEach(activity => {
+    activityList.forEach((activity) => {
       // 获取活动商品的最低价格
-      activity.products.forEach(product => {
+      activity.products.forEach((product) => {
         const combinationPrice = product.combinationPrice || Infinity;
 
         // 找到对应的 spu 并更新价格
-        const spu = state.spuList.find(spu => activity.spuId === spu.id);
+        const spu = state.spuList.find((spu) => activity.spuId === spu.id);
         if (spu) {
           spu.price = Math.min(combinationPrice, spu.price || Infinity);
         }
@@ -326,4 +323,4 @@
       color: #fff;
     }
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/sheep/platform/share.js b/sheep/platform/share.js
index 53fe196..d200f67 100644
--- a/sheep/platform/share.js
+++ b/sheep/platform/share.js
@@ -178,7 +178,7 @@ const decryptSpm = (spm) => {
 };
 
 // 绑定推广员
-const bindBrokerageUser = async (val= undefined) => {
+const bindBrokerageUser = async (val = undefined) => {
   try {
     const shareId = val || uni.getStorageSync('shareId');
     if (!shareId) {