From ad8abc44cf633517c30ab8447b9b035019beeadb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 17:57:14 +0800
Subject: [PATCH] 2022-12-09
---
public/options.json | 12 ++--
src/assets/css/viewstyle.scss | 10 +-
src/api/index.js | 71 -----------------------
src/views/login/index.scss | 31 ++++------
src/views/login/index.jsx | 16 ++--
5 files changed, 34 insertions(+), 106 deletions(-)
diff --git a/public/options.json b/public/options.json
index 4308297..db18eef 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,14 +1,14 @@
{
- "appId": "20201221213901540C6BC419CE41E47FABA62",
- "appkey": "2020122121373692319E639E61B0E46A6BC2C",
+ "appId": "20210626201534927C87102C56DF9484EB501",
+ "appkey": "20210626201522493D7AD7591D7A547278685",
"mainSystemApi": "https://cloud.positecgroup.com/webapi/dostars",
"systemType": "",
- "externalDatabase": "mkdata_kress_test",
+ "externalDatabase": "mkdata_worx_test",
"lineColor": "",
"filter": "false",
"defaultApp": "",
"defaultLang": "zh-CN",
- "WXAppID": "wxa5dd6f28cae613fc",
+ "WXAppID": "wx4d8a34c8d4494872",
"WXminiAppID": "",
"nginx": "true",
"debugger": false,
@@ -17,6 +17,6 @@
"transfer": "false",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://bms-test.kresstools.cn",
- "service": "oc/"
+ "host": "http://dms-test.worx.cn",
+ "service": "new/"
}
\ No newline at end of file
diff --git a/src/api/index.js b/src/api/index.js
index 52ef280..05c8cc9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -120,16 +120,15 @@
}
/**
-<<<<<<< HEAD
* @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
loginAndRedirect (param) {
let url = ''
if (process.env.NODE_ENV === 'production') {
- url = document.location.origin + '/Home/LoginAndRedirect'
+ url = document.location.origin + '/zh-CN/Home/LoginAndRedirect'
} else {
- url = '/Home/LoginAndRedirect'
+ url = window.GLOB.location + '/zh-CN/Home/LoginAndRedirect'
}
return axios({
@@ -140,72 +139,6 @@
}
/* @description 鐩存帴璇锋眰
-=======
- * @description 寰俊涓氬姟璇锋眰
- */
- wxAccessToken () {
- let _url = window.GLOB.baseurl + 'wxpay/getaccesstoken'
- if (process.env.NODE_ENV !== 'production') {
- _url = document.location.origin + '/wxpay/getaccesstoken'
- }
-
- return new Promise(resolve => {
- if (window.GLOB.accessToken.accessTime && (parseInt(new Date().getTime() / 1000) - window.GLOB.accessToken.accessTime < 30)) {
- resolve(window.GLOB.accessToken)
- } else {
- window.GLOB.accessToken = {}
- axios({
- url: _url,
- method: 'get'
- }).then(res => {
- if (res.oa_access_token || res.mini_access_token) {
- window.GLOB.accessToken.accessTime = parseInt(new Date().getTime() / 1000)
- window.GLOB.accessToken.oa_access_token = res.oa_access_token
- window.GLOB.accessToken.mini_access_token = res.mini_access_token
- }
- resolve(res)
- })
- }
- })
- }
-
- /**
- * @description 寰俊涓氬姟璇锋眰
- */
- wxNginxRequest (url, method, param) {
- let _url = window.GLOB.location + '/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + '/' + url
- }
- if (/^http:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8080/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8080/' + url
- }
- } else if (/^https:\/\/(qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn)/.test(_url)) {
- _url = window.GLOB.location + ':8443/' + url
- if (process.env.NODE_ENV === 'production') {
- _url = document.location.origin + ':8443/' + url
- }
- }
-
- if (param) {
- return axios({
- url: _url,
- method,
- data: param
- })
- }
-
- return axios({
- url: _url,
- method
- })
- }
-
- /**
- * @description 鐩存帴璇锋眰
->>>>>>> positec
* @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
*/
directRequest (url, method = 'post', param, cross) {
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index 12bc3d3..9814a1a 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -39,17 +39,17 @@
}
}
.anticon-eye {
- color: #1890ff;
+ color: $color6;
}
.ant-input:hover {
- border-color: #1890ff!important;
+ border-color: $color6!important;
}
.ant-input:focus, .ant-input:active {
- border-color: #40a9ff;
- box-shadow: 0 0 0 2px #bae7ff;
+ border-color: $color4;
+ box-shadow: 0 0 0 2px $color2;
}
.ant-input-affix-wrapper:hover .ant-input:not(.ant-input-disabled) {
- border-color: #40a9ff;
+ border-color: $color4;
}
}
.login-bottom {
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index c1de41c..dc66349 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -149,7 +149,7 @@
})
message.warning('鐧诲綍澶辫触,鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒!')
} else {
- window.location.replace(document.location.origin + '/Home/Index')
+ window.location.replace(document.location.origin + '/zh-CN/Home/Index')
}
})
} else {
@@ -962,13 +962,13 @@
authLogin={this.authLogin}
wrappedComponentRef={(inst) => this.loginformRef = inst}
/> : null}
- </div>
- <div className="login-bottom">
- {webSite && copyRight ?
- <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> :
- <p dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></p>
- }
- {ICP ? <p dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, ' ') }}></p> : null}
+ <div className="login-bottom">
+ {webSite && copyRight ?
+ <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> :
+ <p dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></p>
+ }
+ {ICP ? <p dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, ' ') }}></p> : null}
+ </div>
</div>
{/* 缂栬緫鐘舵�佺櫥褰� */}
<Modal
diff --git a/src/views/login/index.scss b/src/views/login/index.scss
index 6ae0096..ea94e22 100644
--- a/src/views/login/index.scss
+++ b/src/views/login/index.scss
@@ -1,18 +1,17 @@
.login-container {
+ position: relative;
height: 100vh;
min-height: 600px;
- background-color: #ffffff!important;
background-size: cover;
background-repeat: no-repeat;
background-position: center center;
.logo {
position: relative;
- height: 70px;
- padding-top: 10px;
- width: 990px;
- margin: 0 auto;
+ height: 100px;
+ padding-top: 30px;
+ border-bottom: 3px solid #aeb303;
img {
- height: 47px;
+ height: 50px;
}
.plat-name {
position: absolute;
@@ -28,9 +27,8 @@
.login-middle {
position: relative;
- height: calc(100vh - 194px);
+ height: calc(100vh - 100px);
min-height: 475px;
- background-color: #427CAA;
background-image: url('http://bms-test.kresstools.cn/Content/images/login2/bg_mid.png');
background-size: contain;
background-repeat: no-repeat;
@@ -47,6 +45,7 @@
border-radius: 5px;
overflow: hidden;
border: 1px solid #bfbfbf;
+ z-index: 3;
.login-way-title {
font-size: 18px;
@@ -101,10 +100,9 @@
}
.form-item-wrap {
padding: 0.6vw 1.6vw 1.6vw;
- // padding: 0.6vw 1.6vw 0vw;
}
.title {
- color: #427CAA;
+ color: var(--mk-sys-color);
font-size: 22px;
font-weight: bold;
margin: 20px 1.6vw 5px;
@@ -207,12 +205,7 @@
font-size: 18px;
}
.anticon-eye {
- color: #1890ff;
- }
- .login-form-button {
- border-radius: 0;
- background: #6fb3e9!important;
- border: 1px solid #6fb3e9!important;
+ color: #aeb303;
}
}
.login-sync-button {
@@ -222,8 +215,11 @@
}
}
.login-bottom {
+ position: absolute;
+ bottom: 30px;
+ left: 0;
+ width: 100%;
text-align: center;
- color: #666!important;
padding-top: 20px;
font: 12px/150% Arial,Verdana,"\5b8b\4f53";
p span.split {
@@ -232,7 +228,6 @@
a {
display: inline-block;
margin-bottom: 5px;
- color: #666!important;
font: 12px/150% Arial,Verdana,"\5b8b\4f53";
}
}
--
Gitblit v1.8.0