From 72d225e476a2ab5fe1e5f40941f90972b2446ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 13 Mar 2023 11:16:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/materialbenefits/materialbenefits.vue | 16 ++++++++--------
 pages/orderDetails/orderDetails.vue         |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pages/materialbenefits/materialbenefits.vue b/pages/materialbenefits/materialbenefits.vue
index 78c93e6..75ec31e 100644
--- a/pages/materialbenefits/materialbenefits.vue
+++ b/pages/materialbenefits/materialbenefits.vue
@@ -12,8 +12,8 @@
 		</view>
 		<view class="content">
 			<view class="statuss">
-				<!-- <view class="statusitem" @tap="changingcoupon('RECEIVE')"
-					:style="couponstatus=='RECEIVE'?'color: #F44B2F;':''">
+				<!-- <view class="statusitem" @tap="changingcoupon('WAIT_RECEIVE')"
+					:style="couponstatus=='WAIT_RECEIVE'?'color: #F44B2F;':''">
 					未领取
 				</view>
 				<span> |</span>
@@ -36,7 +36,7 @@
 				<view class="item" v-for="(item,index) in couponlist" :key="index"
 					:style="item.useStatus!='NOT_USED'?'height:180rpx':''">
 					<view class="top"
-						:style="item.useStatus!='NOT_USED'&&item.useStatus!='RECEIVE'?'background: #EFECEC;color: #4B4B4B;':''">
+						:style="item.useStatus!='NOT_USED'&&item.useStatus!='WAIT_RECEIVE'?'background: #EFECEC;color: #4B4B4B;':''">
 						<view class="title">
 							<span class="text">
 								￥
@@ -46,19 +46,19 @@
 							</span>
 						</view>
 						<view class="what"
-							:style="item.useStatus!='NOT_USED'&&item.useStatus!='RECEIVE'?'background: #DADADA;;':''">
+							:style="item.useStatus!='NOT_USED'&&item.useStatus!='WAIT_RECEIVE'?'background: #DADADA;;':''">
 							{{item.couponTitle}}
 						</view>
 						<view class="texts">
 							满{{item.couponConsumePrice}}可用
 						</view>
-						<view class="time" v-if="item.useStatus!='RECEIVE'">
+						<view class="time" v-if="item.useStatus!='WAIT_RECEIVE'">
 							有效期至{{item.expirationEndTime}}
 						</view>
-						<view class="btn" v-if="item.useStatus=='RECEIVE'" @tap='logininfo(item)'>
-							{{item.useStatus=='RECEIVE'?'领取':''}}
+						<view class="btn" v-if="item.useStatus=='WAIT_RECEIVE'" @tap='logininfo(item)'>
+							{{item.useStatus=='WAIT_RECEIVE'?'领取':''}}
 						</view>
-						<view class="btngq" v-if="item.useStatus!='NOT_USED'&&item.useStatus!='RECEIVE'">
+						<view class="btngq" v-if="item.useStatus!='NOT_USED'&&item.useStatus!='WAIT_RECEIVE'">
 							{{item.useStatus=='EXPIRED'?'已过期':''}}
 							{{item.useStatus=='USED'?'已使用':''}}
 						</view>
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index f990774..14abd7b 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -169,7 +169,7 @@
 				confirmReceipt(this.order.goOrderNo).then(res => {
 					if (res.code == 200) {
 						this.$refs.uToast.show({
-							title: '收货成功',
+							title: '完成订单成功',
 							type: 'success',
 							duration: '1000'
 						})
@@ -183,7 +183,7 @@
 						}, 1000)
 					} else {
 						this.$refs.uToast.show({
-							title: '收货失败',
+							title: '完成订单失败',
 							type: 'error',
 							duration: '1000'
 						})