diff --git a/.env.development b/.env.development index db70fbc..2280663 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,11 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com #VITE_SERVER_URL=https://server.gxwebsoft.com/api -VITE_THINK_URL=https://gxtyzx-api.websoft.top/api -VITE_API_URL=https://modules.gxwebsoft.com/api +#VITE_THINK_URL=https://gxtyzx-api.websoft.top/api +#VITE_API_URL=https://modules.gxwebsoft.com/api -VITE_SERVER_URL=https://common-api.websoft.top/api -#VITE_API_URL=http://127.0.0.1:9001/api -#VITE_THINK_URL=http://127.0.0.1:9099/api +VITE_SERVER_URL=https://server.gxwebsoft.com/api +VITE_API_URL=http://127.0.0.1:9091/api +VITE_THINK_URL=http://127.0.0.1:9099/api #/booking/bookingItem diff --git a/package-lock.json b/package-lock.json index 18ebb35..b466114 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "vue-echarts": "^6.2.3", "vue-i18n": "^9.2.2", "vue-router": "^4.1.5", + "vue-tianditu": "^2.7.6", "vuedraggable": "^4.1.0", "xgplayer": "^2.31.7", "xlsx": "^0.18.5" @@ -9029,6 +9030,49 @@ "vue": "^3.2.0" } }, + "node_modules/vue-tianditu": { + "version": "2.7.6", + "resolved": "https://registry.npmmirror.com/vue-tianditu/-/vue-tianditu-2.7.6.tgz", + "integrity": "sha512-Yvcxg0IAgGB3ZY8zlC5ayjo9f85fa8PFTaifguTNpri76g67GO9toaRWMjBKi39yYHMBADaT3P6bEkJx87X8MQ==", + "dependencies": { + "mitt": "^3.0.0", + "vue-demi": "^0.12.1" + }, + "peerDependencies": { + "@vue/composition-api": "^1.4.2", + "vue": "^2.0.0 || >=3.0.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, + "node_modules/vue-tianditu/node_modules/vue-demi": { + "version": "0.12.5", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz", + "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==", + "hasInstallScript": true, + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/vue-tsc": { "version": "0.40.5", "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.40.5.tgz", @@ -16421,6 +16465,23 @@ "@vue/devtools-api": "^6.1.4" } }, + "vue-tianditu": { + "version": "2.7.6", + "resolved": "https://registry.npmmirror.com/vue-tianditu/-/vue-tianditu-2.7.6.tgz", + "integrity": "sha512-Yvcxg0IAgGB3ZY8zlC5ayjo9f85fa8PFTaifguTNpri76g67GO9toaRWMjBKi39yYHMBADaT3P6bEkJx87X8MQ==", + "requires": { + "mitt": "^3.0.0", + "vue-demi": "^0.12.1" + }, + "dependencies": { + "vue-demi": { + "version": "0.12.5", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz", + "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==", + "requires": {} + } + } + }, "vue-tsc": { "version": "0.40.5", "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-0.40.5.tgz", diff --git a/package.json b/package.json index 54e7f50..5da2fc2 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "vue-echarts": "^6.2.3", "vue-i18n": "^9.2.2", "vue-router": "^4.1.5", + "vue-tianditu": "^2.7.6", "vuedraggable": "^4.1.0", "xgplayer": "^2.31.7", "xlsx": "^0.18.5" diff --git a/src/api/think/thinkSite/model/index.ts b/src/api/think/thinkSite/model/index.ts index 7ee1457..923342d 100644 --- a/src/api/think/thinkSite/model/index.ts +++ b/src/api/think/thinkSite/model/index.ts @@ -16,6 +16,8 @@ export interface ThinkSite { businessTime?: string; // 场馆地址 address?: string; + lat?: string; + lng?: string; // 场馆介绍 info?: string; // 场馆电话 diff --git a/src/main.ts b/src/main.ts index 876546c..fc0a25d 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,6 +5,8 @@ import router from './router'; import permission from './utils/permission'; import i18n from './i18n'; import './styles/index.less'; +import VueTianditu from "vue-tianditu" +import "vue-tianditu/lib/style.css"; const app = createApp(App); @@ -12,5 +14,9 @@ app.use(store); app.use(router); app.use(permission); app.use(i18n); +app.use(VueTianditu, { + v: "4.0", //目前只支持4.0版本 + tk: "bfbc6bd9e85fcda67b62788705aa6427" +}); app.mount('#app'); diff --git a/src/views/booking/bookingSite/components/bookingSiteEdit.vue b/src/views/booking/bookingSite/components/bookingSiteEdit.vue index a154e24..e8c8afc 100644 --- a/src/views/booking/bookingSite/components/bookingSiteEdit.vue +++ b/src/views/booking/bookingSite/components/bookingSiteEdit.vue @@ -350,6 +350,7 @@ status: 'done' }); } + console.log(images.value) if (props.data.files) { const arr = JSON.parse(props.data.files); arr.map((item) => { diff --git a/src/views/think/thinkSite/components/search.vue b/src/views/think/thinkSite/components/search.vue index d6f1bcd..82fea9d 100644 --- a/src/views/think/thinkSite/components/search.vue +++ b/src/views/think/thinkSite/components/search.vue @@ -1,7 +1,7 @@