From 9356e7ba0d187589b6f3c86de450a9e82a7e1b9a Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 28 Jun 2021 15:18:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?ui=E4=BF=AE=E6=94=B92.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 colorui/main.css               |  8 ++++----
 components/me-tabs/me-tabs.vue |  2 +-
 pages/order/apply-details.vue  | 11 ++++++++---
 pages/order/apply-refund.vue   |  2 +-
 pages/order/index.vue          |  8 +++++++-
 pages/order/order-details.vue  |  4 ++--
 pages/order/unpay-details.vue  |  5 +++--
 7 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/colorui/main.css b/colorui/main.css
index 3d190f7..ea9cc53 100644
--- a/colorui/main.css
+++ b/colorui/main.css
@@ -3396,7 +3396,7 @@ scroll-view.cu-steps .cu-item {
 	float: right;
 }
 .border {
-	border: 1px solid #ccc;
+	border: 1px solid #777!important;
 }
 
 /* ==================
@@ -3465,7 +3465,7 @@ scroll-view.cu-steps .cu-item {
 
 .line-gray::after,
 .lines-gray::after {
-	border-color: #aaaaaa;
+	border-color: #777777!important;
 }
 
 .line-black::after,
@@ -3559,7 +3559,7 @@ scroll-view.cu-steps .cu-item {
 
 .bg-white {
 	background-color: #ffffff;
-	color: #666666;
+	color: #777;
 }
 
 .bg-shadeTop {
@@ -3980,7 +3980,7 @@ scroll-view.cu-steps .cu-item {
 .text-gray,
 .line-gray,
 .lines-gray {
-	color: #777777;
+	color: #777777!important;
 }
 
 .text-black,
diff --git a/components/me-tabs/me-tabs.vue b/components/me-tabs/me-tabs.vue
index cdec867..b65a1ae 100644
--- a/components/me-tabs/me-tabs.vue
+++ b/components/me-tabs/me-tabs.vue
@@ -145,7 +145,7 @@
 		}
 
 		.tabs-item {
-			margin-left: 4rpx;
+			margin:0 4rpx;
 			border-radius: 16px;
 			display: flex;
 			position: relative;
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 944845e..840a631 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -68,7 +68,7 @@
 				<view class="padding-lr bg-white" style="padding-top: 30rpx;">
 					<view class="cu-self menu">
 						<view class="text-gray lf-font-28">
-							由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text class="text-orange">《{{checkArea}}》</text>或咨询客服
+							由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text @tap="$routerGo('/pages/agreement/agreement?id='+checkAreaId)" class="text-orange">《{{checkArea}}》</text>或咨询客服
 						</view>
 					</view>
 				</view>
@@ -80,11 +80,14 @@
 				<view class="cu-self menu">
 					<view class="lf-font-32 text-black1">退款说明</view>
 				</view>
-				<view class="cu-self menu" style="margin-top: 20rpx;padding-bottom: 20rpx;border-bottom: 1px solid #F5F5F5;">
+				<view class="cu-self menu" style="margin-top: 20rpx;padding-bottom: 20rpx;border-bottom: 1px solid #F5F5F5;" v-if="images.length == 0">
+					<view class="text-gray lf-font-32">{{orderDetails.comment}}</view>
+				</view>
+				<view class="cu-self menu" style="margin-top: 20rpx;" v-else>
 					<view class="text-gray lf-font-32">{{orderDetails.comment}}</view>
 				</view>
 			</view>
-			<view class="cu-form-group">
+			<view class="cu-form-group solid-bottom" style="padding-bottom: 20rpx;" v-if="images.length != 0">
 				<view class="grid col-4 grid-square flex-sub">
 					<view style="width: 212rpx;height: 212rpx;border-radius: 10rpx;" class="bg-img" v-for="(item,index) of images" :key="index">
 						<image :src="item.path" @tap="showImg(item.path)" style="width: 216rpx;height: 216rpx;" mode="aspectFill"></image>
@@ -111,6 +114,7 @@
 				order_id:1,
 				orderDetails: {},
 				checkArea: '',
+				checkAreaId: 1,
 				images: []
 			}
 		},
@@ -130,6 +134,7 @@
 						this.orderDetails = res.data.refund
 						this.checkArea = res.data.agreement.title
 						this.images = res.data.refund.images
+						this.checkAreaId = res.data.agreement.article_id
 						this.skeletonLoading = false
 					}
 					
diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue
index 9fbd5de..32ab6ff 100644
--- a/pages/order/apply-refund.vue
+++ b/pages/order/apply-refund.vue
@@ -67,7 +67,7 @@
 				<view class="padding-top padding-lr bg-white">
 					<view class="cu-self menu">
 						<view class="text-gray lf-font-28">
-							由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text class="text-orange">《{{applyDetails.agreement.title}}》</text>或咨询客服
+							由于产品的特殊性，在申请的过程中，供应商会向您收取部分费用。如有疑问可参与产品的<text class="text-orange" @tap="$routerGo('/pages/agreement/agreement?id='+applyDetails.agreement.article_id)">《{{applyDetails.agreement.title}}》</text>或咨询客服
 						</view>
 					</view>
 				</view>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index b9dc3fc..567a646 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -25,6 +25,7 @@
 							</text>
 							<button  v-if="item.state==1"  @tap.stop="$routerGo('/pages/order/confirm-order?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id)">立即付款</button>
 							<button  v-if="item.state==2" class="cu-btn bg-green round margin-left-sm" @tap="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
+							<button  v-if="item.state==4" class="cu-btn1 border round margin-left-sm">等待审核</button>
 						</view>
 					</view>
 				</view>
@@ -223,6 +224,11 @@
 </script>
 
 <style lang="scss" scoped>
+	.cu-btn1 {
+		background-color: white!important;
+		color: #777!important;
+		border: 1px solid #777;
+	}
 	.font-400 {
 		font-weight: 400;
 	}
@@ -254,7 +260,7 @@
 		.list {
 			border-radius: 10rpx;
 			overflow: hidden;
-			margin: 20rpx 32rpx;
+			margin: 30rpx 32rpx;
 			background-color: #FFFFFF;
 			// box-shadow: 0 0 10px 5px #e5e5e5;
 			box-shadow: 0 10rpx 20rpx 0 rgba(0, 0, 0, 0.1);
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index 9e7a092..c4900bd 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -46,7 +46,7 @@
 						<text class="text-gray lf-font-32">付款时间</text>
 						<text class="lf-font-32 text-black1">{{orderDetails.payment_at_text}}</text>
 					</view>
-					<view class="cu-bar padding-lr solid-bottom" v-if="orderDetails.payment_type != ''">
+					<view class="cu-bar padding-lr" v-if="orderDetails.payment_type != ''">
 						<text class="text-gray lf-font-32">支付方式</text>
 						<text class="lf-font-32 text-black1">{{orderDetails.payment_type}}</text>
 					</view>
@@ -54,7 +54,7 @@
 				
 				<self-line/>
 				<view class="bg-white">
-					<view class="cu-bar padding-lr solid-bottom">
+					<view class="cu-bar padding-lr">
 						<text class="text-gray lf-font-32">优惠</text>
 						<text class="lf-font-32 text-black1" v-if="orderDetails.coupons == null">暂无优惠</text>
 					</view>
diff --git a/pages/order/unpay-details.vue b/pages/order/unpay-details.vue
index 9ba15ae..3d371c5 100644
--- a/pages/order/unpay-details.vue
+++ b/pages/order/unpay-details.vue
@@ -48,7 +48,7 @@
 						<text class="text-gray lf-font-32">付款时间</text>
 						<text class="lf-font-32 text-black1">{{orderDetails.payment_at_text}}</text>
 					</view>
-					<view class="cu-bar padding-lr solid-bottom" v-if="orderDetails.payment_type != ''">
+					<view class="cu-bar padding-lr" v-if="orderDetails.payment_type != ''">
 						<text class="text-gray lf-font-32">支付方式</text>
 						<text class="lf-font-32 text-black1">{{orderDetails.payment_type}}</text>
 					</view>
@@ -56,11 +56,12 @@
 				
 				<self-line/>
 				<view class="bg-white">
-					<view class="cu-bar padding-lr solid-bottom">
+					<view class="cu-bar padding-lr">
 						<text class="text-gray lf-font-32">优惠</text>
 						<text class="lf-font-32 text-black1" v-if="orderDetails.coupons == null">暂无优惠</text>
 					</view>
 				</view>
+				<self-line/>
 			</skeleton>
 		</block>
 	</view>

From 86fb5931cb85ca8b71e40a042364a01b60ac5a04 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 28 Jun 2021 15:28:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm-order.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 3f5a3b8..804a09e 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -56,7 +56,7 @@
 							</view>
 						</checkbox-group>
 						<view class="lf-font-24 text-gray">
-							请认真阅读并同意<text>《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text>《{{orderDetails.agreement.title}}》</text>的所有条款。 
+							请认真阅读并同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>的所有条款。 
 						</view>
 					</view>
 					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top shadow">

From 7a598a03956527e857a80083a60c0e4efa3ca181 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 28 Jun 2021 16:17:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 colorui/main.css              |  6 ++++++
 pages/order/apply-details.vue |  1 -
 pages/order/confirm-order.vue | 12 ++++++++----
 pages/order/index.vue         | 15 +++++++--------
 pages/order/order-details.vue |  2 +-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/colorui/main.css b/colorui/main.css
index ea9cc53..1b52349 100644
--- a/colorui/main.css
+++ b/colorui/main.css
@@ -455,6 +455,7 @@ radio.white.checked .uni-radio-input {
 
 .solid,
 .solid-top,
+.solid-top1,
 .solid-right,
 .solid-bottom,
 .solid-left,
@@ -473,6 +474,7 @@ radio.white.checked .uni-radio-input {
 
 .solid::after,
 .solid-top::after,
+.solid-top1::after,
 .solid-right::after,
 .solid-bottom::after,
 .solid-left::after,
@@ -509,6 +511,10 @@ radio.white.checked .uni-radio-input {
 	border-top: 1upx solid rgba(0, 0, 0, 0.1);
 }
 
+.solid-top1::after {
+	border-top: 1upx solid rgba(0, 0, 0, 0.1);
+}
+
 .solid-right::after {
 	border-right: 1upx solid rgba(0, 0, 0, 0.1);
 }
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 840a631..cc4e569 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -48,7 +48,6 @@
 				</view>
 			</view>
 		</skeleton>
-		<self-line/>
 		<!-- 表单 -->
 		<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">
 			<view class="bg-white">
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 804a09e..df976af 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -2,7 +2,6 @@
 	<view>
 		<!-- 商品信息 -->
 		<block v-if="isRight(orderDetails)">
-			<self-line/>
 			<view class="bg-white padding-tb-sm">
 				<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">
 			
@@ -39,7 +38,7 @@
 			<self-line/>
 			<skeleton :loading="skeletonLoading" :row="1" :showAvatar="false" :showTitle="true">
 				<view class="bg-white">
-					<view class="cu-bar padding-lr solid-bottom">
+					<view class="cu-bar padding-lr">
 						<text class="text-gray lf-font-32">优惠</text>
 						<text class="lf-font-32 text-black1">暂无优惠</text>
 					</view>
@@ -59,7 +58,7 @@
 							请认真阅读并同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>，在小程序下单购买即表示您已默认同意<text @tap="$routerGo('/pages/agreement/agreement?id='+orderDetails.agreement.article_id)">《{{orderDetails.agreement.title}}》</text>的所有条款。 
 						</view>
 					</view>
-					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top shadow">
+					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center shadow">
 						<view class="flex align-center">
 							<text class="lf-font-28 text-gray">应付款：</text>
 							<view class="text-red text-price lf-font-42 lf-font-bold">
@@ -97,7 +96,8 @@
 				ifCheck: true,
 				type: 0,
 				order_id: 0,
-				ifDo: 1
+				ifDo: 1,
+				ifPay: true
 			}
 		},
 		computed: {
@@ -170,6 +170,8 @@
 							}
 						});
 					}else {
+						if(!this.ifPay) return;
+						this.ifPay = false;
 						if(this.type == 1){
 							this.pay();
 							return;
@@ -188,9 +190,11 @@
 								signType: res.data.signType,
 								paySign: res.data.paySign,
 								success: (res) => {
+									this.ifPay = true
 									this.$url('/pages/order/pay-success?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
 								},
 								fail: (err) => {
+									this.ifPay = true
 									this.$url('/pages/order/pay-success?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'})
 								},
 							})
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 567a646..9671c84 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -8,7 +8,7 @@
 		<view class="com" v-for="(tab, tabIndex) in tab_list" v-if="tabIndex == current" :key="tab.id">
 			<view class="flex-direction justify-around list" v-for="(item, index) in tab.list" :key="item.id" @tap="goDetails(tabIndex,index)">
 				<view class="lf-row-between">
-					<view class="left" style="position: relative;">
+					<view class="left" style="position: relative;display: flex;">
 						<image :src="item.goods.cover" mode=""></image>
 						<view class="cu-tag badge tag-self lf-font-28 font-400" :style="{'background-color':item.state_text.bg_color,'color':item.state_text.color}">{{item.state_text.text}}</view>
 					</view>
@@ -18,7 +18,7 @@
 							<text class="progress margin-right-xs">数量</text>
 							<text class="bought">x {{item.number}}</text>
 						</view>
-						<view class="lf-row-between price">
+						<view class="lf-row-between price" style="padding-right: 14rpx;">
 							<text class="lf-font-bold">
 								<text class="lf-font-24">￥</text>
 								<text class="lf-font-42">{{item.selling_price}}</text>
@@ -34,7 +34,7 @@
 						<view class="text-gray lf-font-28" style="padding: 20rpx;">
 							{{item.created_at_text}}
 						</view>
-						<view class="text-orange" v-if="item.state==1" style="padding: 20rpx;">
+						<view class="text-orange" v-if="item.state==1" style="padding: 20rpx 40rpx 20rpx 20rpx;">
 							{{item.comment_text}}
 						</view>
 					</view>
@@ -227,7 +227,7 @@
 	.cu-btn1 {
 		background-color: white!important;
 		color: #777!important;
-		border: 1px solid #777;
+		border: 1px solid #777!important;
 	}
 	.font-400 {
 		font-weight: 400;
@@ -242,7 +242,7 @@
 	.title {
 		font-size: 28rpx;
 		color: $u-content-color;
-		height: 80rpx;
+		height: 98rpx;
 	}
 
 	// tab
@@ -279,10 +279,10 @@
 
 			.right {
 				overflow: hidden;
-				width: 64%;
+				width: 67%;
 
 				.title {
-					margin: 0rpx 20rpx 10rpx 0;
+					margin: 0rpx 20rpx 0rpx 0;
 					color: #222222;
 					font-size: 32rpx;
 				}
@@ -312,7 +312,6 @@
 				.price {
 					overflow: hidden;
 					color: #FF0000;
-					margin-top: 10rpx;
 					button {
 						width: 176rpx;
 						height: 60rpx;
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index c4900bd..11ffc3f 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -82,7 +82,7 @@
 							{{orderDetails.confirm_code_text}}
 						</view>
 					</view>
-					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top btn-bottom">
+					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top1 btn-bottom">
 						<view class="flex align-center">
 							<text class="text-gray lf-font-28" style="margin-right: 20rpx;">实付款</text>
 							<view class="text-red text-price lf-font-42 lf-font-bold">