diff --git a/api/api.js b/api/api.js
index 1648097..11d9972 100644
--- a/api/api.js
+++ b/api/api.js
@@ -68,13 +68,13 @@ const config = {
// },
//提交预约信息
- // submit: {
- // url: '/applet_post/submit',
- // method: 'POST',
- // limit : 1000,
- // showLoading : true,
- // auth: true,
- // },
+ submit: {
+ url: '/applet_post/submit',
+ method: 'POST',
+ limit : 1000,
+ showLoading : true,
+ auth: true,
+ },
// //查询我的问答记录
// queryMyLog: {
// url: '/applet_post/queryMyLog',
diff --git a/pages.json b/pages.json
index 04d616f..676072e 100644
--- a/pages.json
+++ b/pages.json
@@ -7,6 +7,13 @@
"navigationBarTitleText" : ""
}
},
+ {
+ "path" : "pages/index/preAppoint",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
{
"path": "pages/index/index",
"style": {
@@ -40,7 +47,14 @@
}
},
{
- "path" : "pages/index/preAppoint",
+ "path" : "pages/index/title",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/index/end",
"style" :
{
"navigationBarTitleText" : ""
diff --git a/pages/index/area.vue b/pages/index/area.vue
deleted file mode 100644
index 4567e80..0000000
--- a/pages/index/area.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- 请选择您所在的区域
-
-
- 确定
-
- 欢快无限饮 饮酒有限度
-
-
-
-
-
-
-
-
diff --git a/pages/index/article - 副本.vue b/pages/index/article - 副本.vue
new file mode 100644
index 0000000..93fc960
--- /dev/null
+++ b/pages/index/article - 副本.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下一页
+
+ {{ configList.bg_title }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/article.vue b/pages/index/article.vue
index 93fc960..4d169c1 100644
--- a/pages/index/article.vue
+++ b/pages/index/article.vue
@@ -1,11 +1,21 @@
-
-
-
+
+
-
+
+
+
+
+
+
+
@@ -13,33 +23,48 @@
-
- 下一页
+
+
+
+
+
+ 下一页
+
+
{{ configList.bg_title }}
+
\ No newline at end of file
+
diff --git a/pages/index/back.vue b/pages/index/back.vue
deleted file mode 100644
index 65ecea9..0000000
--- a/pages/index/back.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/pages/index/cancelArticle.vue b/pages/index/cancelArticle.vue
index fc28cb3..c2911b0 100644
--- a/pages/index/cancelArticle.vue
+++ b/pages/index/cancelArticle.vue
@@ -1,76 +1,138 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+ {{ mapKey[key].title }}
+
+
+
+ {{ mapKey[key].stext }}
-
-
+
+
+ 点击预约
+
+
+
返回
- {{ configList.bg_title }}
+
-
\ No newline at end of file
+}
+
diff --git a/pages/index/end.vue b/pages/index/end.vue
new file mode 100644
index 0000000..e724659
--- /dev/null
+++ b/pages/index/end.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+ 专属品鉴之旅告一段落
+
+
+
+ Genius Journey Club
+
+
+
+ 期待与您的
+
+ 再次见面
+
+ ...
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/home.vue b/pages/index/home.vue
index 221c9a8..fcfbb2e 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -119,7 +119,9 @@
methods: {
select(item){
this.answerIds.splice(this.index, 1, item.id)
- this.isActive = item.toMainId
+ if(item.isEnd != 'Y'){
+ this.isActive = item.toMainId
+ }
},
ret(){
this.index--
diff --git a/pages/index/preAppoint.vue b/pages/index/preAppoint.vue
index eca3204..4c433b8 100644
--- a/pages/index/preAppoint.vue
+++ b/pages/index/preAppoint.vue
@@ -1,23 +1,38 @@
-
-
-
+
+
+
+
+
+ 专属品鉴服务
+
+
+
+ 专属品鉴服务 根据您的称号我们为您匹配了专属的单桶品鉴组合, 并且为您提供一次专属上门品鉴服务, 您可以点击下方按钮进行预约
+
+
+
- 保存
+ @click="next">
+ 点击预约
- 下一页
+ @click="rep">
+ 返回
@@ -28,11 +43,25 @@
export default {
data() {
return {
-
}
},
+ onLoad() {
+ },
methods: {
-
+ rep(){
+ uni.navigateBack(-1)
+ // uni.reLaunch({
+ // url: '/pages/index/agreement'
+ // })
+ // uni.navigateTo({
+ // url: '/pages/index/end'
+ // })
+ },
+ next(){
+ uni.navigateTo({
+ url: '/pages_order/info/appoint'
+ })
+ },
}
}
@@ -43,6 +72,26 @@
width: 600rpx;
margin: 150rpx 75rpx;
}
+ .service{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .img_2{
+ margin: 0 auto;
+ width: 100rpx;
+ }
+ .title{
+ font-weight: 900;
+ margin: 30rpx 0;
+ }
+ .stext{
+ width: 600rpx;
+ margin-bottom: 150rpx;
+ line-height: 50rpx;
+ font-size: 26rpx;
+ color: #777;
+ }
+ }
.btn-list{
display: flex;
flex-direction: column;
@@ -52,24 +101,24 @@
align-items: center;
}
.next-btn{
- width: 220rpx;
+ width: 400rpx;
display: flex;
align-items: center;
justify-content: center;
color: white;
- padding: 16rpx 90rpx;
+ padding: 22rpx 90rpx;
background-color: $uni-color;
- border-radius: 30rpx;
+ border-radius: 40rpx;
}
.next-btn-2{
- width: 220rpx;
+ width: 400rpx;
display: flex;
align-items: center;
justify-content: center;
color: white;
- padding: 16rpx 90rpx;
+ padding: 22rpx 90rpx;
background-color: $uni-color-primary;
- border-radius: 30rpx;
+ border-radius: 40rpx;
}
}
diff --git a/pages/index/title.vue b/pages/index/title.vue
new file mode 100644
index 0000000..1b8d3ff
--- /dev/null
+++ b/pages/index/title.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+ 下一页
+
+
+
+
+
+
+
+
+
diff --git a/pages_order/info/appoint.vue b/pages_order/info/appoint.vue
index 511ac77..fe221f8 100644
--- a/pages_order/info/appoint.vue
+++ b/pages_order/info/appoint.vue
@@ -1,14 +1,23 @@
-
-
-
+
+
+
+
+
+
+
请选择您方便的时间,
我们将根据您的日程为您安排上门威士忌品鉴服务,
确保您能在舒适的环境中尽享专属体验
@@ -36,51 +45,49 @@
姓名:
+ placeholder="请输入姓名"
+ type="text" class="input" style="width: 580rpx;">
-
联系电话:
+ placeholder="请输入联系电话"
+ type="tel" class="input" style="width: 580rpx;">
-
-
- 地址: {{ addressCity }}
-
+ 详细地址
+
+ style="width: 580rpx;">
-
-
-
- 返回
-
-
- 预约
-
-
- 取消预约
-
+
+
+ 返回
+
+
+ 确认/提交
+
+
+ 取消预约
- {{ configList.bg_title }}
+ {{ configList.bg_title }}
.home{
font-size: 28rpx;
+ .logo{
+ width: 600rpx;
+ height: 100rpx;
+ margin: 150rpx 75rpx;
+ }
+ .content{
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ box-sizing: border-box;
+ padding: 60rpx;
+ text-align: center;
+ width: 720rpx;
+ margin: 0 auto;
+ .content-bg{
+ height: 100%;
+ width: 700rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
+ .topt{
+ width: 600rpx;
+ padding: 20rpx 0;
+ gap: 10rpx;
+ border-radius: 12rpx;
+ border: 2rpx solid #ecb864;
+ display: flex;
+ flex-direction: column;
+ }
+ }
+ .second-color{
+ text-align: center;
+ margin-top: 40rpx;
+ }
}
- .an{
- position: fixed;
- bottom: 300rpx;
- text-align: center;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- width: 100%;
- }
.date {
border: 2rpx solid $uni-color;
@@ -274,4 +298,24 @@
border-radius: 10rpx;
padding: 4rpx 10rpx;
}
+ .next-btn{
+ width: 160rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: white;
+ padding: 16rpx 90rpx;
+ background-color: $uni-color;
+ border-radius: 30rpx;
+ }
+ .next-btn-2{
+ width: 160rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: white;
+ padding: 16rpx 90rpx;
+ background-color: $uni-color-primary;
+ border-radius: 30rpx;
+ }
\ No newline at end of file
diff --git a/store/store.js b/store/store.js
index af29c34..0c756d6 100644
--- a/store/store.js
+++ b/store/store.js
@@ -90,6 +90,10 @@ const store = new Vuex.Store({
api('getTitleByIds', {ids}, res => {
if(res.code == 200){
state.titleBy = res.result
+ state.articleList = res.result.answerObjectRuleNewsList
+ setTimeout(uni.navigateTo, 0, {
+ url: '/pages/index/title'
+ })
}
})
},
diff --git a/utils/authorize.js b/utils/authorize.js
new file mode 100644
index 0000000..eca6537
--- /dev/null
+++ b/utils/authorize.js
@@ -0,0 +1,53 @@
+
+
+
+function authorize(scope){
+ return new Promise((success, error) => {
+ uni.authorize({
+ /* scope.writePhotosAlbum 类型是保存到相册 */
+ scope,
+ success,
+ complete(res) {
+ /* 判断如果没有授权就打开设置选项让用户重新授权 */
+ uni.getSetting({
+ success(res) {
+ if (!res.authSetting[scope]) {
+ setting()
+ }
+ }
+ });
+ }
+ });
+
+ function setting(){
+ uni.showModal({
+ title: '当前操作未授权,请授权!',
+ content: '拒绝授权将影响本小程序部分功能的使用',
+ confirmText: '授权',
+ success(e) {
+ if(!e.confirm){
+ return error()
+ }
+ uni.openSetting({
+ success(res) {
+ if (!res.authSetting[scope]) {
+ uni.showToast({
+ title: '授权失败',
+ icon: 'none',
+ })
+ return error()
+ }
+ success()
+ }
+ });
+ }
+ })
+ }
+ })
+}
+
+
+
+
+
+export default authorize
\ No newline at end of file
diff --git a/utils/index.js b/utils/index.js
index b40f098..aeb82a5 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -20,6 +20,7 @@ dayjs.locale('zh-cn')
import Oss from '@/utils/oss-upload/oss/index.js'
import { handleTree } from './tree.js'
+import authorize from './authorize.js'
Vue.prototype.$handleTree = handleTree
Vue.prototype.$Oss = Oss
@@ -27,4 +28,5 @@ Vue.prototype.$dayjs = dayjs
Vue.prototype.$timeUtils = time
Vue.prototype.$utils = util
-Vue.prototype.$md5 = md5
\ No newline at end of file
+Vue.prototype.$md5 = md5
+Vue.prototype.$authorize = authorize
\ No newline at end of file