Commit 2cfb2236 by 梁建民

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

parents 0c9f4806 d1002dc1
{
"debug":true,
"pages": [
"pages/tab/home/home",
"pages/person/auth/index",
......
......@@ -94,7 +94,7 @@ Component({
id: userId,
name: companyName,
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,
img1: this.data.username.name == companyName ? this.data.username.img1 : this.data.username.img,
timer: WebIM.time()
......
......@@ -5,7 +5,7 @@
<image class="avatar" src="{{ '../../../images/faces/' + item.data }}" style="width:25px; height:25px; margin:0 0 2px 0; float:left;" />
</template>
<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 name="cmd">
<view class="tel-view">
......
......@@ -205,6 +205,7 @@ const webimListen = () => {
},
// 各种异常
onError(error) {
console.log(error)
if (error.type == 8) { //异地登录
let pages = getCurrentPages();
let curPage = pages[pages.length - 1];
......
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