@nutui/nutui 3.1.16 → 3.1.18-beta.0

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.
Files changed (137) hide show
  1. package/CHANGELOG.md +37 -0
  2. package/README.md +1 -1
  3. package/dist/nutui.d.ts +3 -1
  4. package/dist/nutui.es.js +1860 -773
  5. package/dist/nutui.umd.js +1871 -778
  6. package/dist/packages/_es/ActionSheet.js +8 -3
  7. package/dist/packages/_es/Address.js +60 -7
  8. package/dist/packages/_es/Audio.js +289 -0
  9. package/dist/packages/_es/Avatar.js +1 -1
  10. package/dist/packages/_es/BackTop.js +3 -3
  11. package/dist/packages/_es/Badge.js +1 -1
  12. package/dist/packages/_es/Barrage.js +1 -1
  13. package/dist/packages/_es/Button.js +13 -4
  14. package/dist/packages/_es/Calendar.js +428 -209
  15. package/dist/packages/_es/Card.js +1 -2
  16. package/dist/packages/_es/Cascader.js +2 -2
  17. package/dist/packages/_es/Cell.js +2 -2
  18. package/dist/packages/_es/CellGroup.js +1 -1
  19. package/dist/packages/_es/Checkbox.js +2 -2
  20. package/dist/packages/_es/CheckboxGroup.js +2 -2
  21. package/dist/packages/_es/CircleProgress.js +1 -1
  22. package/dist/packages/_es/Col.js +1 -1
  23. package/dist/packages/_es/Collapse.js +1 -1
  24. package/dist/packages/_es/CollapseItem.js +4 -2
  25. package/dist/packages/_es/CountDown.js +1 -1
  26. package/dist/packages/_es/CountUp.js +1 -1
  27. package/dist/packages/_es/DatePicker.js +1 -2
  28. package/dist/packages/_es/Dialog.js +1 -1
  29. package/dist/packages/_es/Divider.js +1 -1
  30. package/dist/packages/_es/Drag.js +1 -1
  31. package/dist/packages/_es/Elevator.js +10 -5
  32. package/dist/packages/_es/Empty.js +1 -1
  33. package/dist/packages/_es/FixedNav.js +1 -1
  34. package/dist/packages/_es/Form.js +1 -1
  35. package/dist/packages/_es/FormItem.js +1 -1
  36. package/dist/packages/_es/Grid.js +1 -1
  37. package/dist/packages/_es/GridItem.js +2 -2
  38. package/dist/packages/_es/Icon.js +1 -1
  39. package/dist/packages/_es/ImagePreview.js +8 -5
  40. package/dist/packages/_es/Indicator.js +1 -1
  41. package/dist/packages/_es/InfiniteLoading.js +1 -1
  42. package/dist/packages/_es/Input.js +7 -2
  43. package/dist/packages/_es/InputNumber.js +1 -1
  44. package/dist/packages/_es/Layout.js +1 -1
  45. package/dist/packages/_es/Menu.js +1 -1
  46. package/dist/packages/_es/MenuItem.js +1 -1
  47. package/dist/packages/_es/Navbar.js +18 -59
  48. package/dist/packages/_es/NoticeBar.js +38 -23
  49. package/dist/packages/_es/Notify.js +2 -2
  50. package/dist/packages/_es/NumberKeyboard.js +1 -2
  51. package/dist/packages/_es/OverLay.js +1 -1
  52. package/dist/packages/_es/Pagination.js +1 -1
  53. package/dist/packages/_es/Picker.js +2 -1
  54. package/dist/packages/_es/Popover.js +4 -1
  55. package/dist/packages/_es/Popup.js +1 -1
  56. package/dist/packages/_es/Price.js +1 -1
  57. package/dist/packages/_es/Progress.js +24 -11
  58. package/dist/packages/_es/Radio.js +2 -2
  59. package/dist/packages/_es/RadioGroup.js +1 -1
  60. package/dist/packages/_es/Range.js +2 -2
  61. package/dist/packages/_es/Rate.js +1 -1
  62. package/dist/packages/_es/Row.js +1 -1
  63. package/dist/packages/_es/SearchBar.js +1 -1
  64. package/dist/packages/_es/ShortPassword.js +12 -4
  65. package/dist/packages/_es/SideNavBar.js +1 -1
  66. package/dist/packages/_es/SideNavBarItem.js +1 -1
  67. package/dist/packages/_es/Signature.js +1 -1
  68. package/dist/packages/_es/Skeleton.js +8 -6
  69. package/dist/packages/_es/Sku.js +1 -1
  70. package/dist/packages/_es/Step.js +1 -1
  71. package/dist/packages/_es/Steps.js +1 -1
  72. package/dist/packages/_es/Sticky.js +143 -0
  73. package/dist/packages/_es/SubSideNavBar.js +1 -1
  74. package/dist/packages/_es/Swipe.js +2 -2
  75. package/dist/packages/_es/Swiper.js +2 -2
  76. package/dist/packages/_es/SwiperItem.js +3 -8
  77. package/dist/packages/_es/Switch.js +2 -2
  78. package/dist/packages/_es/TabPane.js +1 -1
  79. package/dist/packages/_es/Tabbar.js +1 -1
  80. package/dist/packages/_es/TabbarItem.js +7 -3
  81. package/dist/packages/_es/Table.js +2 -2
  82. package/dist/packages/_es/Tabs.js +1 -1
  83. package/dist/packages/_es/Tag.js +1 -1
  84. package/dist/packages/_es/TextArea.js +1 -1
  85. package/dist/packages/_es/TimeDetail.js +1 -1
  86. package/dist/packages/_es/TimePannel.js +1 -1
  87. package/dist/packages/_es/TimeSelect.js +7 -2
  88. package/dist/packages/_es/Toast.js +15 -8
  89. package/dist/packages/_es/Uploader.js +1 -1
  90. package/dist/packages/_es/Video.js +1 -55
  91. package/dist/packages/_es/common.js +1 -1
  92. package/dist/packages/_es/component.js +1 -1
  93. package/dist/packages/_es/index.js +5 -7
  94. package/dist/packages/_es/index2.js +7 -58
  95. package/dist/packages/_es/index3.js +1 -1
  96. package/dist/packages/_es/index4.js +64 -0
  97. package/dist/packages/_es/plugin-vue_export-helper.js +1 -1
  98. package/dist/packages/_es/pxCheck.js +1 -1
  99. package/dist/packages/_es/raf.js +1 -1
  100. package/dist/packages/_es/util.js +1 -1
  101. package/dist/packages/actionsheet/index.scss +7 -6
  102. package/dist/packages/address/index.scss +8 -0
  103. package/dist/packages/audio/index.scss +66 -0
  104. package/dist/packages/audiooperate/index.scss +13 -0
  105. package/dist/packages/button/index.scss +5 -5
  106. package/dist/packages/calendar/index.scss +47 -41
  107. package/dist/packages/calendaritem/index.scss +57 -42
  108. package/dist/packages/cell/index.scss +3 -3
  109. package/dist/packages/cellgroup/index.scss +1 -1
  110. package/dist/packages/elevator/index.scss +3 -0
  111. package/dist/packages/infiniteloading/index.scss +1 -1
  112. package/dist/packages/input/index.scss +4 -2
  113. package/dist/packages/navbar/index.scss +2 -0
  114. package/dist/packages/noticebar/index.scss +11 -5
  115. package/dist/packages/notify/index.scss +1 -0
  116. package/dist/packages/progress/index.scss +21 -17
  117. package/dist/packages/range/index.scss +8 -8
  118. package/dist/packages/row/index.scss +3 -0
  119. package/dist/packages/sticky/index.scss +5 -0
  120. package/dist/packages/swiper/index.scss +4 -4
  121. package/dist/packages/switch/index.scss +8 -8
  122. package/dist/packages/tabbar/index.scss +7 -4
  123. package/dist/packages/tabbaritem/index.scss +4 -3
  124. package/dist/packages/tabs/index.scss +1 -0
  125. package/dist/packages/toast/index.scss +8 -7
  126. package/dist/style.css +1 -1
  127. package/dist/styles/font/config.json +6 -1
  128. package/dist/styles/font/demo_index.html +118 -3
  129. package/dist/styles/font/iconfont.css +23 -3
  130. package/dist/styles/font/iconfont.js +25 -24
  131. package/dist/styles/font/iconfont.json +35 -0
  132. package/dist/styles/font/iconfont.ttf +0 -0
  133. package/dist/styles/font/iconfont.woff +0 -0
  134. package/dist/styles/font/iconfont.woff2 +0 -0
  135. package/dist/styles/themes/default.scss +46 -43
  136. package/dist/styles/variables.scss +123 -42
  137. package/package.json +12 -13
@@ -0,0 +1,64 @@
1
+ /*!
2
+ * @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
3
+ * (c) 2021 @jdf2e.
4
+ * Released under the MIT License.
5
+ */
6
+ import { ref } from "vue";
7
+ const MIN_DISTANCE = 10;
8
+ function getDirection(x, y) {
9
+ if (x > y && x > MIN_DISTANCE) {
10
+ return "horizontal";
11
+ }
12
+ if (y > x && y > MIN_DISTANCE) {
13
+ return "vertical";
14
+ }
15
+ return "";
16
+ }
17
+ function useTouch() {
18
+ const startX = ref(0);
19
+ const startY = ref(0);
20
+ const deltaX = ref(0);
21
+ const deltaY = ref(0);
22
+ const offsetX = ref(0);
23
+ const offsetY = ref(0);
24
+ const direction = ref("");
25
+ const isVertical = () => direction.value === "vertical";
26
+ const isHorizontal = () => direction.value === "horizontal";
27
+ const reset = () => {
28
+ deltaX.value = 0;
29
+ deltaY.value = 0;
30
+ offsetX.value = 0;
31
+ offsetY.value = 0;
32
+ direction.value = "";
33
+ };
34
+ const start = (event) => {
35
+ reset();
36
+ startX.value = event.touches[0].clientX;
37
+ startY.value = event.touches[0].clientY;
38
+ };
39
+ const move = (event) => {
40
+ const touch = event.touches[0];
41
+ deltaX.value = touch.clientX - startX.value;
42
+ deltaY.value = touch.clientY - startY.value;
43
+ offsetX.value = Math.abs(deltaX.value);
44
+ offsetY.value = Math.abs(deltaY.value);
45
+ if (!direction.value) {
46
+ direction.value = getDirection(offsetX.value, offsetY.value);
47
+ }
48
+ };
49
+ return {
50
+ move,
51
+ start,
52
+ reset,
53
+ startX,
54
+ startY,
55
+ deltaX,
56
+ deltaY,
57
+ offsetX,
58
+ offsetY,
59
+ direction,
60
+ isVertical,
61
+ isHorizontal
62
+ };
63
+ }
64
+ export { useTouch as u };
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui v3.1.16 Sun Jan 30 2022 10:58:10 GMT+0800 (中国标准时间)
2
+ * @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
3
3
  * (c) 2021 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui v3.1.16 Sun Jan 30 2022 10:58:10 GMT+0800 (中国标准时间)
2
+ * @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
3
3
  * (c) 2021 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui v3.1.16 Sun Jan 30 2022 10:58:10 GMT+0800 (中国标准时间)
2
+ * @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
3
3
  * (c) 2021 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui v3.1.16 Sun Jan 30 2022 10:58:10 GMT+0800 (中国标准时间)
2
+ * @nutui/nutui v3.1.18-beta.0 Tue Mar 08 2022 10:41:31 GMT+0800 (中国标准时间)
3
3
  * (c) 2021 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -37,22 +37,23 @@
37
37
  display: block;
38
38
  // height: 24px;
39
39
  padding: 10px;
40
- line-height: 24px;
41
- font-size: $font-size-base;
42
- color: $title-color;
40
+ line-height: $actionsheet-item-line-height;
41
+ font-size: $actionsheet-item-font-size;
42
+ color: $actionsheet-item-font-color;
43
43
  text-align: center;
44
44
  background-color: #fff;
45
+ border-bottom: $actionsheet-item-border-bottom;
45
46
  cursor: pointer;
46
47
  }
47
48
 
48
49
  .desc {
49
- font-size: $font-size-2;
50
+ font-size: $actionsheet-item-font-size;
50
51
  color: #999;
51
52
  }
52
53
 
53
54
  .subdesc {
54
55
  display: block;
55
- font-size: $font-size-small;
56
+ font-size: $actionsheet-item-subdesc-font-size;
56
57
  color: #999;
57
58
  }
58
59
 
@@ -63,6 +64,6 @@
63
64
 
64
65
  .nut-actionsheet-cancel {
65
66
  margin-top: 5px;
66
- border-top: 1px solid $actionsheet-light-color;
67
+ border-top: $actionsheet-item-cancel-border-top;
67
68
  }
68
69
  }
@@ -37,6 +37,14 @@
37
37
  font-weight: bold;
38
38
  }
39
39
 
40
+ view {
41
+ display: block;
42
+ max-width: 100px;
43
+ overflow: hidden;
44
+ text-overflow: ellipsis;
45
+ white-space: nowrap;
46
+ }
47
+
40
48
  span {
41
49
  display: inline-block;
42
50
  max-width: 100px;
@@ -0,0 +1,66 @@
1
+ .nut-audio {
2
+ padding: 0;
3
+ .progress-wrapper {
4
+ display: flex;
5
+ align-items: center;
6
+ width: 100%;
7
+ margin: 0px auto;
8
+ padding: 10px 0;
9
+
10
+ .progress-bar-wrapper {
11
+ flex: 1;
12
+ margin: 0 10px;
13
+ }
14
+
15
+ .time {
16
+ min-width: 50px;
17
+ font-size: 12px;
18
+ text-align: center;
19
+ }
20
+ }
21
+
22
+ .nut-audio-icon {
23
+ position: relative;
24
+ display: inline-block;
25
+
26
+ .nut-audio-icon-box {
27
+ display: flex;
28
+ align-items: center;
29
+ justify-content: center;
30
+ width: 30px;
31
+ height: 30px;
32
+ background: #fff;
33
+ border-radius: 50%;
34
+ box-shadow: 0 0 8px rgba($color: $text-color, $alpha: 0.5);
35
+ &.nut-audio-icon-stop {
36
+ &::after {
37
+ position: absolute;
38
+ left: 50%;
39
+ top: 50%;
40
+ transform: translateX(-15px);
41
+ content: '';
42
+ height: 2px;
43
+ width: 30px;
44
+ background: $disable-color;
45
+ transform: rotate(45deg);
46
+ transform-origin: 8px -18px;
47
+ }
48
+ }
49
+ }
50
+ }
51
+
52
+ .audioMain {
53
+ margin-top: 30px;
54
+ }
55
+
56
+ .custom-button {
57
+ width: 8px;
58
+ height: 8px;
59
+ color: #fff;
60
+ font-size: 10px;
61
+ line-height: 18px;
62
+ text-align: center;
63
+ background-color: #ee0a24;
64
+ border-radius: 100px;
65
+ }
66
+ }
@@ -0,0 +1,13 @@
1
+ .nut-audio-operate-group {
2
+ display: flex;
3
+ display: flex;
4
+ align-items: center;
5
+ justify-content: center;
6
+ margin-top: 10px;
7
+
8
+ .nut-audio-operate {
9
+ .nut-audio-operate-item {
10
+ margin: 0 5px;
11
+ }
12
+ }
13
+ }
@@ -126,21 +126,21 @@
126
126
  }
127
127
 
128
128
  &--normal {
129
- padding: 0 18px;
129
+ padding: $button-default-padding;
130
130
  font-size: $button-default-font-size;
131
131
  }
132
132
 
133
133
  &--small {
134
134
  height: $button-small-height;
135
135
  line-height: $button-small-line-height;
136
- padding: 0 $padding-xs;
137
- font-size: $font-size-1;
136
+ padding: $button-small-padding;
137
+ font-size: $button-small-font-size;
138
138
  }
139
139
  &--mini {
140
140
  height: $button-mini-height;
141
141
  line-height: 1.2;
142
- padding: 0 $padding-xs;
143
- font-size: $font-size-1;
142
+ padding: $button-mini-padding;
143
+ font-size: $button-mini-font-size;
144
144
  }
145
145
 
146
146
  &--block {
@@ -2,30 +2,24 @@
2
2
  position: relative;
3
3
  display: flex;
4
4
  flex: 1;
5
- height: 518px;
6
- padding-top: 132px;
7
- padding-bottom: 78px;
8
- color: $calendar-base-color;
9
- font-size: $calendar-base-font;
10
- background-color: $white;
5
+ color: #333333;
6
+ font-size: 16px;
7
+ background-color: #fff;
11
8
  overflow: hidden;
12
-
9
+ height: 100%;
10
+ flex-direction: column;
13
11
  &.nut-calendar-tile {
14
- padding-top: 46px;
15
- padding-bottom: 0;
16
-
17
12
  .nut-calendar-header {
18
13
  .calendar-title {
19
14
  font-size: $calendar-base-font;
20
15
  }
21
16
  }
22
17
  }
23
-
24
18
  .nut-calendar-taro {
25
19
  height: 60vh;
26
20
  }
27
21
  .popup-box {
28
- height: 518px;
22
+ height: 100%;
29
23
  }
30
24
  .nut-calendar-content {
31
25
  overflow-y: auto;
@@ -36,26 +30,21 @@
36
30
 
37
31
  // 头部导航
38
32
  .nut-calendar-header {
39
- position: absolute;
40
- top: -1px;
41
- left: 0;
42
- right: 0;
43
33
  display: flex;
44
34
  flex-direction: column;
45
35
  text-align: center;
46
36
  padding-top: 1px;
47
37
  background-color: $white;
48
- z-index: 1;
49
38
 
50
39
  .calendar-title {
51
- padding-top: 22px;
52
40
  font-size: $calendar-title-font;
53
- line-height: 25px;
54
- border-radius: 12px 12px 0 0;
41
+ line-height: 44px;
42
+ }
43
+ .calendar-top-slot {
44
+ height: 24px;
55
45
  }
56
-
57
46
  .calendar-curr-month {
58
- padding: 10px 0 7px;
47
+ padding: 7px 0;
59
48
  line-height: 22px;
60
49
  }
61
50
 
@@ -63,7 +52,7 @@
63
52
  display: flex;
64
53
  align-items: center;
65
54
  justify-content: space-around;
66
- height: 46px;
55
+ height: 36px;
67
56
  border-radius: 0px 0px 12px 12px;
68
57
  box-shadow: 0px 4px 10px 0px rgba($color: #000000, $alpha: 0.06);
69
58
 
@@ -79,13 +68,17 @@
79
68
  // 月份
80
69
  .nut-calendar-content {
81
70
  flex: 1;
82
-
71
+ width: 100%;
72
+ display: block;
83
73
  .calendar-months-panel {
84
74
  position: relative;
85
75
  width: 100%;
86
76
  height: auto;
87
77
  display: block;
88
-
78
+ box-sizing: border-box;
79
+ .viewArea {
80
+ display: block;
81
+ }
89
82
  .calendar-month {
90
83
  display: flex;
91
84
  flex-direction: column;
@@ -118,14 +111,12 @@
118
111
 
119
112
  .calendar-month-con {
120
113
  overflow: hidden;
121
-
122
114
  .calendar-month-item {
123
115
  .calendar-month-day:nth-child(7n + 0),
124
116
  .calendar-month-day:nth-child(7n + 1) {
125
117
  color: $calendar-primary-color;
126
118
  }
127
119
  }
128
-
129
120
  .calendar-month-day {
130
121
  float: left;
131
122
  width: 14.28%;
@@ -136,24 +127,43 @@
136
127
  flex-direction: column;
137
128
  position: relative;
138
129
 
139
- .curr-tips,
130
+ .calendar-curr-tips {
131
+ position: absolute;
132
+ width: 100%;
133
+ }
134
+
135
+ .calendar-curr-tip-curr {
136
+ position: absolute;
137
+ bottom: 6px;
138
+ width: 100%;
139
+ font-size: 12px;
140
+ line-height: 14px;
141
+ }
140
142
  .calendar-day-tip {
141
143
  position: absolute;
142
- top: 10px;
144
+ bottom: 6px;
143
145
  width: 100%;
144
- font-size: 11px;
145
- line-height: 12px;
146
+ font-size: 12px;
147
+ line-height: 14px;
146
148
  color: $calendar-primary-color;
147
149
  }
148
-
150
+ .calendar-curr-tips-top {
151
+ top: 6px;
152
+ }
153
+ .calendar-curr-tips-bottom {
154
+ bottom: 6px;
155
+ }
149
156
  &-active {
150
157
  background-color: $calendar-primary-color;
151
158
  color: $white !important;
152
159
 
153
- .curr-tips {
160
+ .calendar-curr-tips {
161
+ // color: $white !important;
162
+ visibility: hidden;
163
+ }
164
+ .calendar-curr-tip-curr {
154
165
  visibility: hidden;
155
166
  }
156
-
157
167
  .calendar-day-tip {
158
168
  color: $white;
159
169
  }
@@ -168,7 +178,7 @@
168
178
  }
169
179
 
170
180
  .calendar-day {
171
- padding: 4px 0;
181
+ padding: 2px 0;
172
182
  font-size: $calendar-day-font;
173
183
  }
174
184
  }
@@ -178,19 +188,15 @@
178
188
 
179
189
  // 底部导航
180
190
  .nut-calendar-footer {
181
- position: absolute;
182
- left: 0;
183
- right: 0;
184
- bottom: -1px;
185
191
  display: flex;
186
- height: 78px;
192
+ height: 62px;
187
193
  width: 100%;
188
194
  background-color: $white;
189
195
 
190
196
  .calendar-confirm-btn {
191
197
  height: 44px;
192
198
  width: 100%;
193
- margin: 14px 18px;
199
+ margin: 10px 18px;
194
200
  border-radius: 22px;
195
201
  background: $button-primary-background-color;
196
202
  color: $white;
@@ -2,52 +2,49 @@
2
2
  position: relative;
3
3
  display: flex;
4
4
  flex: 1;
5
- height: 518px;
6
- padding-top: 132px;
7
- padding-bottom: 78px;
8
- color: $calendar-base-color;
9
- font-size: $calendar-base-font;
10
- background-color: $white;
5
+ color: #333333;
6
+ font-size: 16px;
7
+ background-color: #fff;
11
8
  overflow: hidden;
12
-
9
+ height: 100%;
10
+ flex-direction: column;
13
11
  &.nut-calendar-tile {
14
- height: 100%;
15
- padding-top: 46px;
16
- padding-bottom: 0;
17
-
18
12
  .nut-calendar-header {
19
13
  .calendar-title {
20
14
  font-size: $calendar-base-font;
21
15
  }
22
16
  }
23
17
  }
24
-
25
- &.nut-calendar-nofooter {
26
- padding-bottom: 0;
18
+ .nut-calendar-taro {
19
+ height: 60vh;
20
+ }
21
+ .popup-box {
22
+ height: 100%;
23
+ }
24
+ .nut-calendar-content {
25
+ overflow-y: auto;
26
+ }
27
+ ::-webkit-scrollbar {
28
+ display: none;
27
29
  }
28
30
 
29
31
  // 头部导航
30
32
  .nut-calendar-header {
31
- position: absolute;
32
- top: -1px;
33
- left: 0;
34
- right: 0;
35
33
  display: flex;
36
34
  flex-direction: column;
37
35
  text-align: center;
38
36
  padding-top: 1px;
39
37
  background-color: $white;
40
- z-index: 1;
41
38
 
42
39
  .calendar-title {
43
- padding-top: 22px;
44
40
  font-size: $calendar-title-font;
45
- line-height: 25px;
46
- border-radius: 12px 12px 0 0;
41
+ line-height: 44px;
42
+ }
43
+ .calendar-top-slot {
44
+ height: 24px;
47
45
  }
48
-
49
46
  .calendar-curr-month {
50
- padding: 10px 0 7px;
47
+ padding: 7px 0;
51
48
  line-height: 22px;
52
49
  }
53
50
 
@@ -55,7 +52,8 @@
55
52
  display: flex;
56
53
  align-items: center;
57
54
  justify-content: space-around;
58
- height: 46px;
55
+ height: 36px;
56
+ border-radius: 0px 0px 12px 12px;
59
57
  box-shadow: 0px 4px 10px 0px rgba($color: #000000, $alpha: 0.06);
60
58
 
61
59
  .calendar-week-item {
@@ -70,13 +68,17 @@
70
68
  // 月份
71
69
  .nut-calendar-content {
72
70
  flex: 1;
73
-
71
+ width: 100%;
72
+ display: block;
74
73
  .calendar-months-panel {
75
74
  position: relative;
76
75
  width: 100%;
77
76
  height: auto;
78
77
  display: block;
79
-
78
+ box-sizing: border-box;
79
+ .viewArea {
80
+ display: block;
81
+ }
80
82
  .calendar-month {
81
83
  display: flex;
82
84
  flex-direction: column;
@@ -109,14 +111,12 @@
109
111
 
110
112
  .calendar-month-con {
111
113
  overflow: hidden;
112
-
113
114
  .calendar-month-item {
114
115
  .calendar-month-day:nth-child(7n + 0),
115
116
  .calendar-month-day:nth-child(7n + 1) {
116
117
  color: $calendar-primary-color;
117
118
  }
118
119
  }
119
-
120
120
  .calendar-month-day {
121
121
  float: left;
122
122
  width: 14.28%;
@@ -127,24 +127,43 @@
127
127
  flex-direction: column;
128
128
  position: relative;
129
129
 
130
- .calendar-curr-tips,
130
+ .calendar-curr-tips {
131
+ position: absolute;
132
+ width: 100%;
133
+ }
134
+
135
+ .calendar-curr-tip-curr {
136
+ position: absolute;
137
+ bottom: 6px;
138
+ width: 100%;
139
+ font-size: 12px;
140
+ line-height: 14px;
141
+ }
131
142
  .calendar-day-tip {
132
143
  position: absolute;
133
- top: 10px;
144
+ bottom: 6px;
134
145
  width: 100%;
135
- font-size: 11px;
136
- line-height: 12px;
146
+ font-size: 12px;
147
+ line-height: 14px;
137
148
  color: $calendar-primary-color;
138
149
  }
139
-
150
+ .calendar-curr-tips-top {
151
+ top: 6px;
152
+ }
153
+ .calendar-curr-tips-bottom {
154
+ bottom: 6px;
155
+ }
140
156
  &-active {
141
157
  background-color: $calendar-primary-color;
142
158
  color: $white !important;
143
159
 
144
160
  .calendar-curr-tips {
161
+ // color: $white !important;
162
+ visibility: hidden;
163
+ }
164
+ .calendar-curr-tip-curr {
145
165
  visibility: hidden;
146
166
  }
147
-
148
167
  .calendar-day-tip {
149
168
  color: $white;
150
169
  }
@@ -159,7 +178,7 @@
159
178
  }
160
179
 
161
180
  .calendar-day {
162
- padding: 4px 0;
181
+ padding: 2px 0;
163
182
  font-size: $calendar-day-font;
164
183
  }
165
184
  }
@@ -169,19 +188,15 @@
169
188
 
170
189
  // 底部导航
171
190
  .nut-calendar-footer {
172
- position: absolute;
173
- left: 0;
174
- right: 0;
175
- bottom: -1px;
176
191
  display: flex;
177
- height: 78px;
192
+ height: 62px;
178
193
  width: 100%;
179
194
  background-color: $white;
180
195
 
181
196
  .calendar-confirm-btn {
182
197
  height: 44px;
183
198
  width: 100%;
184
- margin: 14px 18px;
199
+ margin: 10px 18px;
185
200
  border-radius: 22px;
186
201
  background: $button-primary-background-color;
187
202
  color: $white;
@@ -2,8 +2,8 @@
2
2
  position: relative;
3
3
  display: flex;
4
4
  width: 100%;
5
- line-height: 20px;
6
- padding: 13px 16px;
5
+ line-height: $cell-line-height;
6
+ padding: $cell-padding;
7
7
  background: $white;
8
8
  border-radius: $cell-border-radius;
9
9
  box-shadow: 0px 1px 7px 0px rgba(237, 238, 241, 1);
@@ -23,7 +23,7 @@
23
23
  box-sizing: border-box;
24
24
  content: ' ';
25
25
  pointer-events: none;
26
- right: 16px;
26
+ right: $cell-after-right;
27
27
  bottom: 0;
28
28
  left: 16px;
29
29
  transform: scaleY(0.5);
@@ -32,7 +32,7 @@
32
32
  }
33
33
  .nut-cell {
34
34
  &::after {
35
- border-bottom: 2px solid #f5f6f7;
35
+ border-bottom: $cell-after-border-bottom;
36
36
  }
37
37
  }
38
38
  }
@@ -33,6 +33,9 @@
33
33
  padding: 0 20px;
34
34
  height: 30px;
35
35
  line-height: 30px;
36
+ &--highcolor {
37
+ color: $elevator-list-item-highcolor;
38
+ }
36
39
  }
37
40
  }
38
41
  }
@@ -29,7 +29,7 @@
29
29
  width: 100%;
30
30
  padding-top: 16px;
31
31
  font-size: $font-size-small;
32
- color: $infinite-bottom-color;
32
+ color: $infiniteloading-bottom-color;
33
33
  text-align: center;
34
34
 
35
35
  .bottom-box {