From 8321e6da34ce075e1e897b1caf3445a068380122 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Fri, 12 Jul 2024 14:35:22 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/main.ts | 83 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 32 deletions(-)
diff --git a/src/main.ts b/src/main.ts
index 083fd56..4d418f9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,28 +1,49 @@
-import Vue from 'vue';
-import axios from 'axios'
-import {i18n} from './app/index';
+import Vue from "vue";
+import axios from "axios";
+import { i18n } from "./app/index";
-import App from './App.vue';
-import router from '@/route/router';
-import store from '@/store/store';
-import './registerServiceWorker';
-
+import App from "./App.vue";
+import router from "@/route/router";
+import store from "@/store/store";
+import "./registerServiceWorker";
//������������
-import BaiduMap from 'vue-baidu-map'
+import BaiduMap from "vue-baidu-map";
Vue.use(BaiduMap, {
- ak: '9FrZ6v3P8xS290ygi40M5Ik3Fgwes4KY'//������������key
-})
+ ak: "c4e73f2c6972766d6a54dffd2f501cac", //������������key
+});
+import AMap from "vue-amap";
+
+AMap.initAMapApiLoader({
+ key: "f4ba1c4d94654309b97a557d41857b48",
+ securityJsCode: "ef9c2027d42f060b979814c849eea7b9",
+ plugin: [
+ "AMap.moveAnimation",
+ "AMap.PlaceSearch",
+ "AMap.Scale",
+ "AMap.OverView",
+ "AMap.ToolBar",
+ "AMap.MapType",
+ "AMap.PolyEditor",
+ "AMap.CircleEditor",
+ "AMap.DistrictSearch",
+ "AMap.Geocoder",
+ "AMap.Autocomplete",
+ ],
+ // ������������ sdk ��������� 1.4.4
+ v: "1.4.4",
+});
+Vue.use(AMap);
// ������������������
-import {preloaderFinished} from './util/preloader';
+import { preloaderFinished } from "./util/preloader";
preloaderFinished();
-import Startup from '@/core/Startup';
+import Startup from "@/core/Startup";
Vue.config.productionTip = false;
-import './directives/index';
+import "./directives/index";
// ������vue������
const app = new Vue({
@@ -32,25 +53,23 @@
render: (h) => h(App),
});
// ������������������
-Startup.bootstrap().then(
- (res: any) => {
- // ���vue������������ #app���
- app.$mount('#app');
+Startup.bootstrap().then((res: any) => {
+ // ���vue������������ #app���
+ app.$mount("#app");
- // app������
- ( window as any ).appBootstrap();
+ // app������
+ (window as any).appBootstrap();
- // ������app������
- store.commit('app/appName', res.data.app);
+ // ������app������
+ store.commit("app/appName", res.data.app);
- // ���storage������������token������������������������token������
- const initToken = app.$ss.get('token');
- if ( initToken != null) {
- store.commit('user/loginSuccess', {token: initToken});
- // ������acl������
- store.dispatch('acl/login', {username: initToken});
- }
- },
-);
+ // ���storage������������token������������������������token������
+ const initToken = app.$ss.get("token");
+ if (initToken != null) {
+ store.commit("user/loginSuccess", { token: initToken });
+ // ������acl������
+ store.dispatch("acl/login", { username: initToken });
+ }
+});
-export default app
+export default app;
--
Gitblit v1.8.0