Merge branches 'stat', 'stat' and 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

src/components/Article/shareItems.vue

@@ -14,7 +14,11 @@
         <div class="share-time">{{ item.time }}</div>
       </div>
       <div class="coures-content">
-          <span>【文章】</span>{{item.title}}
+          <div style="width: 100%;">【文章】{{item.title}}</div>
+          <div style="color: #999999;font-size: 12px;font-weight: normal; cursor: pointer;width: 50px;" v-if="!item.isRead&&type=='myShare'"  @click.stop="deleteshares(item)">
+            <svg-icon icon-class="withdraw" style="margin-right: 5px;font-size: 14px;" ></svg-icon>
+            撤回
+          </div>
       </div>
     </div>
     <!-- 旧版 -->
@@ -130,12 +134,15 @@ export default {
   width: 100%;
   padding: 30px 0;
   border-bottom:1px solid #e9e9e9 ;
+  
   .coures-content{
     margin-top: 20px;
     font-size: 16px;
     color: #333333;
     font-weight: 600;
     word-break:break-all;
+    display: flex;
+    justify-content: space-between;
     span{
     font-size: 16px;
     margin-left: -9px;
@@ -143,10 +150,12 @@ export default {
   }
   .coures-head{
     display: flex;
+   
     .share-name{
       font-size: 14px;
       color: #666666;
       margin-right: 17px;
+      cursor: pointer;
     }
     .share-time{
       font-size: 14px;

src/components/Case/caseItems.vue

@@ -14,7 +14,10 @@
         <div class="share-time">{{ item.time }}</div>
       </div>
       <div class="coures-content">
-          <span>【案例】</span>{{item.title}}
+          <div style="width: 100%;">【案例】{{item.title}}</div>
+          <div v-if="!item.isRead&&type=='myShare'" @click.stop="deleteshares(item)" style="color: #999999;font-size: 12px;font-weight: normal;width: 50px;">
+            <svg-icon icon-class="withdraw" style="margin-right: 5px;font-size: 14px;" ></svg-icon>
+            撤回</div>
       </div>
 
     </div>
@@ -122,6 +125,8 @@ export default {
     color: #333333;
     font-weight: 600;
     word-break:break-all;
+    display: flex;
+    justify-content: space-between;
     span{
     font-size: 16px;
     margin-left: -9px;

src/components/Course/shareItem.vue

@@ -14,7 +14,10 @@
         <div class="share-time">{{ item.time }}</div>
       </div>
       <div class="coures-content">
-          <span>【课程】</span>{{item.title}}
+          <div style="width: 100%;">【课程】{{item.title}}</div>
+          <div v-if="!item.isRead&&type=='myShare'" @click.stop="deleteshares(item)" style="color: #999999;font-size: 12px;font-weight: normal;width: 50px;">
+            <svg-icon icon-class="withdraw" style="margin-right: 5px;font-size: 14px;" ></svg-icon>
+            撤回</div>
       </div>
 
     </div>
@@ -167,6 +170,8 @@ export default {
     color: #333333;
     font-weight: 600;
     word-break:break-all;
+    display: flex;
+    justify-content: space-between;
     span{
     font-size: 16px;
     margin-left: -9px;

src/components/HomePage/courseList.vue

@@ -100,12 +100,11 @@
                 if(!data.contentId){
                   return;
                 }
-                console.log(data.info,'data.info')
                 if(!data.info.enabled || data.info.deleted){
                   this.$message.warning("此课程已停用或已删除");
                   return;
                 }
-                this.$router.push({ path: '/course/detail?id=', query: { id: data.contentId } });
+                this.$router.push({ path: '/course/studyindex?id=', query: { id: data.contentId } });
             }
           }
       }

src/components/Qa/shareList.vue

@@ -14,7 +14,10 @@
         <div class="share-time">{{ item.time }}</div>
       </div>
       <div class="coures-content">
-          <span>【问答】</span>{{item.title}}
+          <div style="width: 100%;">【问答】{{item.title}}</div>
+          <div v-if="!item.isRead&&type=='myShare'" @click.stop="deleteshares(item)" style="color: #999999;font-size: 12px;font-weight: normal;width: 50px;">
+            <svg-icon icon-class="withdraw" style="margin-right: 5px;font-size: 14px;" ></svg-icon>
+            撤回</div>
       </div>
     </div>
     <!-- 旧版 -->
@@ -137,6 +140,8 @@ export default {
     color: #333333;
     font-weight: 600;
     word-break:break-all;
+    display: flex;
+    justify-content: space-between;
     span{
     font-size: 16px;
     margin-left: -9px;

src/icons/svg/withdraw.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="19px" height="18px" viewBox="0 0 19 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 19</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="我分享的" transform="translate(-1721.000000, -465.000000)" stroke-width="2">
+            <g id="编组-19" transform="translate(1721.644444, 465.000000)">
+                <path d="M2.6077919,5.0612599 L12.0876493,5.39622409 C14.7185321,5.48918451 16.8032826,7.64889926 16.8032826,10.2814239 C16.8032826,12.8874215 14.6907041,15 12.0847064,15 L4.93033545,15 L4.93033545,15" id="路径-76" stroke="#999999"></path>
+                <polyline id="路径-77" stroke="#979797" points="6.36367768 1 2 5.8476065 6.36367768 9.03062995"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>

src/views/portal/article/Detail.vue

@@ -59,7 +59,6 @@
                 <p class="ranking-title">贡献榜</p>
                 <ul class="ranking-data">
                     <li class="index-one-line-ellipsis" v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
-                      <router-link  :to="'article/detail?id=' + item.id">
                         <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
                           <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
                         </span>
@@ -76,7 +75,6 @@
                              <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                         </span>
                         <span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text"> {{ item.orinfo }}</span>  </span>
-                         </router-link>
                     </li>
                 </ul>
               </div>