wxd / MShopWeApp

Commit 04e1adaad53e3d79f94cb3eae66f4eb15709540f

Authored by 后端研发-苏明海
2 parents e8c00a5c 966a8768

Merge branch 'dev' into 'test' 

Dev

See merge request !459
Inline Side-by-side
Showing 7 changed files with 55 additions and 42 deletions
packageA/pages/liveStream/liveStream.json
  View file @04e1ada
1 1 {
2 2 "usingComponents": {
3 3 "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
4   - }
  4 + },
  5 + "navigationBarTitleText": "直播"
5 6 }
6 7 \ No newline at end of file
... ...
packageA/pages/liveStream/liveStream.wxss
  View file @04e1ada
... ... @@ -63,7 +63,7 @@
63 63 width: 172rpx;
64 64 height: 56rpx;
65 65 line-height: 56rpx;
66   - background-color: #000;
  66 + background-color: #f23030;
67 67 color: #fff;
68 68 font-size: 28rpx;
69 69 text-align: center;
... ... @@ -75,7 +75,7 @@ subscribe {
75 75 width: 172rpx !important;
76 76 height: 56rpx !important;
77 77 line-height: 56rpx !important;
78   - background-color: #000 !important;
  78 + background-color: #f23030 !important;
79 79 font-size: 28rpx !important;
80 80 position: relative;
81 81 border-radius: 0 !important;
... ... @@ -87,7 +87,7 @@ subscribe {
87 87 left: 0;
88 88 width: 172rpx;
89 89 height: 56rpx;
90   - background-color: #000;
  90 + background-color: #f23030;
91 91 color: #fff;
92 92 }
93 93 .subscribe--live-player-hasSubscribe {
... ...
packageA/pages/liveStreamDetails/liveStreamDetails.json
  View file @04e1ada
1 1 {
2 2 "usingComponents": {
3 3 "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
4   - }
  4 + },
  5 + "navigationBarTitleText": "直播详情"
5 6 }
6 7 \ No newline at end of file
... ...
packageA/pages/liveStreamDetails/liveStreamDetails.wxss
  View file @04e1ada
... ... @@ -14,6 +14,7 @@
14 14 .cover-img {
15 15 width: 100%;
16 16 height: 100%;
  17 + background-color: #eee;
17 18 }
18 19 .cover-desc {
19 20 position: absolute;
... ... @@ -78,7 +79,7 @@
78 79 }
79 80 .item-desc-container {
80 81 padding-left: 46rpx;
81   - font-size: 24rpx;
  82 + font-size: 26rpx;
82 83 display: flex;
83 84 flex-direction: column;
84 85 justify-content: space-between;
... ... @@ -123,9 +124,9 @@
123 124 }
124 125 .btn {
125 126 color: #fff;
126   - background-color: #000;
  127 + background-color: #f23030;
127 128 font-size: 36rpx;
128   - line-height: 120rpx;
  129 + line-height: 92rpx;
129 130 text-align: center;
130 131 /* width: 618rpx;
131 132 height: 92rpx; */
... ... @@ -139,16 +140,16 @@
139 140 left: 0;
140 141 width: 100%;
141 142 height: auto;
142   - background-color: #000;
  143 + background-color: #f23030;
143 144 color: #fff;
144 145 }
145 146 .subscribe--live-player-subscribe__btn {
146 147 width: 100% !important;
147 148 height: auto !important;
148 149 font-size: 36rpx !important;
149   - line-height: 120rpx !important;
  150 + /* line-height: 120rpx !important; */
150 151 border-radius: 0 !important;
151   - background-color: #000 !important;
  152 + background-color: #f23030 !important;
152 153 }
153 154 .subscribe--live-player-hasSubscribe {
154 155 background-color: #666 !important;
... ... @@ -217,12 +218,12 @@
217 218 .playbill.active ~ .mask {
218 219 display: block;
219 220 }
220   -
221 221 .playbill-pic {
  222 + display: block;
222 223 width: 478rpx;
223 224 height: 737rpx;
224 225 border-width: 31rpx 20rpx 51rpx;
225   - border-color: black;
  226 + border-color: #f23030;
226 227 border-style: solid;
227 228 margin: 0 auto 26rpx;
228 229 }
... ... @@ -231,10 +232,11 @@
231 232 width: 560rpx;
232 233 height: 100rpx;
233 234 line-height: 100rpx;
234   - background-color: black;
  235 + background-color: #f23030;
235 236 color: #fff;
236 237 font-size: 36rpx;
237 238 text-align: center;
  239 + margin: 0 auto;
238 240 }
239 241 .playbill-save image {
240 242 width: 44rpx;
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  View file @04e1ada
... ... @@ -239,7 +239,7 @@ Page({
239 239 }
240 240 }
241 241 } else {
242   - getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
  242 + getApp().my_warnning(res.data.msg, 0, th);
243 243 return false;
244 244 }
245 245 }
... ... @@ -293,7 +293,7 @@ Page({
293 293 isStart:isStart,
294 294 })
295 295 } else {
296   - getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
  296 + getApp().my_warnning(res.data.msg, 0, _this2);
297 297 return false;
298 298 }
299 299 }
... ... @@ -337,7 +337,6 @@ Page({
337 337  
338 338 },
339 339 "put"
340   -
341 340 )
342 341  
343 342 },
... ...
pages/giftpack/giftpacklist/giftpacklist.wxml
  View file @04e1ada
... ... @@ -100,29 +100,39 @@
100 100 </view>
101 101 </view>
102 102 <view class="foot_empty data-v-3a5b7e36"></view>
103   - <block wx:if="{{isBuy==1}}">
104   - <view class="foot_button data-v-3a5b7e36">
105   - <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
106   - <view class="foot_button_left data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
107   - <text class="data-v-3a5b7e36 ">立即购买</text>
108   - </view>
109   - </block>
110   - <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
111   - <view class="foot_button_right data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
112   - <text class="data-v-3a5b7e36">立即兑换</text>
113   - </view>
114   - </block>
115   - <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
116   - <view class="foot_button_buy data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
117   - <text class="data-v-3a5b7e36">立即购买</text>
118   - </view>
119   - </block>
120   - <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
121   - <view class="foot_button_intalge data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
122   - <text class="data-v-3a5b7e36">立即兑换</text>
123   - </view>
124   - </block>
125   - </view>
  103 + <block wx:if="{{isBuy==1 && giftTitle}}">
  104 + <block wx:if="{{isStart==1}}">
  105 + <view class="foot_button data-v-3a5b7e36">
  106 + <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
  107 + <view class="foot_button_left data-v-3a5b7e36 " data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
  108 + <text class="data-v-3a5b7e36 ">立即购买</text>
  109 + </view>
  110 + </block>
  111 + <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
  112 + <view class="foot_button_right data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
  113 + <text class="data-v-3a5b7e36">立即兑换</text>
  114 + </view>
  115 + </block>
  116 + <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
  117 + <view class="foot_button_buy data-v-3a5b7e36 " data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
  118 + <text class="data-v-3a5b7e36">立即购买</text>
  119 + </view>
  120 + </block>
  121 + <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
  122 + <view class="foot_button_intalge data-v-3a5b7e36 " bindtap="GetBuyIntegral" data-id="{{lbId}}">
  123 + <text class="data-v-3a5b7e36">立即兑换</text>
  124 + </view>
  125 + </block>
  126 + </view>
  127 + </block>
  128 + <block wx:else>
  129 + <view class="foot_button data-v-3a5b7e36">
  130 + <view class="foot_button_intalge data-v-3a5b7e36 gray ">
  131 + <text class="data-v-3a5b7e36">活动还未开始</text>
  132 + </view>
  133 + </view>
  134 + </block>
  135 +
126 136 </block>
127 137 <block wx:if="{{isBuy==0}}">
128 138 <view class="foot_button data-v-3a5b7e36">
... ...
pages/giftpack/giftpacklist/giftpacklist.wxss
  View file @04e1ada
... ... @@ -245,5 +245,5 @@ page.data-v-3a5b7e36 {
245 245 background-color: rgb(153,153,153);
246 246 }
247 247  
248   -.foot_button_left.data-v-3a5b7e36.gray{ background-color: #aaa; }
249   -.foot_button_right.data-v-3a5b7e36.gray{ background-color: #aaa;}
  248 +.foot_button_intalge.data-v-3a5b7e36.gray{ background-color: #aaa; }
  249 +
... ...