From 152caca82d97e9b2776216eeead8e01bdacf517e Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Mon, 13 Jul 2020 18:01:42 +0800
Subject: [PATCH] 重新提交：修改直播详情页图片显示和海报文字行高

---
 packageA/pages/liveStreamDetails/liveStreamDetails.js   |  2 +-
 packageA/pages/liveStreamDetails/liveStreamDetails.wxml | 14 ++++++++++++++
 packageA/pages/liveStreamDetails/liveStreamDetails.wxss |  9 ++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js
index 1ddcb0b..55350ee 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.js
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js
@@ -551,7 +551,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
     }
     return {
       title: '自定义转发标题',
-      path: '/page/user?id=123'
+      // path: '/page/user?id=123'
     }
   }
 
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.wxml b/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
index 08f5da9..2240d7b 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.wxml
@@ -1,10 +1,15 @@
 <!--pages/liveStreamDetails/liveStreamDetails.wxml-->
 <wxs src="../../../utils/filter.wxs" module="filter"></wxs> 
 <wxs src="../../../utils/myUtils.wxs" module="myUtils"></wxs>
+<!-- <wxs src="/packageA/pages/liveStreamDetails/wxs.wxs" module="tool"></wxs> -->
 <view class="content">
   <!-- 封面标题 -->
   <view class="cover-container">
     <image src="{{details.share_img}}" class="cover-img" mode="widthFix"></image>
+    <!-- <view class="cover-desc">
+      <view>{{details.name}}</view>
+      <view>{{filter.format_time(details.startshare_time)}}</view>
+    </view> -->
   </view>
 
   <!-- 直播详情 -->
@@ -12,6 +17,8 @@
     <view class="desc-title">{{details.name}}</view>
     <view class="desc-content">
       <view>{{filter.format_time(details.start_time, 2)}} 锁定直播</view>
+      <!-- <view>护肤、彩妆、香氛群星汇聚，更有折扣买赠与神秘新品加持~</view>
+      <view>多轮抽奖惊喜连连，不容错过！</view> -->
     </view>
     <text class="desc-status">{{myUtils.liveStatus(details.live_status)}}</text>
   </view>
@@ -32,6 +39,7 @@
         </view>
       </view>
     </block>
+    
   </view> 
 
   <!-- 回放直播 -->
@@ -68,11 +76,17 @@
   <view class="{{showPlaybill ? 'playbill':'playbill active'}}" hidden="{{showPlaybill}}">
     <image src="{{canvasToImgPath}}" class="playbill-pic" mode="widthFix"></image>
     <canvas canvas-id="myCanvas" catchtouchmove="true" style="width:480px;height:738px;position:absolute;left:5000%;"></canvas>
+    <!-- style="width:{{windowWidth}}px;height:{{windowHeight}}px;" -->
     <view class="playbill-save" bindtap="onSaveToPhone">保存至相册</view>
   </view>
 
+  <!-- <canvas canvas-id="myCanvas" class="" catchtouchmove="true" style="width:{{windowWidth}}px;height:{{windowHeight}}px;"></canvas> -->
+
   <!-- mask -->
   <!-- 这里mask必须强制放在actionsheet和playbill的后面 -->
   <view class="mask"  bindtap="hiddenActionSheet" catchtouchmove="true"></view>
+
 </view>
 
+<!-- <canvas canvas-id="myCanvas" class="" catchtouchmove="true" style="width:480px;height:738px;position:absolute;left:5000%"></canvas> -->
+<!-- <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{!canvasHidden}}'></canvas> -->
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.wxss b/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
index 3ce1c44..f413e0f 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
@@ -13,9 +13,8 @@
   position: relative;
 }
 .cover-img {
-  display: block;
   width: 100%;
-  height: auto;
+  height: 100%;
   background-color: #eee;
 }
 .cover-desc {
@@ -225,11 +224,7 @@
 .playbill-pic {
   display: block;
   width: 560rpx;
-  height: 737rpx;
-  /* border-width: 31rpx 20rpx 51rpx;
-  border-color: #f23030;
-  border-style: solid; */
-  /* border: 4rpx solid #f23030; */
+  height: auto;
   margin: 0 auto 26rpx;
   border-radius: 10rpx;
   overflow: hidden;
--
libgit2 0.21.4