diff --git a/.env.development b/.env.development
index e11cd79..182dbd7 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,3 @@
ENV = 'development'
-VUE_APP_BASE_API = 'https://lcny-api.peidikeji.cn'
\ No newline at end of file
+VUE_APP_BASE_API = 'https://lcny.sk797.cn'
\ No newline at end of file
diff --git a/package.json b/package.json
index 9d39c93..0a6ed5d 100644
--- a/package.json
+++ b/package.json
@@ -73,11 +73,10 @@
"flv.js": "^1.6.2",
"flyio": "^0.6.2",
"hls.js": "^1.4.12",
+ "js-md5": "^0.8.3",
"lodash-es": "^4.17.21",
"mui-player": "^1.8.1",
"portal-vue": "^2.1.7",
- "node-sass": "^6.0.1",
- "sass-loader": "^13.3.2",
"uview-ui": "^1.8.8",
"video.js": "^8.6.1",
"videojs-contrib-hls": "^5.15.0",
@@ -108,6 +107,7 @@
"postcss-comment": "^2.0.0",
"postcss-windicss": "file:src/vendor/postcss-windicss",
"sass": "^1.43.4",
+ "sass-loader": "^8.0.2",
"vue-template-compiler": "^2.6.11"
},
"browserslist": [
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index aa16d0a..aa9e960 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -25,7 +25,9 @@
v-model="password"
/>
- 登 录
+ 登 录
@@ -40,6 +42,7 @@ import {
toast,
} from '@/com/utils.js'
import jwt from '@/api/jwt.js'
+import md5 from 'js-md5'
export default {
data() {
return {
@@ -62,7 +65,7 @@ export default {
}
let params = {
username: this.username,
- password: this.password,
+ password: md5(this.password),
}
this.$http
@@ -134,8 +137,6 @@ export default {
padding-top: 80rpx;
}
-
-
.t-login input {
height: 90rpx;
line-height: 90rpx;
diff --git a/src/pages/system/account.vue b/src/pages/system/account.vue
index 51a49ea..774a46f 100644
--- a/src/pages/system/account.vue
+++ b/src/pages/system/account.vue
@@ -129,6 +129,7 @@
删除
修改密码
+ 解封
编辑
@@ -150,6 +151,10 @@
部门
{{formInfo.department?formInfo.department:'-' }}
+
+ 封禁时间
+ {{formInfo.banned_at?$u.date(formInfo.banned_at, 'yyyy-MM-dd hh:mm'):'-' }}
+
是否启用
@@ -236,6 +241,7 @@