liyongli 1 gadu atpakaļ
vecāks
revīzija
13cd266f34

+ 2 - 1
pages/guests/index.wxml

@@ -10,7 +10,8 @@
         <view style="padding: 10rpx 15rpx;" class="van-ellipsis">
           {{item.userName}}
         </view>
-        <view style="padding: 10rpx 15rpx;" class="van-ellipsis">
+        <view style="padding: 10rpx 15rpx;" class="van-multi-ellipsis--l2">
+        <!-- <view style="padding: 10rpx 15rpx;" class="van-ellipsis"> -->
           {{item.tags}}
         </view>
       </view>

+ 1 - 1
pages/guests/index.wxss

@@ -30,7 +30,7 @@
 .m_phone_bg {
   display: inline-block;
   margin: 10rpx 0 0 20rpx;
-  border-radius: 35rpx;
+  border-radius: 15rpx;
   line-height: 1.5em;
   width: 220rpx;
   overflow: hidden;

+ 1 - 1
pages/livePhone/index.wxml

@@ -2,7 +2,7 @@
 <view class="media">
   <image wx:if="{{cover}}" src="{{cover}}" style="{{'width:' + top.width + 'px;height:' + top.height + 'px'}}" bindload="imageLoad" data-width="{{top.width}}" data-image="top" mode="aspectFit" />
 
-  <van-tabs sticky="{{true}}" color="#ffffff" title-inactive-color="#cccccc" title-active-color="#ffffff" active="{{ actMeet }}" bind:change="changeMeet">
+  <van-tabs ellipsis="{{false}}" sticky="{{true}}" color="#ffffff" title-inactive-color="#cccccc" title-active-color="#ffffff" active="{{ actMeet }}" bind:change="changeMeet">
     <van-tab wx:for="{{tabs}}" wx:key="index" title="{{item.agendaName}}" name="{{item.id + ''}}"></van-tab>
   </van-tabs>
   <view style="margin-top: 1em;padding-right: 5px;">

+ 20 - 12
pages/stroke/index.js

@@ -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

+ 1 - 1
project.private.config.json

@@ -3,7 +3,7 @@
   "projectname": "miniprogram-1",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "condition": {}
 }

+ 1 - 0
utils/util.js

@@ -42,6 +42,7 @@ const openFileFunc = (url, fileName = '') => {
           wx.hideLoading()
           wx.showToast({
             title: '请稍后再试!',
+            icon: 'none'
           })
         }
       })