xiaoe_mp_npm 0.5.42-test7 → 0.5.42-test8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/miniprogram_dist/GoodsItem/index.js +2 -2
- package/miniprogram_dist/GoodsItem/index.scss +26 -6
- package/miniprogram_dist/GoodsItem/index.wxml +7 -10
- package/miniprogram_dist/GoodsItem/index.wxss +104 -24
- package/miniprogram_dist/LiveGoodsList/index.wxml +28 -33
- package/miniprogram_dist/TeacherGoodsList/index.js +6 -0
- package/miniprogram_dist/TeacherGoodsList/index.scss +5 -2
- package/miniprogram_dist/TeacherGoodsList/index.wxml +19 -23
- package/miniprogram_dist/TeacherGoodsList/index.wxss +16 -8
- package/package.json +1 -1
- package/src/GoodsItem/index.js +2 -2
- package/src/GoodsItem/index.scss +26 -6
- package/src/GoodsItem/index.wxml +7 -10
- package/src/GoodsItem/index.wxss +107 -24
- package/src/LiveGoodsList/index.wxml +28 -33
- package/src/LiveGoodsList/index.wxss +230 -230
- package/src/TeacherGoodsList/index.js +6 -0
- package/src/TeacherGoodsList/index.scss +5 -2
- package/src/TeacherGoodsList/index.wxml +19 -23
- package/src/TeacherGoodsList/index.wxss +17 -8
|
@@ -238,7 +238,7 @@ Component({
|
|
|
238
238
|
return "购买"
|
|
239
239
|
} else if (data.goodsItem.hasStock && data.goodsItem.leftStock === 0) {
|
|
240
240
|
// 库存为0,已售罄
|
|
241
|
-
return "
|
|
241
|
+
return "已抢光"
|
|
242
242
|
} else if (data.goodsItem.err_code) {
|
|
243
243
|
// 券后价接口报错,领取不了优惠券的情况
|
|
244
244
|
return "查看详情"
|
|
@@ -247,7 +247,7 @@ Component({
|
|
|
247
247
|
return "免费领取"
|
|
248
248
|
} else if (data.showPreferentialPrice) {
|
|
249
249
|
// 展示券后价
|
|
250
|
-
return "
|
|
250
|
+
return "购买"
|
|
251
251
|
} else {
|
|
252
252
|
return "购买"
|
|
253
253
|
}
|
|
@@ -11,7 +11,8 @@ $deviceWidth: 750;
|
|
|
11
11
|
background: #ffffff;
|
|
12
12
|
border-radius: vmin(16);
|
|
13
13
|
flex-direction: column;
|
|
14
|
-
margin-
|
|
14
|
+
margin-bottom: vmin(32);
|
|
15
|
+
padding: 0 vmin(32);
|
|
15
16
|
.main-card{
|
|
16
17
|
display: flex;
|
|
17
18
|
flex-direction: row;
|
|
@@ -262,7 +263,7 @@ $deviceWidth: 750;
|
|
|
262
263
|
}
|
|
263
264
|
.no-stock-btn{
|
|
264
265
|
font-size: vmin(24);
|
|
265
|
-
border-radius: vmin(
|
|
266
|
+
border-radius: vmin(8);
|
|
266
267
|
width: vmin(128);
|
|
267
268
|
height: vmin(48);
|
|
268
269
|
display: flex;
|
|
@@ -276,7 +277,7 @@ $deviceWidth: 750;
|
|
|
276
277
|
}
|
|
277
278
|
.see-btn {
|
|
278
279
|
font-size: vmin(24);
|
|
279
|
-
border-radius: vmin(
|
|
280
|
+
border-radius: vmin(8);
|
|
280
281
|
width: vmin(128);
|
|
281
282
|
height: vmin(48);
|
|
282
283
|
display: flex;
|
|
@@ -287,11 +288,11 @@ $deviceWidth: 750;
|
|
|
287
288
|
font-weight: 500;
|
|
288
289
|
margin-left: inherit;
|
|
289
290
|
margin-right: inherit;
|
|
290
|
-
background: linear-gradient(270deg,
|
|
291
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
291
292
|
}
|
|
292
293
|
.buy-btn-preferential{
|
|
293
294
|
font-size: vmin(24);
|
|
294
|
-
border-radius: vmin(
|
|
295
|
+
border-radius: vmin(8);
|
|
295
296
|
padding: 0 vmin(10);
|
|
296
297
|
min-width: vmin(160);
|
|
297
298
|
height: vmin(68);
|
|
@@ -301,7 +302,7 @@ $deviceWidth: 750;
|
|
|
301
302
|
color: white;
|
|
302
303
|
flex-flow: column;
|
|
303
304
|
line-height: vmin(32);
|
|
304
|
-
background: linear-gradient(270deg,
|
|
305
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
305
306
|
.go-buy{
|
|
306
307
|
font-size: vmin(24);
|
|
307
308
|
font-weight: 500;
|
|
@@ -317,6 +318,9 @@ $deviceWidth: 750;
|
|
|
317
318
|
}
|
|
318
319
|
}
|
|
319
320
|
}
|
|
321
|
+
.manage-right{
|
|
322
|
+
width: vmin(374);
|
|
323
|
+
}
|
|
320
324
|
.teacher-switch{
|
|
321
325
|
height: vmin(32);
|
|
322
326
|
background: #fff;
|
|
@@ -332,6 +336,22 @@ $deviceWidth: 750;
|
|
|
332
336
|
}
|
|
333
337
|
}
|
|
334
338
|
}
|
|
339
|
+
.hide-tip {
|
|
340
|
+
width: vmin(240);
|
|
341
|
+
height: vmin(48);
|
|
342
|
+
border-radius: vmin(24);
|
|
343
|
+
background: #f5f5f5;
|
|
344
|
+
font-size: vmin(20);
|
|
345
|
+
color: #666666;
|
|
346
|
+
font-weight: 500;
|
|
347
|
+
display: flex;
|
|
348
|
+
justify-content: center;
|
|
349
|
+
align-items: center;
|
|
350
|
+
margin-top: vmin(8);
|
|
351
|
+
}
|
|
352
|
+
.full-hide-tip{
|
|
353
|
+
width: 100%;
|
|
354
|
+
}
|
|
335
355
|
}
|
|
336
356
|
|
|
337
357
|
@keyframes turn {
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
src="../../common/assets/images/liveGoodsList/explaining.png"
|
|
26
26
|
/>
|
|
27
27
|
</view>
|
|
28
|
-
<view class="right">
|
|
28
|
+
<view class="right {{isManage?'manage-right':''}}">
|
|
29
29
|
<!-- 标题 -->
|
|
30
30
|
<view class="line-one">
|
|
31
31
|
<view class="super-activity-type" wx:if="{{isSupperVip}}">
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
<!-- <view></view> -->
|
|
51
51
|
|
|
52
52
|
<!-- 券后价 -->
|
|
53
|
-
<view wx:if="{{
|
|
53
|
+
<view wx:if="{{showPreferentialPrice}}" class="preferential-price">{{ '券后¥' + goodsItem.preferentialShowInt }}</view>
|
|
54
54
|
</view>
|
|
55
55
|
|
|
56
56
|
<!-- 商品销量 -->
|
|
@@ -94,13 +94,12 @@
|
|
|
94
94
|
<text class="price-flow">¥</text>
|
|
95
95
|
<text class="price-show">{{ goodsItem.priceShowInt }}</text>
|
|
96
96
|
<text class="price-show" wx:if="{{ goodsItem.priceShowFlow !== '00'}}">.{{ goodsItem.priceShowFlow }}</text>
|
|
97
|
-
<text class="price-line" wx:if="{{ showPriceLine }}">
|
|
97
|
+
<text class="price-line" wx:if="{{ showPriceLine && !isManage }}">
|
|
98
98
|
<text>¥{{ goodsItem.priceLineShowInt }}</text>
|
|
99
99
|
<text wx:if="{{ goodsItem.priceLineShowFlow !== '00'}}">.{{ goodsItem.priceLineShowFlow }}</text>
|
|
100
100
|
</text>
|
|
101
101
|
</view>
|
|
102
102
|
</view>
|
|
103
|
-
|
|
104
103
|
<!-- 购买按钮 start -->
|
|
105
104
|
<block wx:if="{{isStudent}}">
|
|
106
105
|
<!-- IOS虚拟商品 -->
|
|
@@ -111,11 +110,11 @@
|
|
|
111
110
|
show-message-card="{{true}}"
|
|
112
111
|
send-message-img="{{goodsItem.img_url}}"
|
|
113
112
|
send-message-title="{{goodsItem.title}}"
|
|
114
|
-
wx:if="{{btnTxt === '
|
|
113
|
+
wx:if="{{btnTxt === '去查看'}}"
|
|
115
114
|
send-message-path="{{params_url}}"
|
|
116
115
|
>{{ btnTxt }}</button>
|
|
117
116
|
<!-- 库存为0的情况 -->
|
|
118
|
-
<view class="no-stock-btn" wx:if="{{ btnTxt === '
|
|
117
|
+
<view class="no-stock-btn" wx:if="{{ btnTxt === '已抢光' }}" catchtap="()=>{}">{{ btnTxt }}</view>
|
|
119
118
|
<!-- 正常情况 -->
|
|
120
119
|
<view class="buy-btn" catchtap="snapUpCheck" wx:if="{{ btnTxt === '购买' }}">{{ btnTxt }}</view>
|
|
121
120
|
<!-- 0元商品/超级会员免费/券后价、领券接口熔断的情况 -->
|
|
@@ -156,8 +155,6 @@
|
|
|
156
155
|
</view>
|
|
157
156
|
</view>
|
|
158
157
|
</view>
|
|
159
|
-
<!--
|
|
160
|
-
|
|
161
|
-
<text class="switch-txt">学员端展示商品</text>
|
|
162
|
-
</view>-->
|
|
158
|
+
<!-- </view>wx:if="{{!goodsItem.is_display_package && !isStudent}}" -->
|
|
159
|
+
<view class="hide-tip {{isFullScreen?'full-hide-tip':''}}">用户端已隐藏该商品</view>
|
|
163
160
|
</view>
|
|
@@ -41,7 +41,8 @@
|
|
|
41
41
|
background: #ffffff;
|
|
42
42
|
border-radius: 2.13333vmin;
|
|
43
43
|
flex-direction: column;
|
|
44
|
-
margin-
|
|
44
|
+
margin-bottom: 4.26667vmin;
|
|
45
|
+
padding: 0 4.26667vmin;
|
|
45
46
|
}
|
|
46
47
|
.goods-item .main-card {
|
|
47
48
|
display: flex;
|
|
@@ -285,7 +286,7 @@
|
|
|
285
286
|
}
|
|
286
287
|
.goods-item .main-card .right .line-three .no-stock-btn {
|
|
287
288
|
font-size: 3.2vmin;
|
|
288
|
-
border-radius:
|
|
289
|
+
border-radius: 1.06667vmin;
|
|
289
290
|
width: 17.06667vmin;
|
|
290
291
|
height: 6.4vmin;
|
|
291
292
|
display: flex;
|
|
@@ -299,7 +300,7 @@
|
|
|
299
300
|
}
|
|
300
301
|
.goods-item .main-card .right .line-three .see-btn {
|
|
301
302
|
font-size: 3.2vmin;
|
|
302
|
-
border-radius:
|
|
303
|
+
border-radius: 1.06667vmin;
|
|
303
304
|
width: 17.06667vmin;
|
|
304
305
|
height: 6.4vmin;
|
|
305
306
|
display: flex;
|
|
@@ -310,11 +311,11 @@
|
|
|
310
311
|
font-weight: 500;
|
|
311
312
|
margin-left: inherit;
|
|
312
313
|
margin-right: inherit;
|
|
313
|
-
background: linear-gradient(270deg, #
|
|
314
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
314
315
|
}
|
|
315
316
|
.goods-item .main-card .right .line-three .buy-btn-preferential {
|
|
316
317
|
font-size: 3.2vmin;
|
|
317
|
-
border-radius:
|
|
318
|
+
border-radius: 1.06667vmin;
|
|
318
319
|
padding: 0 1.33333vmin;
|
|
319
320
|
min-width: 21.33333vmin;
|
|
320
321
|
height: 9.06667vmin;
|
|
@@ -324,7 +325,7 @@
|
|
|
324
325
|
color: white;
|
|
325
326
|
flex-flow: column;
|
|
326
327
|
line-height: 4.26667vmin;
|
|
327
|
-
background: linear-gradient(270deg, #
|
|
328
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
328
329
|
}
|
|
329
330
|
.goods-item .main-card .right .line-three .buy-btn-preferential .go-buy {
|
|
330
331
|
font-size: 3.2vmin;
|
|
@@ -338,6 +339,9 @@
|
|
|
338
339
|
font-size: 3.73333vmin;
|
|
339
340
|
color: white;
|
|
340
341
|
}
|
|
342
|
+
.goods-item .main-card .manage-right {
|
|
343
|
+
width: 49.86667vmin;
|
|
344
|
+
}
|
|
341
345
|
.goods-item .main-card .teacher-switch {
|
|
342
346
|
height: 4.26667vmin;
|
|
343
347
|
background: #fff;
|
|
@@ -352,6 +356,22 @@
|
|
|
352
356
|
font-family: "PingFang SC";
|
|
353
357
|
margin-left: 2.13333vmin;
|
|
354
358
|
}
|
|
359
|
+
.goods-item .hide-tip {
|
|
360
|
+
width: 32vmin;
|
|
361
|
+
height: 6.4vmin;
|
|
362
|
+
border-radius: 3.2vmin;
|
|
363
|
+
background: #f5f5f5;
|
|
364
|
+
font-size: 2.66667vmin;
|
|
365
|
+
color: #666666;
|
|
366
|
+
font-weight: 500;
|
|
367
|
+
display: flex;
|
|
368
|
+
justify-content: center;
|
|
369
|
+
align-items: center;
|
|
370
|
+
margin-top: 1.06667vmin;
|
|
371
|
+
}
|
|
372
|
+
.goods-item .full-hide-tip {
|
|
373
|
+
width: 100%;
|
|
374
|
+
}
|
|
355
375
|
@media screen and (min-width: 768px) and (orientation: portrait) {
|
|
356
376
|
.goods-item {
|
|
357
377
|
display: flex;
|
|
@@ -359,7 +379,8 @@
|
|
|
359
379
|
background: #ffffff;
|
|
360
380
|
border-radius: 1.04167vmin;
|
|
361
381
|
flex-direction: column;
|
|
362
|
-
margin-
|
|
382
|
+
margin-bottom: 2.08333vmin;
|
|
383
|
+
padding: 0 2.08333vmin;
|
|
363
384
|
}
|
|
364
385
|
.goods-item .main-card {
|
|
365
386
|
display: flex;
|
|
@@ -603,7 +624,7 @@
|
|
|
603
624
|
}
|
|
604
625
|
.goods-item .main-card .right .line-three .no-stock-btn {
|
|
605
626
|
font-size: 1.5625vmin;
|
|
606
|
-
border-radius:
|
|
627
|
+
border-radius: 0.52083vmin;
|
|
607
628
|
width: 8.33333vmin;
|
|
608
629
|
height: 3.125vmin;
|
|
609
630
|
display: flex;
|
|
@@ -617,7 +638,7 @@
|
|
|
617
638
|
}
|
|
618
639
|
.goods-item .main-card .right .line-three .see-btn {
|
|
619
640
|
font-size: 1.5625vmin;
|
|
620
|
-
border-radius:
|
|
641
|
+
border-radius: 0.52083vmin;
|
|
621
642
|
width: 8.33333vmin;
|
|
622
643
|
height: 3.125vmin;
|
|
623
644
|
display: flex;
|
|
@@ -628,11 +649,11 @@
|
|
|
628
649
|
font-weight: 500;
|
|
629
650
|
margin-left: inherit;
|
|
630
651
|
margin-right: inherit;
|
|
631
|
-
background: linear-gradient(270deg, #
|
|
652
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
632
653
|
}
|
|
633
654
|
.goods-item .main-card .right .line-three .buy-btn-preferential {
|
|
634
655
|
font-size: 1.5625vmin;
|
|
635
|
-
border-radius:
|
|
656
|
+
border-radius: 0.52083vmin;
|
|
636
657
|
padding: 0 0.65104vmin;
|
|
637
658
|
min-width: 10.41667vmin;
|
|
638
659
|
height: 4.42708vmin;
|
|
@@ -642,7 +663,7 @@
|
|
|
642
663
|
color: white;
|
|
643
664
|
flex-flow: column;
|
|
644
665
|
line-height: 2.08333vmin;
|
|
645
|
-
background: linear-gradient(270deg, #
|
|
666
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
646
667
|
}
|
|
647
668
|
.goods-item .main-card .right .line-three .buy-btn-preferential .go-buy {
|
|
648
669
|
font-size: 1.5625vmin;
|
|
@@ -656,6 +677,9 @@
|
|
|
656
677
|
font-size: 1.82292vmin;
|
|
657
678
|
color: white;
|
|
658
679
|
}
|
|
680
|
+
.goods-item .main-card .manage-right {
|
|
681
|
+
width: 24.34896vmin;
|
|
682
|
+
}
|
|
659
683
|
.goods-item .main-card .teacher-switch {
|
|
660
684
|
height: 2.08333vmin;
|
|
661
685
|
background: #fff;
|
|
@@ -670,6 +694,22 @@
|
|
|
670
694
|
font-family: "PingFang SC";
|
|
671
695
|
margin-left: 1.04167vmin;
|
|
672
696
|
}
|
|
697
|
+
.goods-item .hide-tip {
|
|
698
|
+
width: 15.625vmin;
|
|
699
|
+
height: 3.125vmin;
|
|
700
|
+
border-radius: 1.5625vmin;
|
|
701
|
+
background: #f5f5f5;
|
|
702
|
+
font-size: 1.30208vmin;
|
|
703
|
+
color: #666666;
|
|
704
|
+
font-weight: 500;
|
|
705
|
+
display: flex;
|
|
706
|
+
justify-content: center;
|
|
707
|
+
align-items: center;
|
|
708
|
+
margin-top: 0.52083vmin;
|
|
709
|
+
}
|
|
710
|
+
.goods-item .full-hide-tip {
|
|
711
|
+
width: 100%;
|
|
712
|
+
}
|
|
673
713
|
}
|
|
674
714
|
@media screen and (min-height: 630px) and (orientation: landscape) {
|
|
675
715
|
.goods-item {
|
|
@@ -678,7 +718,8 @@
|
|
|
678
718
|
background: #ffffff;
|
|
679
719
|
border-radius: 1.26984vmin;
|
|
680
720
|
flex-direction: column;
|
|
681
|
-
margin-
|
|
721
|
+
margin-bottom: 2.53968vmin;
|
|
722
|
+
padding: 0 2.53968vmin;
|
|
682
723
|
}
|
|
683
724
|
.goods-item .main-card {
|
|
684
725
|
display: flex;
|
|
@@ -922,7 +963,7 @@
|
|
|
922
963
|
}
|
|
923
964
|
.goods-item .main-card .right .line-three .no-stock-btn {
|
|
924
965
|
font-size: 1.90476vmin;
|
|
925
|
-
border-radius:
|
|
966
|
+
border-radius: 0.63492vmin;
|
|
926
967
|
width: 10.15873vmin;
|
|
927
968
|
height: 3.80952vmin;
|
|
928
969
|
display: flex;
|
|
@@ -936,7 +977,7 @@
|
|
|
936
977
|
}
|
|
937
978
|
.goods-item .main-card .right .line-three .see-btn {
|
|
938
979
|
font-size: 1.90476vmin;
|
|
939
|
-
border-radius:
|
|
980
|
+
border-radius: 0.63492vmin;
|
|
940
981
|
width: 10.15873vmin;
|
|
941
982
|
height: 3.80952vmin;
|
|
942
983
|
display: flex;
|
|
@@ -947,11 +988,11 @@
|
|
|
947
988
|
font-weight: 500;
|
|
948
989
|
margin-left: inherit;
|
|
949
990
|
margin-right: inherit;
|
|
950
|
-
background: linear-gradient(270deg, #
|
|
991
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
951
992
|
}
|
|
952
993
|
.goods-item .main-card .right .line-three .buy-btn-preferential {
|
|
953
994
|
font-size: 1.90476vmin;
|
|
954
|
-
border-radius:
|
|
995
|
+
border-radius: 0.63492vmin;
|
|
955
996
|
padding: 0 0.79365vmin;
|
|
956
997
|
min-width: 12.69841vmin;
|
|
957
998
|
height: 5.39683vmin;
|
|
@@ -961,7 +1002,7 @@
|
|
|
961
1002
|
color: white;
|
|
962
1003
|
flex-flow: column;
|
|
963
1004
|
line-height: 2.53968vmin;
|
|
964
|
-
background: linear-gradient(270deg, #
|
|
1005
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
965
1006
|
}
|
|
966
1007
|
.goods-item .main-card .right .line-three .buy-btn-preferential .go-buy {
|
|
967
1008
|
font-size: 1.90476vmin;
|
|
@@ -975,6 +1016,9 @@
|
|
|
975
1016
|
font-size: 2.22222vmin;
|
|
976
1017
|
color: white;
|
|
977
1018
|
}
|
|
1019
|
+
.goods-item .main-card .manage-right {
|
|
1020
|
+
width: 29.68254vmin;
|
|
1021
|
+
}
|
|
978
1022
|
.goods-item .main-card .teacher-switch {
|
|
979
1023
|
height: 2.53968vmin;
|
|
980
1024
|
background: #fff;
|
|
@@ -989,6 +1033,22 @@
|
|
|
989
1033
|
font-family: "PingFang SC";
|
|
990
1034
|
margin-left: 1.26984vmin;
|
|
991
1035
|
}
|
|
1036
|
+
.goods-item .hide-tip {
|
|
1037
|
+
width: 19.04762vmin;
|
|
1038
|
+
height: 3.80952vmin;
|
|
1039
|
+
border-radius: 1.90476vmin;
|
|
1040
|
+
background: #f5f5f5;
|
|
1041
|
+
font-size: 1.5873vmin;
|
|
1042
|
+
color: #666666;
|
|
1043
|
+
font-weight: 500;
|
|
1044
|
+
display: flex;
|
|
1045
|
+
justify-content: center;
|
|
1046
|
+
align-items: center;
|
|
1047
|
+
margin-top: 0.63492vmin;
|
|
1048
|
+
}
|
|
1049
|
+
.goods-item .full-hide-tip {
|
|
1050
|
+
width: 100%;
|
|
1051
|
+
}
|
|
992
1052
|
}
|
|
993
1053
|
@media screen and (min-height: 768px) and (orientation: landscape) {
|
|
994
1054
|
.goods-item {
|
|
@@ -997,7 +1057,8 @@
|
|
|
997
1057
|
background: #ffffff;
|
|
998
1058
|
border-radius: 1.04167vmin;
|
|
999
1059
|
flex-direction: column;
|
|
1000
|
-
margin-
|
|
1060
|
+
margin-bottom: 2.08333vmin;
|
|
1061
|
+
padding: 0 2.08333vmin;
|
|
1001
1062
|
}
|
|
1002
1063
|
.goods-item .main-card {
|
|
1003
1064
|
display: flex;
|
|
@@ -1241,7 +1302,7 @@
|
|
|
1241
1302
|
}
|
|
1242
1303
|
.goods-item .main-card .right .line-three .no-stock-btn {
|
|
1243
1304
|
font-size: 1.5625vmin;
|
|
1244
|
-
border-radius:
|
|
1305
|
+
border-radius: 0.52083vmin;
|
|
1245
1306
|
width: 8.33333vmin;
|
|
1246
1307
|
height: 3.125vmin;
|
|
1247
1308
|
display: flex;
|
|
@@ -1255,7 +1316,7 @@
|
|
|
1255
1316
|
}
|
|
1256
1317
|
.goods-item .main-card .right .line-three .see-btn {
|
|
1257
1318
|
font-size: 1.5625vmin;
|
|
1258
|
-
border-radius:
|
|
1319
|
+
border-radius: 0.52083vmin;
|
|
1259
1320
|
width: 8.33333vmin;
|
|
1260
1321
|
height: 3.125vmin;
|
|
1261
1322
|
display: flex;
|
|
@@ -1266,11 +1327,11 @@
|
|
|
1266
1327
|
font-weight: 500;
|
|
1267
1328
|
margin-left: inherit;
|
|
1268
1329
|
margin-right: inherit;
|
|
1269
|
-
background: linear-gradient(270deg, #
|
|
1330
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
1270
1331
|
}
|
|
1271
1332
|
.goods-item .main-card .right .line-three .buy-btn-preferential {
|
|
1272
1333
|
font-size: 1.5625vmin;
|
|
1273
|
-
border-radius:
|
|
1334
|
+
border-radius: 0.52083vmin;
|
|
1274
1335
|
padding: 0 0.65104vmin;
|
|
1275
1336
|
min-width: 10.41667vmin;
|
|
1276
1337
|
height: 4.42708vmin;
|
|
@@ -1280,7 +1341,7 @@
|
|
|
1280
1341
|
color: white;
|
|
1281
1342
|
flex-flow: column;
|
|
1282
1343
|
line-height: 2.08333vmin;
|
|
1283
|
-
background: linear-gradient(270deg, #
|
|
1344
|
+
background: linear-gradient(270deg, #ff2e57 0%, #ff4d82 100%);
|
|
1284
1345
|
}
|
|
1285
1346
|
.goods-item .main-card .right .line-three .buy-btn-preferential .go-buy {
|
|
1286
1347
|
font-size: 1.5625vmin;
|
|
@@ -1294,6 +1355,9 @@
|
|
|
1294
1355
|
font-size: 1.82292vmin;
|
|
1295
1356
|
color: white;
|
|
1296
1357
|
}
|
|
1358
|
+
.goods-item .main-card .manage-right {
|
|
1359
|
+
width: 24.34896vmin;
|
|
1360
|
+
}
|
|
1297
1361
|
.goods-item .main-card .teacher-switch {
|
|
1298
1362
|
height: 2.08333vmin;
|
|
1299
1363
|
background: #fff;
|
|
@@ -1308,4 +1372,20 @@
|
|
|
1308
1372
|
font-family: "PingFang SC";
|
|
1309
1373
|
margin-left: 1.04167vmin;
|
|
1310
1374
|
}
|
|
1375
|
+
.goods-item .hide-tip {
|
|
1376
|
+
width: 15.625vmin;
|
|
1377
|
+
height: 3.125vmin;
|
|
1378
|
+
border-radius: 1.5625vmin;
|
|
1379
|
+
background: #f5f5f5;
|
|
1380
|
+
font-size: 1.30208vmin;
|
|
1381
|
+
color: #666666;
|
|
1382
|
+
font-weight: 500;
|
|
1383
|
+
display: flex;
|
|
1384
|
+
justify-content: center;
|
|
1385
|
+
align-items: center;
|
|
1386
|
+
margin-top: 0.52083vmin;
|
|
1387
|
+
}
|
|
1388
|
+
.goods-item .full-hide-tip {
|
|
1389
|
+
width: 100%;
|
|
1390
|
+
}
|
|
1311
1391
|
}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* @LastEditors: conlinchen
|
|
8
8
|
* @LastEditTime: 2021-11-18 19:51:34
|
|
9
9
|
*/
|
|
10
|
-
|
|
10
|
+
-->
|
|
11
11
|
<view class="goods-list-box">
|
|
12
12
|
<custom-popup
|
|
13
13
|
class="goods-list-box-popup"
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
<view slot="content" class="page-main">
|
|
34
34
|
<!-- 商品列表 start-->
|
|
35
35
|
<scroll-view
|
|
36
|
-
class="goods-list"
|
|
36
|
+
class="goods-list {{isFullScreen?'full-list':''}}"
|
|
37
37
|
scroll-y="true"
|
|
38
38
|
bindscrolltolower="onScrolltolower"
|
|
39
39
|
refresher-triggered="{{refreshing}}"
|
|
@@ -47,13 +47,34 @@
|
|
|
47
47
|
bind:showPopup="showInfoCollection"
|
|
48
48
|
bind:receivedSuccess="receivedSuccess"
|
|
49
49
|
sensorReportParams="{{sensorReportParams}}"
|
|
50
|
-
bind:showReceivePopup="showReceivePopup"
|
|
51
50
|
></coupon-list>
|
|
52
51
|
<!-- 优惠券列表 end -->
|
|
53
52
|
<!-- 讲解中的商品 start -->
|
|
54
|
-
<
|
|
53
|
+
<view class="full-item">
|
|
54
|
+
<block wx:if="{{showExplainingGoods}}">
|
|
55
|
+
<goods-item
|
|
56
|
+
aliveInfo="{{aliveInfo}}"
|
|
57
|
+
allContactPay="{{allContactPay}}"
|
|
58
|
+
goodsInfo="{{formExplainingGoods}}"
|
|
59
|
+
coupon_switch="{{coupon_switch}}"
|
|
60
|
+
bind:sendNewMsg="sendNewMsg"
|
|
61
|
+
bind:showConfirmOrder="showConfirmOrder"
|
|
62
|
+
bind:showSku="showSku"
|
|
63
|
+
explainingGoods="{{explainingGoods}}"
|
|
64
|
+
bind:showDialog="showDialog"
|
|
65
|
+
class="goods-item"
|
|
66
|
+
envName="{{ENV_NAME}}"
|
|
67
|
+
sensorReportParams="{{sensorReportParams}}"
|
|
68
|
+
isFullScreen="{{ popPosition === 'right'}}"
|
|
69
|
+
isGrayMarketing="{{ isGrayMarketing}}"
|
|
70
|
+
></goods-item>
|
|
71
|
+
</block>
|
|
72
|
+
<!-- 讲解中的商品 end -->
|
|
55
73
|
<goods-item
|
|
56
|
-
|
|
74
|
+
wx:for="{{goodsInfo}}"
|
|
75
|
+
wx:for-item="goodsItem"
|
|
76
|
+
wx:key="index"
|
|
77
|
+
goodsInfo="{{goodsItem}}"
|
|
57
78
|
allContactPay="{{allContactPay}}"
|
|
58
79
|
goodsInfo="{{formExplainingGoods}}"
|
|
59
80
|
coupon_switch="{{coupon_switch}}"
|
|
@@ -68,28 +89,7 @@
|
|
|
68
89
|
isFullScreen="{{ popPosition === 'right'}}"
|
|
69
90
|
isGrayMarketing="{{ isGrayMarketing}}"
|
|
70
91
|
></goods-item>
|
|
71
|
-
</
|
|
72
|
-
<!-- 讲解中的商品 end -->
|
|
73
|
-
<goods-item
|
|
74
|
-
wx:for="{{goodsInfo}}"
|
|
75
|
-
wx:for-item="goodsItem"
|
|
76
|
-
wx:key="index"
|
|
77
|
-
goodsInfo="{{goodsItem}}"
|
|
78
|
-
allContactPay="{{allContactPay}}"
|
|
79
|
-
coupon_switch="{{coupon_switch}}"
|
|
80
|
-
bind:sendNewMsg="sendNewMsg"
|
|
81
|
-
bind:showConfirmOrder="showConfirmOrder"
|
|
82
|
-
bind:showSku="showSku"
|
|
83
|
-
aliveInfo="{{aliveInfo}}"
|
|
84
|
-
explainingGoods="{{explainingGoods}}"
|
|
85
|
-
bind:showDialog="showDialog"
|
|
86
|
-
bind:toDetails="toDetails"
|
|
87
|
-
class="goods-item"
|
|
88
|
-
envName="{{ENV_NAME}}"
|
|
89
|
-
sensorReportParams="{{sensorReportParams}}"
|
|
90
|
-
isFullScreen="{{ popPosition === 'right'}}"
|
|
91
|
-
isGrayMarketing="{{ isGrayMarketing}}"
|
|
92
|
-
></goods-item>
|
|
92
|
+
</view>
|
|
93
93
|
<view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
|
|
94
94
|
<view class="no-data" wx:if="{{!refreshing && finishedTxt === 'no-data'}}">
|
|
95
95
|
<image class="no-data-png" src="../common/assets/images/liveGoodsList/no-data.png" />
|
|
@@ -100,9 +100,4 @@
|
|
|
100
100
|
</view>
|
|
101
101
|
</custom-popup>
|
|
102
102
|
</view>
|
|
103
|
-
<van-dialog
|
|
104
|
-
id="van-dialog"
|
|
105
|
-
confirm-button-color="#105cfb"
|
|
106
|
-
catchtap="stopEvent"
|
|
107
|
-
/>
|
|
108
|
-
|
|
103
|
+
<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent" />
|
|
@@ -29,7 +29,6 @@ $deviceWidth: 750;
|
|
|
29
29
|
display: flex;
|
|
30
30
|
flex-direction: column;
|
|
31
31
|
height: 100%;
|
|
32
|
-
padding: 0 vmin(32);
|
|
33
32
|
.finished-text{
|
|
34
33
|
display: flex;
|
|
35
34
|
justify-content: center;
|
|
@@ -38,9 +37,13 @@ $deviceWidth: 750;
|
|
|
38
37
|
padding: 2.67vmin 0;
|
|
39
38
|
}
|
|
40
39
|
.check-box{
|
|
41
|
-
padding-left:
|
|
40
|
+
padding-left: 0 !important;
|
|
41
|
+
}
|
|
42
|
+
.full-item{
|
|
43
|
+
padding-left: vmin(32);
|
|
42
44
|
}
|
|
43
45
|
}
|
|
46
|
+
|
|
44
47
|
.no-data{
|
|
45
48
|
display: flex;
|
|
46
49
|
flex-direction: column;
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
-->
|
|
11
11
|
<!-- 商品列表 start-->
|
|
12
12
|
<scroll-view
|
|
13
|
-
class="goods-list"
|
|
13
|
+
class="goods-list {{isFullScreen?'full-list':''}}"
|
|
14
14
|
scroll-y="true"
|
|
15
15
|
bindscrolltolower="onScrolltolower"
|
|
16
16
|
refresher-triggered="{{refreshing}}"
|
|
@@ -20,31 +20,27 @@
|
|
|
20
20
|
>
|
|
21
21
|
<block wx:if="{{isManage}}">
|
|
22
22
|
<van-checkbox-group value="{{ selectList }}" bind:change="onChange">
|
|
23
|
-
<
|
|
24
|
-
name="{{goodsItem.id}}"
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
isFullScreen="{{isFullScreen}}"
|
|
41
|
-
isManage="{{true}}"
|
|
42
|
-
></goods-item>
|
|
43
|
-
</van-checkbox>
|
|
23
|
+
<view wx:for="{{goodsInfo}}" class="full-item" wx:for-item="goodsItem" wx:key="index">
|
|
24
|
+
<van-checkbox name="{{goodsItem.id}}" label-class="check-box">
|
|
25
|
+
<goods-item
|
|
26
|
+
goodsInfo="{{goodsItem}}"
|
|
27
|
+
aliveInfo="{{aliveInfo}}"
|
|
28
|
+
bind:sendGoodsCard="sendGoodsCard"
|
|
29
|
+
class="goods-item"
|
|
30
|
+
envName="{{ENV_NAME}}"
|
|
31
|
+
sensorReportParams="{{sensorReportParams}}"
|
|
32
|
+
current_role="teacher"
|
|
33
|
+
index="{{index}}"
|
|
34
|
+
sending="{{sending && index === sendingIndex}}"
|
|
35
|
+
isFullScreen="{{isFullScreen}}"
|
|
36
|
+
isManage="{{true}}"
|
|
37
|
+
></goods-item>
|
|
38
|
+
</van-checkbox>
|
|
39
|
+
</view>
|
|
44
40
|
</van-checkbox-group>
|
|
45
41
|
</block>
|
|
46
42
|
<block wx:else>
|
|
47
|
-
<view wx:for="{{goodsInfo}}" wx:for-item="goodsItem" wx:key="index">
|
|
43
|
+
<view wx:for="{{goodsInfo}}" wx:for-item="goodsItem" wx:key="index" class="full-item">
|
|
48
44
|
<goods-item
|
|
49
45
|
goodsInfo="{{goodsItem}}"
|
|
50
46
|
aliveInfo="{{aliveInfo}}"
|