上传

config.js

@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置

pages.json

@@ -23,6 +23,20 @@
 			"style": {
 				"enablePullDownRefresh": true
 			}
+		},
+		{
+			"path" : "pages/index/introduce",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/index/logoInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 	],
 	"preloadRule": {

pages/index/cancelArticle.vue

@@ -7,11 +7,12 @@
 		
 		<view class="content_now">
 			<view class="article">
-				<uv-parse :content="configList.cancel_value"></uv-parse>
+				<uv-parse :content="configList[key]"></uv-parse>
 			</view>
 		</view>
 		
-		<view class="an">
+		<view class="an"
+		>
 			<view class="btn2"
 			@click="next">
 				返回

pages/index/greetP1.vue

@@ -1,38 +0,0 @@
-<template>
-	<view>
-		<greetCmponents title="“威士忌鉴赏家”" :textList="textList" :path="greetP2" :btn="btn"/>
-	</view>
-</template>
-
-<script>
-	import greetCmponents from "../../components/home/greetComponents.vue"
-	export default {
-		data() {
-			return {
-				textList:[
-					'您的独到品味和对复杂风味的深刻理解展现了',
-					'您在威士忌世界中的非凡见解。',
-					'无论是高年份的经典之作，',
-					'还是精湛工艺的限量版,',
-					'每一杯威士忌在您手中都被赋予了更多的意义。',
-					'愿您在未来的品鉴之旅中继续探索更多顶级佳酿，',
-					'感受威士忌的独特魅力畅享每一滴带来的极致体验!'
-				],
-				greetP2:'/pages/index/greetP2',
-				btn:[
-					'下一页'
-				]
-			}
-		},
-		components:{
-			greetCmponents
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/index/greetP2.vue

@@ -1,36 +0,0 @@
-<template>
-	<view>
-		<greetCmponents title="“威士忌探秘者”" :textList="textList" :path="greetP3" :btn="btn"/>
-	</view>
-</template>
-
-<script>
-	import greetCmponents from "../../components/home/greetComponents.vue"
-	export default {
-		data() {
-			return {
-				textList:[
-					'您的好奇心和冒险精神',
-					'让您不断探索新奇和冒险精神。',
-					'愿每一杯威士忌都能拿为您带来',
-					'新鲜的体验与惊喜,',
-					'在这段探秘旅程中发现无尽的可能性。'
-				],
-				greetP3:'/pages/index/greetP3',
-				btn:[
-					'下一页'
-				]
-			}
-		},
-		components:{
-			greetCmponents
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/index/greetP3.vue

@@ -1,35 +0,0 @@
-<template>
-	<view>
-		<greetCmponents title="“威士忌品鉴大师”" :textList="textList" :path="greetP4"  :btn="btn"/>
-	</view>
-</template>
-
-<script>
-	import greetCmponents from "../../components/home/greetComponents.vue"
-	export default {
-		data() {
-			return {
-				textList: [
-					'您的敏锐舌尖与挑剔眼光',
-					'让您在细微之处也能捕捉到每一滴威士忌的精髓。',
-					'愿您在今后的品鉴之路上，',
-					'继续发现与享受那些别具匠心的美妙时刻。'
-				],
-				greetP4: '/pages/index/greetP4',
-				btn:[
-					'下一页'
-				]
-			}
-		},
-		components: {
-			greetCmponents
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/index/greetP4.vue

@@ -1,36 +0,0 @@
-<template>
-	<view>
-		<greetCmponents title="“威士忌藏家”" :textList="textList" :path="greetP5" :btn="btn"/>
-	</view>
-</template>
-
-<script>
-	import greetCmponents from "../../components/home/greetComponents.vue"
-	export default {
-		data() {
-			return {
-				textList:[
-					'您的眼光独到,能够识别并珍藏',
-					'那些真正值得铭记的佳酿。',
-					'愿您在未来的岁月中，',
-					'继续收集那些能够讲述故事、承载记忆的珍品,将',
-					'您的收藏变成一段永恒的艺术。'
-				],
-				greetP5:'/pages/index/greetP5',
-				btn:[
-					'下一页'
-				]
-			}
-		},
-		components:{
-			greetCmponents
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/index/greetP5.vue

@@ -1,37 +0,0 @@
-<template>
-	<view>
-		<greetCmponents title="“威士忌玩家”" :textList="textList" :path="greetP5" :btn="btn"/>
-	</view>
-</template>
-
-<script>
-	import greetCmponents from "../../components/home/greetComponents.vue"
-	export default {
-		data() {
-			return {
-				textList:[
-					'您对威士忌的热爱不仅体现在酒杯中，',
-					'更体现在与朋友分享的每一个欢乐时刻。',
-					'愿您在每一次聚会中，',
-					'都能用您的创意和激情，',
-					'让威士忌成为欢聚的中心，',
-					'点燃无数难忘的瞬间。'
-				],
-				greetP5:'/pages/index/appointment',
-				btn:[
-					'下一页'
-				]
-			}
-		},
-		components:{
-			greetCmponents
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/index/index.vue

@@ -48,8 +48,8 @@
 		methods: {
 			query(){
 				uni.navigateTo({
-					// url: '/pages_order/info/infoPages'
-					url: '/pages/index/article'
+					// url: '/pages/index/article'
+					url: '/pages/index/introduce'
 				})
 			},
 		}

pages/index/introduce.vue

@@ -0,0 +1,121 @@
+<template>
+	<view class="home">
+			
+		<image src="/static/image/bg/5.png"
+		class="page-bg"
+		mode="aspectFill"></image>
+		
+		<view class="content_now">
+			<view class="article">
+				<uv-parse :content="configList.introduce"></uv-parse>
+			</view>
+		</view>
+		
+		<view class="an">
+			<view class="btn2"
+			@click="start">
+				开始
+			</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>
+				</view>
+			</view>
+			
+			<text class="second-color">{{ configList.bg_title }}</text>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import { mapState } from 'vuex'
+	export default {
+		computed : {
+			...mapState(['articleList', 'configList']),
+		},
+		data() {
+			return {
+				key : 'cancel_value'
+			}
+		},
+		onLoad(args) {
+		},
+		methods: {
+			next(){
+			},
+			start(){
+				uni.navigateTo({
+					url: '/pages/index/article'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.article{
+		width: 600rpx;
+		font-size: 28rpx;
+		line-height: 50rpx;
+	}
+	.an{
+		position: fixed;
+		bottom: 190rpx;
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 100%;
+	}
+	.second-color{
+		margin-top: 20rpx;
+	}
+	.btn2 {
+		border: 4rpx solid $uni-color;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 16rpx 200rpx;
+		color: $uni-color;
+		border-radius: 10rpx;
+	}
+	.logo-list{
+		display: flex;
+		gap: 30rpx;
+		margin-top: 20rpx;
+		image{
+			width: 160rpx;
+			height: 90rpx;
+		}
+		.logoo-item{
+			background-color: rgba(236, 184, 100, 0.1);
+			border: 1rpx solid rgba(236, 184, 100, 0.4);
+			padding: 10rpx 20rpx;
+			border-radius: 10rpx;
+			.btn{
+				font-size: 20rpx;
+				color: #fff;
+				background-color: rgba(236, 184, 100, 1);
+				border-radius: 30rpx;
+				padding: 4rpx 14rpx;
+			}
+		}
+	}
+</style>

pages/index/logoInfo.vue

@@ -0,0 +1,24 @@
+<template>
+	<view class="page">
+		<uv-parse :content="content"></uv-parse>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				content : '',
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	
+}
+</style>

pages_order/info/appoint.vue

@@ -211,12 +211,11 @@
 					dayTime : this.$dayjs(this.date).format('HH:mm'),
 				}, res => {
 					if(res.code == 200){
-						uni.showToast({
-							title: '预约成功',
-							icon: 'none'
-						})
-						setTimeout(uni.reLaunch, 1000, {
-							url : '/pages/index/index'
+						// setTimeout(uni.reLaunch, 1000, {
+						// 	url : '/pages/index/index'
+						// })
+						uni.navigateTo({
+							url: '/pages/index/cancelArticle?key=success_text'
 						})
 					}
 				})

pages_order/info/fillInfo.vue

@@ -65,7 +65,7 @@
 					return
 				}
 					
-				if(this.$utils.verificationPhone(this.form.phone)){
+				if(!this.$utils.verificationPhone(this.form.phone)){
 					uni.showToast({
 						title: '请输入正确的手机号',
 						icon: 'none',