From 9c12cc8c1c747831f9ab37385e9a90d609ac9a1c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 5 Dec 2024 15:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                   |  5 +++
 pages/index/cancle.vue       | 33 ----------------
 pages/index/checkAge.vue     | 89 -------------------------------------------
 pages/index/comment.vue      | 32 ----------------
 pages/index/fillIn.vue       | 91 --------------------------------------------
 pages/index/introduce.vue    | 37 ++++++++++--------
 pages/index/logoInfo.vue     | 17 ++++++++-
 pages/index/order.vue        | 18 ++++++++-
 pages_order/info/appoint.vue |  2 +-
 9 files changed, 60 insertions(+), 264 deletions(-)
 delete mode 100644 pages/index/cancle.vue
 delete mode 100644 pages/index/checkAge.vue
 delete mode 100644 pages/index/comment.vue
 delete mode 100644 pages/index/fillIn.vue

diff --git a/api/api.js b/api/api.js
index ad3008f..858beb7 100644
--- a/api/api.js
+++ b/api/api.js
@@ -46,6 +46,11 @@ const config = {
 		url: '/applet_index/articleList',
 		method: 'GET',
 	},
+	//首页-品牌介绍接口
+	getBrand: {
+		url: '/applet_index/getBrand',
+		method: 'GET',
+	},
 	
 	//首页-轮播图接口
 	bannerList: {
diff --git a/pages/index/cancle.vue b/pages/index/cancle.vue
deleted file mode 100644
index 989cefd..0000000
--- a/pages/index/cancle.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-	<view>
-		<greetCmponents :textList="textList" :btn="btn"/>
-	</view>
-</template>
-
-<script>
-	import greetCmponents from "../../components/home/greetComponents.vue"
-	export default {
-		data() {
-			return {
-				textList: [
-					'我们已收到您的取消请求，',
-					'非常遗憾无法为您提供此次上门威士忌品鉴服务。',
-					'如果您有其他需求或在未来希望重新预约，',
-					'随时与我们联系。',
-					'期待在合适的时间为您奉上难忘的品监体验!'
-				],
-				btn: []
-			}
-		},
-		components: {
-			greetCmponents
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/pages/index/checkAge.vue b/pages/index/checkAge.vue
deleted file mode 100644
index fde6de5..0000000
--- a/pages/index/checkAge.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-	<view class="home">
-		<view class="content" style="padding-top: 25vh;">
-			<span class="font-bold">Genius Journey Club</span>
-			<text style="margin-top: 20rpx; font-size: 28rpx; color: #878787;">欢迎您的到来</text>
-			<text style="margin-top: 30rpx; font-size: 28rpx; color: #878787;">使用小程序请确认您已满18周岁</text>
-			<view class="mian-btn" :class="{active:isActive === 'yes'}" @click="setActive('yes')">未满18岁</view>
-			<view class="mian-btn" :class="{active:isActive === 'no'}" @click="setActive('no')">已满18岁</view>
-			<view class="flex-center mt-40">
-				<uv-checkbox-group>
-					<uv-checkbox size="15px" v-model="isCheck" iconSize="20rpx" activeColor="#e6bf7f" @change="change"></uv-checkbox>
-				</uv-checkbox-group>
-				<span style="font-size: 26rpx;">我已阅读政策隐私条</span>
-			</view>
-			<view class="" style="margin-top: 60rpx;" @click="start">
-				<view class="btn2">
-					立即开启
-				</view>
-			</view>
-			<view class="flex-col query" style="gap: 0rpx;">
-				<text class="second-color">欢快无限饮&nbsp;&nbsp;饮酒有限度</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				isActive: null,
-				isCheck: false
-			}
-		},
-		methods: {
-			setActive(val) {
-				this.isActive = val
-			},
-			change(e){
-				this.isCheck = e
-			},
-			start() {
-				if (this.isActive && this.isCheck) {
-					uni.navigateTo({
-						url:'/pages/index/fillIn'
-					})
-				} else {
-					uni.showToast({
-						title: '请选择并勾选后开启',
-						icon: 'none'
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.query {
-		position: relative;
-		bottom: -15vh;
-	}
-
-	.b-btn {
-		width: 86%;
-		display: flex;
-		justify-content: space-between;
-		padding-top: 20vh;
-
-		.pre-btn {
-			border: 4rpx solid #f1e0c6;
-			padding: 16rpx 90rpx;
-			border-radius: 66rpx;
-			color: #e6bf7f;
-		}
-
-		.next-btn {
-			background-image: url('../../static/image/home/btn.png');
-			background-size: contain;
-			background-repeat: no-repeat;
-			background-position: center;
-			width: 40vw;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: white;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/index/comment.vue b/pages/index/comment.vue
deleted file mode 100644
index e50c91b..0000000
--- a/pages/index/comment.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-	<view>
-		<greetCmponents :textList="textList" :btn="btn"/>
-	</view>
-</template>
-
-<script>
-	import greetCmponents from "../../components/home/greetComponents.vue"
-	export default {
-		data() {
-			return {
-				textList: [
-					'感谢您分享宝贵的评价!',
-					'您的反馈对我们非常重要。',
-					'祝愿您每一天都充满精彩与愉悦，生活美满，',
-					'尽享每一杯威士忌的独特魅力!'
-				],
-				btn: []
-			}
-		},
-		components: {
-			greetCmponents
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/pages/index/fillIn.vue b/pages/index/fillIn.vue
deleted file mode 100644
index 9c1bd6c..0000000
--- a/pages/index/fillIn.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-	<view class="home">
-		<view class="content" style="padding-top: 25vh;">
-			<span class="font-bold">为了给您提供更个性化的服务</span>
-			<span class="font-bold">请您填写以下基本信息</span>
-			<view class="flex-col mt-40">
-				<view  class="flex-center">
-					<span style="margin-right: 30rpx;">您的姓名:</span>
-					<input class="inputStyle" v-model="username" type="text" />
-				</view>
-				<view class="flex-center">
-					<span style="margin-right: 30rpx;">手机号码:</span>
-					<input class="inputStyle" v-model="phone" type="number" />
-				</view>
-			</view>
-			<view style="margin-top: 15vh;" @click="query">
-				<view class="btn2">
-					确认
-				</view>
-			</view>
-			<view class="flex-col query" style="gap: 0rpx;">
-
-				<text class="second-color">欢快无限饮&nbsp;&nbsp;饮酒有限度</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				username:'',
-				phone:''
-			}
-		},
-		methods: {
-			query(){
-				if(!this.username && !this.phone){
-					uni.showToast({
-						title:'您的姓名和手机号都不能为空哦~',
-						icon: 'none'
-					})
-				}else{
-					uni.navigateTo({
-						url:'/pages/index/greet'
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.query {
-		position: relative;
-		bottom: -15vh;
-	}
-
-	.b-btn {
-		width: 86%;
-		display: flex;
-		justify-content: space-between;
-		padding-top: 20vh;
-
-		.pre-btn {
-			border: 4rpx solid #f1e0c6;
-			padding: 16rpx 90rpx;
-			border-radius: 66rpx;
-			color: #e6bf7f;
-		}
-
-		.next-btn {
-			background-image: url('../../static/image/home/btn.png');
-			background-size: contain;
-			background-repeat: no-repeat;
-			background-position: center;
-			width: 40vw;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: white;
-		}
-	}
-	.inputStyle{
-		border: 3rpx solid #e5bf7d;
-		border-radius: 40rpx;
-		color: #e5bf7d;
-		padding: 10rpx 10rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/index/introduce.vue b/pages/index/introduce.vue
index edb165e..887091e 100644
--- a/pages/index/introduce.vue
+++ b/pages/index/introduce.vue
@@ -18,21 +18,12 @@
 			</view>
 			
 			<view class="logo-list">
-				<view class="logoo-item">
-					<image src="../../static/image/bg/3.png" mode=""></image>
-					<view class="btn">
-						点击进入
-					</view>
-				</view>
-				<view class="logoo-item">
-					<image src="../../static/image/bg/3.png" mode=""></image>
-					<view class="btn">
-						点击进入
-					</view>
-				</view>
-				<view class="logoo-item">
-					<image src="../../static/image/bg/3.png" mode=""></image>
-					<view class="btn">
+				<view class="logoo-item"
+				:key="index"
+				v-for="(item, index) in list">
+					<image :src="item.image" mode="aspectFill"></image>
+					<view class="btn"
+					@click="toBrand(item.id)">
 						点击进入
 					</view>
 				</view>
@@ -52,10 +43,12 @@
 		},
 		data() {
 			return {
-				key : 'cancel_value'
+				key : 'cancel_value',
+				list : [],
 			}
 		},
 		onLoad(args) {
+			this.getBrand()
 		},
 		methods: {
 			next(){
@@ -65,6 +58,18 @@
 					url: '/pages/index/article'
 				})
 			},
+			getBrand(){
+				this.$api('getBrand', res => {
+					if(res.code == 200){
+						this.list = res.result
+					}
+				})
+			},
+			toBrand(id){
+				uni.navigateTo({
+					url: '/pages/index/logoInfo?id=' + id
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages/index/logoInfo.vue b/pages/index/logoInfo.vue
index 716e896..f6e7f7b 100644
--- a/pages/index/logoInfo.vue
+++ b/pages/index/logoInfo.vue
@@ -9,10 +9,25 @@
 		data() {
 			return {
 				content : '',
+				id : 0,
 			}
 		},
+		onLoad({id}) {
+			this.id = id
+			this.getBrand()
+		},
 		methods: {
-			
+			getBrand(){
+				this.$api('getBrand', res => {
+					if(res.code == 200){
+						res.result.forEach(n => {
+							if(this.id == n.id){
+								this.content = n.details
+							}
+						})
+					}
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages/index/order.vue b/pages/index/order.vue
index cfacaec..c2985b2 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -52,6 +52,15 @@
 					{{ item.area }}
 					{{ item.address }}
 				</view>
+				
+				<view class="bottom">
+					<view></view>
+					
+					<view class="b2"
+					@click.stop="toEvaluate(item.id)">
+						去评价
+					</view>
+				</view>
 	
 			</view>
 		</view>
@@ -107,6 +116,13 @@
 					url: '/pages_order/info/appoint?id=' + id
 				})
 			},
+			
+			// 去评价
+			toEvaluate(id){
+				// uni.navigateTo({
+				// 	url: '/pages_order/info/appoint?id=' + id
+				// })
+			},
 		}
 	}
 </script>
@@ -181,7 +197,7 @@
 				}
 	
 				.b2 {
-					background: linear-gradient(178deg, #4FD3BC, #60C285);
+					background: linear-gradient(178deg, #ecb86488, #ecb864);
 					color: #fff;
 				}
 	
diff --git a/pages_order/info/appoint.vue b/pages_order/info/appoint.vue
index d9f16c7..511ac77 100644
--- a/pages_order/info/appoint.vue
+++ b/pages_order/info/appoint.vue
@@ -185,7 +185,7 @@
 					return
 				}
 				
-				if(this.$utils.verificationPhone(this.form.phone)){
+				if(!this.$utils.verificationPhone(this.form.phone)){
 					uni.showToast({
 						title: '请输入正确的手机号',
 						icon: 'none',