From b11f6af1fa45b7fddd049ecf5bb359920ea61b7c Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 23 Aug 2021 15:20:27 +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/=E9=A6=96=E9=A1=B5banner?=
 =?UTF-8?q?=E5=9B=BE=E5=88=A4=E6=96=AD=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    |  3 +++
 pages/index/index.vue         | 16 +++++++++++-----
 pages/index/urlWeb.vue        | 21 +++++++++++++++++++++
 pages/order/order_details.vue | 22 +++++++++++++---------
 4 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 pages/index/urlWeb.vue

diff --git a/pages.json b/pages.json
index 2f99fd1..ce8be4f 100644
--- a/pages.json
+++ b/pages.json
@@ -11,6 +11,9 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/index/urlWeb"
+		},
 		{
 			"path": "pages/user/user",
 			"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e24cd64..522aa6d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<swiper class="head" :current="banner_current" >
-			<swiper-item @click="clickBanner" v-for="(item,index) of banner" :key="index">
-				<image :src="item.url" class="swipe-img" mode="aspectFill"></image>
+			<swiper-item @click="clickBanner(item.type,item.url)" v-for="(item,index) of banner" :key="index">
+				<image :src="item.picture" class="swipe-img" mode="aspectFill"></image>
 			</swiper-item>
 		</swiper>
 		<view class="content">
@@ -164,13 +164,19 @@
 				this.current = event.detail.current;
 			},
 			// banner图被点击
-			clickBanner(){
-				this.$msg('您点击了banner图')
+			clickBanner(type,url){
+				if(url) {
+					if(type == 0) {
+						this.$url(url);
+					}else {
+						this.$url('/pages/index/urlWeb?url='+url);
+					}
+				}
 			},
 			// ad被点击
 			clickAD(id){
 				// this.$msg('您点击了ad广告')
-				this.$url('/pages/activityList/index?special_id='+id)
+				this.$url('/pages/activityList/index?special_id='+id);
 			}
 		},
 		onReachBottom() {
diff --git a/pages/index/urlWeb.vue b/pages/index/urlWeb.vue
new file mode 100644
index 0000000..9551e78
--- /dev/null
+++ b/pages/index/urlWeb.vue
@@ -0,0 +1,21 @@
+<template>
+	<view>
+		<web-view :src="webUrl"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				webUrl: ''
+			}
+		},
+		onLoad(e) {
+			this.webUrl = e.url;
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/order/order_details.vue b/pages/order/order_details.vue
index a4f59d3..42e05ce 100644
--- a/pages/order/order_details.vue
+++ b/pages/order/order_details.vue
@@ -73,11 +73,12 @@
 					<view style="margin-top: 10rpx;position: relative;top: 26rpx;">
 						<view class="lf-font-28 text-black1">
 						{{checkArea}} 
-						<text v-if="false" style="position: relative;left: 172rpx;top: -36rpx;display: inherit;" class="lf-color-blue lf-font-28" @tap="copy(checkArea)">复制</text></view>
+						<text v-if="checkArea" style="position: relative;left: 172rpx;top: -36rpx;display: inherit;" class="lf-color-blue lf-font-28" @tap="copy(checkArea)">复制</text></view>
 					</view>
-					<view class="lf-m-t-32" v-if="false">
+					<view class="lf-m-t-32" v-if="checkArea">
 						<view class="lf-color-green lf-font-28 lf-flex">
-							<text>待使用</text>
+							<text v-if="orderDetails.status == 3">待使用</text>
+							<text v-else>{{orderDetails.status_text}}</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> -->
@@ -87,11 +88,11 @@
 							</image>
 						</view>
 					</view>
-					<view style="margin-top: 44rpx;" v-else>
+					<!-- <view style="margin-top: 44rpx;" v-else>
 						<view class="lf-color-999 lf-font-28">
-							{{orderDetails.status_text}}
-						</view>
-					</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">
@@ -118,6 +119,10 @@
 					<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>
@@ -172,10 +177,9 @@
 					id: this.order_id
 				}).then(res => {
 					this.orderDetails = res.data
-					this.checkArea = res.data.id
+					this.checkArea = res.data.verify_code
 					this.skeletonLoading = false
 					console.log(res.data)
-
 				}).catch(err => {
 					setTimeout(() => {
 						this.$toBack()