Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

pages/detail/xj/index.js

@@ -78,27 +78,21 @@ Page({
   },
   sendTemplate:function(){
     let data = this.data.info;
+    let topData = this.data.topInfo
     let my = wx.getStorageSync("myUsername");
     let companyName = wx.getStorageSync("company_name");
     let userId = wx.getStorageSync("user_id");
     let avatar = wx.getStorageSync("avatar");
-    let img = "";
-    if(this.data.topInfo){
-
-      img = this.data.topInfo.goods_images||''
-    }else{
-      img = ""
-    }
     let obj = {
       userId: data.im_username,
-      type: data.goods_name,
-      price: data.currency == 1?'￥'+data.price:'$'+data.price,
-      brand: data.brand_name,
-      fz: data.encap,
-      num: data.number+'',
-      hq: data.delivery_time,
-      time: changeTime(data.add_time*1000),
-      goodImage: img,
+      type: topData.goods_name,
+      price: topData.currency == 1 ? '￥' + topData.price : '$' + topData.price,
+      brand: topData.brand_name,
+      fz: topData.encap,
+      num: topData.number+'',
+      hq: topData.delivery_time,
+      time: changeTime(topData.add_time*1000),
+      goodImage: topData.goods_images || '',
       userName: data.company_name,
       targetId: data.user_id,
       userImg: data.avatar,

utils/chat.js

@@ -105,6 +105,7 @@ const webimListen = () => {
     onOpened(message) {
       let im = getApp().globalData.imBoolean;
       if (im) {
+        getApp().globalData.imBoolean = false;
         wx.showToast({
           title: "登录成功",
           duration: 2000