diff --git a/pages/activity/book.vue b/pages/activity/book.vue index 39b8d54..3122a50 100644 --- a/pages/activity/book.vue +++ b/pages/activity/book.vue @@ -58,7 +58,7 @@ 每单限购{{list.person_max_count}}张,同一身份证当天限购1张 {{list.team_min_count}}人以上可团体预约,一个团体最多{{list.team_max_count}}人 + v-if="type=='team'">{{list.team_min_count}}人以上可团体预约 diff --git a/pages/activity/index.vue b/pages/activity/index.vue index 54c136b..360c600 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -31,7 +31,7 @@ - {{item.isCanBook?"立即报名":"不可报名"}} + {{item.isCanBook?"立即报名":"已结束"}} diff --git a/pages/activity/info.vue b/pages/activity/info.vue index 881894b..5af4e94 100644 --- a/pages/activity/info.vue +++ b/pages/activity/info.vue @@ -75,9 +75,9 @@ 已报名数:{{item.has_total}} - - - + + + @@ -110,7 +110,7 @@ - + 团体预约 @@ -175,10 +175,10 @@ this.showNumbers = false this.chooseNum = "" }, - numChange(item) { - if(item.disabled) { - this.util.alert("您选择的产次不可预约!"); - return; + numChange(item) { + if (item.disabled) { + this.util.alert("您选择的场次不可预约!"); + return; }; var _numbers = this.numbers; for (var mod of _numbers) { @@ -228,21 +228,22 @@ .getHm(m.start_time) + "-" + that.getHm(m.end_time); if (that.compareDate(nowTime, m .end_plan)) { - m.disabled = true - } - - if (m.has_total == m.total && m.total != 0){ - m.disabled = true - + m.disabled = true + } + + if (m.has_total == m.total && m.total != 0) { + m.disabled = true + } numberArr.push(m); if (!m.disabled) { - - this.activity_number_id = (i == 0 ? m.id : '') m.checked = i == 0; i++; } } + console.log("numberArr[0].id", numberArr[0].id); + if (numberArr.length > 0) + that.activity_number_id = numberArr[0].id that.numbers = numberArr wx.setStorage({ key: 'activityinfo', @@ -380,20 +381,20 @@ .numbersBoxActive { border: #D98012 1px solid; - background-color: #FCF6E3; + background-color: #FCF6E3; position: relative; - } - - .book-box-row-timeitem-status { - position: absolute; - right: 0; - top: 0; - background: #EF9525; - border-top-right-radius: 5rpx; - border-bottom-left-radius: 5rpx; - font-size: 20rpx; - color: #828282; - padding: 7rpx; + } + + .book-box-row-timeitem-status { + position: absolute; + right: 0; + top: 0; + background: #EF9525; + border-top-right-radius: 5rpx; + border-bottom-left-radius: 5rpx; + font-size: 20rpx; + color: #828282; + padding: 7rpx; } \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index e1fd8f2..256446b 100755 --- a/utils/util.js +++ b/utils/util.js @@ -1,6 +1,6 @@ import md5 from "./md5.min"; const HOSTARR = { - 'development': 'https://leyitest.ali251.langye.net', + 'development':'https://leyiyuyue.szgmbwg.org.cn',// 'https://leyitest.ali251.langye.net', 'production': 'https://leyiyuyue.szgmbwg.org.cn' }; // 审核状态