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 @@
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
- Genius Journey Club
- 欢迎您的到来
- 使用小程序请确认您已满18周岁
- 未满18岁
- 已满18岁
-
-
-
-
- 我已阅读政策隐私条
-
-
-
- 立即开启
-
-
-
- 欢快无限饮 饮酒有限度
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
- 为了给您提供更个性化的服务
- 请您填写以下基本信息
-
-
- 您的姓名:
-
-
-
- 手机号码:
-
-
-
-
-
- 确认
-
-
-
-
- 欢快无限饮 饮酒有限度
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
- 点击进入
-
-
-
-
-
- 点击进入
-
-
-
-
-
+
+
+
点击进入
@@ -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
+ })
+ },
}
}
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
+ }
+ })
+ }
+ })
+ },
}
}
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 }}
+
+
+
+
+
+ 去评价
+
+
@@ -107,6 +116,13 @@
url: '/pages_order/info/appoint?id=' + id
})
},
+
+ // 去评价
+ toEvaluate(id){
+ // uni.navigateTo({
+ // url: '/pages_order/info/appoint?id=' + id
+ // })
+ },
}
}
@@ -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',