diff --git a/gj.rar b/gj.rar
deleted file mode 100644
index 94b146f..0000000
Binary files a/gj.rar and /dev/null differ
diff --git a/src/api/user-manage.js b/src/api/user-manage.js
index a53a9b8..9c552b4 100644
--- a/src/api/user-manage.js
+++ b/src/api/user-manage.js
@@ -603,4 +603,4 @@ export const unifiedLogin = (data) => {
method: "POST",
data
});
-};
\ No newline at end of file
+};
diff --git a/src/permission.js b/src/permission.js
index 6e69108..587c5c1 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,9 +1,6 @@
import router from './router'
import Base64 from "base-64";
import store from './store'
-import {
- unifiedLogin
-} from "@/api/user-manage";
import {
setItem,
getItem,
diff --git a/src/views/home/components/collection.vue b/src/views/home/components/collection.vue
index 380481e..dafb1a1 100644
--- a/src/views/home/components/collection.vue
+++ b/src/views/home/components/collection.vue
@@ -85,7 +85,7 @@ gettbGjtjgjCount();
color: #f4fdff;
line-height: 21px;
text-shadow: 0px 5px 6px rgba(4, 13, 32, 0.27);
- background: linear-gradient(0deg, #59a6f4 0%);
+ background: linear-gradient(0deg, #59a6f4 0%, #59a6f4 100%);
-webkit-background-clip: text;
// margin: 0 6px 8px 5px;
text-align: center;
diff --git a/src/views/home/components/warning.vue b/src/views/home/components/warning.vue
index 85eaa40..b0272b9 100644
--- a/src/views/home/components/warning.vue
+++ b/src/views/home/components/warning.vue
@@ -101,6 +101,7 @@ const roadmap = (row) => {
height: 100%;
padding-top: 20px;
box-sizing: border-box;
+ color: #fff;
}
.tab-content {
diff --git a/src/views/login/oatuh_login.vue b/src/views/login/oatuh_login.vue
index 4709dd5..8e0468b 100644
--- a/src/views/login/oatuh_login.vue
+++ b/src/views/login/oatuh_login.vue
@@ -40,8 +40,4 @@ onMounted(() => {
});
-<<<<<<< HEAD
-=======
-
->>>>>>> d55c698309e1775da715e035dd9e1b7d06e52a30
diff --git a/vue.config.js b/vue.config.js
index 3814ca5..8632947 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,19 +3,11 @@ const path = require("path");
function resolve(dir) {
return path.join(__dirname, dir);
}
-<<<<<<< HEAD
-const serverHost = "http://192.168.1.32:8066";
-// const serverHost = "http://192.168.0.83:8006";
+// const serverHost = "http://192.168.1.32:8066";
+const serverHost = "http://192.168.0.231:8006";
module.exports = {
publicPath: "./",
outputDir: "zhgj",
-=======
-const serverHost = "http://192.168.0.231:8006";
-// const serverHost = "http://127.0.0.1:8006"
-module.exports = {
- publicPath: "./",
- outputDir: "gj",
->>>>>>> d55c698309e1775da715e035dd9e1b7d06e52a30
assetsDir: "static",
lintOnSave: false, //process.env.NODE_ENV === 'development',
productionSourceMap: false,
diff --git a/zhgj/index.html b/zhgj/index.html
index 50619c1..1c186cf 100644
--- a/zhgj/index.html
+++ b/zhgj/index.html
@@ -1,4 +1,4 @@
-公安
\ No newline at end of file
+ );