From 9931c14a7ee9502daa749d94020ea1cbc68c8473 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Fri, 30 Sep 2022 11:50:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E6=8F=90=E9=97=AE=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/uc.scss          |  4 ++++
 src/components/Qa/ucList.vue       | 36 +++++++++++++++++-------------
 src/components/UserCenter/menu.vue |  2 +-
 src/icons/svg/del-icon.svg         | 16 +++++++++++++
 src/icons/svg/edit-icon.svg        | 13 +++++++++++
 src/views/qa/MyList.vue            | 16 +++++++------
 src/views/study/Courses.vue        |  7 +++---
 src/views/user/MyAssess.vue        | 20 ++++++++---------
 8 files changed, 77 insertions(+), 37 deletions(-)
 create mode 100644 src/icons/svg/del-icon.svg
 create mode 100644 src/icons/svg/edit-icon.svg

diff --git a/src/assets/styles/uc.scss b/src/assets/styles/uc.scss
index feb88a5c..f1db6c34 100644
--- a/src/assets/styles/uc.scss
+++ b/src/assets/styles/uc.scss
@@ -22,6 +22,10 @@
     font-size: 14px;
     color: #666666;
  }
+ .uc-center-summary{
+   font-size: 14px;
+   color: #333333;
+}
  .uc-center-icon{
     font-size: 12px;
     color: #999999;
diff --git a/src/components/Qa/ucList.vue b/src/components/Qa/ucList.vue
index d3212f2c..a9238e59 100644
--- a/src/components/Qa/ucList.vue
+++ b/src/components/Qa/ucList.vue
@@ -3,15 +3,18 @@
     <div class="article-list" v-for="(item, idx) in items" :key="idx" @click="jumpRouter(item)">
       <div class="article-info">
         <div class="article-info-title">
-          <span v-if="item.isResolve ==true" class="qa-basic qa-solve">【已解决】</span>
-          <span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span>
-          <span class="title one-line-ellipsis" v-html="$keywordActiveShow(item.title,keyWord)"></span>
-
+          <!-- <span v-if="item.isResolve ==true" class="qa-basic qa-solve">【已解决】</span>
+          <span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span> -->
+          <span class="uc-center-one-title one-line-ellipsis" v-html="$keywordActiveShow(item.title,keyWord)"></span>
+          <div class="button-cla" style="margin-right:70px">
+                 <el-button class="edit" @click.stop="editItem(item)" type="text" size="mini"><svg-icon style="margin-right: 6px;font-size: 14px;" icon-class="edit-icon"></svg-icon>编辑</el-button>
+               <el-button class="del" @click.stop="delItem(item)" type="text" size="mini"><svg-icon style="margin-right: 6px;font-size: 14px;" icon-class="del-icon"></svg-icon>删除</el-button>
+             </div>
         </div>
         <!-- 提问内容 -->
         <div class="article-info-summary ">
           <!-- <div class="summary-content two-line-ellipsis" style="word-wrap: break-word;">{{ item.content }}</div> -->
-          <div class="summary-content two-line-ellipsis " v-html="$keywordActiveShow(item.content,keyWord)"></div>
+            <div class="summary-content two-line-ellipsis " v-html="$keywordActiveShow(item.content,keyWord)"></div>
           <!-- <div class="article-info-tools"> -->
             <!-- <div class="article-info-tools-source">来源:{{ item.course }}</div> -->
             <div class="two-line-ellipsis" style="margin-bottom: 10px;" v-if="item.bestAnswer !== ''">
@@ -22,17 +25,15 @@
             <div style="position: relative; font-size: 15px;display: flex;justify-content: flex-start;align-items: center;">
                 <!-- <div style="font-size:15px;margin:8px 0">提问人：{{ item.sysCreateBy }}</div> -->
 
-                <span style="color: #7b7b7b;margin-right: 8px;">
+                <span style="font-size: 14px;color: #999999;margin-right: 8px;">
 
                   提问时间： {{ item.sysCreateTime }}
                 </span>
                 <span v-if="item.status==0||item.status==2" style="color: red">{{statusText(item.status)}}</span>
               <!-- <div class="article-info-tools-btns"> -->
               <!-- <interactBar :data="item" :type="0" class="test" :answers="true" :comments="false" :shares="false" :views="false"></interactBar> -->
-             <div class="button-cla">
-                 <el-button class="edit" @click.stop="editItem(item)" type="text" icon="el-icon-edit" size="mini" >编辑</el-button>
-               <el-button class="del" @click.stop="delItem(item)" type="text" icon="el-icon-delete" size="mini" >删除</el-button>
-             </div>
+             
+             <div class="button-cla"><interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="item" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
             </div>
             <!-- <el-link icon="el-icon-chat-line-round" class="article-info-tools-btn" >回答57</el-link>
             <el-link icon="el-icon-s-promotion" class="article-info-tools-btn" >分享57</el-link>
@@ -79,9 +80,10 @@
 // import interactBar from '@/components/Portal/interactBar';
 import imageUpload from '@/components/ImageUpload/index.vue';
 import apiQa from '@/api/modules/qa.js'
+import interactBar from '@/components/Portal/interactBar.vue';
 export default {
   name: 'articleItems',
-  components: { imageUpload },
+  components: { imageUpload,interactBar },
   props: {
     items: {
       //name,
@@ -225,8 +227,9 @@ export default {
       font-size: 14px;
     }
 .artlist{
-  padding-left: 23px;
+  padding-left: 16px;
   padding-right: 32px;
+  // margin-top: 30px;
   cursor: pointer;
 }
 .one-line-ellipsis{
@@ -273,8 +276,8 @@ export default {
 }
 .article-list {
   margin: 5px 0;
-  border-bottom: 1px solid #E8E8E8;
-  padding: 10px 0;
+  border-bottom: 1px solid rgba($color: #999999, $alpha:0.2);
+  padding: 33px 0;
 }
 
 .article-info {
@@ -285,7 +288,7 @@ export default {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    margin-left: -14px;
+    // margin-left: -14px;
     .title{
       margin-left: 8px;
       flex-shrink: 10000;
@@ -298,8 +301,9 @@ export default {
   .article-info-summary {
     margin-left: px;
     // height:70px;
-    color: #666;
+    color: #333;
     .summary-content{
+      font-size: 14px;
       margin:10px 0;
     }
   }
diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 7cc45a0c..38fc9e0d 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -268,7 +268,7 @@
           </el-menu-item>
           <el-menu-item index="/qa/myreplys">
             <!-- <i class="el-icon-menu"></i> -->
-            <span slot="title" class="myqa">我回答的</span>
+            <span slot="title" class="textl">我回答的</span>
           </el-menu-item>
         </el-submenu>
         <el-menu-item index="/article/mylist" v-show="curIdentity == 1">
diff --git a/src/icons/svg/del-icon.svg b/src/icons/svg/del-icon.svg
new file mode 100644
index 00000000..b031afdc
--- /dev/null
+++ b/src/icons/svg/del-icon.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 17备份</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="13.我的提问" transform="translate(-1734.000000, -445.000000)">
+            <g id="编组-17备份" transform="translate(1734.000000, 445.000000)">
+                <path d="M6.02941176,0 L7.26470588,0 C8.09313301,-1.52179594e-16 8.76470588,0.671572875 8.76470588,1.5 L8.76470588,2 L8.76470588,2 L4.52941176,2 L4.52941176,1.5 C4.52941176,0.671572875 5.20098464,1.52179594e-16 6.02941176,0 Z" id="矩形" fill="#B3BDC4"></path>
+                <rect id="矩形" fill="#B3BDC4" x="1.70588235" y="3.33333333" width="10.5882353" height="10.6666667" rx="1"></rect>
+                <rect id="矩形" stroke="#B3BDC4" fill="#B3BDC4" x="1.5" y="1.83333333" width="11" height="1" rx="0.5"></rect>
+                <line x1="7" y1="5.45305864" x2="7" y2="11.7528444" id="路径-8" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="4.17647059" y1="6.78639197" x2="4.17647059" y2="10.3333333" id="路径-8备份" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="9.82352941" y1="6.78639197" x2="9.82352941" y2="10.3333333" id="路径-8备份-2" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/edit-icon.svg b/src/icons/svg/edit-icon.svg
new file mode 100644
index 00000000..0160cf07
--- /dev/null
+++ b/src/icons/svg/edit-icon.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 29</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="13.我的提问" transform="translate(-1627.000000, -445.000000)">
+            <g id="编组-29" transform="translate(1627.096757, 445.000000)">
+                <polygon id="路径-43" fill="#B3BDC4" points="0 13.7254019 0 10.6458899 7.31104864 3.41424666 10.0545279 5.62816355 3.18899894 13.2703675"></polygon>
+                <polygon id="路径-44" fill="#B3BDC4" points="7.87799024 2.47399486 9.4834953 0.725401855 13 3.41424666 11.0908145 5.10319344"></polygon>
+                <line x1="6.55379409" y1="12.9181356" x2="14" y2="12.9181356" id="路径-45" stroke="#B3BDC4" stroke-width="2"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/qa/MyList.vue b/src/views/qa/MyList.vue
index 6671abca..f90633db 100644
--- a/src/views/qa/MyList.vue
+++ b/src/views/qa/MyList.vue
@@ -16,16 +16,17 @@
       <div>
         <div style="display: flex;justify-content:space-around;padding: 12px 22px 10px 18px;">
           <!--<div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div>-->
+          <div class="uc-center-page" style="margin-right:30px">我的提问</div>
           <div style="padding: 0px 5px;">
-            <el-select v-model="queryObj.isResolve" style="width: 110px;" clearable placeholder="状态">
+            <el-select v-model="queryObj.isResolve" class="uc-select" clearable placeholder="状态">
               <el-option label="全部" value=""></el-option>
               <el-option label="待解决" :value="false"></el-option>
               <el-option label="已解决" :value="true"></el-option>
             </el-select>
           </div>
-          <div style="padding: 0px 5px;"><el-input clearable placeholder="搜索问题" v-model="queryObj.keyWord"></el-input></div>
-          <div style="padding: 0px 5px;"><el-button icon="el-icon-search" @click="getList" type="primary" >搜索</el-button></div>
-           <div style="padding-left:5px"><el-button type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button></div>
+          <div style="padding: 0px 6px;"><el-input class="uc-input" clearable placeholder="搜索问题" v-model="queryObj.keyWord"></el-input></div>
+          <div style="padding: 0px 6px;"><el-button icon="el-icon-search" class="search-btn" @click="getList" type="primary" >搜索</el-button></div>
+           <div style="padding-left:5px"><el-button type="primary" class="search-btn" icon="el-icon-refresh-right" @click="reset">重置</el-button></div>
         </div>
       </div>
       <div style="padding: 12px 32px 10px 32px;"><el-button type="primary" style="width: 89px;height: 38px;" icon="el-icon-plus" @click="$refs.addQuestion.askQuestionDialog = true" size="small">提问题</el-button></div>
@@ -46,9 +47,10 @@
         ></el-pagination>
       </div>
       <div v-else>
-          <div v-if="qaList.length == 0">
-              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-              <div v-else class="zan-wu">暂无数据</div>
+          <div v-if="qaList.length == 0" class="home-no-list">
+                <img class="img" style="width:360px;height:226px" src="/images/homeWu/no-madel.png" alt="" srcset="">
+                <p class="text"  v-if="isSearh" style="color: #333333;margin-top:50px;font-size: 14px">没有查询到相关内容</p>
+                <p class="text" v-else style="color: #333333;margin-top:50px;font-size: 14px">你还没有提问问题哦～</p>
           </div>
       </div>
     </div>
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue
index d4618148..ccf64010 100644
--- a/src/views/study/Courses.vue
+++ b/src/views/study/Courses.vue
@@ -93,8 +93,9 @@
         <div v-else class="home-no-list">
             <!-- <span v-if="dataList.length==0">当前列表无数据</span>
             <span v-else-if="couresList.length==0" >未找到您要搜索的内容</span> -->
-            <img class="img" style="width:360px;height:226px" src="/images/homeWu/no-madel.png" alt="" srcset="">
-            <p class="text" style="color: #333333;margin-top:50px;font-size: 14px">你还没有报名课程哦～</p>
+            <img v-if="dataList.length==0 || couresList.length==0" class="img" style="width:360px;height:226px" src="/images/homeWu/no-madel.png" alt="" srcset="">
+            <p v-if="dataList.length==0" class="text" style="color: #333333;margin-top:50px;font-size: 14px">你还没有报名课程哦～</p>
+            <p v-else-if="couresList.length==0" class="text" style="color: #333333;margin-top:50px;font-size: 14px">未找到您要搜索的内容</p>
         </div>
       </div>
   </div>
@@ -170,7 +171,7 @@ computed: {
             if(item.isOld){
                apiBoeCourse.delLearning(item.kid).then(res=>{
                   if(res.status==200){
-                     this.$message({ type: 'success', message: '删除成功!' });
+                     this.$message({ type: 'success',center: true, message: '课程删除成功!' });
                     this.couresList.forEach((ic,index)=>{
                        if(item.kid == ic.kid) {
                          this.couresList.splice(index,1);
diff --git a/src/views/user/MyAssess.vue b/src/views/user/MyAssess.vue
index 18974ed7..9345fa43 100644
--- a/src/views/user/MyAssess.vue
+++ b/src/views/user/MyAssess.vue
@@ -2,12 +2,13 @@
     <!-- <Remark>
       1.测评界面实例图<br/>
     </Remark> -->
-    <div style="padding:10px 0px 12px 2px">
+    <div style="padding:10px 0px 12px 22px">
     <el-row>
       <el-col :span="24">
-        <el-input clearable placeholder="搜索名称" v-model="keyword"></el-input>
-        <el-button type="primary" icon="el-icon-search" @click="getData()">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button>
+        <span class="uc-center-page" style="margin-right:90px">我的测评</span>
+        <el-input clearable placeholder="搜索名称" class="uc-input" v-model="keyword"></el-input>
+        <el-button type="primary" icon="el-icon-search" class="search-btn" @click="getData()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-refresh-right" class="search-btn" @click="reset">重置</el-button>
       </el-col>
       <el-col  :span="8" v-for="(item,index) in testList" :key="index">
          <!-- @click="textdetail(item)" -->
@@ -41,13 +42,12 @@
           </el-pagination>
        </div>
        <div v-else>
-            <div v-if="testList.length == 0">
-              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-              <div v-else class="zan-wu">暂无数据</div>
-            </div>
+          <div v-if="testList.length == 0" class="home-no-list">
+            <img class="img" style="width:360px;height:226px" src="/images/homeWu/no-madel.png" alt="" srcset="">
+            <p class="text" style="color: #333333;margin-top:50px;font-size: 14px">暂无课程，请优先学习其它课程吧～</p>
           </div>
-    </div>
-
+       </div>
+  </div>
 </template>
 <script>
   import apiBoeCourse from '@/api/boe/course.js';