diff --git a/components/layout/AiDvWrapper/AiDvWrapper.vue b/components/layout/AiDvWrapper/AiDvWrapper.vue index 0c24ece9..4499557f 100644 --- a/components/layout/AiDvWrapper/AiDvWrapper.vue +++ b/components/layout/AiDvWrapper/AiDvWrapper.vue @@ -2,7 +2,8 @@
- +
@@ -23,10 +24,11 @@ import {fullScreenContainer} from '@jiaminghi/data-view' import AiSprite from "../../AiSprite"; import Classic from "./layout/classic"; import Vue from "vue" +import Primary from "./layout/primary"; export default { name: "AiDvWrapper", - components: {Classic, AiSprite}, + components: {Primary, Classic, AiSprite}, model: { prop: 'value', event: 'change' @@ -44,7 +46,7 @@ export default { /** * 布局方案:black,classic */ - type: {default: "classic"} + type: {default: "black"} }, computed: { active: { @@ -56,7 +58,8 @@ export default { } }, headerComponent: v => ({ - classic: Classic + classic: Classic, + black: Primary }[v.type]) }, watch: { diff --git a/components/layout/AiDvWrapper/assets/fullscreenIcon.png b/components/layout/AiDvWrapper/assets/fullscreenIcon.png new file mode 100644 index 00000000..c53081d4 Binary files /dev/null and b/components/layout/AiDvWrapper/assets/fullscreenIcon.png differ diff --git a/components/layout/AiDvWrapper/assets/headerPrimaryBG_lb.png b/components/layout/AiDvWrapper/assets/headerPrimaryBG_lb.png new file mode 100644 index 00000000..53e012d9 Binary files /dev/null and b/components/layout/AiDvWrapper/assets/headerPrimaryBG_lb.png differ diff --git a/components/layout/AiDvWrapper/assets/headerPrimaryBg_rb.png b/components/layout/AiDvWrapper/assets/headerPrimaryBg_rb.png new file mode 100644 index 00000000..45c4b278 Binary files /dev/null and b/components/layout/AiDvWrapper/assets/headerPrimaryBg_rb.png differ diff --git a/components/layout/AiDvWrapper/assets/settingIcon.png b/components/layout/AiDvWrapper/assets/settingIcon.png new file mode 100644 index 00000000..3fdb6f2f Binary files /dev/null and b/components/layout/AiDvWrapper/assets/settingIcon.png differ diff --git a/components/layout/AiDvWrapper/assets/timeIcon.png b/components/layout/AiDvWrapper/assets/timeIcon.png new file mode 100644 index 00000000..46629684 Binary files /dev/null and b/components/layout/AiDvWrapper/assets/timeIcon.png differ diff --git a/components/layout/AiDvWrapper/assets/weatherIcon.png b/components/layout/AiDvWrapper/assets/weatherIcon.png new file mode 100644 index 00000000..87973c0f Binary files /dev/null and b/components/layout/AiDvWrapper/assets/weatherIcon.png differ diff --git a/components/layout/AiDvWrapper/layout/classic.vue b/components/layout/AiDvWrapper/layout/classic.vue index 83da08d5..6939b28c 100644 --- a/components/layout/AiDvWrapper/layout/classic.vue +++ b/components/layout/AiDvWrapper/layout/classic.vue @@ -220,7 +220,7 @@ export default { width: 760px; height: 124px; background-repeat: no-repeat; - background-image: url("./../assets/headerCenterBorderLight.svg"), url("./../assets/headerCenterBorder.svg"), url("./../assets/headerCenterBg2.png"); + background-image: url("../assets/headerCenterBorderLight.svg"), url("../assets/headerCenterBorder.svg"), url("../assets/headerCenterBg2.png"); background-position: center bottom, center 0, center -20px; overflow: visible; diff --git a/components/layout/AiDvWrapper/layout/primary.vue b/components/layout/AiDvWrapper/layout/primary.vue new file mode 100644 index 00000000..8cedd77c --- /dev/null +++ b/components/layout/AiDvWrapper/layout/primary.vue @@ -0,0 +1,163 @@ + + + + + diff --git a/ui/lib/styles/common.scss b/ui/lib/styles/common.scss index b6b38e81..ea635075 100644 --- a/ui/lib/styles/common.scss +++ b/ui/lib/styles/common.scss @@ -23,7 +23,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; } } -@each $v in (8, 10, 12, 14, 16, 20, 32, 48, 56, 64, 80) { +@each $v in (8, 10, 12, 14, 16, 20, 24, 32, 48, 56, 64, 80) { //gap .gap-#{$v} { gap: #{$v}px