rosehan 2 years ago
parent ac5bea9660
commit 02a73ec7de
  1. 3
      common/param.js
  2. 6
      pages.json
  3. 5
      pages/myReserve/myReserve.vue
  4. 9
      static/ancss/an.css
  5. 1
      static/css/common.css
  6. 42
      sunPackIndex/scenic/subscribe/yuyue/yue-notice.vue
  7. 2
      sunPackIndex/scenic/subscribe/yuyue/yue_detail_2.vue
  8. 6
      sunPackIndex/scenic/subscribe/yuyue/yue_detail_js.vue
  9. 78
      sunPackIndex/scenic/subscribe/yuyue/yue_form_js.vue
  10. 5
      sunPackIndex/scenic/subscribe/yuyue/yue_time_js.vue

@ -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

@ -441,6 +441,12 @@
"style": {
"navigationBarTitleText": "预约景区"
}
}, {
"path": "scenic/subscribe/yuyue/yue-notice",
"style": {
"navigationBarTitleText": "预约须知"
}
}, {
"path": "scenic/subscribe/yuyue/yue_time_js",

@ -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)
}
})

@ -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; }

@ -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; }

@ -0,0 +1,42 @@
<template>
<view>
<view class="lgn_t_box">
<view class="guo_box"></view>
<view class="wei_box_con">
<view class="an_box_4">
游客须知
</view>
<view class="an_box_2 rcd_box box_1">
<view class="amt_30 yue-xuzhi">
<view class="p">景区严禁烟火严禁携带易燃易爆等危险物品</view>
<view class="p">请注意安全警示遵守游览秩序请勿攀爬翻越安全防护栏请勿进入未开放的区域游玩请勿拥挤打闹上下台阶时要小心谨慎</view>
<view class="p">请注意人身财产安全保管好个人物品照顾好老人和儿童如遇特殊情况请听从导游或工作人员指挥</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
</script>
<style>
.an_box_4 {
color: #fff;
text-align: center;
font-weight: 600;
padding-top: 50rpx;
}
.wei_box_con .p {
margin-bottom: 30rpx;
font-size: 28rpx;
}
.wei_box_con .yue-xuzhi {
padding-top: 30rpx;
}
</style>

@ -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
}

@ -62,9 +62,9 @@
</view>
</view>
</view>
<view class="yuyue-btn" v-if='State'>
<view class="yuyue-btn" v-if='state'>
<view class="an_box_2">
<button form-type="submit" class="yue_fm_btn yue_e_bun" @tap="cancelReserve">
<button form-type="submit" class="yue_fm_btn yue_c_bun" @tap="cancelReserve">
取消预约
</button>
</view>
@ -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

@ -1,6 +1,5 @@
<template>
<view class="v-page">
<template v-for="(item,index) in dynamicLists">
<uni-forms ref="form" :modelValue="dynamicLists[index]" label-position="top" :label-width='150'
:rules="rules">
@ -45,11 +44,20 @@
</view>
<view class="yuyue-btn">
<view class="an_box_2">
<view class="amt_60">
<button form-type="submit" class="yue_fm_btn yue_e_bun" @click="saveReserve('dynamicForm')">
<view class="amt_30">
<view class="yue_xuzhi">
<radio-group>
<label class="radio">
<radio :checked="agreementChecked" @click="radioChange"/>
</label>我已阅读并同意<text @click="gotoNotice">游客须知</text>
</radio-group>
</view>
<button form-type="submit" class="yue_fm_btn yue_e_bun" :class="agreementChecked?'active':''" @click="saveReserve('dynamicForm')">
预约
</button>
</view>
</view>
</view>
@ -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 @@
<style>
.v-page {
padding-bottom: 120rpx;
padding-bottom: 180rpx;
}
.uni-data-checklist .checklist-group .checklist-box.is--button {
@ -269,4 +290,13 @@
.uni-forms-item__label {
padding: 0 !important;
}
.yue_xuzhi {
font-size: 28rpx;
margin-bottom: 10rpx;
}
.yue_xuzhi text {
color: rgb(22, 119, 255);
}
</style>

@ -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
});

Loading…
Cancel
Save