Explorar o código

Merge branch 'dev' of http://39.106.8.246:3003/zhangyu/PDM into dev

 Conflicts:
	src/router/system.js
shaun-sheep %!s(int64=4) %!d(string=hai) anos
pai
achega
006ef666f5

+ 27 - 0
src/components/brand/brandTool.vue

@@ -0,0 +1,27 @@
+<!--
+ * @Author: zhangyu
+ * @Date: 2020-05-08 18:37:31
+ * @Info: 
+ * @LastEditTime: 2020-05-08 19:01:25
+ -->
+<template>
+  <div>
+    <span>品牌总数</span>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  created() {},
+  mounted() {},
+  data() {
+    return {
+    }
+  },
+  methods: {}
+}
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 26 - 0
src/components/brand/sagaBrand.vue

@@ -0,0 +1,26 @@
+<!--
+ * @Author: zhangyu
+ * @Date: 2020-05-08 16:06:03
+ * @Info: 
+ * @LastEditTime: 2020-05-08 16:23:35
+ -->
+<template>
+  <div>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  created() {},
+  mounted() {},
+  data() {
+    return {
+    }
+  },
+  methods: {}
+}
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 44 - 0
src/components/public/sagaToolbar.vue

@@ -0,0 +1,44 @@
+<!--
+ * @Author: zhangyu
+ * @Date: 2020-05-08 16:47:45
+ * @Info: 
+ * @LastEditTime: 2020-05-08 18:38:11
+ -->
+<template>
+  <div class="saga-toolbar-box">
+    <div class="saga-toolbar-main">
+      <brand-tool></brand-tool>
+    </div> 
+  </div>
+</template>
+
+<script>
+import brandTool from "@/components/brand/brandTool"
+export default {
+  components: {
+    brandTool
+  },
+  created() {},
+  mounted() {},
+  data() {
+    return {
+    }
+  },
+  methods: {}
+}
+</script>
+<style lang="scss" scoped>
+  .saga-toolbar-box {
+    position: fixed;
+    top: 48px;
+    left: 0;
+    width: 100%;
+    height: 70px;
+    background: #fff;
+    .saga-toolbar-main {
+      width: 1200px;
+      height: 100%;
+      margin: auto;
+    }
+  }
+</style>

+ 15 - 1
src/router/system.js

@@ -2,6 +2,8 @@ import LayoutMain from '@/framework/layout/Main'
 import Dasboard from '@/views/dasboard'
 //首页登录页面
 import login from '@/framework/layout'
+// 品牌管理
+import brand from '@/views/brand'
 //测试页面
 import test from '@/components/test'
 //产品管理
@@ -13,7 +15,7 @@ export default [
   // 首页
   {
     path: '/',
-    name: '',
+    name: 'LayoutMain',
     component: LayoutMain,
     children: [{
       path: '',
@@ -33,6 +35,18 @@ export default [
     name: 'product',
     component: product,
   },
+  // 品牌管理
+  {
+    path: '/brand',
+    name: 'LayoutMain',
+    component: LayoutMain,
+    children: [{
+        path: '',
+        name: 'brand',
+        component: brand
+      },
+    ]
+  },
   {
     path: '/test',
     name: 'test',

+ 34 - 0
src/views/brand/index.vue

@@ -0,0 +1,34 @@
+<!--
+ * @Author: zhangyu
+ * @Date: 2020-05-08 15:55:30
+ * @Info: 
+ * @LastEditTime: 2020-05-08 16:49:36
+ -->
+<template>
+  <div>
+    <saga-toolbar></saga-toolbar>
+    <saga-brand></saga-brand>
+  </div>
+</template>
+
+<script>
+import sagaBrand from "@/components/brand/sagaBrand"
+import sagaToolbar from "@/components/public/sagaToolbar"
+export default {
+  name: "brand",
+  components: {
+    sagaBrand,
+    sagaToolbar
+  },
+  created() {},
+  mounted() {},
+  data() {
+    return {
+    }
+  },
+  methods: {}
+}
+</script>
+<style lang="scss" scoped>
+
+</style>