Merge branch 'dev' into 'test'

Dev See merge request !459

Merge branch 'dev' into 'test'
Dev See merge request !459
后端研发-苏明海
2 parents e8c00a5c 966a8768
Showing 7 changed files with 55 additions and 42 deletions
packageA/pages/liveStream/liveStream.json
packageA/pages/liveStream/liveStream.wxss
packageA/pages/liveStreamDetails/liveStreamDetails.json
packageA/pages/liveStreamDetails/liveStreamDetails.wxss
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/giftpack/giftpacklist/giftpacklist.wxss
 {
   "usingComponents": {
       "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
-  }
+  },
+  "navigationBarTitleText": "直播"
 }
 \ No newline at end of file
@@ -63,7 +63,7 @@
   width: 172rpx;
   height: 56rpx;
   line-height: 56rpx;
-  background-color: #000;
+  background-color: #f23030;
   color: #fff;
   font-size: 28rpx;
   text-align: center;
@@ -75,7 +75,7 @@ subscribe {
   width: 172rpx !important;
   height: 56rpx !important;
   line-height: 56rpx !important;
-  background-color: #000 !important;
+  background-color: #f23030 !important;
   font-size: 28rpx !important;
   position: relative;
   border-radius: 0 !important;
@@ -87,7 +87,7 @@ subscribe {
   left: 0;
   width: 172rpx;
   height: 56rpx;
-  background-color: #000;
+  background-color: #f23030;
   color: #fff;
 }
 .subscribe--live-player-hasSubscribe {
 {
   "usingComponents": {
     "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
-  }
+  },
+  "navigationBarTitleText": "直播详情"
 }
 \ No newline at end of file
@@ -14,6 +14,7 @@
 .cover-img {
   width: 100%;
   height: 100%;
+  background-color: #eee;
 }
 .cover-desc {
   position: absolute;
@@ -78,7 +79,7 @@
 }
 .item-desc-container {
   padding-left: 46rpx;
-  font-size: 24rpx;
+  font-size: 26rpx;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -123,9 +124,9 @@
 }
 .btn {
   color: #fff;
-  background-color: #000;
+  background-color: #f23030;
   font-size: 36rpx;
-  line-height: 120rpx;
+  line-height: 92rpx;
   text-align: center;
   /* width: 618rpx;
   height: 92rpx; */
@@ -139,16 +140,16 @@
   left: 0;
   width: 100%;
   height: auto;
-  background-color: #000;
+  background-color: #f23030;
   color: #fff;
 }
 .subscribe--live-player-subscribe__btn {
   width: 100% !important;
   height: auto !important;
   font-size: 36rpx !important;
-  line-height: 120rpx !important;
+  /* line-height: 120rpx !important; */
   border-radius: 0 !important;
-  background-color: #000 !important;
+  background-color: #f23030 !important;
 }
 .subscribe--live-player-hasSubscribe {
   background-color: #666 !important;
@@ -217,12 +218,12 @@
 .playbill.active ~ .mask {
   display: block;
 }
-
 .playbill-pic {
+  display: block;
   width: 478rpx;
   height: 737rpx;
   border-width: 31rpx 20rpx 51rpx;
-  border-color: black;
+  border-color: #f23030;
   border-style: solid;
   margin: 0 auto 26rpx;
 }
@@ -231,10 +232,11 @@
   width: 560rpx;
   height: 100rpx;
   line-height: 100rpx;
-  background-color: black;
+  background-color: #f23030;
   color: #fff;
   font-size: 36rpx;
   text-align: center;
+  margin: 0 auto;
 }
 .playbill-save image {
   width: 44rpx;
@@ -239,7 +239,7 @@ Page({
             }
           }
         } else {
-          getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+          getApp().my_warnning(res.data.msg, 0, th);
           return false;
         }
       }
@@ -293,7 +293,7 @@ Page({
             isStart:isStart,
           })
         } else {
-          getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
+          getApp().my_warnning(res.data.msg, 0, _this2);
           return false;
         }
       }
@@ -337,7 +337,6 @@ Page({
       },
       "put"
-
     )
   },
@@ -100,29 +100,39 @@
     </view>
   </view>
   <view class="foot_empty data-v-3a5b7e36"></view>
-  <block wx:if="{{isBuy==1}}">
-    <view class="foot_button data-v-3a5b7e36">
-      <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-        <view class="foot_button_left data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
-           <text class="data-v-3a5b7e36  ">立即购买</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
-        <view class="foot_button_right data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即兑换</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-        <view class="foot_button_buy data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即购买</text>
-        </view>
-      </block>
-      <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
-        <view class="foot_button_intalge data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
-          <text class="data-v-3a5b7e36">立即兑换</text>
-        </view>
-      </block>
-    </view>
+  <block wx:if="{{isBuy==1 && giftTitle}}">
+    <block wx:if="{{isStart==1}}">
+      <view class="foot_button data-v-3a5b7e36">
+        <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
+          <view class="foot_button_left data-v-3a5b7e36 " data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
+            <text class="data-v-3a5b7e36  ">立即购买</text>
+          </view>
+        </block>
+        <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
+          <view class="foot_button_right data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
+            <text class="data-v-3a5b7e36">立即兑换</text>
+          </view>
+        </block>
+        <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
+          <view class="foot_button_buy data-v-3a5b7e36 " data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
+            <text class="data-v-3a5b7e36">立即购买</text>
+          </view>
+        </block>
+        <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
+           <view class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
+              <text class="data-v-3a5b7e36">立即兑换</text>
+           </view>
+        </block>
+      </view>
+    </block>
+    <block wx:else>
+      <view class="foot_button data-v-3a5b7e36">
+      <view class="foot_button_intalge data-v-3a5b7e36 gray ">
+          <text class="data-v-3a5b7e36">活动还未开始</text>
+      </view>
+      </view>
+    </block>
+
   </block>
   <block wx:if="{{isBuy==0}}">
     <view class="foot_button data-v-3a5b7e36">
@@ -245,5 +245,5 @@ page.data-v-3a5b7e36 {
   background-color: rgb(153,153,153);
 }
-.foot_button_left.data-v-3a5b7e36.gray{ background-color: #aaa; }
-.foot_button_right.data-v-3a5b7e36.gray{ background-color: #aaa;}
+.foot_button_intalge.data-v-3a5b7e36.gray{ background-color: #aaa; }
+