From 90fcc077e736966eb1d5595615340a368449aa9f Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Sat, 5 Aug 2023 19:46:59 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=8F=97=E4=BC=97=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E5=8F=98=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/courseForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 81aac052..688d3fad 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -650,7 +650,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,

From 3eb3d40d59482abb1f128ffb1f6dfe83d979ad1f Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 7 Aug 2023 11:56:37 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/boe/login.js       |  8 +++++++-
 src/views/user/Setting.vue | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/api/boe/login.js b/src/api/boe/login.js
index 2ea26ea3..8d7923eb 100644
--- a/src/api/boe/login.js
+++ b/src/api/boe/login.js
@@ -8,6 +8,11 @@ const logout = function() {
     return ajax.post('/b1/system/user/logout',{});
 }
 
+const getRsaPublicKey(){
+   return ajax.get('/b1/common/secret/rsa-public-key');
+}
+
+
 /**修改密码
 * oldPassword:'',
 * newPassword:'',
@@ -20,5 +25,6 @@ const modifyPassword = function(data) {
 
 export default {
     logout,
-    modifyPassword
+    modifyPassword,
+    getRsaPublicKey
 }
diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index 3e65317c..a9b22d3d 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -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('修改密码成功')

From d47d621e89a97fce67265a2440bb15a709e8b2fd Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Mon, 7 Aug 2023 12:30:46 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=A1=88=E4=BE=8Byear=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 858283b0..50c98aba 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -361,6 +361,7 @@ export default {
   },
   data() {
     return {
+      caseYears:[],
       refId: '',//消息跳转案例的id
       selectList: [],//点击选中的list
       twoList: [], //二级分类{type:12}

From 924d2a2a6c398e373610179daa86fb78594a652a Mon Sep 17 00:00:00 2001
From: "BOE\\10867418" <huangshengfa@boe.com.cn>
Date: Mon, 7 Aug 2023 13:39:15 +0800
Subject: [PATCH 04/12] fix bug

---
 src/api/boe/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/boe/login.js b/src/api/boe/login.js
index 8d7923eb..43ad9839 100644
--- a/src/api/boe/login.js
+++ b/src/api/boe/login.js
@@ -8,7 +8,7 @@ const logout = function() {
     return ajax.post('/b1/system/user/logout',{});
 }
 
-const getRsaPublicKey(){
+const getRsaPublicKey = function(){
    return ajax.get('/b1/common/secret/rsa-public-key');
 }
 

From dedc8e99c3a6a5e62de50006fdfe1269da2cd9f1 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 7 Aug 2023 13:52:21 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9js=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/boe/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/boe/login.js b/src/api/boe/login.js
index 8d7923eb..30e78c2a 100644
--- a/src/api/boe/login.js
+++ b/src/api/boe/login.js
@@ -8,7 +8,7 @@ const logout = function() {
     return ajax.post('/b1/system/user/logout',{});
 }
 
-const getRsaPublicKey(){
+const getRsaPublicKey=function(){
    return ajax.get('/b1/common/secret/rsa-public-key');
 }
 

From 3cee29ad1e2a9fc4e8a521d9b8fe026dbd3eca66 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 7 Aug 2023 14:08:36 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/Setting.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index a9b22d3d..8586ceab 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -724,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;
           }

From 63f7caba550e2a37524a19657f256d22dca1b888 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Mon, 7 Aug 2023 18:15:12 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/course/Index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index 12259958..8b7359c8 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -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')"

From 2fa6363a6ad831dba2c0ad958106400d35ffce82 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Tue, 8 Aug 2023 14:14:27 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=89=E7=BA=A7=E7=BA=BF=E4=B8=8A=E5=93=81=E7=89=8C=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/course/Index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index 8b7359c8..e2279663 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -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,

From 11a76469fb497bec2531efe02148c5d55245856b Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Tue, 8 Aug 2023 23:34:12 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E4=B8=89=E7=BA=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 50c98aba..96476a02 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -573,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 => {

From 83c83a1421ce394a6d1be14259160a62f98c607b Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Tue, 8 Aug 2023 23:58:57 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E4=B8=89?=
 =?UTF-8?q?=E7=BA=A7margin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss
index 8f2b399e..2939576a 100644
--- a/src/assets/styles/portal.scss
+++ b/src/assets/styles/portal.scss
@@ -364,6 +364,7 @@ body {margin: 0px;padding: 0px;}
       line-height: 40px;
       padding: 0 20px;
       margin-right: 20px;
+      margin-bottom: 5px;
       cursor: pointer;
 
       &:hover{

From 00df6209d6857d248d0ccc20bdf80e4fd5de141f Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Wed, 9 Aug 2023 00:24:39 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=89=E7=BA=A7margi?=
 =?UTF-8?q?n=E5=8F=98=E6=88=9010?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss
index 2939576a..e6eb1800 100644
--- a/src/assets/styles/portal.scss
+++ b/src/assets/styles/portal.scss
@@ -364,7 +364,7 @@ body {margin: 0px;padding: 0px;}
       line-height: 40px;
       padding: 0 20px;
       margin-right: 20px;
-      margin-bottom: 5px;
+      margin-bottom: 10px;
       cursor: pointer;
 
       &:hover{

From 0bfee8bb957526e9f67d14fd0dd79df478d068d8 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Wed, 9 Aug 2023 01:38:54 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E5=B9=B4=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 96476a02..439be944 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -388,7 +388,7 @@ export default {
       Positive: [],//排行数据3
       protocolDialogVisible: false,
       protocolConfirmButton: true,
-      years: [new Date().getFullYear().toString()],
+      years: [],
       queryCondition: {
         pageIndex: 1,
         pageSize: 5,