Skip to content

Commit 11e9323

Browse files
committed
previewImage
1 parent d143616 commit 11e9323

File tree

5 files changed

+27
-13
lines changed

5 files changed

+27
-13
lines changed

app.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ var util = require('./utils/util')
55
App({
66
onLaunch () {
77
//调用API从本地缓存中获取数据
8-
var logs = wx.getStorageSync('logs') || []
9-
logs.unshift(Date.now())
10-
wx.setStorageSync('logs', logs)
11-
setTimeout(() => {
12-
this.fetchCurrentUser()
13-
}, 0)
8+
// var logs = wx.getStorageSync('logs') || []
9+
// logs.unshift(Date.now())
10+
// wx.setStorageSync('logs', logs)
11+
this.fetchCurrentUser()
1412
},
1513
fetchCurrentUser(cb) {
1614
var currentUser = wx.getStorageSync('currentUser')

pages/live/live.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Page({
6969
this.setData({
7070
liveId: query.liveId
7171
})
72+
7273
var app = getApp()
7374
this.setData({
7475
curUser: app.globalData.currentUser
@@ -320,7 +321,10 @@ Page({
320321
this.addSystemMsg('聊天服务器连接成功')
321322
this.registerEvent()
322323
this.fetchConv()
323-
}).catch(this.handleError)
324+
325+
}).catch((error) => {
326+
this.addSystemMsg('连接聊天服务器失败 ' + error)
327+
})
324328
},
325329
registerEvent() {
326330
this.client.on('message', (message, conversation) => {
@@ -361,7 +365,9 @@ Page({
361365
this.fetchCount()
362366
}, 5 * 1000)
363367

364-
}).catch(this.handleError)
368+
}).catch((error) => {
369+
this.addSystemMsg('加载聊天记录失败:' + error)
370+
})
365371
},
366372
fetchCount() {
367373
this.conv.count()
@@ -386,6 +392,9 @@ Page({
386392
util.showError(error)
387393
},
388394
upper(e) {
395+
if (!this.messageIterator) {
396+
return
397+
}
389398
if (this.isLoading) {
390399
return
391400
}
@@ -548,5 +557,11 @@ Page({
548557
desc: '来自趣直播-知识直播平台',
549558
path: '/pages/live/live?liveId=' + live.liveId
550559
}
560+
},
561+
viewQrcode(e) {
562+
console.log(e)
563+
wx.previewImage({
564+
urls: ['http://mres.quzhiboapp.com/qrcode_me_3.jpg']
565+
})
551566
}
552567
})

pages/live/live.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<view class="small-title">开播时您将收到一条微信通知~</view>
1010
<view class="small-title">可打开 quzhiboapp.com 在电脑上观看</view>
1111
<view class="small-title">另可长按加微信进入用户群和主播聊聊</view>
12-
<image class="qrcode" src="http://mres.quzhiboapp.com/qrcode_me_3.jpg" alt="" mode="widthFix"></image>
12+
<image bindtap="viewQrcode" class="qrcode" src="http://mres.quzhiboapp.com/qrcode_me_3.jpg" alt="" mode="widthFix"></image>
1313
</view>
1414

1515
<view class="video-on" wx:if="{{live.status == 20 || live.status == 25 || live.status == 30}}">

pages/live/live.wxss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@
4545
justify-content: center;
4646
align-items: center;
4747
flex-direction: column;
48+
height: 100%;
4849
}
4950

5051
.video-error {
51-
height: 100%;
52+
5253
}
5354

5455
.player-area .video-wait .qrcode {

templates/live-item/live-item.wxss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
}
3838

3939
.live-item .live-info .subject {
40-
height: 80rpx;
41-
line-height: 40rpx;
40+
height: 70rpx;
41+
line-height: 35rpx;
4242
overflow: hidden;
4343
text-overflow: ellipsis;
4444
word-wrap: break-word;
45-
font-size: 36rpx;
45+
font-size: 34rpx;
4646
display: table-cell;
4747
vertical-align: middle;
4848
}

0 commit comments

Comments
 (0)