diff --git a/pages/activity/book.vue b/pages/activity/book.vue index b2b728b..d80f5dd 100644 --- a/pages/activity/book.vue +++ b/pages/activity/book.vue @@ -8,7 +8,7 @@ {{list.name}} - + {{list.target_name}} @@ -18,11 +18,11 @@ 活动时间:{{list.start_time}}-{{list.end_time}} - + 活动地址:{{list.address}} @@ -54,7 +54,7 @@ :max="(type=='user'?list.person_max_count:list.team_max_count)" class="plus"> - + 每单限购{{list.person_max_count}}张,同一身份证当天限购1张 {{isUnde(item.name)}} - + {{isUnde(item.target_name)}} @@ -30,11 +30,11 @@ 活动时间:{{isUnde(item.start_time)}}-{{getHm(item.end_time)}} - + 活动地址:{{isUnde(item.address)}} diff --git a/pages/activity/info.vue b/pages/activity/info.vue index 22767e1..61c241a 100644 --- a/pages/activity/info.vue +++ b/pages/activity/info.vue @@ -17,7 +17,7 @@ {{isUnde(list.name)}} - + {{isUnde(list.target_name)}} @@ -27,11 +27,11 @@ 活动时间:{{isUnde(list.start_time)}}-{{isUnde(list.end_time)}} - + 活动地址:{{isUnde(list.address)}} diff --git a/pages/guide/index.vue b/pages/guide/index.vue index 98fd211..dd1c0c3 100644 --- a/pages/guide/index.vue +++ b/pages/guide/index.vue @@ -12,7 +12,7 @@ @@ -26,7 +26,7 @@ diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue index 6313934..b8d5b94 100644 --- a/pages/order/activityorderinfo.vue +++ b/pages/order/activityorderinfo.vue @@ -136,7 +136,7 @@ var that = this this.timers = setInterval(function(){ that.loadInfo(that.optionid); - },1000) + },4000) }, onHide() { diff --git a/pages/order/visitorderinfo.vue b/pages/order/visitorderinfo.vue index 80204f7..64bd069 100644 --- a/pages/order/visitorderinfo.vue +++ b/pages/order/visitorderinfo.vue @@ -153,7 +153,7 @@ var that = this this.timer = setInterval(function(){ that.loadInfo(that.optionid); - },1000) + },4000) }, onHide() { diff --git a/pages/park/book.vue b/pages/park/book.vue index cc02fe4..93ed25d 100644 --- a/pages/park/book.vue +++ b/pages/park/book.vue @@ -41,7 +41,7 @@ {{notice.name}} - + @@ -208,7 +208,10 @@ tag: "car_park_notice" }, utilSuccess: function(res) { - that.notice = res; + that.notice = res; + that.notice.value = that.notice.value.replace(/\

diff --git a/pages/visit/book.vue b/pages/visit/book.vue index cb1bc86..a4fcedf 100644 --- a/pages/visit/book.vue +++ b/pages/visit/book.vue @@ -85,7 +85,7 @@ bgColor="#FCF6E3" :min="minCount" :max="maxCount" class="plus"> - + 每单限购{{maxCount}}张,同一身份证当天限购1张 {{minCount}}人以上可团体预约,一个团体最多{{maxCount}}人 @@ -257,7 +257,8 @@ - + + @@ -503,7 +504,8 @@ utilSuccess: function(res) { console.log(res); that.info = res; - that.notice[0].content = (that.type == 'user' ? res.person_notice : res.team_notice) + that.notice[0].content = (that.type == 'user' ? res.person_notice : res.team_notice) + that.notice[0].content = that.notice[0].content.replace(/\