Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

src/main.js

@@ -17,7 +17,7 @@ import Vant from "vant";
 import "vant/lib/index.css";
 import "vant/lib/icon/local.css";
 // import '@/styles/vant-css/index.css'
-
+import "@/styles/media.scss";
 import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";