3 Commits a1386387db ... 34ad03b5aa

Autore SHA1 Messaggio Data
  柳香萍 34ad03b5aa Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-vue 5 anni fa
  柳香萍 b15ebdbc7e 01 5 anni fa
  柳香萍 58aa357f58 微网站 5 anni fa

+ 2 - 1
config/index.js Vedi File

@@ -17,8 +17,9 @@ module.exports = {
17 17
     // can be overwritten by process.env.HOST
18 18
     // if you want dev by ip, please set host: '0.0.0.0'
19 19
 
20
-    host: 'test1.sgjyun.com',
21 20
     // host: 'jk.kuyicloud.com',
21
+
22
+
22 23
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
23 24
     autoOpenBrowser: true,
24 25
     errorOverlay: true,

+ 3 - 3
package-lock.json Vedi File

@@ -3495,9 +3495,9 @@
3495 3495
       "dev": true
3496 3496
     },
3497 3497
     "element-ui": {
3498
-      "version": "2.7.2",
3499
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.7.2.tgz",
3500
-      "integrity": "sha512-Exh9QTkm9gwMMPzg1TyaTlBKyr3k4K9XcC5vl0A/mneDvJX//RsURGuOWsCNDVQMdhh5h9e+W5icosh+pKfbCg==",
3498
+      "version": "2.9.1",
3499
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.9.1.tgz",
3500
+      "integrity": "sha512-w8vrCW5Q+2gfDzs19MUrFdnCy5IjF98rs7DBsKnJQKFfZJZiZ2O+YAsSp/EuPrCm3P/2o/N3MtvZ34VANel13g==",
3501 3501
       "requires": {
3502 3502
         "async-validator": "~1.8.1",
3503 3503
         "babel-helper-vue-jsx-merge-props": "^2.0.0",

+ 1 - 1
package.json Vedi File

@@ -44,7 +44,7 @@
44 44
     "driver.js": "0.5.2",
45 45
     "dropzone": "5.2.0",
46 46
     "echarts": "3.8.5",
47
-    "element-ui": "^2.7.2",
47
+    "element-ui": "^2.9.1",
48 48
     "file-saver": "1.3.3",
49 49
     "font-awesome": "4.7.0",
50 50
     "js-cookie": "2.2.0",

BIN
src/assets/home/wei.jpg Vedi File


BIN
src/assets/preview/new-1.png Vedi File


+ 1 - 1
src/icons/svg/dashboard.svg Vedi File

@@ -1 +1 @@
1
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559132638469" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1438" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M563.197497 0 460.802503 0 0.012259 486.388227c0 0 0.901006 102.396016 51.200051 102.396016s76.797012 0 76.797012 0 0 232.496449 0 332.816677c0 100.300818 102.397038 102.399081 102.397038 102.399081l204.79714 0c0 0 0-272.419617 0-358.416702 0-25.647017 25.600026-25.600026 25.600026-25.600026l102.394994 0c0 0 25.601047 0.851972 25.601047 25.600026 0 92.198911 0 358.416702 0 358.416702s99.647027 0 204.795097 0c105.147048 0 102.398059-102.399081 102.398059-102.399081L895.992721 563.185239c0 0 27.19875 0 76.799055 0 49.59724 0 51.195965-76.79599 51.195965-76.79599L563.197497 0z" p-id="1439" fill="#bfcbd9"></path></svg>
1
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559805368038" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2337" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M405.923568 101.722776C279.295566 206.825532 205.614449 276.459472 95.310228 397.352867c-27.430746 35.963073-22.976294 102.870926 0 102.870926 71.362304 0 102.870926 0 102.870926 0s0 128.160915 0 257.177314c0 37.830607 5.390777 102.869902 45.196365 102.869902 65.173348 0 160.544463 0 160.544463 0L403.921981 603.088578l205.741851 0 0 257.18243c0 0 83.145675 0 148.308791 0 29.956266 0 57.43306-27.219945 57.43306-102.869902 0-132.344191 0-257.177314 0-257.177314s40.329521 0 102.869902 0c30.588669 0 35.552727-72.79084 0-102.870926C817.308009 294.65795 703.651436 195.340967 593.641927 105.117083 506.79393 37.305651 459.622584 46.296419 405.923568 101.722776z" p-id="2338"></path></svg>

+ 3 - 1
src/router/index.js Vedi File

@@ -12,6 +12,7 @@ import member from './modules/member'
12 12
 import org from './modules/org'
13 13
 import marketing_tool from './modules/marketing_tool'
14 14
 import system from './modules/system'
15
+import site from './modules/site'
15 16
 
16 17
 /** note: submenu only apppear when children.length>=1
17 18
  *   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -77,7 +78,8 @@ var _asy_router_map = [
77 78
   marketing_tool,
78 79
   org,
79 80
   role,
80
-  system
81
+  system,
82
+  site
81 83
 ]
82 84
 
83 85
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

+ 20 - 0
src/router/modules/site.js Vedi File

@@ -0,0 +1,20 @@
1
+import Layout from '@/views/layout/Layout'
2
+
3
+export default {
4
+  path: '',
5
+  component: Layout,
6
+  redirect: '/site',
7
+  children: [{
8
+    path: '/site',
9
+    component: () => import('@/scrm_pages/site/index'),
10
+    name: 'site',
11
+    meta: {
12
+      title: '微网站',
13
+      icon: 'dashboard',
14
+      noCache: true
15
+    }
16
+  },
17
+  { path: '/site/preview', component: () => import('@/scrm_pages/site/preview'), name: '预览', meta: { title: 'preview' }, hidden: true, is_menu: false }
18
+
19
+  ]
20
+}

+ 107 - 0
src/scrm_pages/site/components/new-feature.vue Vedi File

@@ -0,0 +1,107 @@
1
+<template>
2
+<div class="feature">
3
+    <ul >
4
+        <li>
5
+            <span>
6
+              <img :src="new1" alt="">
7
+              <p>轮播图</p>  
8
+            </span>
9
+        </li>
10
+         <li>
11
+           <span>
12
+              <img :src="new1" alt="">
13
+              <p>轮播图</p>  
14
+            </span>  
15
+        </li>
16
+         <li>
17
+           <span>
18
+              <img :src="new1" alt="">
19
+              <p>轮播图</p>  
20
+            </span>  
21
+        </li>
22
+         <li>
23
+           <span>
24
+              <img :src="new1" alt="">
25
+              <p>轮播图</p>  
26
+            </span>  
27
+        </li>
28
+         <li>
29
+           <span>
30
+              <img :src="new1" alt="">
31
+              <p class="title">轮播图</p>  
32
+            </span>  
33
+        </li>
34
+    </ul>
35
+    <!-- <el-row :gutter="21" type="flex"  justify="space-around">
36
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>轮播图</p></div></el-col>
37
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>医院介绍</p></div></el-col>
38
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>科室介绍</p></div></el-col>
39
+    </el-row>
40
+    <el-row :gutter="21" type="flex"  justify="space-around">
41
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>轮播图</p></div></el-col>
42
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>医院介绍</p></div></el-col>
43
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>科室介绍</p></div></el-col>
44
+    </el-row>
45
+    <el-row :gutter="21" type="flex"  justify="space-around">
46
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>轮播图</p></div></el-col>
47
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>医院介绍</p></div></el-col>
48
+        <el-col :span="5"><div class="grid-content "><img :src="new1" alt=""><p>科室介绍</p></div></el-col>
49
+    </el-row> -->
50
+</div>    
51
+</template>
52
+
53
+
54
+<script>
55
+export default {
56
+  name: "newfeature",
57
+  data() {
58
+    return {
59
+      new1: require("../../../assets/preview/new-1.png")
60
+    };
61
+  }
62
+};
63
+</script>
64
+
65
+<style rel="stylesheet/scss" lang="scss" scoped>
66
+.feature {
67
+  ul {
68
+    border: 1px solid #eaeefb;
69
+    float: left;
70
+    width: 100%;
71
+    li {
72
+      width: 33.3%;
73
+      float: left;
74
+      text-align: center;
75
+      height: 120px;
76
+      color: #666;
77
+      font-size: 13px;
78
+      border-right: 1px solid #eee;
79
+      border-bottom: 1px solid #eee;
80
+      margin-right: -1px;
81
+      margin-bottom: -1px;
82
+      span {
83
+        vertical-align: middle;
84
+        display: flex;
85
+        flex-direction: column;
86
+        align-items: center;
87
+        justify-content: center;
88
+        height: 120px;
89
+        img {
90
+          display: inline-block;
91
+          font-size: 32px;
92
+          margin-bottom: 15px;
93
+          color: #606266;
94
+          transition: color 0.15s linear;
95
+          vertical-align: middle;
96
+        }
97
+        .title {
98
+          display: inline-block;
99
+          padding: 0 3px;
100
+          height: 30px;
101
+          vertical-align: middle;
102
+        }
103
+      }
104
+    }
105
+  }
106
+}
107
+</style>

+ 67 - 0
src/scrm_pages/site/index.vue Vedi File

@@ -0,0 +1,67 @@
1
+<template>
2
+   <div class="main-contain">
3
+      <div class="position">
4
+        <bread-crumb :crumbs='crumbs'></bread-crumb>
5
+      </div>
6
+      <div class="app-container">
7
+         <el-row :gutter="20">
8
+            <el-col :span="12">
9
+              <div class="success">
10
+                <h1 class="name">欢迎来到微官网主页</h1>
11
+                <div class="tips">您可以手机扫码访问或在右侧预览</div>
12
+                <div class="site-code"><img :src="codeImg" alt=""></div>
13
+                <router-link to="/site/preview">
14
+                  <el-button type="primary">进入微官网后台</el-button>
15
+                </router-link>
16
+              </div>
17
+            </el-col>
18
+            <el-col :span="12">
19
+
20
+            </el-col>
21
+          </el-row>
22
+      </div>
23
+   </div>
24
+</template>
25
+
26
+<script>
27
+import BreadCrumb from "../components/bread-crumb";
28
+export default {
29
+  name: "site",
30
+  components: {
31
+    BreadCrumb
32
+  },
33
+  data() {
34
+    return {
35
+      crumbs: [{ path: false, name: "微网站" }],
36
+      codeImg: require("../../assets/home/wei.jpg")
37
+    };
38
+  }
39
+};
40
+</script>
41
+
42
+<style rel="stylesheet/scss" lang="scss" scoped>
43
+.success {
44
+  text-align: center;
45
+  align-items: center;
46
+  display: flex;
47
+  flex-direction: column;
48
+  .name {
49
+    font-size: 30px;
50
+    font-weight: bold;
51
+    color: #333;
52
+    margin: 0;
53
+    padding-bottom: 10px;
54
+  }
55
+  .tips{
56
+    line-height: 30px;
57
+    padding-bottom: 10px;
58
+  }
59
+  .site-code {
60
+    width: 200px;
61
+    padding-bottom: 10px;
62
+    img{
63
+      width: 100%;
64
+    }
65
+  }
66
+}
67
+</style>

+ 57 - 0
src/scrm_pages/site/preview.vue Vedi File

@@ -0,0 +1,57 @@
1
+<template>
2
+   <div class="main-contain">
3
+      <div class="position">
4
+        <bread-crumb :crumbs='crumbs'></bread-crumb>
5
+      </div>
6
+      <div class="app-container">
7
+            <!-- 新增 -->
8
+                <el-tabs type="border-card" style="width:450px;">
9
+                    <el-tab-pane label="首页">
10
+                        <el-tabs v-model="activeName" @tab-click="handleClick"  >
11
+                            <el-tab-pane label="新增模块" name="first">
12
+                                 <new-feature> </new-feature>
13
+                            </el-tab-pane>
14
+                            <el-tab-pane label="已使用" name="second">
15
+
16
+                            </el-tab-pane>
17
+                        </el-tabs>
18
+                    </el-tab-pane>
19
+                    <el-tab-pane label="联系我们">
20
+                        <el-tabs v-model="activeName" @tab-click="handleClick">
21
+                            <el-tab-pane label="新增模块" name="three">
22
+
23
+                            </el-tab-pane>
24
+                            <el-tab-pane label="已使用" name="four">
25
+                                
26
+                            </el-tab-pane>
27
+                        </el-tabs>                        
28
+                    </el-tab-pane>
29
+                </el-tabs>
30
+            <!-- 已使用 -->
31
+           
32
+      </div>
33
+   </div>
34
+</template>
35
+
36
+<script> 
37
+import BreadCrumb from "../components/bread-crumb";
38
+import NewFeature from "./components/new-feature";
39
+export default {
40
+  name: "preview",
41
+  components: {
42
+    BreadCrumb,
43
+    NewFeature
44
+  },
45
+  data() {
46
+    return {
47
+      crumbs: [{ path: false, name: "预览" }],
48
+      activeName: 'first'
49
+    };
50
+  }
51
+};
52
+</script>
53
+
54
+<style rel="stylesheet/scss" lang="scss" scoped>
55
+</style>
56
+
57
+

+ 8 - 8
src/xt_permission.js Vedi File

@@ -10,14 +10,14 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
10 10
 
11 11
 router.beforeEach((to, from, next) => {
12 12
   // 线上注释
13
-  // if (store.getters.permission_routers === undefined) {
14
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
15
-  //     next()
16
-  //   })
17
-  // } else {
18
-  //   next()
19
-  // }
20
-  // return
13
+  if (store.getters.permission_routers === undefined) {
14
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
15
+      next()
16
+    })
17
+  } else {
18
+    next()
19
+  }
20
+  return
21 21
   // 线上注释
22 22
 
23 23
   NProgress.start()