From 70fe080f5705997aa584a8ee13ee944276c61965 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 17 Jun 2023 00:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8B=BC=E5=9B=A2=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=91=201.=20=E6=8E=A5=E5=85=A5=20banner?=
 =?UTF-8?q?=20=E6=B4=BB=E5=8A=A8=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/promotion/banner.js                    |  7 ++
 api/promotion/combination.js               |  7 ++
 pages/activity/goods_combination/index.vue | 77 ++++++++++++----------
 3 files changed, 56 insertions(+), 35 deletions(-)
 create mode 100644 api/promotion/banner.js

diff --git a/api/promotion/banner.js b/api/promotion/banner.js
new file mode 100644
index 00000000..d2d78688
--- /dev/null
+++ b/api/promotion/banner.js
@@ -0,0 +1,7 @@
+import request from "@/utils/request.js";
+
+export function getBannerList(position) {
+  return request.get("app-api/promotion/banner/list", {
+    position
+  });
+}
diff --git a/api/promotion/combination.js b/api/promotion/combination.js
index 1426d9f1..1ff8f705 100644
--- a/api/promotion/combination.js
+++ b/api/promotion/combination.js
@@ -34,3 +34,10 @@ export function getCombinationRecordDetail(id) {
     noAuth: true // TODO 芋艿：后续要做调整
   });
 }
+
+// 获得拼团活动的概要信息
+export function getCombinationSummary() {
+  return request.get("app-api/promotion/combination-record/get-summary", {}, {
+    noAuth: true // TODO 芋艿：后续要做调整
+  });
+}
diff --git a/pages/activity/goods_combination/index.vue b/pages/activity/goods_combination/index.vue
index d1be99e4..b44164cf 100644
--- a/pages/activity/goods_combination/index.vue
+++ b/pages/activity/goods_combination/index.vue
@@ -6,36 +6,36 @@
 				<!-- #ifdef H5 -->
 				<view class='iconfont icon-xiangzuo' @tap='goBack' :style="'top:'+ (navH/2) +'rpx'" v-if="returnShow"></view>
 				<!-- #endif -->
-				<!-- banner TODO 芋艿：banner -->
+				<!-- banner -->
 				<view class="swiper" v-if="bannerList.length">
 					<swiper indicator-dots="true" :autoplay="true" :circular="circular" :interval="interval"
 						:duration="duration" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
 						<block v-for="(item,index) in bannerList" :key="index">
 							<swiper-item>
-								<navigator :url='item.value' class='slide-navigator acea-row row-between-wrapper'
+								<navigator :url='item.url' class='slide-navigator acea-row row-between-wrapper'
 									hover-class='none'>
-									<image :src="item.value" class="slide-image" lazy-load></image>
+									<image :src="item.picUrl" class="slide-image" lazy-load />
 								</navigator>
 							</swiper-item>
 						</block>
 					</swiper>
 				</view>
-        <!-- TODO 芋艿：头部 -->
+        <!-- 拼团概要 -->
         <view class="nav acea-row row-between-wrapper">
 					<image src="../static/zuo.png"></image>
 					<view class="title acea-row row-center">
 						<view class="spike-bd">
-							<view v-if="avatarList.length > 0" class="activity_pic">
-								<view v-for="(item,index) in avatarList" :key="index" class="picture"
-									:style='index===6?"position: relative":"position: static"'>
+							<view v-if="summary.avatars.length > 0" class="activity_pic">
+								<view v-for="(item,index) in summary.avatars" :key="index" class="picture"
+									:style='index === 6?"position: relative":"position: static"'>
 									<span class="avatar" :style='"background-image: url("+item+")"'></span>
-									<span v-if="index===6 && Number(avatarList.length) > 3" class="mengceng">
+									<span v-if="index === 6 && summary.avatars.length > 3" class="mengceng">
 										<i>···</i>
 									</span>
 								</view>
 							</view>
 						</view>
-						<text class="pic_count">{{totalPeople}}人参与</text>
+						<text class="pic_count">{{ summary.userCount || 0 }}人参与</text>
 					</view>
 					<image src="../static/you.png"></image>
 				</view>
@@ -69,17 +69,12 @@
 		</div>
 	</div>
 </template>
-
 <script>
-	import {
-		getCombinationList,
-		combinationHeaderApi
-	} from '@/api/activity.js';
 	import { openPinkSubscribe } from '../../../utils/SubscribeMessage.js';
   import * as CombinationApi from '@/api/promotion/combination.js';
+  import * as BannerApi from '@/api/promotion/banner.js';
   import * as Util from '@/utils/util.js';
   import home from '@/components/home/index.vue'
-  import {getCombinationActivityPage} from "../../../api/promotion/combination";
 	let app = getApp();
 	export default {
 		components: {
@@ -95,18 +90,22 @@
         page: 1,
         loadTitle: '',
 
-        // TODO 芋艿：未整理
-				indicatorDots: false,
-				circular: true,
-				autoplay: true,
-				interval: 3000,
-				duration: 500,
-				navH: '',
+        // 拼团记录概要
+        summary: {
+          userCount: 0,
+          avatars: [],
+        },
 
+        // banner 相关
+        bannerList: [],
+        circular: true,
+        autoplay: true,
+        interval: 3000,
+        duration: 500,
+
+        // 导航相关
+				navH: '',
 				returnShow: true,
-				avatarList: [],
-				bannerList: [],
-				totalPeople: 0
 			}
 		},
 		onShow() {
@@ -116,7 +115,7 @@
 			var pages = getCurrentPages();
 			this.returnShow = pages.length !== 1;
 			uni.setNavigationBarTitle({
-				title:"拼团列表"
+				title: "拼团列表"
 			})
 			// #ifdef MP
 			this.navH = app.globalData.navH;
@@ -127,8 +126,10 @@
 
       // 获得拼团活动列表
 			this.getCombinationList();
-      // TODO 芋艿：
+      // 获得拼团概要
 			this.getCombinationHeader();
+      // 获得 banner 列表
+      this.getBannerList();
 		},
     onReachBottom: function() {
       this.getCombinationList();
@@ -189,16 +190,22 @@
 			goBack: function() {
 				uni.navigateBack();
 			},
+      /**
+       * 获得拼团记录概要
+       */
 			getCombinationHeader: function() {
-				combinationHeaderApi().then(res => {
-					this.avatarList = res.data.avatarList || [];
-					this.bannerList = res.data.bannerList || [];
-					this.totalPeople = res.data.totalPeople;
-				}).catch(() => {
-					this.loading = false;
-					this.loadTitle = '加载更多';
-				})
+        CombinationApi.getCombinationSummary().then(res => {
+          this.summary = res.data;
+        })
 			},
+      /**
+       * 获得 banner 列表
+       */
+      getBannerList() {
+        BannerApi.getBannerList(10).then(res => {
+          this.bannerList = res.data;
+        })
+      },
 
       fen2yuan(price) {
         return Util.fen2yuan(price)