Merge remote-tracking branch 'lanju/master'

src/App.vue

@@ -31,7 +31,8 @@ export default Vue.extend({
 <style lang="scss">
 /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
 @import '~uview-ui/index.scss';
-
+// global css
+@import '@/static/styles/index.scss';
 /*每个页面公共css */
 page {
   height: 100%;

src/main.ts

@@ -26,8 +26,6 @@ import uniThead from '@/uni_modules/uni-table/components/uni-thead/uni-thead.vue
 import uniDataSelect from '@/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue';
 import uniIcons from '@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue';
 import MyMixins from './utils/mixin';
-// global css
-import '@/static/styles/index.scss';
 
 Vue.config.productionTip = false;