套餐问题修复

userPackage/goodsDetail/goodsDetail.vue

@@ -101,7 +101,7 @@
 		</view>
 
 
-		<view class="desc">
+		<view class="desc" v-if="item.tieredDiscount&&item.tieredDiscount.length>0">
 			<view class="u-flex u-row-between">
 				<view class="name">分享说明</view>
 				<view class="u-flex color-666" @click="showDesc=!showDesc" style="align-items: baseline;">
@@ -126,13 +126,15 @@
 
 				<view class="u-m-t-26" >
 					<view>
-						分享期限（小时）：4
+						分享期限（小时）：{{item.expireHours}}
 					</view>
 					<view class="u-m-t-10">
 						规定期限内的助力才会被计入
 					</view>
 					<view class="u-m-t-40">
-						如何才是分享成功？
被分享人只需要点击《助力》，提示助力成功后即可
+						如何才是分享成功？被分享人只需要点击《助力》，提示助力成功后即可
+						
+						
 					</view>
 
 				</view>
@@ -158,10 +160,10 @@
 			<template v-if="useDescShow">
 				<view class="u-m-t-16 color-666">
 					<view>
-						1、可用时间段：04:00 - 16:07
+						1、可用时间段：{{canuseTime}}
 					</view>
-					<view>
-						2、其他使用说明：这里是其他使用说明
+					<view v-if="item.otherDesc">
+						2、其他使用说明：{{item.otherDesc}}
 					</view>
 				</view>
 		
@@ -179,18 +181,21 @@
 				<view class="title">商品详情</view>
 			</view>
 			<view class="u-m-t-32">
-				<image class="w-full" v-for="(item,index) in item.imgs" :key="index" mode="widthFix" :src="item">
+				<image class="w-full" v-for="(item,index) in item.detailImages" :key="index" mode="widthFix" :src="item">
 				</image>
 			</view>
 		</view>
 
 		<view style="height: 140px"></view>
 		<view class="fixed-bottom  ">
-			<view v-if="isCanExchange" class="btn" @click="exchangeClick">
+			<!-- <view v-if="isCanExchange" class="btn" @click="exchangeClick">
+				{{returnBtmText}}
+			</view> -->
+			<view v-if="isCanExchange" class="btn" @click="payExchange">
 				{{returnBtmText}}
 			</view>
-			<view class="btn gray u-m-t-32" @click="createOrder">
-				立即助力
+			<view class="btn gray u-m-t-32" @click="createOrder" v-if="item.tieredDiscount&&item.tieredDiscount.length>0">
+				发起助力
 			</view>
 
 		</view>
@@ -356,8 +361,9 @@
 	}
 	
 	async function createOrder(){
-		Api.order({
-			packageId:item.id
+		Api.createOrder({
+			packageId:item.id,
+			shopId: item.shopId,
 		}).then(res=>{
 			if(res){
 				uni.navigateTo({
@@ -376,10 +382,9 @@
 		uni.setStorageSync('group_buying_order', {
 			...item,
 			number: number.value,
-			groupOrderNo: popupData.item ? popupData.item.groupOrderNo : '',
 		})
 		uni.navigateTo({
-			url: '/groupBuying/confirm-order/confirm-order'
+			url: '/userPackage/confirm-order/confirm-order'
 		})
 		return
 		await dingyue();
@@ -459,7 +464,6 @@
 	const query = reactive({
 		shopId: '',
 		id: '',
-		groupOrderNo: ''
 	})
 
 
@@ -481,7 +485,7 @@
 	}
 
 	function getDetail() {
-		Api.getPackageDetail(query.id).then(res => {
+		Api.getPackageDetail(query).then(res => {
 			Object.assign(item, res)
 			console.log(item)
 			coverImgs.value = res.images
@@ -552,15 +556,18 @@
 	uni.showShareMenu()
 	// #endif
 	onShareAppMessage(() => {
-
 		const query = `id=${item.id}&shopId=${item.shopId}`
 		return wxShare({
 			title: item.wareName,
 			imageUrl: coverImgs.value[0],
-			path: '/groupBuying/goodsDetail/goodsDetail' + '?' + query,
+			path: '/userPackage/goodsDetail/goodsDetail' + '?' + query,
 			query,
 		})
 	})
+	
+	const canuseTime=computed(()=>{
+		return item.useWeeks.join('、')+' '+item.useTimes
+	})
 </script>
 
 <style lang="scss" scoped>