From 02a73ec7de6f1274011d1848562469b4635fcb38 Mon Sep 17 00:00:00 2001
From: rosehan <151435705@qq.com>
Date: Mon, 14 Aug 2023 10:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/param.js | 3 +-
pages.json | 6 ++
pages/myReserve/myReserve.vue | 5 +-
static/ancss/an.css | 9 ++-
static/css/common.css | 1 +
.../scenic/subscribe/yuyue/yue-notice.vue | 42 ++++++++++
.../scenic/subscribe/yuyue/yue_detail_2.vue | 2 -
.../scenic/subscribe/yuyue/yue_detail_js.vue | 6 +-
.../scenic/subscribe/yuyue/yue_form_js.vue | 78 +++++++++++++------
.../scenic/subscribe/yuyue/yue_time_js.vue | 5 +-
10 files changed, 120 insertions(+), 37 deletions(-)
create mode 100644 sunPackIndex/scenic/subscribe/yuyue/yue-notice.vue
diff --git a/common/param.js b/common/param.js
index 3b17508..4d73d32 100644
--- a/common/param.js
+++ b/common/param.js
@@ -7,8 +7,9 @@ module.exports = {
update_oauthTime: 1000*60*60*12 ,//更新时间
appid: "wx111bbea67d1b06d5",
user_info:null ,//用户信息
- cityName:"雄安",
+ cityName:"衡水老白干",
cityPy:"xiongan",
+ scenicId:167,
imgType:"2901",
duoCaiType:"2908",
userkey:"95034a2bb9a843b79dbc93f74599282b" ,//唯一标识， xa: 95034a2bb9a843b79dbc93f74599282b hd:53904c3cc069487eb198d4698d67aadd sjz:9c55f9b790244319a0c533b21a3efc7b
diff --git a/pages.json b/pages.json
index 82b3d1b..76d94a2 100644
--- a/pages.json
+++ b/pages.json
@@ -441,6 +441,12 @@
"style": {
"navigationBarTitleText": "预约景区"
+ }
+ }, {
+ "path": "scenic/subscribe/yuyue/yue-notice",
+ "style": {
+ "navigationBarTitleText": "预约须知"
+
}
}, {
"path": "scenic/subscribe/yuyue/yue_time_js",
diff --git a/pages/myReserve/myReserve.vue b/pages/myReserve/myReserve.vue
index cf7ecac..35450b8 100644
--- a/pages/myReserve/myReserve.vue
+++ b/pages/myReserve/myReserve.vue
@@ -104,7 +104,7 @@
var data = {
"page": "1",
"limit": "10",
- "scenicId": 80,
+ "scenicId": this.$param.scenicId,
"unionId": "unionIdewrqrfb",
"state": that.type
}
@@ -124,8 +124,7 @@
that.dataList = result.data.data.data;
}
},
- fail: function(e) {
- console.log(e)
+ fail: function(e) {
//error.call(self, e)
}
})
diff --git a/static/ancss/an.css b/static/ancss/an.css
index f85791a..9e6d812 100644
--- a/static/ancss/an.css
+++ b/static/ancss/an.css
@@ -419,7 +419,13 @@ s首页菜单
.yue_fm_btn{ background: none; outline: none; border:none; box-shadow: none; width: 100%; padding: 0;}
.yue_fm_btn:after{ display: none;}
-.yue_e_bun{ font-size: 30rpx; color: #fff; background: #1677ff; padding: 8rpx 0;}
+.yue_e_bun{ font-size: 30rpx; color: #fff; background: #1677ff; padding: 8rpx 0;opacity: .4;}
+.yue_e_bun.active{opacity: 1;}
+
+
+.yue_c_bun{ font-size: 30rpx; color: #fff; background: #1677ff; padding: 8rpx 0;}
+
+
.yue_e_bun .ac_size_1{ margin-right: 10rpx; position: relative; top:6rpx}
.yue_icn{ position: absolute; right: 5rpx; top:5rpx; z-index: 0;}
.yue_icn .ac_size_1{ width:56rpx; height: 56rpx;}
@@ -669,6 +675,7 @@ s首页菜单
.huan_box{background: #22b938;}
.guo_box{background: #007AFF;}
.yuyue-btn{position: fixed; bottom: 0;left: 0; width: 100%;background-color: #F5F5F5; }
+
.yuyue-btn .an_box_2{}
.add_btn{height: 60rpx;line-height: 60rpx;font-size: 32rpx; background: #d9e7ff;
color: #007AFF;opacity: .5; }
diff --git a/static/css/common.css b/static/css/common.css
index 7157adb..9204fe3 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -1031,3 +1031,4 @@ page{ background: #f5f5f5;}
.search_warp{ /* background: #fff; */}
.reci_sch{ display: inline-block; padding: 10rpx 25rpx;background: rgba(255,255,255,.6);color: #999; font-size: 24rpx; margin-right: 15rpx; margin-bottom: 10rpx; border-radius: 5rpx; }
.cur{ display: inline-block; background: rgb(22, 119, 255); color: #fff; }
+
diff --git a/sunPackIndex/scenic/subscribe/yuyue/yue-notice.vue b/sunPackIndex/scenic/subscribe/yuyue/yue-notice.vue
new file mode 100644
index 0000000..da14581
--- /dev/null
+++ b/sunPackIndex/scenic/subscribe/yuyue/yue-notice.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+ 游客须知
+
+
+
+
+ 一、景区严禁烟火，严禁携带易燃易爆等危险物品。
+ 二、请注意安全警示，遵守游览秩序，请勿攀爬、翻越安全防护栏；请勿进入未开放的区域游玩；请勿拥挤打闹；上下台阶时，要小心谨慎。
+ 三、请注意人身、财产安全，保管好个人物品，照顾好老人和儿童。如遇特殊情况，请听从导游或工作人员指挥。
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sunPackIndex/scenic/subscribe/yuyue/yue_detail_2.vue b/sunPackIndex/scenic/subscribe/yuyue/yue_detail_2.vue
index 36c4bfe..5f7e5ca 100644
--- a/sunPackIndex/scenic/subscribe/yuyue/yue_detail_2.vue
+++ b/sunPackIndex/scenic/subscribe/yuyue/yue_detail_2.vue
@@ -42,7 +42,6 @@
};
},
onLoad(options) {
- console.log('asd',options.id)
this.reserveId = options.id;
this.getReserveDetail();
},
@@ -52,7 +51,6 @@
id: this.reserveId
}
this.$Request.get(this.$config.appletsAppointmentDocumentsDetails, queryParams).then(res => {
- console.log(res.data)
if (res.status == 200) {
this.detailData = res.data
}
diff --git a/sunPackIndex/scenic/subscribe/yuyue/yue_detail_js.vue b/sunPackIndex/scenic/subscribe/yuyue/yue_detail_js.vue
index 347bb91..a0d5eb6 100644
--- a/sunPackIndex/scenic/subscribe/yuyue/yue_detail_js.vue
+++ b/sunPackIndex/scenic/subscribe/yuyue/yue_detail_js.vue
@@ -62,9 +62,9 @@
-
+
-
@@ -101,7 +101,7 @@
}
this.detailist = res.data.list
const result = this.detailist.filter(item => {
- return item.writeOff == '0' && item.expiredState == '0'
+ return item.writeOff == '0'
})
if (result.length > 0) {
this.state = true
diff --git a/sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue b/sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue
index 4b513c9..aa23242 100644
--- a/sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue
+++ b/sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue
@@ -1,6 +1,5 @@
-
@@ -45,11 +44,20 @@
+
-
-
@@ -62,12 +70,14 @@
export default {
data() {
return {
- formData: {
+ agreementChecked: false,
+ formData: {
name: {},
phone: {},
documentsType: {},
idCardNumber: {},
passportNumber: {},
+
},
dynamicLists: [],
rules: {
@@ -83,7 +93,7 @@
errorMessage: '电话号码不能为空'
},
{
- validateFunction: function(rule, value, data, callback) {
+ validateFunction: function(rule, value, data, callback) {
let reg = /^[1][3,4,5,7,8,9][0-9]{9}$/
if (!reg.test(value)) {
callback('请填写正确的手机号码')
@@ -101,15 +111,17 @@
},
{
validateFunction: function(rule, value, data, callback) {
- if(data.documentsType=='5502'){
+ if (data.documentsType == '5502') {
return true
- }else{let idreg =
- /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
- if (!idreg.test(value)) {
- callback('请填写正确的身份证件号码')
} else {
- return true
- }}
+ let idreg =
+ /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
+ if (!idreg.test(value)) {
+ callback('请填写正确的身份证件号码')
+ } else {
+ return true
+ }
+ }
}
},
]
@@ -139,6 +151,13 @@
this.addReserve()
},
methods: {
+ radioChange: function(e) {
+ this.agreementChecked = !this.agreementChecked;},
+ gotoNotice: function() {
+ uni.navigateTo({
+ url: '/sunPackIndex/scenic/subscribe/yuyue/yue-notice'
+ });
+ },
//创建预约人
addReserve: function() {
if (this.isAdd) {
@@ -166,19 +185,21 @@
},
//预约按钮
saveReserve: function() {
- let errList = []
- const promises = this.dynamicLists.map((item, index) => {
- return new Promise(resolve => {
- this.$refs.form[index].validate(err => {
- errList = err
+ if(this.agreementChecked){
+ let errList = []
+ const promises = this.dynamicLists.map((item, index) => {
+ return new Promise(resolve => {
+ this.$refs.form[index].validate(err => {
+ errList = err
+ })
})
})
- })
- setTimeout(() => {
- if (errList == null) {
- this.postReserve()
- }
- }, 500)
+ setTimeout(() => {
+ if (errList == null) {
+ this.postReserve()
+ }
+ }, 500)
+ }
},
//传输数据
postReserve: function() {
@@ -259,7 +280,7 @@
\ No newline at end of file
diff --git a/sunPackIndex/scenic/subscribe/yuyue/yue_time_js.vue b/sunPackIndex/scenic/subscribe/yuyue/yue_time_js.vue
index a925efd..786fb27 100644
--- a/sunPackIndex/scenic/subscribe/yuyue/yue_time_js.vue
+++ b/sunPackIndex/scenic/subscribe/yuyue/yue_time_js.vue
@@ -74,7 +74,7 @@
},
onLoad(options) {
// uni.setStorageSync("userid",64)
- var scenicId = 80;
+ var scenicId = this.$param.scenicId;
this.scenicId = scenicId;
this.getDetail(scenicId);
this.getDateList();
@@ -221,8 +221,7 @@
endTime: item.endTime,
externalId: item.externalId
}
- let parameData = JSON.stringify(data)
- console.log('parameData', parameData)
+ let parameData = JSON.stringify(data)
uni.navigateTo({
url: '/sunPackIndex/scenic/subscribe/yuyue/yue_form_js?data=' + parameData
});