From 7f79fbf76ad7fdbd558a4c7ab10a311f23439dac Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Thu, 7 Dec 2023 21:25:24 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE?=
 =?UTF-8?q?=EF=BC=9A=E8=A3=85=E4=BF=AE=E6=A8=A1=E6=9D=BF=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                          |  3 ++-
 pages/index/index.vue               | 30 +++++++++++++-------------
 sheep/api/promotion/diy/template.js | 22 +++++++++++++------
 sheep/store/app.js                  | 33 ++++++++++++++++++-----------
 4 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7639e4bf..0670590a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ deploy.sh
 .env
 yarn.lock
 package-lock.json
-*.keystore
\ No newline at end of file
+*.keystore
+pnpm-lock.yaml
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 92546704..e568e081 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -28,26 +28,26 @@
 
 	const template = computed(() => sheep.$store('app').template?.home);
 	// 在此处拦截改变一下首页轮播图 此处先写死后期复活 放到启动函数里
-	(async function() {
-		console.log('原代码首页定制化数据',template)
-		let {
-			data
-		} = await index2Api.decorate();
-		console.log('首页导航配置化过高无法兼容',JSON.parse(data[1].value))
+	// (async function() {
+		// console.log('原代码首页定制化数据',template)
+		// let {
+		// 	data
+		// } = await index2Api.decorate();
+		// console.log('首页导航配置化过高无法兼容',JSON.parse(data[1].value))
 		// 改变首页底部数据 但是没有通过数组id获取商品数据接口
 		// let {
 		// 	data: datas
 		// } = await index2Api.spids();
 		// template.value.data[9].data.goodsIds = datas.list.map(item => item.id);
-		template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
-			return {
-				src: item.picUrl,
-				url: item.url,
-				title: item.name,
-				type: "image"
-			}
-		})
-	}())
+		// template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
+		// 	return {
+		// 		src: item.picUrl,
+		// 		url: item.url,
+		// 		title: item.name,
+		// 		type: "image"
+		// 	}
+		// })
+	// }())
 
 
 	onLoad((options) => {
diff --git a/sheep/api/promotion/diy/template.js b/sheep/api/promotion/diy/template.js
index 8c1312c3..054dffae 100644
--- a/sheep/api/promotion/diy/template.js
+++ b/sheep/api/promotion/diy/template.js
@@ -1,10 +1,20 @@
 import request from '@/sheep/request';
 
-export default {
+ const DiyTemplateApi = {
   // TODO 芋艿：测试
-  getUsedDiyTemplate: () =>
-    request({
-      url: '/app-api/promotion/diy-template/used',
-      method: 'GET',
-    }),
+  getUsedDiyTemplate: () => {
+      return request({
+          url: '/app-api/promotion/diy-template/used',
+          method: 'GET',
+      });
+  },
+  getDiyTemplate: (id) => {
+      return request({
+          url: '/app-api/promotion/diy-template/get',
+          method: 'GET',
+          params: { id }
+      });
+  },
 };
+
+export default DiyTemplateApi;
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 7ed6ac22..28598e3d 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -61,18 +61,18 @@ const app = defineStore({
         $router.error('NetworkError');
       }
 
+      await adaptTemplate(this.template, templateId)
       const res = await appApi.init(templateId);
       if (res.error === 0) {
         this.info = res.data.app;
         this.platform = res.data.platform;
-        this.template = res.data.template;
-        this.has_wechat_trade_managed = res.data.has_wechat_trade_managed;
-        if (!res.data.template) {
-          $router.error('TemplateError');
-        }
-        this.chat = res.data.chat;
 
-        await adaptTemplate(this.template);
+        // this.template = res.data.template;
+        this.has_wechat_trade_managed = res.data.has_wechat_trade_managed;
+        // if (!res.data.template) {
+        //   $router.error('TemplateError');
+        // }
+        this.chat = res.data.chat;
 
         // 加载主题
         const sysStore = sys();
@@ -100,17 +100,26 @@ const app = defineStore({
 });
 
 // todo: @owen 先做数据适配，后期重构
-const adaptTemplate = async (appTemplate) => {
-  const diyTemplate = await diyTemplateApi.getUsedDiyTemplate();
-  const tabBar = diyTemplate?.data?.property?.tabBar;
+const adaptTemplate = async (appTemplate, templateId) => {
+  const { data: diyTemplate } = templateId
+      // 查询指定模板，一般是预览时使用
+      ? await diyTemplateApi.getDiyTemplate(templateId)
+      : await diyTemplateApi.getUsedDiyTemplate();
+  // 模板不存在
+  if (!diyTemplate) {
+    $router.error('TemplateError');
+    return
+  }
+
+  const tabBar = diyTemplate?.property?.tabBar;
   if (tabBar) {
     appTemplate.basic.tabbar = tabBar
     if (tabBar?.theme) {
       appTemplate.basic.theme = tabBar?.theme;
     }
   }
-  appTemplate.home = diyTemplate?.data?.home;
-  appTemplate.user = diyTemplate?.data?.user;
+  appTemplate.home = diyTemplate?.home;
+  appTemplate.user = diyTemplate?.user;
 }
 
 export default app;

From d9b25ed14b3c81f32ba8f245b0604d509a6e40a0 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sat, 9 Dec 2023 15:37:24 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=90=E5=BC=B9=E7=AA=97=E5=B9=BF=E5=91=8A=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                         |  4 +---
 .../components/s-block-item/s-block-item.vue  |  2 ++
 .../s-popup-image/s-popup-image.vue           | 22 ++++++++++++++-----
 sheep/hooks/useModal.js                       |  4 ++--
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index ac6e7cad..68a00bd8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,8 +5,6 @@
 			<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
 				<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
 			</s-block>
-			<!-- 广告模块 -->
-			<s-popup-image />
 		</s-layout>
 	</view>
 </template>
@@ -89,4 +87,4 @@
 	onPageScroll(() => {});
 </script>
 
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index a9c795b8..67a83912 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -10,6 +10,8 @@
     <s-menu-list v-if="type === 'MenuList'" :data="data" />
     <!-- 基础组件：宫格导航 -->
     <s-menu-grid v-if="type === 'MenuGrid'" :data="data" />
+    <!-- 基础组件：弹窗广告 -->
+    <s-popup-image v-if="type === 'Popover'" :data="data" />
 
     <!-- 图文组件：图片展示 -->
     <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
diff --git a/sheep/components/s-popup-image/s-popup-image.vue b/sheep/components/s-popup-image/s-popup-image.vue
index f2528a3b..b10f4777 100644
--- a/sheep/components/s-popup-image/s-popup-image.vue
+++ b/sheep/components/s-popup-image/s-popup-image.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <view v-for="(item, index) in popupList" :key="item.src">
+    <view v-for="(item, index) in popupList" :key="index">
       <su-popup
         v-if="index === currentIndex"
         :show="item.isShow"
@@ -14,7 +14,7 @@
         <view class="img-box">
           <image
             class="modal-img"
-            :src="sheep.$url.cdn(item.src)"
+            :src="sheep.$url.cdn(item.imgUrl)"
             mode="widthFix"
             @tap.stop="onPopup(item.url)"
           />
@@ -27,34 +27,46 @@
 <script setup>
   import sheep from '@/sheep';
   import { computed, ref } from 'vue';
-  import { onShow } from '@dcloudio/uni-app';
   import { saveAdvHistory } from '@/sheep/hooks/useModal';
 
+  // 定义属性
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    }
+  })
+
   // const modalStore = sheep.$store('modal');
   const modalStore = JSON.parse(uni.getStorageSync('modal-store') || '{}');
+  console.log(modalStore)
   const advHistory = modalStore.advHistory || [];
   const currentIndex = ref(0);
   const popupList = computed(() => {
-    const list = sheep.$store('app').template.basic?.popupImage?.list || [];
+    const list = props.data.list || [];
     const newList = [];
     if (list.length > 0) {
       list.forEach((adv) => {
-        if (adv.show === 1 && advHistory.includes(adv.src)) {
+        if (adv.showType === 'once' && advHistory.includes(adv.imgUrl)) {
           adv.isShow = false;
         } else {
           adv.isShow = true;
           newList.push(adv);
         }
+
+        // 记录弹窗已显示过
         saveAdvHistory(adv);
       });
     }
     return newList;
   });
 
+  // 跳转链接
   function onPopup(path) {
     sheep.$router.go(path);
   }
 
+  // 关闭
   function onClose(index) {
     currentIndex.value = index + 1;
     popupList.value[index].isShow = false;
diff --git a/sheep/hooks/useModal.js b/sheep/hooks/useModal.js
index 273124e1..76bb333c 100644
--- a/sheep/hooks/useModal.js
+++ b/sheep/hooks/useModal.js
@@ -121,8 +121,8 @@ export function saveAdvHistory(adv) {
   const modal = $store('modal');
 
   modal.$patch((state) => {
-    if (!state.advHistory.includes(adv.src)) {
-      state.advHistory.push(adv.src);
+    if (!state.advHistory.includes(adv.imgUrl)) {
+      state.advHistory.push(adv.imgUrl);
     }
   });
 }

From a28a36e0383ef1ec1ebd23cd812b64148e8b9b9c Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sat, 9 Dec 2023 16:55:31 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-wallet-card/s-wallet-card.vue           | 63 ++-----------------
 1 file changed, 4 insertions(+), 59 deletions(-)

diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index 25d6c1c1..a1c4164b 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -1,29 +1,14 @@
 <template>
-<<<<<<< HEAD
 	<view class="ss-wallet-menu-wrap ss-flex ss-col-center">
 		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
 			@tap="sheep.$router.go('/pages/user/wallet/money')">
 			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text ss-line-1">{{ userInfo.money }}</view>
+				<view class="value-text ss-line-1">{{ userInfo.money || '0.00' }}</view>
 				<view class="unit-text ss-m-l-6">元</view>
 			</view>
 			<view class="menu-title ss-m-t-28">账户余额</view>
 		</view>
 		<!-- <view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-=======
-  <view class="ss-wallet-menu-wrap ss-flex ss-col-center">
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="sheep.$router.go('/pages/user/wallet/money')"
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text ss-line-1">{{ userInfo.money || '0.00' }}</view>
-        <view class="unit-text ss-m-l-6">元</view>
-      </view>
-      <view class="menu-title ss-m-t-28">账户余额</view>
-    </view>
-    <!-- <view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
->>>>>>> 6251ffa9944516e995002e7f11539aef3e1d50de
 			@tap="sheep.$router.go('/pages/user/wallet/commission')">
 			<view class="value-box ss-flex ss-col-bottom">
 				<view class="value-text">{{ userInfo?.commission || '0.00' }}</view>
@@ -31,11 +16,10 @@
 			</view>
 			<view class="menu-title ss-m-t-28">佣金</view>
 		</view> -->
-<<<<<<< HEAD
 		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
 			@tap="sheep.$router.go('/pages/user/wallet/score')">
 			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text">{{ userInfo.point }}</view>
+				<view class="value-text">{{ userInfo.point || '0.00' }}</view>
 				<view class="unit-text ss-m-l-6">个</view>
 			</view>
 			<view class="menu-title ss-m-t-28">积分</view>
@@ -46,7 +30,7 @@
         })
       ">
 			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text">{{ numData.coupons_num }}</view>
+				<view class="value-text">{{ numData.coupons_num || '0.00' }}</view>
 				<view class="unit-text ss-m-l-6">张</view>
 			</view>
 			<view class="menu-title ss-m-t-28">优惠券</view>
@@ -58,45 +42,6 @@
 			<view class="menu-title ss-m-t-30">我的钱包</view>
 		</view>
 	</view>
-=======
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="sheep.$router.go('/pages/user/wallet/score')"
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text">{{ userInfo.score || 0 }}</view>
-        <view class="unit-text ss-m-l-6">个</view>
-      </view>
-      <view class="menu-title ss-m-t-28">积分</view>
-    </view>
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="
-        sheep.$router.go('/pages/coupon/list', {
-          type: 'geted',
-        })
-      "
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text">{{ numData.coupons_num || 0 }}</view>
-        <view class="unit-text ss-m-l-6">张</view>
-      </view>
-      <view class="menu-title ss-m-t-28">优惠券</view>
-    </view>
-    <view
-      class="menu-item ss-flex-col ss-row-center ss-col-center menu-wallet"
-      @tap="sheep.$router.go('/pages/user/wallet/money')"
-    >
-      <image
-        class="item-icon"
-        :src="sheep.$url.static('/static/img/shop/user/wallet_icon.png')"
-        mode="aspectFit"
-      >
-      </image>
-      <view class="menu-title ss-m-t-30">我的钱包</view>
-    </view>
-  </view>
->>>>>>> 6251ffa9944516e995002e7f11539aef3e1d50de
 </template>
 
 <script setup>
@@ -153,4 +98,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>

From 3157df8464a5099d6e65ccbcfd3776ba23db0f44 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 9 Dec 2023 20:04:51 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E2=9C=A8=20=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=9ASKU=20=E9=80=89=E6=8B=A9=E7=9A=84=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-select-sku/s-select-sku.vue  | 53 ++++++++-------
 .../s-wallet-card/s-wallet-card.vue           | 64 +------------------
 sheep/hooks/useGoods.js                       | 44 +++++++++++++
 3 files changed, 76 insertions(+), 85 deletions(-)

diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
index 7819b900..b3938054 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -4,7 +4,7 @@
 		<view class="ss-modal-box bg-white ss-flex-col">
 			<view class="modal-header ss-flex ss-col-center">
 				<view class="header-left ss-m-r-30">
-					<image class="sku-image" :src="sheep.$url.cdn(state.selectedSkuPrice.image || goodsInfo.image)"
+					<image class="sku-image" :src="state.selectedSkuPrice.image || goodsInfo.image"
 						mode="aspectFill"></image>
 				</view>
 				<view class="header-right ss-flex-col ss-row-between ss-flex-1">
@@ -38,17 +38,17 @@
 			</view>
 			<view class="modal-content ss-flex-1">
 				<scroll-view scroll-y="true" class="modal-content-scroll" @touchmove.stop>
-					<view class="sku-item ss-m-b-20" v-for="sku1 in goodsInfo.skus" :key="sku1.id">
+					<view class="sku-item ss-m-b-20" v-for="sku1 in skuList" :key="sku1.id">
 						<view class="label-text ss-m-b-20">{{ sku1.name }}</view>
 						<view class="ss-flex ss-col-center ss-flex-wrap">
-							<button class="ss-reset-button spec-btn" v-for="sku2 in sku1.children" :class="[
+							<button class="ss-reset-button spec-btn" v-for="sku2 in sku1.values" :class="[
                   {
-                    'ui-BG-Main-Gradient': state.currentSkuArray[sku2.parent_id] == sku2.id,
+                    'ui-BG-Main-Gradient': state.currentSkuArray[sku1.id] == sku2.id,
                   },
                   {
-                    'disabled-btn': sku2.disabled == true,
+                    'disabled-btn': sku2.disabled === true,
                   },
-                ]" :key="sku2.id" :disabled="sku2.disabled == true" @tap="onSelectSku(sku2.parent_id, sku2.id)">
+                ]" :key="sku2.id" :disabled="sku2.disabled === true" @tap="onSelectSku(sku1.id, sku2.id)">
 								{{ sku2.name }}
 							</button>
 						</view>
@@ -56,7 +56,7 @@
 					<view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
 						<view class="label-text">购买数量</view>
 						<su-number-box :min="1" :max="state.selectedSkuPrice.stock" :step="1"
-							v-model="state.selectedSkuPrice.goods_num" @change="onNumberChange($event)"></su-number-box>
+							v-model="state.selectedSkuPrice.goods_num" @change="onNumberChange($event)" />
 					</view>
 				</scroll-view>
 			</view>
@@ -82,7 +82,8 @@
 	import sheep from '@/sheep';
 	import {
 		formatStock,
-		formatPrice
+		formatPrice,
+    convertProductPropertyList
 	} from '@/sheep/hooks/useGoods';
 	import {
 		isEmpty
@@ -108,27 +109,32 @@
 		selectedSkuPrice: {},
 		currentSkuArray: [],
 	});
-	//输入框改变数量
+	// 输入框改变数量
 	function onNumberChange(e) {
 		if (e === 0) return;
 		if (state.selectedSkuPrice.goods_num === e) return;
 		state.selectedSkuPrice.goods_num = e;
 	}
+  // TODO 芋艿：去除单规格
 	// 默认单规格
-	if (!props.goodsInfo.is_sku) {
-		state.selectedSkuPrice = props.goodsInfo.sku_prices[0];
-	}
+	// if (!props.goodsInfo.is_sku) {
+	// 	state.selectedSkuPrice = props.goodsInfo.sku_prices[0];
+	// }
 
-	const skuList = props.goodsInfo.skus;
+	const skuList = convertProductPropertyList(props.goodsInfo.skus);
 
 	// 可选规格
 	const skuPrices = computed(() => {
-		let skuPrices = props.goodsInfo.sku_prices;
-		if (props.goodsInfo.is_sku) {
-			skuPrices.forEach((item) => {
-				item.goods_sku_id_arr = item.goods_sku_ids.split(',');
-			});
-		}
+		let skuPrices = props.goodsInfo.skus;
+    // TODO 芋艿：去除单规格
+		// if (props.goodsInfo.is_sku) {
+		// 	skuPrices.forEach((item) => {
+		// 		item.goods_sku_id_arr = item.goods_sku_ids.split(',');
+		// 	});
+		// }
+    for (let price of skuPrices) {
+      price.goods_sku_id_arr = price.properties.map((item) => item.valueId).join(',')
+    }
 		return skuPrices;
 	});
 
@@ -143,7 +149,7 @@
 	);
 
 	const goodsPrice = computed(() => {
-		let price, score;
+    let price, score;
 		if (isEmpty(state.selectedSkuPrice)) {
 			price = props.goodsInfo.price[0];
 			score = props.goodsInfo.score || 0;
@@ -182,7 +188,7 @@
 	}
 	// 改变禁用状态
 	function changeDisabled(isChecked = false, pid = 0, skuId = 0) {
-		let newPrice = []; // 所有可以选择的 skuPrice
+    let newPrice = []; // 所有可以选择的 skuPrice
 
 		if (isChecked) {
 			// 选中规格
@@ -192,6 +198,7 @@
 					// this.goodsNum 不判断是否大于当前选择数量，在 uni-number-box 判断，并且 取 stock 和 goods_num 的小值
 					continue;
 				}
+        console.log(price.goods_sku_id_arr, '=======')
 				if (price.goods_sku_id_arr.indexOf(skuId.toString()) >= 0) {
 					newPrice.push(price);
 				}
@@ -262,6 +269,7 @@
 	}
 	// 当前所选规格下，获取所有有库存的 skuPrice
 	function getCanUseSkuPrice() {
+    // debugger
 		let newPrice = [];
 
 		for (let price of skuPrices.value) {
@@ -287,6 +295,7 @@
 	}
 	// 选择规格
 	function onSelectSku(pid, skuId) {
+    // debugger
 		// 清空已选择
 		let isChecked = true; // 选中 or 取消选中
 		if (state.currentSkuArray[pid] != undefined && state.currentSkuArray[pid] == skuId) {
@@ -306,7 +315,7 @@
 			}
 		});
 
-		// 当前所选规格下，所有可以选择的 skuPric
+		// 当前所选规格下，所有可以选择的 skuPrice
 		let newPrice = getCanUseSkuPrice();
 
 		// 判断所有规格大类是否选择完成
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index 25d6c1c1..6f0f0163 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -1,5 +1,5 @@
 <template>
-<<<<<<< HEAD
+  <!-- TODO @惠智造：代码合并有问题，可以看看 -->
 	<view class="ss-wallet-menu-wrap ss-flex ss-col-center">
 		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
 			@tap="sheep.$router.go('/pages/user/wallet/money')">
@@ -9,29 +9,6 @@
 			</view>
 			<view class="menu-title ss-m-t-28">账户余额</view>
 		</view>
-		<!-- <view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-=======
-  <view class="ss-wallet-menu-wrap ss-flex ss-col-center">
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="sheep.$router.go('/pages/user/wallet/money')"
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text ss-line-1">{{ userInfo.money || '0.00' }}</view>
-        <view class="unit-text ss-m-l-6">元</view>
-      </view>
-      <view class="menu-title ss-m-t-28">账户余额</view>
-    </view>
-    <!-- <view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
->>>>>>> 6251ffa9944516e995002e7f11539aef3e1d50de
-			@tap="sheep.$router.go('/pages/user/wallet/commission')">
-			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text">{{ userInfo?.commission || '0.00' }}</view>
-				<view class="unit-text ss-m-l-6">元</view>
-			</view>
-			<view class="menu-title ss-m-t-28">佣金</view>
-		</view> -->
-<<<<<<< HEAD
 		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
 			@tap="sheep.$router.go('/pages/user/wallet/score')">
 			<view class="value-box ss-flex ss-col-bottom">
@@ -58,45 +35,6 @@
 			<view class="menu-title ss-m-t-30">我的钱包</view>
 		</view>
 	</view>
-=======
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="sheep.$router.go('/pages/user/wallet/score')"
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text">{{ userInfo.score || 0 }}</view>
-        <view class="unit-text ss-m-l-6">个</view>
-      </view>
-      <view class="menu-title ss-m-t-28">积分</view>
-    </view>
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="
-        sheep.$router.go('/pages/coupon/list', {
-          type: 'geted',
-        })
-      "
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text">{{ numData.coupons_num || 0 }}</view>
-        <view class="unit-text ss-m-l-6">张</view>
-      </view>
-      <view class="menu-title ss-m-t-28">优惠券</view>
-    </view>
-    <view
-      class="menu-item ss-flex-col ss-row-center ss-col-center menu-wallet"
-      @tap="sheep.$router.go('/pages/user/wallet/money')"
-    >
-      <image
-        class="item-icon"
-        :src="sheep.$url.static('/static/img/shop/user/wallet_icon.png')"
-        mode="aspectFit"
-      >
-      </image>
-      <view class="menu-title ss-m-t-30">我的钱包</view>
-    </view>
-  </view>
->>>>>>> 6251ffa9944516e995002e7f11539aef3e1d50de
 </template>
 
 <script setup>
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index a95ef55f..4ee726e3 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -156,3 +156,47 @@ function getDayjsTime(time) {
     return dayjs.unix(parseInt(time));
   }
 }
+
+/**
+ * 从商品 SKU 数组中，转换出商品属性的数组
+ *
+ * 类似结构：[{
+ *    id: // 属性的编号
+ *    name: // 属性的名字
+ *    values: [{
+ *      id: // 属性值的编号
+ *      name: // 属性值的名字
+ *    }]
+ * }]
+ *
+ * @param skus 商品 SKU 数组
+ */
+export function convertProductPropertyList(skus) {
+  let result = [];
+  for (const sku of skus) {
+    if (!sku.properties) {
+      continue
+    }
+    for (const property of sku.properties) {
+      // ① 先处理属性
+      let resultProperty = result.find(item => item.id === property.propertyId)
+      if (!resultProperty) {
+        resultProperty = {
+          id: property.propertyId,
+          name: property.propertyName,
+          values: []
+        }
+        result.push(resultProperty)
+      }
+      // ② 再处理属性值
+      let resultValue = resultProperty.values.find(item => item.id === property.valueId)
+      if (!resultValue) {
+        resultProperty.values.push({
+          id: property.valueId,
+          name: property.valueName
+        })
+      }
+    }
+  }
+  return result;
+}
\ No newline at end of file

From 72998abf10eaa8b128c14195ddb80e60a5e79dd1 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sat, 9 Dec 2023 21:33:46 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=90=E6=82=AC=E6=B5=AE=E6=8C=89=E9=92=AE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/user.vue                          |   1 -
 .../components/s-block-item/s-block-item.vue  |   2 +
 .../components/s-float-menu/s-float-menu.vue  | 116 ++++++++++--------
 sheep/components/s-layout/s-layout.vue        |   8 --
 4 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/pages/index/user.vue b/pages/index/user.vue
index b51e5fdb..37e6291b 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -6,7 +6,6 @@
     :bgStyle="template.page"
     :navbarStyle="template.style?.navbar"
     onShareAppMessage
-    :showFloatButton="true"
   >
     <s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
       <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 67a83912..9821ce23 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -12,6 +12,8 @@
     <s-menu-grid v-if="type === 'MenuGrid'" :data="data" />
     <!-- 基础组件：弹窗广告 -->
     <s-popup-image v-if="type === 'Popover'" :data="data" />
+    <!-- 基础组件：悬浮按钮 -->
+    <s-float-menu v-if="type === 'FloatingActionButton'" :data="data" />
 
     <!-- 图文组件：图片展示 -->
     <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
diff --git a/sheep/components/s-float-menu/s-float-menu.vue b/sheep/components/s-float-menu/s-float-menu.vue
index b696c34b..bed65138 100644
--- a/sheep/components/s-float-menu/s-float-menu.vue
+++ b/sheep/components/s-float-menu/s-float-menu.vue
@@ -1,75 +1,93 @@
 <template>
-  <!-- TODO-jj: 点击遮罩关闭 -->
-  <view>
-    <view v-if="data?.show === 1">
-      <uni-fab
-        ref="fabRef"
-        :pattern="state.pattern"
-        :content="state.content"
-        horizontal="right"
-        vertical="bottom"
-        :direction="state.direction"
-        @trigger="trigger"
-        @fabClick="fabClick"
-        :popMenu="true"
-      ></uni-fab>
-    </view>
-    <view :class="state.show ? 'float-bg' : ''" @click="onTap"></view>
-  </view>
+  <!-- 模态背景：展开时显示，点击后折叠 -->
+  <view class="modal-bg" v-if="fabRef?.isShow" @click="handleCollapseFab"></view>
+  <!-- 悬浮按钮 -->
+  <uni-fab
+    ref="fabRef"
+    horizontal="right"
+    vertical="bottom"
+    :direction="state.direction"
+    :pattern="state.pattern"
+    :content="state.content"
+    @trigger="handleOpenLink"
+  />
 </template>
 <script setup>
+  /**
+   * 悬浮按钮
+   */
+
   import sheep from '@/sheep';
-  import { computed, reactive, ref, unref, getCurrentInstance } from 'vue';
+  import { reactive, ref, unref } from 'vue';
   import { onBackPress } from '@dcloudio/uni-app';
-  const data = computed(() => sheep.$store('app').template.basic?.floatMenu);
+
+  // 定义属性
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {
+        return {
+          // horizontal vertical
+          direction: 'vertical',
+          showText: true,
+          list: [{
+            imgUrl: 'http://localhost/logo.gif',
+            url: '',
+            text: '客服',
+            textColor: '',
+          }],
+        }
+      },
+    }
+  })
+
+  // 悬浮按钮配置： https://uniapp.dcloud.net.cn/component/uniui/uni-fab.html#fab-props
   const state = reactive({
+    // 可选样式配置项
     pattern: [],
+    // 展开菜单内容配置项
     content: [],
+    // 展开菜单显示方式：horizontal-水平显示，vertical-垂直显示
     direction: '',
-    show: false,
   });
 
+  // 悬浮按钮引用
   const fabRef = ref(null);
-  const vm = getCurrentInstance();
-  if (data.value?.mode === 1) {
-    state.direction = 'vertical';
-  } else {
-    state.direction = 'horizontal';
-  }
-  data.value?.list.forEach((i) => {
-    if (data.value?.isText === 0) {
-      state.content.push({ iconPath: sheep.$url.cdn(i.src), url: i.url });
-    } else {
-      state.content.push({ iconPath: sheep.$url.cdn(i.src), text: i.title.text + '', url: i.url });
-    }
-    state.pattern.push({ color: i.title.color });
+  // 按钮方向
+  state.direction = props.data.direction;
+  props.data?.list.forEach((item) => {
+    // 按钮文字
+    const text = props.data?.showText ? item.text : ''
+    // 生成内容配置项
+    state.content.push({ iconPath: sheep.$url.cdn(item.imgUrl), url: item.url, text });
+    // 生成样式配置项
+    state.pattern.push({ color: item.textColor });
   });
-  function trigger(e) {
+
+  // 处理链接跳转
+  function handleOpenLink(e) {
     sheep.$router.go(e.item.url);
   }
-  function onTap() {
-    if (state.show) {
-      state.show = false;
-      vm.refs.fabRef.close();
-    } else {
-      state.show = true;
-      vm.refs.fabRef.open();
+
+  // 折叠
+  function handleCollapseFab() {
+    if (unref(fabRef)?.isShow) {
+      unref(fabRef)?.close();
     }
   }
-  function fabClick() {
-    state.show = !state.show;
-  }
+
+  // 按返回值后，折叠悬浮按钮
   onBackPress(() => {
-    if (unref(fabRef).isShow) {
-      unref(fabRef).close();
+    if (unref(fabRef)?.isShow) {
+      unref(fabRef)?.close();
       return true;
-    } else {
-      return false;
     }
+    return false;
   });
 </script>
 <style lang="scss" scoped>
-  .float-bg {
+  /* 模态背景 */
+  .modal-bg {
     position: fixed;
     left: 0;
     top: 0;
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index f3bcb689..914e7a31 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -36,9 +36,6 @@
         <!-- 页面内容插槽 -->
         <slot />
 
-        <!-- 悬浮按钮 -->
-        <s-float-menu v-if="showFloatButton"></s-float-menu>
-
         <!-- 底部导航 -->
         <s-tabbar v-if="tabbar !== ''" :path="tabbar" />
       </view>
@@ -130,11 +127,6 @@
       type: String,
       default: '',
     },
-    //展示悬浮按钮
-    showFloatButton: {
-      type: Boolean,
-      default: false,
-    },
     //展示返回按钮
     showLeftButton: {
       type: Boolean,

From e3264329e74b261fb3a27a7d38612ea087e73138 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 Dec 2023 11:57:24 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E2=9C=A8=20=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=9ASKU=20=E7=9A=84=E9=80=89=E6=8B=A9=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/detail-cell-sku.vue     |  26 +-
 pages/goods/index.vue                         | 114 +++---
 .../components/s-select-sku/s-select-sku.vue  | 327 +++++++-----------
 3 files changed, 191 insertions(+), 276 deletions(-)

diff --git a/pages/goods/components/detail/detail-cell-sku.vue b/pages/goods/components/detail/detail-cell-sku.vue
index 3ba9739a..31a8b462 100644
--- a/pages/goods/components/detail/detail-cell-sku.vue
+++ b/pages/goods/components/detail/detail-cell-sku.vue
@@ -1,10 +1,10 @@
 <template>
-  <detail-cell v-if="skus.length > 0" label="选择" :value="value"></detail-cell>
+  <!-- SKU 选择的提示框 -->
+  <detail-cell label="选择" :value="value" />
 </template>
 
 <script setup>
   import { computed } from 'vue';
-
   import detailCell from './detail-cell.vue';
 
   const props = defineProps({
@@ -14,22 +14,18 @@
         return [];
       },
     },
-    skus: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
+    sku: {
+      type: Object
+    }
   });
   const value = computed(() => {
-    let str = '';
-    if (props.modelValue.length > 0) {
-      props.modelValue.forEach((item, index) => {
-        str += props.skus[index].name + ':' + item + ' ';
-      });
-    } else {
-      str = '请选择商品规格';
+    if (!props.sku.id) {
+      return '请选择商品规格';
     }
+    let str = '';
+    props.sku.properties.forEach(property => {
+      str += property.propertyName + ':' + property.valueName + ' ';
+    });
     return str;
   });
 </script>
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 1661dfcb..3e4badc0 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -12,24 +12,25 @@
 			<block v-else>
 				<view class="detail-swiper-selector">
 					<!-- 商品轮播图  -->
-					<su-swiper class="ss-m-b-14" isPreview :list="state.goodsSwiper" dotStyle="tag" imageMode="widthFix"
-						dotCur="bg-mask-40" :seizeHeight="750" />
+					<su-swiper class="ss-m-b-14" isPreview :list="formatGoodsSwiper(state.goodsInfo.sliderPicUrls)"
+                     dotStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
 
 					<!-- 价格+标题 -->
 					<view class="title-card detail-card ss-p-y-40 ss-p-x-20">
 						<view class="ss-flex ss-row-between ss-col-center ss-m-b-26">
 							<view class="price-box ss-flex ss-col-bottom">
 								<view class="price-text ss-m-r-16">
-									{{ state.selectedSkuPrice.price || formatPrice(state.goodsInfo.price) }}
+									{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
 								</view>
-								<view class="origin-price-text" v-if="state.goodsInfo.original_price > 0">
-									{{ state.selectedSkuPrice.original_price || state.goodsInfo.original_price }}
+								<view class="origin-price-text" v-if="state.goodsInfo.marketPrice > 0">
+									{{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
 								</view>
 							</view>
 							<view class="sales-text">
-								{{ formatSales(state.goodsInfo.sales_show_type, state.goodsInfo.sales) }}
+								{{ formatSales('exact', state.goodsInfo.salesCount) }}
 							</view>
 						</view>
+            <!-- TODO 芋艿：promos 未写 -->
 						<view class="discounts-box ss-flex ss-row-between ss-m-b-28">
 							<div class="tag-content">
 								<view class="tag-box ss-flex">
@@ -40,27 +41,29 @@
 								</view>
 							</div>
 
+              <!-- TODO 芋艿：couponInfo 优惠劵 -->
 							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="state.showModel = true"
 								v-if="state.couponInfo.length">
 								<view class="discounts-title ss-m-r-8">领券</view>
 								<text class="cicon-forward"></text>
 							</view>
 						</view>
-						<view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.title }}</view>
-						<view class="subtitle-text ss-line-1">{{ state.goodsInfo.subtitle }}</view>
+						<view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.name }}</view>
+						<view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view>
 					</view>
 
 					<!-- 功能卡片 -->
 					<view class="detail-cell-card detail-card ss-flex-col">
-						<detail-cell-sku v-model="state.selectedSkuPrice.goods_sku_text" :skus="state.goodsInfo.skus"
-							@tap="state.showSelectSku = true" />
+						<detail-cell-sku v-model="state.selectedSku.goods_sku_text" :sku="state.selectedSku"
+                             @tap="state.showSelectSku = true" />
+            <!-- TODO 芋艿：可能暂时不考虑使用 -->
 						<detail-cell-service v-if="state.goodsInfo.service" v-model="state.goodsInfo.service" />
 						<detail-cell-params v-if="state.goodsInfo.params" v-model="state.goodsInfo.params" />
 					</view>
 
 					<!-- 规格与数量弹框 -->
 					<s-select-sku :goodsInfo="state.goodsInfo" :show="state.showSelectSku" @addCart="onAddCart"
-						@buy="onBuy" @change="onSkuChange" @close="state.showSelectSku = false" />
+                        @buy="onBuy" @change="onSkuChange" @close="state.showSelectSku = false" />
 				</view>
 
 				<!-- 评价 -->
@@ -73,7 +76,6 @@
 
 				<!-- 详情tabbar -->
 				<detail-tabbar v-model="state.goodsInfo">
-					<!-- TODO: 缺货中 已售罄 判断 设计-->
 					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0">
 						<button class="ss-reset-button add-btn ui-Shadow-Main" @tap="state.showSelectSku = true">
 							加入购物车
@@ -87,29 +89,19 @@
 					</view>
 				</detail-tabbar>
 				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
-					@get="onGet" />
+                      @get="onGet" />
 				<s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
-					@close="state.showActivityModel = false" />
+                        @close="state.showActivityModel = false" />
 			</block>
 		</s-layout>
 	</view>
 </template>
 
 <script setup>
-	import {
-		reactive,
-		computed
-	} from 'vue';
-	import {
-		onLoad,
-		onPageScroll
-	} from '@dcloudio/uni-app';
+	import { reactive, computed } from 'vue';
+	import { onLoad, onPageScroll } from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
-	import {
-		formatSales,
-		formatGoodsSwiper,
-		formatPrice
-	} from '@/sheep/hooks/useGoods';
+  import { formatSales, formatGoodsSwiper, fen2yuan, } from '@/sheep/hooks/useGoods';
 	import detailNavbar from './components/detail/detail-navbar.vue';
 	import detailCellSku from './components/detail/detail-cell-sku.vue';
 	import detailCellService from './components/detail/detail-cell-service.vue';
@@ -130,29 +122,27 @@
 
 	const state = reactive({
 		goodsId: 0,
-		skeletonLoading: true,
-		goodsInfo: {},
-		showSelectSku: false,
-		goodsSwiper: [],
-		selectedSkuPrice: {},
+		skeletonLoading: true, // SPU 加载中
+		goodsInfo: {}, // SPU 信息
+		showSelectSku: false, // 是否展示 SKU 选择弹窗
+		selectedSku: {}, // 选中的 SKU
 		showModel: false,
-		total: 0,
 		couponInfo: [],
 		showActivityModel: false,
 		activityInfo: [],
 	});
 
-	// 规格变更
+	// 规格变更 TODO 芋艿：待测试
 	function onSkuChange(e) {
-		state.selectedSkuPrice = e;
+		state.selectedSku = e;
 	}
 
-	// 添加购物车
+	// 添加购物车  TODO 芋艿：待测试
 	function onAddCart(e) {
 		sheep.$store('cart').add(e);
 	}
 
-	// 立即购买
+	// 立即购买  TODO 芋艿：待测试
 	function onBuy(e) {
 		sheep.$router.go('/pages/order/confirm', {
 			data: JSON.stringify({
@@ -165,13 +155,14 @@
 			}),
 		});
 	}
-	//营销活动
+
+	// 营销活动  TODO 芋艿：待测试
 	function onActivity() {
 		state.activityInfo = state.goodsInfo.promos;
 		state.showActivityModel = true;
 	}
 
-	//立即领取
+	//立即领取  TODO 芋艿：待测试
 	async function onGet(id) {
 		const {
 			error,
@@ -187,10 +178,11 @@
 		}
 	}
 
+  //  TODO 芋艿：待测试
 	const shareInfo = computed(() => {
 		if (isEmpty(state.goodsInfo)) return {};
 		return sheep.$platform.share.getShareInfo({
-			title: state.goodsInfo.title,
+			title: state.goodsInfo.name,
 			image: sheep.$url.cdn(state.goodsInfo.image),
 			desc: state.goodsInfo.subtitle,
 			params: {
@@ -199,7 +191,7 @@
 			},
 		}, {
 			type: 'goods', // 商品海报
-			title: state.goodsInfo.title, // 商品标题
+			title: state.goodsInfo.name, // 商品标题
 			image: sheep.$url.cdn(state.goodsInfo.image), // 商品主图
 			price: state.goodsInfo.price[0], // 商品价格
 			original_price: state.goodsInfo.original_price, // 商品原价
@@ -207,41 +199,29 @@
 	});
 
 	onLoad(async (options) => {
-		console.log('页面被访问')
 		// 非法参数
 		if (!options.id) {
 			state.goodsInfo = null;
 			return;
 		}
 		state.goodsId = options.id;
-		// 加载商品信息
+		// 1. 加载商品信息
 		sheep.$api.goods.detail(state.goodsId).then((res) => {
-			// 处理数据适配
-			// let arr = [];
-			// res.skus = res.data.skus.map(item => {
-			// 	arr = [...arr, ...item.properties];
-			// 	item.children = item.properties;
-			// 	item.goods_id = res.data.id;
-			// 	item.name = item.children[0].propertyName;
-			// 	return item;
-			// })
-			// console.log(arr, '合并');
-			// console.log(res.data, '替换后订单数据');
+      // 未找到商品
+      if (res.code !== 0 || !res.data) {
+        state.goodsInfo = null;
+        return;
+      }
+			// 加载到商品
 			state.skeletonLoading = false;
-			if (res.code === 0) {
-				// 在此处对数据做出转换
-				res.data.sales = res.data.salesCount
-				res.data.original_price = res.data.marketPrice / 100
-				res.data.subtitle = res.data.introduction
-				res.data.title = res.data.name
-				res.data.price = [res.data.price / 100]
-				state.goodsInfo = res.data;
-				state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.sliderPicUrls);
-			} else {
-				// 未找到商品
-				state.goodsInfo = null;
-			}
+      state.goodsInfo = res.data;
 		});
+    // TODO 芋艿：下面接口的调整
+    if (true) {
+      return
+    }
+
+    // 2. 加载优惠劵信息
 		const {
 			error,
 			data
diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
index b3938054..b339d4a1 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -1,70 +1,56 @@
 <template>
 	<!-- 规格弹窗 -->
 	<su-popup :show="show" round="10" @close="emits('close')">
+    <!-- SKU 信息 -->
 		<view class="ss-modal-box bg-white ss-flex-col">
 			<view class="modal-header ss-flex ss-col-center">
 				<view class="header-left ss-m-r-30">
-					<image class="sku-image" :src="state.selectedSkuPrice.image || goodsInfo.image"
-						mode="aspectFill"></image>
+					<image class="sku-image" :src="state.selectedSku.picUrl || goodsInfo.picUrl" mode="aspectFill" />
 				</view>
 				<view class="header-right ss-flex-col ss-row-between ss-flex-1">
-					<view class="goods-title ss-line-2">{{ goodsInfo.title }}</view>
+					<view class="goods-title ss-line-2">{{ goodsInfo.name }}</view>
 					<view class="header-right-bottom ss-flex ss-col-center ss-row-between">
 						<view class="ss-flex">
-							<view v-if="goodsPrice.price > 0" class="price-text">
-								{{ goodsPrice.price }}
-							</view>
-							<view class="ss-flex">
-								<view v-if="goodsPrice.price > 0 && goodsPrice.score > 0" class="score-text ss-m-l-4">+
-								</view>
-								<image v-if="goodsPrice.score > 0"
-									:src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img">
-								</image>
-								<view v-if="goodsPrice.score > 0" class="score-text">
-									{{ goodsPrice.score }}
-								</view>
+							<view class="price-text">
+								{{ fen2yuan( state.selectedSku.price || goodsInfo.price) }}
 							</view>
 						</view>
-
 						<view class="stock-text ss-m-l-20">
-							{{
-                state.selectedSkuPrice.stock
-                  ? formatStock(goodsInfo.stock_show_type, state.selectedSkuPrice.stock)
-                  : formatStock(goodsInfo.stock_show_type, goodsInfo.stock)
-              }}
+							{{ formatStock('exact', state.selectedSku.stock || goodsInfo.stock) }}
 						</view>
 					</view>
 				</view>
 			</view>
+
+      <!-- 属性选择 -->
 			<view class="modal-content ss-flex-1">
 				<scroll-view scroll-y="true" class="modal-content-scroll" @touchmove.stop>
-					<view class="sku-item ss-m-b-20" v-for="sku1 in skuList" :key="sku1.id">
-						<view class="label-text ss-m-b-20">{{ sku1.name }}</view>
+					<view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
+						<view class="label-text ss-m-b-20">{{ property.name }}</view>
 						<view class="ss-flex ss-col-center ss-flex-wrap">
-							<button class="ss-reset-button spec-btn" v-for="sku2 in sku1.values" :class="[
+							<button class="ss-reset-button spec-btn" v-for="value in property.values" :class="[
                   {
-                    'ui-BG-Main-Gradient': state.currentSkuArray[sku1.id] == sku2.id,
+                    'ui-BG-Main-Gradient': state.currentPropertyArray[property.id] === value.id,
                   },
                   {
-                    'disabled-btn': sku2.disabled === true,
+                    'disabled-btn': value.disabled === true,
                   },
-                ]" :key="sku2.id" :disabled="sku2.disabled === true" @tap="onSelectSku(sku1.id, sku2.id)">
-								{{ sku2.name }}
+                ]" :key="value.id" :disabled="value.disabled === true" @tap="onSelectSku(property.id, value.id)">
+								{{ value.name }}
 							</button>
 						</view>
 					</view>
 					<view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
 						<view class="label-text">购买数量</view>
-						<su-number-box :min="1" :max="state.selectedSkuPrice.stock" :step="1"
-							v-model="state.selectedSkuPrice.goods_num" @change="onNumberChange($event)" />
+						<su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
+                           v-model="state.selectedSku.goods_num" @change="onNumberChange($event)" />
 					</view>
 				</scroll-view>
 			</view>
+
+      <!-- 操作区 -->
 			<view class="modal-footer border-top">
-				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center" v-if="isScore">
-					<button class="ss-reset-button score-btn ui-Shadow-Main" @tap="onBuy">立即兑换</button>
-				</view>
-				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center" v-else>
+				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
 					<button class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart">加入购物车</button>
 					<button class="ss-reset-button buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
 				</view>
@@ -74,20 +60,9 @@
 </template>
 
 <script setup>
-	import {
-		computed,
-		reactive,
-		watch
-	} from 'vue';
+	import { computed, reactive, watch } from 'vue';
 	import sheep from '@/sheep';
-	import {
-		formatStock,
-		formatPrice,
-    convertProductPropertyList
-	} from '@/sheep/hooks/useGoods';
-	import {
-		isEmpty
-	} from 'lodash';
+  import { formatStock, convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
 
 	const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
 	const props = defineProps({
@@ -98,48 +73,27 @@
 		show: {
 			type: Boolean,
 			default: false,
-		},
-		isScore: {
-			type: Boolean,
-			default: false,
-		},
+		}
 	});
 
 	const state = reactive({
-		selectedSkuPrice: {},
-		currentSkuArray: [],
+		selectedSku: {}, // 选中的 SKU
+		currentPropertyArray: [], // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号
 	});
-	// 输入框改变数量
-	function onNumberChange(e) {
-		if (e === 0) return;
-		if (state.selectedSkuPrice.goods_num === e) return;
-		state.selectedSkuPrice.goods_num = e;
-	}
-  // TODO 芋艿：去除单规格
-	// 默认单规格
-	// if (!props.goodsInfo.is_sku) {
-	// 	state.selectedSkuPrice = props.goodsInfo.sku_prices[0];
-	// }
 
-	const skuList = convertProductPropertyList(props.goodsInfo.skus);
+	const propertyList = convertProductPropertyList(props.goodsInfo.skus);
 
-	// 可选规格
-	const skuPrices = computed(() => {
+	// SKU 列表
+	const skuList = computed(() => {
 		let skuPrices = props.goodsInfo.skus;
-    // TODO 芋艿：去除单规格
-		// if (props.goodsInfo.is_sku) {
-		// 	skuPrices.forEach((item) => {
-		// 		item.goods_sku_id_arr = item.goods_sku_ids.split(',');
-		// 	});
-		// }
     for (let price of skuPrices) {
-      price.goods_sku_id_arr = price.properties.map((item) => item.valueId).join(',')
+      price.value_id_array = price.properties.map((item) => item.valueId)
     }
 		return skuPrices;
 	});
 
 	watch(
-		() => state.selectedSkuPrice,
+		() => state.selectedSku,
 		(newVal) => {
 			emits('change', newVal);
 		}, {
@@ -148,189 +102,174 @@
 		},
 	);
 
-	const goodsPrice = computed(() => {
-    let price, score;
-		if (isEmpty(state.selectedSkuPrice)) {
-			price = props.goodsInfo.price[0];
-			score = props.goodsInfo.score || 0;
-		} else {
-			price = state.selectedSkuPrice.price;
-			score = state.selectedSkuPrice.score || 0;
-		}
-		return {
-			price,
-			score,
-		};
-	});
+  // 输入框改变数量
+  function onNumberChange(e) {
+    if (e === 0) return;
+    if (state.selectedSku.goods_num === e) return;
+    state.selectedSku.goods_num = e;
+  }
 
+  // 加入购物车
 	function onAddCart() {
-		if (state.selectedSkuPrice.goods_id) {
-			if (state.selectedSkuPrice.stock <= 0) {
-				sheep.$helper.toast('库存不足');
-			} else {
-				emits('addCart', state.selectedSkuPrice);
-			}
-		} else {
-			sheep.$helper.toast('请选择规格');
+		if (state.selectedSku.id <= 0) {
+      sheep.$helper.toast('请选择规格');
+      return;
 		}
+    if (state.selectedSku.stock <= 0) {
+      sheep.$helper.toast('库存不足');
+      return;
+    }
+
+    emits('addCart', state.selectedSku);
 	}
 
+  // 立即购买
 	function onBuy() {
-		if (state.selectedSkuPrice.goods_id) {
-			if (state.selectedSkuPrice.stock <= 0) {
-				sheep.$helper.toast('库存不足');
-			} else {
-				emits('buy', state.selectedSkuPrice);
-			}
-		} else {
-			sheep.$helper.toast('请选择规格');
-		}
+    if (state.selectedSku.id <= 0) {
+      sheep.$helper.toast('请选择规格');
+      return;
+    }
+    if (state.selectedSku.stock <= 0) {
+      sheep.$helper.toast('库存不足');
+      return;
+    }
+    emits('buy', state.selectedSku);
 	}
-	// 改变禁用状态
-	function changeDisabled(isChecked = false, pid = 0, skuId = 0) {
-    let newPrice = []; // 所有可以选择的 skuPrice
 
+	// 改变禁用状态：计算每个 property 属性值的按钮，是否禁用
+	function changeDisabled(isChecked = false, propertyId = 0, valueId = 0) {
+    let newSkus = []; // 所有可以选择的 sku 数组
 		if (isChecked) {
-			// 选中规格
-			// 当前点击选中规格下的 所有可用 skuPrice
-			for (let price of skuPrices.value) {
+			// 情况一：选中 property
+			// 获得当前点击选中 property 的、所有可用 SKU
+			for (let price of skuList.value) {
 				if (price.stock <= 0) {
-					// this.goodsNum 不判断是否大于当前选择数量，在 uni-number-box 判断，并且 取 stock 和 goods_num 的小值
 					continue;
 				}
-        console.log(price.goods_sku_id_arr, '=======')
-				if (price.goods_sku_id_arr.indexOf(skuId.toString()) >= 0) {
-					newPrice.push(price);
+				if (price.value_id_array.indexOf(valueId) >= 0) {
+					newSkus.push(price);
 				}
 			}
 		} else {
-			// 取消选中
-			// 当前所选规格下，所有可以选择的 skuPrice
-			newPrice = getCanUseSkuPrice();
+			// 情况二：取消选中 property
+			// 当前所选 property 下，所有可以选择的 SKU
+			newSkus = getCanUseSkuList();
 		}
 
-		// 所有存在并且有库存未选择的规格项 的 子项 id
-		let noChooseSkuIds = [];
-		for (let price of newPrice) {
-			noChooseSkuIds = noChooseSkuIds.concat(price.goods_sku_id_arr);
+		// 所有存在并且有库存未选择的 SKU 的 value 属性值 id
+		let noChooseValueIds = [];
+		for (let price of newSkus) {
+			noChooseValueIds = noChooseValueIds.concat(price.value_id_array);
 		}
-
-		// 去重
-		noChooseSkuIds = Array.from(new Set(noChooseSkuIds));
+		noChooseValueIds = Array.from(new Set(noChooseValueIds)); // 去重
 
 		if (isChecked) {
-			// 去除当前选中的规格项
-			let index = noChooseSkuIds.indexOf(skuId.toString());
-			noChooseSkuIds.splice(index, 1);
+			// 去除当前选中的 value 属性值 id
+			let index = noChooseValueIds.indexOf(valueId);
+			noChooseValueIds.splice(index, 1);
 		} else {
-			// 循环去除当前已选择的规格项
-			state.currentSkuArray.forEach((sku) => {
-				if (sku.toString() != '') {
-					// sku 为空是反选 填充的
-					let index = noChooseSkuIds.indexOf(sku.toString());
-					if (index >= 0) {
-						// sku 存在于 noChooseSkuIds
-						noChooseSkuIds.splice(index, 1);
-					}
+			// 循环去除当前已选择的 value 属性值 id
+			state.currentPropertyArray.forEach((currentPropertyId) => {
+				if (currentPropertyId.toString() !== '') {
+          return;
 				}
+        // currentPropertyId 为空是反选 填充的
+        let index = noChooseValueIds.indexOf(currentPropertyId);
+        if (index >= 0) {
+          // currentPropertyId 存在于 noChooseValueIds
+          noChooseValueIds.splice(index, 1);
+        }
 			});
 		}
 
-		// 当前已选择的规格大类
-		let chooseSkuKey = [];
+    // 当前已选择的 property 数组
+		let choosePropertyIds = [];
 		if (!isChecked) {
-			// 当前已选择的规格大类
-			state.currentSkuArray.forEach((sku, key) => {
-				if (sku != '') {
-					// sku 为空是反选 填充的
-					chooseSkuKey.push(key);
+			// 当前已选择的 property
+			state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => {
+				if (currentPropertyId !== '') {
+					// currentPropertyId 为空是反选 填充的
+					choosePropertyIds.push(currentValueId);
 				}
 			});
 		} else {
-			// 当前点击选择的规格大类
-			chooseSkuKey = [pid];
+			// 当前点击选择的 property
+			choosePropertyIds = [propertyId];
 		}
 
-		for (let i in skuList) {
-			// 当前点击的规格，或者取消选择时候 已选中的规格 不进行处理
-			if (chooseSkuKey.indexOf(skuList[i]['id']) >= 0) {
+    for (let propertyIndex in propertyList) {
+			// 当前点击的 property、或者取消选择时候，已选中的 property 不进行处理
+			if (choosePropertyIds.indexOf(propertyList[propertyIndex]['id']) >= 0) {
 				continue;
 			}
-
-			for (let j in skuList[i]['children']) {
-				// 如果当前规格项 id 不存在于有库存的规格项中，则禁用
-				if (noChooseSkuIds.indexOf(skuList[i]['children'][j]['id'].toString()) >= 0) {
-					skuList[i]['children'][j]['disabled'] = false;
-				} else {
-					skuList[i]['children'][j]['disabled'] = true;
-				}
+      // 如果当前 property id 不存在于有库存的 SKU 中，则禁用
+      for (let valueIndex in propertyList[propertyIndex]['values']) {
+				propertyList[propertyIndex]['values'][valueIndex]['disabled'] =
+          noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) < 0; // true 禁用 or false 不禁用
 			}
 		}
 	}
-	// 当前所选规格下，获取所有有库存的 skuPrice
-	function getCanUseSkuPrice() {
-    // debugger
-		let newPrice = [];
 
-		for (let price of skuPrices.value) {
-			if (price.stock <= 0) {
-				// || price.stock < this.goodsNum		不判断是否大于当前选择数量，在 uni-number-box 判断，并且 取 stock 和 goods_num 的小值
+	// 当前所选属性下，获取所有有库存的 SKU 们
+	function getCanUseSkuList() {
+		let newSkus = [];
+		for (let sku of skuList.value) {
+			if (sku.stock <= 0) {
 				continue;
 			}
-			var isOk = true;
-
-			state.currentSkuArray.forEach((sku) => {
-				// sku 不为空，并且，这个 条 skuPrice 没有被选中,则排除
-				if (sku.toString() != '' && price.goods_sku_id_arr.indexOf(sku.toString()) < 0) {
+      let isOk = true;
+      state.currentPropertyArray.forEach((propertyId) => {
+				// propertyId 不为空，并且，这个 条 sku 没有被选中，则排除
+				if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) {
 					isOk = false;
 				}
 			});
-
 			if (isOk) {
-				newPrice.push(price);
+				newSkus.push(sku);
 			}
 		}
-
-		return newPrice;
+		return newSkus;
 	}
+
 	// 选择规格
-	function onSelectSku(pid, skuId) {
-    // debugger
+	function onSelectSku(propertyId, valueId) {
 		// 清空已选择
 		let isChecked = true; // 选中 or 取消选中
-		if (state.currentSkuArray[pid] != undefined && state.currentSkuArray[pid] == skuId) {
+		if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
 			// 点击已被选中的，删除并填充 ''
 			isChecked = false;
-			state.currentSkuArray.splice(pid, 1, '');
+			state.currentPropertyArray.splice(propertyId, 1, '');
 		} else {
 			// 选中
-			state.currentSkuArray[pid] = skuId;
+			state.currentPropertyArray[propertyId] = valueId;
 		}
 
-		let chooseSkuId = []; // 选中的规格大类
-		state.currentSkuArray.forEach((sku) => {
-			if (sku != '') {
-				// sku 为空是反选 填充的
-				chooseSkuId.push(sku);
+    // 选中的 property 大类
+		let choosePropertyId = [];
+		state.currentPropertyArray.forEach((currentPropertyId) => {
+			if (currentPropertyId !== '') {
+				// currentPropertyId 为空是反选 填充的
+				choosePropertyId.push(currentPropertyId);
 			}
 		});
 
-		// 当前所选规格下，所有可以选择的 skuPrice
-		let newPrice = getCanUseSkuPrice();
+		// 当前所选 property 下，所有可以选择的 SKU 们
+		let newSkuList = getCanUseSkuList();
 
-		// 判断所有规格大类是否选择完成
-		if (chooseSkuId.length == skuList.length && newPrice.length) {
-			newPrice[0].goods_num = state.selectedSkuPrice.goods_num || 1;
-			state.selectedSkuPrice = newPrice[0];
+		// 判断所有 property 大类是否选择完成
+		if (choosePropertyId.length === propertyList.length && newSkuList.length) {
+			newSkuList[0].goods_num = state.selectedSku.goods_num || 1;
+			state.selectedSku = newSkuList[0];
 		} else {
-			state.selectedSkuPrice = {};
+			state.selectedSku = {};
 		}
 
-		// 改变规格项禁用状态
-		changeDisabled(isChecked, pid, skuId);
+		// 改变 property 禁用状态
+		changeDisabled(isChecked, propertyId, valueId);
 	}
 
 	changeDisabled(false);
+  // TODO 芋艿：待讨论的优化点：1）单规格，要不要默认选中；2）默认要不要选中第一个规格
 </script>
 
 <style lang="scss" scoped>

From 0e189711a8576072cf5a58a7d76fea670fd0fd7c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 Dec 2023 17:25:15 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E2=9C=A8=20=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=9A=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/comment/list.vue                  | 301 +++++++++---------
 .../goods/components/detail/comment-item.vue  | 127 ++++----
 .../components/detail/detail-comment-card.vue |  26 +-
 pages/goods/index.vue                         |   9 +-
 sheep/api/goods.js                            |  10 -
 sheep/api/product/comment.js                  |  18 ++
 sheep/hooks/useGoods.js                       |  10 +
 7 files changed, 259 insertions(+), 242 deletions(-)
 create mode 100644 sheep/api/product/comment.js

diff --git a/pages/goods/comment/list.vue b/pages/goods/comment/list.vue
index 138b5f54..01526b00 100644
--- a/pages/goods/comment/list.vue
+++ b/pages/goods/comment/list.vue
@@ -1,170 +1,167 @@
-<!-- 页面  -->
+<!-- 商品评论的分页 -->
 <template>
-	<s-layout title="全部评价">
-		<su-tabs :list="state.type" :scrollable="false" @change="onTabsChange" :current="state.currentTab"></su-tabs>
-		<view class="ss-m-t-20">
-			<view class="list-item" v-for="item in state.pagination.data" :key="item">
-				<comment-item :item="item"></comment-item>
-			</view>
-		</view>
-		<s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" />
-		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+  <s-layout title="全部评价">
+    <su-tabs
+      :list="state.type"
+      :scrollable="false"
+      @change="onTabsChange"
+      :current="state.currentTab"
+    />
+    <!-- 评论列表 -->
+    <view class="ss-m-t-20">
+      <view class="list-item" v-for="item in state.pagination.list" :key="item">
+        <comment-item :item="item" />
+      </view>
+    </view>
+    <s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" />
+    <!-- 下拉 -->
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
         contentdown: '上拉加载更多',
-      }" @tap="loadmore" />
-	</s-layout>
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
 </template>
 
 <script setup>
-	import sheep from '@/sheep';
-	import {
-		onLoad,
-		onReachBottom
-	} from '@dcloudio/uni-app';
-	import {
-		computed,
-		reactive
-	} from 'vue';
-	import _ from 'lodash';
-	import commentItem from '../components/detail/comment-item.vue';
+  import CommentApi from '@/sheep/api/product/comment';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash';
+  import commentItem from '../components/detail/comment-item.vue';
 
-	const pagination = {
-		data: [],
-		current_page: 1,
-		total: 1,
-		last_page: 1,
-	};
-	const state = reactive({
-		list: [],
-		type: [],
-		currentTab: 0,
-		pagination: {
-			data: [],
-			current_page: 1,
-			total: 1,
-			last_page: 1,
-		},
-		commentId: 0,
-		code: 0,
-	});
-	// 切换选项卡
-	function onTabsChange(e) {
-		state.pagination = pagination
-		state.currentTab = e.index;
-		state.code = e.code;
-		getList(state.commentId, e.code);
-	}
-	async function getType(id) {
-		const {
-			error,
-			data
-		} = await sheep.$api.goods.getType(id);
-		if (error === 0) {
-			console.log(data)
-			// state.type = data;
-			state.type = [{code:0,name:'全部'},{code:1,name:'好评'},{code:2,name:'中评'},{code:3,name:'差评'}];
-		}
-	}
-	async function getList(id, code=0, page = 1, list_rows = 6) {
-		state.loadStatus = 'loading';
-		let res = await sheep.$api.goods.comment2(id, {
-			type: code,
-			pageSize: list_rows,
-			pageNo: page,
-		});
-		console.log(res);
-		if (res.code === 0) {
-			let orderList = _.concat(state.pagination.data, res.data.list);
-			state.pagination = {
-				...res.data,
-				data: orderList,
-			};
-			if (state.pagination.current_page < state.pagination.last_page) {
-				state.loadStatus = 'more';
-			} else {
-				state.loadStatus = 'noMore';
-			}
-		}
-	}
-	// 加载更多
-	function loadmore() {
-		if (state.loadStatus !== 'noMore') {
-			getList(state.commentId, state.code, state.pagination.current_page + 1);
-		}
-	}
-	onLoad((options) => {
-		state.commentId = options.id;
-		getType(state.commentId);
-		getList(state.commentId);
-	});
-	// 上拉加载更多
-	onReachBottom(() => {
-		loadmore();
-	});
+  const state = reactive({
+    id: 0, // 商品 SPU 编号
+    type: [
+      { type: 0, name: '全部' },
+      { type: 1, name: '好评' },
+      { type: 2, name: '中评' },
+      { type: 3, name: '差评' },
+    ],
+    currentTab: 0, // 选中的 TAB
+    loadStatus: '',
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 1,
+    },
+  });
+
+  // 切换选项卡
+  function onTabsChange(e) {
+    state.currentTab = e.index;
+    // 加载列表
+    state.pagination.pageNo = 1;
+    state.pagination.list = [];
+    state.pagination.total = 0;
+    getList();
+  }
+
+  async function getList() {
+    // 加载列表
+    state.loadStatus = 'loading';
+    let res = await CommentApi.getCommentPage(
+      state.id,
+      state.pagination.pageNo,
+      state.pagination.pageSize,
+      state.type[state.currentTab].type,
+    );
+    if (res.code !== 0) {
+      return;
+    }
+    // 合并列表
+    state.pagination.list = _.concat(state.pagination.list, res.data.list);
+    state.pagination.total = res.data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getList();
+  }
+
+  onLoad((options) => {
+    state.id = options.id;
+    getList();
+  });
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
 </script>
 
 <style lang="scss" scoped>
-	.list-item {
-		padding: 32rpx 30rpx 20rpx 20rpx;
-		background: #fff;
+  .list-item {
+    padding: 32rpx 30rpx 20rpx 20rpx;
+    background: #fff;
 
-		.avatar {
-			width: 52rpx;
-			height: 52rpx;
-			border-radius: 50%;
-		}
+    .avatar {
+      width: 52rpx;
+      height: 52rpx;
+      border-radius: 50%;
+    }
 
-		.nickname {
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #999999;
-		}
+    .nickname {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #999999;
+    }
 
-		.create-time {
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #c4c4c4;
-		}
+    .create-time {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #c4c4c4;
+    }
 
-		.content-title {
-			font-size: 26rpx;
-			font-weight: 400;
-			color: #666666;
-			line-height: 42rpx;
-		}
+    .content-title {
+      font-size: 26rpx;
+      font-weight: 400;
+      color: #666666;
+      line-height: 42rpx;
+    }
 
-		.content-img {
-			width: 174rpx;
-			height: 174rpx;
-		}
+    .content-img {
+      width: 174rpx;
+      height: 174rpx;
+    }
 
-		.cicon-info-o {
-			font-size: 26rpx;
-			color: #c4c4c4;
-		}
+    .cicon-info-o {
+      font-size: 26rpx;
+      color: #c4c4c4;
+    }
 
-		.foot-title {
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #999999;
-		}
-	}
+    .foot-title {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #999999;
+    }
+  }
 
-	.btn-box {
-		width: 100%;
-		height: 120rpx;
-		background: #fff;
-		border-top: 2rpx solid #eee;
-	}
+  .btn-box {
+    width: 100%;
+    height: 120rpx;
+    background: #fff;
+    border-top: 2rpx solid #eee;
+  }
 
-	.tab-btn {
-		width: 130rpx;
-		height: 62rpx;
-		background: #eeeeee;
-		border-radius: 31rpx;
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #999999;
-		border: 1px solid #e5e5e5;
-		margin-right: 10rpx;
-	}
-</style>
\ No newline at end of file
+  .tab-btn {
+    width: 130rpx;
+    height: 62rpx;
+    background: #eeeeee;
+    border-radius: 31rpx;
+    font-size: 28rpx;
+    font-weight: 400;
+    color: #999999;
+    border: 1px solid #e5e5e5;
+    margin-right: 10rpx;
+  }
+</style>
diff --git a/pages/goods/components/detail/comment-item.vue b/pages/goods/components/detail/comment-item.vue
index 2c96ac04..518db2a8 100644
--- a/pages/goods/components/detail/comment-item.vue
+++ b/pages/goods/components/detail/comment-item.vue
@@ -1,95 +1,94 @@
+<!-- 商品评论项 -->
 <template>
   <view>
+    <!-- 用户评论 -->
     <view class="user ss-flex ss-m-b-14">
       <view class="ss-m-r-20 ss-flex">
-        <image class="avatar" :src="sheep.$url.cdn(item.user_avatar)"></image>
-      </view>
-      <view class="nickname ss-m-r-20">
-        {{ item.userNickname }}
+        <image class="avatar" :src="item.userAvatar"></image>
       </view>
+      <view class="nickname ss-m-r-20">{{ item.userNickname }}</view>
       <view class="">
         <uni-rate :readonly="true" v-model="item.scores" size="18" />
       </view>
     </view>
-    <view class="content">
-      {{ item.content }}
-    </view>
+    <view class="content"> {{ item.content }} </view>
     <view class="ss-m-t-24" v-if="item.picUrls?.length">
       <scroll-view class="scroll-box" scroll-x scroll-anchoring>
         <view class="ss-flex">
-          <view v-for="(item, index) in item.picUrls" :key="item" class="ss-m-r-10">
-            <su-image class="content-img" isPreview :previewList="state.commentImages" :current="index" :src="item"
-              :height="120" :width="120" mode="aspectFill"></su-image>
+          <view v-for="(picUrl, index) in item.picUrls" :key="picUrl" class="ss-m-r-10">
+            <su-image
+              class="content-img"
+              isPreview
+              :previewList="item.picUrls"
+              :current="index"
+              :src="picUrl"
+              :height="120"
+              :width="120"
+              mode="aspectFill"
+            />
           </view>
         </view>
       </scroll-view>
     </view>
-    <view class="ss-m-t-20 reply-box" v-if="item.reply_time">
+    <!-- 商家回复 -->
+    <view class="ss-m-t-20 reply-box" v-if="item.replyTime">
       <view class="reply-title">商家回复：</view>
-      <view class="reply-content">{{ item.reply_content }}</view>
+      <view class="reply-content">{{ item.replyContent }}</view>
     </view>
   </view>
 </template>
 
 <script setup>
-import sheep from '@/sheep';
-import { reactive } from 'vue';
-const props = defineProps({
-  item: {
-    type: Object,
-    default() { },
-  },
-});
-const state = reactive({
-  commentImages: [],
-});
-props.item.images?.forEach((i) => {
-  state.commentImages.push(sheep.$url.cdn(i));
-});
+  const props = defineProps({
+    item: {
+      type: Object,
+      default() {},
+    },
+  });
 </script>
 
 <style lang="scss" scoped>
-.avatar {
-  width: 52rpx;
-  height: 52rpx;
-  border-radius: 50%;
-}
+  .avatar {
+    width: 52rpx;
+    height: 52rpx;
+    border-radius: 50%;
+  }
 
-.nickname {
-  font-size: 26rpx;
-  font-weight: 500;
-  color: #999999;
-}
+  .nickname {
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #999999;
+  }
 
-.content {
-  width: 636rpx;
-  font-size: 26rpx;
-  font-weight: 400;
-  color: #333333;
-}
+  .content {
+    width: 636rpx;
+    font-size: 26rpx;
+    font-weight: 400;
+    color: #333333;
+  }
 
-.reply-box {
-  position: relative;
-  background: #f8f8f8;
-  border-radius: 8rpx;
-  padding: 16rpx;
-}
+  .reply-box {
+    position: relative;
+    background: #f8f8f8;
+    border-radius: 8rpx;
+    padding: 16rpx;
+  }
 
-.reply-title {
-  position: absolute;
-  left: 16rpx;
-  top: 16rpx;
-  font-weight: 400;
-  font-size: 26rpx;
-  line-height: 40rpx;
-  color: #333333;
-}
+  .reply-title {
+    position: absolute;
+    left: 16rpx;
+    top: 16rpx;
+    font-weight: 400;
+    font-size: 26rpx;
+    line-height: 40rpx;
+    color: #333333;
+  }
 
-.reply-content {
-  text-indent: 128rpx;
-  font-weight: 400;
-  font-size: 26rpx;
-  line-height: 40rpx;
-  color: #333333;
-}
+  .reply-content {
+    text-indent: 128rpx;
+    font-weight: 400;
+    font-size: 26rpx;
+    line-height: 40rpx;
+    color: #333333;
+  }
 </style>
diff --git a/pages/goods/components/detail/detail-comment-card.vue b/pages/goods/components/detail/detail-comment-card.vue
index 90cd4dfd..cc48dfde 100644
--- a/pages/goods/components/detail/detail-comment-card.vue
+++ b/pages/goods/components/detail/detail-comment-card.vue
@@ -1,3 +1,4 @@
+<!-- 商品评论的卡片 -->
 <template>
   <view class="detail-comment-card bg-white">
     <view class="card-header ss-flex ss-col-center ss-row-between ss-p-b-30">
@@ -12,19 +13,20 @@
         v-if="state.commentList.length > 0"
       >
         <button class="ss-reset-button more-btn">查看全部</button>
-        <text class="cicon-forward"></text>
+        <text class="cicon-forward" />
       </view>
     </view>
+    <!-- 评论列表 -->
     <view class="card-content">
       <view class="comment-box ss-p-y-30" v-for="item in state.commentList" :key="item.id">
-        <comment-item :item="item"></comment-item>
+        <comment-item :item="item" />
       </view>
       <s-empty
         v-if="state.commentList.length === 0"
         paddingTop="0"
         icon="/static/comment-empty.png"
         text="期待您的第一个评价"
-      ></s-empty>
+      />
     </view>
   </view>
 </template>
@@ -32,25 +34,27 @@
 <script setup>
   import { reactive, onBeforeMount } from 'vue';
   import sheep from '@/sheep';
+  import CommentApi from '@/sheep/api/product/comment';
   import commentItem from './comment-item.vue';
+
   const props = defineProps({
     goodsId: {
       type: [Number, String],
       default: 0,
     },
   });
+
   const state = reactive({
-    commentList: [],
-    total: 0,
+    commentList: [], // 评论列表，只展示最近的 3 条
+    total: 0, // 总评论数
   });
+
   async function getComment(id) {
-    const { data } = await sheep.$api.goods.comment(id, {
-      list_rows: 3,
-    });  
-	 const {data:datas} = await sheep.$api.goods.comment2(id);
-    state.commentList = data;
-    state.total = datas.total;
+    const { data } = await CommentApi.getCommentPage(id, 1, 3, 0);
+    state.commentList = data.list;
+    state.total = data.total;
   }
+
   onBeforeMount(() => {
     getComment(props.goodsId);
   });
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 3e4badc0..1d6f6a9f 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -34,8 +34,7 @@
 						<view class="discounts-box ss-flex ss-row-between ss-m-b-28">
 							<div class="tag-content">
 								<view class="tag-box ss-flex">
-									<view class="tag ss-m-r-10" v-for="promos in state.goodsInfo.promos"
-										:key="promos.id" @tap="onActivity">
+									<view class="tag ss-m-r-10" v-for="promos in state.goodsInfo.promos" :key="promos.id" @tap="onActivity">
 										{{ promos.title }}
 									</view>
 								</view>
@@ -71,10 +70,10 @@
 				<!-- 详情 -->
 				<detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
 
-				<!-- 活动跳转 -->
-				<detail-activity-tip v-if="state.goodsInfo.activities" :data="state.goodsInfo"></detail-activity-tip>
+				<!-- TODO 芋艿：活动跳转 -->
+				<detail-activity-tip v-if="state.goodsInfo.activities" :data="state.goodsInfo" />
 
-				<!-- 详情tabbar -->
+				<!-- 详情 tabbar -->
 				<detail-tabbar v-model="state.goodsInfo">
 					<view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0">
 						<button class="ss-reset-button add-btn ui-Shadow-Main" @tap="state.showSelectSku = true">
diff --git a/sheep/api/goods.js b/sheep/api/goods.js
index c2dfe610..61f422a6 100644
--- a/sheep/api/goods.js
+++ b/sheep/api/goods.js
@@ -49,16 +49,6 @@ export default {
         showError: false,
       },
     }),
-  comment2: (id, params = {pageNo:1,pageSize:10,type:0}) =>
-    request2({
-      url: 'product/comment/page?spuId='+id,
-      method: 'GET',
-      params,
-      custom: {
-        showLoading: false,
-        showError: false,
-      },
-    }),
   // 商品评价类型
   getType: (id) =>
     request({
diff --git a/sheep/api/product/comment.js b/sheep/api/product/comment.js
new file mode 100644
index 00000000..01ce25c2
--- /dev/null
+++ b/sheep/api/product/comment.js
@@ -0,0 +1,18 @@
+import request from '@/sheep/request';
+
+const CommentApi = {
+  // 获得商品评价分页
+  getCommentPage: (spuId, pageNo, pageSize, type) => {
+    return request({
+      url: '/app-api/product/comment/page',
+      method: 'GET',
+      params: {
+        spuId,
+        pageNo,
+        pageSize,
+        type
+      },
+    });
+  },
+};
+export default CommentApi;
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index 4ee726e3..1be3a60d 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -157,6 +157,16 @@ function getDayjsTime(time) {
   }
 }
 
+/**
+ * 将分转成元
+ *
+ * @param price 分，例如说 100 分
+ * @returns {string} 元，例如说 1.00 元
+ */
+export function fen2yuan(price) {
+  return (price / 100.0).toFixed(2)
+}
+
 /**
  * 从商品 SKU 数组中，转换出商品属性的数组
  *

From 6326cf80c5e64427fa80482b28d0bf4113fbb37a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 Dec 2023 19:08:43 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E2=9C=A8=20=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=9A=E6=8E=A5=E5=85=A5=E4=BC=98=E6=83=A0=E5=8A=B5?=
 =?UTF-8?q?=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue         | 31 ++++++++++++++-----------------
 sheep/api/promotion/coupon.js | 26 +++++++++++++++++---------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 1d6f6a9f..845dbc92 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -87,8 +87,12 @@
 						<button class="ss-reset-button disabled-btn" disabled> 已售罄 </button>
 					</view>
 				</detail-tabbar>
+
+        <!-- 优惠劵弹窗 -->
 				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
                       @get="onGet" />
+
+        <!-- TODO 芋艿：待接入 -->
 				<s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
                         @close="state.showActivityModel = false" />
 			</block>
@@ -100,6 +104,7 @@
 	import { reactive, computed } from 'vue';
 	import { onLoad, onPageScroll } from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
+  import CouponApi from '@/sheep/api/promotion/coupon';
   import { formatSales, formatGoodsSwiper, fen2yuan, } from '@/sheep/hooks/useGoods';
 	import detailNavbar from './components/detail/detail-navbar.vue';
 	import detailCellSku from './components/detail/detail-cell-sku.vue';
@@ -114,9 +119,6 @@
 		isEmpty
 	} from 'lodash';
 
-	// import detailActivityTip from './components/detail/detail-activity-tip.vue';
-	// import detailTab from './components/detail/detail-tab.vue';
-	// import detailCoupon from './components/detail/detail-coupon.vue';
 	onPageScroll(() => {});
 
 	const state = reactive({
@@ -125,8 +127,8 @@
 		goodsInfo: {}, // SPU 信息
 		showSelectSku: false, // 是否展示 SKU 选择弹窗
 		selectedSku: {}, // 选中的 SKU
-		showModel: false,
-		couponInfo: [],
+		showModel: false, // 是否展示 Coupon 优惠劵的弹窗
+		couponInfo: [], // 可领取的 Coupon 优惠劵的列表
 		showActivityModel: false,
 		activityInfo: [],
 	});
@@ -161,7 +163,7 @@
 		state.showActivityModel = true;
 	}
 
-	//立即领取  TODO 芋艿：待测试
+	// 立即领取  TODO 芋艿：待测试
 	async function onGet(id) {
 		const {
 			error,
@@ -215,19 +217,14 @@
 			state.skeletonLoading = false;
       state.goodsInfo = res.data;
 		});
-    // TODO 芋艿：下面接口的调整
-    if (true) {
-      return
-    }
 
     // 2. 加载优惠劵信息
-		const {
-			error,
-			data
-		} = await sheep.$api.coupon.listByGoods(state.goodsId);
-		if (error === 0) {
-			state.couponInfo = data;
-		}
+    CouponApi.getCouponTemplateList(state.goodsId,2, 10).then((res) => {
+      if (res.code !== 0) {
+        return;
+      }
+      state.couponInfo = res.data;
+    });
 	});
 </script>
 
diff --git a/sheep/api/promotion/coupon.js b/sheep/api/promotion/coupon.js
index d4e62dd5..9bdbb19e 100644
--- a/sheep/api/promotion/coupon.js
+++ b/sheep/api/promotion/coupon.js
@@ -1,12 +1,20 @@
 import request from '@/sheep/request';
 
 export default {
-    // 获得优惠劵模板列表
-    getCouponTemplateListByIds: (ids) => {
-        return request({
-            url: '/app-api/promotion/coupon-template/list-by-ids',
-            method: 'GET',
-            params: { ids }
-        });
-    }
-}
+  // 获得优惠劵模板列表
+  getCouponTemplateListByIds: (ids) => {
+    return request({
+      url: '/app-api/promotion/coupon-template/list-by-ids',
+      method: 'GET',
+      params: { ids },
+    });
+  },
+  // 获得优惠劵模版列表
+  getCouponTemplateList: (spuId, productScope, count) => {
+    return request({
+      url: '/app-api/promotion/coupon-template/list',
+      method: 'GET',
+      params: { spuId, productScope, count },
+    });
+  },
+};

From 3d4f7e9a099fafdcbcb1e4969894015e9463de37 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 Dec 2023 19:52:54 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E2=9C=A8=20=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=9A=E6=8E=A5=E5=85=A5=E8=90=A5=E9=94=80=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/detail-activity-tip.vue | 39 +++++++++++--------
 pages/goods/index.vue                         | 32 +++++++++------
 sheep/api/promotion/activity.js               | 16 ++++++++
 3 files changed, 58 insertions(+), 29 deletions(-)
 create mode 100644 sheep/api/promotion/activity.js

diff --git a/pages/goods/components/detail/detail-activity-tip.vue b/pages/goods/components/detail/detail-activity-tip.vue
index d4282993..755d1bd3 100644
--- a/pages/goods/components/detail/detail-activity-tip.vue
+++ b/pages/goods/components/detail/detail-activity-tip.vue
@@ -1,52 +1,57 @@
 <template>
   <su-fixed bottom placeholder :val="44">
     <view>
-      <view v-for="activity in data.activities" :key="activity.id">
+      <view v-for="activity in props.activityList" :key="activity.id">
+        <!-- TODO 芋艿：拼团 -->
         <view
           class="activity-box ss-p-x-38 ss-flex ss-row-between ss-col-center"
-          :class="activity.type == 'seckill' ? 'seckill-box' : 'groupon-box'"
+          :class="activity.type === 1 ? 'seckill-box' : 'groupon-box'"
         >
           <view class="activity-title ss-flex">
             <view class="ss-m-r-16">
               <image
+                v-if="activity.type === 1"
                 :src="sheep.$url.static('/static/img/shop/goods/seckill-icon.png')"
-                v-if="activity.type == 'seckill'"
                 class="activity-icon"
-              ></image>
+              />
+              <!-- TODO 芋艿：拼团 -->
               <image
+                v-else-if="activity.type === 3"
                 :src="sheep.$url.static('/static/img/shop/goods/groupon-icon.png')"
                 class="activity-icon"
-                v-else
-              ></image>
+              />
             </view>
-            <view>该商品正在参与{{ activity.type_text }}活动</view>
+            <view>该商品正在参与{{ activity.name }}活动</view>
           </view>
           <button class="ss-reset-button activity-go" @tap="onActivity(activity)"> GO </button>
         </view>
-        <!-- <button @tap="onActivity(activity)">{{ activity.title }} {{ activity.type_text }}</button> -->
       </view>
     </view>
   </su-fixed>
 </template>
 
 <script setup>
-  import { ref, reactive } from 'vue';
   import sheep from '@/sheep';
 
+  // TODO 芋艿：这里要迁移下；
   const seckillBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
   const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
 
   const props = defineProps({
-    data: {
-      type: Object,
-      default() {},
-    },
+    activityList: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
   });
+
   function onActivity(activity) {
-    let type = activity.type;
-    if (type === 'groupon_ladder') type = 'groupon';
-    sheep.$router.go(`/pages/goods/${type}`, {
-      id: props.data.id,
+    const type = activity.type;
+    const typePath = type === 1 ? 'seckill' :
+      type === 2 ? 'TODO 拼团' : 'groupon';
+    sheep.$router.go(`/pages/goods/${typePath}`, {
+      id: activity.spuId,
       activity_id: activity.id,
     });
   }
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 845dbc92..19601af1 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -30,9 +30,9 @@
 								{{ formatSales('exact', state.goodsInfo.salesCount) }}
 							</view>
 						</view>
-            <!-- TODO 芋艿：promos 未写 -->
 						<view class="discounts-box ss-flex ss-row-between ss-m-b-28">
-							<div class="tag-content">
+              <!-- 满减送/限时折扣活动的提示 TODO 芋艿：promos 未写 -->
+              <div class="tag-content">
 								<view class="tag-box ss-flex">
 									<view class="tag ss-m-r-10" v-for="promos in state.goodsInfo.promos" :key="promos.id" @tap="onActivity">
 										{{ promos.title }}
@@ -40,7 +40,7 @@
 								</view>
 							</div>
 
-              <!-- TODO 芋艿：couponInfo 优惠劵 -->
+              <!-- 优惠劵 -->
 							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="state.showModel = true"
 								v-if="state.couponInfo.length">
 								<view class="discounts-title ss-m-r-8">领券</view>
@@ -70,8 +70,8 @@
 				<!-- 详情 -->
 				<detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
 
-				<!-- TODO 芋艿：活动跳转 -->
-				<detail-activity-tip v-if="state.goodsInfo.activities" :data="state.goodsInfo" />
+				<!-- 活动跳转：拼团/秒杀/砍价活动 -->
+				<detail-activity-tip v-if="state.activityList.length > 0" :activity-list="state.activityList" />
 
 				<!-- 详情 tabbar -->
 				<detail-tabbar v-model="state.goodsInfo">
@@ -92,7 +92,7 @@
 				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
                       @get="onGet" />
 
-        <!-- TODO 芋艿：待接入 -->
+        <!-- 满减送/限时折扣活动弹窗 -->
 				<s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
                         @close="state.showActivityModel = false" />
 			</block>
@@ -105,6 +105,7 @@
 	import { onLoad, onPageScroll } from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
   import CouponApi from '@/sheep/api/promotion/coupon';
+  import ActivityApi from '@/sheep/api/promotion/activity';
   import { formatSales, formatGoodsSwiper, fen2yuan, } from '@/sheep/hooks/useGoods';
 	import detailNavbar from './components/detail/detail-navbar.vue';
 	import detailCellSku from './components/detail/detail-cell-sku.vue';
@@ -115,9 +116,7 @@
 	import detailCommentCard from './components/detail/detail-comment-card.vue';
 	import detailContentCard from './components/detail/detail-content-card.vue';
 	import detailActivityTip from './components/detail/detail-activity-tip.vue';
-	import {
-		isEmpty
-	} from 'lodash';
+	import { isEmpty } from 'lodash';
 
 	onPageScroll(() => {});
 
@@ -129,11 +128,12 @@
 		selectedSku: {}, // 选中的 SKU
 		showModel: false, // 是否展示 Coupon 优惠劵的弹窗
 		couponInfo: [], // 可领取的 Coupon 优惠劵的列表
-		showActivityModel: false,
-		activityInfo: [],
+		showActivityModel: false, // 【满减送/限时折扣】是否展示 Activity 营销活动的弹窗
+		activityInfo: [], // 【满减送/限时折扣】可参与的 Activity 营销活动的列表
+    activityList: [], // 【秒杀/拼团/砍价】可参与的 Activity 营销活动的列表
 	});
 
-	// 规格变更 TODO 芋艿：待测试
+	// 规格变更
 	function onSkuChange(e) {
 		state.selectedSku = e;
 	}
@@ -225,6 +225,14 @@
       }
       state.couponInfo = res.data;
     });
+
+    // 3. 加载营销活动信息
+    ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
+      if (res.code !== 0) {
+        return;
+      }
+      state.activityList = res.data;
+    });
 	});
 </script>
 
diff --git a/sheep/api/promotion/activity.js b/sheep/api/promotion/activity.js
new file mode 100644
index 00000000..efa0e1e9
--- /dev/null
+++ b/sheep/api/promotion/activity.js
@@ -0,0 +1,16 @@
+import request2 from '@/sheep/request2';
+
+const ActivityApi = {
+  // 获得单个商品，近期参与的每个活动
+  getActivityListBySpuId: (spuId) => {
+    return request2({
+      url: '/app-api/promotion/activity/list-by-spu-id',
+      method: 'GET',
+      params: {
+        spuId,
+      },
+    });
+  },
+};
+
+export default ActivityApi;

From e971e0959343ed3732f304c6547a74b68f486d32 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 Dec 2023 20:46:11 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E2=9C=A8=20=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=9Asecond-one=20=E6=A0=B7=E5=BC=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/category.vue              | 23 +++----
 pages/index/components/second-one.vue | 24 +++----
 pages/index/components/third-one.vue  | 92 ---------------------------
 3 files changed, 23 insertions(+), 116 deletions(-)
 delete mode 100644 pages/index/components/third-one.vue

diff --git a/pages/index/category.vue b/pages/index/category.vue
index 4ed73b80..36999cbc 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -1,7 +1,9 @@
+<!-- 分类列表 -->
 <template>
 	<s-layout title="分类" tabbar="/pages/index/category" :bgStyle="{ color: '#fff' }">
 		<view class="s-category">
 			<view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
+        <!-- 商品分类（左） -->
 				<scroll-view class="side-menu-wrap" scroll-y :style="[{ height: pageHeight + 'px' }]">
 					<view class="menu-item ss-flex" v-for="(item, index) in state.categoryList?.children" :key="item.id"
 						:class="[{ 'menu-item-active': index == state.activeMenu }]" @tap="onMenu(index)">
@@ -10,7 +12,8 @@
 						</view>
 					</view>
 				</scroll-view>
-				<scroll-view class="goods-list-box" scroll-y :style="[{ height: pageHeight + 'px' }]"
+        <!-- 商品分类（右） -->
+        <scroll-view class="goods-list-box" scroll-y :style="[{ height: pageHeight + 'px' }]"
 					v-if="state.categoryList?.children?.length">
 					<image v-if="state.categoryList.children[state.activeMenu].image" class="banner-img"
 						:src="sheep.$url.cdn(state.categoryList.children[state.activeMenu].image)" mode="widthFix">
@@ -21,8 +24,6 @@
 						:activeMenu="state.activeMenu" :pagination="state.pagination" />
 					<second-one v-if="state.categoryList.style === 'second_one'" :data="state.categoryList"
 						:activeMenu="state.activeMenu" :pagination="state.pagination" />
-					<third-one v-if="state.categoryList.style === 'third_one'" :data="state.categoryList"
-						:activeMenu="state.activeMenu" :pagination="state.pagination" />
 					<uni-load-more v-if="
               (state.categoryList.style === 'first_one' ||
                 state.categoryList.style === 'first_two') &&
@@ -38,7 +39,6 @@
 
 <script setup>
 	import secondOne from './components/second-one.vue';
-	import thirdOne from './components/third-one.vue';
 	import firstOne from './components/first-one.vue';
 	import firstTwo from './components/first-two.vue';
 	import sheep from '@/sheep';
@@ -52,8 +52,10 @@
 		reactive
 	} from 'vue';
 	import _ from 'lodash';
+  import { handleTree } from '@/sheep/util';
 	const state = reactive({
-		categoryList: [],
+    style: 'second_one', // first_one（一级 - 样式一）, first_two（二级 - 样式二）, second_one（二级）
+		categoryList: [], // 商品分类树
 		activeMenu: '0',
 
 		pagination: {
@@ -65,12 +67,7 @@
 		loadStatus: '',
 	});
 
-	const {
-		screenHeight,
-		safeAreaInsets,
-		screenWidth,
-		safeArea
-	} = sheep.$platform.device;
+	const { safeArea } = sheep.$platform.device;
 	const pageHeight = computed(() => safeArea.height - 44 - 50);
 
 	async function getList(options) {
@@ -82,8 +79,8 @@
 		});
 		if (code === 0) {
 			state.categoryList = {
-				children: data,
-				style: 'first_one'
+				children: handleTree(data),
+				style: 'second_one'
 			};
 		}
 	}
diff --git a/pages/index/components/second-one.vue b/pages/index/components/second-one.vue
index e6868e46..817c144a 100644
--- a/pages/index/components/second-one.vue
+++ b/pages/index/components/second-one.vue
@@ -1,23 +1,25 @@
-<!-- 页面  -->
+<!-- 分类展示：second-one 风格  -->
 <template>
   <view>
+    <!-- 一级分类的名字 -->
     <view class="title-box ss-flex ss-col-center ss-row-center ss-p-b-30">
-      <view class="title-line-left"></view>
+      <view class="title-line-left" />
       <view class="title-text ss-p-x-20">{{ props.data.children[activeMenu].name }}</view>
-      <view class="title-line-right"></view>
+      <view class="title-line-right" />
     </view>
+    <!-- 二级分类的名字 -->
     <view class="goods-item-box ss-flex ss-flex-wrap ss-p-b-20">
       <view
         class="goods-item"
         v-for="item in props.data.children[activeMenu].children"
         :key="item.id"
-		@tap="
-		  sheep.$router.go('/pages/goods/list', {
-		    categoryId: item.id,
-		  })
-		"
+        @tap="
+          sheep.$router.go('/pages/goods/list', {
+            categoryId: item.id,
+          })
+        "
       >
-        <image class="goods-img" :src="sheep.$url.cdn(item.image)" mode="aspectFill"></image>
+        <image class="goods-img" :src="item.picUrl" mode="aspectFill" />
         <view class="ss-p-10">
           <view class="goods-title ss-line-1">{{ item.name }}</view>
         </view>
@@ -28,13 +30,13 @@
 
 <script setup>
   import sheep from '@/sheep';
+
   const props = defineProps({
     data: {
       type: Object,
       default: () => ({}),
     },
-    activeMenu: [Number, String],
-    pagination: Object,
+    activeMenu: [Number, String]
   });
 </script>
 
diff --git a/pages/index/components/third-one.vue b/pages/index/components/third-one.vue
deleted file mode 100644
index e4306816..00000000
--- a/pages/index/components/third-one.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- 页面  -->
-<template>
-  <view>
-    <view v-for="item in props.data.children[activeMenu].children" :key="item.id">
-      <view class="title-box ss-flex ss-col-center ss-row-between ss-p-b-30">
-        <view class="title-text">{{ item.name }}</view>
-        <button
-          class="ss-reset-button more-btn"
-          @tap="
-            sheep.$router.go('/pages/goods/list', {
-              categoryId: item.id,
-            })
-          "
-        >
-          查看更多
-          <text class="cicon-forward"></text>
-        </button>
-      </view>
-      <view class="goods-item-box ss-flex ss-flex-wrap ss-p-b-20">
-        <view class="goods-item" v-for="i in item.children" :key="i">
-          <view
-            @tap="
-              sheep.$router.go('/pages/goods/list', {
-                categoryId: i.id,
-              })
-            "
-          >
-            <image class="goods-img" :src="sheep.$url.cdn(i.image)" mode="aspectFill"></image>
-            <view class="ss-p-10">
-              <view class="goods-title ss-line-1">{{ i.name }}</view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-  import sheep from '@/sheep';
-  const props = defineProps({
-    data: {
-      type: Object,
-      default: () => ({}),
-    },
-    activeMenu: [Number, String],
-    pagination: Object,
-  });
-</script>
-
-<style lang="scss" scoped>
-  .title-box {
-    .title-text {
-      font-size: 28rpx;
-      font-weight: bold;
-      color: #333333;
-    }
-
-    .more-btn {
-      font-size: 26rpx;
-      font-weight: 400;
-      color: #999999;
-    }
-  }
-
-  .goods-item {
-    width: calc((100% - 20px) / 3);
-    margin-right: 10px;
-    margin-bottom: 10px;
-
-    &:nth-of-type(3n) {
-      margin-right: 0;
-    }
-
-    .goods-img {
-      width: calc((100vw - 140px) / 3);
-      height: calc((100vw - 140px) / 3);
-    }
-
-    .goods-title {
-      font-size: 24rpx;
-      font-weight: 500;
-      color: #333333;
-      text-align: center;
-    }
-
-    .goods-price {
-      color: $red;
-      line-height: 40rpx;
-    }
-  }
-</style>

From 8fd8ff9f70a6a45945d348430ed62c5f32ac2ee7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 10 Dec 2023 22:12:33 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E2=9C=A8=20=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=9A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/category.vue              | 411 +++++++++++++-------------
 pages/index/components/first-one.vue  |  11 +-
 pages/index/components/first-two.vue  |  15 +-
 pages/index/components/second-one.vue |   6 +-
 sheep/api/product/category.js         |  12 +
 sheep/util/index.js                   |  27 +-
 6 files changed, 258 insertions(+), 224 deletions(-)
 create mode 100644 sheep/api/product/category.js

diff --git a/pages/index/category.vue b/pages/index/category.vue
index 36999cbc..2317d1d9 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -1,231 +1,236 @@
-<!-- 分类列表 -->
+<!-- 商品分类列表 -->
 <template>
-	<s-layout title="分类" tabbar="/pages/index/category" :bgStyle="{ color: '#fff' }">
-		<view class="s-category">
-			<view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
+  <s-layout title="分类" tabbar="/pages/index/category" :bgStyle="{ color: '#fff' }">
+    <view class="s-category">
+      <view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
         <!-- 商品分类（左） -->
-				<scroll-view class="side-menu-wrap" scroll-y :style="[{ height: pageHeight + 'px' }]">
-					<view class="menu-item ss-flex" v-for="(item, index) in state.categoryList?.children" :key="item.id"
-						:class="[{ 'menu-item-active': index == state.activeMenu }]" @tap="onMenu(index)">
-						<view class="menu-title ss-line-1">
-							{{ item.name }}
-						</view>
-					</view>
-				</scroll-view>
+        <scroll-view class="side-menu-wrap" scroll-y :style="[{ height: pageHeight + 'px' }]">
+          <view
+            class="menu-item ss-flex"
+            v-for="(item, index) in state.categoryList"
+            :key="item.id"
+            :class="[{ 'menu-item-active': index === state.activeMenu }]"
+            @tap="onMenu(index)"
+          >
+            <view class="menu-title ss-line-1">
+              {{ item.name }}
+            </view>
+          </view>
+        </scroll-view>
         <!-- 商品分类（右） -->
-        <scroll-view class="goods-list-box" scroll-y :style="[{ height: pageHeight + 'px' }]"
-					v-if="state.categoryList?.children?.length">
-					<image v-if="state.categoryList.children[state.activeMenu].image" class="banner-img"
-						:src="sheep.$url.cdn(state.categoryList.children[state.activeMenu].image)" mode="widthFix">
-					</image>
-					<first-one v-if="state.categoryList.style === 'first_one'" :data="state.categoryList"
-						:activeMenu="state.activeMenu" :pagination="state.pagination" />
-					<first-two v-if="state.categoryList.style === 'first_two'" :data="state.categoryList"
-						:activeMenu="state.activeMenu" :pagination="state.pagination" />
-					<second-one v-if="state.categoryList.style === 'second_one'" :data="state.categoryList"
-						:activeMenu="state.activeMenu" :pagination="state.pagination" />
-					<uni-load-more v-if="
-              (state.categoryList.style === 'first_one' ||
-                state.categoryList.style === 'first_two') &&
+        <scroll-view
+          class="goods-list-box"
+          scroll-y
+          :style="[{ height: pageHeight + 'px' }]"
+          v-if="state.categoryList?.length"
+        >
+          <image
+            v-if="state.categoryList[state.activeMenu].picUrl"
+            class="banner-img"
+            :src="sheep.$url.cdn(state.categoryList[state.activeMenu].picUrl)"
+            mode="widthFix"
+          />
+          <first-one v-if="state.style === 'first_one'" :pagination="state.pagination" />
+          <first-two v-if="state.style === 'first_two'" :pagination="state.pagination" />
+          <second-one
+            v-if="state.style === 'second_one'"
+            :data="state.categoryList"
+            :activeMenu="state.activeMenu"
+          />
+          <uni-load-more
+            v-if="
+              (state.style === 'first_one' || state.style === 'first_two') &&
               state.pagination.total > 0
-            " :status="state.loadStatus" :content-text="{
+            "
+            :status="state.loadStatus"
+            :content-text="{
               contentdown: '点击查看更多',
-            }" @tap="loadmore" />
-				</scroll-view>
-			</view>
-		</view>
-	</s-layout>
+            }"
+            @tap="loadMore"
+          />
+        </scroll-view>
+      </view>
+    </view>
+  </s-layout>
 </template>
 
 <script setup>
-	import secondOne from './components/second-one.vue';
-	import firstOne from './components/first-one.vue';
-	import firstTwo from './components/first-two.vue';
-	import sheep from '@/sheep';
-
-	import {
-		onLoad,
-		onReachBottom
-	} from '@dcloudio/uni-app';
-	import {
-		computed,
-		reactive
-	} from 'vue';
-	import _ from 'lodash';
+  import secondOne from './components/second-one.vue';
+  import firstOne from './components/first-one.vue';
+  import firstTwo from './components/first-two.vue';
+  import sheep from '@/sheep';
+  import CategoryApi from '@/sheep/api/product/category';
+  import SpuApi from '@/sheep/api/product/spu';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { computed, reactive } from 'vue';
+  import _ from 'lodash';
   import { handleTree } from '@/sheep/util';
-	const state = reactive({
+
+  const state = reactive({
     style: 'second_one', // first_one（一级 - 样式一）, first_two（二级 - 样式二）, second_one（二级）
-		categoryList: [], // 商品分类树
-		activeMenu: '0',
+    categoryList: [], // 商品分类树
+    activeMenu: 0, // 选中的一级菜单，在 categoryList 的下标
 
-		pagination: {
-			data: [],
-			current_page: 1,
-			total: 1,
-			last_page: 1,
-		},
-		loadStatus: '',
-	});
+    pagination: {
+      // 商品分页
+      list: [], // 商品列表
+      total: [], // 商品总数
+      pageNo: 1,
+      pageSize: 6,
+    },
+    loadStatus: '',
+  });
 
-	const { safeArea } = sheep.$platform.device;
-	const pageHeight = computed(() => safeArea.height - 44 - 50);
+  const { safeArea } = sheep.$platform.device;
+  const pageHeight = computed(() => safeArea.height - 44 - 50);
 
-	async function getList(options) {
-		const {
-			code,
-			data
-		} = await sheep.$api.category.list({
-			id: options.id,
-		});
-		if (code === 0) {
-			state.categoryList = {
-				children: handleTree(data),
-				style: 'second_one'
-			};
-		}
-	}
+  // 加载商品分类
+  async function getList() {
+    const { code, data } = await CategoryApi.getCategoryList();
+    if (code !== 0) {
+      return;
+    }
+    state.categoryList = handleTree(data);
+  }
 
-	const onMenu = (val) => {
-		state.activeMenu = val;
-		if (state.categoryList.style === 'first_one' || state.categoryList.style === 'first_two') {
-			state.pagination = {
-				data: [],
-				current_page: 1,
-				total: 1,
-				last_page: 1,
-			};
-			getGoodsList(state.categoryList.children[val].id);
-		}
-		// 这段代码本来是在判断里的
-		// getGoodsList(state.categoryList.children[val].id);
-	};
+  // 选中菜单
+  const onMenu = (val) => {
+    state.activeMenu = val;
+    if (state.style === 'first_one' || state.style === 'first_two') {
+      state.pagination.pageNo = 1;
+      state.pagination.list = [];
+      state.pagination.total = 0;
+      getGoodsList();
+    }
+  };
 
-	async function getGoodsList(id, page = 1, list_rows = 6) {
-		state.loadStatus = 'loading';
-		const res = await sheep.$api.goods.list({
-			categoryId: id,
-			pageSize: list_rows,
-			pageNo: page,
-		});
-		if (res.code === 0) {
-			let couponList = _.concat(state.pagination.data, res.data.list);
-			state.pagination = {
-				...res.data,
-				data: couponList,
-			};
-			console.log(state.pagination)
-			if (state.pagination.current_page < state.pagination.last_page) {
-				state.loadStatus = 'more';
-			} else {
-				state.loadStatus = 'noMore';
-			}
-		}
-	}
-	// 加载更多
-	function loadmore() {
-		if (state.loadStatus !== 'noMore') {
-			getGoodsList(
-				state.categoryList.children[state.activeMenu].id,
-				state.pagination.current_page + 1,
-			);
-		}
-	}
-	onLoad(async (options) => {
-		await getList(options);
-		if (state.categoryList.style === 'first_one' || state.categoryList.style === 'first_two') {
-			getGoodsList(state.categoryList.children[0].id);
-		}
-	});
-	onReachBottom(() => {
-		loadmore();
-	});
+  // 加载商品列表
+  async function getGoodsList() {
+    // 加载列表
+    state.loadStatus = 'loading';
+    const res = await SpuApi.getSpuPage({
+      categoryId: state.categoryList[state.activeMenu].id,
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (res.code !== 0) {
+      return;
+    }
+    // 合并列表
+    state.pagination.list = _.concat(state.pagination.list, res.data.list);
+    state.pagination.total = res.data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 加载更多商品
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getGoodsList();
+  }
+
+  onLoad(async () => {
+    await getList();
+    // 如果是 first 风格，需要加载商品分页
+    if (state.style === 'first_one' || state.style === 'first_two') {
+      onMenu(0);
+    }
+  });
+
+  onReachBottom(() => {
+    loadMore();
+  });
 </script>
 
 <style lang="scss" scoped>
-	.s-category {
-		:deep() {
-			.side-menu-wrap {
-				width: 200rpx;
-				height: 100%;
-				padding-left: 12rpx;
-				background-color: #f6f6f6;
+  .s-category {
+    :deep() {
+      .side-menu-wrap {
+        width: 200rpx;
+        height: 100%;
+        padding-left: 12rpx;
+        background-color: #f6f6f6;
 
-				.menu-item {
-					width: 100%;
-					height: 88rpx;
-					position: relative;
-					transition: all linear 0.2s;
+        .menu-item {
+          width: 100%;
+          height: 88rpx;
+          position: relative;
+          transition: all linear 0.2s;
 
-					.menu-title {
-						line-height: 32rpx;
-						font-size: 30rpx;
-						font-weight: 400;
-						color: #333;
-						margin-left: 28rpx;
-						position: relative;
-						z-index: 0;
+          .menu-title {
+            line-height: 32rpx;
+            font-size: 30rpx;
+            font-weight: 400;
+            color: #333;
+            margin-left: 28rpx;
+            position: relative;
+            z-index: 0;
 
-						&::before {
-							content: '';
-							width: 64rpx;
-							height: 12rpx;
-							background: linear-gradient(90deg,
-									var(--ui-BG-Main-gradient),
-									var(--ui-BG-Main-light)) !important;
-							position: absolute;
-							left: -64rpx;
-							bottom: 0;
-							z-index: -1;
-							transition: all linear 0.2s;
-						}
-					}
+            &::before {
+              content: '';
+              width: 64rpx;
+              height: 12rpx;
+              background: linear-gradient(
+                90deg,
+                var(--ui-BG-Main-gradient),
+                var(--ui-BG-Main-light)
+              ) !important;
+              position: absolute;
+              left: -64rpx;
+              bottom: 0;
+              z-index: -1;
+              transition: all linear 0.2s;
+            }
+          }
 
-					&.menu-item-active {
-						background-color: #fff;
-						border-radius: 20rpx 0 0 20rpx;
+          &.menu-item-active {
+            background-color: #fff;
+            border-radius: 20rpx 0 0 20rpx;
 
-						&::before {
-							content: '';
-							position: absolute;
-							right: 0;
-							bottom: -20rpx;
-							width: 20rpx;
-							height: 20rpx;
-							background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
-						}
+            &::before {
+              content: '';
+              position: absolute;
+              right: 0;
+              bottom: -20rpx;
+              width: 20rpx;
+              height: 20rpx;
+              background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
+            }
 
-						&::after {
-							content: '';
-							position: absolute;
-							top: -20rpx;
-							right: 0;
-							width: 20rpx;
-							height: 20rpx;
-							background: radial-gradient(circle at 0% 0%, transparent 20rpx, #fff 0);
-						}
+            &::after {
+              content: '';
+              position: absolute;
+              top: -20rpx;
+              right: 0;
+              width: 20rpx;
+              height: 20rpx;
+              background: radial-gradient(circle at 0% 0%, transparent 20rpx, #fff 0);
+            }
 
-						.menu-title {
-							font-weight: 600;
+            .menu-title {
+              font-weight: 600;
 
-							&::before {
-								left: 0;
-							}
-						}
-					}
-				}
-			}
+              &::before {
+                left: 0;
+              }
+            }
+          }
+        }
+      }
 
-			.goods-list-box {
-				background-color: #fff;
-				width: calc(100vw - 100px);
-				padding: 10px;
-			}
+      .goods-list-box {
+        background-color: #fff;
+        width: calc(100vw - 100px);
+        padding: 10px;
+      }
 
-			.banner-img {
-				width: calc(100vw - 130px);
-				border-radius: 5px;
-				margin-bottom: 20rpx;
-			}
-		}
-	}
-</style>
\ No newline at end of file
+      .banner-img {
+        width: calc(100vw - 130px);
+        border-radius: 5px;
+        margin-bottom: 20rpx;
+      }
+    }
+  }
+</style>
diff --git a/pages/index/components/first-one.vue b/pages/index/components/first-one.vue
index 792fcd92..2decc86f 100644
--- a/pages/index/components/first-one.vue
+++ b/pages/index/components/first-one.vue
@@ -1,23 +1,20 @@
+<!-- 分类展示：first-one 风格  -->
 <template>
   <view class="ss-flex-col">
-    <view class="goods-box" v-for="item in pagination.data" :key="item.id">
+    <view class="goods-box" v-for="item in pagination.list" :key="item.id">
       <s-goods-column
         size="sl"
         :data="item"
         @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-      ></s-goods-column>
+      />
     </view>
   </view>
 </template>
 
 <script setup>
   import sheep from '@/sheep';
+
   const props = defineProps({
-    data: {
-      type: Object,
-      default: () => ({}),
-    },
-    activeMenu: [Number, String],
     pagination: Object,
   });
 </script>
diff --git a/pages/index/components/first-two.vue b/pages/index/components/first-two.vue
index f1479974..482931cc 100644
--- a/pages/index/components/first-two.vue
+++ b/pages/index/components/first-two.vue
@@ -1,15 +1,15 @@
-<!-- 页面  -->
+<!-- 分类展示：first-two 风格  -->
 <template>
   <view>
     <view class="ss-flex flex-wrap">
-      <view class="goods-box" v-for="item in pagination?.data" :key="item.id">
+      <view class="goods-box" v-for="item in pagination?.list" :key="item.id">
         <view @click="sheep.$router.go('/pages/goods/index', { id: item.id })">
           <view class="goods-img">
-            <image class="goods-img" :src="sheep.$url.cdn(item.image)" mode="aspectFit"></image>
+            <image class="goods-img" :src="item.picUrl" mode="aspectFit" />
           </view>
           <view class="goods-content">
             <view class="goods-title ss-line-1 ss-m-b-28">{{ item.title }}</view>
-            <view class="goods-price">￥{{ item.price[0] }}</view>
+            <view class="goods-price">￥{{ fen2yuan(item.price) }}</view>
           </view>
         </view>
       </view>
@@ -19,12 +19,9 @@
 
 <script setup>
   import sheep from '@/sheep';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+
   const props = defineProps({
-    data: {
-      type: Object,
-      default: () => ({}),
-    },
-    activeMenu: [Number, String],
     pagination: Object,
   });
 </script>
diff --git a/pages/index/components/second-one.vue b/pages/index/components/second-one.vue
index 817c144a..86b70782 100644
--- a/pages/index/components/second-one.vue
+++ b/pages/index/components/second-one.vue
@@ -4,14 +4,14 @@
     <!-- 一级分类的名字 -->
     <view class="title-box ss-flex ss-col-center ss-row-center ss-p-b-30">
       <view class="title-line-left" />
-      <view class="title-text ss-p-x-20">{{ props.data.children[activeMenu].name }}</view>
+      <view class="title-text ss-p-x-20">{{ props.data[activeMenu].name }}</view>
       <view class="title-line-right" />
     </view>
     <!-- 二级分类的名字 -->
     <view class="goods-item-box ss-flex ss-flex-wrap ss-p-b-20">
       <view
         class="goods-item"
-        v-for="item in props.data.children[activeMenu].children"
+        v-for="item in props.data[activeMenu].children"
         :key="item.id"
         @tap="
           sheep.$router.go('/pages/goods/list', {
@@ -36,7 +36,7 @@
       type: Object,
       default: () => ({}),
     },
-    activeMenu: [Number, String]
+    activeMenu: [Number, String],
   });
 </script>
 
diff --git a/sheep/api/product/category.js b/sheep/api/product/category.js
new file mode 100644
index 00000000..6549acf5
--- /dev/null
+++ b/sheep/api/product/category.js
@@ -0,0 +1,12 @@
+import request from '@/sheep/request';
+
+const CategoryApi = {
+    // 查询分类列表
+    getCategoryList: () => {
+        return request({
+            url: '/app-api/product/category/list',
+            method: 'GET'
+        });
+    }
+};
+export default CategoryApi;
diff --git a/sheep/util/index.js b/sheep/util/index.js
index 355d53af..2a3ca202 100644
--- a/sheep/util/index.js
+++ b/sheep/util/index.js
@@ -53,8 +53,6 @@ export const convertToInteger = (num) => {
   return Math.round(parsedNumber * 100)
 }
 
-
-
 /**
  * 时间日期转换
  * @param {dayjs.ConfigType} date 当前时间，new Date() 格式
@@ -77,3 +75,28 @@ export function formatDate(date, format) {
   }
   return dayjs(date).format(format)
 }
+
+/**
+ * 构造树型结构数据
+ *
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ * @param {*} rootId 根Id 默认 0
+ */
+export function handleTree(data, id = 'id', parentId = 'parentId', children = 'children', rootId = 0) {
+  // 对源数据深度克隆
+  const cloneData = JSON.parse(JSON.stringify(data))
+  // 循环所有项
+  const treeData = cloneData.filter(father => {
+    let branchArr = cloneData.filter(child => {
+      //返回每一项的子级数组
+      return father[id] === child[parentId]
+    });
+    branchArr.length > 0 ? father.children = branchArr : '';
+    //返回第一层
+    return father[parentId] === rootId;
+  });
+  return treeData !== '' ? treeData : data;
+}
\ No newline at end of file

From 7a15c9496c3b42730db314a0fcba7e191250da81 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 11 Dec 2023 12:50:46 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E2=9C=A8=20=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=EF=BC=9A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue   |   2 +-
 pages/index/cart.vue    | 384 +++++++++++++++++++++-------------------
 sheep/api/cart.js       |   1 +
 sheep/api/trade/cart.js |  47 +++++
 sheep/store/cart.js     | 101 +++++------
 5 files changed, 299 insertions(+), 236 deletions(-)
 create mode 100644 sheep/api/trade/cart.js

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 19601af1..76f5a369 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -138,7 +138,7 @@
 		state.selectedSku = e;
 	}
 
-	// 添加购物车  TODO 芋艿：待测试
+	// 添加购物车
 	function onAddCart(e) {
 		sheep.$store('cart').add(e);
 	}
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 02c052f1..3ba03389 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -1,200 +1,220 @@
+<!-- 购物车界面 -->
 <template>
-	<s-layout title="购物车" tabbar="/pages/index/cart" :bgStyle="{ color: '#fff' }">
-		<s-empty v-if="state.list.length === 0" text="购物车空空如也,快去逛逛吧~" icon="/static/cart-empty.png" />
+  <s-layout title="购物车" tabbar="/pages/index/cart" :bgStyle="{ color: '#fff' }">
+    <s-empty
+      v-if="state.list.length === 0"
+      text="购物车空空如也,快去逛逛吧~"
+      icon="/static/cart-empty.png"
+    />
 
-		<!-- 头部 -->
-		<view class="cart-box ss-flex ss-flex-col ss-row-between" v-if="state.list.length">
-			<view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
-				<view class="header-left ss-flex ss-col-center ss-font-26">
-					共
-					<text class="goods-number ui-TC-Main ss-flex">{{ state.list.length }}</text>
-					件商品
-				</view>
-				<view class="header-right">
-					<button v-if="state.editMode" class="ss-reset-button" @tap="state.editMode = false">
-						取消
-					</button>
-					<button v-else class="ss-reset-button ui-TC-Main" @tap="state.editMode = true">
-						编辑
-					</button>
-				</view>
-			</view>
-			<!-- 内容 -->
-			<view class="cart-content ss-flex-1 ss-p-x-30 ss-m-b-40">
-				<view class="goods-box ss-r-10 ss-m-b-14" v-for="item in state.list" :key="item.id">
-					<view class="ss-flex ss-col-center">
-						<label class="check-box ss-flex ss-col-center ss-p-l-10" @tap="onSelectSingle(item.id)">
-							<radio :checked="state.selectedIds.includes(item.id)" color="var(--ui-BG-Main)"
-								style="transform: scale(0.8)" @tap.stop="onSelectSingle(item.id)" />
-						</label>
-						<s-goods-item :title="item.spu.name" :img="item.spu.picUrl || item.goods.image"
-							:price="item.sku.price/100"
-							:skuText="item.sku.properties.length>1? item.sku.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.sku.properties[0].valueName"
-							priceColor="#FF3000" :titleWidth="400">
-							<template v-if="!state.editMode" v-slot:tool>
-								<su-number-box :min="0" :max="item.sku.stock" :step="1" v-model="item.count"
-									@change="onNumberChange($event, item)"></su-number-box>
-							</template>
-						</s-goods-item>
-					</view>
-				</view>
-			</view>
-			<!-- 底部 -->
-			<su-fixed bottom :val="48" placeholder v-if="state.list.length > 0" :isInset="false">
-				<view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
-					<view class="footer-left ss-flex ss-col-center">
-						<label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
-							<radio :checked="state.isAllSelected" color="var(--ui-BG-Main)"
-								style="transform: scale(0.8)" @tap.stop="onSelectAll" />
-							<view class="ss-m-l-8"> 全选 </view>
-						</label>
-						<text>合计：</text>
-						<view class="text-price price-text">
-							{{ state.totalPriceSelected }}
-						</view>
-					</view>
-					<view class="footer-right">
-						<button v-if="state.editMode" class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
-							@tap="onDelete">
-							删除
-						</button>
-						<button v-else class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
-							@tap="onConfirm">
-							去结算
-							{{ state.selectedIds?.length ? `(${state.selectedIds.length})` : '' }}
-						</button>
-					</view>
-				</view>
-			</su-fixed>
-		</view>
-	</s-layout>
+    <!-- 头部 -->
+    <view class="cart-box ss-flex ss-flex-col ss-row-between" v-if="state.list.length">
+      <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
+        <view class="header-left ss-flex ss-col-center ss-font-26">
+          共
+          <text class="goods-number ui-TC-Main ss-flex">{{ state.list.length }}</text>
+          件商品
+        </view>
+        <view class="header-right">
+          <button v-if="state.editMode" class="ss-reset-button" @tap="state.editMode = false">
+            取消
+          </button>
+          <button v-else class="ss-reset-button ui-TC-Main" @tap="state.editMode = true">
+            编辑
+          </button>
+        </view>
+      </view>
+
+      <!-- 内容 -->
+      <view class="cart-content ss-flex-1 ss-p-x-30 ss-m-b-40">
+        <view class="goods-box ss-r-10 ss-m-b-14" v-for="item in state.list" :key="item.id">
+          <view class="ss-flex ss-col-center">
+            <label class="check-box ss-flex ss-col-center ss-p-l-10" @tap="onSelectSingle(item.id)">
+              <radio
+                :checked="state.selectedIds.includes(item.id)"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelectSingle(item.id)"
+              />
+            </label>
+            <s-goods-item
+              :title="item.spu.name"
+              :img="item.sku.picUrl || item.spu.picUrl"
+              :price="fen2yuan(item.sku.price)"
+              :skuText="item.sku.properties.map((property) => property.valueName).join(' ')"
+              priceColor="#FF3000"
+              :titleWidth="400"
+            >
+              <template v-if="!state.editMode" v-slot:tool>
+                <su-number-box
+                  :min="0"
+                  :max="item.sku.stock"
+                  :step="1"
+                  v-model="item.count"
+                  @change="onNumberChange($event, item)"
+                />
+              </template>
+            </s-goods-item>
+          </view>
+        </view>
+      </view>
+
+      <!-- 底部 -->
+      <su-fixed bottom :val="48" placeholder v-if="state.list.length > 0" :isInset="false">
+        <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
+          <view class="footer-left ss-flex ss-col-center">
+            <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
+              <radio
+                :checked="state.isAllSelected"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelectAll"
+              />
+              <view class="ss-m-l-8"> 全选 </view>
+            </label>
+            <text>合计：</text>
+            <view class="text-price price-text">
+              {{ fen2yuan(state.totalPriceSelected) }}
+            </view>
+          </view>
+          <view class="footer-right">
+            <button
+              v-if="state.editMode"
+              class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
+              @tap="onDelete"
+            >
+              删除
+            </button>
+            <button
+              v-else
+              class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
+              @tap="onConfirm"
+            >
+              去结算
+              {{ state.selectedIds?.length ? `(${state.selectedIds.length})` : '' }}
+            </button>
+          </view>
+        </view>
+      </su-fixed>
+    </view>
+  </s-layout>
 </template>
 
 <script setup>
-	import sheep from '@/sheep';
-	import {
-		computed,
-		reactive,
-		unref
-	} from 'vue';
+  import sheep from '@/sheep';
+  import { computed, reactive } from 'vue';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import { property } from 'lodash/util';
 
-	const sys_navBar = sheep.$platform.navbar;
-	const cart = sheep.$store('cart');
+  const sys_navBar = sheep.$platform.navbar;
+  const cart = sheep.$store('cart');
 
-	const state = reactive({
-		editMode: false,
-		list: computed(() => cart.list),
-		selectedList: [],
-		selectedIds: computed(() => cart.selectedIds),
-		isAllSelected: computed(() => cart.isAllSelected),
-		totalPriceSelected: computed(() => cart.totalPriceSelected),
-	});
-	// 单选选中
-	function onSelectSingle(id) {
-		console.log('单选')
-		cart.selectSingle(id);
-	}
-	// 全选
-	function onSelectAll() {
-		cart.selectAll(!state.isAllSelected);
-	}
+  const state = reactive({
+    editMode: false,
+    list: computed(() => cart.list), // 购物车项的列表
+    selectedIds: computed(() => cart.selectedIds),
+    isAllSelected: computed(() => cart.isAllSelected),
+    totalPriceSelected: computed(() => cart.totalPriceSelected),
+  });
 
-	// 结算
-	function onConfirm() {
-		let items = []
-		let goods_list = [];
-		state.selectedList = state.list.filter((item) => state.selectedIds.includes(item.id));
-		state.selectedList.map((item) => {
-			console.log(item, '便利');
-			// 此处前端做出修改
-			items.push({
-				skuId: item.sku.id,
-				count: item.count,
-				cartId: item.id,
-			})
-			goods_list.push({
-				// goods_id: item.goods_id,
-				goods_id: item.spu.id,
-				// goods_num: item.goods_num,
-				goods_num: item.count,
-				// 商品价格id真没有
-				// goods_sku_price_id: item.goods_sku_price_id,
-			});
-		});
-		// return;
-		if (goods_list.length === 0) {
-			sheep.$helper.toast('请选择商品');
-			return;
-		}
-		sheep.$router.go('/pages/order/confirm', {
-			data: JSON.stringify({
-				// order_type: 'goods',
-				// goods_list,
-				items,
-				// from: 'cart',
-				deliveryType: 1,
-				pointStatus: false,
-			}),
-		});
-	}
+  // 单选
+  function onSelectSingle(id) {
+    cart.selectSingle(id);
+  }
 
-	function onNumberChange(e, cartItem) {
-		if (e === 0) {
-			cart.delete(cartItem.id);
-			return;
-		}
-		if (cartItem.goods_num === e) return;
-		cartItem.goods_num = e;
-		cart.update({
-			goods_id: cartItem.id,
-			goods_num: e,
-			goods_sku_price_id: cartItem.goods_sku_price_id,
-		});
-	}
-	async function onDelete() {
-		cart.delete(state.selectedIds);
-	}
+  // 全选
+  function onSelectAll() {
+    cart.selectAll(!state.isAllSelected);
+  }
+
+  // 结算
+  function onConfirm() {
+    const items = state.list
+      .filter((item) => state.selectedIds.includes(item.id))
+      .map((item) => {
+        return {
+          skuId: item.sku.id,
+          count: item.count,
+          cartId: item.id,
+        };
+      });
+    if (items.length === 0) {
+      sheep.$helper.toast('请选择商品');
+      return;
+    }
+    sheep.$router.go('/pages/order/confirm', {
+      data: JSON.stringify({
+        items,
+        // order_type: 'goods',
+        // goods_list,
+        // from: 'cart',
+        deliveryType: 1,
+        pointStatus: false,
+      }),
+    });
+  }
+
+  // 更新数量
+  function onNumberChange(number, cartItem) {
+    if (number === 0) {
+      cart.delete([cartItem.id]);
+      return;
+    }
+    if (cartItem.goods_num === number) {
+      return;
+    }
+    cartItem.goods_num = number;
+    cart.update({
+      goods_id: cartItem.id,
+      goods_num: number,
+    });
+  }
+
+  // 删除
+  async function onDelete() {
+    cart.delete(state.selectedIds);
+  }
 </script>
 
 <style lang="scss" scoped>
-	:deep(.ui-fixed) {
-		height: 72rpx;
-	}
+  :deep(.ui-fixed) {
+    height: 72rpx;
+  }
 
-	.cart-box {
-		width: 100%;
+  .cart-box {
+    width: 100%;
 
-		.cart-header {
-			height: 70rpx;
-			background-color: #f6f6f6;
-			width: 100%;
-			position: fixed;
-			left: 0;
-			top: v-bind('sys_navBar') rpx;
-			z-index: 1000;
-			box-sizing: border-box;
-		}
+    .cart-header {
+      height: 70rpx;
+      background-color: #f6f6f6;
+      width: 100%;
+      position: fixed;
+      left: 0;
+      top: v-bind('sys_navBar') rpx;
+      z-index: 1000;
+      box-sizing: border-box;
+    }
 
-		.cart-footer {
-			height: 100rpx;
-			background-color: #fff;
+    .cart-footer {
+      height: 100rpx;
+      background-color: #fff;
 
-			.pay-btn {
-				width: 180rpx;
-				height: 70rpx;
-				font-size: 28rpx;
-				line-height: 28rpx;
-				font-weight: 500;
-				border-radius: 40rpx;
-			}
-		}
+      .pay-btn {
+        width: 180rpx;
+        height: 70rpx;
+        font-size: 28rpx;
+        line-height: 28rpx;
+        font-weight: 500;
+        border-radius: 40rpx;
+      }
+    }
 
-		.cart-content {
-			margin-top: 70rpx;
+    .cart-content {
+      margin-top: 70rpx;
 
-			.goods-box {
-				background-color: #fff;
-			}
-		}
-	}
-</style>
\ No newline at end of file
+      .goods-box {
+        background-color: #fff;
+      }
+    }
+  }
+</style>
diff --git a/sheep/api/cart.js b/sheep/api/cart.js
index f4aacaa3..c89eadd9 100644
--- a/sheep/api/cart.js
+++ b/sheep/api/cart.js
@@ -15,6 +15,7 @@ export default {
 		request({
 			url: 'cart',
 			method: 'POST',
+      // TODO 芋艿：这里没提示
 			custom: {
 				showSuccess: true,
 				successMsg: '已添加到购物车~',
diff --git a/sheep/api/trade/cart.js b/sheep/api/trade/cart.js
new file mode 100644
index 00000000..f6a0104a
--- /dev/null
+++ b/sheep/api/trade/cart.js
@@ -0,0 +1,47 @@
+import request2 from '@/sheep/request2';
+
+const CartApi = {
+  addCart: (data) => {
+    return request2({
+      url: '/app-api/trade/cart/add',
+      method: 'POST',
+      data: data,
+      // TODO 芋艿：这里没提示
+      custom: {
+        showSuccess: true,
+        successMsg: '已添加到购物车~',
+      }
+    });
+  },
+  updateCartCount: (data) => {
+    return request2({
+      url: '/app-api/trade/cart/update-count',
+      method: 'PUT',
+      data: data
+    });
+  },
+  updateCartSelected: (data) => {
+    return request2({
+      url: '/app-api/trade/cart/update-selected',
+      method: 'PUT',
+      data: data
+    });
+  },
+  deleteCart: (ids) => {
+    return request2({
+      url: '/app-api/trade/cart/delete',
+      method: 'DELETE',
+      params: {
+        ids
+      }
+    });
+  },
+  getCartList: () => {
+    return request2({
+      url: '/app-api/trade/cart/list',
+      method: 'GET',
+    });
+  },
+};
+
+export default CartApi;
\ No newline at end of file
diff --git a/sheep/store/cart.js b/sheep/store/cart.js
index 8e076343..6e70d4a4 100644
--- a/sheep/store/cart.js
+++ b/sheep/store/cart.js
@@ -1,98 +1,93 @@
 import { defineStore } from 'pinia';
-import cartApi from '@/sheep/api/cart';
+import CartApi from '@/sheep/api/trade/cart';
 
 const cart = defineStore({
   id: 'cart',
   state: () => ({
     list: [], // 购物车列表
     selectedIds: [], // 已选列表
-    isAllSelected: false, //是否全选
-    cartSelectedTotalPrice: '0.00', // 选中项总金额
+    isAllSelected: false, // 是否全选
+    totalPriceSelected: 0, // 选中项总金额
   }),
-  getters: {
-    totalPriceSelected: (state) => {
-      let price = 0;
-      if (!state.selectedIds.length) return price.toFixed(2);
-      state.list.forEach((item) => {
-        price += state.selectedIds.includes(item.id)
-          ? Number(item.sku.price/100) * item.count
-          : 0;
-      });
-      return price.toFixed(2);
-    },
-  },
   actions: {
     // 获取购物车列表
     async getList() {
-      const { data, code } = await cartApi.list();
+      const { data, code } = await CartApi.getCartList();
       if (code === 0) {
         this.list = data.validList;
+
+        // 计算各种关联属性
+        this.selectedIds = [];
+        this.isAllSelected = true;
+        this.totalPriceSelected = 0;
+        this.list.forEach((item) => {
+          if (item.selected) {
+            this.selectedIds.push(item.id);
+            this.totalPriceSelected += item.count * item.sku.price;
+          } else {
+            this.isAllSelected = false;
+          }
+        });
       }
     },
+
     // 添加购物车
     async add(goodsInfo) {
-      const { error } = await cartApi.append({
-        goods_id: goodsInfo.goods_id,
-        goods_num: goodsInfo.goods_num,
-        goods_sku_price_id: goodsInfo.id,
+      // 添加购物项
+      const { code } = await CartApi.addCart({
+        skuId: goodsInfo.id,
+        count: goodsInfo.goods_num,
       });
-      if (error === 0) {
-        this.getList();
+      // 刷新购物车列表
+      if (code === 0) {
+        await this.getList();
       }
     },
 
     // 更新购物车
     async update(goodsInfo) {
-      const { error } = await cartApi.update({
+      const { code } = await CartApi.updateCartCount({
         id: goodsInfo.goods_id,
         count: goodsInfo.goods_num,
-        goods_sku_price_id: goodsInfo.goods_sku_price_id,
       });
-      if (error === 0) {
-        // this.getList();
+      if (code === 0) {
+        await this.getList();
       }
     },
 
     // 移除购物车
     async delete(ids) {
-      if (typeof ids === 'array') {
-        ids = ids.join(',');
-      }
-      const { code } = await cartApi.delete(ids);
+      const { code } = await CartApi.deleteCart(ids.join(','));
       if (code === 0) {
-        this.selectAll(false);
-        this.getList();
+        await this.getList();
       }
     },
 
-    // 选择购物车商品
-    selectSingle(goodsId) {
-      if (!this.selectedIds.includes(goodsId)) {
-        this.selectedIds.push(goodsId);
-      } else {
-        this.selectedIds.splice(this.selectedIds.indexOf(goodsId), 1);
+    // 单选购物车商品
+    async selectSingle(goodsId) {
+      const { code } = await CartApi.updateCartSelected({
+        ids: [goodsId],
+        selected: !this.selectedIds.includes(goodsId), // 取反
+      });
+      if (code === 0) {
+        await this.getList();
       }
-      this.isAllSelected = this.selectedIds.length === this.list.length;
     },
 
-    // 全选
-    selectAll(flag) {
-      this.isAllSelected = flag;
-      if (!flag) {
-        this.selectedIds = [];
-      } else {
-        this.list.forEach((item) => {
-          this.selectedIds.push(item.id);
-        });
+    // 全选购物车商品
+    async selectAll(flag) {
+      const { code } = await CartApi.updateCartSelected({
+        ids: this.list.map((item) => item.id),
+        selected: flag
+      });
+      if (code === 0) {
+        await this.getList();
       }
     },
 
     // 清空购物车
-    emptyList() {
-      this.list = [];
-      this.selectedIds = [];
-      this.isAllSelected = false;
-      this.cartSelectedTotalPrice = '0.00';
+    async emptyList() {
+      await this.delete(this.list.map((item) => item.id));
     },
   },
   persist: {

From 4ddf17e2dfed0c819c717e91cd278f130e9dc442 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 11 Dec 2023 22:21:21 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E2=9C=A8=20=E4=B8=8B=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue                       | 722 +++++++++---------
 sheep/api/app.js                              |   8 +-
 sheep/api/order.js                            |  25 +-
 sheep/api/promotion/coupon.js                 |  13 +
 sheep/api/trade/order.js                      |  41 +
 .../s-coupon-select/s-coupon-select.vue       |  24 +-
 .../components/s-goods-item/s-goods-item.vue  |   3 +-
 7 files changed, 434 insertions(+), 402 deletions(-)
 create mode 100644 sheep/api/trade/order.js

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 7f866a4c..9b4c8bf0 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -1,414 +1,388 @@
 <template>
-	<s-layout title="确认订单">
-		<!-- v-if="state.orderInfo.need_address === 1" -->
-		<!-- 这个判断先删除 -->
-		<view class="bg-white address-box ss-m-b-14 ss-r-b-10" @tap="onSelectAddress">
-			<s-address-item :item="state.addressInfo" :hasBorderBottom="false">
-				<view class="ss-rest-button"><text class="_icon-forward"></text></view>
-			</s-address-item>
-		</view>
-		<view class="order-card-box ss-m-b-14">
-			<s-goods-item v-for="item in state.orderInfo.goods_list" :key="item.goods_id"
-				:img="item.current_sku_price.image || item.goods.image" :title="item.goods.title"
-				:skuText="item.current_sku_price?.goods_sku_text" :price="item.current_sku_price.price"
-				:num="item.goods_num" marginBottom="10">
-				<template #top>
-					<view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white">
-						<view class="item-title">配送方式</view>
-						<view class="ss-flex ss-col-center">
-							<text class="item-value">{{ item.dispatch_type_text }}</text>
-						</view>
-					</view>
-				</template>
-			</s-goods-item>
+  <s-layout title="确认订单">
+    <!-- TODO：这个判断先删除 v-if="state.orderInfo.need_address === 1" -->
+    <view class="bg-white address-box ss-m-b-14 ss-r-b-10" @tap="onSelectAddress">
+      <s-address-item :item="state.addressInfo" :hasBorderBottom="false">
+        <view class="ss-rest-button">
+          <text class="_icon-forward" />
+        </view>
+      </s-address-item>
+    </view>
 
-			<view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
-				<view class="item-title">订单备注</view>
-				<view class="ss-flex ss-col-center">
-					<uni-easyinput maxlength="20" placeholder="建议留言前先与商家沟通" v-model="state.orderPayload.remark"
-						:inputBorder="false" :clearable="false"></uni-easyinput>
-				</view>
-			</view>
-		</view>
-		<!-- 合计 -->
-		<view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
-			<view class="total-box-content border-bottom">
-				<view class="order-item ss-flex ss-col-center ss-row-between">
-					<view class="item-title">商品金额</view>
-					<view class="ss-flex ss-col-center">
-						<text class="item-value ss-m-r-24">￥{{ state.orderInfo.goods_amount }}</text>
-					</view>
-				</view>
-				<view class="order-item ss-flex ss-col-center ss-row-between"
-					v-if="state.orderPayload.order_type === 'score'">
-					<view class="item-title">扣除积分</view>
-					<view class="ss-flex ss-col-center">
-						<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img"></image>
-						<text class="item-value ss-m-r-24">{{ state.orderInfo.score_amount }}</text>
-					</view>
-				</view>
-				<view class="order-item ss-flex ss-col-center ss-row-between">
-					<view class="item-title">运费</view>
-					<view class="ss-flex ss-col-center">
-						<text class="item-value ss-m-r-24">+￥{{ state.orderInfo.dispatch_amount }}</text>
-					</view>
-				</view>
-				<view class="order-item ss-flex ss-col-center ss-row-between"
-					v-if="state.orderPayload.order_type != 'score'">
-					<!-- <view v-if="state.orderInfo.coupon_discount_fee > 0" class="order-item ss-flex ss-col-center ss-row-between"> -->
-					<view class="item-title">优惠券</view>
-					<view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
-						<text class="item-value text-red"
-							v-if="state.orderPayload.coupon_id">-￥{{ state.orderInfo.coupon_discount_fee }}</text>
-						<text class="item-value"
-							:class="state.couponInfo.can_use?.length > 0 ? 'text-red' : 'text-disabled'" v-else>{{
-                state.couponInfo.can_use?.length > 0
-                  ? state.couponInfo.can_use?.length + '张可用'
-                  : '暂无可用优惠券'
-              }}</text>
+    <!-- 商品信息 -->
+    <view class="order-card-box ss-m-b-14">
+      <s-goods-item
+        v-for="item in state.orderInfo.items"
+        :key="item.skuId"
+        :img="item.picUrl"
+        :title="item.spuName"
+        :skuText="item.properties.map((property) => property.valueName).join(' ')"
+        :price="item.price"
+        :num="item.count"
+        marginBottom="10"
+      />
+      <view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
+        <view class="item-title">订单备注</view>
+        <view class="ss-flex ss-col-center">
+          <uni-easyinput
+            maxlength="20"
+            placeholder="建议留言前先与商家沟通"
+            v-model="state.orderPayload.remark"
+            :inputBorder="false"
+            :clearable="false"
+          />
+        </view>
+      </view>
+    </view>
 
-						<text class="_icon-forward item-icon"></text>
-					</view>
-				</view>
-				<view class="order-item ss-flex ss-col-center ss-row-between"
-					v-if="state.orderInfo.promo_infos?.length">
-					<!-- <view v-if="state.orderInfo.promo_discount_fee > 0" class="order-item ss-flex ss-col-center ss-row-between"> -->
-					<view class="item-title">活动优惠</view>
-					<view class="ss-flex ss-col-center" @tap="state.showDiscount = true">
-						<text class="item-value text-red"> -￥{{ state.orderInfo.promo_discount_fee }} </text>
-						<text class="_icon-forward item-icon"></text>
-					</view>
-				</view>
-			</view>
-			<view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
-				<view class="total-num ss-m-r-20">共{{ state.totalNumber }}件</view>
-				<view>合计：</view>
-				<view class="total-num text-red"> ￥{{ state.orderInfo.pay_fee }} </view>
-				<view class="ss-flex" v-if="state.orderPayload.order_type === 'score'">
-					<view class="total-num ss-font-30 text-red ss-m-l-4"> + </view>
-					<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img"></image>
-					<view class="total-num ss-font-30 text-red">{{ state.orderInfo.score_amount }}</view>
-				</view>
-			</view>
-		</view>
-		<!-- 发票 -->
-		<view class="bg-white ss-p-20 ss-r-20">
-			<view class="order-item ss-flex ss-col-center ss-row-between">
-				<view class="item-title">发票申请</view>
-				<view class="ss-flex ss-col-center" @tap="onSelectInvoice">
-					<text class="item-value">{{ state.invoiceInfo.name || '无需开具发票' }}</text>
-					<text class="_icon-forward item-icon"></text>
-				</view>
-			</view>
-		</view>
-		<!-- 选择优惠券弹框 -->
-		<s-coupon-select v-model="state.couponInfo" :show="state.showCoupon" @confirm="onSelectCoupon"
-			@close="state.showCoupon = false" />
-		<!-- 满额折扣弹框  -->
-		<s-discount-list v-model="state.orderInfo" :show="state.showDiscount" @close="state.showDiscount = false" />
-		<!-- 底部 -->
-		<su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
-			<view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
-				<view class="total-box-footer ss-flex ss-col-center">
-					<view class="total-num ss-font-30 text-red"> ￥{{ state.orderInfo.pay_fee }} </view>
-					<view v-if="state.orderPayload.order_type === 'score'" class="ss-flex">
-						<view class="total-num ss-font-30 text-red ss-m-l-4">+</view>
-						<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img"></image>
-						<view class="total-num ss-font-30 text-red">{{ state.orderInfo.score_amount }}</view>
-					</view>
-				</view>
+    <!-- 价格信息 -->
+    <view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
+      <view class="total-box-content border-bottom">
+        <view class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">商品金额</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value ss-m-r-24">
+              ￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
+            </text>
+          </view>
+        </view>
+        <!-- TODO 芋艿：接入积分 -->
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderPayload.order_type === 'score'"
+        >
+          <view class="item-title">扣除积分</view>
+          <view class="ss-flex ss-col-center">
+            <image
+              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+              class="score-img"
+            />
+            <text class="item-value ss-m-r-24">{{ state.orderInfo.score_amount }}</text>
+          </view>
+        </view>
+        <view class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">运费</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value ss-m-r-24">
+              +￥{{ fen2yuan(state.orderInfo.price.deliveryPrice) }}
+            </text>
+          </view>
+        </view>
+        <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 0"
+        >
+          <view class="item-title">优惠券</view>
+          <view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
+            <text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
+              -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
+            </text>
+            <text
+              class="item-value"
+              :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
+              v-else
+            >
+              {{
+                state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
+              }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.discountPrice > 0"
+        >
+          <view class="item-title">活动优惠</view>
+          <view class="ss-flex ss-col-center">
+            <!--                @tap="state.showDiscount = true" TODO 芋艿：后续要把优惠信息打进去 -->
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+      </view>
+      <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
+        <view class="total-num ss-m-r-20">
+          共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
+        </view>
+        <view>合计：</view>
+        <view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }} </view>
+      </view>
+    </view>
 
-				<button class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main" @tap="onConfirm">
-					{{ exchangeNow ? '立即兑换' : '提交订单' }}
-				</button>
-			</view>
-		</su-fixed>
-	</s-layout>
+    <!-- 选择优惠券弹框 -->
+    <s-coupon-select
+      v-model="state.couponInfo"
+      :show="state.showCoupon"
+      @confirm="onSelectCoupon"
+      @close="state.showCoupon = false"
+    />
+
+    <!-- 满额折扣弹框 TODO 芋艿：后续要把优惠信息打进去 -->
+    <s-discount-list
+      v-model="state.orderInfo"
+      :show="state.showDiscount"
+      @close="state.showDiscount = false"
+    />
+
+    <!-- 底部 -->
+    <su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
+      <view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
+        <view class="total-box-footer ss-flex ss-col-center">
+          <view class="total-num ss-font-30 text-red">
+            ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
+          </view>
+        </view>
+        <button
+          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
+          @tap="onConfirm"
+        >
+          提交订单
+        </button>
+      </view>
+    </su-fixed>
+  </s-layout>
 </template>
 
 <script setup>
-	import {
-		reactive,
-		computed
-	} from 'vue';
-	import {
-		onLoad,
-		onPageScroll,
-		onShow
-	} from '@dcloudio/uni-app';
-	import sheep from '@/sheep';
-	import {
-		isEmpty
-	} from 'lodash';
+  import { reactive } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash';
+  import OrderApi from '@/sheep/api/trade/order';
+  import CouponApi from '@/sheep/api/promotion/coupon';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
 
-	const state = reactive({
-		orderPayload: {},
-		orderInfo: {},
-		addressInfo: {},
-		invoiceInfo: {},
-		totalNumber: 0,
-		showCoupon: false,
-		couponInfo: [],
-		showDiscount: false,
-	});
+  const state = reactive({
+    orderPayload: {},
+    orderInfo: {
+      items: [], // 商品项列表
+      price: {}, // 价格信息
+    },
+    addressInfo: {}, // 选择的收货地址
+    showCoupon: false, // 是否展示优惠劵
+    couponInfo: [], // 优惠劵列表
+    showDiscount: false, // 是否展示营销活动
+  });
 
-	// 立即兑换(立即兑换无需跳转收银台)
-	const exchangeNow = computed(
-		() => state.orderPayload.order_type === 'score' && state.orderInfo.pay_fee == 0,
-	);
+  // 选择地址
+  function onSelectAddress() {
+    uni.$once('SELECT_ADDRESS', (e) => {
+      changeConsignee(e.addressInfo);
+    });
+    sheep.$router.go('/pages/user/address/list');
+  }
 
-	// 选择地址
-	function onSelectAddress() {
-		uni.$once('SELECT_ADDRESS', (e) => {
-			changeConsignee(e.addressInfo);
-		});
-		sheep.$router.go('/pages/user/address/list');
-	}
+  // 更改收货人地址&计算订单信息
+  async function changeConsignee(addressInfo = {}) {
+    if (!isEmpty(addressInfo)) {
+      state.addressInfo = addressInfo;
+    }
+    await getOrderInfo();
+  }
 
-	// 更改收货人地址&计算订单信息
-	async function changeConsignee(addressInfo = {}) {
-		if (isEmpty(addressInfo)) {
-			const {
-				code,
-				data
-			} = await sheep.$api.user.address.default();
-			console.log(data, '默认收货地址');
-			if (code === 0 && !isEmpty(data)) {
-				console.log('执行赋值')
-				addressInfo = data;
-			}
-		}
-		if (!isEmpty(addressInfo)) {
-			state.addressInfo = addressInfo;
-			state.orderPayload.address_id = state.addressInfo.id;
-		}
-		getOrderInfo();
-	}
+  // 选择优惠券
+  async function onSelectCoupon(couponId) {
+    state.orderPayload.couponId = couponId || 0;
+    await getOrderInfo();
+    state.showCoupon = false;
+  }
 
-	// 选择优惠券
-	async function onSelectCoupon(e) {
-		state.orderPayload.coupon_id = e || 0;
-		getOrderInfo();
-		state.showCoupon = false;
-	}
+  // 提交订单
+  function onConfirm() {
+    if (!state.addressInfo.id) {
+      sheep.$helper.toast('请选择收货地址');
+      return;
+    }
+    submitOrder();
+  }
 
-	// 选择发票信息
-	function onSelectInvoice() {
-		uni.$once('SELECT_INVOICE', (e) => {
-			state.invoiceInfo = e.invoiceInfo;
-			state.orderPayload.invoice_id = e.invoiceInfo.id || 0;
-		});
-		sheep.$router.go('/pages/user/invoice/list');
-	}
+  // 创建订单&跳转
+  async function submitOrder() {
+    const { code, data } = await OrderApi.createOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      addressId: state.addressInfo.id,
+      deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
+      pointStatus: false, // TODO 芋艿：需要支持【积分选择】
+    });
+    if (code !== 0) {
+      return;
+    }
+    // 更新购物车列表，如果来自购物车
+    if (state.orderPayload.items[0].cartId > 0) {
+      sheep.$store('cart').getList();
+    }
+    // 跳转到支付页面
+    sheep.$router.redirect('/pages/pay/index', {
+      orderSN: data.payOrderId,
+    });
+  }
 
-	// 提交订单/立即兑换
-	function onConfirm() {
-		if (!state.orderPayload.address_id && state.orderInfo.need_address === 1) {
-			sheep.$helper.toast('请选择收货地址');
-			return;
-		}
+  // 检查库存 & 计算订单价格
+  async function getOrderInfo() {
+    // 计算价格
+    const { data, code } = await OrderApi.settlementOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      addressId: state.addressInfo.id,
+      deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
+      pointStatus: false, // TODO 芋艿：需要支持【积分选择】
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.orderInfo = data;
+    // 设置收货地址
+    if (state.orderInfo.address) {
+      state.addressInfo = state.orderInfo.address;
+    }
+  }
 
-		if (exchangeNow.value) {
-			uni.showModal({
-				title: '提示',
-				content: '确定使用积分立即兑换?',
-				cancelText: '再想想',
-				success: async function(res) {
-					if (res.confirm) {
-						submitOrder();
-					}
-				},
-			});
-		} else {
-			submitOrder();
-		}
-	}
+  // 获取可用优惠券
+  async function getCoupons() {
+    const { code, data } = await CouponApi.getMatchCouponList(
+      state.orderInfo.price.payPrice,
+      state.orderInfo.items.map((item) => item.spuId),
+      state.orderPayload.items.map((item) => item.skuId),
+      state.orderPayload.items.map((item) => item.categoryId),
+    );
+    if (code === 0) {
+      state.couponInfo = data;
+    }
+  }
 
-	// 创建订单&跳转
-	async function submitOrder() {
-		const {
-			error,
-			data
-		} = await sheep.$api.order.create(state.orderPayload);
-		if (error === 0) {
-			// 更新购物车列表
-			if (state.orderPayload.from === 'cart') {
-				sheep.$store('cart').getList();
-			}
-			if (exchangeNow.value) {
-				sheep.$router.redirect('/pages/pay/result', {
-					orderSN: data.order_sn,
-				});
-			} else {
-				sheep.$router.redirect('/pages/pay/index', {
-					orderSN: data.order_sn,
-				});
-			}
-		}
-	}
-
-	// 检查库存&计算订单价格
-	async function getOrderInfo() {
-		console.log(state.orderPayload, '计算价格传参')
-		// let {code, data} = await sheep.$api.order.calc(state.orderPayload);
-		// let data = await sheep.$api.order.calc(state.orderPayload);
-		console.log(state.orderPayload.items)
-		let data = await sheep.$api.order.calc({
-			deliveryType: 1,
-			pointStatus: false,
-			items: state.orderPayload.items
-		});
-		console.log(data, '修改后的获取订单详细数据')
-		return;
-		if (error === 0) {
-			state.totalNumber = 0;
-			state.orderInfo = data;
-			state.orderInfo.goods_list.forEach((item) => {
-				state.totalNumber += item.goods_num;
-			});
-		}
-	}
-
-	// 获取可用优惠券
-	async function getCoupons() {
-		const {
-			error,
-			data
-		} = await sheep.$api.order.coupons(state.orderPayload);
-		if (error === 0) {
-			state.couponInfo = data;
-		}
-	}
-
-	onLoad(async (options) => {
-		console.log(options)
-		if (options.data) {
-			state.orderPayload = JSON.parse(options.data);
-			changeConsignee();
-			if (state.orderPayload.order_type !== 'score') {
-				getCoupons();
-			}
-		}
-	});
+  onLoad(async (options) => {
+    if (!options.data) {
+      sheep.$helper.toast('参数不正确，请检查！');
+      return;
+    }
+    state.orderPayload = JSON.parse(options.data);
+    await getOrderInfo();
+    await getCoupons();
+  });
 </script>
 
 <style lang="scss" scoped>
-	:deep() {
-		.uni-input-wrapper {
-			width: 320rpx;
-		}
+  :deep() {
+    .uni-input-wrapper {
+      width: 320rpx;
+    }
 
-		.uni-easyinput__content-input {
-			font-size: 28rpx;
-			height: 72rpx;
-			text-align: right !important;
-			padding-right: 0 !important;
+    .uni-easyinput__content-input {
+      font-size: 28rpx;
+      height: 72rpx;
+      text-align: right !important;
+      padding-right: 0 !important;
 
-			.uni-input-input {
-				font-weight: 500;
-				color: #333333;
-				font-size: 26rpx;
-				height: 32rpx;
-				margin-top: 4rpx;
-			}
-		}
+      .uni-input-input {
+        font-weight: 500;
+        color: #333333;
+        font-size: 26rpx;
+        height: 32rpx;
+        margin-top: 4rpx;
+      }
+    }
 
-		.uni-easyinput__content {
-			display: flex !important;
-			align-items: center !important;
-			justify-content: right !important;
-		}
-	}
+    .uni-easyinput__content {
+      display: flex !important;
+      align-items: center !important;
+      justify-content: right !important;
+    }
+  }
 
-	.score-img {
-		width: 36rpx;
-		height: 36rpx;
-		margin: 0 4rpx;
-	}
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
 
-	.order-item {
-		height: 80rpx;
+  .order-item {
+    height: 80rpx;
 
-		.item-title {
-			font-size: 28rpx;
-			font-weight: 400;
-		}
+    .item-title {
+      font-size: 28rpx;
+      font-weight: 400;
+    }
 
-		.item-value {
-			font-size: 28rpx;
-			font-weight: 500;
-			font-family: OPPOSANS;
-		}
+    .item-value {
+      font-size: 28rpx;
+      font-weight: 500;
+      font-family: OPPOSANS;
+    }
 
-		.text-disabled {
-			color: #bbbbbb;
-		}
+    .text-disabled {
+      color: #bbbbbb;
+    }
 
-		.item-icon {
-			color: $dark-9;
-		}
+    .item-icon {
+      color: $dark-9;
+    }
 
-		.remark-input {
-			text-align: right;
-		}
+    .remark-input {
+      text-align: right;
+    }
 
-		.item-placeholder {
-			color: $dark-9;
-			font-size: 26rpx;
-			text-align: right;
-		}
-	}
+    .item-placeholder {
+      color: $dark-9;
+      font-size: 26rpx;
+      text-align: right;
+    }
+  }
 
-	.total-box-footer {
-		height: 90rpx;
+  .total-box-footer {
+    height: 90rpx;
 
-		.total-num {
-			color: #333333;
-			font-family: OPPOSANS;
-		}
-	}
+    .total-num {
+      color: #333333;
+      font-family: OPPOSANS;
+    }
+  }
 
-	.footer-box {
-		height: 100rpx;
+  .footer-box {
+    height: 100rpx;
 
-		.submit-btn {
-			width: 240rpx;
-			height: 70rpx;
-			font-size: 28rpx;
-			font-weight: 500;
+    .submit-btn {
+      width: 240rpx;
+      height: 70rpx;
+      font-size: 28rpx;
+      font-weight: 500;
 
-			.goto-pay-text {
-				line-height: 28rpx;
-			}
-		}
+      .goto-pay-text {
+        line-height: 28rpx;
+      }
+    }
 
-		.cancel-btn {
-			width: 240rpx;
-			height: 80rpx;
-			font-size: 26rpx;
-			background-color: #e5e5e5;
-			color: $dark-9;
-		}
-	}
+    .cancel-btn {
+      width: 240rpx;
+      height: 80rpx;
+      font-size: 26rpx;
+      background-color: #e5e5e5;
+      color: $dark-9;
+    }
+  }
 
-	.title {
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #333333;
-	}
+  .title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+  }
 
-	.subtitle {
-		font-size: 28rpx;
-		color: #999999;
-	}
+  .subtitle {
+    font-size: 28rpx;
+    color: #999999;
+  }
 
-	.cicon-checkbox {
-		font-size: 36rpx;
-		color: var(--ui-BG-Main);
-	}
+  .cicon-checkbox {
+    font-size: 36rpx;
+    color: var(--ui-BG-Main);
+  }
 
-	.cicon-box {
-		font-size: 36rpx;
-		color: #999999;
-	}
-</style>
\ No newline at end of file
+  .cicon-box {
+    font-size: 36rpx;
+    color: #999999;
+  }
+</style>
diff --git a/sheep/api/app.js b/sheep/api/app.js
index 2bb92c6c..a174686d 100644
--- a/sheep/api/app.js
+++ b/sheep/api/app.js
@@ -115,12 +115,14 @@ export default {
         formData: {
           group,
         },
+        // TODO 芋艿：临时写死
         header: {
           // Accept: 'text/json',
           // Authorization: token,
-		  Accept : '*/*',
-		  'tenant-id' :'1',
-		  Authorization:  'Bearer test247',
+          Accept : '*/*',
+          'tenant-id' :'1',
+          'terminal': 20,
+          Authorization:  'Bearer test247',
         },
         success: (uploadFileRes) => {
           let result = JSON.parse(uploadFileRes.data);
diff --git a/sheep/api/order.js b/sheep/api/order.js
index 8fb48cad..6dd8b362 100644
--- a/sheep/api/order.js
+++ b/sheep/api/order.js
@@ -65,27 +65,18 @@ export default {
 		// 解决 SpringMVC 接受 List<Item> 参数的问题
 		delete data2.items
 		for (let i = 0; i < data.items.length; i++) {
-			// data2['items[' + i + '' + '].skuId'] = data.items[i].skuId + '';
-			// data2['items[' + i + '' + '].count'] = data.items[i].count + '';
-			// data2['items[' + i + '' + '].cartId'] = data.items[i].cartId + '';
-			data2['items' + `%5B${i}%5D` + '.skuId'] = data.items[i].skuId + '';
-			data2['items' + `%5B${i}%5D` + '.count'] = data.items[i].count + '';
-			data2['items' + `%5B${i}%5D` + '.cartId'] = data.items[i].cartId + '';
+			data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
+			data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
+      if (data.items[i].cartId) {
+        data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
+      }
 		}
-		console.log(data2, '对比数据')
+    const queryString= Object.keys(data2).map(key => key + '=' + data2[key]).join('&')
 		return request2({
-			url: 'trade/order/settlement',
-			method: 'GET',
-			// data,
-			params: data2
+			url: `trade/order/settlement?${queryString}`,
+			method: 'GET'
 		})
 	},
-	// calc: (data) =>
-	//   request({
-	//     url: 'order/order/calc',
-	//     method: 'POST',
-	//     data,
-	//   }),
 	// 创建订单
 	create: (data) =>
 		request({
diff --git a/sheep/api/promotion/coupon.js b/sheep/api/promotion/coupon.js
index 9bdbb19e..feeb0caa 100644
--- a/sheep/api/promotion/coupon.js
+++ b/sheep/api/promotion/coupon.js
@@ -17,4 +17,17 @@ export default {
       params: { spuId, productScope, count },
     });
   },
+  // 获得匹配指定商品的优惠劵列表
+  getMatchCouponList: (price, spuIds, skuIds, categoryIds) => {
+    return request({
+      url: '/app-api/promotion/coupon/match-list',
+      method: 'GET',
+      params: {
+        price,
+        spuIds: spuIds.join(','),
+        skuIds: skuIds.join(','),
+        categoryIds: categoryIds.join(','),
+      },
+    });
+  }
 };
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
new file mode 100644
index 00000000..10444657
--- /dev/null
+++ b/sheep/api/trade/order.js
@@ -0,0 +1,41 @@
+import request2 from '@/sheep/request2';
+
+const OrderApi = {
+  // 计算订单信息
+  settlementOrder: (data) => {
+    const data2 = {
+      ...data,
+    }
+    // 移除多余字段
+    if (!(data.couponId > 0)) {
+      delete data2.couponId
+    }
+    if (!(data.addressId > 0)) {
+      delete data2.addressId
+    }
+    // 解决 SpringMVC 接受 List<Item> 参数的问题
+    delete data2.items
+    for (let i = 0; i < data.items.length; i++) {
+      data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
+      data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
+      if (data.items[i].cartId) {
+        data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
+      }
+    }
+    const queryString= Object.keys(data2).map(key => key + '=' + data2[key]).join('&')
+    return request2({
+      url: `trade/order/settlement?${queryString}`,
+      method: 'GET'
+    })
+  },
+  // 创建订单
+  createOrder: (data) => {
+    return request2({
+      url: `trade/order/create`,
+      method: 'POST',
+      data
+    })
+  }
+};
+
+export default OrderApi;
\ No newline at end of file
diff --git a/sheep/components/s-coupon-select/s-coupon-select.vue b/sheep/components/s-coupon-select/s-coupon-select.vue
index 928f903a..e1a9db43 100644
--- a/sheep/components/s-coupon-select/s-coupon-select.vue
+++ b/sheep/components/s-coupon-select/s-coupon-select.vue
@@ -1,3 +1,4 @@
+<!-- 订单确认的优惠劵选择弹窗 -->
 <template>
   <su-popup
     :show="show"
@@ -16,20 +17,21 @@
         :enable-back-to-top="true"
       >
         <view class="subtitle ss-m-l-20">可使用优惠券</view>
-        <view v-for="(item, index) in state.couponInfo.can_use" :key="index">
+        <view v-for="(item, index) in state.couponInfo" :key="index">
           <s-coupon-list :data="item" type="user" :disabled="false">
             <template #default>
               <label class="ss-flex ss-col-center" @tap="radioChange(item.id)">
                 <radio
                   color="var(--ui-BG-Main)"
                   style="transform: scale(0.8)"
-                  :checked="state.couponId == item.id"
+                  :checked="state.couponId === item.id"
                   @tap.stop="radioChange(item.id)"
                 />
               </label>
             </template>
           </s-coupon-list>
         </view>
+        <!-- TODO 芋艿：未来接口需要支持下
         <view class="subtitle ss-m-t-40 ss-m-l-20">不可使用优惠券</view>
         <view v-for="item in state.couponInfo.cannot_use" :key="item.id">
           <s-coupon-list :data="item" type="user" :disabled="true">
@@ -41,6 +43,7 @@
             </template>
           </s-coupon-list>
         </view>
+      -->
       </scroll-view>
     </view>
     <view class="modal-footer ss-flex">
@@ -50,8 +53,9 @@
 </template>
 <script setup>
   import { computed, reactive } from 'vue';
+
   const props = defineProps({
-    modelValue: {
+    modelValue: { // 优惠劵列表
       type: Object,
       default() {},
     },
@@ -60,21 +64,27 @@
       default: false,
     },
   });
+
   const emits = defineEmits(['confirm', 'close']);
+
   const state = reactive({
-    couponInfo: computed(() => props.modelValue),
-    couponId: 0,
+    couponInfo: computed(() => props.modelValue), // 优惠劵列表
+    couponId: 0, // 选中的优惠劵编号
   });
+
+  // 选中优惠劵
   function radioChange(couponId) {
-    if (state.couponId == couponId) {
+    if (state.couponId === couponId) {
       state.couponId = 0;
     } else {
       state.couponId = couponId;
     }
   }
+
+  // 确认优惠劵
   const onConfirm = () => {
     emits('confirm', state.couponId);
-  };
+  }
 </script>
 <style lang="scss" scoped>
   :deep() {
diff --git a/sheep/components/s-goods-item/s-goods-item.vue b/sheep/components/s-goods-item/s-goods-item.vue
index d599f28e..41dd610f 100644
--- a/sheep/components/s-goods-item/s-goods-item.vue
+++ b/sheep/components/s-goods-item/s-goods-item.vue
@@ -26,7 +26,7 @@
               :style="[{ color: priceColor }]"
               v-if="price && Number(price) > 0"
             >
-              ￥{{ price }}
+              ￥{{ fen2yuan(price) }}
             </view>
             <view v-if="score && Number(price) > 0">+</view>
             <view class="price-text ss-flex ss-col-center" v-if="score">
@@ -54,6 +54,7 @@
 <script setup>
   import sheep from '@/sheep';
   import { computed } from 'vue';
+  import { fen2yuan } from '../../hooks/useGoods';
   /**
    * 订单卡片
    *

From 072f6a15a913229d39a5d61090bb8d85e4a47b34 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 12 Dec 2023 00:03:07 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E2=9C=A8=20=E6=94=B6=E9=93=B6=E5=8F=B0?=
 =?UTF-8?q?=EF=BC=9A=E6=8E=A5=E5=85=A5=E6=A0=B8=E5=BF=83=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pay/index.vue      | 158 +++++++++++----------------------------
 sheep/api/pay/channel.js |  14 ++++
 sheep/api/pay/order.js   |  14 ++++
 sheep/platform/pay.js    |  99 +++++++++++++++++++-----
 sheep/store/app.js       |   4 +-
 5 files changed, 153 insertions(+), 136 deletions(-)
 create mode 100644 sheep/api/pay/channel.js
 create mode 100644 sheep/api/pay/order.js

diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index 8b11d90e..804c2cd1 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -2,14 +2,17 @@
 <template>
   <s-layout title="收银台">
     <view class="bg-white ss-modal-box ss-flex-col">
+      <!-- 订单信息 -->
       <view class="modal-header ss-flex-col ss-col-center ss-row-center">
         <view class="money-box ss-m-b-20">
-          <text class="money-text">{{ state.orderInfo.pay_fee }}</text>
+          <text class="money-text">{{ fen2yuan(state.orderInfo.price) }}</text>
         </view>
         <view class="time-text">
           <text>{{ payDescText }}</text>
         </view>
       </view>
+
+      <!-- 支付方式 -->
       <view class="modal-content ss-flex-1">
         <view class="pay-title ss-p-l-30 ss-m-y-30">选择支付方式</view>
         <radio-group @change="onTapPay">
@@ -17,7 +20,6 @@
             <view
               class="pay-item ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom"
               :class="{ 'disabled-pay-item': item.disabled }"
-              v-if="allowedPayment.includes(item.value)"
             >
               <view class="ss-flex ss-col-center">
                 <image
@@ -25,25 +27,19 @@
                   v-if="item.disabled"
                   :src="sheep.$url.static('/static/img/shop/pay/cod_disabled.png')"
                   mode="aspectFit"
-                ></image>
+                />
                 <image
                   class="pay-icon"
                   v-else
                   :src="sheep.$url.static(item.icon)"
                   mode="aspectFit"
-                ></image>
+                />
                 <text class="pay-title">{{ item.title }}</text>
               </view>
               <view class="check-box ss-flex ss-col-center ss-p-l-10">
-                <view class="userInfo-money ss-m-r-10" v-if="item.value == 'money'">
+                <view class="userInfo-money ss-m-r-10" v-if="item.value === 'wallet'">
                   余额: {{ userInfo.money }}元
                 </view>
-                <view
-                  class="userInfo-money ss-m-r-10"
-                  v-if="item.value == 'offline' && item.disabled"
-                >
-                  部分商品不支持
-                </view>
                 <radio
                   :value="item.value"
                   color="var(--ui-BG-Main)"
@@ -56,6 +52,7 @@
           </label>
         </radio-group>
       </view>
+
       <!-- 工具 -->
       <view class="modal-footer ss-flex ss-row-center ss-col-center ss-m-t-80 ss-m-b-40">
         <button v-if="state.payStatus === 0" class="ss-reset-button past-due-btn">
@@ -81,65 +78,27 @@
   import { computed, reactive } from 'vue';
   import { onLoad } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
-  import { useDurationTime } from '@/sheep/hooks/useGoods';
+  import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import PayChannelApi from '@/sheep/api/pay/channel';
+  import { getPayMethods } from '@/sheep/platform/pay';
 
   const userInfo = computed(() => sheep.$store('user').userInfo);
 
   // 检测支付环境
   const state = reactive({
-    orderType: 'goods',
     payment: '',
     orderInfo: {},
     payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息， -1=支付已过期， 1=待支付，2=订单已支付
     payMethods: [],
   });
 
-  const allowedPayment = computed(() => {
-    if(state.orderType === 'recharge') {
-      return sheep.$store('app').platform.recharge_payment
-    }
-    return sheep.$store('app').platform.payment
-    });
-
-  const payMethods = [
-    {
-      icon: '/static/img/shop/pay/wechat.png',
-      title: '微信支付',
-      value: 'wechat',
-      disabled: false,
-    },
-    {
-      icon: '/static/img/shop/pay/alipay.png',
-      title: '支付宝支付',
-      value: 'alipay',
-      disabled: false,
-    },
-    {
-      icon: '/static/img/shop/pay/wallet.png',
-      title: '余额支付',
-      value: 'money',
-      disabled: false,
-    },
-    {
-      icon: '/static/img/shop/pay/apple.png',
-      title: 'Apple Pay',
-      value: 'apple',
-      disabled: false,
-    },
-    {
-      icon: '/static/img/shop/pay/cod.png',
-      title: '货到付款',
-      value: 'offline',
-      disabled: false,
-    },
-  ];
-
   const onPay = () => {
     if (state.payment === '') {
       sheep.$helper.toast('请选择支付方式');
       return;
     }
-    if (state.payment === 'money') {
+    if (state.payment === 'wallet') {
       uni.showModal({
         title: '提示',
         content: '确定要支付吗?',
@@ -149,27 +108,18 @@
           }
         },
       });
-    } else if (state.payment === 'offline') {
-      uni.showModal({
-        title: '提示',
-        content: '确定要下单吗?',
-        success: function (res) {
-          if (res.confirm) {
-            sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.order_sn);
-          }
-        },
-      });
     } else {
       sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.order_sn);
     }
   };
 
+  // 支付文案提示
   const payDescText = computed(() => {
     if (state.payStatus === 2) {
       return '该订单已支付';
     }
-    if (state.payStatus === 1 && state.orderInfo.ext.expired_time !== 0) {
-      const time = useDurationTime(state.orderInfo.ext.expired_time);
+    if (state.payStatus === 1) {
+      const time = useDurationTime(state.orderInfo.expireTime);
       if (time.ms <= 0) {
         state.payStatus = -1;
         return '';
@@ -179,59 +129,49 @@
     if (state.payStatus === -2) {
       return '未查询到支付单信息';
     }
-
     return '';
   });
 
+  // 状态转换：payOrder.status => payStatus
   function checkPayStatus() {
-    if (state.orderInfo.status === 'unpaid') {
-      state.payStatus = 1;
+    if (state.orderInfo.status === 10) {
+      state.payStatus = 2;
       return;
     }
-    if (state.orderInfo.status === 'closed') {
+    if (state.orderInfo.status === 20) {
       state.payStatus = -1;
       return;
     }
-    state.payStatus = 2;
+    state.payStatus = 1;
   }
 
+  // 切换支付方式
   function onTapPay(e) {
     state.payment = e.detail.value;
   }
 
-  async function setRechargeOrder(id) {
-    const { data, error } = await sheep.$api.trade.order(id);
-    if (error === 0) {
-      state.orderInfo = data;
-      state.payMethods = payMethods;
-      checkPayStatus();
-    } else {
+  // 设置支付订单信息
+  async function setOrder(id) {
+    // 获得支付订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code !== 0 || !data) {
       state.payStatus = -2;
+      return;
     }
+    state.orderInfo = data;
+    // 获得支付方式
+    await setPayMethods();
+    // 设置支付状态
+    checkPayStatus();
   }
 
-  async function setGoodsOrder(id) {
-    const { data, error } = await sheep.$api.order.detail(id);
-    if (error === 0) {
-      state.orderInfo = data;
-      if (state.orderInfo.ext.offline_status === 'none') {
-        payMethods.forEach((item, index, array) => {
-          if (item.value === 'offline') {
-            array.splice(index, 1);
-          }
-        });
-      } else if (state.orderInfo.ext.offline_status === 'disabled') {
-        payMethods.forEach((item) => {
-          if (item.value === 'offline') {
-            item.disabled = true;
-          }
-        });
-      }
-      state.payMethods = payMethods;
-      checkPayStatus();
-    } else {
-      state.payStatus = -2;
+  // 获得支付方式
+  async function setPayMethods() {
+    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId);
+    if (code !== 0) {
+      return;
     }
+    state.payMethods = getPayMethods(data);
   }
 
   onLoad((options) => {
@@ -243,22 +183,9 @@
       location.reload();
       return;
     }
-    let id = '';
-    if (options.orderSN) {
-      id = options.orderSN;
-    }
-    if (options.id) {
-      id = options.id;
-    }
-    if (options.type === 'recharge') {
-      state.orderType = 'recharge';
-      // 充值订单
-      setRechargeOrder(id);
-    } else {
-      state.orderType = 'goods';
-      // 商品订单
-      setGoodsOrder(id);
-    }
+    // 获得支付订单信息
+    let id = options.id;
+    setOrder(id);
   });
 </script>
 
@@ -276,7 +203,6 @@
       position: relative;
       padding: 60rpx 20rpx 40rpx;
 
-
       .money-text {
         color: $red;
         font-size: 46rpx;
diff --git a/sheep/api/pay/channel.js b/sheep/api/pay/channel.js
new file mode 100644
index 00000000..20a8c28f
--- /dev/null
+++ b/sheep/api/pay/channel.js
@@ -0,0 +1,14 @@
+import request from '@/sheep/request';
+
+const PayChannelApi = {
+  // 获得指定应用的开启的支付渠道编码列表
+  getEnableChannelCodeList: (appId) => {
+    return request({
+      url: '/app-api/pay/channel/get-enable-code-list',
+      method: 'GET',
+      params: { appId }
+    });
+  },
+};
+
+export default PayChannelApi;
diff --git a/sheep/api/pay/order.js b/sheep/api/pay/order.js
new file mode 100644
index 00000000..9dbe0710
--- /dev/null
+++ b/sheep/api/pay/order.js
@@ -0,0 +1,14 @@
+import request from '@/sheep/request';
+
+const PayOrderApi = {
+  // 获得支付订单
+  getOrder: (id) => {
+    return request({
+      url: '/app-api/pay/order/get',
+      method: 'GET',
+      params: { id }
+    });
+  },
+};
+
+export default PayOrderApi;
diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js
index 29120038..f319e538 100644
--- a/sheep/platform/pay.js
+++ b/sheep/platform/pay.js
@@ -29,8 +29,8 @@ export default class SheepPay {
         alipay: () => {
           this.redirectPay(); // 现在公众号可以直接跳转支付宝页面
         },
-        money: () => {
-          this.moneyPay();
+        wallet: () => {
+          this.walletPay();
         },
         offline: () => {
           this.offlinePay();
@@ -43,8 +43,8 @@ export default class SheepPay {
         alipay: () => {
           this.copyPayLink();
         },
-        money: () => {
-          this.moneyPay();
+        wallet: () => {
+          this.walletPay();
         },
         offline: () => {
           this.offlinePay();
@@ -57,8 +57,8 @@ export default class SheepPay {
         alipay: () => {
           this.alipay();
         },
-        money: () => {
-          this.moneyPay();
+        wallet: () => {
+          this.walletPay();
         },
         offline: () => {
           this.offlinePay();
@@ -71,8 +71,8 @@ export default class SheepPay {
         alipay: () => {
           this.redirectPay();
         },
-        money: () => {
-          this.moneyPay();
+        wallet: () => {
+          this.walletPay();
         },
         offline: () => {
           this.offlinePay();
@@ -109,7 +109,7 @@ export default class SheepPay {
     });
   }
   // #ifdef H5
-  // 微信公众号JSSDK支付
+  // 微信公众号JSSDK支付 TODO 芋艿：待接入
   async wechatOfficialAccountPay() {
     let that = this;
     let { error, data, msg } = await this.prepay();
@@ -130,7 +130,7 @@ export default class SheepPay {
     });
   }
 
-  //浏览器微信H5支付
+  //浏览器微信H5支付 TODO 芋艿：待接入
   async wechatWapPay() {
     const { error, data } = await this.prepay();
     if (error === 0) {
@@ -140,7 +140,7 @@ export default class SheepPay {
     }
   }
 
-  // 支付链接
+  // 支付链接  TODO 芋艿：待接入
   async redirectPay() {
     let { error, data } = await this.prepay();
     if (error === 0) {
@@ -152,7 +152,7 @@ export default class SheepPay {
 
   // #endif
 
-  // 微信小程序支付
+  // 微信小程序支付  TODO 芋艿：待接入
   async wechatMiniProgramPay() {
     let that = this;
     let result = await this.prepay();
@@ -172,19 +172,19 @@ export default class SheepPay {
     });
   }
 
-  // 余额支付
-  async moneyPay() {
+  // 余额支付  TODO 芋艿：待接入
+  async walletPay() {
     const { error } = await this.prepay();
     error === 0 && this.payResult('success');
   }
 
-  // 货到付款
+  // 货到付款  TODO 芋艿：待接入
   async offlinePay() {
     const { error } = await this.prepay();
     error === 0 && this.payResult('success');
   }
 
-  // 支付宝复制链接支付
+  // 支付宝复制链接支付  TODO 芋艿：待接入
   async copyPayLink() {
     let that = this;
     let { error, data } = await this.prepay();
@@ -203,7 +203,7 @@ export default class SheepPay {
     }
   }
 
-  // 支付宝支付
+  // 支付宝支付  TODO 芋艿：待接入
   async alipay() {
     let that = this;
     const { error, data } = await this.prepay();
@@ -225,7 +225,7 @@ export default class SheepPay {
     }
   }
 
-  // 微信支付
+  // 微信支付  TODO 芋艿：待接入
   async wechatAppPay() {
     let that = this;
     let { error, data } = await this.prepay();
@@ -253,3 +253,66 @@ export default class SheepPay {
     });
   }
 }
+
+export function getPayMethods(channels) {
+  const payMethods = [
+    {
+      icon: '/static/img/shop/pay/wechat.png',
+      title: '微信支付',
+      value: 'wechat',
+      disabled: true,
+    },
+    {
+      icon: '/static/img/shop/pay/alipay.png',
+      title: '支付宝支付',
+      value: 'alipay',
+      disabled: true,
+    },
+    {
+      icon: '/static/img/shop/pay/wallet.png',
+      title: '余额支付',
+      value: 'wallet',
+      disabled: true,
+    },
+    {
+      icon: '/static/img/shop/pay/apple.png',
+      title: 'Apple Pay',
+      value: 'apple',
+      disabled: true,
+    },
+    {
+      icon: '/static/img/shop/pay/wallet.png',
+      title: '模拟支付',
+      value: 'mock',
+      disabled: true,
+    }
+  ];
+  const platform = sheep.$platform.name
+
+  // 1. 处理【微信支付】
+  const wechatMethod = payMethods[0];
+  if ((platform === 'WechatOfficialAccount' && channels.includes('wx_pub'))
+    || platform === 'WechatMiniProgram' && channels.includes('wx_lite')
+    || platform === 'App' && channels.includes('wx_app')) {
+    wechatMethod.disabled = false;
+  }
+  // 2. 处理【支付宝支付】
+  const alipayMethod = payMethods[1];
+  if ((platform === 'WechatOfficialAccount' && channels.includes('alipay_wap'))
+    || platform === 'WechatMiniProgram' && channels.includes('alipay_wap')
+    || platform === 'App' && channels.includes('alipay_app')) {
+    alipayMethod.disabled = false;
+  }
+  // 3. 处理【余额支付】
+  const walletMethod = payMethods[2];
+  if (channels.includes('wallet')) {
+    walletMethod.disabled = false;
+  }
+  // 4. 处理【苹果支付】TODO 芋艿：未来接入
+  // 5. 处理【模拟支付】
+  const mockMethod = payMethods[4];
+  if (channels.includes('mock')) {
+    mockMethod.disabled = false;
+  }
+  return payMethods;
+}
\ No newline at end of file
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 28598e3d..f2486bac 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -23,8 +23,8 @@ const app = defineStore({
       copytime: '', // 版权信息 II
     },
     platform: {
-      payment: [], // 支持的支付方式
-      recharge_payment: [], // 支持的充值支付方式
+      payment: [], // 支持的支付方式 TODO 芋艿：可删除
+      recharge_payment: [], // 支持的充值支付方式 TODO 芋艿：可删除
       share: {
         methods: [], // 支持的分享方式
         forwardInfo: {}, // 默认转发信息

From 4245164cae1bf4f2509b990c9bef720e9620846c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 12 Dec 2023 22:23:33 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E2=9C=A8=20=E6=94=B6=E9=93=B6=E5=8F=B0?=
 =?UTF-8?q?=EF=BC=9A=E6=8E=A5=E5=85=A5=E6=94=B6=E9=93=B6=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pay/index.vue      |  36 ++++++------
 pages/pay/result.vue     | 120 ++++++++++++++++++++-------------------
 sheep/api/pay/order.js   |   8 +++
 sheep/api/trade/order.js |  34 +++++++----
 sheep/platform/pay.js    |  37 ++++++------
 5 files changed, 132 insertions(+), 103 deletions(-)

diff --git a/pages/pay/index.vue b/pages/pay/index.vue
index 804c2cd1..7ea40be6 100644
--- a/pages/pay/index.vue
+++ b/pages/pay/index.vue
@@ -87,10 +87,11 @@
 
   // 检测支付环境
   const state = reactive({
-    payment: '',
-    orderInfo: {},
+    orderType: 'goods', // 订单类型; goods - 商品订单, recharge - 充值订单
+    orderInfo: {}, // 支付单信息
     payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息， -1=支付已过期， 1=待支付，2=订单已支付
-    payMethods: [],
+    payMethods: [], // 可选的支付方式
+    payment: '', // 选中的支付方式
   });
 
   const onPay = () => {
@@ -104,12 +105,12 @@
         content: '确定要支付吗?',
         success: function (res) {
           if (res.confirm) {
-            sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.order_sn);
+            sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id);
           }
         },
       });
     } else {
-      sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.order_sn);
+      sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id);
     }
   };
 
@@ -134,15 +135,16 @@
 
   // 状态转换：payOrder.status => payStatus
   function checkPayStatus() {
-    if (state.orderInfo.status === 10) {
+    if (state.orderInfo.status === 10
+      || state.orderInfo.status === 20 ) { // 支付成功
       state.payStatus = 2;
       return;
     }
-    if (state.orderInfo.status === 20) {
+    if (state.orderInfo.status === 30) { // 支付关闭
       state.payStatus = -1;
       return;
     }
-    state.payStatus = 1;
+    state.payStatus = 1; // 待支付
   }
 
   // 切换支付方式
@@ -167,24 +169,25 @@
 
   // 获得支付方式
   async function setPayMethods() {
-    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId);
+    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId)
     if (code !== 0) {
-      return;
+      return
     }
-    state.payMethods = getPayMethods(data);
+    state.payMethods = getPayMethods(data)
   }
 
   onLoad((options) => {
-    if (
-      sheep.$platform.name === 'WechatOfficialAccount' &&
-      sheep.$platform.os === 'ios' &&
-      !sheep.$platform.landingPage.includes('pages/pay/index')
-    ) {
+    if (sheep.$platform.name === 'WechatOfficialAccount'
+      && sheep.$platform.os === 'ios'
+      && !sheep.$platform.landingPage.includes('pages/pay/index')) {
       location.reload();
       return;
     }
     // 获得支付订单信息
     let id = options.id;
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
     setOrder(id);
   });
 </script>
@@ -203,6 +206,7 @@
       position: relative;
       padding: 60rpx 20rpx 40rpx;
 
+
       .money-text {
         color: $red;
         font-size: 46rpx;
diff --git a/pages/pay/result.vue b/pages/pay/result.vue
index 5b18ba8e..82943712 100644
--- a/pages/pay/result.vue
+++ b/pages/pay/result.vue
@@ -2,34 +2,27 @@
 <template>
   <s-layout title="支付结果" :bgStyle="{ color: '#FFF' }">
     <view class="pay-result-box ss-flex-col ss-row-center ss-col-center">
-      <view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'"> </view>
+      <!-- 信息展示 -->
+      <view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'" />
       <image
         class="pay-img ss-m-b-30"
         v-if="payResult === 'success'"
         :src="sheep.$url.static('/static/img/shop/order/order_pay_success.gif')"
-      ></image>
+      />
       <image
         class="pay-img ss-m-b-30"
         v-if="['failed', 'closed'].includes(payResult)"
         :src="sheep.$url.static('/static/img/shop/order/order_paty_fail.gif')"
-      ></image>
-      <view class="tip-text ss-m-b-30" v-if="payResult == 'success'">{{
-        state.orderInfo.pay_mode === 'offline' ? '下单成功' : '支付成功'
-      }}</view>
-      <view class="tip-text ss-m-b-30" v-if="payResult == 'failed'">支付失败</view>
-      <view class="tip-text ss-m-b-30" v-if="payResult == 'closed'">该订单已关闭</view>
-      <view class="tip-text ss-m-b-30" v-if="payResult == 'waiting'">检测支付结果...</view>
+      />
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'success'">支付成功</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'failed'">支付失败</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'closed'">该订单已关闭</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'waiting'">检测支付结果...</view>
       <view class="pay-total-num ss-flex" v-if="payResult === 'success'">
-        <view v-if="Number(state.orderInfo.pay_fee) > 0">￥{{ state.orderInfo.pay_fee }}</view>
-        <view v-if="state.orderInfo.score_amount && Number(state.orderInfo.pay_fee) > 0">+</view>
-        <view class="price-text ss-flex ss-col-center" v-if="state.orderInfo.score_amount">
-          <image
-            :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-            class="score-img"
-          ></image>
-          <view>{{ state.orderInfo.score_amount }}</view>
-        </view>
+        <view>￥{{ fen2yuan(state.orderInfo.price) }}</view>
       </view>
+
+      <!-- 操作区 -->
       <view class="btn-box ss-flex ss-row-center ss-m-t-50">
         <button class="back-btn ss-reset-button" @tap="sheep.$router.go('/pages/index/index')">
           返回首页
@@ -37,30 +30,29 @@
         <button
           class="check-btn ss-reset-button"
           v-if="payResult === 'failed'"
-          @tap="sheep.$router.redirect('/pages/pay/index', { orderSN: state.orderId })"
+          @tap="
+            sheep.$router.redirect('/pages/pay/index', { id: state.id, orderType: state.orderType })
+          "
         >
           重新支付
         </button>
         <button class="check-btn ss-reset-button" v-if="payResult === 'success'" @tap="onOrder">
           查看订单
         </button>
+        <!-- TODO 芋艿：拼团接入 -->
         <button
           class="check-btn ss-reset-button"
-          v-if="
-            payResult === 'success' &&
-            ['groupon', 'groupon_ladder'].includes(state.orderInfo.activity_type)
-          "
+          v-if="payResult === 'success' && state.tradeOrder.type === 3"
           @tap="sheep.$router.redirect('/pages/activity/groupon/order')"
         >
           我的拼团
         </button>
       </view>
+
+      <!-- TODO 芋艿：订阅 -->
       <!-- #ifdef MP -->
       <view class="subscribe-box ss-flex ss-m-t-44">
-        <image
-          class="subscribe-img"
-          :src="sheep.$url.static('/static/img/shop/order/cargo.png')"
-        ></image>
+        <image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
         <view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
         <view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
       </view>
@@ -74,15 +66,20 @@
   import { reactive, computed } from 'vue';
   import { isEmpty } from 'lodash';
   import sheep from '@/sheep';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import { fen2yuan } from '../../sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
 
   const state = reactive({
-    orderId: 0,
-    orderType: 'goods',
+    id: 0, // 支付单号
+    orderType: 'goods', // 订单类型
     result: 'unpaid', // 支付状态
-    orderInfo: {}, // 订单详情
+    orderInfo: {}, // 支付订单信息
+    tradeOrder: {}, // 商品订单信息，只有在 orderType 为 goods 才会请求。目的：【我的拼团】按钮的展示
     counter: 0, // 获取结果次数
   });
 
+  // 支付结果 result => payResult
   const payResult = computed(() => {
     if (state.result === 'unpaid') {
       return 'waiting';
@@ -93,57 +90,65 @@
     if (state.result === 'failed') {
       return 'failed';
     }
-
     if (state.result === 'closed') {
       return 'closed';
     }
   });
-  async function getOrderInfo(orderId) {
-    let checkPayResult;
+
+  // 获得订单信息
+  async function getOrderInfo(id) {
     state.counter++;
-    if (state.orderType === 'recharge') {
-      checkPayResult = sheep.$api.trade.order;
-    } else {
-      checkPayResult = sheep.$api.order.detail;
-    }
-    const { data, error } = await checkPayResult(orderId);
-    if (error === 0) {
+    // 1. 加载订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code === 0) {
       state.orderInfo = data;
-      if (state.orderInfo.status === 'closed') {
+      if (!state.orderInfo || state.orderInfo.status === 30) {
+        // 支付关闭
         state.result = 'closed';
         return;
       }
-      if (state.orderInfo.status !== 'unpaid') {
+      if (state.orderInfo.status !== 0) {
+        // 非待支付，可能是已支付，可能是已退款
         state.result = 'paid';
         // #ifdef MP
         subscribeMessage();
         // #endif
+        // 特殊：获得商品订单信息
+        if (state.orderType === 'goods') {
+          const { data, code } = await OrderApi.getOrder(state.orderInfo.merchantOrderId);
+          if (code === 0) {
+            state.tradeOrder = data;
+          }
+        }
         return;
       }
     }
+    // 2.1 情况三一：未支付，且轮询次数小于三次，则继续轮询
     if (state.counter < 3 && state.result === 'unpaid') {
       setTimeout(() => {
-        getOrderInfo(orderId);
+        getOrderInfo(id);
       }, 1500);
     }
-    // 超过三次检测才判断为支付失败
+    // 2.2 情况二：超过三次检测才判断为支付失败
     if (state.counter >= 3) {
       state.result = 'failed';
     }
   }
 
   function onOrder() {
-    if ((state.orderType === 'recharge')) {
+    // TODO 芋艿：待测试
+    if (state.orderType === 'recharge') {
       sheep.$router.redirect('/pages/pay/recharge-log');
     } else {
       sheep.$router.redirect('/pages/order/list');
     }
   }
 
+  // TODO 芋艿：待测试
   // #ifdef MP
   function subscribeMessage() {
     let event = ['order_dispatched'];
-    if (['groupon', 'groupon_ladder'].includes(state.orderInfo.activity_type)) {
+    if (state.tradeOrder.type === 3) {
       event.push('groupon_finish');
       event.push('groupon_fail');
     }
@@ -152,18 +157,13 @@
   // #endif
 
   onLoad(async (options) => {
-    let id = '';
     // 支付订单号
-    if (options.orderSN) {
-      id = options.orderSN;
-    }
     if (options.id) {
-      id = options.id;
+      state.id = options.id;
     }
-    state.orderId = id;
-
-    if (options.orderType === 'recharge') {
-      state.orderType = 'recharge';
+    // 订单类型
+    if (options.orderType) {
+      state.orderType = options.orderType;
     }
 
     // 支付结果传值过来是失败，则直接显示失败界面
@@ -171,14 +171,16 @@
       state.result = 'failed';
     } else {
       // 轮询三次检测订单支付结果
-      getOrderInfo(state.orderId);
+      await getOrderInfo(state.id);
     }
   });
 
   onShow(() => {
-    if(isEmpty(state.orderInfo)) return;
-    getOrderInfo(state.orderId);
-  })
+    if (isEmpty(state.orderInfo)) {
+      return;
+    }
+    getOrderInfo(state.id);
+  });
 
   onHide(() => {
     state.result = 'unpaid';
diff --git a/sheep/api/pay/order.js b/sheep/api/pay/order.js
index 9dbe0710..f1935293 100644
--- a/sheep/api/pay/order.js
+++ b/sheep/api/pay/order.js
@@ -9,6 +9,14 @@ const PayOrderApi = {
       params: { id }
     });
   },
+  // 提交支付订单
+  submitOrder: (data) => {
+    return request({
+      url: '/app-api/pay/order/submit',
+      method: 'POST',
+      data
+    });
+  }
 };
 
 export default PayOrderApi;
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
index 10444657..4df9c89d 100644
--- a/sheep/api/trade/order.js
+++ b/sheep/api/trade/order.js
@@ -5,16 +5,16 @@ const OrderApi = {
   settlementOrder: (data) => {
     const data2 = {
       ...data,
-    }
+    };
     // 移除多余字段
     if (!(data.couponId > 0)) {
-      delete data2.couponId
+      delete data2.couponId;
     }
     if (!(data.addressId > 0)) {
-      delete data2.addressId
+      delete data2.addressId;
     }
     // 解决 SpringMVC 接受 List<Item> 参数的问题
-    delete data2.items
+    delete data2.items;
     for (let i = 0; i < data.items.length; i++) {
       data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
       data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
@@ -22,20 +22,32 @@ const OrderApi = {
         data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
       }
     }
-    const queryString= Object.keys(data2).map(key => key + '=' + data2[key]).join('&')
+    const queryString = Object.keys(data2)
+      .map((key) => key + '=' + data2[key])
+      .join('&');
     return request2({
       url: `trade/order/settlement?${queryString}`,
-      method: 'GET'
-    })
+      method: 'GET',
+    });
   },
   // 创建订单
   createOrder: (data) => {
     return request2({
       url: `trade/order/create`,
       method: 'POST',
-      data
-    })
-  }
+      data,
+    });
+  },
+  // 获得订单
+  getOrder: (id) => {
+    return request2({
+      url: `trade/order/get-detail`,
+      method: 'GET',
+      params: {
+        id,
+      },
+    });
+  },
 };
 
-export default OrderApi;
\ No newline at end of file
+export default OrderApi;
diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js
index f319e538..a23dcc61 100644
--- a/sheep/platform/pay.js
+++ b/sheep/platform/pay.js
@@ -3,19 +3,20 @@ import sheep from '@/sheep';
 import $wxsdk from '@/sheep/libs/sdk-h5-weixin';
 // #endif
 import { getRootUrl } from '@/sheep/helper';
+import PayOrderApi from '@/sheep/api/pay/order';
 
 /**
  * 支付
  *
  * @param {String} payment = ['wechat','alipay','wallet','offline']  	- 支付方式
  * @param {String} orderType = ['goods','recharge','groupon']  	- 订单类型
- * @param {String} orderSN					- 订单号
+ * @param {String} id					- 订单号
  */
 
 export default class SheepPay {
-  constructor(payment, orderType, orderSN) {
+  constructor(payment, orderType, id) {
     this.payment = payment;
-    this.orderSN = orderSN;
+    this.id = id;
     this.orderType = orderType;
     this.payAction();
   }
@@ -83,18 +84,21 @@ export default class SheepPay {
   }
 
   // 预支付
-  prepay() {
+  prepay(channel) {
     return new Promise((resolve, reject) => {
       let data = {
-        order_sn: this.orderSN,
-        payment: this.payment,
+        id: this.id,
+        channelCode: channel,
+        channelExtras: {}
       };
       if (uni.getStorageSync('openid')) {
         data.openid = uni.getStorageSync('openid');
       }
-      sheep.$api.pay.prepay(data).then((res) => {
-        res.error === 0 && resolve(res);
-        if (res.error === -1 && res.msg === 'miss_openid') {
+      PayOrderApi.submitOrder(data).then((res) => {
+        // 成功时
+        res.code === 0 && resolve(res);
+        // 失败时
+        if (res.code !== 0 && res.msg === 'miss_openid') {
           uni.showModal({
             title: '微信支付',
             content: '请先绑定微信再使用微信支付',
@@ -134,7 +138,7 @@ export default class SheepPay {
   async wechatWapPay() {
     const { error, data } = await this.prepay();
     if (error === 0) {
-      const redirect_url = `${getRootUrl()}pages/pay/result?orderSN=${this.orderSN}&payment=${this.payment
+      const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment
         }&orderType=${this.orderType}`;
       location.href = `${data.pay_data.h5_url}&redirect_url=${encodeURIComponent(redirect_url)}`;
     }
@@ -144,7 +148,7 @@ export default class SheepPay {
   async redirectPay() {
     let { error, data } = await this.prepay();
     if (error === 0) {
-      const redirect_url = `${getRootUrl()}pages/pay/result?orderSN=${this.orderSN}&payment=${this.payment
+      const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment
         }&orderType=${this.orderType}`;
       location.href = data.pay_data + encodeURIComponent(redirect_url);
     }
@@ -172,10 +176,10 @@ export default class SheepPay {
     });
   }
 
-  // 余额支付  TODO 芋艿：待接入
+  // 余额支付
   async walletPay() {
-    const { error } = await this.prepay();
-    error === 0 && this.payResult('success');
+    const { code } = await this.prepay('wallet');
+    code === 0 && this.payResult('success');
   }
 
   // 货到付款  TODO 芋艿：待接入
@@ -246,10 +250,9 @@ export default class SheepPay {
   // 支付结果跳转,success:成功，fail:失败
   payResult(resultType) {
     sheep.$router.redirect('/pages/pay/result', {
-      orderSN: this.orderSN,
-      payment: this.payment, //重新支付的时候使用
-      payState: resultType,
+      id: this.id,
       orderType: this.orderType,
+      payState: resultType
     });
   }
 }

From 25a82c18129bb3b3ae82bb58cb1694d63af287ce Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 12 Dec 2023 23:26:02 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E2=9C=A8=20=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=9A=E6=8E=A5=E5=85=A5=2080%=EF=BC=8C=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=93=8D=E4=BD=9C=E5=BE=85=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/list.vue    | 240 +++++++++++-----------------------------
 sheep/hooks/useGoods.js |  87 ++++++++++++---
 2 files changed, 133 insertions(+), 194 deletions(-)

diff --git a/pages/order/list.vue b/pages/order/list.vue
index 5cc39aae..c3a89dec 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -1,153 +1,72 @@
-<!-- 页面 -->
+<!-- 订单列表 -->
 <template>
 	<s-layout title="我的订单">
 		<su-sticky bgColor="#fff">
-			<su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab"></su-tabs>
+			<su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab" />
 		</su-sticky>
-		<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单"></s-empty>
+		<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
 		<view v-if="state.pagination.total > 0">
 			<view class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20" v-for="order in state.pagination.data"
-				:key="order.id" @tap="onOrderDetail(order.id)">
+            :key="order.id" @tap="onOrderDetail(order.id)">
 				<view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
 					<view class="order-no">订单号：{{ order.no }}</view>
-					<view class="order-state ss-font-26" :class="formatOrderColor(order.status_code)">{{
-            order.status
-          }}</view>
+					<view class="order-state ss-font-26" :class="formatOrderColor(order)">
+            {{ formatOrderStatus(order) }}
+          </view>
 				</view>
 				<view class="border-bottom" v-for="item in order.items" :key="item.id">
-					<s-goods-item :img="item.picUrl" :title="item.spuName"
-						:skuText="item.properties.length>1? item.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.properties[0].valueName"
-						:price="item.price/100" :score="order.score_amount" :num="item.count">
-						<template #tool>
-							<view class="ss-flex">
-								<!-- <button class="ss-reset-button apply-btn" v-if="item.btns.includes('aftersale')"
-									@tap.stop="
-                    sheep.$router.go('/pages/order/aftersale/apply', {
-                      item: JSON.stringify(item),
-                    })
-                  ">
-									申请售后
-								</button>
-								<button class="ss-reset-button apply-btn" v-if="item.btns.includes('re_aftersale')"
-									@tap.stop="
-                    sheep.$router.go('/pages/order/aftersale/apply', {
-                      item: JSON.stringify(item),
-                    })
-                  ">
-									重新售后
-								</button>
-
-								<button class="ss-reset-button apply-btn" v-if="item.btns.includes('aftersale_info')"
-									@tap.stop="
-                    sheep.$router.go('/pages/order/aftersale/detail', {
-                      id: item.ext.aftersale_id,
-                    })
-                  ">
-									售后详情
-								</button>
-								<button class="ss-reset-button apply-btn" v-if="item.btns.includes('buy_again')"
-									@tap.stop="
-                    sheep.$router.go('/pages/goods/index', {
-                      id: item.goods_id,
-                    })
-                  ">
-									再次购买
-								</button> -->
-							</view>
-						</template>
-					</s-goods-item>
+					<s-goods-item
+            :img="item.picUrl"
+            :title="item.spuName"
+						:skuText="item.properties.map((property) => property.valueName).join(' ')"
+						:price="item.price"
+            :num="item.count"
+          />
 				</view>
 				<view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
-					<!-- <view v-if="order.total_discount_fee > 0" class="ss-flex ss-col-center ss-m-r-8">
-						<view class="discounts-title">优惠:￥</view>
-						<view class="discounts-money">{{ order.total_discount_fee }}</view>
-					</view> -->
-					<!-- 	<view class="ss-flex ss-col-center ss-m-r-8">
-						<view class="discounts-title">运费:￥</view>
-						<view class="discounts-money">{{ order.dispatch_amount }}</view>
-					</view> -->
 					<view class="ss-flex ss-col-center">
-						<view class="discounts-title pay-color">共{{count}}件商品,总金额:</view>
-						<view class="discounts-money pay-color" v-if="Number(order.payPrice) > 0">
-							￥{{ order.payPrice/100 }}</view>
-						<view v-if="order.score_amount && Number(order.payPrice) > 0">+</view>
-						<view class="discounts-money pay-color ss-flex ss-col-center" v-if="order.score_amount">
-							<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img">
-							</image>
-							<view>{{ order.score_amount }}</view>
-						</view>
+						<view class="discounts-title pay-color">共 {{ order.productCount }} 件商品,总金额:</view>
+						<view class="discounts-money pay-color">
+							￥{{ fen2yuan(order.payPrice) }}
+            </view>
 					</view>
 				</view>
-				<!-- :class="order.btns.length > 3 ? 'ss-row-between' : 'ss-row-right'" -->
-				<view class="order-card-footer ss-flex ss-col-center ss-p-x-20">
-					<!-- <su-popover>
-            <button class="more-btn ss-reset-button" @click.stop>更多</button>
-            <template #content>
-              <view class="more-item-box">
-                <view class="more-item ss-flex ss-col-center ss-reset-button">
-                  <view class="item-title">删除订单</view>
-                </view>
-                <view class="more-item ss-flex ss-col-center ss-reset-button">
-                  <view class="item-title">查看发票</view>
-                </view>
-                <view class="more-item ss-flex ss-col-center ss-reset-button">
-                  <view class="item-title">评价晒单</view>
-                </view>
-              </view>
-            </template>
-          </su-popover> -->
+				<view class="order-card-footer ss-flex ss-col-center ss-p-x-20"
+              :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'">
 					<view class="ss-flex ss-col-center">
-						<!-- 				<button v-if="order.btns.includes('groupon')" class="tool-btn ss-reset-button"
+            <!-- TODO 芋艿：再次购买 -->
+						<button v-if="order.buttons.includes('combination')" class="tool-btn ss-reset-button"
 							@tap.stop="onOrderGroupon(order)">
-							{{ order.status_code === 'groupon_ing' ? '邀请拼团' : '拼团详情' }}
+              拼团详情
 						</button>
-						<button v-if="order.btns.includes('invoice')" class="tool-btn ss-reset-button"
-							@tap.stop="onOrderInvoice(order.invoice?.id)">
-							查看发票
+						<button v-if="order.buttons.length === 0" class="tool-btn ss-reset-button"
+                    @tap.stop="onOrderDetail(order.id)">
+              查看详情
 						</button>
-						<button v-if="order.btns.length === 0" class="tool-btn ss-reset-button"
-							@tap.stop="onOrderDetail(order.order_sn)">
-							查看详情
+						<button v-if="order.buttons.includes('confirm')" class="tool-btn ss-reset-button"
+                    @tap.stop="onConfirm(order)">
+              确认收货
 						</button>
-
-						<button v-if="order.btns.includes('confirm')" class="tool-btn ss-reset-button"
-							@tap.stop="onConfirm(order)">
-							确认收货
-						</button>
-
-						<button v-if="order.btns.includes('express')" class="tool-btn ss-reset-button"
-							@tap.stop="onExpress(order.id)">
+						<button v-if="order.buttons.includes('express')" class="tool-btn ss-reset-button"
+                    @tap.stop="onExpress(order.id)">
 							查看物流
 						</button>
-
-						<button v-if="order.btns.includes('apply_refund')" class="tool-btn ss-reset-button"
-							@tap.stop="onRefund(order.id)">
-							申请退款
-						</button>
-						<button v-if="order.btns.includes('re_apply_refund')" class="tool-btn ss-reset-button"
-							@tap.stop="onRefund(order.id)">
-							重新退款
-						</button>
-
-						<button v-if="order.btns.includes('cancel')" class="tool-btn ss-reset-button"
-							@tap.stop="onCancel(order.id)">
+						<button v-if="order.buttons.includes('cancel')" class="tool-btn ss-reset-button"
+                    @tap.stop="onCancel(order.id)">
 							取消订单
 						</button>
-
-						<button v-if="order.btns.includes('comment')" class="tool-btn ss-reset-button"
-							@tap.stop="onComment(order.order_sn)">
-							评价晒单
+						<button v-if="order.buttons.includes('comment')" class="tool-btn ss-reset-button"
+                    @tap.stop="onComment(order.order_sn)">
+							评价
 						</button>
-
-						<button v-if="order.btns.includes('delete')" class="delete-btn ss-reset-button"
-							@tap.stop="onDelete(order.id)">
+						<button v-if="order.buttons.includes('delete')" class="delete-btn ss-reset-button"
+                    @tap.stop="onDelete(order.id)">
 							删除订单
 						</button>
-
-						<button v-if="order.btns.includes('pay')" class="tool-btn ss-reset-button ui-BG-Main-Gradient"
-							@tap.stop="onPay(order.order_sn)">
+						<button v-if="order.buttons.includes('pay')" class="tool-btn ss-reset-button ui-BG-Main-Gradient"
+                    @tap.stop="onPay(order.order_sn)">
 							继续支付
-						</button> -->
+						</button>
 					</view>
 				</view>
 			</view>
@@ -170,9 +89,10 @@
 		onReachBottom,
 		onPullDownRefresh
 	} from '@dcloudio/uni-app';
-	import {
-		formatOrderColor
-	} from '@/sheep/hooks/useGoods';
+  import {
+    fen2yuan,
+    formatOrderColor, formatOrderStatus, handleOrderButtons,
+  } from '@/sheep/hooks/useGoods';
 	import sheep from '@/sheep';
 	import _ from 'lodash';
 	import {
@@ -182,17 +102,16 @@
 	const pagination = {
 		data: [],
 		current_page: 1,
-		total: 1,
-		last_page: 1,
+		total: 1
 	};
+
 	// 数据
 	const state = reactive({
-		currentTab: 0,
+		currentTab: 0, // 选中的 tabMaps 下标
 		pagination: {
 			data: [],
 			current_page: 1,
-			total: 1,
-			last_page: 1,
+			total: 1
 		},
 		loadStatus: '',
 		deleteOrderId: 0,
@@ -200,8 +119,7 @@
 	});
 
 	const tabMaps = [{
-			name: '全部',
-			// value: 'all',
+			name: '全部'
 		},
 		{
 			name: '待付款',
@@ -232,44 +150,37 @@
 	}
 
 	// 订单详情
-	function onOrderDetail(orderSN) {
+	function onOrderDetail(id) {
 		sheep.$router.go('/pages/order/detail', {
-			orderSN,
+			id,
 		});
 	}
 
-	// 分享拼团
+	// 分享拼团 TODO 芋艿：待测试
 	function onOrderGroupon(order) {
 		sheep.$router.go('/pages/activity/groupon/detail', {
 			id: order.ext.groupon_id,
 		});
 	}
 
-	// 查看发票
-	function onOrderInvoice(invoiceId) {
-		sheep.$router.go('/pages/order/invoice', {
-			invoiceId,
-		});
-	}
-
-	// 继续支付
+	// 继续支付 TODO 芋艿：待测试
 	function onPay(orderSN) {
 		sheep.$router.go('/pages/pay/index', {
 			orderSN,
 		});
 	}
 
-	// 评价
+	// 评价 TODO 芋艿：待测试
 	function onComment(orderSN) {
 		sheep.$router.go('/pages/goods/comment/add', {
 			orderSN,
 		});
 	}
 
-	// 确认收货
+	// 确认收货 TODO 芋艿：待测试
 	async function onConfirm(order, ignore = false) {
 		// 需开启确认收货组件
-		// todo:
+		// todo: 芋艿：需要后续接入微信收货组件
 		// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
 		// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
 		let isOpenBusinessView = true;
@@ -284,13 +195,12 @@
 		}
 
 		// 正常的确认收货流程
-
 		const {
 			error
 		} = await sheep.$api.order.confirm(order.id);
 		if (error === 0) {
 			state.pagination = pagination;
-			getOrderList();
+			await getOrderList();
 		}
 	}
 
@@ -326,14 +236,14 @@
 	}
 	// #endif
 
-	// 查看物流
+	// 查看物流 TODO 芋艿：待测试
 	async function onExpress(orderId) {
 		sheep.$router.go('/pages/order/express/list', {
 			orderId,
 		});
 	}
 
-	// 取消订单
+	// 取消订单 TODO 芋艿：待测试
 	async function onCancel(orderId) {
 		uni.showModal({
 			title: '提示',
@@ -353,7 +263,7 @@
 		});
 	}
 
-	// 删除订单
+	// 删除订单 TODO 芋艿：待测试
 	function onDelete(orderId) {
 		uni.showModal({
 			title: '提示',
@@ -373,30 +283,7 @@
 		});
 	}
 
-	// 申请退款
-	async function onRefund(orderId) {
-		uni.showModal({
-			title: '提示',
-			content: '确定要申请退款吗?',
-			success: async function(res) {
-				if (res.confirm) {
-					// #ifdef MP
-					sheep.$platform.useProvider('wechat').subscribeMessage('order_refund');
-					// #endif
-					const {
-						error,
-						data
-					} = await sheep.$api.order.applyRefund(orderId);
-					if (error === 0) {
-						let index = state.pagination.data.findIndex((order) => order.id === orderId);
-						state.pagination.data[index] = data;
-					}
-				}
-			},
-		});
-	}
-
-	// 获取订单列表
+	// 获取订单列表 TODO 芋艿：待测试
 	async function getOrderList(page = 1, list_rows = 5) {
 		state.loadStatus = 'loading';
 		let res = await sheep.$api.order.list({
@@ -407,6 +294,7 @@
 		});
 		state.error = res.code;
 		if (res.code === 0) {
+      res.data.list.forEach(order => handleOrderButtons(order));
 			let orderList = _.concat(state.pagination.data, res.data.list);
 			state.pagination = {
 				...res.data,
@@ -440,7 +328,7 @@
 		loadmore();
 	});
 
-	//下拉刷新
+	// 下拉刷新
 	onPullDownRefresh(() => {
 		state.pagination = pagination;
 		getOrderList();
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index 1be3a60d..87cf8fde 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -82,26 +82,77 @@ export function formatGoodsSwiper(urlList) {
 
 /**
  * 格式化订单状态的颜色
- * @param type 订单类型
+ *
+ * @param order 订单
  * @return {string} 颜色的 class 名称
  */
-export function formatOrderColor(type) {
-  switch (type) {
-    case 'apply_refund':
-    case 'groupon_ing':
-    case 'nocomment':
-    case 'noget':
-    case 'nosend':
-      return 'warning-color';
-    case 'closed':
-    case 'groupon_invalid':
-    case 'cancel':
-    case 'refund_agree':
-      return 'danger-color';
-    case 'completed':
-      return 'success-color';
-    case 'unpaid':
-      return 'info-color';
+export function formatOrderColor(order) {
+  if (order.status === 0) {
+    return 'info-color';
+  }
+  if (order.status === 10
+    || order.status === 20
+    || (order.status === 30 && !order.commentStatus)) {
+    return 'warning-color';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return 'success-color';
+  }
+  return 'danger-color';
+}
+
+/**
+ * 格式化订单状态
+ *
+ * @param order 订单
+ */
+export function formatOrderStatus(order) {
+  if (order.status === 0) {
+    return '待付款';
+  }
+  if (order.status === 10 && order.deliveryType === 1) {
+    return '待发货';
+  }
+  if (order.status === 10 && order.deliveryType === 2) {
+    return '待核销';
+  }
+  if (order.status === 20) {
+    return '待收货';
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    return '待评价';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return '已完成';
+  }
+  return '已关闭';
+}
+
+/**
+ * 处理订单的 button 操作按钮数组
+ *
+ * @param order 订单
+ */
+export function handleOrderButtons(order) {
+  order.buttons = []
+  if (order.type === 3) { // 查看拼团
+    order.buttons.push('combination');
+  }
+  if (order.status === 20) { // 确认收货
+    order.buttons.push('confirm');
+  }
+  if (order.logisticsId > 0) { // 查看物流
+    order.buttons.push('express');
+  }
+  if (order.status === 0) { // 取消订单 / 发起支付
+    order.buttons.push('cancel');
+    order.buttons.push('pay');
+  }
+  if (order.status === 30 && !order.commentStatus) { // 发起评价
+    order.buttons.push('comment');
+  }
+  if (order.status === 40) { // 删除订单
+    order.buttons.push('delete');
   }
 }