From 5f37f9cba5b6cd202f8c53e4a5c001abb0bb6202 Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Thu, 16 Jul 2020 19:42:16 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 处理手机绑定用户问题 --- pages/index/index.js | 69 +++++++++++++++++++++--------------------- pages/index/index.wxml | 6 ++-- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/pages/index/index.js b/pages/index/index.js index 2184626..43c4729 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -7,7 +7,7 @@ Page({ randomName: '', showPhone: true, gotCode: false, - restTime: 10, + restTime: 120, timer: '', indicatorDots: true, autoplay: true, @@ -29,7 +29,8 @@ Page({ liveUrl: app.liveUrl, liveList: [] }, - usercenterUrl: app.usercenterUrl + usercenterUrl: app.usercenterUrl, + isConfirm: false }, doLogin: function () { var self = this; @@ -189,7 +190,6 @@ Page({ this.setData({ phone: res.detail.value }) - console.log(this.data.phone) }, // 校验手机号 testPhone: function () { @@ -214,43 +214,40 @@ Page({ }, // 获取验证码 getCode: function () { - var self = this + var self = this; + self.setData({ + gotCode: true + }) + self.data.timer = setInterval(function () { + var cur = self.data.restTime - 1 + if (cur == 0) { + clearInterval(self.data.timer) + self.setData({ + restTime: 120, + gotCode: false + }) + } else { + self.setData({ + restTime: cur + }) + } + }, 1000) app.restAjax.get(app.restAjax.path('{usercenterUrl}/api/sms/getverificationcode/' + self.data.phone, [app.usercenterUrl]), {}, null, + function (code, data) {}, function (code, data) { - if (code == 200) { - console.log(data) - self.setData({ - gotCode: true - }) - self.data.timer = setInterval(function () { - var cur = self.data.restTime - 1 - console.log(cur) - if (cur == 0) { - clearInterval(self.data.timer) - self.setData({ - restTime: 120, - gotCode: false - }) - } else { - self.setData({ - restTime: cur - }) - } - }, 1000) - } - }, - function (code, data) { - console.log(data) wx.showToast({ title: data.msg, icon: 'none', duration: 1500 }) - } ) + }) }, // 提交绑定手机 submitPhone: function () { - var self = this + var self = this; + self.setData({ + isConfirm: true + }) app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/user/updateminiappdefaultusername', [app.usercenterUrl]), { phone: self.data.phone, verificationCode: self.data.code @@ -259,17 +256,19 @@ Page({ token: self.data.token } }, function (code, data) { - console.log(data) wx.setStorageSync('token', data.data); wx.setStorageSync('isRandomUsername', 0) clearInterval(self.data.timer) self.setData({ - showPhone: false, - restTime: 120 + showPhone: false }) + wx.showTabBar(); self.getUserInfo() }, function (code, data) { - console.log(data) + app.dialog.msg(data.msg); + self.setData({ + isConfirm: false + }) }) }, // 验证码 @@ -305,7 +304,7 @@ Page({ userInfo: data }) }, function (code, data) { - console.log(data) + app.dialog.msg(data.msg); }) }, /** diff --git a/pages/index/index.wxml b/pages/index/index.wxml index d2bed56..f88358a 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -138,15 +138,15 @@ 您还没有绑定手机号，请先绑定手机号 - + - + 获取验证码 {{restTime}} - 确认 + 确认 \ No newline at end of file From 91a7d7d44b53e9d5963fd8ac1c9c60f193052464 Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Fri, 17 Jul 2020 11:16:44 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/heritage/heritage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/heritage/heritage.js b/pages/heritage/heritage.js index c426ff9..d3b59cd 100644 --- a/pages/heritage/heritage.js +++ b/pages/heritage/heritage.js @@ -45,7 +45,7 @@ Page({ if(page <= 1) { libraryArray = data.rows; } else { - libraryArray = self.data.news.newsList; + libraryArray = self.data.libraryList; libraryArray = libraryArray.concat(data.rows); } self.setData({ From 5837de0c1316d5456478b43265e827573283d096 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Wed, 29 Jul 2020 16:34:04 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/newTeam/newTeam.js | 55 ++++++++++++++++++-- pages/volunteerRegister/volunteerRegister.js | 55 ++++++++++++++++++-- 2 files changed, 104 insertions(+), 6 deletions(-) diff --git a/pages/newTeam/newTeam.js b/pages/newTeam/newTeam.js index 3c05d8c..09b67b6 100644 --- a/pages/newTeam/newTeam.js +++ b/pages/newTeam/newTeam.js @@ -96,7 +96,7 @@ Page({ teamAreaArray: [] }) - this.getDataFromDict(self.data.teamCity[self.data.teamCityIndex].dictionaryId, 2).then(result => { + this.getDataFromArea(self.data.teamCity[self.data.teamCityIndex].areaId, 2).then(result => { if(self.data.tempObj.length > 0) { self.setData({ teamCounty: self.data.tempObj, @@ -122,7 +122,7 @@ Page({ teamCountyIndex: e.detail.value }) - this.getDataFromDict(self.data.teamCounty[self.data.teamCountyIndex].dictionaryId, 2).then(result => { + this.getDataFromArea(self.data.teamCounty[self.data.teamCountyIndex].areaId, 2).then(result => { if(self.data.tempObj.length > 0) { self.setData({ teamArea: self.data.tempObj, @@ -256,13 +256,62 @@ Page({ }) }) }, + /** + *从区域表拉取数据 + */ + getDataFromArea: function(dictId, type) { + var self = this; + return new Promise(resolve => { + app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/app/dataarea/listareabyparentidrelease/' + dictId, []), + {}, { + headers: { + 'token': self.data.token + } + }, function(code, data) { + if('200' == code) { + if(data || type === 2) { + var array = []; + for(var item of data) { + delete item.areaParentId; + delete item.areaParentName; + delete item.areaCode; + delete item.areaCityCode; + delete item.areaMergerName; + delete item.areaShortName; + delete item.areaZipCode; + delete item.areaLevel; + delete item.areaLng; + delete item.areaLat; + delete item.areaPinyin; + delete item.areaFirst; + delete item.subArea; + delete item.parent; + + array.push(item.areaName); + } + self.setData({ + tempArray: array + }) + } + self.setData({ + tempObj: data + }) + } + return resolve(); + }, function() { + + }, function() { + + }) + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { var self = this; this.getToken().then(result => { - this.getDataFromDict('4a03e904-81e2-48e9-9006-e15ea4a6bc69', 2).then(result => { + this.getDataFromArea('640332', 2).then(result => { self.setData({ teamCity: self.data.tempObj, teamCityArray: self.data.tempArray, diff --git a/pages/volunteerRegister/volunteerRegister.js b/pages/volunteerRegister/volunteerRegister.js index 6d61ce0..f8d17c6 100644 --- a/pages/volunteerRegister/volunteerRegister.js +++ b/pages/volunteerRegister/volunteerRegister.js @@ -58,7 +58,7 @@ Page({ teamAreaArray: [] }) - this.getDataFromDict(self.data.teamCity[self.data.teamCityIndex].dictionaryId, 2).then(result => { + this.getDataFromArea(self.data.teamCity[self.data.teamCityIndex].areaId, 2).then(result => { if(self.data.tempObj.length > 0) { self.setData({ teamCounty: self.data.tempObj, @@ -84,7 +84,7 @@ Page({ teamCountyIndex: e.detail.value }) - this.getDataFromDict(self.data.teamCounty[self.data.teamCountyIndex].dictionaryId, 2).then(result => { + this.getDataFromArea(self.data.teamCounty[self.data.teamCountyIndex].areaId, 2).then(result => { if(self.data.tempObj.length > 0) { self.setData({ teamArea: self.data.tempObj, @@ -280,6 +280,55 @@ Page({ }) }) }, + /** + *从区域表拉取数据 + */ + getDataFromArea: function(dictId, type) { + var self = this; + return new Promise(resolve => { + app.restAjax.get(app.restAjax.path(app.volunteerUrl + '/app/dataarea/listareabyparentidrelease/' + dictId, []), + {}, { + headers: { + 'token': self.data.token + } + }, function(code, data) { + if('200' == code) { + if(data || type === 2) { + var array = []; + for(var item of data) { + delete item.areaParentId; + delete item.areaParentName; + delete item.areaCode; + delete item.areaCityCode; + delete item.areaMergerName; + delete item.areaShortName; + delete item.areaZipCode; + delete item.areaLevel; + delete item.areaLng; + delete item.areaLat; + delete item.areaPinyin; + delete item.areaFirst; + delete item.subArea; + delete item.parent; + + array.push(item.areaName); + } + self.setData({ + tempArray: array + }) + } + self.setData({ + tempObj: data + }) + } + return resolve(); + }, function() { + + }, function() { + + }) + }) + }, getVolunteerMsg() { var self = this; return new Promise(resolve => { @@ -323,7 +372,7 @@ Page({ }) }) }).then(result => { - this.getDataFromDict('4a03e904-81e2-48e9-9006-e15ea4a6bc69', 2).then(result => { + this.getDataFromArea('640332', 2).then(result => { self.setData({ teamCity: self.data.tempObj, teamCityArray: self.data.tempArray, From 4b92002e832776cdd5cb7a8cd121593f188b89a0 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Wed, 29 Jul 2020 16:35:24 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index b6139c1..ec50428 100644 --- a/app.js +++ b/app.js @@ -9,7 +9,7 @@ App({ libraryUrl: 'https://www.wgink.ink/library', venueUrl: 'https://www.wgink.ink/venuebooking', activityUrl: 'https://www.wgink.ink/culturalactivity', - volunteerUrl: 'https://www.wgink.ink/volunteer', + volunteerUrl: 'http://192.168.0.111:8888/volunteer', liveUrl: 'https://www.wgink.ink/live', liveRecordUrl: 'https://www.wgink.ink', socialUrl: 'https://www.wgink.ink/social', From 8555f8c2cd310ce9fdc19a34346841205d404f1a Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Thu, 6 Aug 2020 14:57:56 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- pages/activityDialog/activityDialog.js | 7 +++++-- pages/activityDialog/activityDialog.wxml | 6 +++--- pages/serviceActivityDetail/serviceActivityDetail.js | 5 +++-- pages/serviceActivityDetail/serviceActivityDetail.wxml | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app.js b/app.js index ec50428..09ffa24 100644 --- a/app.js +++ b/app.js @@ -8,7 +8,7 @@ App({ newsContentUrl: 'https://www.wgink.ink', libraryUrl: 'https://www.wgink.ink/library', venueUrl: 'https://www.wgink.ink/venuebooking', - activityUrl: 'https://www.wgink.ink/culturalactivity', + activityUrl: 'http://192.168.0.111:8080/culturalactivity', volunteerUrl: 'http://192.168.0.111:8888/volunteer', liveUrl: 'https://www.wgink.ink/live', liveRecordUrl: 'https://www.wgink.ink', diff --git a/pages/activityDialog/activityDialog.js b/pages/activityDialog/activityDialog.js index 915664e..5afb011 100644 --- a/pages/activityDialog/activityDialog.js +++ b/pages/activityDialog/activityDialog.js @@ -12,7 +12,8 @@ Page({ page: 1, rows: 5 }, - dataList: {} + dataList: {}, + status: '' }, getToken: function() { var self = this; @@ -61,6 +62,7 @@ Page({ self.setData({ dataList: data.rows }) + console.log(self.data.dataList) }else { if(data.rows.length == 0) { self.setData({ @@ -88,7 +90,8 @@ Page({ onLoad: function (options) { var self = this; self.setData({ - serviceId: options.serviceId + serviceId: options.serviceId, + status: options.status }) this.getToken().then(result => { this.getActivityHis() diff --git a/pages/activityDialog/activityDialog.wxml b/pages/activityDialog/activityDialog.wxml index b01d618..48a8c04 100644 --- a/pages/activityDialog/activityDialog.wxml +++ b/pages/activityDialog/activityDialog.wxml @@ -1,4 +1,7 @@ + + 暂无评论 + @@ -15,9 +18,6 @@ {{item.uploadTime}} - diff --git a/pages/serviceActivityDetail/serviceActivityDetail.js b/pages/serviceActivityDetail/serviceActivityDetail.js index 55b32b6..f00dc9f 100644 --- a/pages/serviceActivityDetail/serviceActivityDetail.js +++ b/pages/serviceActivityDetail/serviceActivityDetail.js @@ -224,10 +224,11 @@ Page({ }) }, - toActivityHis: function() { + toActivityHis: function(e) { var self = this; + const status = e.currentTarget.dataset.status; wx.navigateTo({ - url: '../activityDialog/activityDialog?serviceId=' + self.data.serviceId, + url: '../activityDialog/activityDialog?serviceId=' + self.data.serviceId + '&status=' + status, }) }, /** diff --git a/pages/serviceActivityDetail/serviceActivityDetail.wxml b/pages/serviceActivityDetail/serviceActivityDetail.wxml index 9d86543..5b40e73 100644 --- a/pages/serviceActivityDetail/serviceActivityDetail.wxml +++ b/pages/serviceActivityDetail/serviceActivityDetail.wxml @@ -24,7 +24,7 @@ 活动详情 - 评论列表 + 评论列表 From cd5bbba85d5616a0ed2756e769bf81d4df127d7f Mon Sep 17 00:00:00 2001 From: dong_bo0602 <358256383@qq.com> Date: Thu, 6 Aug 2020 16:49:55 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/activity/activity.js | 31 +++++++++++++++++++++- pages/activity/activity.wxml | 4 +++ pages/activity/activity.wxss | 20 +++++++++++++++ pages/newsList/newsList.js | 42 +++++++++++++++++++++++++++--- pages/newsList/newsList.wxml | 30 ++++++++++++++++------ pages/newsList/newsList.wxss | 47 ++++++++++++++++++++++++++++++--- pages/venue/venue.js | 50 +++++++++++++++++++++++++++++++++++- pages/venue/venue.wxml | 12 +++++++++ pages/venue/venue.wxss | 41 +++++++++++++++++++++++++++-- 9 files changed, 257 insertions(+), 20 deletions(-) diff --git a/pages/activity/activity.js b/pages/activity/activity.js index f5ce8cc..c6d4ffe 100644 --- a/pages/activity/activity.js +++ b/pages/activity/activity.js @@ -7,11 +7,38 @@ Page({ */ data: { dataList: [], + areaList: [], pages: { page: 1, - rows: 5 + rows: 5, + county: '' } }, + getAreaList: function () { + var self = this; + app.restAjax.get(app.restAjax.path(app.usercenterUrl + '/app/dataarea/listareabyparentidrelease/640675', []), + self.data.pages, null, function (code, data) { + if (code == '200') { + self.setData({ + areaList: data + }) + } + } + ) + }, + changeArea: function (e) { + app.dialog.loading('正在加载'); + this.setData({ + 'pages.county': e.currentTarget.dataset.area + }) + this.getActivityList() + }, + loadAll: function () { + this.setData({ + 'pages.county': '' + }) + this.getActivityList() + }, goDetail: function (e) { var id = e.currentTarget.dataset.id; wx.navigateTo({ @@ -50,6 +77,7 @@ Page({ }, function() { wx.hideNavigationBarLoading(); //完成停止加载图标 wx.stopPullDownRefresh(); + wx.hideLoading(); }) }, /** @@ -57,6 +85,7 @@ Page({ */ onLoad: function (options) { this.getActivityList(); + this.getAreaList() }, /** diff --git a/pages/activity/activity.wxml b/pages/activity/activity.wxml index a415140..c1644db 100644 --- a/pages/activity/activity.wxml +++ b/pages/activity/activity.wxml @@ -1,3 +1,7 @@ + + 全部 + {{item.areaName}} + diff --git a/pages/activity/activity.wxss b/pages/activity/activity.wxss index 454a8b4..a496ac3 100644 --- a/pages/activity/activity.wxss +++ b/pages/activity/activity.wxss @@ -1,5 +1,6 @@ .activity{ padding: 20rpx 30rpx 0; + margin-top: 80rpx; } .activity-box{ margin-bottom: 20rpx; @@ -66,4 +67,23 @@ margin-top: 10rpx; font-size: 24rpx; color: #242424; +} +.area{ + position: fixed; + top: 0; + left: 0; + right: 0; + height: 80rpx; + white-space: nowrap; + overflow-x: auto; +} +.area-box{ + display: inline-block; + width: 25%; + line-height: 80rpx; + text-align: center; + font-size: 30rpx; +} +.area-box.active{ + color: #9F1512; } \ No newline at end of file diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js index 6c4e7f4..2e7175e 100644 --- a/pages/newsList/newsList.js +++ b/pages/newsList/newsList.js @@ -13,7 +13,8 @@ Page({ directoriesParentId: 'f497904b-7727-4832-891c-604c36ae4167', currentNewsDictionariesId: '', currentPage: 1, - rows: 10 + rows: 10, + areaId: '' }, doGetNewsDictionariesList: function() { var self = this; @@ -43,15 +44,21 @@ Page({ }); self.doGetNewsList(1); }, - doGetNewsList: function(page) { + doGetNewsList: function(page, lv) { var self = this; app.dialog.loading('正在加载'); - app.restAjax.get(app.restAjax.path('{newsUrl}/app/newscontent/listpagenewscontentrelease', [self.data.news.newsUrl]), { + var info = { newsDirectoriesParentId: self.data.directoriesParentId, newsDirectoriesId: self.data.currentNewsDictionariesId ? self.data.currentNewsDictionariesId : '', page: page, rows: self.data.rows - }, null, function(code, data) { + } + if (lv) { + lv = 'area' + lv + info[lv] = self.data.areaId + } + console.log(info) + app.restAjax.get(app.restAjax.path('{newsUrl}/app/newscontent/listpagenewscontentrelease', [self.data.news.newsUrl]), info, null, function(code, data) { var newsArray; if(page <= 1) { newsArray = data.rows; @@ -79,6 +86,32 @@ Page({ url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl, }) }, + getAreaList: function () { + var self = this; + app.restAjax.get(app.restAjax.path(app.usercenterUrl + '/app/dataarea/listareabyparentidrelease/640675', []), + self.data.pages, null, function (code, data) { + if (code == '200') { + self.setData({ + areaList: data + }) + } + } + ) + }, + changeArea: function (e) { + app.dialog.loading('正在加载'); + var lv = parseInt(e.currentTarget.dataset.level) + 1 + this.setData({ + areaId: e.currentTarget.dataset.area + }) + this.doGetNewsList(1, lv) + }, + loadAll: function () { + this.setData({ + areaId: '' + }) + this.doGetNewsList(1) + }, /** * 生命周期函数--监听页面加载 */ @@ -94,6 +127,7 @@ Page({ }); } self.doGetNewsDictionariesList(); + self.getAreaList(); }, /** diff --git a/pages/newsList/newsList.wxml b/pages/newsList/newsList.wxml index e008858..7d31b3a 100644 --- a/pages/newsList/newsList.wxml +++ b/pages/newsList/newsList.wxml @@ -1,13 +1,27 @@ - - - 全部 - + + + + 全部 + + + + + {{item.directoriesName}} + + - - - {{item.directoriesName}} - + + + + 全部 + + + + + {{item.areaName}} + + diff --git a/pages/newsList/newsList.wxss b/pages/newsList/newsList.wxss index 43041b4..03719e3 100644 --- a/pages/newsList/newsList.wxss +++ b/pages/newsList/newsList.wxss @@ -3,12 +3,14 @@ top: 0; left: 0; right: 0; - display: flex; box-shadow:0 0 17rpx 0 rgba(0,0,0,0.1); border-radius:0 0 31rpx 31rpx; background: #fff; overflow-x: auto; } +.type{ + display: flex; +} .tab-box{ display: inline-flex; justify-content: center; @@ -35,15 +37,52 @@ display: block; } .tab-box image.selected-l{ - left: 40rpx; + left: 20rpx; } .tab-box image.selected-r{ - right: 40rpx; + right: 20rpx; +} +.area{ + overflow-x: auto; + white-space: nowrap; +} +.area-box{ + display: inline-block; + width: 30%; + height: 90rpx; + line-height: 90rpx; + text-align: center; + padding: 0 20px; + box-sizing: border-box; + position: relative; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.area-box.active{ + color: #9F1512; +} +.area-box image{ + position: absolute; + width: 15rpx; + height: 40rpx; + top: 50%; + margin-top: -20rpx; + display: none; +} +.area-box.active image{ + display: block; +} +.area-box image.selected-l{ + left: 20rpx; +} +.area-box image.selected-r{ + right: 20rpx; } .news{ padding: 30rpx; border-bottom: 5px solid #FBFBFB; - margin-top: 90rpx; + margin-top: 180rpx; } .news-box{ padding: 30rpx 0; diff --git a/pages/venue/venue.js b/pages/venue/venue.js index edfb9a3..4e3104e 100644 --- a/pages/venue/venue.js +++ b/pages/venue/venue.js @@ -16,7 +16,11 @@ Page({ orderKey : '', venueType : '', latitude: '', - longitude: '' + longitude: '', + selectingArea: false, // 显示隐藏选择区域 + areaList: [], + venueArea: '', + areaName: '' }, //获取定位 @@ -63,6 +67,7 @@ Page({ latitude: self.data.latitude, longitude: self.data.longitude, selfLocation: 'TX', + venueArea: self.data.venueArea }, null, function(code, data){ data.rows.forEach(element => { @@ -77,11 +82,15 @@ Page({ venuesList : data.rows, page : data.page }); + if (data.rows.length == 0) { + app.dialog.msg('暂无数据'); + } }, function(code,data){ app.dialog.msg(data.msg); },function(){ wx.hideNavigationBarLoading(); wx.stopPullDownRefresh(); + wx.hideLoading(); } ); }, @@ -115,12 +124,51 @@ Page({ }) }, + //选择区域 + selectArea: function () { + this.setData({ + selectingArea: true + }) + }, + + // 获取地区列表 + getAreaList: function () { + var self = this; + app.restAjax.get(app.restAjax.path(app.usercenterUrl + '/app/dataarea/listareabyparentidrelease/640675', []), + self.data.pages, null, function (code, data) { + if (code == '200') { + self.setData({ + areaList: data + }) + } + }) + }, + // 切换地区 + changeArea: function (e) { + app.dialog.loading('正在加载'); + this.setData({ + venueArea: e.currentTarget.dataset.area, + selectingArea: false, + areaName: e.currentTarget.dataset.areaname + }) + this.listPageVenuesInfo() + }, + + // 全部地区 + loadAll: function () { + this.setData({ + venueArea: '', + selectingArea: false + }) + this.listPageVenuesInfo() + }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { this.listVenueType(); this.getLocation(); + this.getAreaList(); }, /** diff --git a/pages/venue/venue.wxml b/pages/venue/venue.wxml index 621c0ef..e2adffb 100644 --- a/pages/venue/venue.wxml +++ b/pages/venue/venue.wxml @@ -19,6 +19,12 @@ 最新发布 + + 选择区域 + + + {{areaName}} + @@ -35,3 +41,9 @@ + + + 全部 + {{item.areaName}} + + \ No newline at end of file diff --git a/pages/venue/venue.wxss b/pages/venue/venue.wxss index 3aa914a..09ff6b5 100644 --- a/pages/venue/venue.wxss +++ b/pages/venue/venue.wxss @@ -3,7 +3,7 @@ top: 0; left: 0; right: 0; - padding: 0 30rpx; + padding: 0 30rpx 10rpx; background: #fff; } .fixed-tab{ @@ -44,7 +44,7 @@ } .venue{ height: 400rpx; - margin-top: 240rpx; + margin-top: 250rpx; padding: 0 30rpx; } @@ -85,4 +85,41 @@ font-size: 28rpx; color: #242424; margin-top: 10rpx; +} +.select-area{ + position: fixed; + top: 0; + bottom: 0; + right: 0; + left: 0; + background: rgba(0,0,0,0.6); +} +.area-container{ + background: #fff; + padding: 15rpx 15rpx 0; + font-size: 0; +} +.area-box{ + display: inline-block; + width: 32%; + height: 60rpx; + line-height: 60rpx; + margin-bottom: 15rpx; + margin-right: 2%; + text-align: center; + font-size: 30rpx; + border: 1px solid #DDD; + border-radius: 10rpx; + box-sizing: border-box; + padding: 0 10rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.area-box.active{ + border: #9F1512 1px solid; + color: #9F1512; +} +.area-box:nth-child(3n){ + margin-right: 0; } \ No newline at end of file From 872cdfbfb396bf65365aad9f0cf008c6d142e5c8 Mon Sep 17 00:00:00 2001 From: dong_bo0602 <358256383@qq.com> Date: Thu, 6 Aug 2020 16:51:52 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 6 +++--- images/marker_yellow.png | Bin 0 -> 3554 bytes pages/index/index.wxml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 images/marker_yellow.png diff --git a/app.js b/app.js index ec50428..8db9eef 100644 --- a/app.js +++ b/app.js @@ -7,9 +7,9 @@ App({ newsUrl: 'https://www.wgink.ink/news', newsContentUrl: 'https://www.wgink.ink', libraryUrl: 'https://www.wgink.ink/library', - venueUrl: 'https://www.wgink.ink/venuebooking', - activityUrl: 'https://www.wgink.ink/culturalactivity', - volunteerUrl: 'http://192.168.0.111:8888/volunteer', + venueUrl: 'http://192.168.0.109:8082/venuebooking', + activityUrl: 'http://192.168.0.111:8080/culturalactivity', + volunteerUrl: 'https://www.wgink.ink/volunteer', liveUrl: 'https://www.wgink.ink/live', liveRecordUrl: 'https://www.wgink.ink', socialUrl: 'https://www.wgink.ink/social', diff --git a/images/marker_yellow.png b/images/marker_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..febe8f6cb407dafcc79bbd0efe75c8f300a1f686 GIT binary patch literal 3554 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 literal 0 HcmV?d00001 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index f88358a..5dc676c 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -134,7 +134,7 @@ - + \ No newline at end of file From 6a356bdbad73d5b9a289e373526b504d7fc84937 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Thu, 6 Aug 2020 16:55:58 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/activitySign/activitySign.js | 23 +++++++++++++++++++++-- pages/activitySign/activitySign.wxml | 3 ++- pages/activitySign/activitySign.wxss | 9 ++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/pages/activitySign/activitySign.js b/pages/activitySign/activitySign.js index d99d5d1..17c709e 100644 --- a/pages/activitySign/activitySign.js +++ b/pages/activitySign/activitySign.js @@ -14,7 +14,10 @@ Page({ name: '', idCard: '', trueCode: '', - activityId: '' + activityId: '', + restTime: 120, + timer: '', + gotCode: false }, getToken: function() { var self = this; @@ -40,7 +43,23 @@ Page({ {}, null, function(code, data) { console.log(data) if('200' == code) { - + self.setData({ + gotCode: true + }) + self.data.timer = setInterval(function () { + var cur = self.data.restTime - 1 + if (cur == 0) { + clearInterval(self.data.timer) + self.setData({ + restTime: 120, + gotCode: false + }) + } else { + self.setData({ + restTime: cur + }) + } + }, 1000) } }, function(code, data) { app.dialog.msg(data.msg) diff --git a/pages/activitySign/activitySign.wxml b/pages/activitySign/activitySign.wxml index 7f5d671..55e9199 100644 --- a/pages/activitySign/activitySign.wxml +++ b/pages/activitySign/activitySign.wxml @@ -41,7 +41,8 @@ 验证码： - 获取验证码 + 获取验证码 + {{restTime}} 姓　名： diff --git a/pages/activitySign/activitySign.wxss b/pages/activitySign/activitySign.wxss index 6282488..a237f80 100644 --- a/pages/activitySign/activitySign.wxss +++ b/pages/activitySign/activitySign.wxss @@ -63,7 +63,7 @@ height: 40rpx; margin-top: -5rpx; } -.get-code{ +.get-code, .got-code{ position: absolute; top: 15rpx; right: 0; @@ -73,6 +73,13 @@ color: #9F1512; font-size: 26rpx; } +.got-code{ + width: 120rpx; + background: #eee; + color: #4a4d52; + border: 1px solid #eaeaea; + text-align: center; +} .sign-box{ position: fixed; bottom: 0; From ab303eb2560a0220cf235cee80f3a6d71f243ea9 Mon Sep 17 00:00:00 2001 From: dong_bo0602 <358256383@qq.com> Date: Thu, 6 Aug 2020 16:56:59 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app.js b/app.js index 65f9b5f..f992a35 100644 --- a/app.js +++ b/app.js @@ -7,15 +7,12 @@ App({ newsUrl: 'https://www.wgink.ink/news', newsContentUrl: 'https://www.wgink.ink', libraryUrl: 'https://www.wgink.ink/library', -<<<<<<< HEAD - venueUrl: 'http://192.168.0.109:8082/venuebooking', - activityUrl: 'http://192.168.0.111:8080/culturalactivity', - volunteerUrl: 'https://www.wgink.ink/volunteer', -======= venueUrl: 'https://www.wgink.ink/venuebooking', - activityUrl: 'http://192.168.0.111:8080/culturalactivity', - volunteerUrl: 'http://192.168.0.111:8888/volunteer', ->>>>>>> 8555f8c2cd310ce9fdc19a34346841205d404f1a + activityUrl: 'https://www.wgink.ink/culturalactivity', + volunteerUrl: 'https://www.wgink.ink/volunteer', + venueUrl: 'https://www.wgink.ink/venuebooking', + activityUrl: 'https://www.wgink.ink/culturalactivity', + volunteerUrl: 'https://www.wgink.ink/volunteer', liveUrl: 'https://www.wgink.ink/live', liveRecordUrl: 'https://www.wgink.ink', socialUrl: 'https://www.wgink.ink/social', From 98883495edd3bcf70c156bb2931847b7ff4b4f83 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Thu, 6 Aug 2020 16:59:51 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81=E7=A0=81=E5=80=92=E8=AE=A1?= =?UTF-8?q?=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app.js b/app.js index 65f9b5f..e702dc3 100644 --- a/app.js +++ b/app.js @@ -7,15 +7,12 @@ App({ newsUrl: 'https://www.wgink.ink/news', newsContentUrl: 'https://www.wgink.ink', libraryUrl: 'https://www.wgink.ink/library', -<<<<<<< HEAD venueUrl: 'http://192.168.0.109:8082/venuebooking', activityUrl: 'http://192.168.0.111:8080/culturalactivity', volunteerUrl: 'https://www.wgink.ink/volunteer', -======= venueUrl: 'https://www.wgink.ink/venuebooking', activityUrl: 'http://192.168.0.111:8080/culturalactivity', volunteerUrl: 'http://192.168.0.111:8888/volunteer', ->>>>>>> 8555f8c2cd310ce9fdc19a34346841205d404f1a liveUrl: 'https://www.wgink.ink/live', liveRecordUrl: 'https://www.wgink.ink', socialUrl: 'https://www.wgink.ink/social',