From 987e90f80a8bc4a8198f89df11c105697d545b42 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 18 Jun 2023 00:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A6=96=E9=A1=B5=E3=80=91=201.=20?=
 =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E6=B4=BB=E5=8A=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/activity.js                               | 35 +++-----
 api/promotion/combination.js                  | 12 ++-
 .../goods_combination_details/index.vue       |  4 +-
 .../goods_combination_status/index.vue        |  2 +-
 pages/index/components/b_combination.vue      | 81 +++++++++----------
 5 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/api/activity.js b/api/activity.js
index fe62b3d0..ed96defe 100644
--- a/api/activity.js
+++ b/api/activity.js
@@ -1,26 +1,18 @@
 import request from "@/utils/request.js";
 /**
- * 
+ *
  * 所有活动接口 包括：拼团，砍价，秒杀
- * 
+ *
 */
 
 /**
  * 拼团列表
- * 
+ *
 */
 export function getCombinationList(data) {
   return request.get('combination/list', data,{noAuth:true});
 }
 
-/**
- * 拼团详情
- * 
-*/
-export function getCombinationDetail(id) {
-  return request.get('combination/detail/'+id);
-}
-
 /**
  * 拼团 开团
  */
@@ -35,13 +27,6 @@ export function postCombinationRemove(data) {
   return request.post("combination/remove",data);
 }
 
-/**
- * 拼团 更多拼团
- */
-export function getCombinationMore(data) {
-  return request.get("combination/more",data,{noAuth:true});
-}
-
 /**
  * 砍价列表
  */
@@ -50,7 +35,7 @@ export function getBargainList(data) {
 }
 
 /**
- * 
+ *
  * 砍价列表(已参与)
  * @param object data
 */
@@ -60,7 +45,7 @@ export function getBargainUserList(data){
 
 
 /**
- * 
+ *
  * 取消砍价
  * @param int bargainId
 */
@@ -105,7 +90,7 @@ export function postBargainHelpPrice(data) {
 }
 
 /**
- * 砍价 砍价帮 
+ * 砍价 砍价帮
  */
 export function postBargainHelpList(params,data) {
   return request.get("bargain/help/list?limit="+params.limit+"&page="+params.page, data,{});
@@ -113,7 +98,7 @@ export function postBargainHelpList(params,data) {
 
 /**
  * 秒杀产品时间区间
- * 
+ *
 */
 export function getSeckillIndexTime(){
   return request.get('seckill/index',{},{noAuth:true});
@@ -139,7 +124,7 @@ export function getSeckillDetail(id){
 /**
  * 砍价海报
  * @param object data
- * 
+ *
 */
 export function getBargainPoster(data){
   return request.post('bargain/poster',data)
@@ -148,7 +133,7 @@ export function getBargainPoster(data){
 /**
  * 拼团海报
  * @param object data
- * 
+ *
 */
 export function getCombinationPoster(data){
   return request.post('combination/poster',data)
@@ -217,4 +202,4 @@ export function bargainHeaderApi(){
 */
 export function combinationHeaderApi(){
   return request.get('combination/header');
-}
\ No newline at end of file
+}
diff --git a/api/promotion/combination.js b/api/promotion/combination.js
index 1ff8f705..0b9b3205 100644
--- a/api/promotion/combination.js
+++ b/api/promotion/combination.js
@@ -1,5 +1,14 @@
 import request from "@/utils/request.js";
 
+// 获得拼团活动列表
+export function getCombinationActivityList(count) {
+  return request.get("app-api/promotion/combination-activity/list", {
+    count
+  }, {
+    noAuth: true // TODO 芋艿：后续要做调整
+  });
+}
+
 // 获得拼团活动分页
 export function getCombinationActivityPage(data) {
   return request.get("app-api/promotion/combination-activity/page", data, {
@@ -17,8 +26,9 @@ export function getCombinationActivity(id) {
 }
 
 // 获得最近 n 条拼团记录（团长发起的）
-export function getHeadCombinationRecordList(status, count) {
+export function getHeadCombinationRecordList(activityId, status, count) {
   return request.get("app-api/promotion/combination-record/get-head-list", {
+    activityId,
     status,
     count
   }, {
diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue
index 96c0a993..00b57b22 100644
--- a/pages/activity/goods_combination_details/index.vue
+++ b/pages/activity/goods_combination_details/index.vue
@@ -473,10 +473,10 @@
             this.status = 0;
           }
           // 参团记录
-          CombinationApi.getHeadCombinationRecordList(1).then(res => {
+          CombinationApi.getHeadCombinationRecordList(this.id, 1).then(res => {
             this.runningRecords = res.data;
           })
-          CombinationApi.getHeadCombinationRecordList(2).then(res => {
+          CombinationApi.getHeadCombinationRecordList(this.id, 2).then(res => {
             this.successRecords = res.data;
           })
 
diff --git a/pages/activity/goods_combination_status/index.vue b/pages/activity/goods_combination_status/index.vue
index 7d53e547..990800b2 100644
--- a/pages/activity/goods_combination_status/index.vue
+++ b/pages/activity/goods_combination_status/index.vue
@@ -527,7 +527,7 @@
        * 更多拼团
        */
       combinationMore: function() {
-        CombinationApi.getHeadCombinationRecordList(1, 9).then(res => {
+        CombinationApi.getHeadCombinationRecordList(undefined, 1, 9).then(res => {
           this.storeCombinationHost = res.data;
         }).catch(res => {
           this.$util.Tips({
diff --git a/pages/index/components/b_combination.vue b/pages/index/components/b_combination.vue
index e776e56c..41c58e50 100644
--- a/pages/index/components/b_combination.vue
+++ b/pages/index/components/b_combination.vue
@@ -1,5 +1,5 @@
 <template>
-	<view :class="{borderShow:isBorader}">
+	<view :class="{borderShow: false}">
 		<view class="combination" v-if="combinationList.length">
 			<view class="title acea-row row-between">
 				<view class="spike-bd">
@@ -11,11 +11,13 @@
 								<i>···</i>
 							</span>
 						</view>
-						<text class="pic_count">{{assistUserCount}}人参与</text>
+						<text class="pic_count">{{ assistUserCount }}人参与</text>
 					</view>
 				</view>
 				<navigator url="/pages/activity/goods_combination/index" hover-class="none"
-					class="more acea-row row-center-wrapper">GO<text class="iconfont icon-xiangyou"></text></navigator>
+					class="more acea-row row-center-wrapper">
+          GO<text class="iconfont icon-xiangyou"></text>
+        </navigator>
 			</view>
 			<view class="conter acea-row">
 				<scroll-view scroll-x="true" style="white-space: nowrap; vertical-align: middle;"
@@ -23,68 +25,63 @@
 					<view class="itemCon" v-for="(item, index) in combinationList" :key="index" @click="goDetail(item)">
 						<view class="item">
 							<view class="pictrue">
-								<image :src="item.image"></image>
+								<image :src="item.picUrl" />
 							</view>
 							<view class="text lines1">
-								<view class="name line1">{{item.title}}</view>
-								<view class="money">¥<text class="num">{{item.price}}</text></view>
-								<view class="y_money">¥{{item.otPrice}}</view>
+								<view class="name line1">{{ item.name }}</view>
+								<view class="money">¥<text class="num">{{ fen2yuan(item.combinationPrice) }}</text></view>
+								<view class="y_money">¥{{ fen2yuan(item.marketPrice) }}</view>
 							</view>
 						</view>
 					</view>
-					<!-- <navigator :url="`/pages/activity/goods_combination_details/index?id=${item.id}`" hover-class="none" class="item" v-for="(item, index) in combinationList" :key="index">
-						<view class="pictrue">
-							<image :src="item.image"></image>
-						</view>
-						<view class="text lines1">
-							<text class="money">¥<text class="num">{{item.price}}</text></text>
-							<text class="y_money">¥{{item.otPrice}}</text>
-						</view>
-					</navigator> -->
 				</scroll-view>
 			</view>
 		</view>
 	</view>
 </template>
-
 <script>
-	let app = getApp();
-	import {
-		getCombinationIndexApi
-	} from '@/api/activity.js';
-	export default {
+  let app = getApp();
+  import * as CombinationApi from '@/api/promotion/combination.js';
+  import * as Util from '@/utils/util.js';
+  export default {
 		name: 'b_combination',
 		data() {
 			return {
-				combinationList: [],
-				isBorader: false,
-				assistUserList: [],
-				assistUserCount: 0
+				combinationList: [], // 拼团列表（由团长发起的）
+				assistUserList: [], // 拼团用户头像列表
+				assistUserCount: 0 // 拼团用户数量
 			};
 		},
 		created() {
-			this.getCombinationList();
+      // 获得拼团列表
+      CombinationApi.getCombinationActivityList(6).then((res) => {
+        this.combinationList = res.data;
+      }).catch((res) => {
+        return this.$util.Tips({
+          title: res
+        });
+      })
+
+      // 获得拼团概要
+      CombinationApi.getCombinationSummary().then((res) => {
+        this.assistUserList = res.data.avatars;
+        this.assistUserCount = res.data.userCount;
+      }).catch((res) => {
+        return this.$util.Tips({
+          title: res
+        });
+      })
 		},
-		mounted() {},
 		methods: {
-			// 拼团列表
-			getCombinationList: function() {
-				let that = this;
-				getCombinationIndexApi().then(function(res) {
-					that.combinationList = res.data.productList;
-					that.assistUserList = res.data.avatarList;
-					that.assistUserCount = res.data.totalPeople;
-				}).catch((res) => {
-					return that.$util.Tips({
-						title: res
-					});
-				})
-			},
 			goDetail(item) {
 				uni.navigateTo({
 					url: `/pages/activity/goods_combination_details/index?id=${item.id}`
 				})
-			}
+			},
+
+      fen2yuan(price) {
+        return Util.fen2yuan(price)
+      }
 		}
 	}
 </script>