分支合并

jydocs-mobile/src/views/details/details.vue

@@ -31,7 +31,7 @@
                     <p class="p2">{{detailData.price}}</p>
                 </template>
             </van-goods-action-icon>
-            <van-goods-action-icon icon="diy-jubao" text="投诉举报" @click="jubaod" />
+            <van-goods-action-icon icon="diy-jubao" text="投诉" @click="jubaod" />
             <van-goods-action-icon :icon="collectd==1?'diy-guanzhu':'diy-weiguanzhu'" :text="collectd==1?'已收藏':'收藏'" @click="canged" v-if="!flag" />
             <van-goods-action-icon :icon="collectd==1?'diy-guanzhu':'diy-weiguanzhu'" :text="collectd==1?'已收藏':'收藏'" v-else />
             <van-goods-action-button text="下载文档" @click="uploaded" />

jydocs-pc/src/components/recommend.vue

@@ -5,7 +5,7 @@
     <div class="docs" v-for="item in recomes" :key="item.docId">
         <div class="imgs" @click="detailClick(item.docId)">
             <img :src="item.previewImgId" alt="">
-            <i class="el-icon-jy-word"></i>
+            <i :class="'el-icon-jy-' + filesType(item.docFileType)"></i>
         </div>
         <div class="conts">
             <h5 @click="detailClick(item.docId)">{{item.docName}}</h5>
@@ -66,6 +66,20 @@ export default {
         params: { id: ids }
       })
       window.open(routeUrl.href, '_blank')
+    },
+    filesType (type) {
+      let numStr = type
+      switch (type) {
+        case 'doc': {
+          numStr = 'word'
+          break
+        }
+        case 'xls': {
+          numStr = 'excel'
+          break
+        }
+      }
+      return numStr
     }
   }
 }

jydocs-pc/src/views/Content.vue

@@ -34,7 +34,7 @@
                     </el-tooltip>
                     <span class="spa1 spa2" @click="shoucang"><i :class="collectd==1?'el-icon-jy-guanzhu':'el-icon-jy-weiguanzhu'"></i>{{collectd==1?'已收藏':'收藏'}}</span>
                     <el-tooltip content="如果您发现此内容有侵权行为，请联系客服400-108-6670进行投诉" placement="top" effect="dark">
-                        <span class="spa1"><i class="el-icon-jy-jubao"></i>投诉举报</span>
+                        <span class="spa1"><i class="el-icon-jy-jubao"></i>投诉</span>
                     </el-tooltip>
                 </div>
             </div>
@@ -67,7 +67,7 @@
                         </el-tooltip>
                         <span class="spa1 spa2" @click="shoucang"><i :class="collectd==1?'el-icon-jy-guanzhu':'el-icon-jy-weiguanzhu'"></i>{{collectd==1?'已收藏':'收藏'}}</span>
                         <el-tooltip content="如果您发现此内容有侵权行为，请联系客服400-108-6670进行投诉" placement="top" effect="dark">
-                            <span class="spa1"><i class="el-icon-jy-jubao"></i>投诉举报</span>
+                            <span class="spa1"><i class="el-icon-jy-jubao"></i>投诉</span>
                         </el-tooltip>
                     </div>
                     <el-button type="primary" @click="loadFile">{{btnName}}</el-button>