diff --git a/app.js b/app.js index adf56dc..07d7645 100644 --- a/app.js +++ b/app.js @@ -17,9 +17,10 @@ App({ liveUrl: restAjax.url + 'live', liveRecordUrl: restAjax.baseUrl, socialUrl: restAjax.baseUrl, - areaCode: '540200000000', - areaName: '日喀则市', - areaId: '640675', + areaCode: '540237000000', + areaName: '岗巴县', + areaId: '642536', + appKey:'wxf09039899a800865', shopUrl: restAjax.url + "xzshop", bigDataUrl: restAjax.url + "module", restAjax: restAjax, diff --git a/app.json b/app.json index 20ef3a9..1cea98b 100644 --- a/app.json +++ b/app.json @@ -62,7 +62,7 @@ "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#9F1512", - "navigationBarTitleText": "日喀则市数字文化云", + "navigationBarTitleText": "岗巴县公共文化数字云", "navigationBarTextStyle": "white" }, "tabBar": { diff --git a/pages/center/center.js b/pages/center/center.js index b77a26e..a7b4005 100644 --- a/pages/center/center.js +++ b/pages/center/center.js @@ -64,7 +64,7 @@ Page({ // 上传 uploadAvatar: function (avatarId) { var self = this - app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/user/updateuseravatar', [app.usercenterUrl]), { + app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/user/update-avatar', [app.usercenterUrl]), { avatar: avatarId }, { headers: { @@ -246,6 +246,11 @@ Page({ }) self.getUserInfo() app.dialog.msg('绑定成功'); + },function(code,error){ + self.setData({ + isLoading: false + }) + app.dialog.msg(error.msg) }) } else { self.setData({ diff --git a/pages/center/center.wxml b/pages/center/center.wxml index fd29c68..3dc4711 100644 --- a/pages/center/center.wxml +++ b/pages/center/center.wxml @@ -3,7 +3,7 @@ - + {{userInfo.name}} diff --git a/pages/index/index.js b/pages/index/index.js index ef34150..577509a 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -41,9 +41,9 @@ Page({ wx.login({ success(res) { if (res.code) { - wx.setStorageSync('token', 'REQ5NW5IZTZjS2ZyQU9QQmFKZ1FIRmVhbjNFZmV4dEx3emdob2g5UjVXaForWGdpOHFIRWgyTWRIelJFWkhNS28wN1hUV2Uwb0FKSUEra2wzYVhXdnI4aG9odkxLd3ZFUGkrTTQwQTkzdyt3cnN3NkY4OE9aaGw0aUJPTUNSaENKbGxTdm8xR3Z5WTJBV0NDcWRpbEd3OW0zUzA3US8xMmUyaTU2a0N4YmN5d1FjTXd6aTZIZkhhdmpsSDlqYSt0OUJVUHRSbTJqSVd6eHlYc1M5WTlkK015MVR2R083T3crU2wrdVFmVGk4N3NHWmZNY1A3SGNNbm8xMDFMTy9tcTN2K0NuQTZJbk9YZGJqK3drQkxlMXNUVjZZNkZyRE9LMGdYdUQzSE9lbDQ9'); - app.restAjax.post(app.restAjax.path('{url}/wechat-miniapp/sign/default', [app.loginUrl]), { - jsCode: res.code + app.restAjax.post(app.restAjax.path('{url}/wechat-miniapp/sign/default-multi', [app.loginUrl]), { + jsCode: res.code, + appKey:app.appKey }, null, function (code, data) { console.log(data) var tokenArray = data.data.split('_'); @@ -354,7 +354,7 @@ Page({ }) self.doLogin(); self.doGetBanner(); - self.doGetLiveList(); + // self.doGetLiveList(); self.doGetVenueList(); self.doGetActivityList(); self.getMainFunc(); diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 20e3f79..da765c0 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,147 +1,151 @@ - - - - - - - - - - - - {{item.directoriesName}} - - - - - 志愿者服务 - - - - 精彩活动 - - - - 场馆导航 - - - - 非遗文化 - - - - 直播点播 - + + + + + + + + + + + {{item.directoriesName}} + + + + + 志愿者服务 + + + + 精彩活动 + + + + 场馆导航 + + + + 非遗文化 + + + + + - - - - 精彩推荐 - - - - - - - 场馆导航 - {{item.venueName}} - - - - 精彩活动 - {{item.activityTitle}} - - - + + + + 精彩推荐 + + + + + + + 场馆导航 + {{item.venueName}} + + + + 精彩活动 + {{item.activityTitle}} + + + + + - - - - - {{it.directoriesName}} - - - - - - - {{item.newsContentTitle}} - - - - - 来源:{{item.newsContentResource}} - {{item.newsContentPublishTime}} - - - - - - - - {{item.newsContentTitle}} - - 来源:{{item.newsContentResource}} - {{item.newsContentPublishTime}} - - - - - - {{item.newsContentTitle}} - - 来源:{{item.newsContentResource}} - {{item.newsContentPublishTime}} - - - - - - - - {{item.newsContentTitle}} - - - - - 来源:{{item.newsContentResource}} - {{item.newsContentPublishTime}} - - - - {{item.newsContentTitle}} - - 来源:{{item.newsContentResource}} - {{item.newsContentPublishTime}} - - - - {{item.newsContentTitle}} - - - - - - 来源:{{item.newsContentResource}} - {{item.newsContentPublishTime}} - - - - {{item.newsContentTitle}} - - 来源:{{item.newsContentResource}} - {{item.newsContentPublishTime}} - - - - - - + + + + + {{it.directoriesName}} + + + + + + + {{item.newsContentTitle}} + + + + + 来源:{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + + + + + {{item.newsContentTitle}} + + 来源:{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + + + {{item.newsContentTitle}} + + 来源:{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + + + + + {{item.newsContentTitle}} + + + + + 来源:{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + {{item.newsContentTitle}} + + 来源:{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + {{item.newsContentTitle}} + + + + + + 来源:{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + {{item.newsContentTitle}} + + 来源:{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + + + - + - + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 89e8ef7..768c5e8 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -34,9 +34,18 @@ swiper { .tab { padding: 30rpx; display: flex; - border-bottom: 5px solid #FBFBFB; flex-wrap: nowrap; - overflow-x: scroll; +} + +.tab-arrow { + font-size: 28rpx; + background: #242424; + text-align: center; + justify-content: center; + align-items: center; + position: absolute; + right: 0rpx; + padding: 20rpx; } .tab-box { @@ -56,14 +65,11 @@ swiper { .recommend { padding: 0rpx 30rpx 30rpx 30rpx; - border-bottom: 5px solid #FBFBFB; } .recommend-container { width: 100%; display: flex; - overflow-x: auto; - margin-top: 10rpx; } .line { @@ -72,6 +78,12 @@ swiper { background: #f2f2f2; } +.line-thick { + width: 100%; + height: 10rpx; + background: #f2f2f2; +} + .recommend-box { flex-shrink: 0; width: 220rpx; diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js index 62f35b5..74f1e29 100644 --- a/pages/newsList/newsList.js +++ b/pages/newsList/newsList.js @@ -34,7 +34,7 @@ Page({ function (code, data) { app.dialog.msg(data.msg); }, - function () {}); + function () { }); }, doClickDictionaries: function (event) { var self = this; @@ -73,7 +73,6 @@ Page({ currentPage: page, 'news.newsList': newsArray }) - console.log(self.data.news.newsList) if (data.rows.length == 0) { app.dialog.msg('暂无数据'); return; @@ -137,5 +136,11 @@ Page({ self.doGetNewsDictionariesList(); self.getAreaList(); }, + onReachBottom() { + this.setData({ + currentPage: this.data.currentPage + 1 + }) + this.doGetNewsList(this.data.currentPage) + } }) \ No newline at end of file diff --git a/pages/venueDetail/venueDetail.wxss b/pages/venueDetail/venueDetail.wxss index a2d97e4..687a350 100644 --- a/pages/venueDetail/venueDetail.wxss +++ b/pages/venueDetail/venueDetail.wxss @@ -85,7 +85,7 @@ border-bottom: 1px solid #ddd; } .venue-intro{ - padding: 0 20rpx 20rpx; + padding: 0 20rpx 100rpx; margin-bottom: 110rpx; } .intro-title{ diff --git a/project.private.config.json b/project.private.config.json index 6b3482f..35ecc23 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -2,6 +2,8 @@ "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "libVersion": "2.30.0", "setting": { - "urlCheck": false - } + "urlCheck": false, + "compileHotReLoad": true + }, + "projectname": "xz_gangba" } \ No newline at end of file