From 55c6865432f17bc2c84c2116cc8a7e2475624c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?= <153298343@qq.com> Date: Tue, 7 Jun 2022 21:32:14 +0800 Subject: [PATCH] up --- App.vue | 4 + pages/activity/book.vue | 66 +++++----- pages/activity/index.vue | 2 +- pages/guide/index copy.vue | 140 ++++++++++++++++++++++ pages/guide/index.vue | 193 ++++++++++++++++-------------- pages/index/index.vue | 4 +- pages/order/activityorder.vue | 30 +++-- pages/order/activityorderinfo.vue | 17 +-- pages/order/parkorderinfo.vue | 17 ++- pages/order/visitorder.vue | 6 +- pages/order/visitorderinfo.vue | 28 ++--- pages/park/index.vue | 2 +- pages/visit/book.vue | 53 ++++---- static/img/export.png | Bin 0 -> 41508 bytes static/img/icon_nav_guide.png | Bin 1740 -> 2008 bytes static/img/icon_nav_guide_on.png | Bin 2678 -> 3177 bytes static/img/icon_nav_home.png | Bin 1630 -> 2994 bytes static/img/icon_nav_home_on.png | Bin 1991 -> 4585 bytes static/img/icon_nav_map.png | Bin 2326 -> 3268 bytes static/img/icon_nav_map_on.png | Bin 2929 -> 5034 bytes static/img/icon_nav_user.png | Bin 2343 -> 3794 bytes static/img/icon_nav_user_on.png | Bin 2340 -> 5196 bytes 22 files changed, 361 insertions(+), 201 deletions(-) create mode 100644 pages/guide/index copy.vue create mode 100644 static/img/export.png diff --git a/App.vue b/App.vue index 13b07d5..937f4c2 100644 --- a/App.vue +++ b/App.vue @@ -93,4 +93,8 @@ display: flex; padding: 0rpx 42rpx; } + + .orderBoxInfoRowTxt { + font-size: 28rpx !important; + } diff --git a/pages/activity/book.vue b/pages/activity/book.vue index 9225064..c5a6d9b 100644 --- a/pages/activity/book.vue +++ b/pages/activity/book.vue @@ -102,7 +102,7 @@ - + 联系人信息 @@ -111,7 +111,7 @@ required> - + @@ -240,7 +240,7 @@ content: "预约须知的内容" }, { title: "批量上传帮助", - content: "

1.批量上传EXCEL的以xlsx结尾

2.第一列为标题列 姓名 手机号 证件号

3.文件是从微信聊天记录中选取或者微信文件传输助手

" + content: "

1.批量上传EXCEL的以xlsx结尾

2.第一列为标题列 姓名 手机号 证件号

3.文件是从微信聊天记录中选取或者微信文件传输助手

" }] } }, @@ -386,22 +386,25 @@ }, submitOrder() { - if (this.util.isNull(this.form.leader)) { - if (this.type == "user") { - uni.showToast({ - icon: "none", - title: "请填写联系人" - }) - } else { + if (this.form.details_list.length != this.form.total) { + uni.showToast({ + icon: "none", + title: "请正确添加观众数量" + }) + return false; + } + + if (this.type != "user") { + + + if (this.util.isNull(this.form.leader)) { uni.showToast({ icon: "none", title: "请填写领队姓名" }) + return false; } - return false; - } - if (this.type != "user") { if (this.util.isNull(this.form.unit)) { uni.showToast({ icon: "none", @@ -427,28 +430,23 @@ return false; } } - } - if (this.util.isNull(this.form.mobile)) { - uni.showToast({ - icon: "none", - title: "请填写手机号" - }) - return false; - } else if (!uni.$u.test.mobile(this.form.mobile)) { - uni.showToast({ - icon: "none", - title: "请正确填写手机号" - }) - return false; - } - if (this.form.details_list.length != this.form.total) { - uni.showToast({ - icon: "none", - title: "请正确添加观众数量" - }) - return false; + + if (this.util.isNull(this.form.mobile)) { + uni.showToast({ + icon: "none", + title: "请填写手机号" + }) + return false; + } else if (!uni.$u.test.mobile(this.form.mobile)) { + uni.showToast({ + icon: "none", + title: "请正确填写手机号" + }) + return false; + } } + var that = this; this.util.request({ api: '/api/mobile/activity/order', @@ -494,7 +492,7 @@ } .box-visitor-info { - font-size: 24rpx; + font-size: 32rpx; color: #4E4E4E; margin-left: 22rpx; } diff --git a/pages/activity/index.vue b/pages/activity/index.vue index 27c396b..b629ed9 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -21,7 +21,7 @@ {{isUnde(item.target_name)}} - 立即报名 + {{item.isCanBook?"立即报名":"不可报名"}} diff --git a/pages/guide/index copy.vue b/pages/guide/index copy.vue new file mode 100644 index 0000000..b4ddfdf --- /dev/null +++ b/pages/guide/index copy.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/pages/guide/index.vue b/pages/guide/index.vue index de499f6..3c294b9 100644 --- a/pages/guide/index.vue +++ b/pages/guide/index.vue @@ -1,36 +1,39 @@ @@ -38,60 +41,81 @@ export default { data() { return { - list: [] + notice: {}, + ask: {}, + form: { + mobile: "", + content: "" + }, + urls: { + 1: '/api/mobile/other/visit-notice-index', + 4: '/api/mobile/other/ask-index' + } } }, onLoad() { var that = this; - wx.getLocation({ - success(res) { - that.latitude = res.latitude; - that.longitude = res.longitude; - that.loadActivity() - } - }) + that.loadList(1, 1) + that.loadList(1, 4) }, methods: { - tolist(type) { - if (type == 5) { - uni.navigateTo({ - url: "contact" - }) - } else if (type == 3) { - uni.navigateTo({ - url: "feedback" - }) - } else - uni.navigateTo({ - url: "list?type=" + type - }) - }, - loadActivity() { + loadList(page, type) { var that = this; this.util.request({ - api: '/api/mobile/activity/index', + api: this.urls[type], data: { - latitude: that.latitude, - longitude: that.longitude, - time_type: 2 + page: page }, utilSuccess: function(res) { - for (var m of res.data) { - m.img = m.cover_upload.url; - } - that.list = res.data; + if (type == 1) + that.notice = res.data[0]; + if (type == 4) + that.ask = res.data[0]; }, utilFail: function(res) { - + uni.showToast({ + icon: "none", + title: res + }) } }) }, - clickInfo(e) { - var obj = this.list[e]; - uni.navigateTo({ - url: "../activity/info?id=" + obj.id + "&latitude=" + obj.latitude + "&longitude=" + obj - .longitude + tosubmit() { + let that = this; + if (this.util.isNull(that.form.mobile)) { + this.util.toast("请填写手机号！"); + return false; + } else { + if (!uni.$u.test.mobile(that.form.mobile)) { + this.util.toast("请填写正确的手机号！"); + return false; + } + } + if (this.util.isNull(that.form.content)) { + this.util.toast("请填写内容！"); + return false; + } + this.util.request({ + api: '/api/mobile/other/tip-store', + data: this.form, + method: "POST", + utilSuccess: function(res) { + console.log(res) + uni.showToast({ + icon: "none", + title: "投诉建议成功", + complete() { + uni.reLaunch({ + url: "/pages/success/success?from=feed" + }) + } + }) + }, + utilFail: function(res) { + that.util.toast(res); + } }) + } } } @@ -99,42 +123,33 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index 565b749..3e0dbee 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -53,7 +53,7 @@ {{item.remain_count==0?"售罄":"余票"}} + v-if="item.is_open==1">{{item.remain_count==0?"售罄":"可预约"}} 闭馆 @@ -246,7 +246,7 @@ if (m.remain_count == 0) { day.bottomInfo = '售罄' } else { - day.bottomInfo = '余票' + day.bottomInfo = '可预约' } else { day.bottomInfo = '闭馆' diff --git a/pages/order/activityorder.vue b/pages/order/activityorder.vue index f1d6902..b49291a 100644 --- a/pages/order/activityorder.vue +++ b/pages/order/activityorder.vue @@ -10,20 +10,21 @@ {{item.type==1?"团队预约":"个人预约"}} - {{sta.name}} + {{sta.name}} - + - 订单信息：{{$u.timeFormat(new Date(item.activity.start_time), 'mm月dd日')}} {{getHm(item.activity.start_time)}}-{{getHm(item.activity.end_time)}}丨{{item.total}} 位观众 + 订单信息：{{timeFormat(item.activity.start_time, 'MM月DD日')}}{{getHm(item.activity.start_time)}}-{{getHm(item.activity.end_time)}}丨{{item.total}}位观众 - + - 联系人：{{item.leader}}丨 {{item.mobile}} + 领队：{{item.leader}}丨 {{item.mobile}} @@ -48,8 +49,8 @@