Skip to content

施宇 / icsalesProgram

Go to a project
Commit e1cec561 by 施宇
Options

32121

parent 9292c60e
Inline Side-by-side
Showing with 22 additions and 90 deletions
app.js
...@@ -45,9 +45,9 @@ App({ ...@@ -45,9 +45,9 @@ App({
success(res) { success(res) {
if (res.data) { if (res.data) {
// wx.switchTab({ wx.switchTab({
// url: '/pages/tab/home/home' url: '/pages/tab/home/home'
// }); });
} }
} }
...@@ -59,9 +59,9 @@ App({ ...@@ -59,9 +59,9 @@ App({
success(res) { success(res) {
if (res.authSetting['scope.userInfo']) { if (res.authSetting['scope.userInfo']) {
// 已经授权 // 已经授权
// wx.switchTab({ wx.switchTab({
// url: '/pages/tab/home/home' url: '/pages/tab/home/home'
// }) })
} }
} }
}); });
......
pages/tab/message/message.js
...@@ -25,7 +25,7 @@ Page({ ...@@ -25,7 +25,7 @@ Page({
//监听未读消息数 //监听未读消息数
disp.on("em.xmpp.unreadspot", function (message) { disp.on("em.xmpp.unreadspot", function (message) {
if (getApp().globalData.customerNum != my) { if (getApp().globalData.customerNum != my) {
me.getCustom() me.getCustom();
} }
me.setData({ me.setData({
arr: me.getChatList(), arr: me.getChatList(),
...@@ -81,6 +81,7 @@ Page({ ...@@ -81,6 +81,7 @@ Page({
let member = wx.getStorageSync("member"); let member = wx.getStorageSync("member");
let myName = wx.getStorageSync("myUsername"); let myName = wx.getStorageSync("myUsername");
for (let i = 0; i < member.length; i++) { for (let i = 0; i < member.length; i++) {
if (member[i] !== getApp().globalData.customerNum){
let newChatMsgs = wx.getStorageSync(member[i] + myName) || []; let newChatMsgs = wx.getStorageSync(member[i] + myName) || [];
let historyChatMsgs = wx.getStorageSync("rendered_" + member[i] + myName) || []; let historyChatMsgs = wx.getStorageSync("rendered_" + member[i] + myName) || [];
let curChatMsgs = historyChatMsgs.concat(newChatMsgs); let curChatMsgs = historyChatMsgs.concat(newChatMsgs);
...@@ -98,6 +99,8 @@ Page({ ...@@ -98,6 +99,8 @@ Page({
array.push(lastChatMsg); array.push(lastChatMsg);
} }
} }
}
array.sort((a, b) => { array.sort((a, b) => {
return b.dateTimeNum - a.dateTimeNum return b.dateTimeNum - a.dateTimeNum
}) })
......
utils/chat.js
...@@ -26,7 +26,7 @@ let conn = { ...@@ -26,7 +26,7 @@ let conn = {
const calcUnReadSpot = (message) => { const calcUnReadSpot = (message) => {
let myName = wx.getStorageSync("myUsername"); let myName = wx.getStorageSync("myUsername");
let allMembers = wx.getStorageSync("member") || []; //好友 let allMembers = wx.getStorageSync("member") || []; //好友
let count = allMembers.reduce(function (result, curMember, idx) { let count = allMembers.reduce(function(result, curMember, idx) {
let chatMsgs = wx.getStorageSync(curMember.toLowerCase() + myName.toLowerCase()) || []; let chatMsgs = wx.getStorageSync(curMember.toLowerCase() + myName.toLowerCase()) || [];
return result + chatMsgs.length; return result + chatMsgs.length;
}, 0); }, 0);
...@@ -47,7 +47,7 @@ const getImUser = () => { ...@@ -47,7 +47,7 @@ const getImUser = () => {
let token = wx.getStorageSync('access_token') || '' let token = wx.getStorageSync('access_token') || ''
getData(apis.authme, 'get', { getData(apis.authme, 'get', {
"token": token, "token": token,
}, function (res) { }, function(res) {
if (res.err_code == 0) { if (res.err_code == 0) {
wx.setStorageSync('user_id', res.data.user_id + ''); wx.setStorageSync('user_id', res.data.user_id + '');
wx.setStorageSync('avatar', res.data.avatar); wx.setStorageSync('avatar', res.data.avatar);
...@@ -104,8 +104,10 @@ const webimListen = () => { ...@@ -104,8 +104,10 @@ const webimListen = () => {
onTextMessage(message) { onTextMessage(message) {
if (message) { if (message) {
if (onMessageError(message)) { if (onMessageError(message)) {
if (getApp().globalData.customerNum != message.from) { if (getApp().globalData.customerNum != my) {
getApp().addChatMemberStorage(message.from); getApp().addChatMemberStorage(message.from);
} else {
getApp().addChatMember(message.from);
} }
msgStorage.saveReceiveMsg(message, msgType.TEXT); msgStorage.saveReceiveMsg(message, msgType.TEXT);
} }
...@@ -117,8 +119,10 @@ const webimListen = () => { ...@@ -117,8 +119,10 @@ const webimListen = () => {
onEmojiMessage(message) { onEmojiMessage(message) {
if (message) { if (message) {
if (onMessageError(message)) { if (onMessageError(message)) {
if (getApp().globalData.customerNum != message.from) { if (getApp().globalData.customerNum != my) {
getApp().addChatMemberStorage(message.from); getApp().addChatMemberStorage(message.from);
} else {
getApp().addChatMember(message.from);
} }
msgStorage.saveReceiveMsg(message, msgType.EMOJI); msgStorage.saveReceiveMsg(message, msgType.EMOJI);
} }
...@@ -128,8 +132,10 @@ const webimListen = () => { ...@@ -128,8 +132,10 @@ const webimListen = () => {
onPictureMessage(message) { onPictureMessage(message) {
if (message) { if (message) {
if (onMessageError(message)) { if (onMessageError(message)) {
if (getApp().globalData.customerNum != message.from) { if (getApp().globalData.customerNum != my) {
getApp().addChatMemberStorage(message.from); getApp().addChatMemberStorage(message.from);
} else {
getApp().addChatMember(message.from);
} }
msgStorage.saveReceiveMsg(message, msgType.IMAGE); msgStorage.saveReceiveMsg(message, msgType.IMAGE);
} }
...@@ -142,7 +148,7 @@ const webimListen = () => { ...@@ -142,7 +148,7 @@ const webimListen = () => {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '您的聊天账号被迫下线!', content: '您的聊天账号被迫下线!',
showCancel:false showCancel: false
}) })
} else { } else {
wx.showModal({ wx.showModal({
......
utils/util.js
//数据请求(get,post) //数据请求(get,post)
const getData = (url, type, param, callBack, loading, isheader, istoken) => { const getData = (url, type, param, callBack, loading, isheader, istoken) => {
wx.showNavigationBarLoading();
var token, header;
//获取token
token = wx.getStorageSync('access_token');
//参数字段追加来源字段,token字段
if (istoken) {
var params = Object.assign({}, param, {
source: 1,
token: token
});
} else {
var params = Object.assign({}, param, {
source: 1
});
}
//是否启用loading加载效果
if (loading) {
wx.showLoading();
}
//是否启用请求头token
if (isheader) {
header = {
"Content-Type": "applciation/json",
"Authorization": 'Bearer ' + token
}
} else {
header = {
"Content-Type": "applciation/json"
}
}
wx.request({
url: url,
data: params,
header: header,
method: type,
success: (res) => {
//处理token失效的情况
if (res.data.hasOwnProperty('data')) {
if (res.data.data.err_code === 501 || res.data.data.errcode === 501) {
wx.navigateTo({
url: '/pages/person/login/index'
});
} else {
typeof callBack == "function" && callBack(res.data, "");
}
} else {
typeof callBack == "function" && callBack(res.data, "");
}
wx.hideNavigationBarLoading();
if (loading) {
wx.hideLoading();
}
},
fail: (err) => {
typeof callBack == "function" && callBack(null, err.errMsg);
console.log(err);
wx.hideNavigationBarLoading();
if (loading) {
wx.hideLoading();
}
}
})
wx.showNavigationBarLoading(); wx.showNavigationBarLoading();
var token, header; var token, header;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment