diff --git a/src/assets/canvasImg/erweima@2x.png b/src/assets/canvasImg/erweima@2x.png new file mode 100644 index 0000000..4fbcf6f Binary files /dev/null and b/src/assets/canvasImg/erweima@2x.png differ diff --git a/src/assets/canvasImg/gzh.png b/src/assets/canvasImg/gzh.png new file mode 100644 index 0000000..ec6fc44 Binary files /dev/null and b/src/assets/canvasImg/gzh.png differ diff --git a/src/assets/canvasImg/logo.png b/src/assets/canvasImg/logo.png new file mode 100644 index 0000000..9862de1 Binary files /dev/null and b/src/assets/canvasImg/logo.png differ diff --git a/src/assets/canvasImg/xcxm.png b/src/assets/canvasImg/xcxm.png new file mode 100644 index 0000000..3d8b055 Binary files /dev/null and b/src/assets/canvasImg/xcxm.png differ diff --git a/src/assets/styles/yshop.scss b/src/assets/styles/yshop.scss index 992faf3..d72f5aa 100644 --- a/src/assets/styles/yshop.scss +++ b/src/assets/styles/yshop.scss @@ -151,6 +151,23 @@ html, body { font-size: 12px !important; } +.containerMall{ + +*{ + padding: 0; + margin: 0; +} + +body, dl, h1, h2, h3, h4, h5, h6, ol, p, ul { + margin: 0; + font-weight: 400; + padding: 0; +} + +ol, ul { + list-style: none; +} +} .page { margin-top: 22px; diff --git a/src/router/routers.js b/src/router/routers.js index 8b2a1d1..f980c64 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -38,7 +38,7 @@ export const constantRouterMap = [ children: [ { path: 'dashboard', - component: (resolve) => require(['@/views/home'], resolve), + component: (resolve) => require(['@/views/theme/container'], resolve), name: 'Dashboard', meta: { title: '首页', icon: 'index', affix: true, noCache: true } } @@ -67,7 +67,7 @@ export const constantRouterMap = [ }, component: (resolve) => require(['@/components/editorMaterial/index'], resolve), hidden: true - }, + } ] export default new Router({ diff --git a/src/views/theme/components/canvasEditPage.vue b/src/views/theme/components/canvasEditPage.vue index a05fc43..ec0c49c 100644 --- a/src/views/theme/components/canvasEditPage.vue +++ b/src/views/theme/components/canvasEditPage.vue @@ -17,7 +17,7 @@ :terminal="terminal">
- +
diff --git a/src/views/theme/components/canvasShow/pc/NavType.vue b/src/views/theme/components/canvasShow/pc/NavType.vue index f60555a..98176a7 100644 --- a/src/views/theme/components/canvasShow/pc/NavType.vue +++ b/src/views/theme/components/canvasShow/pc/NavType.vue @@ -7,7 +7,7 @@
- logo + logo
diff --git a/src/views/theme/components/leftBar/panel.vue b/src/views/theme/components/leftBar/panel.vue index 1542448..9dcfbc9 100644 --- a/src/views/theme/components/leftBar/panel.vue +++ b/src/views/theme/components/leftBar/panel.vue @@ -9,7 +9,7 @@ :class="{ on: componentActive == index }" @click="componentActive = index" > - + {{ item }} diff --git a/src/views/theme/components/leftBar/panelList.js b/src/views/theme/components/leftBar/panelList.js index 8bade03..183c9ac 100644 --- a/src/views/theme/components/leftBar/panelList.js +++ b/src/views/theme/components/leftBar/panelList.js @@ -386,13 +386,13 @@ export const panelList = [ { 'title': '微信公众号', 'des': '微信公众号', - 'pic': 'static/img/erweima@2x.png', + 'pic': '/static/img/erweima@2x.png', 'linkTo': '' }, { 'title': '小程序码', 'des': '小程序码', - 'pic': 'static/img/xcxm.png', + 'pic': '/static/img/xcxm.png', 'linkTo': '' } ] diff --git a/src/views/theme/container/index.vue b/src/views/theme/container/index.vue index 91afb0f..51ce047 100644 --- a/src/views/theme/container/index.vue +++ b/src/views/theme/container/index.vue @@ -10,7 +10,7 @@ :class="{ on: terminal == item.id }" > - +