Skip to content

施宇 / icsalesProgram

Go to a project
Commit d714ccb2 by 施宇
Options

1111

parent f69f2b5e
Inline Side-by-side
Showing with 117 additions and 81 deletions
app.js
...@@ -18,14 +18,14 @@ App({ ...@@ -18,14 +18,14 @@ App({
customerName: "IC助手客服" customerName: "IC助手客服"
}, },
getImUser: chat.getImUser, getImUser: chat.getImUser,
addChatMember: function (id) { addChatMember: function (id,userId) {//id为环信id userId为账户id
let token = wx.getStorageSync('access_token') || ''; let token = wx.getStorageSync('access_token') || '';
this.addChatMemberStorage(id); this.addChatMemberStorage(id);
getData(apis.addrecord, 'GET', { getData(apis.addrecord, 'GET', {
"token": token, "token": token,
"user_id": id "user_id": userId
}, function (res) { }, function (res) {
if (res.errcode === 0) { if (res.errcode === 0) {
...@@ -35,14 +35,8 @@ App({ ...@@ -35,14 +35,8 @@ App({
}, false); }, false);
}, },
addChatMemberStorage: function (id) { addChatMemberStorage: function (id) {
let member = wx.getStorageSync("member") || []; let member = wx.getStorageSync("member") || [];
let index = member.indexOf(id); member.push(id);
if (index == -1) {
member.push(id)
}
wx.setStorage({ wx.setStorage({
key: "member", key: "member",
data: member data: member
......
components/chat/inputbar/suit/main/main.js
...@@ -132,11 +132,14 @@ Component({ ...@@ -132,11 +132,14 @@ Component({
let userId = wx.getStorageSync('user_id'); let userId = wx.getStorageSync('user_id');
let companyName = wx.getStorageSync('company_name'); let companyName = wx.getStorageSync('company_name');
let avatar = wx.getStorageSync('avatar'); let avatar = wx.getStorageSync('avatar');
let touserid = this.data.username.id == userId ? this.data.username.touserid : this.data.username.id;
let members = wx.getStorageSync('member') || '';
let index = members.indexOf(me.data.username);
let params = Object.assign({}, me.data.template, { let params = Object.assign({}, me.data.template, {
id: userId, id: userId,
name: companyName, name: companyName,
img: avatar, img: avatar,
touserid: this.data.username.id == userId ? this.data.username.touserid : this.data.username.id, touserid: touserid,
name1: this.data.username.name == companyName ? this.data.username.name1 : this.data.username.name, name1: this.data.username.name == companyName ? this.data.username.name1 : this.data.username.name,
img1: this.data.username.name == companyName ? this.data.username.img1 : this.data.username.img, img1: this.data.username.name == companyName ? this.data.username.img1 : this.data.username.img,
timer: WebIM.time() timer: WebIM.time()
...@@ -157,7 +160,9 @@ Component({ ...@@ -157,7 +160,9 @@ Component({
console.log('发送模板失败'); console.log('发送模板失败');
} }
}); });
getApp().addChatMember(me.data.username.your) if (index == -1) { //表示未缓存
getApp().addChatMember(me.data.username.your, touserid);
}
WebIM.conn.send(msg.body); WebIM.conn.send(msg.body);
this.triggerEvent( this.triggerEvent(
"newTextMsg", { "newTextMsg", {
......
pages/detail/good/index.js
...@@ -14,9 +14,6 @@ Page({ ...@@ -14,9 +14,6 @@ Page({
*/ */
data: { data: {
info: null, info: null,
name: "", //埋点统计
price: "", //埋点统计
img: "", //埋点统计
editOrShow: -1, //1编辑 2在线沟通 editOrShow: -1, //1编辑 2在线沟通
goodId: "", goodId: "",
type: "", type: "",
...@@ -31,7 +28,7 @@ Page({ ...@@ -31,7 +28,7 @@ Page({
goodId: options.goodId || '', goodId: options.goodId || '',
type: options.type || '' type: options.type || ''
}) })
console.log(options) console.log(options)
}, },
getData: function() { getData: function() {
let me = this; let me = this;
...@@ -78,14 +75,6 @@ Page({ ...@@ -78,14 +75,6 @@ Page({
me.setData({ me.setData({
info: res.goods_list[goodId] info: res.goods_list[goodId]
}) })
let data = me.data.info;
if (data) {
me.setData({
name: data.goods_name || '',
img: data.goods_images || '',
price: data.currency == 1 ? '￥' + data.price : '$' + data.price
})
}
} }
} else { } else {
...@@ -190,9 +179,15 @@ Page({ ...@@ -190,9 +179,15 @@ Page({
}, },
onShareAppMessage: function(res) { onShareAppMessage: function(res) {
let me = this;
wx.reportAnalytics('share_good', {
good_name: me.data.info.goods_name,
price: me.data.info.currency == 1 ? '￥' + me.data.info.price : '$' + me.data.info.price,
img: me.data.info.goods_images
});
return { return {
title: this.data.info.goods_name || '', title: me.data.info.goods_name || '',
path: "/pages/detail/good/index?type=3&goodId=" + this.data.goodId path: "/pages/detail/good/index?type=3&goodId=" + me.data.goodId
} }
}, },
previewImage: function() { previewImage: function() {
...@@ -209,5 +204,4 @@ Page({ ...@@ -209,5 +204,4 @@ Page({
} }
} }
}) })
\ No newline at end of file
pages/tab/good/good.js
...@@ -91,7 +91,6 @@ Page({ ...@@ -91,7 +91,6 @@ Page({
}, },
onPageScroll:function(e){ onPageScroll:function(e){
console.log(e.scrollTop);
if(e.scrollTop>90){ if(e.scrollTop>90){
this.setData({ this.setData({
isFixed:true isFixed:true
......
pages/tab/home/home.js
...@@ -37,7 +37,8 @@ Page({ ...@@ -37,7 +37,8 @@ Page({
getData(apis.inquirySearch, 'get', { getData(apis.inquirySearch, 'get', {
"offset": 10, "offset": 10,
"p1": 1, "p1": 1,
"add_time/order": "desc" "add_time/order": "desc",
"token":token
}, function(res) { }, function(res) {
let newArr = []; let newArr = [];
if (res.errcode === 0) { if (res.errcode === 0) {
......
pages/tab/message/message.js
...@@ -181,7 +181,6 @@ Page({ ...@@ -181,7 +181,6 @@ Page({
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
onHide: function() { onHide: function() {
}, },
/** /**
...@@ -268,25 +267,47 @@ Page({ ...@@ -268,25 +267,47 @@ Page({
del_chat: function(event, type) { del_chat: function(event, type) {
let detail = event.currentTarget.dataset.item; let detail = event.currentTarget.dataset.item;
let your = detail.username; let your = detail.username;
console.log(your)
let myName = wx.getStorageSync("myUsername"); let myName = wx.getStorageSync("myUsername");
let currentPage = getCurrentPages(); let currentPage = getCurrentPages();
let title = type == 1 ? '是否删除记录' : '是否加入黑名单？' let title = type == 1 ? '是否删除记录' : '是否加入黑名单？';
let token = wx.getStorageSync('access_token') || '';
let userId = wx.getStorageSync('user_id') || '';
let id;
if (userId == detail.ext.id) {
id = detail.ext.touserid
} else {
id = detail.ext.id
};
wx.showModal({ wx.showModal({
title: title, title: title,
confirmText: "确定", confirmText: "确定",
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
if (type == 1) { if (type == 1) {
let member = wx.getStorageSync('member'); getData(apis.addrecord, 'GET', {
let index = member.indexOf(your); "token": token,
member.splice(index, 1); "user_id": id,
wx.setStorageSync('member', member) status: 3
wx.removeStorageSync(your + myName); }, function(res) {
wx.removeStorageSync("rendered_" + your + myName); if (res.errcode === 0) {
if (currentPage[0]) { let member = wx.getStorageSync('member');
currentPage[0].onShow(); let index = member.indexOf(your);
} member.splice(index, 1);
disp.fire("em.chat.session.remove"); wx.setStorageSync('member', member)
wx.removeStorageSync(your + myName);
wx.removeStorageSync("rendered_" + your + myName);
if (currentPage[0]) {
currentPage[0].onShow();
}
} else {
wx.showToast({
title: '删除失败',
icon: 'none',
duration: 2000
});
}
}, false);
} else { } else {
let list = { let list = {
your: { your: {
...@@ -299,16 +320,29 @@ Page({ ...@@ -299,16 +320,29 @@ Page({
list: list, list: list,
type: 'jid', type: 'jid',
success: function() { success: function() {
let member = wx.getStorageSync('member'); getData(apis.addrecord, 'GET', {
let index = member.indexOf(your); "token": token,
member.splice(index, 1); "user_id": id,
wx.setStorageSync('member', member) status: 2
wx.removeStorageSync(your + myName); }, function(res) {
wx.removeStorageSync("rendered_" + your + myName); if (res.errcode === 0) {
if (currentPage[0]) { let member = wx.getStorageSync('member');
currentPage[0].onShow(); let index = member.indexOf(your);
} member.splice(index, 1);
disp.fire("em.chat.session.remove"); wx.setStorageSync('member', member)
wx.removeStorageSync(your + myName);
wx.removeStorageSync("rendered_" + your + myName);
if (currentPage[0]) {
currentPage[0].onShow();
}
} else {
wx.showToast({
title: '加入黑名单失败',
icon: 'none',
duration: 2000
});
}
}, false);
}, },
error: function() { error: function() {
wx.showToast({ wx.showToast({
......
utils/api.js
const auth_url = 'https://authapi.icsales.com'; // const auth_url = 'https://authapi.icsales.com';
const so_url = 'https://soapi.icsales.com'; // const so_url = 'https://soapi.icsales.com';
const offer_url = "https://offerapi.icsales.com"; // const offer_url = "https://offerapi.icsales.com";
const user_url = 'https://userapi.icsales.com'; // const user_url = 'https://userapi.icsales.com';
const goods_url = 'https://goodsapi.icsales.com'; // const goods_url = 'https://goodsapi.icsales.com';
const home_url = 'https://home.icsales.com'; // const home_url = 'https://home.icsales.com';
// const auth_url = 'http://authapi.icsales.cc'; const auth_url = 'http://authapi.icsales.cc';
// const so_url = 'http://soapi.icsales.cc'; const so_url = 'http://soapi.icsales.cc';
// const offer_url = "http://offerapi.icsales.cc"; const offer_url = "http://offerapi.icsales.cc";
// const user_url = 'http://userapi.icsales.cc'; const user_url = 'http://userapi.icsales.cc';
// const goods_url = 'http://goodsapi.icsales.cc'; const goods_url = 'http://goodsapi.icsales.cc';
// const home_url = 'http://home.icsales.cc'; const home_url = 'http://home.icsales.cc';
const apis = { const apis = {
/** /**
* 授权接口 * 授权接口
*/ */
......
utils/chat.js
...@@ -46,6 +46,7 @@ const getImUser = () => { ...@@ -46,6 +46,7 @@ const getImUser = () => {
wx.setStorageSync('avatar', res.data.avatar); wx.setStorageSync('avatar', res.data.avatar);
wx.setStorageSync('company_name', res.data.company_name); wx.setStorageSync('company_name', res.data.company_name);
wx.setStorageSync("myUsername", res.data.im_username); wx.setStorageSync("myUsername", res.data.im_username);
console.log(res)
conn.open({ conn.open({
apiUrl: WebIM.config.apiURL, apiUrl: WebIM.config.apiURL,
user: res.data.im_username, user: res.data.im_username,
...@@ -58,6 +59,20 @@ const getImUser = () => { ...@@ -58,6 +59,20 @@ const getImUser = () => {
} }
}, false) }, false)
}; };
const addImUser = (message) => { //接收消息后进行用户的处理，以便同步到pc
let fromUserId = message.ext.id;
let fromImId = message.from;
let members = wx.getStorageSync('member') || '';
let index = members.indexOf(fromImId);
if (index == -1) { //表示未缓存
if (fromImId == getApp().globalData.customerNum) { //如果是客服就不调用接口添加}
getApp().addChatMemberStorage(fromImId);
} else {
getApp().addChatMember(fromImId, fromUserId);
}
}
};
const webimListen = () => { const webimListen = () => {
let my = wx.getStorageSync('myUsername') || ''; let my = wx.getStorageSync('myUsername') || '';
WebIM.conn.listen({ WebIM.conn.listen({
...@@ -96,7 +111,7 @@ const webimListen = () => { ...@@ -96,7 +111,7 @@ const webimListen = () => {
onCmdMessage(message) { onCmdMessage(message) {
if (message) { if (message) {
if (onMessageError(message)) { if (onMessageError(message)) {
getApp().addChatMember(message.from); addImUser(message)
msgStorage.saveReceiveMsg(message, msgType.CMD); msgStorage.saveReceiveMsg(message, msgType.CMD);
} }
calcUnReadSpot(message); calcUnReadSpot(message);
...@@ -105,11 +120,7 @@ const webimListen = () => { ...@@ -105,11 +120,7 @@ const webimListen = () => {
onTextMessage(message) { onTextMessage(message) {
if (message) { if (message) {
if (onMessageError(message)) { if (onMessageError(message)) {
if (getApp().globalData.customerNum != my) { addImUser(message)
getApp().addChatMemberStorage(message.from);
} else {
getApp().addChatMember(message.from);
}
msgStorage.saveReceiveMsg(message, msgType.TEXT); msgStorage.saveReceiveMsg(message, msgType.TEXT);
} }
calcUnReadSpot(message); calcUnReadSpot(message);
...@@ -120,11 +131,7 @@ const webimListen = () => { ...@@ -120,11 +131,7 @@ const webimListen = () => {
onEmojiMessage(message) { onEmojiMessage(message) {
if (message) { if (message) {
if (onMessageError(message)) { if (onMessageError(message)) {
if (getApp().globalData.customerNum != my) { addImUser(message)
getApp().addChatMemberStorage(message.from);
} else {
getApp().addChatMember(message.from);
}
msgStorage.saveReceiveMsg(message, msgType.EMOJI); msgStorage.saveReceiveMsg(message, msgType.EMOJI);
} }
calcUnReadSpot(message); calcUnReadSpot(message);
...@@ -133,18 +140,19 @@ const webimListen = () => { ...@@ -133,18 +140,19 @@ const webimListen = () => {
onPictureMessage(message) { onPictureMessage(message) {
if (message) { if (message) {
if (onMessageError(message)) { if (onMessageError(message)) {
if (getApp().globalData.customerNum != my) { addImUser(message)
getApp().addChatMemberStorage(message.from);
} else {
getApp().addChatMember(message.from);
}
msgStorage.saveReceiveMsg(message, msgType.IMAGE); msgStorage.saveReceiveMsg(message, msgType.IMAGE);
} }
calcUnReadSpot(message); calcUnReadSpot(message);
} }
}, },
onBlacklistUpdate: function (list) { //黑名单变动
// 查询黑名单，将好友拉黑，将好友从黑名单移除都会回调这个函数，list则是黑名单现有的所有好友信息
console.log(list);
},
// 各种异常 // 各种异常
onError(error) { onError(error) {
console.log(error)
if (error.type == 8) { if (error.type == 8) {
let pages = getCurrentPages(); let pages = getCurrentPages();
let curPage = pages[pages.length - 1]; let curPage = pages[pages.length - 1];
...@@ -153,7 +161,9 @@ const webimListen = () => { ...@@ -153,7 +161,9 @@ const webimListen = () => {
reloginIm() reloginIm()
} }
} else { } else if(error.type == 1){
getImUser()
}else {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '聊天系统出现异常!', content: '聊天系统出现异常!',
......
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