s-material-react 2.2.43 → 2.2.45
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/css/common/card.scss +4 -5
- package/css/pages/cube.scss +0 -1
- package/css/pages/goodsDetail.scss +25 -24
- package/css/pages/order-goodsItem.scss +5 -5
- package/css/pages/orderList.scss +11 -3
- package/css/pages/paymentMode.scss +1 -1
- package/css/pages/placeOrderGroup.scss +22 -10
- package/dist/common/card/index.d.ts +2 -1
- package/dist/components/business/order-group/order-list/components/orderItem.d.ts +1 -1
- package/dist/index.js +1 -1
- package/package.json +1 -1
package/css/common/card.scss
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
&-info {
|
|
16
16
|
&-container {
|
|
17
17
|
display: grid;
|
|
18
|
-
grid-template-columns: 1fr
|
|
18
|
+
grid-template-columns: 1fr 80px;
|
|
19
19
|
grid-auto-flow: dense;
|
|
20
20
|
line-height: 18px;
|
|
21
21
|
justify-content: space-between;
|
|
@@ -57,12 +57,11 @@
|
|
|
57
57
|
color: #ff1643;
|
|
58
58
|
padding: 2px 4px;
|
|
59
59
|
}
|
|
60
|
-
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
62
|
|
|
64
63
|
.card-item-info-countDown {
|
|
65
|
-
background-color: #
|
|
64
|
+
background-color: #f2f4f5;
|
|
66
65
|
height: 35px;
|
|
67
66
|
line-height: 35px;
|
|
68
67
|
border-radius: 8px;
|
|
@@ -73,6 +72,6 @@
|
|
|
73
72
|
|
|
74
73
|
.count-down-text {
|
|
75
74
|
margin-left: 6px;
|
|
76
|
-
color: #
|
|
75
|
+
color: #ff2d1e;
|
|
77
76
|
}
|
|
78
|
-
}
|
|
77
|
+
}
|
package/css/pages/cube.scss
CHANGED
|
@@ -3,7 +3,11 @@ $padding: 16px;
|
|
|
3
3
|
.goodsDetail-topInfo {
|
|
4
4
|
display: flex;
|
|
5
5
|
border-radius: 8px 8px 0 0;
|
|
6
|
-
background: linear-gradient(
|
|
6
|
+
// background: linear-gradient(180deg, #ff9b2a 0%, #fba038 100%);
|
|
7
|
+
background-image: url('https://brushes.oss-cn-shanghai.aliyuncs.com/jinmen/icon/price_27.png');
|
|
8
|
+
background-repeat: no-repeat;
|
|
9
|
+
background-position: top;
|
|
10
|
+
background-size: 100% 100px;
|
|
7
11
|
.lPart {
|
|
8
12
|
flex: 1;
|
|
9
13
|
|
|
@@ -30,9 +34,9 @@ $padding: 16px;
|
|
|
30
34
|
}
|
|
31
35
|
|
|
32
36
|
.sale-price {
|
|
33
|
-
color: #
|
|
37
|
+
color: #ff2d1e;
|
|
34
38
|
background: #fff;
|
|
35
|
-
background: linear-gradient(
|
|
39
|
+
background: linear-gradient(180deg, #ffefe3 0%, #ffffff 100%);
|
|
36
40
|
border-radius: 8px;
|
|
37
41
|
font-size: 14px;
|
|
38
42
|
font-weight: 600;
|
|
@@ -115,7 +119,7 @@ $padding: 16px;
|
|
|
115
119
|
padding: $padding;
|
|
116
120
|
display: grid;
|
|
117
121
|
grid-template-columns: 60px 1fr;
|
|
118
|
-
border-bottom: 1px solid #
|
|
122
|
+
border-bottom: 1px solid #f0f0f0;
|
|
119
123
|
padding-bottom: 15px;
|
|
120
124
|
|
|
121
125
|
.label {
|
|
@@ -143,12 +147,10 @@ $padding: 16px;
|
|
|
143
147
|
}
|
|
144
148
|
}
|
|
145
149
|
|
|
146
|
-
|
|
147
150
|
.blod {
|
|
148
151
|
color: #000;
|
|
149
152
|
}
|
|
150
153
|
|
|
151
|
-
|
|
152
154
|
.font-14 {
|
|
153
155
|
font-size: 14px;
|
|
154
156
|
}
|
|
@@ -165,12 +167,11 @@ $padding: 16px;
|
|
|
165
167
|
color: #999;
|
|
166
168
|
|
|
167
169
|
.goods-supplynum {
|
|
168
|
-
border-bottom: 1px solid #
|
|
170
|
+
border-bottom: 1px solid #f0f0f0;
|
|
169
171
|
padding-bottom: 15px;
|
|
170
172
|
margin-bottom: 15px;
|
|
171
173
|
}
|
|
172
174
|
|
|
173
|
-
|
|
174
175
|
.info {
|
|
175
176
|
display: flex;
|
|
176
177
|
justify-content: space-between;
|
|
@@ -248,15 +249,15 @@ $padding: 16px;
|
|
|
248
249
|
&.addCart {
|
|
249
250
|
background-color: #959595;
|
|
250
251
|
color: #ffffff;
|
|
251
|
-
border-top-left-radius: 8px!important;
|
|
252
|
-
border-bottom-left-radius: 8px!important;
|
|
252
|
+
border-top-left-radius: 8px !important;
|
|
253
|
+
border-bottom-left-radius: 8px !important;
|
|
253
254
|
}
|
|
254
255
|
|
|
255
256
|
&.buy {
|
|
256
257
|
background-color: #34c0bc !important;
|
|
257
258
|
color: #ffffff;
|
|
258
|
-
border-top-right-radius: 8px!important;
|
|
259
|
-
border-bottom-right-radius: 8px!important;
|
|
259
|
+
border-top-right-radius: 8px !important;
|
|
260
|
+
border-bottom-right-radius: 8px !important;
|
|
260
261
|
}
|
|
261
262
|
}
|
|
262
263
|
|
|
@@ -268,7 +269,7 @@ $padding: 16px;
|
|
|
268
269
|
.goodsDetailTab {
|
|
269
270
|
background-color: #ffffff;
|
|
270
271
|
margin-top: 12px;
|
|
271
|
-
border-radius: 16px;
|
|
272
|
+
// border-radius: 16px;
|
|
272
273
|
overflow: hidden;
|
|
273
274
|
|
|
274
275
|
.tabs {
|
|
@@ -294,7 +295,7 @@ $padding: 16px;
|
|
|
294
295
|
.line {
|
|
295
296
|
width: 60px;
|
|
296
297
|
height: 2px;
|
|
297
|
-
background-color: #
|
|
298
|
+
background-color: #34c0bc;
|
|
298
299
|
position: absolute;
|
|
299
300
|
bottom: 0;
|
|
300
301
|
left: 50%;
|
|
@@ -314,7 +315,7 @@ $padding: 16px;
|
|
|
314
315
|
background-size: cover !important;
|
|
315
316
|
}
|
|
316
317
|
|
|
317
|
-
width: 100%;
|
|
318
|
+
// width: 100%;
|
|
318
319
|
background-color: #ffffff;
|
|
319
320
|
|
|
320
321
|
.ssd-module-wrap {
|
|
@@ -542,13 +543,13 @@ $padding: 16px;
|
|
|
542
543
|
border-radius: 8px;
|
|
543
544
|
color: #333333;
|
|
544
545
|
margin-bottom: 10px;
|
|
545
|
-
background: #
|
|
546
|
-
border: 1px solid #
|
|
546
|
+
background: #f5f8fb;
|
|
547
|
+
border: 1px solid #f5f8fb;
|
|
547
548
|
|
|
548
549
|
&.active {
|
|
549
|
-
background: #
|
|
550
|
-
color: #
|
|
551
|
-
border: 1px solid #
|
|
550
|
+
background: #eafaf9;
|
|
551
|
+
color: #34c0bc;
|
|
552
|
+
border: 1px solid #34c0bc;
|
|
552
553
|
}
|
|
553
554
|
|
|
554
555
|
&.offShelf {
|
|
@@ -609,7 +610,7 @@ $padding: 16px;
|
|
|
609
610
|
}
|
|
610
611
|
|
|
611
612
|
.price {
|
|
612
|
-
color: #
|
|
613
|
+
color: #ff2d1e;
|
|
613
614
|
font-size: 18px;
|
|
614
615
|
}
|
|
615
616
|
}
|
|
@@ -623,7 +624,7 @@ $padding: 16px;
|
|
|
623
624
|
display: block;
|
|
624
625
|
width: 100%;
|
|
625
626
|
height: 100%;
|
|
626
|
-
color: #
|
|
627
|
+
color: #6a6c6d;
|
|
627
628
|
position: relative;
|
|
628
629
|
top: -4px;
|
|
629
630
|
}
|
|
@@ -634,10 +635,10 @@ $padding: 16px;
|
|
|
634
635
|
display: block;
|
|
635
636
|
width: 100%;
|
|
636
637
|
height: 100%;
|
|
637
|
-
color: #
|
|
638
|
+
color: #6a6c6d;
|
|
638
639
|
position: relative;
|
|
639
640
|
top: -4px;
|
|
640
641
|
}
|
|
641
642
|
}
|
|
642
643
|
}
|
|
643
|
-
}
|
|
644
|
+
}
|
|
@@ -10,15 +10,15 @@
|
|
|
10
10
|
font-size: 13px;
|
|
11
11
|
|
|
12
12
|
&.white {
|
|
13
|
-
--background-color: #
|
|
14
|
-
--border-color: #
|
|
13
|
+
--background-color: #f1f5f8;
|
|
14
|
+
--border-color: #f1f5f8;
|
|
15
15
|
margin-left: 10px;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
&.black {
|
|
19
|
-
--background-color: #
|
|
20
|
-
--border-color: #
|
|
21
|
-
--text-color: #
|
|
19
|
+
--background-color: #eafaf9;
|
|
20
|
+
--border-color: #eafaf9;
|
|
21
|
+
--text-color: #34c0bc;
|
|
22
22
|
margin-left: 10px;
|
|
23
23
|
}
|
|
24
24
|
}
|
package/css/pages/orderList.scss
CHANGED
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
color: #333333;
|
|
14
14
|
}
|
|
15
15
|
.actived-item {
|
|
16
|
-
color: #
|
|
17
|
-
border-color: #
|
|
16
|
+
color: #34c0bc;
|
|
17
|
+
border-color: #34c0bc !important;
|
|
18
18
|
border-width: 2px;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -94,12 +94,20 @@
|
|
|
94
94
|
.goodsItemWrap {
|
|
95
95
|
padding-bottom: 6px;
|
|
96
96
|
margin-bottom: 10px;
|
|
97
|
+
|
|
98
|
+
.card-item {
|
|
99
|
+
margin-top: 10px;
|
|
100
|
+
&:first-of-type {
|
|
101
|
+
margin-top: unset;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
97
104
|
}
|
|
98
105
|
|
|
99
106
|
.allInfo {
|
|
100
107
|
display: flex;
|
|
101
108
|
justify-content: space-between;
|
|
102
|
-
margin-bottom:
|
|
109
|
+
margin-bottom: 10px;
|
|
110
|
+
margin-top: 10px;
|
|
103
111
|
|
|
104
112
|
.totalNum {
|
|
105
113
|
font-size: 12px;
|
|
@@ -44,7 +44,7 @@ $radius: 8px;
|
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
.left-title-default {
|
|
47
|
-
background: #
|
|
47
|
+
background: #34c0bc;
|
|
48
48
|
font-size: 10px;
|
|
49
49
|
color: #fff;
|
|
50
50
|
padding: 2px 4px;
|
|
@@ -73,13 +73,13 @@ $radius: 8px;
|
|
|
73
73
|
margin-bottom: 12px;
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
.good-name{
|
|
76
|
+
.good-name {
|
|
77
77
|
font-size: 14px;
|
|
78
78
|
color: #333;
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
.shop-info-price {
|
|
82
|
-
color: #
|
|
82
|
+
// color: #ff2d1e;
|
|
83
83
|
font-size: 16px;
|
|
84
84
|
}
|
|
85
85
|
|
|
@@ -115,13 +115,13 @@ $radius: 8px;
|
|
|
115
115
|
margin-bottom: 12px;
|
|
116
116
|
}
|
|
117
117
|
|
|
118
|
-
.good-name{
|
|
118
|
+
.good-name {
|
|
119
119
|
font-size: 14px;
|
|
120
120
|
color: #333;
|
|
121
121
|
}
|
|
122
122
|
|
|
123
123
|
.shop-info-price {
|
|
124
|
-
color: #
|
|
124
|
+
// color: #ff2d1e;
|
|
125
125
|
font-size: 16px;
|
|
126
126
|
}
|
|
127
127
|
|
|
@@ -135,7 +135,10 @@ $radius: 8px;
|
|
|
135
135
|
|
|
136
136
|
.card-item {
|
|
137
137
|
grid-template-columns: 100px 1fr;
|
|
138
|
-
margin-bottom:
|
|
138
|
+
margin-bottom: 10px;
|
|
139
|
+
&:last-of-type {
|
|
140
|
+
margin-bottom: unset;
|
|
141
|
+
}
|
|
139
142
|
}
|
|
140
143
|
|
|
141
144
|
.card-item-img {
|
|
@@ -211,15 +214,16 @@ $radius: 8px;
|
|
|
211
214
|
align-items: center;
|
|
212
215
|
position: sticky;
|
|
213
216
|
bottom: 0;
|
|
217
|
+
box-shadow: 0 -2px 10px 0 rgba(0, 0, 0, 0.05);
|
|
214
218
|
|
|
215
219
|
.price {
|
|
216
220
|
font-size: 14px;
|
|
217
|
-
color: #
|
|
221
|
+
color: #34c0bc;
|
|
218
222
|
}
|
|
219
223
|
|
|
220
224
|
.price-value {
|
|
221
225
|
font-size: 18px;
|
|
222
|
-
color: #
|
|
226
|
+
color: #ff2d1e;
|
|
223
227
|
}
|
|
224
228
|
|
|
225
229
|
.btn {
|
|
@@ -270,6 +274,14 @@ $radius: 8px;
|
|
|
270
274
|
.info {
|
|
271
275
|
margin-left: auto;
|
|
272
276
|
margin-right: 10px;
|
|
277
|
+
display: flex;
|
|
278
|
+
align-items: center;
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
.pay-method-icon {
|
|
282
|
+
width: 28px;
|
|
283
|
+
height: 28px;
|
|
284
|
+
margin-right: 5px;
|
|
273
285
|
}
|
|
274
286
|
}
|
|
275
287
|
|
|
@@ -321,7 +333,7 @@ $radius: 8px;
|
|
|
321
333
|
text-align: center;
|
|
322
334
|
|
|
323
335
|
&.active {
|
|
324
|
-
color: #
|
|
336
|
+
color: #34c0bc;
|
|
325
337
|
font-weight: 500;
|
|
326
338
|
|
|
327
339
|
.line {
|
|
@@ -332,7 +344,7 @@ $radius: 8px;
|
|
|
332
344
|
.line {
|
|
333
345
|
width: 40px;
|
|
334
346
|
height: 3px;
|
|
335
|
-
background-color: #
|
|
347
|
+
background-color: #34c0bc;
|
|
336
348
|
position: absolute;
|
|
337
349
|
bottom: 0;
|
|
338
350
|
left: 50%;
|
|
@@ -11,5 +11,6 @@ export interface CardItemType {
|
|
|
11
11
|
pricesetRefrice?: number;
|
|
12
12
|
memberBname?: string;
|
|
13
13
|
memberName?: string;
|
|
14
|
+
contractBillcode?: string;
|
|
14
15
|
}
|
|
15
|
-
export declare const CardJsx: ({ dataPic, goodsName, goodsCamount, pricesetNprice, skuName, children, goodsType, pricesetRefrice, memberName }: CardItemType) => import("react/jsx-runtime").JSX.Element;
|
|
16
|
+
export declare const CardJsx: ({ dataPic, goodsName, goodsCamount, pricesetNprice, skuName, children, goodsType, pricesetRefrice, memberName, contractBillcode }: CardItemType) => import("react/jsx-runtime").JSX.Element;
|
|
@@ -2,5 +2,5 @@ import { orderType } from 'qj-b2c-store';
|
|
|
2
2
|
interface action {
|
|
3
3
|
init: () => void;
|
|
4
4
|
}
|
|
5
|
-
export declare function Item({ contractBillcode, dataBmoney, dataBnum, goodsList, dataState, contractId, init, contractAppraise, borderRadius, orderSpacing, contractPaydate, contractType, countdownCancel }: typeof orderType & action): import("react/jsx-runtime").JSX.Element;
|
|
5
|
+
export declare function Item({ memberName, contractBillcode, dataBmoney, dataBnum, goodsList, dataState, contractId, init, contractAppraise, borderRadius, orderSpacing, contractPaydate, contractType, countdownCancel }: typeof orderType & action): import("react/jsx-runtime").JSX.Element;
|
|
6
6
|
export {};
|