From f636691cd7f37d52c9772d8a4c3de1dfc995cc21 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Wed, 20 Jul 2022 17:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=81=E5=AF=B9=E6=8E=A5=E7=A1=AE=E8=AE=A4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BD=BF=E7=94=A8=E7=BA=A2=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/account/myOrders.vue     | 375 +++++++++++++++++----------------
 pages/account/myReview.vue     |  20 +-
 pages/index/index.vue          |  32 ++-
 pages/order/confirmation.vue   |  27 ++-
 pages/productDetails/index.vue |  10 +-
 5 files changed, 261 insertions(+), 203 deletions(-)

diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue
index 7fa91b2..314681e 100644
--- a/pages/account/myOrders.vue
+++ b/pages/account/myOrders.vue
@@ -153,249 +153,259 @@
 			
 			<!-- 待发货订单 -->
 			<template v-if="isList==true && scroll_active==2">
-				<view class="order" v-if="item.pay_status_code==2 && item.shipping_status_code==0" @click="goDetails(0,item.order_id)">
-					<view class="order_title">
-						<text>To be shipped</text>
-						<view class="order_title_right">
-							<text>order#{{item.order_sn}}</text>
-							<image src="../../static/img/right.png" mode=""></image>
+				<view  v-for="(item,idnex) in orderList" :key="item.order_id">
+					<view class="order" v-if="item.pay_status_code==2 && item.shipping_status_code==0" @click="goDetails(0,item.order_id)">
+						<view class="order_title">
+							<text>To be shipped</text>
+							<view class="order_title_right">
+								<text>order#{{item.order_sn}}</text>
+								<image src="../../static/img/right.png" mode=""></image>
+							</view>
 						</view>
-					</view>
-					<view class="order_content">
-						<template v-if="item.order_goods.length==1">
-							<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
-								<view class="good_info_left ">
-									<view class="good_info_image" >
-										<image :src="item1.goods_img" mode=""></image>
-									</view>
-									<view class="left_info">
-										<view class="info_name">{{item1.goods_name}}</view>
-										<view class="left_info_bottom">
-											<view class="info_lable">
-												<text>{{item1.goods_attr |goodsAttr}}</text>
-												<image src="/static/img/bottom.png" mode=""></image>
+						<view class="order_content">
+							<template v-if="item.order_goods.length==1">
+								<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
+									<view class="good_info_left ">
+										<view class="good_info_image" >
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+										<view class="left_info">
+											<view class="info_name">{{item1.goods_name}}</view>
+											<view class="left_info_bottom">
+												<view class="info_lable">
+													<text>{{item1.goods_attr |goodsAttr}}</text>
+													<image src="/static/img/bottom.png" mode=""></image>
+												</view>
+												<text>×{{item1.goods_number}}</text>
 											</view>
-											<text>×{{item1.goods_number}}</text>
 										</view>
 									</view>
 								</view>
-							</view>
-						</template>
-						<template v-else>
-							<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
-								<view class="good_info_left">
-									<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
-										<image :src="item1.goods_img" mode=""></image>
+							</template>
+							<template v-else>
+								<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
+									<view class="good_info_left">
+										<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+									</view>
+									<view class="good_info_right">
+										<text>{{item.order_goods.length}} ltems</text>
+										<image src="../../static/img/right.png" mode=""></image>
 									</view>
 								</view>
-								<view class="good_info_right">
-									<text>{{item.order_goods.length}} ltems</text>
-									<image src="../../static/img/right.png" mode=""></image>
-								</view>
-							</view>
-						</template>
-						<view class="good_price">total:US${{item.total_fee_o}}</view>
+							</template>
+							<view class="good_price">total:US${{item.total_fee_o}}</view>
+						</view>
 					</view>
 				</view>
 			</template>
 			<!-- 运输中订单 -->
 			<template v-if="isList==true && scroll_active==3">
-				<view class="order" v-if="item.pay_status_code==2 && item.shipping_status_code==1 || item.shipping_status_code==4" @click="goDetails(4,item.order_id)">
-					<view class="order_title">
-						<text>Shipped</text>
-						<view class="order_title_right">
-							<text>order#{{item.order_sn}}</text>
-							<image src="../../static/img/right.png" mode=""></image>
+				<view  v-for="(item,idnex) in orderList" :key="item.order_id">
+					<view class="order" v-if="item.pay_status_code==2 && item.shipping_status_code==1 || item.shipping_status_code==4" @click="goDetails(4,item.order_id)">
+						<view class="order_title">
+							<text>Shipped</text>
+							<view class="order_title_right">
+								<text>order#{{item.order_sn}}</text>
+								<image src="../../static/img/right.png" mode=""></image>
+							</view>
 						</view>
-					</view>
-					<view class="order_content">
-						<template v-if="item.order_goods.length==1">
-							<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
-								<view class="good_info_left ">
-									<view class="good_info_image" >
-										<image :src="item1.goods_img" mode=""></image>
-									</view>
-									<view class="left_info">
-										<view class="info_name">{{item1.goods_name}}</view>
-										<view class="left_info_bottom">
-											<view class="info_lable">
-												<text>{{item1.goods_attr |goodsAttr}}</text>
-												<image src="/static/img/bottom.png" mode=""></image>
+						<view class="order_content">
+							<template v-if="item.order_goods.length==1">
+								<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
+									<view class="good_info_left ">
+										<view class="good_info_image" >
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+										<view class="left_info">
+											<view class="info_name">{{item1.goods_name}}</view>
+											<view class="left_info_bottom">
+												<view class="info_lable">
+													<text>{{item1.goods_attr |goodsAttr}}</text>
+													<image src="/static/img/bottom.png" mode=""></image>
+												</view>
+												<text>×{{item1.goods_number}}</text>
 											</view>
-											<text>×{{item1.goods_number}}</text>
 										</view>
 									</view>
 								</view>
-							</view>
-						</template>
-						<template v-else>
-							<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
-								<view class="good_info_left">
-									<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
-										<image :src="item1.goods_img" mode=""></image>
+							</template>
+							<template v-else>
+								<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
+									<view class="good_info_left">
+										<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+									</view>
+									<view class="good_info_right">
+										<text>{{item.order_goods.length}} ltems</text>
+										<image src="../../static/img/right.png" mode=""></image>
 									</view>
 								</view>
-								<view class="good_info_right">
-									<text>{{item.order_goods.length}} ltems</text>
-									<image src="../../static/img/right.png" mode=""></image>
-								</view>
+							</template>
+							<view class="good_price">total:US${{item.total_fee_o}}</view>
+							<view class="order_button">
+								<button class="cancel" @click.stop="goLogistics(item.order_id)">LOGISTICS</button>
+								<button class="pay" @click.stop="openTips(item.order_id,2)">CONFIRM RECEIPT</button>
 							</view>
-						</template>
-						<view class="good_price">total:US${{item.total_fee_o}}</view>
-						<view class="order_button">
-							<button class="cancel" @click.stop="goLogistics(item.order_id)">LOGISTICS</button>
-							<button class="pay" @click.stop="openTips(item.order_id,2)">CONFIRM RECEIPT</button>
 						</view>
 					</view>
 				</view>
 			</template>
 			<!-- 已完成订单 -->
 			<template v-if="isList==true && scroll_active==4">
-				<view class="order " v-if="item.pay_status_code==2 && item.shipping_status_code==2" @click="goDetails(2,item.order_id)">
-					<view class="order_title">
-						<text>Completed</text>
-						<view class="order_title_right">
-							<text>order#{{item.order_sn}}</text>
-							<image src="../../static/img/right.png" mode=""></image>
+				<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
+					<view class="order " v-if="item.pay_status_code==2 && item.shipping_status_code==2" @click="goDetails(2,item.order_id)">
+						<view class="order_title">
+							<text>Completed</text>
+							<view class="order_title_right">
+								<text>order#{{item.order_sn}}</text>
+								<image src="../../static/img/right.png" mode=""></image>
+							</view>
 						</view>
-					</view>
-					<view class="order_content">
-						<template v-if="item.order_goods.length==1">
-							<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
-								<view class="good_info_left ">
-									<view class="good_info_image" >
-										<image :src="item1.goods_img" mode=""></image>
-									</view>
-									<view class="left_info">
-										<view class="info_name">{{item1.goods_name}}</view>
-										<view class="left_info_bottom">
-											<view class="info_lable">
-												<text>{{item1.goods_attr |goodsAttr}}</text>
-												<image src="/static/img/bottom.png" mode=""></image>
+						<view class="order_content">
+							<template v-if="item.order_goods.length==1">
+								<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
+									<view class="good_info_left ">
+										<view class="good_info_image" >
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+										<view class="left_info">
+											<view class="info_name">{{item1.goods_name}}</view>
+											<view class="left_info_bottom">
+												<view class="info_lable">
+													<text>{{item1.goods_attr |goodsAttr}}</text>
+													<image src="/static/img/bottom.png" mode=""></image>
+												</view>
+												<text>×{{item1.goods_number}}</text>
 											</view>
-											<text>×{{item1.goods_number}}</text>
 										</view>
 									</view>
 								</view>
-							</view>
-						</template>
-						<template v-else>
-							<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
-								<view class="good_info_left">
-									<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
-										<image :src="item1.goods_img" mode=""></image>
+							</template>
+							<template v-else>
+								<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
+									<view class="good_info_left">
+										<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+									</view>
+									<view class="good_info_right">
+										<text>{{item.order_goods.length}} ltems</text>
+										<image src="../../static/img/right.png" mode=""></image>
 									</view>
 								</view>
-								<view class="good_info_right">
-									<text>{{item.order_goods.length}} ltems</text>
-									<image src="../../static/img/right.png" mode=""></image>
-								</view>
+							</template>
+							<view class="good_price">total:US${{item.total_fee_o}}</view>
+							<view class="order_button">
+								<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
+								<button class="pay" @click.stop="goComment(item)" v-if="item.comment_status_code==0">COMMENT</button>
 							</view>
-						</template>
-						<view class="good_price">total:US${{item.total_fee_o}}</view>
-						<view class="order_button">
-							<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
-							<button class="pay" @click.stop="goComment(item)" v-if="item.comment_status_code==0">COMMENT</button>
 						</view>
 					</view>
 				</view>
 			</template>
 			<!-- 退换货订单 -->
 			<template v-if="isList==true && scroll_active==5">
-				<view class="order" v-if="item.order_status_code==4" @click="goDetails(2,item.order_id)">
-					<view class="order_title">
-						<text>Return and exchange</text>
-						<view class="order_title_right">
-							<text>order#{{item.order_sn}}</text>
-							<image src="../../static/img/right.png" mode=""></image>
+				<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
+					<view class="order" v-if="item.order_status_code==4" @click="goDetails(2,item.order_id)">
+						<view class="order_title">
+							<text>Return and exchange</text>
+							<view class="order_title_right">
+								<text>order#{{item.order_sn}}</text>
+								<image src="../../static/img/right.png" mode=""></image>
+							</view>
 						</view>
-					</view>
-					<view class="order_content">
-						<template v-if="item.order_goods.length==1">
-							<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
-								<view class="good_info_left ">
-									<view class="good_info_image" >
-										<image :src="item1.goods_img" mode=""></image>
-									</view>
-									<view class="left_info">
-										<view class="info_name">{{item1.goods_name}}</view>
-										<view class="left_info_bottom">
-											<view class="info_lable">
-												<text>{{item1.goods_attr |goodsAttr}}</text>
-												<image src="/static/img/bottom.png" mode=""></image>
+						<view class="order_content">
+							<template v-if="item.order_goods.length==1">
+								<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
+									<view class="good_info_left ">
+										<view class="good_info_image" >
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+										<view class="left_info">
+											<view class="info_name">{{item1.goods_name}}</view>
+											<view class="left_info_bottom">
+												<view class="info_lable">
+													<text>{{item1.goods_attr |goodsAttr}}</text>
+													<image src="/static/img/bottom.png" mode=""></image>
+												</view>
+												<text>×{{item1.goods_number}}</text>
 											</view>
-											<text>×{{item1.goods_number}}</text>
 										</view>
 									</view>
 								</view>
-							</view>
-						</template>
-						<template v-else>
-							<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
-								<view class="good_info_left">
-									<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
-										<image :src="item1.goods_img" mode=""></image>
+							</template>
+							<template v-else>
+								<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
+									<view class="good_info_left">
+										<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+									</view>
+									<view class="good_info_right">
+										<text>{{item.order_goods.length}} ltems</text>
+										<image src="../../static/img/right.png" mode=""></image>
 									</view>
 								</view>
-								<view class="good_info_right">
-									<text>{{item.order_goods.length}} ltems</text>
-									<image src="../../static/img/right.png" mode=""></image>
-								</view>
+							</template>
+							<view class="good_price">total:US${{item.total_fee_o}}</view>
+							<view class="order_button">
+								<button class="pay">CANCEL RETURN</button>
 							</view>
-						</template>
-						<view class="good_price">total:US${{item.total_fee_o}}</view>
-						<view class="order_button">
-							<button class="pay">CANCEL RETURN</button>
 						</view>
 					</view>
 				</view>
 			</template>
 			<!-- 已取消订单 -->
 			<template v-if="isList==true && scroll_active==6">
-				<view class="order" v-if="item.order_status_code==2" @click="goDetails(1,item.order_id)">
-					<view class="order_title">
-						<text>cancelled</text>
-						<view class="order_title_right">
-							<text>order#{{item.order_sn}}</text>
-							<image src="../../static/img/right.png" mode=""></image>
+				<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
+					<view class="order" v-if="item.order_status_code==2" @click="goDetails(1,item.order_id)">
+						<view class="order_title">
+							<text>cancelled</text>
+							<view class="order_title_right">
+								<text>order#{{item.order_sn}}</text>
+								<image src="../../static/img/right.png" mode=""></image>
+							</view>
 						</view>
-					</view>
-					<view class="order_content">
-						<template v-if="item.order_goods.length==1">
-							<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
-								<view class="good_info_left ">
-									<view class="good_info_image" >
-										<image :src="item1.goods_img" mode=""></image>
-									</view>
-									<view class="left_info">
-										<view class="info_name">{{item1.goods_name}}</view>
-										<view class="left_info_bottom">
-											<view class="info_lable">
-												<text>{{item1.goods_attr |goodsAttr}}</text>
-												<image src="/static/img/bottom.png" mode=""></image>
+						<view class="order_content">
+							<template v-if="item.order_goods.length==1">
+								<view class="good_info" v-for="(item1,index1) in item.order_goods" :key="index1">
+									<view class="good_info_left ">
+										<view class="good_info_image" >
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+										<view class="left_info">
+											<view class="info_name">{{item1.goods_name}}</view>
+											<view class="left_info_bottom">
+												<view class="info_lable">
+													<text>{{item1.goods_attr |goodsAttr}}</text>
+													<image src="/static/img/bottom.png" mode=""></image>
+												</view>
+												<text>×{{item1.goods_number}}</text>
 											</view>
-											<text>×{{item1.goods_number}}</text>
 										</view>
 									</view>
 								</view>
-							</view>
-						</template>
-						<template v-else>
-							<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
-								<view class="good_info_left">
-									<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
-										<image :src="item1.goods_img" mode=""></image>
+							</template>
+							<template v-else>
+								<view class="good_info" @click.stop="showGoods(item.order_goods,1)">
+									<view class="good_info_left">
+										<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
+											<image :src="item1.goods_img" mode=""></image>
+										</view>
+									</view>
+									<view class="good_info_right">
+										<text>{{item.order_goods.length}} ltems</text>
+										<image src="../../static/img/right.png" mode=""></image>
 									</view>
 								</view>
-								<view class="good_info_right">
-									<text>{{item.order_goods.length}} ltems</text>
-									<image src="../../static/img/right.png" mode=""></image>
-								</view>
+							</template>
+							<view class="good_price">total:US${{item.total_fee_o}}</view>
+							<view class="order_button">
+								<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
 							</view>
-						</template>
-						<view class="good_price">total:US${{item.total_fee_o}}</view>
-						<view class="order_button">
-							<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
 						</view>
 					</view>
 				</view>
@@ -584,8 +594,9 @@
 						    orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
 						    success: function (res) {
 						        console.log('success:' + JSON.stringify(res));
+										this.isShow=false
 										uni.navigateTo({
-											url: 'paySuccess?order_id='+this.payQuery.order_id
+											url: '../order/paySuccess?order_id='+this.payQuery.order_id
 										});
 						    },
 						    fail: function (err) {
diff --git a/pages/account/myReview.vue b/pages/account/myReview.vue
index 8baef1b..e75e78b 100644
--- a/pages/account/myReview.vue
+++ b/pages/account/myReview.vue
@@ -25,14 +25,30 @@
 </template>
 
 <script>
+	import {defaultRequest,defaultRequest2} from '../../api/index.js'
 	export default {
 		data() {
 			return {
-				isShwo:false
+				isShwo:false,
+				query:{
+					_action:'getgoodscomment',
+					goods_id:'',
+					page_index:1,
+					page_size:10,
+					commentlabel:''
+				}
 			}
 		},
 		methods:{
-			
+			getList(){
+				defaultRequest(this.query).then(res=>{
+					console.info(res)
+				})
+			}
+		},
+		onLoad(e) {
+			this.query.goods_id=e.goods_id
+			this.getList()
 		}
 	}
 </script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ba3de95..8bb3238 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -69,25 +69,30 @@
 				</swiper>
 			</uni-swiper-dot>
 			
-			<!-- 打折 -->
-			<!-- class="discount page_padding" -->
+			<!-- ONEPIC -->
 			<view class="ONEPIC" v-if="item.zone_code=='ONEPIC' && item.zone_status=='NORMAL'">
+				<!-- class="discount page_padding" -->
 				<image :src="item.blocks[0].block_pic" mode=""  ></image>
 			</view>
+			<!-- TWOPIC -->
 			<view class="TWOPIC" v-if="item.zone_code=='TWOPIC' && item.zone_status=='NORMAL'">
-				<image :src="item.blocks[0].block_pic" mode="" ></image>
+				<image :src="item1.block_pic" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
 			</view>
+			<!-- THREEPIC -->
 			<view class="THREEPIC" v-if="item.zone_code=='THREEPIC' && item.zone_status=='NORMAL'">
-				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+				<image :src="item1.block_pic" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
 			</view>
+			<!-- FOURPIC -->
 			<view class="FOURPIC" v-if="item.zone_code=='FOURPIC' && item.zone_status=='NORMAL'">
-				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+				<image :src="item1.block_pic" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
 			</view>
+			<!-- FIVEPIC -->
 			<view class="FIVEPIC" v-if="item.zone_code=='FIVEPIC' && item.zone_status=='NORMAL'">
-				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+				<image :src="item1.block_pic" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
 			</view>
+			<!-- SIXPIC -->
 			<view class="SIXPIC" v-if="item.zone_code=='SIXPIC' && item.zone_status=='NORMAL'">
-				<image :src="item.blocks[0].block_pic" mode=""  ></image>
+				<image :src="item1.block_pic" mode="" v-for="(item1,index1) in item.blocks" :key="item1.block_id"></image>
 			</view>
 			
 			
@@ -661,8 +666,12 @@
 			.hotSells1_item_img{
 				width: 100%;
 				height: 266.67rpx;
-				background-color: #999999;
+				// background-color: #999999;
 				margin-bottom: 23.33rpx;
+				image{
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 		.hotSells2_item{
@@ -673,8 +682,13 @@
 			.hotSells2_item_img{
 				width: 100%;
 				height: 224rpx;
-				background-color: #999999;
+				// background-color: #999999;
 				margin-bottom: 25.33rpx;
+				
+				image{
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 	}
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 5a8d618..53c63a8 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -55,7 +55,7 @@
 			<view class="discount_item" @click="openMore(1)">
 				<text>Coupons</text>
 				<view class="discount_item_right">
-					<text v-show="isCoupons">-US$12.5</text>
+					<text v-show="total.bonus!=0">-US${{total.bonus}}</text>
 					<image src="../../static/img/right.png" mode="" class="address_more"></image>
 				</view>
 			</view>
@@ -82,7 +82,7 @@
 			</view>
 			<view class="settlement_item">
 				<text>Discount :</text>
-				<text class="settlement_item_right1">-US${{total.discount || 0}}</text>
+				<text class="settlement_item_right1">-US${{total.bonus || 0}}</text>
 			</view>
 		</view>
 		
@@ -124,20 +124,21 @@
 			</view>
 			
 			<view class="order_popup_coupons" v-show="popup_index==1">
-				<view class="coupons_item" v-for="(item,index) in 3 " :key="index">
+				<view class="coupons_item" v-for="(item,index) in bonus_list " :key="item.bonus_id">
 					<view class="coupons_item_left">
-						<view class="item_left_prcie">$20.00</view>
+						<view class="item_left_prcie">${{item.type_money}}</view>
 						<text class="item_left_span">Min.spend</text>
 						<view>$200.00</view>
 					</view>
 					<view class="coupons_item_right">
 						<view class="coupons_right_info">
-							<view class="coupons_right_info_title">All-purpose</view>
+							<view class="coupons_right_info_title">{{item.type_name}}</view>
 							<text>The tide zone is available</text>
 							<view class="coupons_right_info_time">2022.09.23  10:37 - 2022.12.23  10:37</view>
 						</view>
-						<button>Use Now</button>
-						<image src="../../static/img/select3.png" mode="" class="coupons_item_right_select"></image>
+						<button @click="useCoupons(item.bonus_id)">Use Now</button>
+						<image src="../../static/img/select3.png" mode="" class="coupons_item_right_select" v-if="order.bonus==item.bonus_id"></image>
+						<image src="../../static/img/select.png" mode="" class="coupons_item_right_select" v-else></image>
 					</view>
 				</view>
 			</view>
@@ -223,7 +224,17 @@
 			}
 		},
 		methods:{
-			
+			// 使用红包
+			useCoupons(id){
+				let data={_action:'cartselectbonus',bonus:id,consignee:this.address}
+				defaultRequest3(data,'consignee').then(res=>{
+					console.info(res)
+					if(res.error==0){
+						this.total=res.data.total
+						this.order=res.data.order
+					}
+				})
+			},
 			// 获取调用支付信息数据
 			getPayDate(id,will_get_integral){
 				let data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'alipay.native'}
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index 63b86bc..69209cd 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -172,7 +172,7 @@
 		</view>
 		
 		<view class="reviews">
-			<view class="goods_title">
+			<view class="goods_title" @click="goReview">
 				<view class="goods_title_left">
 					<text>Reviews({{goodsDate.comment_summary[0].commentcount}})</text>
 				</view>
@@ -244,7 +244,7 @@
 		
 		<view class="footer">
 			<view class="footer_left">
-				<text>US$314.00</text>
+				<text>US${{goodsDate.is_promote==0? goodsDate.shop_price *cartQuery.goods_number:goodsDate.promote_price *cartQuery.goods_number}}</text>
 			</view>
 			<view class="footer_right">
 				<button @click="isCart=true">ADD TO CART</button>
@@ -382,6 +382,12 @@
 			}
 		},
 		methods:{
+			// 跳转到评论详情
+			goReview(){
+				uni.navigateTo({
+					url:'../account/myReview?goods_id='+this.query.goods_id
+				})
+			},
 			// 添加到购物车
 			addCart(){
 				if(this.goods_attr_list.length==0){