From 60a619fa7b15eb312986fe95f33b2bb2eea86c45 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Sat, 22 Aug 2020 09:00:00 +0800 Subject: [PATCH 01/12] fix 756 --- pageD/notice/notice.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pageD/notice/notice.vue b/pageD/notice/notice.vue index 4c7d154..c8ab6a7 100644 --- a/pageD/notice/notice.vue +++ b/pageD/notice/notice.vue @@ -39,7 +39,7 @@ }; - \ No newline at end of file diff --git a/pages.json b/pages.json index 144ff1c..fbcc15f 100644 --- a/pages.json +++ b/pages.json @@ -988,6 +988,19 @@ } } }, + { + "path": "setting/binding", + "style": { + "navigationBarTitleText": "第三方绑定", + "app-plus": { + "titleSize": "36px", + "titleNView": { + "titleColor": "#333333", + "backgroundColor": "#FFFFFF" + } + } + } + }, { "path": "setting/ShieldUsers", "style": { diff --git a/static/image/mine/43.png b/static/image/mine/43.png new file mode 100644 index 0000000000000000000000000000000000000000..1d1ef78ab3cb814908366741cf3da218c954ece6 GIT binary patch literal 665 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 D;GYHN literal 0 HcmV?d00001 From 18c99cd668f8fd61fd54b751b82be0648f6edb0c Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Thu, 27 Aug 2020 11:06:11 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=93=83=E5=A3=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageD/privateChat/privateChat.vue | 3 +++ pages/zhibo/index.nvue | 2 +- static/imservice.js | 12 ++++++++++++ static/music.mp3 | Bin 0 -> 11582 bytes 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 static/music.mp3 diff --git a/pageD/privateChat/privateChat.vue b/pageD/privateChat/privateChat.vue index a34f460..2cf173c 100644 --- a/pageD/privateChat/privateChat.vue +++ b/pageD/privateChat/privateChat.vue @@ -128,6 +128,8 @@ this.friend = JSON.parse(options.id); this.currentUser = this.imService.currentUser; let privateMessages = this.imService.getPrivateMessages(this.friend.uuid); + this.imService.uid = this.friend.uuid; + this.messages = privateMessages.sentMessages; this.pendingMessages = privateMessages.pendingMessages; @@ -153,6 +155,7 @@ this.imService.onPrivateHistoryLoad = (friendId, messages) =>{}; //将未读消息数清零 this.imService.resetFriendUnReadMessage(this.friend); + this.imService.uid = 0; }, methods: { bindtapInput(){ diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue index 3050fb9..876bf7a 100644 --- a/pages/zhibo/index.nvue +++ b/pages/zhibo/index.nvue @@ -29,7 +29,7 @@ - + 发送 diff --git a/static/imservice.js b/static/imservice.js index b276f2c..9d85284 100644 --- a/static/imservice.js +++ b/static/imservice.js @@ -8,6 +8,8 @@ import GoEasyIM from './goeasy-im-1.0.9'; // import GoEasyIM from './goeasy-im-1.1.1'; import restApi from './restapi'; +import music from './music.mp3' + function Friend(uuid, name, avatar,time = "", text = "",date = "",unReadMessage = 0) { this.uuid = uuid; @@ -52,6 +54,8 @@ function IMService() { //群聊消息记录，map格式，每个群对应一个数组 this.groupMessages = {}; + + this.uid = 0; /* * 监听器们 @@ -283,6 +287,14 @@ IMService.prototype.initialIMListeners = function () { friends.sort(paixu) } + if(message.senderId != this.uid){ + const innerAudioContext = uni.createInnerAudioContext(); + innerAudioContext.autoplay = true; + innerAudioContext.src = music; + innerAudioContext.onPlay(() => { + console.log('开始播放'); + }); + } let that = this if(!friend && friend == undefined){ diff --git a/static/music.mp3 b/static/music.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..61c030bcb44530063108076ea7d4c076d463f9b9 GIT binary patch literal 11582 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 Date: Thu, 27 Aug 2020 12:15:55 +0800 Subject: [PATCH 08/12] 1 --- pages/index/index.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 6888b10..9f6e93b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -262,7 +262,8 @@ loading: '努力加载中', nomore: '实在没有了' }, - refresher:true + refresher:true, + zqie:false } }, components: { @@ -354,7 +355,11 @@ tabLiveList() { uni.showLoading({ title: "loading..." - }) + }) + if(this.zqie){ + return ; + } + this.zqie = true; this.$u.api.tabLiveList({page:this.live_page}).then((res) => { // uni.stopPullDownRefresh(); this.status_live = "loading"; @@ -371,6 +376,7 @@ } else if (res.data.data.length == 0 && this.live_page > 1) { this.status_live = "nomore"; } else { + console.log(this.live_page,1223) this.tabLiveLists = this.tabLiveLists.concat(res.data.data); console.log(this.tabLiveLists) } @@ -381,6 +387,8 @@ } else { this.status_live = "nomore" } + this.zqie = false; + }) }, From 16115ba1115df7dde1cbd6b66dd01c40ba6030c5 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 27 Aug 2020 12:16:09 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/user.js | 13 ++++++++++ pageE/setting/binding.vue | 50 ++++++++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/common/api/user.js b/common/api/user.js index 459f496..714350d 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -454,6 +454,19 @@ export default { //获取默认头像 getDefaultAvatar(){ return vm.$u.post("member/getDefaultAvatar") + }, + // 第三方账号绑定【微信|QQ】 + bindingThird({ openid, type }) { + return vm.$u.post("auth/memberBindThird", { + third_openid: openid, + third_type: type, + }) + }, + // 解绑 + unbindingThird({ type }) { + return vm.$u.post("auth/memberUnbindThird", { + third_type: type, + }) } } diff --git a/pageE/setting/binding.vue b/pageE/setting/binding.vue index e085f80..a01be37 100644 --- a/pageE/setting/binding.vue +++ b/pageE/setting/binding.vue @@ -2,11 +2,11 @@ {{ item.title }} - + 解绑 - + 绑定 @@ -17,29 +17,61 @@ export default { data() { return { + userInfo: '', bangdingList: [ { title: 'QQ', - provider: 'qq' + provider: 'qq', // uni 登录 provider + type: 'qq', // 后台需要解绑的参数名 type + name: 'member_qqopenid', // 后台返回是否绑定的字段名 }, { title: '微信', - provider: 'weixin' + provider: 'weixin', + type: 'wechat', + name: 'member_wxopenid', } ] } }, + onLoad() { + this.getMemberInfo(); + }, methods: { - binding(provider) { + getMemberInfo() { + this.$u.api.getMemberInfo().then(res => { + if (res.errCode == 0) { + this.userInfo = res.data.MemberArray; + } + }) + }, + binding(provider, type) { uni.login({ provider: provider, - success: function (loginRes) { - console.log(loginRes.authResult); + success: (loginRes) => { + console.log(loginRes); + uni.getUserInfo({ + provider: provider, + success: (res) => { + console.log(res.userInfo.openId); + this.$u.api.bindingThird({ + openid: res.userInfo.openId, + type: type + }).then(res => { + this.$u.toast(res.message); + }) + } + }) + }, + fail: (e) => { + console.log(e); } }); }, - unbinding() { - + unbinding(type) { + this.$u.api.unbindingThird({ type: type }).then(res => { + this.$u.toast(res.message); + }) } } }; From d3154dc864471f0d2eecd720c944f425132caeb7 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 27 Aug 2020 12:21:32 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageE/setting/binding.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pageE/setting/binding.vue b/pageE/setting/binding.vue index a01be37..2450d1f 100644 --- a/pageE/setting/binding.vue +++ b/pageE/setting/binding.vue @@ -59,6 +59,9 @@ export default { type: type }).then(res => { this.$u.toast(res.message); + if(res.errCode == 0) { + this.getMemberInfo(); + } }) } }) @@ -71,6 +74,9 @@ export default { unbinding(type) { this.$u.api.unbindingThird({ type: type }).then(res => { this.$u.toast(res.message); + if(res.errCode == 0) { + this.getMemberInfo(); + } }) } } From 839b1728f0d9cc7c2350135381843bc2931539ab Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Fri, 28 Aug 2020 22:54:51 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8D=E5=87=BA?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/zhibo/index.nvue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue index 876bf7a..cf26a68 100644 --- a/pages/zhibo/index.nvue +++ b/pages/zhibo/index.nvue @@ -18,7 +18,7 @@ {{room.onlineUsers.users.length}} - + From 97c9774cc4fafcde3048bb339812fc6f96106021 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Fri, 28 Aug 2020 23:11:12 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=20=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/shop.js | 3 ++- pageC/classify/goods.vue | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/api/shop.js b/common/api/shop.js index fccbc0e..ab442b0 100644 --- a/common/api/shop.js +++ b/common/api/shop.js @@ -86,11 +86,12 @@ export default { return vm.$u.post('Goods/getGoodsClassRecommend'); }, // goodsListByClassId - goodsListByClassId({ gc_id, page, order }) { + goodsListByClassId({ gc_id, page, order, keyword }) { return vm.$u.post('goods/goodsListByClassId', { gc_id: gc_id, page: page, order: order, + keyword:keyword }); }, // 商品推荐 diff --git a/pageC/classify/goods.vue b/pageC/classify/goods.vue index c6305a8..97c6bee 100644 --- a/pageC/classify/goods.vue +++ b/pageC/classify/goods.vue @@ -1,5 +1,6 @@