From 24b60d746860f24be748e60b5ecd924e0cb331f0 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 18 Nov 2024 10:49:09 +0800
Subject: [PATCH] fix
---
src/components/upload/config.js | 17 +-
src/setting.js | 3 +-
src/views/devLogin.vue | 779 ++++++++++++++++++--------------
src/views/match/list/index.vue | 83 ++--
4 files changed, 507 insertions(+), 375 deletions(-)
diff --git a/src/components/upload/config.js b/src/components/upload/config.js
index 1216d71..a30b89b 100644
--- a/src/components/upload/config.js
+++ b/src/components/upload/config.js
@@ -2,11 +2,22 @@
* 阿里云oss配置
* */
+import router from '@/router/index'
+import { Message } from 'element-ui'
export default async function () {
try {
let RE = localStorage.getItem('osc')
- if (RE) RE = JSON.parse(RE)
- return RE ? {
+ if (RE) {
+ RE = JSON.parse(RE)
+ } else {
+ sessionStorage.removeItem('token')
+ Message.error('登录过期,请重新登录!')
+ setTimeout(() => {
+ router.replace('/login')
+ }, 1500)
+ return false
+ }
+ return {
// oss账号信息
config: {
region: 'oss-cn-shenzhen',
@@ -16,6 +27,6 @@ export default async function () {
},
// 上传成功url前置部分(成功回调没有返回url)
preUrl: 'https://huoran.oss-cn-shenzhen.aliyuncs.com/'
- } : {}
+ }
} catch (e) { }
}
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index 020b3fb..9f0b523 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -3,8 +3,7 @@
* */
const url = location.host;
const isDev = process.env.NODE_ENV === 'development' // 开发环境
-// const isPro = url.includes('huorantech.cn') //正式服
-const isPro = url.includes('47.97.49.1') //正式服
+const isPro = url.includes('huorantech.cn') //正式服
let jumpPath = `${location.origin}/panfen/`
let sandPath = `http://121.37.12.51/sandbox` // 沙盘地址
diff --git a/src/views/devLogin.vue b/src/views/devLogin.vue
index 3ab7411..3c23394 100644
--- a/src/views/devLogin.vue
+++ b/src/views/devLogin.vue
@@ -5,80 +5,81 @@
- 依据国家政策法规,需绑定手机号进行网络实名才可登录使用本平台
-
-
-
-
-
-
-
- {{phoneBtnText}}
-
-
-
-
+ 依据国家政策法规,需绑定手机号进行网络实名才可登录使用本平台
+
+
+
+
+
+
+
+ {{ phoneBtnText
+ }}
+
+
+
+
+
+
+
+ 该手机号已绑定以下用户信息
+
+ -
+ {{ user.schoolName }},{{ user.userName }},{{ user.workNumber }}{{
+ user.isEnable
+ ? ''
+ : '(已禁用)' }}
+
+
+
@@ -87,217 +88,272 @@
@@ -305,24 +361,28 @@ export default {
.wrap {
min-height: 100%;
}
+
.logo {
z-index: 2;
position: absolute;
top: 50px;
left: 50px;
}
+
.login {
position: relative;
height: 100%;
background-image: url(../assets/img/devLogin.jpg);
background-size: 100%;
}
+
.box {
width: 448px;
position: absolute;
right: 20%;
top: 50%;
transform: translateY(-50%);
+
h1 {
margin-bottom: 20px;
font-size: 34px;
@@ -330,76 +390,129 @@ export default {
text-align: center;
}
}
+
/deep/ .form {
- padding: 20px 60px 0;
- background-color: rgba(255, 255, 255, .3);
- border-radius: 4px;
- box-sizing: border-box;
- border: 4px solid rgba(255, 255, 255, .2);
- .el-input__inner {
- height: 50px;
- line-height: 50px;
- border: 1px solid rgba(220, 220, 220, 1);
- border-radius: 2px;
- }
- .el-form-item {
- margin-bottom: 25px;
- }
- .verification{
- position: absolute;
- top: 1px;
- right: 1px;
- width: 160px;
- height: 47px;
- cursor: pointer;
- }
+ padding: 20px 60px 0;
+ background-color: rgba(255, 255, 255, .3);
+ border-radius: 4px;
+ box-sizing: border-box;
+ border: 4px solid rgba(255, 255, 255, .2);
+
+ .el-input__inner {
+ height: 50px;
+ line-height: 50px;
+ border: 1px solid rgba(220, 220, 220, 1);
+ border-radius: 2px;
+ }
+
+ .el-form-item {
+ margin-bottom: 25px;
+ }
+
+ .verification {
+ position: absolute;
+ top: 1px;
+ right: 1px;
+ width: 160px;
+ height: 47px;
+ cursor: pointer;
+ }
}
-.tab{
- display: flex;
- justify-content: center;
- align-items: center;
- margin-bottom: 24px;
- li{
- padding: 18px 5px;
- margin: 0 20px;
- font-size: 16px;
- font-weight: 600;
- color: #fff;
- cursor: pointer;
- border-bottom: 2px solid transparent;
- &:last-child{
- margin-right: 0;
- }
- &.active{
- color: #fff;
- border-bottom-color: #ccc;
- }
+
+.tab {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-bottom: 24px;
+
+ li {
+ padding: 18px 5px;
+ margin: 0 20px;
+ font-size: 16px;
+ font-weight: 600;
+ color: #fff;
+ cursor: pointer;
+ border-bottom: 2px solid transparent;
+
+ &:last-child {
+ margin-right: 0;
}
+
+ &.active {
+ color: #fff;
+ border-bottom-color: #ccc;
+ }
+ }
}
-.title{
- font-size: 16px;
- text-align: center;
- font-weight: bold;
+
+.title {
+ font-size: 16px;
+ text-align: center;
+ font-weight: bold;
}
+
.login-btn {
- text-align: center;
+ text-align: center;
}
+
.login-btn button {
- width: 100%;
- height: 48px;
- margin-bottom: 50px;
- font-weight: bold;
- background: #1dabff;
- border-radius: 4px;
- border: 0;
+ width: 100%;
+ height: 48px;
+ margin-bottom: 50px;
+ font-weight: bold;
+ background: #1dabff;
+ border-radius: 4px;
+ border: 0;
}
-.forget{
- margin-bottom: 28px;
- text-align: right;
- color: #999;
- font-weight:bold;
- &:hover{
- color: #0092FF;
+
+.forget {
+ margin-bottom: 28px;
+ text-align: right;
+ color: #999;
+ font-weight: bold;
+
+ &:hover {
+ color: #0092FF;
+ }
+}
+
+/deep/.user-dia {
+ .tips {
+ margin-bottom: 20px;
+ text-align: center;
+ color: #666;
+ }
+
+ .users {
+ li {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 15px;
+ margin-bottom: 10px;
+ line-height: 40px;
+ font-size: 14px;
+ background-color: #ebeef5;
+ cursor: pointer;
+
+ &.isEnable {
+ color: #c0c4cc;
+ background-color: #f5f7fa;
+ cursor: not-allowed;
+ }
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ &:hover {
+ background-color: #d3e0ff;
+ }
+
+ i {
+ font-size: 16px;
+ }
}
+ }
}
\ No newline at end of file
diff --git a/src/views/match/list/index.vue b/src/views/match/list/index.vue
index a9a998a..eec582f 100644
--- a/src/views/match/list/index.vue
+++ b/src/views/match/list/index.vue
@@ -151,7 +151,7 @@