From 39ccc983e0d503ac79d20bac86f30353d8b76720 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 13 Jan 2024 20:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E7=A7=92=E6=9D=80=EF=BC=9A?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/seckill.vue      |  2 +-
 pages/order/confirm.vue      |  6 ++++--
 pages/user/goods-log.vue     | 12 +++++++-----
 sheep/api/product/history.js |  7 -------
 sheep/api/trade/order.js     |  3 +++
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 060609f5..027449a3 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -199,7 +199,7 @@
     });
   }
 
-  // 分享信息
+  // 分享信息 TODO 芋艿：待接入
   const shareInfo = computed(() => {
     if (isEmpty(activity)) return {};
     return sheep.$platform.share.getShareInfo(
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 6c04c041..7a945abf 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -209,7 +209,8 @@
       deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
       combinationActivityId: state.orderPayload.combinationActivityId,
-      combinationHeadId: state.orderPayload.combinationHeadId
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId
     });
     if (code !== 0) {
       return;
@@ -234,7 +235,8 @@
       deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
       combinationActivityId: state.orderPayload.combinationActivityId,
-      combinationHeadId: state.orderPayload.combinationHeadId
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId
     });
     if (code !== 0) {
       return;
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index 04d77ff6..630f7c5a 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -1,3 +1,4 @@
+<!-- 商品浏览记录  -->
 <template>
   <s-layout title="我的足迹" :bgStyle="{ color: '#f2f2f2' }">
     <view class="cart-box ss-flex ss-flex-col ss-row-between">
@@ -150,11 +151,7 @@
 
     state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
-    if (state.pagination.list.length < state.pagination.total) {
-      state.loadStatus = 'more';
-    } else {
-      state.loadStatus = 'noMore';
-    }
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
   }
 
   // 单选选中
@@ -166,6 +163,7 @@
     }
     state.selectAll = state.selectedSpuIdList.length === state.pagination.list.length;
   };
+
   // 全选
   const onSelectAll = () => {
     state.selectAll = !state.selectAll;
@@ -180,6 +178,7 @@
       });
     }
   };
+
   // 删除足迹
   async function onDelete() {
     if (state.selectedSpuIdList.length <= 0) {
@@ -191,6 +190,7 @@
       reload();
     }
   }
+
   // 清空
   async function onClean() {
     const { code } = await SpuHistoryApi.cleanBrowseHistory();
@@ -214,9 +214,11 @@
       getList();
     }
   }
+
   onReachBottom(() => {
     loadMore();
   });
+
   onLoad(() => {
     getList();
   });
diff --git a/sheep/api/product/history.js b/sheep/api/product/history.js
index 1f026642..1e60a2ac 100644
--- a/sheep/api/product/history.js
+++ b/sheep/api/product/history.js
@@ -23,13 +23,6 @@ const SpuHistoryApi = {
             method: 'GET',
             data
         });
-    },
-    // 获得商品浏览记录数量
-    getBrowseHistoryCount: () => {
-        return request({
-            url: '/app-api/product/browse-history/get-count',
-            method: 'GET',
-        });
     }
 };
 export default SpuHistoryApi;
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
index 2e744deb..00e87de1 100644
--- a/sheep/api/trade/order.js
+++ b/sheep/api/trade/order.js
@@ -19,6 +19,9 @@ const OrderApi = {
     if (!(data.combinationHeadId > 0)) {
       delete data2.combinationHeadId;
     }
+    if (!(data.seckillActivityId > 0)) {
+      delete data2.seckillActivityId;
+    }
     // 解决 SpringMVC 接受 List<Item> 参数的问题
     delete data2.items;
     for (let i = 0; i < data.items.length; i++) {