Browse Source

Merge remote-tracking branch 'origin/release-201901-wangcz' into release-201901-wangcz

shenjunjie 6 years ago
parent
commit
2be12bea51
3 changed files with 2 additions and 2 deletions
  1. 1 0
      app.html
  2. 1 1
      package.json
  3. 0 1
      plugins/element-ui.js

+ 1 - 0
app.html

@@ -7,6 +7,7 @@
   <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_452262_6koxroe1k5l.css">
   <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/Swiper/3.4.2/css/swiper.min.css" />
   <link rel="stylesheet" href="https://cdn.bootcss.com/mint-ui/1.0.2/style.min.css">
+  <link rel="stylesheet" href="https://unpkg.com/element-ui@1.3/lib/theme-default/index.css">
   <!--<script src="https://wechatfe.github.io/vconsole/lib/vconsole.min.js?v=3.2.0"></script>-->
   {{ HEAD }}
   <script>

+ 1 - 1
package.json

@@ -12,7 +12,7 @@
     "clipboard": "^1.7.1",
     "cookiejar": "^2.1.1",
     "cross-env": "^3.1.4",
-    "element-ui": "^1.4.13",
+    "element-ui": "^1.3.7",
     "express": "^4.14.1",
     "font-awesome": "^4.7.0",
     "http-proxy-middleware": "^0.17.4",

+ 0 - 1
plugins/element-ui.js

@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import { Message, Breadcrumb, BreadcrumbItem, Tree, Pagination, Upload, Dialog, DatePicker, Switch, Progress, Popover, Button } from 'element-ui'
-import 'element-ui/lib/theme-default/index.css'
 
 Vue.use(Breadcrumb)
 Vue.use(BreadcrumbItem)