Skip to content

Commit 1e8d4da

Browse files
committed
[new] color UI 更新到3.x
1. 对大量ui进行修改 2. 适配黑夜模式 3. 页面大部分修改
1 parent 85e81cd commit 1e8d4da

File tree

245 files changed

+11540
-762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+11540
-762
lines changed

app.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
//app.js
2+
import { colorUI } from './config/ColorUI.js'
3+
import { colorUISdk } from './config/mp-sdk.js'
24
App({
35
//onLaunch,onShow: options(path,query,scene,shareTicket,referrerInfo(appId,extraData))
6+
7+
colorUI,//挂载到app上
8+
colorUISdk,
49
onLaunch: function(options){
510

611
},
712
onShow: function(options){
813

9-
},
10-
onHide: function(){
11-
12-
},
13-
onError: function(msg){
14-
15-
},
16-
//options(path,query,isEntryPage)
17-
onPageNotFound: function(options){
18-
1914
},
2015
globalData: {
2116
userInfo: {},

app.json

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,60 @@
1212
"pages/publish/publish",
1313
"pages/search/search",
1414
"pages/user/change_user_info",
15-
"pages/user/user"
15+
"pages/user/user",
16+
"pages/setting/setting"
1617
],
1718
"window": {
1819
"backgroundTextStyle": "light",
1920
"navigationBarBackgroundColor": "#eaa8b6",
2021
"navigationBarTitleText": "findPlatform",
2122
"navigationBarTextStyle": "white",
22-
"backgroundColor": "#ededed"
23+
"backgroundColor": "#ededed",
24+
"navigationStyle": "custom"
25+
2326
},
27+
28+
"usingComponents": {
29+
"ui-sys": "mp-cu/colorUI/components/ui-sys/ui-sys",
30+
"ui-title": "mp-cu/colorUI/components/ui-title/ui-title",
31+
"ui-code": "mp-cu/colorUI/components/ui-code/ui-code",
32+
"ui-loading": "mp-cu/colorUI/components/ui-loading/ui-loading",
33+
"ui-menu": "mp-cu/colorUI/components/ui-menu/ui-menu",
34+
"ui-menu-item": "mp-cu/colorUI/components/ui-menu-item/ui-menu-item",
35+
"ui-avatar": "mp-cu/colorUI/components/ui-avatar/ui-avatar",
36+
"ui-avatar-stack": "mp-cu/colorUI/components/ui-avatar-stack/ui-avatar-stack",
37+
"ui-modal": "mp-cu/colorUI/components/ui-modal/ui-modal",
38+
"ui-toast": "mp-cu/colorUI/components/ui-toast/ui-toast",
39+
"ui-switch": "mp-cu/colorUI/components/ui-switch/ui-switch",
40+
"ui-radio-group": "mp-cu/colorUI/components/ui-radio-group/ui-radio-group",
41+
"ui-radio": "mp-cu/colorUI/components/ui-radio/ui-radio",
42+
"ui-card": "mp-cu/colorUI/components/ui-card/ui-card",
43+
"ui-fixed": "mp-cu/colorUI/components/ui-fixed/ui-fixed",
44+
"ui-img": "mp-cu/colorUI/components/ui-img/ui-img",
45+
"ui-navbar": "/mp-cu/colorUI/components/ui-navbar/ui-navbar",
46+
"ui-swiper": "/mp-cu/colorUI/components/ui-swiper/ui-swiper",
47+
"ui-text-size": "/mp-cu/colorUI/components/ui-text-size/ui-text-size",
48+
"ui-tag": "/mp-cu/colorUI/components/ui-tag/ui-tag",
49+
"ui-progress": "/mp-cu/colorUI/components/ui-progress/ui-progress",
50+
"ui-tab": "/mp-cu/colorUI/components/ui-tab/ui-tab",
51+
"ui-popover" : "/mp-cu/colorUI/components/ui-popover/ui-popover",
52+
"ui-steps" : "/mp-cu/colorUI/components/ui-steps/ui-steps",
53+
"ui-form" : "/mp-cu/colorUI/components/ui-form/ui-form",
54+
"ui-form-group" : "/mp-cu/colorUI/components/ui-form-group/ui-form-group",
55+
"ui-input-box" : "/mp-cu/colorUI/components/ui-input-box/ui-input-box",
56+
"ui-checkbox" : "/mp-cu/colorUI/components/ui-checkbox/ui-checkbox",
57+
"ui-checkbox-group" : "/mp-cu/colorUI/components/ui-checkbox-group/ui-checkbox-group",
58+
"ui-change-theme": "/mp-cu/colorUI/components/ui-change-theme/ui-change-theme",
59+
"ui-parameter" : "/mp-sdk/components/ui-parameter/ui-parameter"
60+
},
61+
2462
"tabBar": {
25-
"color": "#999",
26-
"selectedColor": "#ff2d4a",
27-
"backgroundColor": "#f5f6f8",
63+
"color": "#959595",
64+
"selectedColor": "#eaa8b6",
65+
"borderStyle": "white",
66+
"backgroundColor": "#ffffff",
2867
"position": "bottom",
29-
"borderStyle": "black",
68+
3069
"list": [
3170
{
3271
"pagePath": "pages/index/index",
@@ -54,8 +93,8 @@
5493
}
5594
]
5695
},
96+
"darkmode": true,
5797
"lazyCodeLoading": "requiredComponents",
58-
"style": "v2",
5998
"sitemapLocation": "sitemap.json",
6099
"permission": {
61100
"scope.userLocation": {

app.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@import "./styles/iconfont.wxss";
2+
@import './mp-cu/colorUI/scss/ui.scss';
3+
@import "colorui/main.wxss";
4+
@import "colorui/icon.wxss";
5+
@import "colorui/dark.wxss";

app.wxss

Lines changed: 0 additions & 18 deletions
This file was deleted.

colorui/components/cu-custom.js

Lines changed: 0 additions & 54 deletions
This file was deleted.

colorui/components/cu-custom.wxml

Lines changed: 0 additions & 16 deletions
This file was deleted.

colorui/components/cu-custom.wxss

Lines changed: 0 additions & 1 deletion
This file was deleted.

colorui/dark.wxss

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
/* 暗黑模式下应用的样式 */
2+
@media (prefers-color-scheme: dark) {
3+
page {
4+
/* 暗黑模式背景色 */
5+
--darkBlack: #000000;
6+
--lightGray: #393939;
7+
--darkGray: #141414;
8+
/* 暗黑模式按钮颜色 */
9+
--btnGray: #313131;
10+
/* 暗黑模式字体颜色 */
11+
--darkTitle: rgba(255, 255, 255, .85);
12+
--darkPrimaryText: rgba(255, 255, 255, .65);
13+
--darkSecondaryText: rgba(255, 255, 255, .45);
14+
--darkDisable: rgba(255, 255, 255, .1);
15+
/* 暗黑模式渐变色 */
16+
--darkGradualRed: linear-gradient(45deg, #f43f3b, #ec008c);
17+
--darkGradualOrange: linear-gradient(45deg, #ff9700, #ed1c24);
18+
--darkGradualGreen: linear-gradient(45deg, #39b54a, #8dc63f);
19+
--darkGradualPurple: linear-gradient(45deg, #9000ff, #5e00ff);
20+
--darkGradualPink: linear-gradient(45deg, #ec008c, #6739b6);
21+
--darkGradualBlue: linear-gradient(45deg, #112A45, #1765AD);
22+
/* 阴影透明色 */
23+
--ShadowSize: 6rpx 6rpx 8rpx;
24+
--redShadow: rgba(204, 69, 59, 0.8);
25+
--orangeShadow: rgba(217, 109, 26, 0.8);
26+
--yellowShadow: rgba(224, 170, 7, 0.8);
27+
--oliveShadow: rgba(124, 173, 55, 0.8);
28+
--greenShadow: rgba(48, 156, 63, 0.8);
29+
--cyanShadow: rgba(28, 187, 180, 0.8);
30+
--blueShadow: rgba(0, 102, 204, 0.8);
31+
--purpleShadow: rgba(88, 48, 156, 0.8);
32+
--mauveShadow: rgba(133, 33, 150, 0.8);
33+
--pinkShadow: rgba(199, 50, 134, 0.8);
34+
--brownShadow: rgba(140, 88, 53, 0.8);
35+
--greyShadow: rgba(114, 130, 138, 0.8);
36+
--grayShadow: rgba(114, 130, 138, 0.8);
37+
--blackShadow: rgba(26, 26, 26, 0.8);
38+
}
39+
40+
page {
41+
background-color: var(--darkBlack);
42+
color: var(--darkPrimaryText);
43+
}
44+
45+
.bg-gradual-blue {
46+
background-image: var(--darkGradualBlue);
47+
}
48+
49+
.bg-white {
50+
color: var(--gray);
51+
background-color: var(--darkGray);
52+
}
53+
54+
.cu-list.menu>.cu-item {
55+
background-color: var(--lightGray);
56+
}
57+
58+
.text-black,
59+
.line-black,
60+
.lines-black {
61+
color: var(--darkTitle);
62+
}
63+
64+
.solids::after {
65+
border: 8rpx solid var(--darkDisable);
66+
}
67+
68+
.solids-top::after {
69+
border-top: 8rpx solid var(--darkDisable);
70+
}
71+
72+
.solids-right::after {
73+
border-right: 8rpx solid var(--darkDisable);
74+
}
75+
76+
.solids-bottom::after {
77+
border-bottom: 8rpx solid var(--darkDisable);
78+
}
79+
80+
.solids-left::after {
81+
border-left: 8rpx solid var(--darkDisable);
82+
}
83+
84+
.cu-bar .search-form {
85+
background-color: var(--lightGray);
86+
color: var(--darkPrimaryText);
87+
}
88+
89+
.cu-list.grid {
90+
background-color: var(--darkGray);
91+
}
92+
93+
.cu-btn:not([class*="bg-"]) {
94+
background-color: var(--btnGray);
95+
}
96+
97+
radio.radio[checked]::after {
98+
border: 8px solid var(--darkDisable) !important;
99+
}
100+
101+
.cu-progress {
102+
background-color: #424242;
103+
}
104+
105+
.cu-progress view {
106+
color: var(--darkPrimaryText);
107+
}
108+
109+
.cu-load.load-modal {
110+
background-color: var(--lightGray);
111+
color: var(--darkPrimaryText);
112+
}
113+
114+
.cu-load.load-modal::after {
115+
background-color: var(--lightGray);
116+
}
117+
118+
.cu-bar {
119+
background-color: var(--lightGray);
120+
}
121+
122+
.cu-bar, .cu-bar.input {
123+
background-color: var(--lightGray);
124+
}
125+
126+
.cu-chat .cu-item>.main .content:not([class*="bg-"]) {
127+
background-color: var(--lightGray);
128+
color: var(--darkPrimaryText);
129+
}
130+
131+
.cu-chat .cu-info {
132+
background-color: rgba(255, 255, 255, 0.2);
133+
color: var(--darkPrimaryText);
134+
}
135+
136+
.cu-list.menu-avatar>.cu-item {
137+
background-color: var(--lightGray);
138+
}
139+
140+
.cu-card.dynamic>.cu-item {
141+
background-color: var(--lightGray);
142+
}
143+
144+
.cu-card>.cu-item {
145+
background-color: var(--lightGray);
146+
}
147+
148+
.cu-timeline {
149+
background-color: var(--lightGray);
150+
}
151+
152+
.cu-timeline>.cu-item::before {
153+
background-color: var(--lightGray);
154+
}
155+
156+
.cu-timeline>.cu-item[class*="cuIcon-"]::before {
157+
background-color: var(--lightGray);
158+
}
159+
160+
.cu-form-group {
161+
background-color: var(--lightGray);
162+
}
163+
164+
.cu-form-group+.cu-form-group {
165+
border-top: 1rpx solid var(--darkDisable);
166+
}
167+
}

components/mp-html/audio/audio-bgAudio.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/mp-html/audio/audio.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)