Skip to content

Commit 9d44269

Browse files
yangxiaolu1993lkjh3214lkjh3214szg2008richard1015
authored
feat: Picker/DatePicker/Address/Sku/Countdown 等组件进行暗黑模式修改 (#1511)
* fix: marge主分支 (#1) * doc: calendar 文档修改 (#1410) * feat: 添加range组件、calendar组件在线文档 * fix: 文档调整 * fix: 重构calendar组件 * feat: 日历组件重构，文档修改，功能完善 * fix: 格式化 * fix: 代码格式化调整。 * fix: 去除无用代码 * fix: 文档调整 * fix: 文档调整 * fix: taro demo 样式修改 * feat: range组件功能完善，新增 竖向操作，刻度展示。 * fix: 冲突解决 * feat: taro功能新增，兼容处理，文档修改 * feat: 添加range组件，jdt主题色 * fix: 修改组件初始化逻辑 * feat: 新增h5 日期多选功能 * feat: taro版本添加 日期多选功能 * fix: 修复多选，无法选中开头结尾日期问题 * fix: 文档修改，添加en-US 文档 * fix: 文档完善 Co-authored-by: lkjh3214 <[email protected]> Co-authored-by: love_forever <[email protected]> * feat: imagepreview 部分功能补齐 (#1412) * feat: image新增单元测试 * feat: ellipsis添加单元测试 * feat: imagepreview 添加 * fix: popop单元测试修改 * docs: 添加版本号 * feat: support highlight for JetBrains web-types * test(imagepreview): edit snap * fix(image): dts edit import * docs(input): demo和md国际化文案修改 (#1414) * fix: 抽离 input ConfirmTextType * feat: input、switch国际化 * feat: category、address国际化 * feat: taro升级maxlength问题 * fix: 国际化增加默认字段 * fix: blank * fix: input组件国际化文案修改 * style: add ellipsis add sass * docs(elevator): 增加吸顶props * feat: input组件新增input slot插槽 (#1418) * fix: 抽离 input ConfirmTextType * feat: input、switch国际化 * feat: category、address国际化 * feat: taro升级maxlength问题 * fix: 国际化增加默认字段 * fix: blank * fix: input组件国际化文案修改 * feat: input组件新增input slot插槽 * release: v3.1.22 * Update README.md add alipay img * Update README.md * docs: changelog 3.1.22 Co-authored-by: lkjh3214 <[email protected]> Co-authored-by: lkjh3214 <[email protected]> Co-authored-by: love_forever <[email protected]> Co-authored-by: richard1015 <[email protected]> Co-authored-by: ailululu <[email protected]> Co-authored-by: snandy <[email protected]> * feat: imagepreview重复问题修改 * fix: picker 组件重影问题修改 * fix: 科技样式同步 * feat: picker组件惯性滚动优化 * feat: picker组件惯性滚动优化 * fix: issue问题修噶 * fix: datepicker国际化修噶 * fix: datePicker在year-month下,maxDate不生效问题解决 * fix: picker异步处理 * fix: picker taro * fix: picker问题修改 * feat: address 新增插槽 * feat: address 新增插槽 * feat: 暗黑模式修改 * feat: comment暗黑模式 Co-authored-by: lkjh3214 <[email protected]> Co-authored-by: lkjh3214 <[email protected]> Co-authored-by: love_forever <[email protected]> Co-authored-by: richard1015 <[email protected]> Co-authored-by: ailululu <[email protected]> Co-authored-by: snandy <[email protected]>
1 parent 4f1bee5 commit 9d44269

File tree

12 files changed

+238
-55
lines changed

12 files changed

+238
-55
lines changed

‎src/packages/__VUE/address/index.scss

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
.nut-theme-dark {
2+
.nut-address {
3+
&__header {
4+
color: $dark-color;
5+
6+
&__title {
7+
color: $dark-color;
8+
}
9+
}
10+
11+
.custom-address {
12+
.region-tab {
13+
color: $dark-color;
14+
}
15+
.region-con {
16+
.region-group {
17+
.region-item {
18+
color: $dark-color;
19+
}
20+
}
21+
}
22+
}
23+
24+
.exist-address {
25+
.exist-address-group {
26+
.exist-ul {
27+
.exist-item {
28+
color: $dark-color;
29+
}
30+
}
31+
}
32+
33+
.choose-other {
34+
border-top: 1px solid $dark-background;
35+
}
36+
}
37+
&-custom-buttom {
38+
border-top: 1px solid $dark-background;
39+
}
40+
}
41+
}
42+
143
.nut-address {
244
display: block;
345
&__header {

‎src/packages/__VUE/audio/demo.vue

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,19 @@ export default createDemo({
147147
});
148148
</script>
149149
<style lang="scss" scoped>
150+
.nut-theme-dark {
151+
.demo {
152+
.nut-voice {
153+
background: $dark-color;
154+
border: 1px solid $dark-color;
155+
border-radius: 18px;
156+
}
157+
158+
.nut-audio-operate {
159+
color: $dark-color;
160+
}
161+
}
162+
}
150163
.demo {
151164
.nut-voice {
152165
display: flex;

‎src/packages/__VUE/audio/index.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
.nut-theme-dark {
2+
.nut-audio-icon {
3+
.nut-audio-icon-box {
4+
background: $dark-color;
5+
}
6+
}
7+
}
8+
19
.nut-audio {
210
padding: 0;
311
.progress-wrapper {

‎src/packages/__VUE/comment/index.scss

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
.nut-theme-dark {
2+
.nut-comment {
3+
&-header {
4+
&__user {
5+
&-name {
6+
color: $dark-color;
7+
}
8+
9+
&-default {
10+
&-name {
11+
color: $dark-color;
12+
}
13+
}
14+
}
15+
}
16+
&__follow {
17+
&-title {
18+
color: $dark-color;
19+
}
20+
}
21+
&-bottom {
22+
&__cpx {
23+
color: $dark-color;
24+
25+
&-item {
26+
span {
27+
color: $dark-color;
28+
}
29+
}
30+
}
31+
}
32+
33+
.nut-comment-shop {
34+
border-top: 1px solid $dark-color;
35+
}
36+
}
37+
}
138
.nut-comment {
239
width: 100%;
340
font-size: 12px;

‎src/packages/__VUE/image/index.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
.nut-theme-dark {
2+
.nut-image {
3+
.nut-img-loading {
4+
background: $dark-background;
5+
}
6+
7+
.nut-img-error {
8+
background: $dark-background;
9+
}
10+
}
11+
}
12+
113
.nut-image {
214
display: block;
315
position: relative;

‎src/packages/__VUE/infiniteloading/demo.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ export default createDemo({
157157
</script>
158158

159159
<style lang="scss" scoped>
160+
.nut-theme-dark {
161+
.infiniteLi {
162+
color: $dark-color;
163+
}
164+
}
160165
.infiniteUl {
161166
height: 300px;
162167
width: 100%;

‎src/packages/__VUE/infiniteloading/index.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
.nut-theme-dark {
2+
.nut-infiniteloading {
3+
.nut-infinite-top {
4+
.top-text {
5+
color: $dark-color;
6+
}
7+
}
8+
9+
.nut-infinite-bottom {
10+
color: $dark-color;
11+
12+
.bottom-text {
13+
color: $dark-color;
14+
}
15+
}
16+
}
17+
}
18+
119
.nut-infiniteloading {
220
display: block;
321
width: 100%;

‎src/packages/__VUE/noticebar/demo.vue

Lines changed: 16 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,23 @@
44
<nut-noticebar :text="translate('text')"></nut-noticebar>
55

66
<h2>{{ translate('scrollable') }}</h2>
7-
<nut-noticebar
8-
:text="translate('textShort')"
9-
:scrollable="true"
10-
:background="`rgba(251, 248, 220, 1)`"
11-
:color="`#D9500B`"
12-
>
13-
</nut-noticebar>
7+
<nut-noticebar :text="translate('textShort')" :scrollable="true"> </nut-noticebar>
148
<p />
15-
<nut-noticebar
16-
:text="translate('text')"
17-
:scrollable="false"
18-
:background="`rgba(251, 248, 220, 1)`"
19-
:color="`#D9500B`"
20-
></nut-noticebar>
9+
<nut-noticebar :text="translate('text')" :scrollable="false"></nut-noticebar>
2110

2211
<h2>{{ translate('mode') }}</h2>
23-
<nut-noticebar :closeMode="true" @click="hello" :background="`rgba(251, 248, 220, 1)`" :color="`#D9500B`"
24-
>{{ translate('text') }}
25-
</nut-noticebar>
12+
<nut-noticebar :closeMode="true" @click="hello">{{ translate('text') }} </nut-noticebar>
2613
<p />
27-
<nut-noticebar
28-
:closeMode="true"
29-
right-icon="circle-close"
30-
@click="hello"
31-
:background="`rgba(251, 248, 220, 1)`"
32-
:color="`#D9500B`"
33-
>{{ translate('text') }}
34-
</nut-noticebar>
14+
<nut-noticebar :closeMode="true" right-icon="circle-close" @click="hello">{{ translate('text') }} </nut-noticebar>
3515
<p />
3616
<nut-noticebar
3717
left-icon="https://img13.360buyimg.com/imagetools/jfs/t1/72082/2/3006/1197/5d130c8dE1c71bcd6/e48a3b60804c9775.png"
38-
:background="`rgba(251, 248, 220, 1)`"
39-
:color="`#D9500B`"
4018
>
4119
<a href="https://www.jd.com">{{ translate('jd') }}</a>
4220
</nut-noticebar>
4321

4422
<h2>{{ translate('multiline') }}</h2>
45-
<nut-noticebar
46-
:text="translate('text')"
47-
wrapable
48-
:background="`rgba(251, 248, 220, 1)`"
49-
:color="`#D9500B`"
50-
></nut-noticebar>
23+
<nut-noticebar :text="translate('text')" wrapable></nut-noticebar>
5124

5225
<h2>{{ translate('vertical') }}</h2>
5326
<div class="interstroll-list">
@@ -58,8 +31,6 @@
5831
:standTime="1000"
5932
@click="go"
6033
:closeMode="true"
61-
:background="`rgba(251, 248, 220, 1)`"
62-
:color="`#D9500B`"
6334
></nut-noticebar>
6435
</div>
6536

@@ -71,22 +42,11 @@
7142
:speed="10"
7243
:standTime="2000"
7344
:complexAm="true"
74-
:background="`rgba(251, 248, 220, 1)`"
75-
:color="`#D9500B`"
7645
></nut-noticebar>
7746
</div>
7847
<h2>{{ translate('customAm') }}</h2>
7948
<div class="interstroll-list">
80-
<nut-noticebar
81-
direction="vertical"
82-
:height="50"
83-
:speed="10"
84-
:standTime="1000"
85-
:list="[]"
86-
@close="go"
87-
:background="`rgba(251, 248, 220, 1)`"
88-
:color="`#D9500B`"
89-
>
49+
<nut-noticebar direction="vertical" :height="50" :speed="10" :standTime="1000" :list="[]" @close="go">
9050
<div
9151
class="custom-item"
9252
:data-index="index"
@@ -100,14 +60,7 @@
10060

10161
<h2>{{ translate('customRightIcon') }}</h2>
10262
<div class="interstroll-list">
103-
<nut-noticebar
104-
direction="vertical"
105-
:list="horseLamp1"
106-
:speed="10"
107-
:standTime="1000"
108-
:background="`rgba(251, 248, 220, 1)`"
109-
:color="`#D9500B`"
110-
>
63+
<nut-noticebar direction="vertical" :list="horseLamp1" :speed="10" :standTime="1000">
11164
<template v-slot:rightIcon>
11265
<nut-icon name="fabulous" color="#f0250f"> </nut-icon>
11366
</template>
@@ -183,6 +136,15 @@ export default createDemo({
183136
</script>
184137

185138
<style lang="scss" scoped>
139+
.nut-theme-dark {
140+
.custom-item {
141+
color: $dark-color;
142+
}
143+
144+
a {
145+
color: $dark-color;
146+
}
147+
}
186148
.demo {
187149
padding-bottom: 30px !important;
188150

‎src/packages/__VUE/noticebar/index.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
.nut-theme-dark {
2+
.nut-noticebar-page {
3+
background: $dark-background2;
4+
color: $dark-color;
5+
}
6+
7+
.nut-noticebar-vertical {
8+
.horseLamp_list_item {
9+
color: $dark-color;
10+
}
11+
}
12+
}
113
.nut-noticebar-page {
214
// width: 100%;
315
display: flex;

‎src/packages/__VUE/picker/index.scss

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
.nut-theme-dark {
2+
.nut-picker {
3+
&__title {
4+
color: $dark-color;
5+
}
6+
7+
&-roller {
8+
&-item {
9+
color: $dark-color;
10+
}
11+
12+
&-item-tile {
13+
color: $dark-color;
14+
}
15+
}
16+
17+
&-roller-mask {
18+
background-image: linear-gradient(180deg, rgba(27, 27, 27, 0.9), rgba(27, 27, 27, 0.4)),
19+
linear-gradient(0deg, rgba(27, 27, 27, 0.9), rgba(27, 27, 27, 0.4));
20+
background-repeat: no-repeat;
21+
background-position: top, bottom;
22+
background-size: 100% 108px;
23+
z-index: 1;
24+
}
25+
26+
&-content {
27+
color: $dark-color;
28+
}
29+
&-item {
30+
color: $dark-color;
31+
}
32+
}
33+
}
134
.nut-picker {
235
// 标题
336
&__bar {

‎src/packages/__VUE/sku/index.scss

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
.nut-theme-dark {
2+
.nut-sku {
3+
background: $dark-background;
4+
5+
&-select {
6+
&-item {
7+
&-title {
8+
color: $dark-color;
9+
}
10+
&-skus {
11+
&-sku {
12+
color: $dark-color;
13+
background: $dark-background2;
14+
}
15+
}
16+
}
17+
}
18+
19+
&-stepper {
20+
&-title {
21+
color: $dark-color;
22+
}
23+
&-limit {
24+
color: $dark-color;
25+
}
26+
&-count {
27+
&-lowestBuy {
28+
color: $primary-color;
29+
}
30+
}
31+
}
32+
33+
&-operate {
34+
&-btn {
35+
background: $dark-background2;
36+
}
37+
}
38+
}
39+
}
40+
141
.nut-sku {
242
height: 100%;
343
display: flex;

‎src/sites/mobile-taro/vue/project.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"minifyWXML": true,
4040
"showES6CompileOption": false,
4141
"useCompilerPlugins": false,
42-
"ignoreUploadUnusedFiles": true
42+
"ignoreUploadUnusedFiles": true,
43+
"useStaticServer": true
4344
},
4445
"compileType": "miniprogram",
4546
"simulatorType": "wechat",

0 commit comments

Comments
 (0)