From daaa71c3ae2ddde77d0d7f626e67fb0bfcdfed0c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 22 Sep 2022 14:28:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A22.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                  |   5 +-
 pages/tabBar/home/home.vue                  |   4 +-
 pages/user/coupon/coupon.vue                |  39 +++++-----
 qianzhu-KFC/order-details/order-details.vue |  76 ++++++++++----------
 qianzhu-KFC/static/imgs/desloca.png         | Bin 0 -> 904 bytes
 5 files changed, 69 insertions(+), 55 deletions(-)
 create mode 100644 qianzhu-KFC/static/imgs/desloca.png

diff --git a/pages.json b/pages.json
index 19f70be..c83bb07 100644
--- a/pages.json
+++ b/pages.json
@@ -868,7 +868,10 @@
 			"path": "order-details/order-details",
 			"style": {
 				"navigationBarTitleText": "订单详情",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#3da7e7",
+				"backgroundColorTop": "#3da7e7",
+				"navigationBarTextStyle": "white"
 			}
 
 		}, {
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 35ea94e..1d84e11 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -760,7 +760,9 @@
 				this.currentSwiper = event.detail.current;
 			},
 			test(item) {
-				let a = item % 2;
+				uni.navigateTo({
+					url:'../../user/news/news'
+				})
 			},
 
 			eheckStu(item) {
diff --git a/pages/user/coupon/coupon.vue b/pages/user/coupon/coupon.vue
index 8718087..c6af601 100644
--- a/pages/user/coupon/coupon.vue
+++ b/pages/user/coupon/coupon.vue
@@ -22,8 +22,8 @@
 					<!-- content -->
 					<view class="carrier">
 						<view class="left">
-							<view class="alijusstart">
-								<view class="alijus width50 font12 fotct fcorfff"
+							<view class="alijusstart" style="margin-top: -7px;">
+								<view class="alijus font12 fotct fcorfff"
 									style="width: 70px;height: 20px;background-color: #3ecbb0;margin-right: 2px;">
 									<image src="../../../static/img/user/user15.png" mode="widthFix" class="icon12">
 									</image>
@@ -279,6 +279,10 @@
 					uni.navigateTo({
 						url: '/member-Recharge/choicepage/choicepage'
 					})
+				} else if (e.highDiscount.useScope == 7) {
+					uni.navigateTo({
+						url: '../../goods/refuel/refuel'
+					})
 				} else {
 					uni.navigateTo({
 						url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id
@@ -534,7 +538,6 @@
 					animation: closeMenu 0.15s linear both;
 				}
 
-				background-color: #fff;
 				position: absolute;
 				width: 100%;
 				padding: 0 0;
@@ -543,7 +546,9 @@
 				flex-wrap: nowrap;
 
 				.left {
-					width: 100%;
+					background-color: #fff;
+					width: 72%;
+					background-image: radial-gradient(6px at top right, #f5f5f5 50px, #ffffff);
 
 					.title {
 						width: 90%;
@@ -552,8 +557,9 @@
 					}
 
 					.term {
-						width: 90%;
-						margin: 0 5%;
+						width: 95%;
+						background-image: radial-gradient(6px at bottom right, #f5f5f5 50px, #ffffff);
+						margin-left: 5%;
 						font-size: 26upx;
 						color: #999;
 					}
@@ -591,7 +597,8 @@
 					flex-shrink: 0;
 					width: 28%;
 					color: #fff;
-					background: linear-gradient(to right, #ec625c, #ee827f);
+					background: linear-gradient(to right, #66c4ff, #009DFF);
+					background-image: radial-gradient(6px at bottom left, #f5f5f5 50px, #009DFF);
 
 					&.invalid {
 						background: linear-gradient(to right, #aaa, #999);
@@ -609,18 +616,18 @@
 					}
 
 					.ticket {
+						background-image: radial-gradient(6px at top left, #f5f5f5 50px, #009DFF);
 						padding-top: 1vw;
 						justify-content: center;
 						align-items: baseline;
-						height: 6vw;
 
 						.num {
-							font-size: 42upx;
+							font-size: 60upx;
 							font-weight: 600;
 						}
 
 						.unit {
-							font-size: 24upx;
+							font-size: 28upx;
 						}
 					}
 
@@ -631,15 +638,15 @@
 					}
 
 					.use {
-						width: 50%;
-						height: 40upx;
+						width: 70%;
+						height: 60rpx;
 						justify-content: center;
 						align-items: center;
-						font-size: 24upx;
+						font-size: 28rpx;
 						background-color: #fff;
-						color: #ee827f;
-						border-radius: 40upx;
-						padding: 0 10upx;
+						color: #009DFF;
+						border-radius: 40rpx;
+						padding: 0 10rpx;
 					}
 				}
 			}
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index 63082b0..b9fc1d8 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -1,19 +1,17 @@
 <template>
 	<view>
-		<view class="width100 paddtop10 paddbotm10 headsbg backcorfff fotct" v-if="orderList.orderStatus == 1">
+		<view class="width100 paddtop10 paddbotm10 backcorfff fotct" v-if="orderList.orderStatus == 1">
 			<view class="height20"></view>
 			<view class="headstu font18 fontwig6">
 				{{countdownm}}:{{countdowns}}
 			</view>
-			<view class="width100  font18 colorc72 mart5">
+			<!-- <view class="width100  font18 colorc72 mart5">
 				{{typeText[orderList.orderStatus]}}
-			</view>
-			<view class="width100  font13 fcor666 mart5">若超时未支付,订单将自动取消</view>
-			<view class="stubtn mart15 backcorf2f6" v-if="typeid == 9" @click="jumppay()">立即支付</view>
+			</view> -->
+			<view class="width100  font13 fcor666 mart10">若超时未支付,订单将自动取消</view>
 			<!-- <view class="stubtn mart15 backcorf2f6" v-if="colorc3 == 9">¥ {{orderList.payPrice}}</view>
 			<view class="stubtn mart15 backcorf2f6" v-if="typeid == 4 || typeid == 10">¥ {{orderList.payPrice}}</view> -->
-			<view class="stubtn mart15" v-if="typeid == 4 || typeid == 10" style="background-color: #c72a20;"
-				@click="jumppay()">立即支付
+			<view class="stubtn mart15" style="background-color: #0F8FE8;" @click="jumppay()">立即支付
 			</view>
 		</view>
 
@@ -22,13 +20,13 @@
 				v-if="orderList.orderStatus != 2 && orderList.orderStatus != 3">
 				<image mode="widthFix" class="width50" src="../static/imgs/otherstu.png"></image>
 			</view>
-			<view class="width100  font18 fcor666 mart15"
+			<view class="width100  font18 fcorfff mart15"
 				v-if=" orderList.orderStatus != 2  && orderList.orderStatus != 3">
 				{{typeText[orderList.orderStatus]}}
 			</view>
 
 			<view v-if="(orderList.orderStatus == 2 || orderList.orderStatus == 3 ) && typeid != 10">
-				<view class="fotct font14 width100  fcor999">您的取餐码为</view>
+				<view class="fotct font16 width100  fcorfff">{{orderList.statusDesc}}</view>
 				<view v-if="typeid == 4 && orderList.list && phonestu == 2">
 					<view class="width90 alijusstart mart10" v-for="(item,index) in orderList.list" :key='index'>
 						<view class="font14 width50 fcor666">取餐号: <text class="colorc3 font18">{{item.code}}</text>
@@ -44,8 +42,9 @@
 						</view>
 					</view>
 				</view>
-				<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && orderList.list">请取餐</view>
-				<view class="phoneck" v-if="typeid == 4 && orderList.list && phonestu == 1" @click="updatestu">查看手机号</view>
+				<!-- <view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && orderList.list">请取餐</view> -->
+				<view class="phoneck" v-if="typeid == 4 && orderList.list && phonestu == 1" @click="updatestu">查看手机号
+				</view>
 				<view v-if="typeid == 9 && orderList.object.orderItems[0].code">
 					<view class="fotct font18 width100 mart10 color2f6f43"
 						v-for="(item,index) in orderList.object.orderItems" :key='index'>{{item.code}}</view>
@@ -55,11 +54,11 @@
 				</view>
 				<view class="fotct font20 width100 mart10 color2f6f43"
 					v-if="typeid == 9 && !orderList.object.orderItems[0].code">{{orderList.statusDesc}}</view>
-				<view class="fotct font13 width100 mart15 fcor666">请至柜台凭取餐码取餐</view>
+				<!-- <view class="fotct font13 width100 mart15 fcor666">请至柜台凭取餐码取餐</view>
 				<view class="fotct font13 width100 mart5 fcor666">如有询问手机号尾号请告知</view>
-				<view class="fotct font13 width100 mart5 colorc3">注:平台取餐手机号皆为虚拟号码</view>
-				<view class="fotct font20 width100 mart10 color2f6f43"
-					v-if="typeid == 9 && orderList.object.orderItems[0].code">请取餐</view>
+				<view class="fotct font13 width100 mart5 colorc3">注:平台取餐手机号皆为虚拟号码</view> -->
+				<!-- <view class="fotct font20 width100 mart10 color2f6f43"
+					v-if="typeid == 9 && orderList.object.orderItems[0].code">请取餐</view> -->
 			</view>
 
 		</view>
@@ -67,23 +66,21 @@
 			注:约5分钟后取餐,请尽快到餐厅取餐哦
 		</view> -->
 
-		<view class="concont width94 mart10 backcorfff">
-			<view class="width94 paddtop10 font16 fontwig6" v-if="typeid == 10">
-				充值明细
+		<view class="concont width94 mart20 backcorfff">
+			<view class="width94 paddtop15 font16 fontwig6 alijusstart">
+				<image src="../static/imgs/desloca.png" mode="widthFix" class="icon20 marglerig"></image> 南充麦当劳潆华南路餐厅
 			</view>
-			<view class="width94 paddtop10 font16 fontwig6" v-else>
-				餐品明细
-			</view>
-			<view class="width100 bor-botm1 mart10 marb10"></view>
-			<view class="width100">
-				<view class="width90 alijusstart mart10 bor-botm1" v-for="(item,index) in orderList.highChildOrderList"
+			<view class="width100 mart5">
+				<view class="width90 alijusstart mart15" v-for="(item,index) in orderList.highChildOrderList"
 					:key="index">
 					<view class="width30">
 						<image :src="item.goodsImg" v-if="item.goodsImg" mode="widthFix" class="width100"></image>
 						<image src="../static/imgs/vipcz.png" v-else mode="widthFix" class="width90w"></image>
 					</view>
-					<view class="width40 font13 fcor666">{{item.goodsName}}</view>
-					<view class="width10 font12 fcor999">x{{item.saleCount}}</view>
+					<view class="width50 font13 fcor666">
+						<view>{{item.goodsName}}</view>
+						<view class="font12 fcor999">{{item.saleCount}} 份</view>
+					</view>
 					<view class="width20">
 						<view class="width100 fcor333 font12">¥<text
 								class="fontwig6 font16">{{item.goodsActualPrice}}</text>
@@ -101,8 +98,9 @@
 						¥{{orderList.totalPrice}}</text>
 				</view>
 			</view>
-		</view>
 
+			<view class="width96 mart10 marb5" style="border:1px dashed #f4f4f4;"></view>
+		</view>
 		<view class="concont width94 mart10 backcorfff marb30">
 			<view class="width94 alijusstart paddtop10 font14 fcor666">
 				订单信息
@@ -356,15 +354,16 @@
 	}
 
 	.headstu {
-		width: 80px;
-		height: 80px;
-		line-height: 80px;
+		width: 90px;
+		height: 90px;
+		line-height: 90px;
 		text-align: center;
 		border-radius: 50%;
-		background-color: #faf1f1;
-		color: #c72a20;
-		margin-left: 40%;
-		border: 1px solid #c72a20;
+		background-color: #C6DEF4;
+		color: #0189E7;
+		margin-left: auto;
+		margin-right: auto;
+		border: 1px solid #0096FF;
 	}
 
 	.headotherstu {
@@ -373,7 +372,8 @@
 		line-height: 80px;
 		text-align: center;
 		border-radius: 50%;
-		margin-left: 40%;
+		margin-left: auto;
+		margin-right: auto;
 		background-color: #999999;
 	}
 
@@ -404,11 +404,13 @@
 	}
 
 	.headsbg {
-		border-radius: 0 0 30px 30px;
+		// border-radius: 0 0 30px 30px;
+		background: linear-gradient(to bottom, #3da7e7, #e8eff4);
 	}
 
 	.concont {
-		border-radius: 12px;
+		border-radius: 12px 12px 0 0;
+		background-image: radial-gradient(6px at bottom right, #f0f0f0 50px, #ffffff);
 	}
 
 	.footbtn {
diff --git a/qianzhu-KFC/static/imgs/desloca.png b/qianzhu-KFC/static/imgs/desloca.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cc9addac0434eec3417aef292a48f7b17d7e47c
GIT binary patch
literal 904
zcmV;319$w1P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px&LP<nHR5(wq)PGFWWgG|a_xm~Tj!Qv2N-5hiafO&p?@Ed@rCD1<T;LA<2Zyc3
zoNfIuYt{O((cJpWuv)84shBO13EnxnA#Sqb6teG;4#*ZYwzd$NXQFTici-pJzEmue
zj(>RmdwzUg&*%9(&mLlq8|T==|AOn+SLB!uy$wJ$AZq|>5jjuAgNan4x$jI{Y^G#p
z1icS$xgBCQ15yCsOPF#(D{4ixNgz)X_}NTx+YepG2LFrR1p0jb%s6p`RC(^r%WLm?
z-uIZENIe0Pw5yZDhkK3>HTJ#<Ex*l6CIj8w;n9DiH-X+Fe<>6j7H!I_S+=|A?eSk?
zYkqHt0s<`E;X%f7_ux>yQ9B&$-!CFNqLEN@dT_&2O#(PQ!K$+WYk%6^3fgU;BFu>t
z^7oYjln;CShwg-6+=v9L(t;je`FDVMY+bPWQ4){zK64cAjdxoK;!4M_xbL$702)2z
zUmS$+MWZu#?`#>K5=wYo%XS}0|48cv3^(^p#pG75#;uRvW8vYRvW9LdR2ZG1wX=cm
z3HYEVRCNGAy`;oGIdXj}#&O$x(56y4Y3@1~_-ZF0T}Ef{x!J%%0PW7)%)Ki=_HU$3
zl~`w-4l;FH@2*f+^5W<o5wj#3Y5g`WSWr;uaJeVy02OfME!>m;zJIfbY^QY<BB6oT
z+74g8Fj6OimeH)q7Y4%NiL{_K>Gjsw=^Fl2fGy6Y*)Og9p!7*9<P5yk{>inzOCO2g
zYsU3X!#F;k_F=DBQQ};<*jWRLN2|$KsU7c<sC49JzF}Xo;L6y!p*jIhLhH|=)a!(9
ziN`Vy^!GPS{sT|frm(Oi%e31Yg?vCXPUqd>sAyWXN<8h+{UoccHz&l2M9lH5%bmy-
zsCoh(5$SdTTO*OsH4B{vy$_Y;!=_FNq>*vwJBHD8^{?ZX-6Af&0;old+o#9Z7MEwM
zl<Wl%fKtWLZ(4r50bEvGoRO2t+6UoQP{u@fhQRlt<f3S~JhfOchk_;6J^+g#SOB8&
z^1Q1r4|a4UZUC*0b;I+slLaRA1_JkkSPgJ70QcWDiUD#7!t<a$tF-O(*dO-(8EZIK
eAMKp~*na|I7g{8IMScAM0000<MNUMnLSTaKez+O{

literal 0
HcmV?d00001