diff --git a/components/me-top/me-top.vue b/components/me-top/me-top.vue
new file mode 100644
index 0000000..71798c0
--- /dev/null
+++ b/components/me-top/me-top.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 2d97930..11f22dd 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,13 @@
{
"pages": [
+ {
+ "path" : "pages/workbench/workbench",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "navigationStyle": "custom"
+ }
+ },
{
"path" : "pages/index/index",
"style" :
@@ -16,13 +24,6 @@
"disableScroll": true
}
},
- {
- "path" : "pages/workbench/workbench",
- "style" :
- {
- "navigationBarTitleText" : "工作台"
- }
- },
{
"path" : "pages/user/user",
"style" :
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3571bd9..8480742 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,13 +1,7 @@
-
-
-
-
-
- 接单大厅
-
+
@@ -117,6 +111,7 @@ import {ref, reactive, computed, watch, inject} from 'vue'
import MeIcon from "../../components/me-icon/me-icon";
import MeButton from "../../components/me-button/me-button";
import MeEmptySpace from "../../components/me-empty-space/me-empty-space.vue";
+import MeTop from "../../components/me-top/me-top.vue";
const data = reactive({
globalData: {},
})
@@ -138,27 +133,6 @@ const listMarginTop = computed(() => {
top: 0;
background-color: var(--pageBgColor);
width: 100%;
- .capsule {
- .icon-ctr {
- width: 60rpx;
- height: 60rpx;
- border: 1px solid #E9F1FE;
- border-radius: 50%;
- position: absolute;
- left: 0;
- .icon {
- width: 80%;
- height: 80%;
- border-radius: 50%;
- }
- }
- .title {
- font-weight: 500;
- font-size: 32rpx;
- color: var(--titleColor);
- margin-left: -60rpx;
- }
- }
}
.list {
.item {
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 8183fd0..e96eb14 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -1,22 +1,99 @@
-
-
-
+
+
+
+
+
+ {{item.name}}({{item.num}})
+
+
+
+
+
+
+
+
-
-
diff --git a/static/css/common.scss b/static/css/common.scss
index 0e1eb37..a3b6797 100644
--- a/static/css/common.scss
+++ b/static/css/common.scss
@@ -56,7 +56,7 @@
position: absolute;
width: 200%;
height: 1px;
- background: var(--dividingLineColor);
+ background: var(--dividerColor);
transform: scale(0.5);
transform-origin: 0 0;
}
@@ -78,7 +78,7 @@
position: absolute;
width: 1px;
height: 200%;
- background: var(--dividingLineColor);
+ background: var(--dividerColor);
transform: scale(0.5);
transform-origin: 0 0;
}
@@ -152,7 +152,7 @@
}
.auto-mask-layer-radius0::after {
@include auto-mask-layer();
- background-color: var(--hotZoneBgColor);
+ background-color: var(--contentBgColor);
border-radius: 0;
}
.auto-mask-layer-radius4{
@@ -160,7 +160,7 @@
}
.auto-mask-layer-radius4::after {
@include auto-mask-layer();
- background-color: var(--hotZoneBgColor);
+ background-color: var(--contentBgColor);
border-radius: 8rpx;
}
@@ -169,7 +169,7 @@
}
.auto-mask-layer-radius8::after {
@include auto-mask-layer();
- background-color: var(--hotZoneBgColor);
+ background-color: var(--contentBgColor);
border-radius: 16rpx;
}
@@ -178,7 +178,7 @@
}
.auto-mask-layer-radius-b8::after {
@include auto-mask-layer();
- background-color: var(--hotZoneBgColor);
+ background-color: var(--contentBgColor);
border-radius: 0rpx 0rpx 16rpx 16rpx;
}
@@ -187,7 +187,7 @@
}
.auto-mask-layer-radius-lb8::after {
@include auto-mask-layer();
- background-color: var(--hotZoneBgColor);
+ background-color: var(--contentBgColor);
border-radius: 0rpx 0rpx 0rpx 16rpx;
}
@@ -196,7 +196,7 @@
}
.auto-mask-layer-radius-rb8::after {
@include auto-mask-layer();
- background-color: var(--hotZoneBgColor);
+ background-color: var(--contentBgColor);
border-radius: 0rpx 0rpx 16rpx 0rpx;
}
@@ -234,12 +234,9 @@
.clickable-text {
color: var(--themeColor);
}
-.clickable-text:active {
- color: var(--themeColorClick);
-}
.placeholder-class {
- color: var(--contentColor30);
+ color: var(--descriptionColor);
}
swiper .wx-swiper-dots .wx-swiper-dot{