diff --git a/components/me-icon/me-icon.css b/components/me-icon/me-icon.css
index 983eb1f..e49060c 100644
--- a/components/me-icon/me-icon.css
+++ b/components/me-icon/me-icon.css
@@ -1,3 +1,6 @@
+.icon-upload-cloud-fill:before {
+ content: "\e90b";
+}
.icon-arrow-right:before {
content: "\e90a";
}
diff --git a/components/me-icon/me-icon.ttf b/components/me-icon/me-icon.ttf
index 360f009..595aca1 100644
Binary files a/components/me-icon/me-icon.ttf and b/components/me-icon/me-icon.ttf differ
diff --git a/pages.json b/pages.json
index 1e5f5b6..b73cace 100644
--- a/pages.json
+++ b/pages.json
@@ -38,6 +38,13 @@
{
"navigationBarTitleText" : "工单详情"
}
+ },
+ {
+ "path" : "pages/order/order-submit",
+ "style" :
+ {
+ "navigationBarTitleText" : "提交"
+ }
}
],
"globalStyle": {
diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue
index 16a99e9..f4f8531 100644
--- a/pages/order/order-info.vue
+++ b/pages/order/order-info.vue
@@ -49,7 +49,7 @@
-
+
@@ -59,6 +59,11 @@
import MeIcon from "../../components/me-icon/me-icon.vue";
import MeEmptySpace from "../../components/me-empty-space/me-empty-space.vue";
import MeButton from "../../components/me-button/me-button.vue";
+import helpers from "../../utils/helpers";
+
+const submit = () => {
+ helpers.jumpToPage('order-submit')
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/theme/theme.scss b/theme/theme.scss
index 4b14f49..65701a6 100644
--- a/theme/theme.scss
+++ b/theme/theme.scss
@@ -10,6 +10,7 @@
--containerBgColor: #FFFFFF; // 内容块背景
--importantColor: #E6521F; // 重要色
--themeColor: #2772F0; // 主题色
+ --themeColor30: rgba(39, 114, 240, 0.3);//主题色30%
--navbarBgColor: #FFFFFF; // 导航背景
--defaultUserAvatar: url("/static/img/default-user.png") no-repeat center / 100%;
@@ -28,6 +29,7 @@
--containerBgColor: #1E1E1E;
--importantColor: #E6521F;
--themeColor: #2772F0;
+ --themeColor30: rgba(39, 114, 240, 0.3);//主题色30%
--navbarBgColor: #1D1D1D;
--defaultUserAvatar: url("/static/img/default-user-dark.png") no-repeat center / 100%;
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
index cf6ce89..27fc225 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -76,7 +76,7 @@
font-size: 14px;
// font-family: Lato-Bold, Lato;
font-weight: bold;
- color: var(--contentColor90);
+ color: var(--titleColor);
}
.uni-calendar-item__weeks-box-item {
@@ -102,7 +102,7 @@
width: 8px;
height: 8px;
border-radius: 8px;
- background-color: var(--remindColor);
+ background-color: var(--importantColor);
}
@@ -111,21 +111,21 @@
}
.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
- color: var(--contentColor30);
+ color: var(--contentBgColor);
}
.uni-calendar-item--today {
position: absolute;
top: 10px;
right: 17%;
- background-color: var(--remindColor);
+ background-color: var(--importantColor);
width:6px;
height: 6px;
border-radius: 50%;
}
.uni-calendar-item--extra {
- color: var(--remindColor);
+ color: var(--importantColor);
opacity: 0.8;
}
@@ -160,7 +160,7 @@
.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
- color: var(--contentColor90)
+ color: var(--titleColor)
}
.uni-calendar-item--before-checked-x {
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
index 94a790c..2fd813e 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -686,7 +686,7 @@
}
.uni-calendar__content {
- background-color: var(--blockBgColor);
+ background-color: var(--containerBgColor);
}
.uni-calendar__content-mobile {
@@ -748,7 +748,7 @@
text-align: center;
width: 100px;
font-size: 15px;
- color: var(--contentColor50);
+ color: var(--summaryColor);
}
.uni-calendar__button-text {
@@ -775,10 +775,10 @@
.uni-calendar__header-btn {
width: 9px;
height: 9px;
- border-left-color: var(--contentColor50);
+ border-left-color: var(--summaryColor);
border-left-style: solid;
border-left-width: 1px;
- border-top-color: var(--contentColor50);
+ border-top-color: var(--summaryColor);
border-top-style: solid;
border-top-width: 1px;
}
@@ -820,7 +820,7 @@
.uni-calendar__weeks-day-text {
font-size: 12px;
- color: var(--contentColor50);
+ color: var(--summaryColor);
}
.uni-calendar__box {
@@ -884,7 +884,7 @@
}
.uni-date-changed--time-date {
- color: var(--contentColor50);
+ color: var(--summaryColor);
line-height: 50px;
/* #ifdef MP-TOUTIAO */
font-size: 16px;
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
index 290c9fb..1faae71 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -14,12 +14,12 @@