diff --git a/App.vue b/App.vue
index 6b69387..ef904c8 100644
--- a/App.vue
+++ b/App.vue
@@ -1,41 +1,63 @@
+
+ .mb-60 {
+ margin-bottom: 60rpx;
+ }
+
+ .mt-60 {
+ margin-top: 60rpx;
+ }
+
+ .mt-40 {
+ margin-top: 40rpx;
+ }
+
+ .mt-20 {
+ margin-top: 20vh;
+ }
+
+ .content-text {
+ line-height: 50rpx;
+ font-size: 28rpx;
+ }
+
\ No newline at end of file
diff --git a/package.json b/package.json
index c6ede65..136edbc 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,7 @@
"author": "",
"license": "ISC",
"dependencies": {
- "@dcloudio/uni-ui": "^1.5.6",
"ali-oss": "^6.21.0",
- "dayjs": "^1.11.12",
- "sass": "^1.79.3"
+ "dayjs": "^1.11.12"
}
}
diff --git a/pages.json b/pages.json
index e063b4c..b42e356 100644
--- a/pages.json
+++ b/pages.json
@@ -1,129 +1,26 @@
{
- "pages": [
- {
- "path" : "pages/index/home",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/area",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/checkAge",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/fillIn",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/greet",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/greetP1",
- "style" :
- {
- "navigationBarTitleText" : ""
+ "pages": [{
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": ""
}
},
{
- "path" : "pages/index/greetP2",
- "style" :
- {
- "navigationBarTitleText" : ""
+ "path": "pages/index/order",
+ "style": {
+ "navigationBarTitleText": ""
}
},
{
- "path" : "pages/index/greetP3",
- "style" :
- {
- "navigationBarTitleText" : ""
+ "path": "pages/index/center",
+ "style": {
+ "navigationBarTitleText": ""
}
},
{
- "path" : "pages/index/greetP4",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/greetP5",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/appointment",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/back",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/viewDetail",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/reschedule",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/cancle",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/start",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/comment",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
- {
- "path" : "pages/index/selectAppointment",
- "style" :
- {
- "navigationBarTitleText" : ""
+ "path": "pages/index/home",
+ "style": {
+ "navigationBarTitleText": ""
}
}
],
@@ -163,17 +60,46 @@
"path": "auth/loginAndRegisterAndForgetPassword"
},
{
- "path" : "auth/takePhoto",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
+ "path": "info/chooseArea"
+ },
+ {
+ "path": "info/isAdult"
+ },
+ {
+ "path": "info/fillInfo"
+ },
+ {
+ "path": "info/greet"
+ },
+ {
+ "path": "info/startTest"
+ },
+ {
+ "path": "info/infoPages"
+ },
+ {
+ "path": "info/appointDate"
+ },
+ {
+ "path" : "info/feedback"
+ },
+ {
+ "path" : "info/start"
+ },
+ {
+ "path" : "info/experience"
+ },
+ {
+ "path" : "info/comment"
+ },
+ {
+ "path" : "info/appoint"
}
]
}],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "答题小程序",
+ "navigationBarTitleText": "酒店桌布",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
"navigationStyle": "custom"
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 2372563..e5ac677 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -4,7 +4,7 @@
您是否有品鉴威士忌的习惯?
是
否
-
+
上一题
@@ -29,9 +29,16 @@
this.isActive = value
},
next(){
- uni.navigateTo({
- url:'/pages/index/area'
- })
+ if(this.isActive!==null){
+ uni.navigateTo({
+ url:'/pages_order/info/chooseArea'
+ })
+ }else{
+ uni.showToast({
+ title:'请选择后进行下一题',
+ icon: 'none'
+ })
+ }
}
}
}
diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
index cfaaa3a..a9fbf75 100644
--- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue
+++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
@@ -198,7 +198,7 @@
// uni.$uv.toast('倒计时结束');
},
start() {
- // uni.`$uv.toast('倒计时开始');
+ // uni.$uv.toast('倒计时开始');
}
}
}
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 8678652..0b21dc6 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -1,6 +1,6 @@
-
+
@@ -11,7 +11,7 @@
-
+
微信登录
@@ -19,85 +19,49 @@
使用短信验证登录
-->
-
-
-
-
-
- 已同意
+
+
+ 已同意
《隐私政策》
《服务条款》
- 
+
+
+
-
-
-
-
-
-
- 答题小程序
-
- 申请
-
- 获取你的昵称、头像、地区及性别
-
-
-
-
- 
-
-
- 可可
- 微信个人信息
-
-
-
- 
-
-
-
- 使用其他头像和昵称
-
-
-
-
-
-
-
-
-
- 服务协议和隐私权政策
-
- 请您务必审慎阅读、充分理解用户协议和隐私
- 政策各条款，包括但不限于用户注意事项、用
- 户行为规范以及为了向你提供服务而收集、使
- 用、存储你的个人信息的情况等。你可阅读
- 《遗产里的景德镇平台用户服务协议》
- 和
- 《遗产里的景德镇平台隐私权政策》
- 了解详细信息。如你同意，请点击下方按钮开始接受我们的服务。
-
-
-
-
-
+
+
+
+
![]()
+
服务协议和隐私权政策
+
+ 请您务必审慎阅读、充分理解用户协议和隐私政策各条款，包括但不限于用户注意事项、用户行为规范以及为了向你提供服务而收集、使用、存储你的个人信息的情况等。你可阅读
+ 《遗产里的景德镇平台用户服务协议》
+ 和
+ 《遗产里的景德镇平台隐私权政策》
+ 了解详细信息。如你同意，请点击下方按钮开始接受我们的服务。
+
+
+
+
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/appointDate.vue b/pages_order/info/appointDate.vue
new file mode 100644
index 0000000..02dde70
--- /dev/null
+++ b/pages_order/info/appointDate.vue
@@ -0,0 +1,191 @@
+
+
+
+ 预约日期和时间
+
+
+ {{year}}
+
+
+ {{date}}
+
+
+ {{time}}
+
+
+ 预约信息
+
+
+
+
+ {{firstName}}
+
+ 姓
+
+
+
+ {{lastName}}
+
+ 名
+
+
+
+ 先生
+ 
+
+
+ 先生
+ 女士
+
+
+
+
+
+
+ 手机
+
+
+ 修改号码
+
+
+
+
+
+
+
+
+ 本人提交此信息即表示本人已网读并接受Genius JourneyClub 的使用条款和个人信息处理规则。
+
+
+
+ 未满18周岁请勿参与此内容。
+
+
+
+
+
+
+ 返回
+
+
+ 取消预约
+
+
+ 欢快无限饮 饮酒有限度
+
+
+
+
+ 请填写预约信息
+
+ 
+ {{username}}
+ {{address}}
+
+
+
+
+
+
+ 预约时间
+
+ 备注
+
+
+
+
+ 暂不预约，先购买
+ 下一步，确认订单
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/chooseArea.vue b/pages_order/info/chooseArea.vue
new file mode 100644
index 0000000..81602eb
--- /dev/null
+++ b/pages_order/info/chooseArea.vue
@@ -0,0 +1,38 @@
+
+
+
+ 请选择您所在的区域
+
+
+ 确定
+
+ 欢快无限饮 饮酒有限度
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/comment.vue b/pages_order/info/comment.vue
new file mode 100644
index 0000000..333bcfe
--- /dev/null
+++ b/pages_order/info/comment.vue
@@ -0,0 +1,34 @@
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/experience.vue b/pages_order/info/experience.vue
new file mode 100644
index 0000000..60a4a8e
--- /dev/null
+++ b/pages_order/info/experience.vue
@@ -0,0 +1,104 @@
+
+
+
+ 整体体验
+
+ 请评价服务的整体质量和满足感。
+ 包括品鉴过程中的舒适度和整体氛围。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{index}}
+ /
+ 5
+
+
+
+
+
+ 上一题
+
+
+ 结束
+
+
+ 欢快无限饮 饮酒有限度
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/feedback.vue b/pages_order/info/feedback.vue
new file mode 100644
index 0000000..7e701f5
--- /dev/null
+++ b/pages_order/info/feedback.vue
@@ -0,0 +1,35 @@
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/fillInfo.vue b/pages_order/info/fillInfo.vue
new file mode 100644
index 0000000..ff09793
--- /dev/null
+++ b/pages_order/info/fillInfo.vue
@@ -0,0 +1,90 @@
+
+
+
+ 为了给您提供更个性化的服务
+ 请您填写以下基本信息
+
+
+ 您的姓名:
+
+
+
+ 手机号码:
+
+
+
+
+
+ 确认
+
+
+
+ 欢快无限饮 饮酒有限度
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/greet.vue b/pages_order/info/greet.vue
new file mode 100644
index 0000000..4d56807
--- /dev/null
+++ b/pages_order/info/greet.vue
@@ -0,0 +1,40 @@
+
+
+
+ 欢迎
+ Christine
+
+ 来到百富门的世界
+ 品味传承与创新交织的威士忌艺术
+ 开启您的专属品鉴之旅
+
+
+
+ 点击进入
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/infoPages.vue b/pages_order/info/infoPages.vue
new file mode 100644
index 0000000..ebcac0b
--- /dev/null
+++ b/pages_order/info/infoPages.vue
@@ -0,0 +1,176 @@
+
+
+
+ 作为一位
+ “{{title1}}”
+
+ {{item}}
+
+
+
+
+ {{btn}}
+
+
+
+
+ 返回
+
+
+ 点击预约
+
+
+ 欢快无限饮 饮酒有限度
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/isAdult.vue b/pages_order/info/isAdult.vue
new file mode 100644
index 0000000..626ac72
--- /dev/null
+++ b/pages_order/info/isAdult.vue
@@ -0,0 +1,89 @@
+
+
+
+ Genius Journey Club
+ 欢迎您的到来
+ 使用小程序请确认您已满18周岁
+ 未满18岁
+ 已满18岁
+
+
+
+
+ 我已阅读政策隐私条款
+
+
+
+ 立即开启
+
+
+
+ 欢快无限饮 饮酒有限度
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/start.vue b/pages_order/info/start.vue
new file mode 100644
index 0000000..20da57c
--- /dev/null
+++ b/pages_order/info/start.vue
@@ -0,0 +1,49 @@
+
+
+
+
+ {{item}}
+
+
+
+
+ 开始
+
+
+ 欢快无限饮 饮酒有限度
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/info/startTest.vue b/pages_order/info/startTest.vue
new file mode 100644
index 0000000..7b1990d
--- /dev/null
+++ b/pages_order/info/startTest.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+ {{item}}
+
+
+
+
+
+ 开始测试
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/static/info/down.svg b/pages_order/static/info/down.svg
new file mode 100644
index 0000000..3cea253
--- /dev/null
+++ b/pages_order/static/info/down.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages_order/static/info/下拉.png b/pages_order/static/info/下拉.png
new file mode 100644
index 0000000..0ba540c
Binary files /dev/null and b/pages_order/static/info/下拉.png differ
diff --git a/project.config.json b/project.config.json
index 9ac7dd5..e235c35 100644
--- a/project.config.json
+++ b/project.config.json
@@ -2,11 +2,6 @@
"appid": "wx75654b529ae6a8ea",
"compileType": "miniprogram",
"miniprogramRoot": "unpackage/dist/dev/mp-weixin/",
- "libVersion": "3.5.8",
- "packOptions": {
- "ignore": [],
- "include": []
- },
"setting": {
"coverView": true,
"es6": true,
@@ -19,12 +14,18 @@
"ignore": [],
"disablePlugins": [],
"outputPath": ""
- }
+ },
+ "ignoreUploadUnusedFiles": true
},
"condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
},
- "srcMiniprogramRoot": "unpackage/dist/dev/mp-weixin/"
+ "srcMiniprogramRoot": "unpackage/dist/dev/mp-weixin/",
+ "libVersion": "3.5.8",
+ "packOptions": {
+ "ignore": [],
+ "include": []
+ }
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index e0971dc..c372b95 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -3,5 +3,18 @@
"projectname": "drink-answer-wechat-uniapp-24-9-2",
"setting": {
"compileHotReLoad": true
+ },
+ "condition": {
+ "miniprogram": {
+ "list": [
+ {
+ "name": "pages_order/auth/wxUserInfo",
+ "pathName": "pages_order/auth/wxUserInfo",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ }
+ ]
+ }
}
}
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
index b1bc837..51c0785 100644
--- a/uni.scss
+++ b/uni.scss
@@ -19,7 +19,8 @@ $uni-color-primary: #007aff;
$uni-color-success: #4cd964;
$uni-color-warning: #f0ad4e;
$uni-color-error: #dd524d;
-$uni-color-login-btn: #00bf61;
+$uni-wx-color: #07c060;
+
/* 文字基本颜色 */
$uni-text-color:#333;//基本色
diff --git a/utils/index.js b/utils/index.js
index 3532db2..b40f098 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -1,3 +1,4 @@
+
import Vue from 'vue'
import util from './utils.js'