From ca150d38b8ecb9c69b0b32ac865e28fcf8c8fc8f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十一月 2022 16:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/sms/smsIndex/index.vue | 3 +--
src/views/operate/sms/smsIndex/createSms/index.vue | 10 +++++++++-
src/views/layout/components/Header/updatePassword/index.vue | 15 +++++++++++----
src/views/operate/sms/smsTemplate/index.vue | 1 -
src/views/operate/message/myIndex/update/index.vue | 2 +-
src/views/operate/message/myIndex/index.vue | 1 -
6 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/views/layout/components/Header/updatePassword/index.vue b/src/views/layout/components/Header/updatePassword/index.vue
index cfe2094..50782be 100644
--- a/src/views/layout/components/Header/updatePassword/index.vue
+++ b/src/views/layout/components/Header/updatePassword/index.vue
@@ -27,6 +27,11 @@
export default {
data() {
return {
+ updatePasswordParam:{
+ newPassword:"",
+ oldPassword:"",
+ username:""
+ },
password: {
oldPassword: null,
newPassword: null,
@@ -45,13 +50,15 @@
onSubmit() {
this.$refs.password.validate(valid => {
if (valid) {
- const userName = JSON.parse(sessionStorage.getItem('name'));
- const passwordParams = Object.assign({}, this.password);
- delete passwordParams.confirmPassword;
- users.updatePassword({ username: userName, ...passwordParams })
+ this.updatePasswordParam.oldPassword=this.password.oldPassword;
+ this.updatePasswordParam.username=sessionStorage.getItem('name');
+ this.updatePasswordParam.newPassword=this.password.newPassword;
+ console.log(this.updatePasswordParam);
+ users.updatePassword(this.updatePasswordParam)
.then(() => {
this.$message.success('淇敼瀵嗙爜鎴愬姛, 鍗冲皢閲嶆柊鐧诲綍');
this.logout();
+ location.reload();
})
.catch(err => this.$message.error(err))
}
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 5f644da..696ea12 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -3,7 +3,6 @@
<header>
<div class="header-nav">
<span class="nav-left">鏁版嵁绛涢��</span>
- <span class="nav-right" @click="showMoreParamsDialog">楂樼骇鎼滅储</span>
</div>
<div class="header-content">
<div class="search">
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 92f232e..81e6076 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -218,7 +218,7 @@
async getColumnList() {
await this.$axios({
method: "get",
- url: "sccg/message_column/getAllColumn",
+ url: "sccg/message_column/getShowColumn",
}).then((res) => {
this.colList = res.data;
});
diff --git a/src/views/operate/sms/smsIndex/createSms/index.vue b/src/views/operate/sms/smsIndex/createSms/index.vue
index 254df77..effcbf0 100644
--- a/src/views/operate/sms/smsIndex/createSms/index.vue
+++ b/src/views/operate/sms/smsIndex/createSms/index.vue
@@ -8,7 +8,7 @@
<el-form-item class="optionItem" label="鐭俊妯℃澘:" prop="messageType">
<div class="message-item">
<div class="message-item__left">
- <el-select v-model="role.messageType" placeholder="璇烽�夋嫨鐭俊妯℃澘">
+ <el-select v-model="role.messageType" placeholder="璇烽�夋嫨鐭俊妯℃澘" @change="setTemplateValue">
<el-option v-for="item in colList" :key="item.id" :label="item.title"
:value="item.id">
</el-option>
@@ -199,6 +199,14 @@
}
})
},
+ setTemplateValue(obj){
+ var _this=this
+ SMS.getSMSTemplateById(obj).then((result) =>{
+ _this.role.head=result.title
+ _this.role.body=result.body
+ _this.$refs.edit.editor.txt.html(result.body)
+ })
+ },
// 閲嶇疆琛ㄥ崟
handleReset() {
this.$refs.edit.editor.txt.clear();
diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index 60d59e7..daadbfa 100644
--- a/src/views/operate/sms/smsIndex/index.vue
+++ b/src/views/operate/sms/smsIndex/index.vue
@@ -3,7 +3,6 @@
<header>
<div class="header-nav">
<span class="nav-left">鏁版嵁绛涢��</span>
- <span class="nav-right">楂樼骇鎼滅储</span>
</div>
<div class="header-content">
<div class="search">
@@ -195,7 +194,7 @@
getTableData() {
const respondResult = this.messageStatus === '鍏ㄩ儴' ? null : this.messageStatus;
- getMessageList({ channelCode: '03', current: this.currentPage,
+ getMessageList({ channelCode: '02', current: this.currentPage,
respondResult, pageSize: this.pageSize, head: this.context })
.then(({ records, total }) => {
this.tableData = records;
diff --git a/src/views/operate/sms/smsTemplate/index.vue b/src/views/operate/sms/smsTemplate/index.vue
index e750f1b..52cfe25 100644
--- a/src/views/operate/sms/smsTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/index.vue
@@ -3,7 +3,6 @@
<header>
<div class="header-nav">
<span class="nav-left">鏁版嵁绛涢��</span>
- <span class="nav-right">楂樼骇鎼滅储</span>
</div>
<div class="header-content">
<div class="search">
--
Gitblit v1.8.0