From db41a5b39237faa00094d00edf5f1dfe12e83bef Mon Sep 17 00:00:00 2001 From: dong_bo0602 <358256383@qq.com> Date: Mon, 30 Nov 2020 16:55:13 +0800 Subject: [PATCH] 1130 --- app.json | 1 - images/loading.gif | Bin 0 -> 6788 bytes images/play.png | Bin 0 -> 1008 bytes pages/book/book.js | 4 - pages/center/center.js | 127 ++++++++++---------- pages/center/center.wxml | 11 +- pages/center/center.wxss | 21 ++++ pages/friendCircle/friendCircle.js | 10 +- pages/heritage/heritage.wxml | 2 +- pages/index/index.wxml | 19 +++ pages/index/index.wxss | 22 ++++ pages/newFriendCircle/newFriendCircle.js | 130 --------------------- pages/newFriendCircle/newFriendCircle.json | 3 - pages/newFriendCircle/newFriendCircle.wxml | 30 ----- pages/newFriendCircle/newFriendCircle.wxss | 79 ------------- pages/newsList/newsList.js | 3 + pages/newsList/newsList.wxml | 21 +++- pages/newsList/newsList.wxss | 24 ++++ 18 files changed, 182 insertions(+), 325 deletions(-) create mode 100644 images/loading.gif create mode 100644 images/play.png delete mode 100644 pages/newFriendCircle/newFriendCircle.js delete mode 100644 pages/newFriendCircle/newFriendCircle.json delete mode 100644 pages/newFriendCircle/newFriendCircle.wxml delete mode 100644 pages/newFriendCircle/newFriendCircle.wxss diff --git a/app.json b/app.json index 7c3a774..6ec8c36 100644 --- a/app.json +++ b/app.json @@ -9,7 +9,6 @@ "pages/order/order", "pages/venue/venue", "pages/center/center", - "pages/newFriendCircle/newFriendCircle", "pages/myFriendCircle/myFriendCircle", "pages/friendCircle/friendCircle", "pages/orderDetail/orderDetail", diff --git a/images/loading.gif b/images/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..8524d0f2cdd4ebc41ccfb987514d1d03c0d78d6e GIT binary patch literal 6788 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 Fe*sCTX9)lR literal 0 HcmV?d00001 diff --git a/images/play.png b/images/play.png new file mode 100644 index 0000000000000000000000000000000000000000..ab4c6ca3d9b1b8a08a1514b5c5daf10c3a084174 GIT binary patch literal 1008 zcmV5X6N2JAG^w}sj2h6&-2{(zUREpA>{FN&z`(p zlB9a3u}L5}0Td*j8UT)L@rm^afJZjT z);#)AN1IiSrGS7>zC*w~2H0{WP75O-#()Q2zp~IQ-&8=*C;wo;utJCj<`D3++^-Bb z!ZH*P^vPVgG!*1I1_4^RU&*LshJb)iR#Td5C^c}bsMoL9Q$f=Nbo=BF1dKIfmC8nl zCGGpSf`u{Q;~2j(E~PT@zr5i9EHFcMH*A5sajRGkT{@4xmeYuR`cSBlyLw}a3h=F_ zX|ZQ!-EOa(j*%xXq>*XgzX}ojhiEh}A$)g8l5Hm6qC!BfZy$N_6rszlaMd-yE>{Xt zRcS|G%Nc}kT**rW08s@YAn21L3`lE^R5ZQ(T)?+2^#Bpv^_$?T+W>NVL}>WlO@vxb zBl7BbPC^J!%l(Rj0@dB>5|*KdY2VpP08 z+FuDF;ak^?;TifUmxIUb6BwbA-2r#g4!G9TCzpFq9!2k|V@BaoF2JfrA}JpMI!n=n ziSRV-gmZ3u4)v^DVt8)+GXb2`wQeIkO*@2uFKd<|+Vwu83Pb)0I79K`W$@bBUqBi0_kBGSCGJUL?(6zP^rM0V)<&LyHLx>;E_itK3#w)~F zvpx&{Sou980mX}!3Szz7vA`#>=R+6IWhG7oM7(~*nfEaIb!0zEYFG7_Tho%Kp7y0D zS8^WLKa8@CW9OXtC_8XMfO8L!?Cx7v#ksF`yv~Oh8RM8|XB)}f4{%?=AGN(r5QlGH z&x<%EINgxw3)!5o&07H~Ev}$Qc{j@>~W~0VT+A#2mx) zVv@}v=ObXC6Hd+jf3Ie`O8s(5z#J>zIN+^R20R?}<#b?~>>>>>> f1eff69198504079759bf289a71907006b988a79 function(code,data){ if(data.data.length > 0 ){ self.setData({ diff --git a/pages/center/center.js b/pages/center/center.js index b901ff1..edf0569 100644 --- a/pages/center/center.js +++ b/pages/center/center.js @@ -17,7 +17,8 @@ Page({ usercenterUrl: app.usercenterUrl, sourcePath: '/route/file/downloadfile/true/', phone: '', - code: '' + code: '', + isLoading: false }, // 选择头像来源 changeAvatar: function () { @@ -76,21 +77,6 @@ Page({ console.log(data) }) }, - // 获取用户信息 - getUserInfo: function () { - var self = this - app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/user/getappuser', [app.usercenterUrl]), {}, { - headers: { - token: self.data.token - } - }, function (code, data) { - self.setData({ - userInfo: data - }) - }, function (code, data) { - console.log(data) - }) - }, // 获取token getToken: function () { var self = this @@ -179,36 +165,6 @@ Page({ }) } }, - // 获取验证码 - getCode: function () { - 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) { - wx.showToast({ - title: data.msg, - icon: 'none', - duration: 1500 - }) - }) - }, // 提交绑定手机 submitPhone: function () { var self = this; @@ -216,8 +172,7 @@ Page({ isConfirm: true }) app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/user/updateminiappdefaultusername', [app.usercenterUrl]), { - phone: self.data.phone, - verificationCode: self.data.code + phone: self.data.phone }, { headers: { token: self.data.token @@ -238,11 +193,47 @@ Page({ }) }) }, - // 验证码 - inputCode: function (e) { - this.setData({ - code: e.detail.value + // // 验证码 + // inputCode: function (e) { + // this.setData({ + // code: e.detail.value + // }) + // }, + getPhoneNumber: function (e) { + var self = this + self.setData({ + isLoading: true }) + console.log(e) + if (e.detail.errMsg == 'getPhoneNumber:ok') { + var info = { + encryptedData: e.detail.encryptedData, + iv: e.detail.iv + } + // app.dialog.loading('正在加载'); + app.restAjax.put(app.restAjax.path('{usercenterUrl}/app/miniuser/updatedefaultusernamebydata', [app.usercenterUrl]), info, { + headers: { + token: self.data.token + } + }, function (code, data) { + // wx.hideLoading(); + self.setData({ + isLoading: false + }) + wx.setStorageSync('token', data.data); + wx.setStorageSync('isRandomUsername', '0'); + self.setData({ + randomName: false, + token: data.data + }) + self.getUserInfo() + app.dialog.msg('绑定成功'); + }) + } else { + self.setData({ + isLoading: false + }) + } }, // 判断用户是否为随机名称 isRandomName: function () { @@ -251,7 +242,6 @@ Page({ key: 'isRandomUsername', success: function (res) { if (res.data == 1) { - wx.hideTabBar() self.setData({ randomName: true }) @@ -263,32 +253,33 @@ Page({ } }) }, - // 获取用户信息 - getUserInfo: function () { - var self = this - app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/user/getappuser', [app.usercenterUrl]), {}, { - headers: { - token: self.data.token - } - }, function (code, data) { - self.setData({ - userInfo: data - }) - }, function (code, data) { - app.dialog.msg(data.msg); + // 获取用户信息 + getUserInfo: function () { + var self = this + app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/user/getappuser', [app.usercenterUrl]), {}, { + headers: { + token: self.data.token + } + }, function (code, data) { + self.setData({ + userInfo: data }) - }, + }, function (code, data) { + app.dialog.msg(data.msg); + }) + }, cancelPhone: function () { this.setData({ showPhone: false }) + wx.showTabBar() }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { this.isRandomName(); - this.getToken() + this.getToken(); }, /** diff --git a/pages/center/center.wxml b/pages/center/center.wxml index d014188..6f9900d 100644 --- a/pages/center/center.wxml +++ b/pages/center/center.wxml @@ -7,6 +7,8 @@ {{userInfo.name}} + + 绑定手机号后，账号信息即可与APP共享 常用功能 @@ -39,10 +41,10 @@ 我的志愿活动 - + + + \ No newline at end of file diff --git a/pages/center/center.wxss b/pages/center/center.wxss index 593722b..87f9007 100644 --- a/pages/center/center.wxss +++ b/pages/center/center.wxss @@ -143,4 +143,25 @@ color: #fff; background: #9F1512; border-radius: 10rpx; +} +.tips{ + font-size: 30rpx; + text-align: center; + margin-top: 15rpx; +} +.loading{ + position: fixed; + top: 0; + right: 0; + left: 0; + bottom: 0; + background: rgba(0, 0, 0, .2); +} +.loading image{ + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%,-50%); + width: 150rpx; + height: 150rpx; } \ No newline at end of file diff --git a/pages/friendCircle/friendCircle.js b/pages/friendCircle/friendCircle.js index 3232d7a..77a66c3 100644 --- a/pages/friendCircle/friendCircle.js +++ b/pages/friendCircle/friendCircle.js @@ -53,11 +53,11 @@ Page({ wx.hideLoading(); }); }, - newFriendCircle: function () { - wx.navigateTo({ - url: '../newFriendCircle/newFriendCircle', - }) - }, + // newFriendCircle: function () { + // wx.navigateTo({ + // url: '../newFriendCircle/newFriendCircle', + // }) + // }, toMyFriendCircle: function () { wx.navigateTo({ url: '../myFriendCircle/myFriendCircle', diff --git a/pages/heritage/heritage.wxml b/pages/heritage/heritage.wxml index 68beadc..404a660 100644 --- a/pages/heritage/heritage.wxml +++ b/pages/heritage/heritage.wxml @@ -9,7 +9,7 @@ 文化直播 --> - diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 8ce8aaf..dcbadff 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -124,6 +124,25 @@ {{item.newsContentPublishTime}} + + {{item.newsContentTitle}} + + + + + + 来源：{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + {{item.newsContentTitle}} + + 来源：{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index ec4406b..64d5f2b 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -238,4 +238,26 @@ color: #fff; background: #9F1512; border-radius: 10rpx; +} +.voice-box{ + padding-right: 30px; + position: relative; +} +.voice-box iamge{ + position: absolute; + top: 0; + right: 0; + width:25rpx; + height: 25rpx; +} +.news-big-pic{ + position: relative; +} +.news-big-pic image.play-btn{ + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 80rpx; + height: 80rpx; } \ No newline at end of file diff --git a/pages/newFriendCircle/newFriendCircle.js b/pages/newFriendCircle/newFriendCircle.js deleted file mode 100644 index 743ed1c..0000000 --- a/pages/newFriendCircle/newFriendCircle.js +++ /dev/null @@ -1,130 +0,0 @@ -// pages/newFriendCircle/newFriendCircle.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - showAdd: true, - selectedType: '', - selectedList: [], - isPublic: '' //朋友圈是否公开 - }, - changepublic: function (e) { - this.setData({ - isPublic: e.detail.value - }) - }, - selectContent: function () { - var self = this - wx.chooseMedia({ - count: 9 - self.data.selectedList.length, - mediaType: ['image','video'], - sourceType: ['album', 'camera'], - success: function (res) { - console.log(res) - if (res.type == 'image') { - self.setData({ - selectedType: res.type, - selectedList: self.data.selectedList.concat(res.tempFiles) - }) - } else { - self.setData({ - selectedType: res.type, - selectedList: self.data.selectedList.concat(res.tempFiles) - }) - } - self.isShowAdd() - console.log(self.data.selectedList) - } - }) - }, - deletePhoto: function (e) { - var self = this - var now = e.currentTarget.dataset.idx - var result = self.data.selectedList - result.splice(now, 1) - this.setData({ - selectedList: result - }) - self.isShowAdd('delete') - }, - isShowAdd: function (from) { - if (this.data.selectedType == 'image') { - if (this.data.selectedList.length < 9) { - this.setData({ - showAdd: true - }) - } else { - this.setData({ - showAdd: false - }) - } - } else { - if (from) { - this.setData({ - showAdd: true - }) - } else { - this.setData({ - showAdd: false - }) - } - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/pages/newFriendCircle/newFriendCircle.json b/pages/newFriendCircle/newFriendCircle.json deleted file mode 100644 index 8835af0..0000000 --- a/pages/newFriendCircle/newFriendCircle.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/newFriendCircle/newFriendCircle.wxml b/pages/newFriendCircle/newFriendCircle.wxml deleted file mode 100644 index 154553e..0000000 --- a/pages/newFriendCircle/newFriendCircle.wxml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 是否公开： - - 公开 - 不公开 - - - - - 发布 - \ No newline at end of file diff --git a/pages/newFriendCircle/newFriendCircle.wxss b/pages/newFriendCircle/newFriendCircle.wxss deleted file mode 100644 index 18d657f..0000000 --- a/pages/newFriendCircle/newFriendCircle.wxss +++ /dev/null @@ -1,79 +0,0 @@ -.new-friend-circle{ - padding: 30rpx; - margin-bottom: 100rpx; -} -.text{ - width: 100%; - height: 250rpx; - margin-bottom: 30rpx; -} -.text textarea{ - width: 100%; - height: 100%; - border: 1px solid #DEDEDE; - padding: 15rpx; - box-sizing: border-box; - font-size: 32rpx; -} -.add{ - width: 32%; - height: 200rpx; - background: #DEDEDE; - display: inline-flex; - justify-content: center; - align-items: center; - vertical-align: top; -} -.add image{ - width: 100rpx; - height: 100rpx; -} -.is-public{ - margin-top: 20rpx; - font-size: 30rpx; -} -.is-public radio-group{ - display: inline-block; -} -.is-public radio-group radio{ - margin-right: 20rpx; -} -.photo{ - display: inline-block; - width: 32%; - height: 200rpx; - margin-right: 2%; - position: relative; - margin-bottom: 20rpx; -} -.photo:nth-child(3n){ - margin-right: 0; -} -.photo image{ - width: 100%; - height: 100%; -} -.photo image.delete{ - width: 30rpx; - height: 30rpx; - position: absolute; - top: -15rpx; - right: -15rpx; -} -.type-box, .type-box video{ - width: 100%; - height: 100%; -} -.submit{ - position: fixed; - left: 0; - right: 0; - bottom: 0; - background: #9F1512; - height: 100rpx; - display: flex; - align-items: center; - justify-content: center; - color: #fff; - font-size: 32rpx; -} \ No newline at end of file diff --git a/pages/newsList/newsList.js b/pages/newsList/newsList.js index 330b6d0..bc89952 100644 --- a/pages/newsList/newsList.js +++ b/pages/newsList/newsList.js @@ -32,6 +32,7 @@ Page({ }, doClickDictionaries: function(event) { var self = this; + console.log(event.currentTarget.dataset.newsDirectoriesId) self.setData({ currentNewsDictionariesId: event.currentTarget.dataset.newsDirectoriesId }); @@ -47,6 +48,7 @@ Page({ doGetNewsList: function(page, lv) { var self = this; app.dialog.loading('正在加载'); + console.log(self.data.currentNewsDictionariesId) var info = { newsDirectoriesParentId: self.data.directoriesParentId, newsDirectoriesId: self.data.currentNewsDictionariesId ? self.data.currentNewsDictionariesId : '', @@ -69,6 +71,7 @@ Page({ currentPage: page, 'news.newsList': newsArray }) + console.log(self.data.news.newsList) if(data.rows.length == 0) { app.dialog.msg('暂无数据'); return; diff --git a/pages/newsList/newsList.wxml b/pages/newsList/newsList.wxml index 3359958..4c63df4 100644 --- a/pages/newsList/newsList.wxml +++ b/pages/newsList/newsList.wxml @@ -25,7 +25,7 @@ - + {{item.newsContentTitle}} @@ -77,5 +77,24 @@ {{item.newsContentPublishTime}} + + {{item.newsContentTitle}} + + + + + + 来源：{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + + {{item.newsContentTitle}} + + 来源：{{item.newsContentResource}} + {{item.newsContentPublishTime}} + + + \ No newline at end of file diff --git a/pages/newsList/newsList.wxss b/pages/newsList/newsList.wxss index eb1acb2..a876635 100644 --- a/pages/newsList/newsList.wxss +++ b/pages/newsList/newsList.wxss @@ -5,6 +5,7 @@ right: 0; background: #fff; overflow-x: auto; + z-index: 100; } .type{ display: flex; @@ -41,6 +42,7 @@ right: 20rpx; } .area{ + z-index: 100; overflow-x: auto; white-space: nowrap; position: fixed; @@ -110,12 +112,34 @@ .news-info text{ margin-right: 20rpx; } +.voice-box{ + padding-right: 30px; + position: relative; +} +.voice-box iamge{ + position: absolute; + top: 0; + right: 0; + width:25rpx; + height: 25rpx; +} .news-big-pic, .news-small-pic{ margin-top: 10rpx; } +.news-big-pic{ + position: relative; +} .news-big-pic image{ width: 100%; } +.news-big-pic image.play-btn{ + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 80rpx; + height: 80rpx; +} .news-small-pic image{ width: 30%; height: 150rpx;