From 47672f61936bc5289ce11596e6b412aebd807b0c Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 1 Dec 2023 18:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=9C=B0=E5=9D=80=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
library-activity/app.config.js | 3 ++-
library-activity/index.html | 10 ----------
library-activity/src/main.js | 3 ++-
library-activity/src/router/index.js | 2 +-
library-activity/vite.config.js | 2 +-
selfServiceMachine/.env.development | 8 ++++----
selfServiceMachine/.env.production | 4 ++--
selfServiceMachine/src/main.js | 6 ++++--
selfServiceMachine/src/views/onlineBookSelection.vue | 2 +-
9 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/library-activity/app.config.js b/library-activity/app.config.js
index 45cfb05..23e619b 100644
--- a/library-activity/app.config.js
+++ b/library-activity/app.config.js
@@ -7,7 +7,8 @@
'url': "http://192.168.99.67:8080/frontDemoApi",
},
prodProxy: {
- 'url': 'https://rosefinchapi.aiyxlib.com/frontDemoApi'
+ // 'url': 'https://rosefinchapi.aiyxlib.com/frontDemoApi'
+ 'url': 'http://58.49.77.70:8443/frontDemoApi'
}
}
diff --git a/library-activity/index.html b/library-activity/index.html
index 910b68a..9819f64 100644
--- a/library-activity/index.html
+++ b/library-activity/index.html
@@ -10,16 +10,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/library-activity/src/main.js b/library-activity/src/main.js
index f261b62..555abd6 100644
--- a/library-activity/src/main.js
+++ b/library-activity/src/main.js
@@ -134,7 +134,8 @@ app.use(Toast)
.use(Progress)
.use(List);
-app.config.globalProperties.$coverUrl = 'http://192.168.99.67:8080'
+// app.config.globalProperties.$coverUrl = 'http://192.168.99.67:8080'
+app.config.globalProperties.$coverUrl = 'http://58.49.77.70:8443'
app.config.globalProperties.$API = $API
app.config.globalProperties.$http = $http
diff --git a/library-activity/src/router/index.js b/library-activity/src/router/index.js
index ec83847..3a9e539 100644
--- a/library-activity/src/router/index.js
+++ b/library-activity/src/router/index.js
@@ -1,7 +1,7 @@
import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
const router = createRouter({
- history: createWebHistory(), // hash模式：createWebHashHistory，history模式：createWebHistory
+ history: createWebHashHistory(), // hash模式：createWebHashHistory，history模式：createWebHistory
routes: [
{
path: '/',
diff --git a/library-activity/vite.config.js b/library-activity/vite.config.js
index 4d2115a..176b7d0 100644
--- a/library-activity/vite.config.js
+++ b/library-activity/vite.config.js
@@ -20,7 +20,7 @@ export default ({ mode }) => defineConfig({
symbolId: 'icon-[name]',
}),
],
- base: baseUrl[mode],
+ base:'./',
build: {
minify: 'terser',
terserOptions: {
diff --git a/selfServiceMachine/.env.development b/selfServiceMachine/.env.development
index a5806b2..18522f1 100644
--- a/selfServiceMachine/.env.development
+++ b/selfServiceMachine/.env.development
@@ -3,12 +3,12 @@ ENV = 'development'
# 接口地址
#内网服务地址
-#VUE_APP_BASE_API = 'http://120.76.47.59:8080'
-#VUE_APP_WS_API = 'ws://120.76.47.59:8080'
+VUE_APP_BASE_API = 'http://58.49.77.70:8443'
+VUE_APP_WS_API = 'ws://58.49.77.70:8443'
# 许镇-本地服地址
-VUE_APP_BASE_API = 'http://192.168.99.67:8080'
-VUE_APP_WS_API = 'ws://192.168.99.67:8081'
+# VUE_APP_BASE_API = 'http://192.168.99.67:8080'
+# VUE_APP_WS_API = 'ws://192.168.99.67:8081'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/selfServiceMachine/.env.production b/selfServiceMachine/.env.production
index 7c2bee8..19e25ff 100644
--- a/selfServiceMachine/.env.production
+++ b/selfServiceMachine/.env.production
@@ -3,7 +3,7 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
# VUE_APP_BASE_API = 'http://192.168.99.107:7070'
-VUE_APP_BASE_API = 'http://172.22.0.23:8080'
+VUE_APP_BASE_API = 'http://58.49.77.70:8443'
# VUE_APP_BASE_API = 'http://127.0.0.1:8080'
# 如果接口是 http 形式， wss 需要改为 ws
-VUE_APP_WS_API = 'ws://192.168.99.107:7071'
+VUE_APP_WS_API = 'ws://58.49.77.70:8443'
diff --git a/selfServiceMachine/src/main.js b/selfServiceMachine/src/main.js
index 6b3aef3..7932fc2 100644
--- a/selfServiceMachine/src/main.js
+++ b/selfServiceMachine/src/main.js
@@ -20,8 +20,10 @@ Vue.prototype.$axios = axios
import echarts from 'echarts'
Vue.prototype.$echarts = echarts
-Vue.prototype.coverUrl = 'http://192.168.99.67:8080'
-Vue.prototype.isLocal = 1
+// Vue.prototype.coverUrl = 'http://192.168.99.67:8080'
+Vue.prototype.coverUrl = 'http://58.49.77.70:8443'
+
+Vue.prototype.isLocal = 0
Vue.config.productionTip = false
diff --git a/selfServiceMachine/src/views/onlineBookSelection.vue b/selfServiceMachine/src/views/onlineBookSelection.vue
index 7a39d17..731fb21 100644
--- a/selfServiceMachine/src/views/onlineBookSelection.vue
+++ b/selfServiceMachine/src/views/onlineBookSelection.vue
@@ -34,7 +34,7 @@ export default {
if(this.isLocal){
that.QRCode = 'http://192.168.99.50:8089/BookList?activeId?activeId='+ this.activeId
}else{
- that.QRCode = window.location.href+'BookList?activeId?activeId='+ this.activeId
+ that.QRCode = window.location.origin +'/web/#/BookList?activeId?activeId='+ this.activeId
}
console.log(that.QRCode)
that.$nextTick(function () {