Skip to content

施宇 / icsalesProgram

Go to a project
Commit 95b474ec by 施宇
Options

小程序bug修复

parent 1288ffab
Inline Side-by-side
Showing with 44 additions and 26 deletions
app.js
...@@ -10,10 +10,12 @@ import { ...@@ -10,10 +10,12 @@ import {
} from './utils/api.js'; } from './utils/api.js';
App({ App({
globalData: { globalData: {
isAddCustomer:false,//是否添加了客服
auth: wx.getStorageSync('auth'), //是否授权 auth: wx.getStorageSync('auth'), //是否授权
token: wx.getStorageSync('access_token'), token: wx.getStorageSync('access_token'),
isIPX: false, //是否为iphone X isIPX: false, //是否为iphone X
customerNum: "001", //客服 customerNum: "001", //客服的im账号
customerUserId:'36',//客服的userId
customerName: "芯掌柜客服", //客服名称 customerName: "芯掌柜客服", //客服名称
isRelogin: true, //登入环信失败后是否重新登入，只允许重新登入一次 isRelogin: true, //登入环信失败后是否重新登入，只允许重新登入一次
bus: bus, //页面之间的监听 bus: bus, //页面之间的监听
...@@ -21,17 +23,20 @@ App({ ...@@ -21,17 +23,20 @@ App({
}, },
getImUser: chat.getImUser, getImUser: chat.getImUser,
conn: chat.conn, conn: chat.conn,
addChatMember: function (id, userId) { //id为环信id userId为账户id addChatMember: function (id, userId,isCustomer) { //id为环信id userId为账户id
let token = wx.getStorageSync('access_token') || ''; let token = wx.getStorageSync('access_token') || '';
let me = this;
if(!isCustomer){
this.addChatMemberStorage(id); this.addChatMemberStorage(id);
}
getData(apis.addrecord, 'GET', { getData(apis.addrecord, 'GET', {
"token": token, "token": token,
"user_id": userId "user_id": userId
}, function (res) { }, function (res) {
if (res.errcode === 0) { if (res.errcode === 0) {
if(isCustomer){
me.globalData.isAddCustomer = true
}
} else { } else {
console.log('添加聊天成员失败') console.log('添加聊天成员失败')
} }
......
components/chat/inputbar/suit/image/image.js
...@@ -81,6 +81,7 @@ Component({ ...@@ -81,6 +81,7 @@ 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 = me.data.username.id == userId ? me.data.username.touserid : me.data.username.id;
msg.set({ msg.set({
apiUrl: WebIM.config.apiURL, apiUrl: WebIM.config.apiURL,
body: file, body: file,
...@@ -90,7 +91,7 @@ Component({ ...@@ -90,7 +91,7 @@ Component({
id: userId, id: userId,
name: companyName, name: companyName,
img: avatar, img: avatar,
touserid: me.data.username.id == userId ? me.data.username.touserid : me.data.username.id, touserid: touserid,
name1: me.data.username.name == companyName ? me.data.username.name1 : me.data.username.name, name1: me.data.username.name == companyName ? me.data.username.name1 : me.data.username.name,
img1: me.data.username.name == companyName ? me.data.username.img1 : me.data.username.img, img1: me.data.username.name == companyName ? me.data.username.img1 : me.data.username.img,
timer: WebIM.time() timer: WebIM.time()
...@@ -99,6 +100,13 @@ Component({ ...@@ -99,6 +100,13 @@ Component({
chatType: me.data.chatType, chatType: me.data.chatType,
success: function (argument) { success: function (argument) {
console.log('发送图片成功') console.log('发送图片成功')
if (me.data.username.your == getApp().globalData.customerNum) {//是客服就将客服加到接口的聊天列表里面
if (getApp().globalData.isAddCustomer) {
return
} else {
getApp().addChatMember(me.data.username.your, touserid, true);
}
}
// disp.fire('em.chat.sendSuccess', id); // disp.fire('em.chat.sendSuccess', id);
}, },
fail:function(){ fail:function(){
......
components/chat/inputbar/suit/main/main.js
...@@ -70,7 +70,6 @@ Component({ ...@@ -70,7 +70,6 @@ Component({
}); });
return return
}; };
let me = this;
let customer = wx.getStorageSync('customer') || ''; let customer = wx.getStorageSync('customer') || '';
if (customer) { if (customer) {
wx.removeStorageSync('customer'); wx.removeStorageSync('customer');
...@@ -81,9 +80,11 @@ Component({ ...@@ -81,9 +80,11 @@ Component({
if (!this.data.userMessage.trim()) { if (!this.data.userMessage.trim()) {
return; return;
} }
let me = this;
let id = WebIM.conn.getUniqueId(); let id = WebIM.conn.getUniqueId();
let msg = new WebIM.message(msgType.TEXT, id); let msg = new WebIM.message(msgType.TEXT, id);
let userId = wx.getStorageSync('user_id'); let userId = wx.getStorageSync('user_id');
let touserid = this.data.username.id == userId ? this.data.username.touserid : this.data.username.id;//前者是拿接收的数据，后者是拿发送的数据
let companyName = wx.getStorageSync('company_name'); let companyName = wx.getStorageSync('company_name');
let avatar = wx.getStorageSync('avatar'); let avatar = wx.getStorageSync('avatar');
msg.set({ msg.set({
...@@ -94,7 +95,7 @@ Component({ ...@@ -94,7 +95,7 @@ Component({
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()
...@@ -103,6 +104,14 @@ Component({ ...@@ -103,6 +104,14 @@ Component({
chatType: this.data.chatType, chatType: this.data.chatType,
success(id, serverMsgId) { success(id, serverMsgId) {
console.log('发送消息成功') console.log('发送消息成功')
if (me.data.username.your == getApp().globalData.customerNum){//是客服就将客服加到接口的聊天列表里面
if (getApp().globalData.isAddCustomer){
return
}else{
getApp().addChatMember(me.data.username.your, touserid,true);
}
}
// disp.fire('em.chat.sendSuccess', id, me.data.userMessage); // disp.fire('em.chat.sendSuccess', id, me.data.userMessage);
}, },
fail(id, serverMsgId) { fail(id, serverMsgId) {
...@@ -147,7 +156,6 @@ Component({ ...@@ -147,7 +156,6 @@ Component({
isTemplate:'1', isTemplate:'1',
custom: "custom" custom: "custom"
}); });
console.log(params)
msg.set({ msg.set({
msg: '', msg: '',
from: me.data.username.myName, from: me.data.username.myName,
...@@ -156,16 +164,14 @@ Component({ ...@@ -156,16 +164,14 @@ Component({
ext: params, ext: params,
success: function () { success: function () {
console.log('发送模板成功') console.log('发送模板成功')
// getApp().addChatMember(me.data.username.your) if (index == -1) { //表示未缓存
// disp.fire('em.chat.sendSuccess', id); getApp().addChatMember(me.data.username.your, touserid);
}
}, },
fail: function () { fail: function () {
console.log('发送模板失败'); console.log('发送模板失败');
} }
}); });
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/form/bj/index.js
...@@ -70,7 +70,7 @@ Page({ ...@@ -70,7 +70,7 @@ Page({
let me = this; let me = this;
let token = wx.getStorageSync('access_token'); let token = wx.getStorageSync('access_token');
let url; let url;
obj.hq == 1 ? obj.delivery_time = '现货' : obj.delivery_time = obj.day + '天'; obj.hq == 1 ? obj.delivery_time = '现货' : obj.delivery_time = obj.day;
obj.currency = this.data.currency == 0 ? 1 : 2; obj.currency = this.data.currency == 0 ? 1 : 2;
obj.token = token; obj.token = token;
if (me.data.type == 1) { if (me.data.type == 1) {
...@@ -135,11 +135,10 @@ Page({ ...@@ -135,11 +135,10 @@ Page({
}) })
} }
if (delivery_time != '现货') { if (delivery_time != '现货') {
let day = delivery_time.replace('天', '');
this.setData({ this.setData({
hq: "2", hq: "2",
isShowTime:true, isShowTime:true,
day: day day: delivery_time
}) })
} }
}, },
......
pages/form/good/index.js
...@@ -84,11 +84,10 @@ Page({ ...@@ -84,11 +84,10 @@ Page({
imgUrl: infoObj.goods_images imgUrl: infoObj.goods_images
}); });
if (infoObj.delivery_time !== '现货') { if (infoObj.delivery_time !== '现货') {
let day = infoObj.delivery_time.replace('天', '');
this.setData({ this.setData({
isShowTime: 2, isShowTime: 2,
hq: 2, hq: 2,
day: day day: infoObj.delivery_time
}); });
} }
...@@ -134,7 +133,7 @@ Page({ ...@@ -134,7 +133,7 @@ Page({
let me = this; let me = this;
let token = wx.getStorageSync('access_token'); let token = wx.getStorageSync('access_token');
let url = ""; let url = "";
obj.hq == 1 ? obj.delivery_time = '现货' : obj.delivery_time = obj.day + '天'; obj.hq == 1 ? obj.delivery_time = '现货' : obj.delivery_time = obj.day;
obj.currency = this.data.currency == 0 ? 1 : 2; obj.currency = this.data.currency == 0 ? 1 : 2;
obj.goods_images = this.data.imgUrl || ''; obj.goods_images = this.data.imgUrl || '';
obj.token = token; obj.token = token;
......
pages/form/xj/index.js
...@@ -66,7 +66,7 @@ Page({ ...@@ -66,7 +66,7 @@ Page({
postData: function(obj) { postData: function(obj) {
let me = this; let me = this;
let token = wx.getStorageSync('access_token'); let token = wx.getStorageSync('access_token');
obj.hq == 1 ? obj.delivery_time = '现货' : obj.delivery_time = obj.day + '天'; obj.hq == 1 ? obj.delivery_time = '现货' : obj.delivery_time = obj.day;
obj.currency = this.data.currency == 0?1:2; obj.currency = this.data.currency == 0?1:2;
obj.goods_images = this.data.imgUrl || ''; obj.goods_images = this.data.imgUrl || '';
obj.token = token; obj.token = token;
......
pages/tab/message/message.js
...@@ -76,7 +76,7 @@ Page({ ...@@ -76,7 +76,7 @@ Page({
name: getApp().globalData.customerName, name: getApp().globalData.customerName,
name1: companyName, name1: companyName,
id: userId, id: userId,
touserid: '', touserid: getApp().globalData.customerUserId,
img: '', img: '',
img1: avatar img1: avatar
}, },
......
utils/chat.js
...@@ -92,11 +92,11 @@ const addImUser = (message) => { //接收消息后进行用户的处理，以便 ...@@ -92,11 +92,11 @@ const addImUser = (message) => { //接收消息后进行用户的处理，以便
let members = wx.getStorageSync('member') || ''; let members = wx.getStorageSync('member') || '';
let index = members.indexOf(fromImId); let index = members.indexOf(fromImId);
if (index == -1) { //表示未缓存 if (index == -1) { //表示未缓存
if (fromImId == getApp().globalData.customerNum) { //如果是客服就不调用接口添加} // if (fromImId == getApp().globalData.customerNum) { //如果是客服就不调用接口添加}
getApp().addChatMemberStorage(fromImId); getApp().addChatMemberStorage(fromImId);
} else { // } else {
getApp().addChatMember(fromImId, fromUserId); // getApp().addChatMember(fromImId, fromUserId);
} // }
} }
}; };
...@@ -160,6 +160,7 @@ const webimListen = () => { ...@@ -160,6 +160,7 @@ const webimListen = () => {
WebIM.conn.close(); WebIM.conn.close();
}, },
onTextMessage(message) { onTextMessage(message) {
console.log(message)
if(isBlack(message.from)){ if(isBlack(message.from)){
return; return;
} }
......
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