xiaoe_mp_npm 0.5.37 → 0.5.38
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 +9 -4
- package/miniprogram_dist/GoodsItem/index.less +33 -2
- package/miniprogram_dist/GoodsItem/index.wxml +6 -7
- package/miniprogram_dist/GoodsItem/index.wxss +34 -7
- package/miniprogram_dist/LiveGoodsList/index.wxml +1 -3
- package/miniprogram_dist/TeacherGoodsList/index.wxml +2 -2
- package/package.json +2 -2
- package/src/GoodsItem/index.js +9 -4
- package/src/GoodsItem/index.less +33 -2
- package/src/GoodsItem/index.wxml +6 -7
- package/src/GoodsItem/index.wxss +306 -1
- package/src/LiveGoodsList/index.wxml +1 -3
- package/src/TeacherGoodsList/index.wxml +2 -2
|
@@ -74,10 +74,6 @@ Component({
|
|
|
74
74
|
}, () => this.countTime())
|
|
75
75
|
}
|
|
76
76
|
},
|
|
77
|
-
index: {
|
|
78
|
-
type: Number,
|
|
79
|
-
value: 0
|
|
80
|
-
},
|
|
81
77
|
sending: {
|
|
82
78
|
type: Boolean,
|
|
83
79
|
value: false
|
|
@@ -124,6 +120,10 @@ Component({
|
|
|
124
120
|
type: String,
|
|
125
121
|
value: ''
|
|
126
122
|
},
|
|
123
|
+
index:{
|
|
124
|
+
type: Number,
|
|
125
|
+
value: -1
|
|
126
|
+
},
|
|
127
127
|
// 是否是新带货接口灰度
|
|
128
128
|
isGrayMarketing: {
|
|
129
129
|
type: Boolean,
|
|
@@ -613,6 +613,10 @@ Component({
|
|
|
613
613
|
});
|
|
614
614
|
},
|
|
615
615
|
changeShowType(){
|
|
616
|
+
if(this.data.goodsItem.teacher_auth != 2){
|
|
617
|
+
this.showToast('暂无权限')
|
|
618
|
+
return
|
|
619
|
+
}
|
|
616
620
|
this.setData({
|
|
617
621
|
switchLoading: true
|
|
618
622
|
})
|
|
@@ -630,6 +634,7 @@ Component({
|
|
|
630
634
|
switchLoading: false,
|
|
631
635
|
checked: !this.data.checked
|
|
632
636
|
})
|
|
637
|
+
this.showToast('操作成功')
|
|
633
638
|
}else{
|
|
634
639
|
this.setData({
|
|
635
640
|
switchLoading: false
|
|
@@ -183,8 +183,8 @@
|
|
|
183
183
|
.buy-btn-teacher{
|
|
184
184
|
font-size: 3.2vmin;
|
|
185
185
|
border-radius: 5.33vmin;
|
|
186
|
-
width:
|
|
187
|
-
height:
|
|
186
|
+
width: 21.33vmin;
|
|
187
|
+
height: 7.47vmin;
|
|
188
188
|
display: flex;
|
|
189
189
|
justify-content: center;
|
|
190
190
|
align-items: center;
|
|
@@ -192,6 +192,12 @@
|
|
|
192
192
|
line-height: 7.47vmin;
|
|
193
193
|
font-weight: 500;
|
|
194
194
|
background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
|
|
195
|
+
.load{
|
|
196
|
+
width: 3.2vmin;
|
|
197
|
+
height: 3.2vmin;
|
|
198
|
+
animation: turn 1s linear infinite;
|
|
199
|
+
margin-right: 1.06vmin;
|
|
200
|
+
}
|
|
195
201
|
}
|
|
196
202
|
.no-stock-btn{
|
|
197
203
|
font-size: 3.2vmin;
|
|
@@ -266,3 +272,28 @@
|
|
|
266
272
|
margin-left: 2.13vmin;
|
|
267
273
|
}
|
|
268
274
|
}
|
|
275
|
+
@keyframes turn {
|
|
276
|
+
0% {
|
|
277
|
+
transform: rotate(0deg);
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
20% {
|
|
281
|
+
transform: rotate(72deg);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
40% {
|
|
285
|
+
transform: rotate(144deg);
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
60% {
|
|
289
|
+
transform: rotate(216deg);
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
80% {
|
|
293
|
+
transform: rotate(288deg);
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
100% {
|
|
297
|
+
transform: rotate(360deg);
|
|
298
|
+
}
|
|
299
|
+
}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
borderRadius="{{'2.13vmin'}}"
|
|
18
18
|
src="{{filterSrc}}"
|
|
19
19
|
/>
|
|
20
|
-
<text class="index {{isIOS && 'ios-index'}}" style="{{!isStudent ? 'border-radius: 1.07vmin 0 1.07vmin 0;' : ''}}">{{
|
|
20
|
+
<text class="index {{isIOS && 'ios-index'}}" style="{{!isStudent ? 'border-radius: 1.07vmin 0 1.07vmin 0;' : ''}}">{{goodsItem.order_weight}}</text>
|
|
21
21
|
<text class="goods-type {{isIOS && 'ios-goods-type'}}">{{goodsItem.resource_type_name}}</text>
|
|
22
22
|
<image wx:if="{{ isShowExamplaining }}" class="goods-explaining" src="../../common/assets/images/liveGoodsList/explaining.png" />
|
|
23
23
|
</view>
|
|
@@ -74,18 +74,17 @@
|
|
|
74
74
|
</view>
|
|
75
75
|
</block>
|
|
76
76
|
<block wx:else>
|
|
77
|
-
<view class="buy-btn-teacher" catchtap="sendGoodsCard" data-item="{{goodsItem}}" data-type="10" data-index="{{index}}">
|
|
77
|
+
<view class="buy-btn-teacher" catchtap="sendGoodsCard" data-item="{{goodsItem}}" data-type="10" data-index="{{index}}">
|
|
78
|
+
<image wx:if="{{sending}}" class="load" src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lik3ojn20167.png" />
|
|
79
|
+
讲解
|
|
80
|
+
</view>
|
|
78
81
|
</block>
|
|
79
82
|
<!-- 购买按钮 end -->
|
|
80
83
|
</view>
|
|
81
84
|
</view>
|
|
82
85
|
</view>
|
|
83
|
-
<view class="teacher-switch" wx:if="{{!isStudent
|
|
86
|
+
<view class="teacher-switch" wx:if="{{!isStudent}}" catchtap="stopEvent">
|
|
84
87
|
<van-switch checked="{{checked}}" bind:change="changeShowType" loading="{{switchLoading}}" size="3.73vmin"/>
|
|
85
88
|
<text class="switch-txt">学员端展示商品</text>
|
|
86
89
|
</view>
|
|
87
90
|
</view>
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* 主题色 */
|
|
1
2
|
.theme-customize-bg {
|
|
2
3
|
background: linear-gradient(180.25deg, #fe6500 0%, #ff4102 100%) !important;
|
|
3
4
|
}
|
|
@@ -94,7 +95,7 @@
|
|
|
94
95
|
.goods-item .main-card .right .line-one .activity-type {
|
|
95
96
|
background-color: #FFF3EB;
|
|
96
97
|
color: #FF781F;
|
|
97
|
-
padding:
|
|
98
|
+
padding: 0vmin 1.07vmin;
|
|
98
99
|
font-size: 2.67vmin;
|
|
99
100
|
height: 4.27vmin;
|
|
100
101
|
line-height: 4.8vmin;
|
|
@@ -107,7 +108,7 @@
|
|
|
107
108
|
font-weight: 500;
|
|
108
109
|
}
|
|
109
110
|
.goods-item .main-card .right .line-one .super-activity-type {
|
|
110
|
-
background: linear-gradient(180.25deg, #
|
|
111
|
+
background: linear-gradient(180.25deg, #333333 0%, #525252 68%, #333333 100%);
|
|
111
112
|
color: #ff781f;
|
|
112
113
|
padding: 0.53vmin 1.07vmin;
|
|
113
114
|
font-size: 2.67vmin;
|
|
@@ -198,8 +199,8 @@
|
|
|
198
199
|
.goods-item .main-card .right .line-three .buy-btn-teacher {
|
|
199
200
|
font-size: 3.2vmin;
|
|
200
201
|
border-radius: 5.33vmin;
|
|
201
|
-
width:
|
|
202
|
-
height:
|
|
202
|
+
width: 21.33vmin;
|
|
203
|
+
height: 7.47vmin;
|
|
203
204
|
display: flex;
|
|
204
205
|
justify-content: center;
|
|
205
206
|
align-items: center;
|
|
@@ -208,6 +209,12 @@
|
|
|
208
209
|
font-weight: 500;
|
|
209
210
|
background: linear-gradient(270deg, #fe6500 0%, #ff4102 100%);
|
|
210
211
|
}
|
|
212
|
+
.goods-item .main-card .right .line-three .buy-btn-teacher .load {
|
|
213
|
+
width: 3.2vmin;
|
|
214
|
+
height: 3.2vmin;
|
|
215
|
+
animation: turn 1s linear infinite;
|
|
216
|
+
margin-right: 1.06vmin;
|
|
217
|
+
}
|
|
211
218
|
.goods-item .main-card .right .line-three .no-stock-btn {
|
|
212
219
|
font-size: 3.2vmin;
|
|
213
220
|
border-radius: 5.33vmin;
|
|
@@ -256,12 +263,12 @@
|
|
|
256
263
|
font-weight: 500;
|
|
257
264
|
}
|
|
258
265
|
.goods-item .main-card .right .line-three .buy-btn-preferential .preferential-flow {
|
|
259
|
-
color: #
|
|
266
|
+
color: #ffffff;
|
|
260
267
|
font-size: 2.67vmin;
|
|
261
268
|
}
|
|
262
269
|
.goods-item .main-card .right .line-three .buy-btn-preferential .preferential-show {
|
|
263
270
|
font-size: 3.73vmin;
|
|
264
|
-
color: #
|
|
271
|
+
color: #ffffff;
|
|
265
272
|
}
|
|
266
273
|
.teacher-switch {
|
|
267
274
|
height: 4.27vmin;
|
|
@@ -271,9 +278,29 @@
|
|
|
271
278
|
}
|
|
272
279
|
.teacher-switch .switch-txt {
|
|
273
280
|
opacity: 1;
|
|
274
|
-
color: #
|
|
281
|
+
color: #333333;
|
|
275
282
|
font-size: 3.2vmin;
|
|
276
283
|
font-weight: 400;
|
|
277
284
|
font-family: "PingFang SC";
|
|
278
285
|
margin-left: 2.13vmin;
|
|
279
286
|
}
|
|
287
|
+
@keyframes turn {
|
|
288
|
+
0% {
|
|
289
|
+
transform: rotate(0deg);
|
|
290
|
+
}
|
|
291
|
+
20% {
|
|
292
|
+
transform: rotate(72deg);
|
|
293
|
+
}
|
|
294
|
+
40% {
|
|
295
|
+
transform: rotate(144deg);
|
|
296
|
+
}
|
|
297
|
+
60% {
|
|
298
|
+
transform: rotate(216deg);
|
|
299
|
+
}
|
|
300
|
+
80% {
|
|
301
|
+
transform: rotate(288deg);
|
|
302
|
+
}
|
|
303
|
+
100% {
|
|
304
|
+
transform: rotate(360deg);
|
|
305
|
+
}
|
|
306
|
+
}
|
|
@@ -36,7 +36,6 @@
|
|
|
36
36
|
aliveInfo="{{aliveInfo}}"
|
|
37
37
|
allContactPay="{{allContactPay}}"
|
|
38
38
|
goodsInfo="{{formExplainingGoods}}"
|
|
39
|
-
index="{{explainingGoodsIndex}}"
|
|
40
39
|
coupon_switch="{{coupon_switch}}"
|
|
41
40
|
bind:sendNewMsg="sendNewMsg"
|
|
42
41
|
bind:showConfirmOrder="showConfirmOrder"
|
|
@@ -57,7 +56,6 @@
|
|
|
57
56
|
wx:key="index"
|
|
58
57
|
goodsInfo="{{goodsItem}}"
|
|
59
58
|
allContactPay="{{allContactPay}}"
|
|
60
|
-
index="{{index}}"
|
|
61
59
|
coupon_switch="{{coupon_switch}}"
|
|
62
60
|
bind:sendNewMsg="sendNewMsg"
|
|
63
61
|
bind:showConfirmOrder="showConfirmOrder"
|
|
@@ -82,4 +80,4 @@
|
|
|
82
80
|
</view>
|
|
83
81
|
</custom-popup>
|
|
84
82
|
</view>
|
|
85
|
-
<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>
|
|
83
|
+
<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>
|
|
@@ -14,13 +14,13 @@
|
|
|
14
14
|
<view wx:for="{{goodsInfo}}" wx:for-item="goodsItem" wx:key="index" style="margin-top: 3.2vmin;">
|
|
15
15
|
<goods-item
|
|
16
16
|
goodsInfo="{{goodsItem}}"
|
|
17
|
-
index="{{index}}"
|
|
18
17
|
aliveInfo="{{aliveInfo}}"
|
|
19
18
|
bind:sendGoodsCard="sendGoodsCard"
|
|
20
19
|
class="goods-item"
|
|
21
20
|
envName="{{ENV_NAME}}"
|
|
22
21
|
sensorReportParams="{{sensorReportParams}}"
|
|
23
22
|
current_role="teacher"
|
|
23
|
+
index="{{index}}"
|
|
24
24
|
sending="{{sending && index === sendingIndex}}"
|
|
25
25
|
isFullScreen="{{isFullScreen}}"
|
|
26
26
|
></goods-item>
|
|
@@ -38,4 +38,4 @@
|
|
|
38
38
|
<view class="chat-text">请联系管理员，或前往电脑端管理台【直播间设置-互动设置-直播带货配置】添加商品</view>
|
|
39
39
|
</block>
|
|
40
40
|
</view>
|
|
41
|
-
<!-- 商品列表 end-->
|
|
41
|
+
<!-- 商品列表 end-->
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xiaoe_mp_npm",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.38",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "miniprogram_dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -75,4 +75,4 @@
|
|
|
75
75
|
"miniprogram-computed": "4.2.1",
|
|
76
76
|
"mp-plugins-info-collection": "1.1.2"
|
|
77
77
|
}
|
|
78
|
-
}
|
|
78
|
+
}
|
package/src/GoodsItem/index.js
CHANGED
|
@@ -74,10 +74,6 @@ Component({
|
|
|
74
74
|
}, () => this.countTime())
|
|
75
75
|
}
|
|
76
76
|
},
|
|
77
|
-
index: {
|
|
78
|
-
type: Number,
|
|
79
|
-
value: 0
|
|
80
|
-
},
|
|
81
77
|
sending: {
|
|
82
78
|
type: Boolean,
|
|
83
79
|
value: false
|
|
@@ -124,6 +120,10 @@ Component({
|
|
|
124
120
|
type: String,
|
|
125
121
|
value: ''
|
|
126
122
|
},
|
|
123
|
+
index:{
|
|
124
|
+
type: Number,
|
|
125
|
+
value: -1
|
|
126
|
+
},
|
|
127
127
|
// 是否是新带货接口灰度
|
|
128
128
|
isGrayMarketing: {
|
|
129
129
|
type: Boolean,
|
|
@@ -613,6 +613,10 @@ Component({
|
|
|
613
613
|
});
|
|
614
614
|
},
|
|
615
615
|
changeShowType(){
|
|
616
|
+
if(this.data.goodsItem.teacher_auth != 2){
|
|
617
|
+
this.showToast('暂无权限')
|
|
618
|
+
return
|
|
619
|
+
}
|
|
616
620
|
this.setData({
|
|
617
621
|
switchLoading: true
|
|
618
622
|
})
|
|
@@ -630,6 +634,7 @@ Component({
|
|
|
630
634
|
switchLoading: false,
|
|
631
635
|
checked: !this.data.checked
|
|
632
636
|
})
|
|
637
|
+
this.showToast('操作成功')
|
|
633
638
|
}else{
|
|
634
639
|
this.setData({
|
|
635
640
|
switchLoading: false
|
package/src/GoodsItem/index.less
CHANGED
|
@@ -183,8 +183,8 @@
|
|
|
183
183
|
.buy-btn-teacher{
|
|
184
184
|
font-size: 3.2vmin;
|
|
185
185
|
border-radius: 5.33vmin;
|
|
186
|
-
width:
|
|
187
|
-
height:
|
|
186
|
+
width: 21.33vmin;
|
|
187
|
+
height: 7.47vmin;
|
|
188
188
|
display: flex;
|
|
189
189
|
justify-content: center;
|
|
190
190
|
align-items: center;
|
|
@@ -192,6 +192,12 @@
|
|
|
192
192
|
line-height: 7.47vmin;
|
|
193
193
|
font-weight: 500;
|
|
194
194
|
background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
|
|
195
|
+
.load{
|
|
196
|
+
width: 3.2vmin;
|
|
197
|
+
height: 3.2vmin;
|
|
198
|
+
animation: turn 1s linear infinite;
|
|
199
|
+
margin-right: 1.06vmin;
|
|
200
|
+
}
|
|
195
201
|
}
|
|
196
202
|
.no-stock-btn{
|
|
197
203
|
font-size: 3.2vmin;
|
|
@@ -266,3 +272,28 @@
|
|
|
266
272
|
margin-left: 2.13vmin;
|
|
267
273
|
}
|
|
268
274
|
}
|
|
275
|
+
@keyframes turn {
|
|
276
|
+
0% {
|
|
277
|
+
transform: rotate(0deg);
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
20% {
|
|
281
|
+
transform: rotate(72deg);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
40% {
|
|
285
|
+
transform: rotate(144deg);
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
60% {
|
|
289
|
+
transform: rotate(216deg);
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
80% {
|
|
293
|
+
transform: rotate(288deg);
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
100% {
|
|
297
|
+
transform: rotate(360deg);
|
|
298
|
+
}
|
|
299
|
+
}
|
package/src/GoodsItem/index.wxml
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
borderRadius="{{'2.13vmin'}}"
|
|
18
18
|
src="{{filterSrc}}"
|
|
19
19
|
/>
|
|
20
|
-
<text class="index {{isIOS && 'ios-index'}}" style="{{!isStudent ? 'border-radius: 1.07vmin 0 1.07vmin 0;' : ''}}">{{
|
|
20
|
+
<text class="index {{isIOS && 'ios-index'}}" style="{{!isStudent ? 'border-radius: 1.07vmin 0 1.07vmin 0;' : ''}}">{{goodsItem.order_weight}}</text>
|
|
21
21
|
<text class="goods-type {{isIOS && 'ios-goods-type'}}">{{goodsItem.resource_type_name}}</text>
|
|
22
22
|
<image wx:if="{{ isShowExamplaining }}" class="goods-explaining" src="../../common/assets/images/liveGoodsList/explaining.png" />
|
|
23
23
|
</view>
|
|
@@ -74,18 +74,17 @@
|
|
|
74
74
|
</view>
|
|
75
75
|
</block>
|
|
76
76
|
<block wx:else>
|
|
77
|
-
<view class="buy-btn-teacher" catchtap="sendGoodsCard" data-item="{{goodsItem}}" data-type="10" data-index="{{index}}">
|
|
77
|
+
<view class="buy-btn-teacher" catchtap="sendGoodsCard" data-item="{{goodsItem}}" data-type="10" data-index="{{index}}">
|
|
78
|
+
<image wx:if="{{sending}}" class="load" src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lik3ojn20167.png" />
|
|
79
|
+
讲解
|
|
80
|
+
</view>
|
|
78
81
|
</block>
|
|
79
82
|
<!-- 购买按钮 end -->
|
|
80
83
|
</view>
|
|
81
84
|
</view>
|
|
82
85
|
</view>
|
|
83
|
-
<view class="teacher-switch" wx:if="{{!isStudent
|
|
86
|
+
<view class="teacher-switch" wx:if="{{!isStudent}}" catchtap="stopEvent">
|
|
84
87
|
<van-switch checked="{{checked}}" bind:change="changeShowType" loading="{{switchLoading}}" size="3.73vmin"/>
|
|
85
88
|
<text class="switch-txt">学员端展示商品</text>
|
|
86
89
|
</view>
|
|
87
90
|
</view>
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
package/src/GoodsItem/index.wxss
CHANGED
|
@@ -1 +1,306 @@
|
|
|
1
|
-
|
|
1
|
+
/* 主题色 */
|
|
2
|
+
.theme-customize-bg {
|
|
3
|
+
background: linear-gradient(180.25deg, #fe6500 0%, #ff4102 100%) !important;
|
|
4
|
+
}
|
|
5
|
+
.theme-customize-font {
|
|
6
|
+
color: #1472FF !important;
|
|
7
|
+
}
|
|
8
|
+
.theme-customize-light-new {
|
|
9
|
+
background-color: #9db8f1 !important;
|
|
10
|
+
}
|
|
11
|
+
.theme-customize-bg-light {
|
|
12
|
+
background-color: #fff3eb !important;
|
|
13
|
+
}
|
|
14
|
+
.theme-customize-border {
|
|
15
|
+
border-color: #FF781F !important;
|
|
16
|
+
}
|
|
17
|
+
.goods-explaining {
|
|
18
|
+
position: absolute;
|
|
19
|
+
width: 32vmin;
|
|
20
|
+
height: 4.8vmin;
|
|
21
|
+
bottom: 0vmin;
|
|
22
|
+
left: 0vmin;
|
|
23
|
+
}
|
|
24
|
+
.goods-item {
|
|
25
|
+
display: flex;
|
|
26
|
+
min-height: 24vmin;
|
|
27
|
+
background: #ffffff;
|
|
28
|
+
margin: 0 4.27vmin 0 4.27vmin;
|
|
29
|
+
border-radius: 2.13vmin;
|
|
30
|
+
padding: 2.13vmin;
|
|
31
|
+
flex-direction: column;
|
|
32
|
+
}
|
|
33
|
+
.goods-item .main-card {
|
|
34
|
+
display: flex;
|
|
35
|
+
flex-direction: row;
|
|
36
|
+
}
|
|
37
|
+
.goods-item .main-card .left {
|
|
38
|
+
position: relative;
|
|
39
|
+
width: 32vmin;
|
|
40
|
+
height: 24vmin;
|
|
41
|
+
}
|
|
42
|
+
.goods-item .main-card .left .index {
|
|
43
|
+
border-radius: 2.13vmin 0 2.13vmin 0;
|
|
44
|
+
position: absolute;
|
|
45
|
+
top: 0;
|
|
46
|
+
left: 0;
|
|
47
|
+
display: inline-flex;
|
|
48
|
+
align-items: center;
|
|
49
|
+
justify-content: center;
|
|
50
|
+
min-width: 4.8vmin;
|
|
51
|
+
height: 3.73vmin;
|
|
52
|
+
padding: 0.13vmin 0.8vmin;
|
|
53
|
+
font-size: 2.66vmin;
|
|
54
|
+
background: rgba(0, 0, 0, 0.6);
|
|
55
|
+
color: #FFFFFF;
|
|
56
|
+
}
|
|
57
|
+
.goods-item .main-card .left .ios-index {
|
|
58
|
+
background: rgba(0, 0, 0, 0.25);
|
|
59
|
+
backdrop-filter: blur(3.2vmin);
|
|
60
|
+
}
|
|
61
|
+
.goods-item .main-card .left .goods-type {
|
|
62
|
+
position: absolute;
|
|
63
|
+
right: calc(100% - 30.67vmin);
|
|
64
|
+
bottom: 1.07vmin;
|
|
65
|
+
padding: 1.07vmin 1.33vmin;
|
|
66
|
+
background: rgba(0, 0, 0, 0.4);
|
|
67
|
+
border-radius: 1.07vmin;
|
|
68
|
+
color: #fff;
|
|
69
|
+
font-size: 2.67vmin;
|
|
70
|
+
width: fit-content;
|
|
71
|
+
display: flex;
|
|
72
|
+
justify-content: center;
|
|
73
|
+
align-items: center;
|
|
74
|
+
height: 2.67vmin;
|
|
75
|
+
font-weight: 500;
|
|
76
|
+
}
|
|
77
|
+
.goods-item .main-card .left .ios-goods-type {
|
|
78
|
+
background: rgba(0, 0, 0, 0.25) !important;
|
|
79
|
+
backdrop-filter: blur(3.2vmin);
|
|
80
|
+
}
|
|
81
|
+
.goods-item .main-card .right {
|
|
82
|
+
flex: 1;
|
|
83
|
+
display: flex;
|
|
84
|
+
flex-direction: column;
|
|
85
|
+
justify-content: space-between;
|
|
86
|
+
margin-left: 2.13vmin;
|
|
87
|
+
height: 24vmin;
|
|
88
|
+
width: calc(100% - 34.13vmin);
|
|
89
|
+
}
|
|
90
|
+
.goods-item .main-card .right .line-one {
|
|
91
|
+
display: flex;
|
|
92
|
+
align-items: center;
|
|
93
|
+
height: 4.8vmin;
|
|
94
|
+
}
|
|
95
|
+
.goods-item .main-card .right .line-one .activity-type {
|
|
96
|
+
background-color: #FFF3EB;
|
|
97
|
+
color: #FF781F;
|
|
98
|
+
padding: 0vmin 1.07vmin;
|
|
99
|
+
font-size: 2.67vmin;
|
|
100
|
+
height: 4.27vmin;
|
|
101
|
+
line-height: 4.8vmin;
|
|
102
|
+
flex-shrink: 0;
|
|
103
|
+
margin-right: 1.07vmin;
|
|
104
|
+
border-radius: 0.53vmin;
|
|
105
|
+
display: flex;
|
|
106
|
+
width: max-content;
|
|
107
|
+
align-items: center;
|
|
108
|
+
font-weight: 500;
|
|
109
|
+
}
|
|
110
|
+
.goods-item .main-card .right .line-one .super-activity-type {
|
|
111
|
+
background: linear-gradient(180.25deg, #333333 0%, #525252 68%, #333333 100%);
|
|
112
|
+
color: #ff781f;
|
|
113
|
+
padding: 0.53vmin 1.07vmin;
|
|
114
|
+
font-size: 2.67vmin;
|
|
115
|
+
height: 4.27vmin;
|
|
116
|
+
width: max-content;
|
|
117
|
+
line-height: 4.8vmin;
|
|
118
|
+
flex-shrink: 0;
|
|
119
|
+
margin-right: 1.07vmin;
|
|
120
|
+
border-radius: 0.53vmin;
|
|
121
|
+
display: flex;
|
|
122
|
+
font-weight: 500;
|
|
123
|
+
align-items: center;
|
|
124
|
+
}
|
|
125
|
+
.goods-item .main-card .right .line-one .super-activity-type .super-activity-txt {
|
|
126
|
+
background: linear-gradient(to right, #FFE4AD, #FFC266);
|
|
127
|
+
-webkit-background-clip: text;
|
|
128
|
+
color: transparent;
|
|
129
|
+
}
|
|
130
|
+
.goods-item .main-card .right .line-one .goods-title {
|
|
131
|
+
font-size: 3.73vmin;
|
|
132
|
+
color: #333333;
|
|
133
|
+
word-break: break-all;
|
|
134
|
+
overflow: hidden;
|
|
135
|
+
text-overflow: ellipsis;
|
|
136
|
+
white-space: nowrap;
|
|
137
|
+
display: inline-block;
|
|
138
|
+
vertical-align: middle;
|
|
139
|
+
line-height: 4.8vmin;
|
|
140
|
+
font-weight: 500;
|
|
141
|
+
}
|
|
142
|
+
.goods-item .main-card .right .sec-kill {
|
|
143
|
+
color: #FF781F;
|
|
144
|
+
font-size: 2.67vmin;
|
|
145
|
+
line-height: 4.27vmin;
|
|
146
|
+
margin: 1.07vmin 0;
|
|
147
|
+
}
|
|
148
|
+
.goods-item .main-card .right .left-stock {
|
|
149
|
+
color: #999999;
|
|
150
|
+
font-size: 2.67vmin;
|
|
151
|
+
height: 3.2vmin;
|
|
152
|
+
display: flex;
|
|
153
|
+
align-items: center;
|
|
154
|
+
}
|
|
155
|
+
.goods-item .main-card .right .left-stock .split {
|
|
156
|
+
display: inline-block;
|
|
157
|
+
border-left: 0.13vmin solid #999999;
|
|
158
|
+
width: 0.27vmin;
|
|
159
|
+
height: 3.2vmin;
|
|
160
|
+
margin: 0 1.6vmin;
|
|
161
|
+
}
|
|
162
|
+
.goods-item .main-card .right .line-three {
|
|
163
|
+
display: flex;
|
|
164
|
+
justify-content: space-between;
|
|
165
|
+
align-items: flex-end;
|
|
166
|
+
}
|
|
167
|
+
.goods-item .main-card .right .line-three .price {
|
|
168
|
+
position: relative;
|
|
169
|
+
min-height: 5.33vmin;
|
|
170
|
+
font-weight: 500;
|
|
171
|
+
}
|
|
172
|
+
.goods-item .main-card .right .line-three .price .price-flow {
|
|
173
|
+
color: #FF5429;
|
|
174
|
+
font-size: 3.2vmin;
|
|
175
|
+
}
|
|
176
|
+
.goods-item .main-card .right .line-three .price .price-show {
|
|
177
|
+
color: #FF5429;
|
|
178
|
+
font-size: 4.8vmin;
|
|
179
|
+
}
|
|
180
|
+
.goods-item .main-card .right .line-three .price .price-line {
|
|
181
|
+
font-size: 2.67vmin;
|
|
182
|
+
text-decoration: line-through;
|
|
183
|
+
color: #999999;
|
|
184
|
+
margin-left: 1.07vmin;
|
|
185
|
+
}
|
|
186
|
+
.goods-item .main-card .right .line-three .buy-btn {
|
|
187
|
+
font-size: 3.2vmin;
|
|
188
|
+
border-radius: 5.33vmin;
|
|
189
|
+
width: 21.33vmin;
|
|
190
|
+
height: 7.47vmin;
|
|
191
|
+
display: flex;
|
|
192
|
+
justify-content: center;
|
|
193
|
+
align-items: center;
|
|
194
|
+
color: white;
|
|
195
|
+
line-height: 7.47vmin;
|
|
196
|
+
font-weight: 500;
|
|
197
|
+
background: linear-gradient(270deg, #fe6500 0%, #ff4102 100%);
|
|
198
|
+
}
|
|
199
|
+
.goods-item .main-card .right .line-three .buy-btn-teacher {
|
|
200
|
+
font-size: 3.2vmin;
|
|
201
|
+
border-radius: 5.33vmin;
|
|
202
|
+
width: 21.33vmin;
|
|
203
|
+
height: 7.47vmin;
|
|
204
|
+
display: flex;
|
|
205
|
+
justify-content: center;
|
|
206
|
+
align-items: center;
|
|
207
|
+
color: white;
|
|
208
|
+
line-height: 7.47vmin;
|
|
209
|
+
font-weight: 500;
|
|
210
|
+
background: linear-gradient(270deg, #fe6500 0%, #ff4102 100%);
|
|
211
|
+
}
|
|
212
|
+
.goods-item .main-card .right .line-three .buy-btn-teacher .load {
|
|
213
|
+
width: 3.2vmin;
|
|
214
|
+
height: 3.2vmin;
|
|
215
|
+
animation: turn 1s linear infinite;
|
|
216
|
+
margin-right: 1.06vmin;
|
|
217
|
+
}
|
|
218
|
+
.goods-item .main-card .right .line-three .no-stock-btn {
|
|
219
|
+
font-size: 3.2vmin;
|
|
220
|
+
border-radius: 5.33vmin;
|
|
221
|
+
width: 21.33vmin;
|
|
222
|
+
height: 7.47vmin;
|
|
223
|
+
display: flex;
|
|
224
|
+
justify-content: center;
|
|
225
|
+
align-items: center;
|
|
226
|
+
color: white;
|
|
227
|
+
line-height: 7.47vmin;
|
|
228
|
+
font-weight: 500;
|
|
229
|
+
opacity: 40%;
|
|
230
|
+
background: linear-gradient(270deg, #fe6500 0%, #ff4102 100%);
|
|
231
|
+
}
|
|
232
|
+
.goods-item .main-card .right .line-three .see-btn {
|
|
233
|
+
font-size: 3.2vmin;
|
|
234
|
+
border-radius: 5.33vmin;
|
|
235
|
+
width: 21.33vmin;
|
|
236
|
+
height: 7.47vmin;
|
|
237
|
+
display: flex;
|
|
238
|
+
justify-content: center;
|
|
239
|
+
align-items: center;
|
|
240
|
+
color: white;
|
|
241
|
+
line-height: 7.47vmin;
|
|
242
|
+
font-weight: 500;
|
|
243
|
+
margin-left: inherit;
|
|
244
|
+
margin-right: inherit;
|
|
245
|
+
background: linear-gradient(270deg, #fe6500 0%, #ff4102 100%);
|
|
246
|
+
}
|
|
247
|
+
.goods-item .main-card .right .line-three .buy-btn-preferential {
|
|
248
|
+
font-size: 3.2vmin;
|
|
249
|
+
border-radius: 5.33vmin;
|
|
250
|
+
padding: 0 1.33vmin;
|
|
251
|
+
min-width: 21.33vmin;
|
|
252
|
+
height: 9.07vmin;
|
|
253
|
+
display: flex;
|
|
254
|
+
justify-content: center;
|
|
255
|
+
align-items: center;
|
|
256
|
+
color: white;
|
|
257
|
+
flex-flow: column;
|
|
258
|
+
line-height: 4.27vmin;
|
|
259
|
+
background: linear-gradient(270deg, #fe6500 0%, #ff4102 100%);
|
|
260
|
+
}
|
|
261
|
+
.goods-item .main-card .right .line-three .buy-btn-preferential .go-buy {
|
|
262
|
+
font-size: 3.2vmin;
|
|
263
|
+
font-weight: 500;
|
|
264
|
+
}
|
|
265
|
+
.goods-item .main-card .right .line-three .buy-btn-preferential .preferential-flow {
|
|
266
|
+
color: #ffffff;
|
|
267
|
+
font-size: 2.67vmin;
|
|
268
|
+
}
|
|
269
|
+
.goods-item .main-card .right .line-three .buy-btn-preferential .preferential-show {
|
|
270
|
+
font-size: 3.73vmin;
|
|
271
|
+
color: #ffffff;
|
|
272
|
+
}
|
|
273
|
+
.teacher-switch {
|
|
274
|
+
height: 4.27vmin;
|
|
275
|
+
background: #fff;
|
|
276
|
+
display: flex;
|
|
277
|
+
margin-top: 2.13vmin;
|
|
278
|
+
}
|
|
279
|
+
.teacher-switch .switch-txt {
|
|
280
|
+
opacity: 1;
|
|
281
|
+
color: #333333;
|
|
282
|
+
font-size: 3.2vmin;
|
|
283
|
+
font-weight: 400;
|
|
284
|
+
font-family: "PingFang SC";
|
|
285
|
+
margin-left: 2.13vmin;
|
|
286
|
+
}
|
|
287
|
+
@keyframes turn {
|
|
288
|
+
0% {
|
|
289
|
+
transform: rotate(0deg);
|
|
290
|
+
}
|
|
291
|
+
20% {
|
|
292
|
+
transform: rotate(72deg);
|
|
293
|
+
}
|
|
294
|
+
40% {
|
|
295
|
+
transform: rotate(144deg);
|
|
296
|
+
}
|
|
297
|
+
60% {
|
|
298
|
+
transform: rotate(216deg);
|
|
299
|
+
}
|
|
300
|
+
80% {
|
|
301
|
+
transform: rotate(288deg);
|
|
302
|
+
}
|
|
303
|
+
100% {
|
|
304
|
+
transform: rotate(360deg);
|
|
305
|
+
}
|
|
306
|
+
}
|
|
@@ -36,7 +36,6 @@
|
|
|
36
36
|
aliveInfo="{{aliveInfo}}"
|
|
37
37
|
allContactPay="{{allContactPay}}"
|
|
38
38
|
goodsInfo="{{formExplainingGoods}}"
|
|
39
|
-
index="{{explainingGoodsIndex}}"
|
|
40
39
|
coupon_switch="{{coupon_switch}}"
|
|
41
40
|
bind:sendNewMsg="sendNewMsg"
|
|
42
41
|
bind:showConfirmOrder="showConfirmOrder"
|
|
@@ -57,7 +56,6 @@
|
|
|
57
56
|
wx:key="index"
|
|
58
57
|
goodsInfo="{{goodsItem}}"
|
|
59
58
|
allContactPay="{{allContactPay}}"
|
|
60
|
-
index="{{index}}"
|
|
61
59
|
coupon_switch="{{coupon_switch}}"
|
|
62
60
|
bind:sendNewMsg="sendNewMsg"
|
|
63
61
|
bind:showConfirmOrder="showConfirmOrder"
|
|
@@ -82,4 +80,4 @@
|
|
|
82
80
|
</view>
|
|
83
81
|
</custom-popup>
|
|
84
82
|
</view>
|
|
85
|
-
<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>
|
|
83
|
+
<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>
|
|
@@ -14,13 +14,13 @@
|
|
|
14
14
|
<view wx:for="{{goodsInfo}}" wx:for-item="goodsItem" wx:key="index" style="margin-top: 3.2vmin;">
|
|
15
15
|
<goods-item
|
|
16
16
|
goodsInfo="{{goodsItem}}"
|
|
17
|
-
index="{{index}}"
|
|
18
17
|
aliveInfo="{{aliveInfo}}"
|
|
19
18
|
bind:sendGoodsCard="sendGoodsCard"
|
|
20
19
|
class="goods-item"
|
|
21
20
|
envName="{{ENV_NAME}}"
|
|
22
21
|
sensorReportParams="{{sensorReportParams}}"
|
|
23
22
|
current_role="teacher"
|
|
23
|
+
index="{{index}}"
|
|
24
24
|
sending="{{sending && index === sendingIndex}}"
|
|
25
25
|
isFullScreen="{{isFullScreen}}"
|
|
26
26
|
></goods-item>
|
|
@@ -38,4 +38,4 @@
|
|
|
38
38
|
<view class="chat-text">请联系管理员，或前往电脑端管理台【直播间设置-互动设置-直播带货配置】添加商品</view>
|
|
39
39
|
</block>
|
|
40
40
|
</view>
|
|
41
|
-
<!-- 商品列表 end-->
|
|
41
|
+
<!-- 商品列表 end-->
|