From 47e9534a5192b08db777a7e0250e0109c3eb656e Mon Sep 17 00:00:00 2001
From: Cyy <547766613@qq.com>
Date: Thu, 22 Dec 2022 11:26:26 +0800
Subject: [PATCH] 进入直播详情优化

---
 packageA/pages/liveStream/liveStream.js               | 12 +++++++++++-
 packageA/pages/liveStream/liveStream.wxml             |  4 ++--
 packageA/pages/liveStreamDetails/liveStreamDetails.js |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packageA/pages/liveStream/liveStream.js b/packageA/pages/liveStream/liveStream.js
index 3d48339..3a27020 100644
--- a/packageA/pages/liveStream/liveStream.js
+++ b/packageA/pages/liveStream/liveStream.js
@@ -59,8 +59,18 @@ Page({
   clickItem: function (e) {
     // id：列表项id
     // live：直播类别 即将开始/直播中/精彩回放
+
+    if(e.currentTarget.dataset.live==101){
+     var live_status = 'ing'
+    }
+    if(e.currentTarget.dataset.live==102){
+      var live_status = 'toBegin'
+     }
+     if(e.currentTarget.dataset.live==103){
+      var live_status = 'over'
+     }
     wx.navigateTo({
-      url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + e.currentTarget.dataset.live
+      url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + live_status
     })
     // console.log('options-->');
   },
diff --git a/packageA/pages/liveStream/liveStream.wxml b/packageA/pages/liveStream/liveStream.wxml
index cb55640..9b403f7 100644
--- a/packageA/pages/liveStream/liveStream.wxml
+++ b/packageA/pages/liveStream/liveStream.wxml
@@ -63,7 +63,7 @@
     <view class="list" style="margin-top: 23rpx;">
       <block wx:for="{{living.pageData}}" wx:key="item">
         <view class="list-item" data-id="{{item.id}}" data-live="ing" style="display: block;margin-top: 23rpx;margin: 20rpx 4%; border-radius: 25rpx;;background-color: white;">
-          <view class="list-item-left" catchtap="clickItem">
+          <view class="list-item-left" catchtap="clickItem" data-id="{{item.id}}"  data-live="{{item.live_status}}">
             <view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==101}}">正在直播</view>
             <view class="item-btnjjkb" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==102}}">即将开播</view>
             <view class="item-btnhf" catchtap="clickLive" data-roomid="{{item.roomid}}" wx:if="{{item.live_status==103}}">回放</view>
@@ -77,7 +77,7 @@
 
           <view class="list-item-right">
             <view style="display: flex;">
-              <view style="display: block;width: 70%;" catchtap="clickItem">
+              <view style="display: block;width: 70%;" catchtap="clickItem" data-id="{{item.id}}"  data-live="{{item.live_status}}">
                 <view class="item-title">{{item.name}}</view>
                 <view class="item-anchor">
                 <image src="../../images/bar/user_on.png" mode="" style="width: 25rpx;height: 25rpx;"/>
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js
index 8ac2e74..5a211c9 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.js
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -530,7 +530,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
     switch(options.live) {
       case 'toBegin': {
         this.setData({
-          btnText: '订阅'
+          btnText: '即将开播'
         })
         break;
       }
--
libgit2 0.21.4