hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-10 19:36:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev0731' into dev0731

Browse Source
This commit is contained in:
lims1@hunktimes.com
2023-08-09 01:44:08 +08:00
parent 8395cb26fa 0bfee8bb95
commit c7ecb9327a
6 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/boe/login.js
View File

@@ -8,6 +8,12 @@ const logout = function() {
return ajax.post('/b1/system/user/logout',{});
}
const getRsaPublicKey=function(){
return ajax.get('/b1/common/secret/rsa-public-key');
}
/**修改密码
* oldPassword:'',
* newPassword:'',
@@ -20,5 +26,6 @@ const modifyPassword = function(data) {
export default {
logout,
modifyPassword
modifyPassword,
getRsaPublicKey
}

1
src/assets/styles/portal.scss
View File

@@ -364,6 +364,7 @@ body {margin: 0px;padding: 0px;}
line-height: 40px;
padding: 0 20px;
margin-right: 20px;
margin-bottom: 10px;
cursor: pointer;
&:hover{

2
src/components/Course/courseForm.vue
View File

@@ -671,7 +671,7 @@ export default {
apiUserBasic.getUserAudiences(params).then(rs=>{
if(rs.status==200){
let crowdList=[];
rs.result.audienceList.forEach(item=>{
rs.result.list.forEach(item=>{
crowdList.push({
id:item.id,
name:item.audienceName,

5
src/views/portal/case/Index.vue
View File

@@ -361,6 +361,7 @@ export default {
},
data() {
return {
caseYears:[],
refId: '',//消息跳转案例的id
selectList: [],//点击选中的list
twoList: [], //二级分类{type:12}
@@ -387,7 +388,7 @@ export default {
Positive: [],//排行数据3
protocolDialogVisible: false,
protocolConfirmButton: true,
years: [new Date().getFullYear().toString()],
years: [],
queryCondition: {
pageIndex: 1,
pageSize: 5,
@@ -572,7 +573,7 @@ export default {
}
console.log(isBack, 'isBack');
// Promise.all([apiType.items("org_domain"), apiCase.majorTypes()]).then(rs => {
Promise.all([apiType.treeList(1,90,1), apiCase.majorTypes()]).then(rs => {
Promise.all([apiType.treeList(1,155,1), apiCase.majorTypes()]).then(rs => {
if (rs[0].code == 200) {
const {records} = rs[0].data
records.forEach(item => {

20
src/views/portal/course/Index.vue
View File

@@ -317,7 +317,7 @@
</div>
</div>
<!-- 清除 -->
<div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0;">
<div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0;margin-bottom: 20px;">
<div class="searchbar" style="background-color:#f6f7fb;display: flex;justify-content: space-between;">
<div style="line-height: 30px;">
<span class="item-title"> 搜索条件</span>
@@ -331,7 +331,7 @@
</div>
<!-- 标题最新最热好评率 -->
<div class="xcourse-list" style="background-color: #fff;border-radius: 8px;padding:0 25px;margin-top: 20px;">
<div class="xcourse-list" style="background-color: #fff;border-radius: 8px;padding:0 25px;">
<div class="order-div" v-if="!newData">
<span class="quyer-tag">
<el-button type="text" class="order-class" @click="orderChange('studys')"
@@ -1012,14 +1012,14 @@ export default {
}
if (item.children) {
//增加死数据
item.children.push({
type: 12,
id: item.id * (index + 200),
name: '线上品牌系列课程',
children: [],
checked: false,
newData: true
})
// item.children.push({
// type: 12,
// id: item.id * (index + 200),
// name: '线上品牌系列课程',
// children: [],
// checked: false,
// newData: true
// })
item.children.forEach(subItem => {
let newSubItem = {
type: 12,

41
src/views/user/Setting.vue
View File

@@ -239,6 +239,7 @@
<script>
import apiTeach from '@/api/modules/teacher.js';
import { mapGetters, mapActions } from 'vuex';
import { JSEncrypt } from 'jsencrypt'
import userApi from "@/api/system/user";
import accountApi from "@/api/account";
import apiPassword from '@/api/boe/login.js'
@@ -538,12 +539,16 @@
this.checkboxGroup = [];
apiUserhobby.info(this.userInfo.aid).then(res=>{
if(res.status == 200) {
let tlist=[];
res.result.forEach(item=>{
this.checkboxGroup.push(item.refId);
item.name = this.sysTypeName(item.refId)
if(item.name){
this.checkboxGroup.push(item.refId);
tlist.push(item);
}
})
// console.log(res.result);
this.interestList = res.result;
this.interestList = tlist;
}
})
},
@@ -685,8 +690,32 @@
})
},
updatePassword(){
let $this=this;
this.$refs.form.validate((valid) => {
if (valid) {
apiPassword.getRsaPublicKey().then(krs=>{
if(krs.code=='0'){
let publicKey=krs.data.list.publickey;
let encryptor = new JSEncrypt();
let rsa ='-----BEGIN PUBLIC KEY-----'+publicKey+'-----END PUBLIC KEY-----';
encryptor.setPublicKey(rsa);
let mpdata={
oldPassword:$this.passwordForm.oldPass,
newPassword:encryptor.encrypt($this.passwordForm.newPass),
confirmPassword:encryptor.encrypt($this.passwordForm.confirmPass)
}
apiUserBasic.modifyPassword(mpdata).then(res=>{
if(res.status==200){
this.$message.success('修改密码成功')
this.dialogVisiblePassword = false;
}else{
this.$message.error(res.message);
}
})
}else{
$this.$message.error('获取公钥错误：'+res.message);
}
})
// apiPassword.modifyPassword({oldPassword:this.passwordForm.oldPass,newPassword:this.passwordForm.newPass,confirmPassword:this.passwordForm.confirmPass}).then(res=>{
// if(res.status==200){
// this.$message.success('修改密码成功')
@@ -695,14 +724,6 @@
// this.$message.error(res.message);
// }
// })
apiUserBasic.modifyPassword({oldPassword:this.passwordForm.oldPass,newPassword:this.passwordForm.newPass,confirmPassword:this.passwordForm.confirmPass}).then(res=>{
if(res.status==200){
this.$message.success('修改密码成功')
this.dialogVisiblePassword = false;
}else{
this.$message.error(res.message);
}
})
} else {
return false;
}