Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

main.js

@@ -4,6 +4,7 @@ import filters from '@/filters'
 import router from '@/router/index.js'
 import router from '@/router/index.js'
 import { RouterMount } from 'uni-simple-router'
 import { RouterMount } from 'uni-simple-router'
 import directive from '@/directive'
 import directive from '@/directive'
+
 // #ifndef VUE3
 // #ifndef VUE3
 import Vue from 'vue'
 import Vue from 'vue'
 Vue.config.productionTip = false
 Vue.config.productionTip = false

pages/index/index.vue

@@ -156,9 +156,9 @@
 </template>
 </template>
 <script>
 <script>
 	import {
 	import {
-		Ichunt_Api,
-		Api_Url
-	} from '@/util/api.js';
+			Ichunt_Api,
+			Api_Url
+		} from '@/util/api.js';
 	import bottomNavFixed from '@/components/bottom_nav.vue';
 	import bottomNavFixed from '@/components/bottom_nav.vue';
 	export default {
 	export default {
 		data() {
 		data() {