From a22b3fba7172e46386eb665dd38a5568af4fe4b1 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Tue, 11 Aug 2020 09:36:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/informations/notice/notice.vue | 4 ++-- pageB/follow/index.vue | 6 +++--- pages/information/information.vue | 2 +- static/imservice.js | 13 +++++++++---- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue index b212e45..712914a 100644 --- a/components/informations/notice/notice.vue +++ b/components/informations/notice/notice.vue @@ -1,11 +1,11 @@ @@ -76,7 +76,7 @@ export default { }, searchValue() { uni.navigateTo({ - url: '/pageB/search/index?type=1' + url: '/pageB/search/index?type=2' }) }, }, diff --git a/pages/information/information.vue b/pages/information/information.vue index f44ad09..8a4444d 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -10,7 +10,7 @@ - + diff --git a/static/imservice.js b/static/imservice.js index f2d1e6f..098524d 100644 --- a/static/imservice.js +++ b/static/imservice.js @@ -297,7 +297,8 @@ IMService.prototype.initialIMListeners = function () { friend.text = message.type != "text" ? "其他消息" : message.payload.text let time = new Date(message.timestamp) friend.date = message.timestamp - friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() + friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds()) + console.log(that.friends) that.friendsarr = [] for(let i in that.friends){ @@ -322,7 +323,7 @@ IMService.prototype.initialIMListeners = function () { friend.text = message.type != "text" ? "其他消息" : message.payload.text let time = new Date(message.timestamp) friend.date = message.timestamp - friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() + friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds()) console.log(this.friends) that.friendsarr = [] for(let i in this.friends){ @@ -537,7 +538,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){ friend.text = message let time = new Date() friend.date = time.getTime() - friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() + friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds()) + + console.log(that.friends) that.friendsarr = [] for(let i in that.friends){ @@ -561,7 +564,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){ friend.text = message let time = new Date() friend.date = time.getTime() - friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() + friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds()) + + console.log(this.friends) that.friendsarr = [] for(let i in this.friends){ From 6984ea9374bd730a427457cdc2a2282a0491df26 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Tue, 11 Aug 2020 10:25:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageC/merchant/index.vue | 39 ++++++++++++++++++++++++++- pages/information/information.vue | 45 ++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue index 83921d5..ccfc7f9 100644 --- a/pageC/merchant/index.vue +++ b/pageC/merchant/index.vue @@ -64,7 +64,7 @@ 店铺信息 - + 联系客服 @@ -109,6 +109,43 @@ export default { // if(e.index == 0) this.show = true; }, methods: { + customers(){ + console.log(this.$store.state.hasLogin) + if(!this.$store.state.hasLogin){ + this.$refs.uToast.show({ + title: "请先登录", + type: 'warning' + }) + }else{ + function Friend(uuid, name, avatar,time = "", text = "",date = "") { + this.uuid = uuid; + this.name = name; + this.avatar = avatar; + this.online = false; + this.unReadMessage = 0; + this.text = text; + this.time = time; + this.date = date + } + console.log(123) + this.$u.api.getAtwillUserInfo({ + id:this.sid + }).then((res)=>{ + console.log(res) + let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar) + this.$u.route({ + url:"/pageD/privateChat/privateChat", + params:{ + id:JSON.stringify(user) + } + + }) + }).catch((err)=>{ + console.log(err) + }) + } + + }, toDetailsPage(id) { // console.log(11); this.$u.route('pageB/photo/index', { diff --git a/pages/information/information.vue b/pages/information/information.vue index 8a4444d..e75d614 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -3,7 +3,7 @@ - + @@ -105,6 +105,49 @@ }, methods: { + kefu(){ + if(!this.$store.state.hasLogin){ + this.$refs.uToast.show({ + title: "请先登录", + type: 'warning' + }) + }else{ + function Friend(uuid, name, avatar,time = "", text = "",date = "") { + this.uuid = uuid; + this.name = name; + this.avatar = avatar; + this.online = false; + this.unReadMessage = 0; + this.text = text; + this.time = time; + this.date = date + } + const token = uni.getStorageSync('token'); + let that = this + uni.request({ + url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo", + data:{ + userId: 1 + }, + method:"POST", + header:{ + "Authorization" : 'Bearer' + " " + token + }, + success(res){ + console.log(res) + res = res.data + let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar) + that.$u.route({ + url:"/pageD/privateChat/privateChat", + params:{ + id:JSON.stringify(user) + } + }) + } + }) + } + + }, gochat(id){ this.$u.route({ url:"/pageD/privateChat/privateChat", From b34ac35821f93c551264dfe9b93e61ee78e2ce66 Mon Sep 17 00:00:00 2001 From: Gdpao <1341331954@qq.com> Date: Tue, 11 Aug 2020 10:35:01 +0800 Subject: [PATCH 3/4] gdpaoup --- pageB/photo/index.vue | 2 +- static/image/mine/38.png | Bin 2863 -> 9022 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue index 13a2d12..d0a673d 100644 --- a/pageB/photo/index.vue +++ b/pageB/photo/index.vue @@ -66,7 +66,7 @@ - + 发送 diff --git a/static/image/mine/38.png b/static/image/mine/38.png index c199bccfd92daa9b005a1c86249309bea83b68fb..1855a52d0225a74e068322929d3d8742259f5c0d 100644 GIT binary patch literal 9022 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 literal 2863 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 Date: Tue, 11 Aug 2020 11:12:32 +0800 Subject: [PATCH 4/4] gdpaomg1 --- common/http.interceptor.js | 2 +- components/index/video-item/index.vue | 2 +- components/remaining/remaining.vue | 2 +- pageA/register/register.vue | 7 ----- pageB/photo/index.vue | 10 +++++-- pageB/sdetails/index.vue | 3 +- pageB/video/video.nvue | 40 +++++++++++++++++++++++++-- pages.json | 6 ++++ pages/index/index.vue | 13 +++++++-- pages/mine/index.vue | 34 +++++++++++++---------- 10 files changed, 87 insertions(+), 32 deletions(-) diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 6ca6879..f1a4095 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -46,7 +46,7 @@ const install = (Vue, vm) => { } else if(res.data.errCode == 401) { // 假设201为token失效，这里跳转登录 // vm.$u.toast('您还没有登录哦，请先去登录！'); - if (res.data.action != "memberinfo") { + if (res.data.data.action != "memberinfo") { uni.showModal({ title: "温馨提示", content: "您还未登录，请立即登录", diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue index a51ec25..a9cfe18 100644 --- a/components/index/video-item/index.vue +++ b/components/index/video-item/index.vue @@ -241,7 +241,7 @@ export default { // console.log(res) if(res.errCode == 0) { this.$u.toast(res.message); - this.$emit("getArticlelist"); + this.$emit("updateList"); } }) }, diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue index c0dd56b..96664c5 100644 --- a/components/remaining/remaining.vue +++ b/components/remaining/remaining.vue @@ -205,7 +205,7 @@ z-index: 1000; position: absolute; bottom: 100rpx; - right: 30%; + right: 230rpx; width: 300rpx; height: 80rpx; line-height: 80rpx; diff --git a/pageA/register/register.vue b/pageA/register/register.vue index 2b567ab..d77a45b 100644 --- a/pageA/register/register.vue +++ b/pageA/register/register.vue @@ -152,16 +152,9 @@ // type: 'success', // url: '/pageA/topick/topick' // }) - } else if(res.errCode == 2){ - this.$refs.uToast.show({ - title: res.message, - type: 'primary', - url: '/pageA/login/login' - }) } else { this.$refs.uToast.show({ title: res.message, - type: 'primary' }) } }) diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue index 5ffccac..894737e 100644 --- a/pageB/photo/index.vue +++ b/pageB/photo/index.vue @@ -27,7 +27,7 @@ 评论 - + @@ -180,13 +180,15 @@ z-index: 1000; position: fixed; top: 0; + display: flex; + align-items: center; + justify-content: space-between; width: 100%; height: 88rpx; padding: 0 20rpx; line-height: 88rpx; background-color: #ECECEC; & > text { - margin-right: 280rpx; color: #333; font-size: 30rpx; font-weight: 500; @@ -514,6 +516,10 @@ export default { }, // 发布评论 sendComment() { + if (this.send_value.length == 0) { + this.$u.toast("内容不能为空！"); + return; + } this.$u.post("article/articleAddComment",{ article_id: this.article_id, content: this.send_value, diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue index 2b14b17..8b4da81 100644 --- a/pageB/sdetails/index.vue +++ b/pageB/sdetails/index.vue @@ -135,7 +135,7 @@ 购买数量 - + @@ -520,6 +520,7 @@ export default { }) } else { this.debounce = true; + this.$u.toast(res.message); } }) }, diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue index 1da0d21..ceba9e7 100644 --- a/pageB/video/video.nvue +++ b/pageB/video/video.nvue @@ -8,7 +8,7 @@ - + > 视频 @@ -68,6 +68,7 @@