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

app.json

 {
 {
+  "debug":true,
   "pages": [
   "pages": [
     "pages/tab/home/home",
     "pages/tab/home/home",
     "pages/person/auth/index",
     "pages/person/auth/index",

components/chat/inputbar/suit/main/main.js

@@ -94,7 +94,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: this.data.username.id == userId ? this.data.username.touserid : this.data.username.id,//前者是拿接收的数据，后者是拿发送的数据
           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()

components/chat/msglist/msglist.wxml

@@ -5,7 +5,7 @@
   <image class="avatar" src="{{ '../../../images/faces/' + item.data }}" style="width:25px; height:25px; margin:0 0 2px 0; float:left;" />
   <image class="avatar" src="{{ '../../../images/faces/' + item.data }}" style="width:25px; height:25px; margin:0 0 2px 0; float:left;" />
 </template>
 </template>
 <template name="img">
 <template name="img">
-  <image class="avatar" src="{{ item.msg.data }}" style="width:90px; height:120px; margin:2px auto;" mode="aspectFit" bind:tap="previewImage" data-url="{{ item.msg.data }}" />
+  <image src="{{ item.msg.data }}" style="width:90px; height:120px; margin:2px auto;" mode="aspectFit" bind:tap="previewImage" data-url="{{ item.msg.data }}" />
 </template>
 </template>
 <template name="cmd">
 <template name="cmd">
   <view class="tel-view">
   <view class="tel-view">

utils/chat.js

@@ -205,6 +205,7 @@ const webimListen = () => {
     },
     },
     // 各种异常
     // 各种异常
     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];