From 3746fe27bb1de279f404fd6b3d3a7f02155ae6cd Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 23 Jun 2023 01:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=95=86=E5=93=81=E7=83=AD=E9=97=A8?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E3=80=91=201.=20=E5=AE=9E=E7=8E=B0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/recommend/index.vue | 24 +++++++++---------------
 libs/order.js                  | 14 ++++++++------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index c11a2fe7..324de95d 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -8,23 +8,23 @@
 		<view class='recommendList acea-row row-between-wrapper'>
 			<view class='item' v-for="(item,index) in hostProduct" :key="index" hover-class='none' @tap="goDetail(item)">
 				<view class='pictrue'>
-					<image :src='item.image'></image>
-					<span class="pictrue_log_big pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '1'">秒杀</span>
-					<span class="pictrue_log_big pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '2'">砍价</span>
-					<span class="pictrue_log_big pictrue_log_class" v-if="item.activityH5 && item.activityH5.type === '3'">拼团</span>
+					<image :src='item.picUrl'></image>
+					<span class="pictrue_log_big pictrue_log_class" v-if="item.activityList && item.activityList[0] && item.activityList[0].type === 1">秒杀</span>
+					<span class="pictrue_log_big pictrue_log_class" v-if="item.activityList && item.activityList[0] && item.activityList[0].type === 2">砍价</span>
+					<span class="pictrue_log_big pictrue_log_class" v-if="item.activityList && item.activityList[0] && item.activityList[0].type === 3">拼团</span>
 				</view>
-				<view class='name line1'>{{item.storeName}}</view>
-				<view class='money font-color'>￥<text class='num'>{{item.price}}</text></view>
+				<view class='name line1'>{{ item.name }}</view>
+				<view class='money font-color'>￥<text class='num'>{{ item.price }}</text></view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {mapGetters} from "vuex";
+	import { mapGetters } from "vuex";
 	import { goShopDetail } from '@/libs/order.js'
 	export default {
-	computed: mapGetters(['uid']),
+	  computed: mapGetters(['uid']),
 		props: {
 			hostProduct: {
 				type: Array,
@@ -33,15 +33,9 @@
 				}
 			}
 		},
-		data() {
-			return {
-
-			};
-		},
-
 		methods: {
 			goDetail(item){
-				goShopDetail(item,this.uid).then(res=>{
+				goShopDetail(item,this.uid).then(() => {
 					uni.navigateTo({
 						url:`/pages/goods_details/index?id=${item.id}`
 					})
diff --git a/libs/order.js b/libs/order.js
index 3cdf6af2..91c3ad9f 100644
--- a/libs/order.js
+++ b/libs/order.js
@@ -3,22 +3,24 @@ import {
 } from '@/api/order.js';
 import util from 'utils/util'
 
+// TODO 芋艿：需要调整位置
 /**
  * 去商品详情
  */
 export function goShopDetail(item, uid) {
 	return new Promise(resolve => {
-		if (item.activityH5 && item.activityH5.type === "1") {
+    const activityH5 = item.activityList && item.activityList[0] ? item.activityList[0] : null;
+		if (activityH5 && activityH5.type === 1) {
 			uni.navigateTo({
-				url: `/pages/activity/goods_seckill_details/index?id=${item.activityH5.id}`
+				url: `/pages/activity/goods_seckill_details/index?id=${activityH5.id}`
 			})
-		} else if (item.activityH5 && item.activityH5.type === "2") {
+		} else if (activityH5 && activityH5.type === 2) {
 			uni.navigateTo({
-				url: `/pages/activity/goods_bargain_details/index?id=${item.activityH5.id}&startBargainUid=${uid}`
+				url: `/pages/activity/goods_bargain_details/index?id=${activityH5.id}&startBargainUid=${uid}`
 			})
-		} else if (item.activityH5 && item.activityH5.type === "3") {
+		} else if (activityH5 && activityH5.type === 3) {
 			uni.navigateTo({
-				url: `/pages/activity/goods_combination_details/index?id=${item.activityH5.id}`
+				url: `/pages/activity/goods_combination_details/index?id=${activityH5.id}`
 			})
 		} else {
 			resolve(item);