From afdda8d36e4eb7560ec51f8872c2b97bcd599744 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 9 Jan 2023 16:42:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=8F=96=E6=B6=88=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=202.=E6=96=B0=E5=A2=9E=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rec-confirmation/rec-confirmation.vue     | 16 ++++-----
 pages/tabBar/home/home.vue                    | 33 +++++++++++--------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/member-Recharge/rec-confirmation/rec-confirmation.vue b/member-Recharge/rec-confirmation/rec-confirmation.vue
index f96afef..c07bff1 100644
--- a/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -174,7 +174,7 @@
 		wechatPay,
 		cardPay,
 		getUserOrderPreList,
-		thirdCancelOrder,
+		cancel,
 		getRebateIntegral
 	} from '../../Utils/Api.js';
 	// #ifdef H5
@@ -575,14 +575,14 @@
 							title: '工会卡余额不足',
 							duration: 2000,
 						});
-						that.thirdCancelOrder();
+						that.cancel();
 						return;
 					}
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../pages/login/updatePas/updatePas'
 						})
-						that.thirdCancelOrder();
+						that.cancel();
 						return;
 					}
 					if (!that.user.isSetHltCard) {
@@ -598,7 +598,7 @@
 								}, 1000)
 							}
 						});
-						that.thirdCancelOrder();
+						that.cancel();
 						return;
 					}
 					that.$refs.paymentPassword.modalFun('show');
@@ -611,11 +611,11 @@
 				}
 			},
 			//取消订单
-			thirdCancelOrder() {
+			cancel() {
 				let params = {
-					orderId: this.orderId,
+					orderNo: this.orderId,
 				}
-				thirdCancelOrder(params).then(res => {
+				cancel(params).then(res => {
 					if (res.return_code == '000000') {
 						this.orderId = '';
 					}
@@ -672,7 +672,7 @@
 							icon: 'none',
 							duration: 2000
 						});
-						this.thirdCancelOrder();
+						this.cancel();
 					})
 					return;
 				}
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 4907376..60d0dba 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -31,7 +31,7 @@
 				<!-- #endif -->
 			</view>
 		</view>
-		<view  v-if="isdisplay">
+		<view v-if="isdisplay">
 			<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
 		</view>
 
@@ -65,11 +65,13 @@
 			<view class="height120 backcorfff" v-if="item.type == 3">
 				<view class="height20 width100"></view>
 				<view class="width92 message alijus">
-					<view class="width100 alijus" style="margin-top: -20px;" @click="test(item.childDate)" v-if="item.childDate.length == 1">
+					<view class="width100 alijus" style="margin-top: -20px;" @click="test(item.childDate)"
+						v-if="item.childDate.length == 1">
 						<view class="width80p paddleft10 alijusstart">
 							<view class="stus"></view>
 							<view class="paddleft10 font14 fcor666 text1 width70">
-								{{item.childDate[0].title}}</view>
+								{{item.childDate[0].title}}
+							</view>
 							<view class="width25 font13 fcor999">{{swipers.timeData}}</view>
 						</view>
 						<view class="width20 alijus">
@@ -82,7 +84,8 @@
 							<view class="width80p paddleft10 alijusstart">
 								<view class="stus"></view>
 								<view class="paddleft10 font14 fcor666 text1 width70">
-									{{swipers.title}}</view>
+									{{swipers.title}}
+								</view>
 								<view class="width25 font13 fcor999">{{swipers.timeData}}</view>
 							</view>
 							<view class="width20 alijus">
@@ -112,8 +115,10 @@
 				<view class="width30 font14 fotrt fcor666">更多</view>
 			</view>
 			<view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
-				<view class="backcorfff spcarea border-r" v-for="(goods,index) in item.childDate" :key="index">
-					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0" :src="imageUrl+goods.couponImg"></image>
+				<view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"
+					@click="toGoods(item.detailJumpUrl,goods.id)">
+					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
+						:src="imageUrl+goods.couponImg"></image>
 					<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
 					<!-- <view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
 					</view> -->
@@ -121,8 +126,10 @@
 				</view>
 			</view>
 			<view class="width94 alijusnostart mart20" v-if="item.type == 9 ">
-				<view class="backcorfff spcarea border-r" v-for="(goods,index) in item.childDate" :key="index">
-					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0" :src="imageUrl+goods.listImg"></image>
+				<view class="backcorfff spcarea border-r" v-for="(goods,index2) in item.childDate" :key="index2"
+					@click="toGoods(item.detailJumpUrl,goods.id)">
+					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
+						:src="imageUrl+goods.listImg"></image>
 					<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
 					<!-- <view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
 						{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}}
@@ -137,8 +144,8 @@
 				</view>
 			</view>
 			<image class="width90 mart10" mode="widthFix" v-if="item.type == 5"
-				:src="imageUrl+item.childCategory[0].imgData"
-				@click="goGoodsList(item.childCategory[0].jumpUrl)"></image>
+				:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
+			</image>
 			<view class="width90 alijusstart mart10" v-if="item.type == 5">
 				<image :src="imageUrl+item.childCategory[1].imgData" mode="widthFix" class="width31"
 					@click="goGoodsList(item.childCategory[1].jumpUrl)"></image>
@@ -609,9 +616,9 @@
 				})
 			},
 			//商品跳转
-			toGoods(e) {
+			toGoods(e, id) {
 				uni.navigateTo({
-					url: '../../goods/goods?id=' + e
+					url: e + id
 				});
 			},
 
@@ -982,4 +989,4 @@
 			border-radius: 50%;
 		}
 	}
-</style>
+</style>