|
@@ -13,19 +13,26 @@ Page({
|
|
|
active: ""
|
|
|
},
|
|
|
|
|
|
- tabChange(){},
|
|
|
+ tabChange() {},
|
|
|
toPage(e) {
|
|
|
- const {agendavideo, cover, url, id} = e.currentTarget.dataset;
|
|
|
- console.log( encodeURI(cover),agendavideo)
|
|
|
- toNavigatePage(url +'?id=' + id + '&agendavideo=' + agendavideo + '&cover=' + encodeURI(cover))
|
|
|
+ const {
|
|
|
+ agendavideo,
|
|
|
+ cover,
|
|
|
+ url,
|
|
|
+ id
|
|
|
+ } = e.currentTarget.dataset;
|
|
|
+ console.log(encodeURI(cover), agendavideo)
|
|
|
+ toNavigatePage(url + '?id=' + id + '&agendavideo=' + agendavideo + '&cover=' + encodeURI(cover))
|
|
|
},
|
|
|
|
|
|
- async getChannelsLive(finderUserName){
|
|
|
- const info = await new Promise((resolve, reject)=>{
|
|
|
+ async getChannelsLive(finderUserName) {
|
|
|
+ const info = await new Promise((resolve, reject) => {
|
|
|
wx.getChannelsLiveInfo({
|
|
|
finderUserName,
|
|
|
success: res => {
|
|
|
- const { status } = res;
|
|
|
+ const {
|
|
|
+ status
|
|
|
+ } = res;
|
|
|
resolve(status);
|
|
|
// status -> 2 直播中
|
|
|
},
|
|
@@ -37,7 +44,7 @@ Page({
|
|
|
return info
|
|
|
},
|
|
|
|
|
|
- openChannels(e){
|
|
|
+ openChannels(e) {
|
|
|
const finderUserName = e.currentTarget.dataset.channelsid || "";
|
|
|
wx.openChannelsLive({
|
|
|
finderUserName
|
|
@@ -53,15 +60,16 @@ Page({
|
|
|
for (let i = 0; i < strokeList.length; i++) {
|
|
|
const v = strokeList[i];
|
|
|
const time = v.agendaTime.split(" ") || [];
|
|
|
- if(!time || !time.length) continue
|
|
|
- if(!sl[time[0]]) sl[time[0]] = [];
|
|
|
+ if (!time || !time.length) continue
|
|
|
+ let t0 = time[0].split("-");
|
|
|
+ if (!sl[t0[1] + '-' + t0[2]]) sl[t0[1] + '-' + t0[2]] = [];
|
|
|
v.localTime = time[1];
|
|
|
- if(v.wxVideoUid){
|
|
|
+ if (v.wxVideoUid) {
|
|
|
// 判断是否正在直播
|
|
|
const status = this.getChannelsLive(v.wxVideoUid);
|
|
|
v.liveing = status === 2;
|
|
|
}
|
|
|
- sl[time[0]].push(v);
|
|
|
+ sl[t0[1] + '-' + t0[2]].push(v);
|
|
|
}
|
|
|
this.setData({
|
|
|
meetingList: sl
|