From 1997a3ec8040df18890fe86ab3100399cbd9deb7 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 1 Jul 2021 17:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=20?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=94=B5=E8=AF=9D=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=20=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9=20=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=8A=B6=E6=80=81=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E5=92=8C=E9=A6=96=E9=A1=B5=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                  |  2 +-
 pages/contactService/index.vue |  2 +-
 pages/index/index.vue          |  2 +-
 pages/order/confirm-atonce.vue |  4 +---
 pages/order/confirm-order.vue  | 21 ++++++++++++++++-----
 pages/order/index.vue          |  8 ++++----
 pages/order/order-details.vue  |  8 ++++++--
 pages/order/pay-success.vue    |  6 +++---
 pages/order/unpay-details.vue  |  1 -
 9 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/manifest.json b/manifest.json
index 540de4d..8cb7e40 100644
--- a/manifest.json
+++ b/manifest.json
@@ -62,7 +62,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxb35ef055a4dd8ad4",
+        "appid" : "wx1031981885c80917",
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,
diff --git a/pages/contactService/index.vue b/pages/contactService/index.vue
index c052867..f232551 100644
--- a/pages/contactService/index.vue
+++ b/pages/contactService/index.vue
@@ -10,7 +10,7 @@
 		</view>
 		<view class="lf-row-between item" @click="makePhoneCall">
 			<view class="lf-color-gray">客服电话</view>
-			<view>{{ info.phone }}</view>
+			<view style="color: #1E89FF!important;">{{ info.phone }}</view>
 		</view>
 		<view class="lf-row-between item">
 			<view class="lf-color-gray">联系地址</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4599688..8a8a05b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,7 +6,7 @@
 		<view class="com" v-for="(tab, tabIndex) in tab_list" v-if="tabIndex == current" :key="tab.id">
 			<view class="lf-row-between list" v-for="(item, index) in tab.list" :key="item.id" @click="toDetail(item)">
 				<view class="left">
-					<image :src="item.cover" mode="aspectFit"></image>
+					<image :src="item.cover" mode="aspectFill"></image>
 				</view>
 				<view class="right">
 					<view class="lf-line-2 title">{{ item.name }}</view>
diff --git a/pages/order/confirm-atonce.vue b/pages/order/confirm-atonce.vue
index c451850..0e00d7a 100644
--- a/pages/order/confirm-atonce.vue
+++ b/pages/order/confirm-atonce.vue
@@ -111,9 +111,8 @@
 			this.order_id = e.order_id;
 			this.goods_specs_id = e.goods_specs_id
 			this.num = e.order_number
-			if(this.goods_id && this.goods_specs_id) {
+			if(this.goods_id && this.goods_specs_id && this.order_id) {
 				this.getConfirmOrder()
-				
 				this.submit()
 			}
 		},
@@ -189,7 +188,6 @@
 				});
 			},
 			pay(){
-				console.log("this.order_id", this.order_id)
 				this.$http(this.API.API_PAYMENT_DIRECT, {order_id: this.order_id}).then(res => {
 					this.order_id = res.data.order_id
 					uni.requestPayment({
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index f60c81b..0910dc6 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -8,7 +8,7 @@
 					<view class="flex justify-between align-start padding-top-sm padding-lr">
 						<image :src="orderDetails.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
 						<view class="flex-sub padding-left-sm">
-							<view class="bref-box margin-top-xs lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
+							<view class="bref-box lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
 								{{orderDetails.goods.name}}
 							</view>
 							<view class="flex justify-between align-center text-center">
@@ -66,7 +66,8 @@
 								{{ total(num, orderDetails.goods.specs[0].selling_price) }}
 							</view> -->
 						</view>
-						<button class="cu-btn block bg-orange round shadow" @tap="submit">
+						
+						<button class="btn" @tap="submit">
 							<text class="lf-font-32 text-white" v-if="type == 1">立即付款</text>
 							<text class="lf-font-32 text-white" v-else>下单付款</text>
 						</button>
@@ -132,7 +133,7 @@
 		methods: {
 			changeNum(num) {
 				if(num > this.limit) {
-					this.$msg('该商品限购数量'+this.limit)
+					this.$msg('该商品限购'+this.limit+'件')
 					this.num = this.limit
 					return
 				}else if(num < 1) {
@@ -155,7 +156,7 @@
 				if(this.num < this.limit) {
 					this.num++
 				}else {
-					this.$msg('该商品限购数量'+this.limit)
+					this.$msg('该商品限购'+this.limit+'件')
 					this.num = this.limit
 					return
 				}
@@ -229,7 +230,6 @@
 				}
 			},
 			pay(){
-				console.log("this.order_id", this.order_id)
 				this.$http(this.API.API_PAYMENT_DIRECT, {order_id: this.order_id}).then(res => {
 					this.order_id = res.data.order_id
 					uni.requestPayment({
@@ -267,6 +267,17 @@
 </script>
 
 <style lang="scss" scoped>
+	.btn{
+		margin: 0;
+		padding: 0;
+		width: 208rpx;
+		height: 80rpx;
+		background-color: #FE9903;
+		color: #FFFFFF;
+		line-height: 80rpx;
+		font-size: 32rpx;
+		border-radius: 42rpx;
+	}
 	.bref-box {
 		text-overflow: -o-ellipsis-lastline;
 		overflow: hidden;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 0fe4510..3660549 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -8,7 +8,7 @@
 			<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;display: flex;">
-						<image :src="item.goods.cover" mode=""></image>
+						<image :src="item.goods.cover" mode="aspectFill"></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>
 					<view class="right">
@@ -19,9 +19,9 @@
 						</view>
 						<view class="lf-row-between price" style="padding-right: 6rpx;">
 							<lf-price :price="item.selling_price" style="margin-top: 10rpx;" />
-							<button  v-if="item.state==1" class="lf-font-28"  @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id+'&order_number='+item.number)">立即付款</button>
-							<button  v-if="item.state==2" class="cu-btn bg-green round margin-left-sm lf-font-28" @tap.stop="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
-							<button  v-if="item.state==4" class="cu-btn1 border round margin-left-sm lf-font-28">等待审核</button>
+							<button  v-if="item.state==1" class="lf-font-28" style="border-radius: 30rpx;"  @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id+'&order_number='+item.number)">立即付款</button>
+							<button  v-if="item.state==2" style="border-radius: 30rpx;"  class="cu-btn bg-green round margin-left-sm lf-font-28" @tap.stop="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
+							<button  v-if="item.state==4" class="cu-btn1 border margin-left-sm lf-font-28" style="border-radius: 30rpx;">等待审核</button>
 						</view>
 					</view>
 				</view>
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index d4433cd..a28e213 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -17,7 +17,8 @@
 								<view>
 									<button v-if="orderDetails.state == 2" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap="$routerGo('/pages/order/apply-refund?order_id='+orderDetails.id)">申请退款</button>
 									<button v-if="orderDetails.state == 1" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+orderDetails.goods_id+'&goods_specs_id='+orderDetails.goods_specs_id +'&order_id='+ orderDetails.id+'&order_number='+orderDetails.number)">立即付款</button>
-									<button v-if="orderDetails.state != 1 && orderDetails.state != 2" class="cu-btn1 border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>
+									<button v-if="orderDetails.state == 3" class="cu-btn1 margin-left-sm lf-font-28" style="width: 176rpx;height: 60rpx;line-height: 60rpx;border-radius: 30rpx;background: none;border: 1px solid #1E89FF;color: #1E89FF;">{{orderDetails.state_text.text}}</button>
+									<button v-if="orderDetails.state != 1 && orderDetails.state != 2 && orderDetails.state != 3" class="cu-btn1 border round margin-left-sm lf-font-28 text-gray" style="width: 176rpx;height: 60rpx;line-height: 60rpx;border-radius: 30rpx;background: none;">{{orderDetails.state_text.text}}</button>
 								</view>
 							</view>
 						</view>
@@ -69,11 +70,14 @@
 							<view class="lf-font-32 text-black1">{{checkArea}} <text style="position: relative;left: 216rpx;top: -42rpx;display: inherit;" v-if="orderDetails.state == 2" class="text-orange lf-font-28" @tap="copy(checkArea)">复制</text></view>
 						</view>
 						<view v-if="orderDetails.state == 5 || orderDetails.state == 6" style="margin-top: 46rpx;" class="text-gray lf-font-28">
-							{{orderDetails.refund_text}}
+							已使用
 						</view>
 						<view v-else style="margin-top: 10rpx;" class="text-gray lf-font-28">
 							{{orderDetails.refund_text}}
 						</view>
+						<view v-if="orderDetails.state == 3" style="margin-top: 46rpx;" class="text-gray lf-font-28">
+							已使用
+						</view>
 						<view style="margin-top: 10rpx;">
 							<view class="text-green lf-font-32" v-if="orderDetails.state == 2">
 								{{orderDetails.confirm_code_text}}
diff --git a/pages/order/pay-success.vue b/pages/order/pay-success.vue
index 57ec96b..9b03857 100644
--- a/pages/order/pay-success.vue
+++ b/pages/order/pay-success.vue
@@ -21,12 +21,12 @@
 		<view class="margin-top flex flex-direction justify-around">
 			<view class="padding-top padding-lr-lg">
 				<button class="cu-btn block bg-orange lg margin-top round" @tap="$url('/pages/order/order-details?order_id='+order_id,{type: 'launch'})">
-					<text class="text-df text-white">查看订单</text>
+					<text class="lf-font-32 text-white">查看订单</text>
 				</button>
 			</view>
 			<view class="padding-top-sm padding-lr-lg">
-				<button class="cu-btn block bg-white border lg margin-top round" @tap="$url('/pages/index/index',{type: 'switch'})">
-					<text class="text-df text-black">返回首页</text>
+				<button class="cu-btn block bg-white lg margin-top round" style="border: 1px solid #555;" @tap="$url('/pages/index/index',{type: 'switch'})">
+					<text class="lf-font-32" style="color: #555!important;">返回首页</text>
 				</button>
 			</view>
 		</view>
diff --git a/pages/order/unpay-details.vue b/pages/order/unpay-details.vue
index e90c73d..8372167 100644
--- a/pages/order/unpay-details.vue
+++ b/pages/order/unpay-details.vue
@@ -2,7 +2,6 @@
 	<view>
 		<!-- 商品信息 -->
 		<block v-if="isRight(orderDetails)">
-			<self-line/>
 			<view class="bg-white">
 				<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">