From 5ed3d8af084b3002d2de4d62d16eccf78f677deb Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 16 Sep 2021 16:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80=E7=A0=81=E4=BC=98=E5=8C=96=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-nav/lf-nav.vue   |  2 +-
 pages/order/confirm_atonce.vue | 27 ++++++++++----
 pages/order/order_details.vue  | 67 ++++++++++++----------------------
 pages/search/search.vue        |  7 ++--
 pages/search/searchList.vue    |  2 +-
 5 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue
index aacc359..b988266 100644
--- a/components/lf-nav/lf-nav.vue
+++ b/components/lf-nav/lf-nav.vue
@@ -85,7 +85,7 @@
 		methods: {
 			goSearch() {
 				console.log(1)
-				uni.redirectTo({
+				uni.navigateTo({
 					url: '/pages/search/search'
 				})
 			},
diff --git a/pages/order/confirm_atonce.vue b/pages/order/confirm_atonce.vue
index 0ab6664..8c02dd5 100644
--- a/pages/order/confirm_atonce.vue
+++ b/pages/order/confirm_atonce.vue
@@ -78,20 +78,31 @@
 							})
 						},
 						fail: (err) => {
-							wx.navigateBackMiniProgram({
-								extraData: {
-									backPayState: false,
-									payorder_id: that.order_id
-								},
-								success(res) {}
-							})
+							uni.showModal({
+								title: '提示',
+								content: JSON.stringify(err),
+								confirmColor: '#1998FE',
+								showCancel: false,
+								success(res2) {
+									if (res2.confirm) {
+										wx.navigateBackMiniProgram({
+											extraData: {
+												backPayState: false,
+												payorder_id: that.order_id
+											},
+											success(res) {}
+										})
+									}
+								}
+							});
 						},
 					})
 				}).catch(err => {
 					uni.showModal({
 						title: '提示',
-						content: '支付获取订单失败',
+						content: JSON.stringify(err),
 						showCancel: false,
+						confirmColor: '#1998FE',
 						success(res2) {
 							if (res2.confirm) {
 								wx.navigateBackMiniProgram({
diff --git a/pages/order/order_details.vue b/pages/order/order_details.vue
index cc4694b..dc8ec1c 100644
--- a/pages/order/order_details.vue
+++ b/pages/order/order_details.vue
@@ -56,28 +56,16 @@
 					<text class="lf-font-28 text-black1">{{orderDetails.mobile}}</text>
 				</view>
 			</view>
-
-			<!-- <self-line />
-			<view class="bg-white">
-				<view class="cu-bar padding-lr">
-					<text class="lf-color-555 lf-font-28">优惠</text>
-					<view v-if="orderDetails.coupon != ''">
-						<text class="lf-color-price lf-font-28 lf-m-l-10" v-for="(item,index) of orderDetails.coupon">{{item.tag}}</text>
-					</view>
-					<view v-else>
-						<text class="lf-color-price lf-font-28 lf-m-l-10">暂无优惠</text>
-					</view>
-				</view>
-			</view> -->
-
 			<view>
 				<self-line />
 				<view class="bg-white flex flex-direction justify-around align-center text-center padding-tb"
 					style="padding-bottom: 140rpx;">
 					<view>
-						<!-- <tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="115" unit="px" background="#fff"
-							foreground="#000" pdground="#000" :onval="true" :loadMake="true" /> -->
-							<image v-if="orderDetails.verify_qrcode" :src="orderDetails.verify_qrcode" mode="aspectFill" style="width: 300rpx;height: 300rpx;"></image>
+							<image v-if="orderDetails.verify_qrcode" :src="orderDetails.verify_qrcode" mode="aspectFill" style="width: 300rpx;height: 300rpx;" :class="!orderDetails.verify_qrcode?'filter-code':''"></image>
+							<view class="qrcode-loading" v-else>
+								<text class="lf-font-40 lf-color-333" :class="!orderDetails.verify_qrcode?'loading-more-text':''"></text>
+								<view class="lf-m-t-40 lf-color-gray">核销码生成中</view>
+							</view>
 					</view>
 					<view class="lf-m-t-10">
 						<view class="lf-font-28 text-black1">
@@ -89,31 +77,14 @@
 						<view class="lf-color-green lf-font-28 lf-flex lf-m-t-10">
 							<text v-if="orderDetails.verify_code && orderDetails.status != 16">待使用</text>
 							<text v-if="orderDetails.verify_code && orderDetails.status == 16">已使用</text>
-							<!-- <text class="lf-iconfont lf-icon-shuaxin1 lf-font-40"
-								style="color: #999;position: relative;left: 84rpx;top: -42rpx;display: inherit;"
-								@tap="refreshCode()"></text> -->
-							<!-- <image src="../../static/center/refresh.png" 
-								style="color: #999;position: relative;left: 28rpx;top: 0rpx;display: inherit; width: 30rpx;height: 30rpx;"
-								@tap="refreshCode()">
-							</image> -->
 						</view>
-					</view>
-					<!-- <view style="margin-top: 44rpx;" v-else>
-						<view class="lf-color-999 lf-font-28">
-							
-						</view> 
-					</view> -->
+					</view>							
 				</view>
 				<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="lf-color-555 lf-font-28" style="margin-right: 20rpx;">实付款</text>
 						<lf-price :price="orderDetails.price" />
 					</view>
-					
-					<!-- <button class="btn bg-green" v-if="orderDetails.status == 2 || orderDetails.status == 3">
-						<text class="lf-font-32 text-white">立即使用</text>
-					</button> -->
-					
 					<button class="btn bg-green" v-if="orderDetails.status == 0" @click="payAtonce()">
 						<text class="lf-font-32 text-white">立即付款</text>
 					</button>
@@ -122,10 +93,6 @@
 						<text class="lf-font-32 text-white">支付尾款</text>
 					</button>
 					
-					<!-- <button class="btn bg-blue" v-if="orderDetails.status == 16">
-						<text class="lf-font-32 text-white">已使用</text>
-					</button> -->
-					
 					<button class="btn lf-bg-gray" v-if="orderDetails.status == 6">
 						<text class="lf-font-32 text-white">等待审核</text>
 					</button>
@@ -145,10 +112,6 @@
 					<button class="btn lf-bg-gray" v-if="orderDetails.status == -1">
 						<text class="lf-font-32 text-white">已取消</text>
 					</button>
-					
-					<!-- <button class="btn lf-bg-gray" v-else>
-						<text class="lf-font-32 text-white">{{orderDetails.status_text}}</text>
-					</button> -->
 				</view>
 			</view>
 		</block>
@@ -252,6 +215,24 @@
 </script>
 
 <style lang="scss" scoped>
+	.loading-more-text::before {
+		height: 60rpx;
+		width: 60rpx;
+	}
+	.qrcode-loading {
+		width: 300rpx;
+		height: 300rpx;
+		background-color: rgba(25, 152, 254, 0.05);
+		display: flex;
+		align-items: center;
+		text-align: center;
+		flex-direction: column;
+		justify-content: center;
+		border-radius: 10rpx;
+	}
+	.filter-code{
+		filter: blur(6rpx);
+	}
 	.btn{
 		margin: 0;
 		padding: 0;
diff --git a/pages/search/search.vue b/pages/search/search.vue
index f670448..42cfcd8 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -9,7 +9,7 @@
 				历史搜索
 			</view>
 			<view class="lf-flex lf-flex-wrap lf-p-l-20 lf-p-r-20">
-				<view class="search-tag" v-for="i of historySearch" @click="gosearch(i)">{{i}}</view>
+				<view class="search-tag" v-for="(i,index) of historySearch" :key="index" @click="gosearch(i)">{{i}}</view>
 			</view>
 		</view>
 		<view class="history-card" v-else>
@@ -39,9 +39,8 @@
 				})
 			},
 			setSearch() {
-				console.log(this.searchContent)
-				// let list = [];
-				list.push(this.searchContent)
+				list.push(this.searchContent);
+				list = [...new Set(list)];
 				uni.navigateTo({
 					url: '/pages/search/searchList?serach_content=' + this.searchContent
 				})
diff --git a/pages/search/searchList.vue b/pages/search/searchList.vue
index 1c7a8a9..4fbb060 100644
--- a/pages/search/searchList.vue
+++ b/pages/search/searchList.vue
@@ -12,7 +12,7 @@
 					<u-icon name="arrow-down" style="font-size: 20rpx;" :class="sort==0?'lf-color-blue':''"></u-icon>
 				</view>
 			</view>
-			<swiper :style="{height: '800rpx', width: '750rpx'}" :current="current" @change="swiperChange">
+			<swiper :style="{height: '1300rpx', width: '750rpx'}" :current="current" @change="swiperChange">
 				<swiper-item v-for="(tabItem, tabIndex) in tab_list" :key="tabIndex">
 					<scroll-view class="com" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="tabItem.isRefresher" @scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
 						<view class="lf-m-t-20"></view>