From 4e09d119f6c6a1c255c09e8f2657c97f3724a0c6 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 9 Mar 2022 16:45:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E5=B1=8F=E5=8F=91=E5=B8=83=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/login.js | 23 ++ src/assets/styles/adminIndex.scss | 13 +- src/main.js | 4 +- src/store/modules/user.js | 18 +- src/views/forgetPassword/index.vue | 32 +- .../publishContent/publishList/index.vue | 301 +++++++++++++++++- .../publishContent/urgentMessage/index.vue | 82 +++-- 8 files changed, 426 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 721fd53..8f140ab 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "sass": "1.32.12", "screenfull": "4.2.0", "sortablejs": "1.8.4", + "vcolorpicker": "^1.1.0", "vue": "2.6.10", "vue-count-to": "1.0.13", "vue-cropper": "0.4.9", diff --git a/src/api/login.js b/src/api/login.js index a0da21a..c11e561 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -13,6 +13,29 @@ export function login(username, password, phone, code, uuid) { } }) } +export function getMsg(phone) { + return request({ + url: 'auth/msg', + method: 'post', + data: { + phone + } + }) +} + +export function setPassword(phone, new_pass, code, uuid) { + return request({ + url: 'auth/password', + method: 'post', + data: { + phone, + new_pass, + code, + uuid + } + }) +} + export function getInfo() { return request({ url: 'auth/info', diff --git a/src/assets/styles/adminIndex.scss b/src/assets/styles/adminIndex.scss index 5e70097..634afc6 100644 --- a/src/assets/styles/adminIndex.scss +++ b/src/assets/styles/adminIndex.scss @@ -129,8 +129,18 @@ background-color: #a7acae !important; } } - +.el-dialog{ + margin-top: 0 !important; + top: 50%; + transform: translateY(-50%); + -webkit-transform: translateY(-50%); + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -o-transform: translateY(-50%); +} .el-dialog__body { + max-height: 70vh !important; + overflow-y: auto; .el-form-item { margin-bottom: 24px; } @@ -327,4 +337,5 @@ height: 1px; } } + // end \ No newline at end of file diff --git a/src/main.js b/src/main.js index 7c6c96e..cac49e3 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,8 @@ import Cookies from 'js-cookie' import 'normalize.css/normalize.css' import Element from 'element-ui' -// +import vcolorpicker from 'vcolorpicker' + import mavonEditor from 'mavon-editor' import 'mavon-editor/dist/css/index.css' @@ -41,6 +42,7 @@ Vue.use(dict) Vue.use(Element, { size: Cookies.get('size') || 'small' // set element-ui default size }) +Vue.use(vcolorpicker) Vue.config.productionTip = false diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 089c87f..2bece44 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,4 +1,4 @@ -import { login, getInfo, logout } from '@/api/login' +import { login, setPassword, getInfo, logout } from '@/api/login' import { getToken, setToken, removeToken } from '@/utils/auth' const user = { @@ -42,11 +42,21 @@ const user = { }) }) }, - + // 忘记密码 + SetPassword({ commit }, userInfo) { + return new Promise((resolve, reject) => { + setPassword(userInfo.phone, userInfo.new_pass, userInfo.code, userInfo.uuid).then(res => { + setUserInfo(res, commit) + resolve(res) + }).catch(error => { + reject(error) + }) + }) + }, // 获取用户信息 - GetInfo({ commit }) { + GetInfo({ commit }, userInfo) { return new Promise((resolve, reject) => { - getInfo().then(res => { + getInfo(userInfo.phone,).then(res => { setUserInfo(res, commit) resolve(res) }).catch(error => { diff --git a/src/views/forgetPassword/index.vue b/src/views/forgetPassword/index.vue index ba99d94..d3e6445 100644 --- a/src/views/forgetPassword/index.vue +++ b/src/views/forgetPassword/index.vue @@ -1,6 +1,6 @@