zhuohongkui hace 1 año
padre
commit
439a2a1e8b
Se han modificado 87 ficheros con 96 adiciones y 90 borrados
  1. 5 5
      src/assets/css/video-box.scss
  2. 0 0
      src/assets/icon/chanpin.png
  3. 0 0
      src/assets/icon/chanpin_fill_blue.png
  4. 0 0
      src/assets/icon/dianzan_border_grey.png
  5. 0 0
      src/assets/icon/dianzan_fill_black.png
  6. 0 0
      src/assets/icon/dianzan_fill_blue.png
  7. 0 0
      src/assets/icon/dingyue_border_blue.png
  8. 0 0
      src/assets/icon/dingyue_file_blue.png
  9. 0 0
      src/assets/icon/dingyue_file_white.png
  10. 0 0
      src/assets/icon/fabutougao.png
  11. 0 0
      src/assets/icon/heji_file_blue.png
  12. 0 0
      src/assets/icon/huidaodingbu.png
  13. 0 0
      src/assets/icon/huifu_border_blue.png
  14. 0 0
      src/assets/icon/huifu_border_grey.png
  15. 0 0
      src/assets/icon/jiangxu_fill_black.png
  16. 0 0
      src/assets/icon/jiangxu_fill_blue.png
  17. 0 0
      src/assets/icon/jianjie_fill_blue.png
  18. 0 0
      src/assets/icon/jubao_border_grey.png
  19. 0 0
      src/assets/icon/jubao_fill_black.png
  20. 0 0
      src/assets/icon/kefu.png
  21. 0 0
      src/assets/icon/liulanliang.png
  22. 0 0
      src/assets/icon/mulu.png
  23. 0 0
      src/assets/icon/paixu_fill_black.png
  24. 0 0
      src/assets/icon/pinglun_fill_grey.png
  25. 0 0
      src/assets/icon/quanping.png
  26. 0 0
      src/assets/icon/resoubang.png
  27. 0 0
      src/assets/icon/saoyisao.png
  28. 0 0
      src/assets/icon/shanchu.png
  29. 0 0
      src/assets/icon/shangcikandao.png
  30. 0 0
      src/assets/icon/shengxu_fill_black.png
  31. 0 0
      src/assets/icon/shengxu_fill_blue.png
  32. 0 0
      src/assets/icon/shipin.png
  33. 0 0
      src/assets/icon/shoucang_fill_black.png
  34. 0 0
      src/assets/icon/shoucang_fill_blue.png
  35. 0 0
      src/assets/icon/tiaozhuan.png
  36. 0 0
      src/assets/icon/tuichuquanping.png
  37. 0 0
      src/assets/icon/tuwen.png
  38. 0 0
      src/assets/icon/vip/baiyinhuiyuan.png
  39. 0 0
      src/assets/icon/vip/bojinhuiyuan.png
  40. 0 0
      src/assets/icon/vip/huangjinhuiyuan.png
  41. 0 0
      src/assets/icon/vip/putongyonghu.png
  42. 0 0
      src/assets/icon/vip/wudengji.png
  43. 0 0
      src/assets/icon/wangyequanping.png
  44. 0 0
      src/assets/icon/xiayiji.png
  45. 0 0
      src/assets/icon/xiazai_fill_blue.png
  46. 0 0
      src/assets/icon/xiazai_fill_white.png
  47. 0 0
      src/assets/icon/yinliang.png
  48. 0 0
      src/assets/icon/yunshangchuan.png
  49. 0 0
      src/assets/icon/zhaunfa.png
  50. 0 0
      src/assets/icon/ziliao.png
  51. 4 3
      src/common/config.js
  52. 7 7
      src/components/card/comment-detail-card.vue
  53. 1 1
      src/components/card/image-text/my-buy-card.vue
  54. 1 1
      src/components/card/image-text/my-chasingFun-card.vue
  55. 1 1
      src/components/card/image-text/my-release-card.vue
  56. 1 1
      src/components/card/information/my-chasingFun-card.vue
  57. 1 1
      src/components/card/information/my-release-card.vue
  58. 1 1
      src/components/card/video/my-buy-card.vue
  59. 1 1
      src/components/card/video/my-chasingFun-card.vue
  60. 1 1
      src/components/card/video/my-release-card.vue
  61. 1 1
      src/components/image-text/image-text-all-card.vue
  62. 7 6
      src/components/image-text/image-text-recommend-card.vue
  63. 2 2
      src/components/image-text/image-text-recommend-image-card.vue
  64. 1 1
      src/components/information/information-collection-card.vue
  65. 1 1
      src/components/layout/Header.vue
  66. 3 3
      src/components/module/collection.vue
  67. 1 1
      src/components/module/contribute/contribute-upload.vue
  68. 7 7
      src/components/module/detail-interactive.vue
  69. 5 5
      src/components/module/detail-title.vue
  70. 1 1
      src/components/module/screen.vue
  71. 1 1
      src/components/module/to-contact.vue
  72. 1 1
      src/components/module/to-contribute.vue
  73. 1 1
      src/components/module/to-top.vue
  74. 3 3
      src/components/search/search-sort.vue
  75. 9 9
      src/components/video/video-interactive.vue
  76. 6 3
      src/components/video/video-player.vue
  77. 2 2
      src/components/video/video-sidebar.vue
  78. 1 1
      src/components/vip/payment-window-wx.vue
  79. 2 2
      src/views/image-text/components/content.vue
  80. 1 0
      src/views/image-text/image-text-collection.vue
  81. 1 1
      src/views/index.vue
  82. 2 2
      src/views/information/components/content.vue
  83. 3 3
      src/views/information/information-collection.vue
  84. 2 2
      src/views/video/components/content.vue
  85. 5 5
      src/views/vip/children/account.vue
  86. 1 1
      src/views/vip/vip-invoice-detail.vue
  87. 2 2
      vue.config.js

+ 5 - 5
src/assets/css/video-box.scss

@@ -122,7 +122,7 @@
       }
       // 退出全屏按钮
       .prism-fullscreen-btn {
-        background-image: url("~@/assets/icon/退出全屏.png");
+        background-image: url("~@/assets/icon/tuichuquanping.png");
       }
     }
   }
@@ -223,7 +223,7 @@
       margin: 0 !important;
       width: 24px;
       height: 24px;
-      background-image: url("~@/assets/icon/下一集.png");
+      background-image: url("~@/assets/icon/xiayiji.png");
       background-size: 100% 100%;
       cursor: pointer;
     }
@@ -299,7 +299,7 @@
       .volume-icon {
         width: 24px;
         height: 24px;
-        background-image: url("~@/assets/icon/音量.png") !important;
+        background-image: url("~@/assets/icon/yinliang.png") !important;
         background-size: 100% 100%;
         // 音量动画
         .short-horizontal,
@@ -316,7 +316,7 @@
       right: 58px;
       bottom: 12px;
       margin: 0 !important;
-      background: url("~@/assets/icon/网页全屏.png");
+      background: url("~@/assets/icon/wangyequanping.png");
       background-size: 100% 100%;
       cursor: pointer;
     }
@@ -326,7 +326,7 @@
       right: 18px;
       bottom: 12px;
       margin: 0 !important;
-      background-image: url("~@/assets/icon/全屏.png");
+      background-image: url("~@/assets/icon/quanping.png");
       background-size: 100% 100%;
     }
   }

+ 0 - 0
src/assets/icon/产品.png → src/assets/icon/chanpin.png


+ 0 - 0
src/assets/icon/产品_蓝色.png → src/assets/icon/chanpin_fill_blue.png


+ 0 - 0
src/assets/icon/点赞_灰框.png → src/assets/icon/dianzan_border_grey.png


+ 0 - 0
src/assets/icon/点赞_黑色.png → src/assets/icon/dianzan_fill_black.png


+ 0 - 0
src/assets/icon/点赞_蓝色.png → src/assets/icon/dianzan_fill_blue.png


+ 0 - 0
src/assets/icon/订阅_蓝框.png → src/assets/icon/dingyue_border_blue.png


+ 0 - 0
src/assets/icon/订阅_蓝色.png → src/assets/icon/dingyue_file_blue.png


+ 0 - 0
src/assets/icon/订阅_白色.png → src/assets/icon/dingyue_file_white.png


+ 0 - 0
src/assets/icon/发布投稿.png → src/assets/icon/fabutougao.png


+ 0 - 0
src/assets/icon/合集_蓝色.png → src/assets/icon/heji_file_blue.png


+ 0 - 0
src/assets/icon/回到顶部.png → src/assets/icon/huidaodingbu.png


+ 0 - 0
src/assets/icon/回复_蓝框.png → src/assets/icon/huifu_border_blue.png


+ 0 - 0
src/assets/icon/回复_灰框.png → src/assets/icon/huifu_border_grey.png


+ 0 - 0
src/assets/icon/降序_黑色.png → src/assets/icon/jiangxu_fill_black.png


+ 0 - 0
src/assets/icon/降序_蓝色.png → src/assets/icon/jiangxu_fill_blue.png


+ 0 - 0
src/assets/icon/简介_蓝色.png → src/assets/icon/jianjie_fill_blue.png


+ 0 - 0
src/assets/icon/举报_灰框.png → src/assets/icon/jubao_border_grey.png


+ 0 - 0
src/assets/icon/举报_黑色.png → src/assets/icon/jubao_fill_black.png


+ 0 - 0
src/assets/icon/客服.png → src/assets/icon/kefu.png


+ 0 - 0
src/assets/icon/浏览量.png → src/assets/icon/liulanliang.png


+ 0 - 0
src/assets/icon/目录.png → src/assets/icon/mulu.png


+ 0 - 0
src/assets/icon/排序_黑色.png → src/assets/icon/paixu_fill_black.png


+ 0 - 0
src/assets/icon/评论_灰色.png → src/assets/icon/pinglun_fill_grey.png


+ 0 - 0
src/assets/icon/全屏.png → src/assets/icon/quanping.png


+ 0 - 0
src/assets/icon/热搜榜.png → src/assets/icon/resoubang.png


+ 0 - 0
src/assets/icon/扫一扫.png → src/assets/icon/saoyisao.png


+ 0 - 0
src/assets/icon/删除.png → src/assets/icon/shanchu.png


+ 0 - 0
src/assets/icon/上次看到.png → src/assets/icon/shangcikandao.png


+ 0 - 0
src/assets/icon/升序_黑色.png → src/assets/icon/shengxu_fill_black.png


+ 0 - 0
src/assets/icon/升序_蓝色.png → src/assets/icon/shengxu_fill_blue.png


+ 0 - 0
src/assets/icon/视频.png → src/assets/icon/shipin.png


+ 0 - 0
src/assets/icon/收藏_黑色.png → src/assets/icon/shoucang_fill_black.png


+ 0 - 0
src/assets/icon/收藏_蓝色.png → src/assets/icon/shoucang_fill_blue.png


+ 0 - 0
src/assets/icon/跳转.png → src/assets/icon/tiaozhuan.png


+ 0 - 0
src/assets/icon/退出全屏.png → src/assets/icon/tuichuquanping.png


+ 0 - 0
src/assets/icon/图文.png → src/assets/icon/tuwen.png


+ 0 - 0
src/assets/icon/vip/白银会员.png → src/assets/icon/vip/baiyinhuiyuan.png


+ 0 - 0
src/assets/icon/vip/铂金会员.png → src/assets/icon/vip/bojinhuiyuan.png


+ 0 - 0
src/assets/icon/vip/黄金会员.png → src/assets/icon/vip/huangjinhuiyuan.png


+ 0 - 0
src/assets/icon/vip/普通用户.png → src/assets/icon/vip/putongyonghu.png


+ 0 - 0
src/assets/icon/vip/无等级.png → src/assets/icon/vip/wudengji.png


+ 0 - 0
src/assets/icon/网页全屏.png → src/assets/icon/wangyequanping.png


+ 0 - 0
src/assets/icon/下一集.png → src/assets/icon/xiayiji.png


+ 0 - 0
src/assets/icon/下载_蓝色.png → src/assets/icon/xiazai_fill_blue.png


+ 0 - 0
src/assets/icon/下载_白色.png → src/assets/icon/xiazai_fill_white.png


+ 0 - 0
src/assets/icon/音量.png → src/assets/icon/yinliang.png


+ 0 - 0
src/assets/icon/云上传.png → src/assets/icon/yunshangchuan.png


+ 0 - 0
src/assets/icon/转发.png → src/assets/icon/zhaunfa.png


+ 0 - 0
src/assets/icon/资料.png → src/assets/icon/ziliao.png


+ 4 - 3
src/common/config.js

@@ -1,9 +1,10 @@
 // 接口请求地址
-// export const BASE_URL = 'https://www.gyxqcdz.com';//正式
-export const BASE_URL = 'https://ceshi.gyxqcdz.com';//测试
+export const BASE_URL = 'https://www.gyxqcdz.com';//正式
+// export const BASE_URL = 'https://ceshi.gyxqcdz.com';//测试
 
 // 分享地址
-export const FORWARD_URL = 'https://ceshi.gyxqcdz.com/pc/#';
+export const FORWARD_URL = 'https://www.gyxqcdz.com/pc/#';//正式
+// export const FORWARD_URL = 'https://ceshi.gyxqcdz.com/pc/#';//测试
 
 // 阿里云oss文件域名
 export const OSS_URL = 'https://gaoyixia.oss-cn-hangzhou.aliyuncs.com/';

+ 7 - 7
src/components/card/comment-detail-card.vue

@@ -19,19 +19,19 @@
         </div>
         <div class="interactive">
           <div class="item" v-if="!send" @click="send = true">
-            <img src="@/assets/icon/回复_灰框.png" alt="" />
+            <img src="@/assets/icon/huifu_border_grey.png" alt="" />
             <span>回复</span>
           </div>
           <div class="item" v-else @click="send = false">
-            <img src="@/assets/icon/回复_蓝框.png" alt="" />
+            <img src="@/assets/icon/huifu_border_blue.png" alt="" />
             <span class="select">取消回复</span>
           </div>
           <div class="item" v-if="!isChild" @click="handleTags">
             <img
               :src="
                 require(comment.is_like === 0
-                  ? '@/assets/icon/点赞_灰框.png'
-                  : '@/assets/icon/点赞_蓝色.png')
+                  ? '@/assets/icon/dianzan_border_grey.png'
+                  : '@/assets/icon/dianzan_fill_blue.png')
               "
               alt=""
             />
@@ -40,7 +40,7 @@
             }}</span>
           </div>
           <div class="item" v-if="!isChild" @click="reportVisible = true">
-            <img src="@/assets/icon/举报_灰框.png" alt="" />
+            <img src="@/assets/icon/jubao_border_grey.png" alt="" />
             <span>举报</span>
           </div>
           <div
@@ -48,11 +48,11 @@
             v-if="!isChild && comment.can_delete"
             @click="deleteVisible = true"
           >
-            <img src="@/assets/icon/删除.png" alt="" />
+            <img src="@/assets/icon/shanchu.png" alt="" />
             <span>删除</span>
           </div>
           <div class="item" v-if="isChild" @click="$emit('jump', comment)">
-            <img src="@/assets/icon/跳转.png" alt="" />
+            <img src="@/assets/icon/tiaozhuan.png" alt="" />
             <span>跳转</span>
           </div>
         </div>

+ 1 - 1
src/components/card/image-text/my-buy-card.vue

@@ -9,7 +9,7 @@
         <div class="title">{{ info.title }}</div>
         <div class="info">
           <div class="left">
-            <img class="icon" src="@/assets/icon/上次看到.png" alt="" />
+            <img class="icon" src="@/assets/icon/shangcikandao.png" alt="" />
             <div class="last" v-if="info.recently_title">
               上次看到:{{ info.recently_title }}
             </div>

+ 1 - 1
src/components/card/image-text/my-chasingFun-card.vue

@@ -12,7 +12,7 @@
         <div class="title">{{ info.title }}</div>
         <div class="info">
           <div class="left">
-            <img class="icon" src="@/assets/icon/上次看到.png" alt="" />
+            <img class="icon" src="@/assets/icon/shangcikandao.png" alt="" />
             <div class="last" v-if="info.recently_title">
               上次看到:{{ info.recently_title }}
             </div>

+ 1 - 1
src/components/card/image-text/my-release-card.vue

@@ -33,7 +33,7 @@
           </div>
         </div>
         <div class="info">
-          <img class="icon" src="@/assets/icon/浏览量.png" />
+          <img class="icon" src="@/assets/icon/liulanliang.png" />
           <div class="num">{{ info.read_num || 0 }}</div>
           <div class="time">{{ info.create_at }}</div>
         </div>

+ 1 - 1
src/components/card/information/my-chasingFun-card.vue

@@ -12,7 +12,7 @@
         <div class="title">{{ info.title }}</div>
         <div class="info">
           <div class="left">
-            <img class="icon" src="@/assets/icon/上次看到.png" alt="" />
+            <img class="icon" src="@/assets/icon/shangcikandao.png" alt="" />
             <div class="last" v-if="info.recently_title">
               上次看到:{{ info.recently_title }}
             </div>

+ 1 - 1
src/components/card/information/my-release-card.vue

@@ -32,7 +32,7 @@
           </div>
         </div>
         <div class="info">
-          <img class="icon" src="@/assets/icon/浏览量.png" />
+          <img class="icon" src="@/assets/icon/liulanliang.png" />
           <div class="num">{{ info.read_num || 0 }}</div>
           <div class="time">{{ info.create_at }}</div>
         </div>

+ 1 - 1
src/components/card/video/my-buy-card.vue

@@ -9,7 +9,7 @@
         <div class="title">{{ info.title }}</div>
         <div class="info">
           <div class="left">
-            <img class="icon" src="@/assets/icon/上次看到.png" alt="" />
+            <img class="icon" src="@/assets/icon/shangcikandao.png" alt="" />
             <div class="last" v-if="info.recently_title">
               上次看到:{{ info.recently_title }}
             </div>

+ 1 - 1
src/components/card/video/my-chasingFun-card.vue

@@ -12,7 +12,7 @@
         <div class="title">{{ info.title }}</div>
         <div class="info">
           <div class="left">
-            <img class="icon" src="@/assets/icon/上次看到.png" alt="" />
+            <img class="icon" src="@/assets/icon/shangcikandao.png" alt="" />
             <div class="last" v-if="info.recently_title">
               上次看到:{{ info.recently_title }}
             </div>

+ 1 - 1
src/components/card/video/my-release-card.vue

@@ -32,7 +32,7 @@
           </div>
         </div>
         <div class="info">
-          <img class="icon" src="@/assets/icon/浏览量.png" />
+          <img class="icon" src="@/assets/icon/liulanliang.png" />
           <div class="num">{{ info.read_num || 0 }}</div>
           <div class="time">{{ info.create_at }}</div>
         </div>

+ 1 - 1
src/components/image-text/image-text-all-card.vue

@@ -16,7 +16,7 @@
 
       <div class="info">
         <div class="left">
-          <img class="icon" src="@/assets/icon/上次看到.png" alt="" />
+          <img class="icon" src="@/assets/icon/shangcikandao.png" alt="" />
           <div class="last" v-if="info.recently_title">
             上次看到:{{ info.recently_title }}
           </div>

+ 7 - 6
src/components/image-text/image-text-recommend-card.vue

@@ -11,8 +11,8 @@
       <div class="desc">{{ info.desc }}</div>
       <div class="control">
         <div class="item" @click.stop="$emit('handleLike')">
-          <img v-if="info.is_like" src="@/assets/icon/点赞_蓝色.png" alt="" />
-          <img v-else src="@/assets/icon/点赞_黑色.png" alt="" />
+          <img v-if="info.is_like" src="@/assets/icon/dianzan_fill_blue.png" alt="" />
+          <img v-else src="@/assets/icon/dianzan_fill_black.png" alt="" />
           <span :style="{ color: info.is_like ? '#2A63F3' : '#202020' }">{{
             info.like_num
           }}</span>
@@ -20,10 +20,10 @@
         <div class="item" @click.stop="$emit('handleCollect')">
           <img
             v-if="info.is_collect"
-            src="@/assets/icon/收藏_蓝色.png"
+            src="@/assets/icon/shoucang_fill_blue.png"
             alt=""
           />
-          <img v-else src="@/assets/icon/收藏_黑色.png" alt="" />
+          <img v-else src="@/assets/icon/shoucang_fill_black.png" alt="" />
           <span :style="{ color: info.is_collect ? '#2A63F3' : '#202020' }">{{
             info.collect_num
           }}</span>
@@ -31,7 +31,7 @@
 
         <el-popover placement="bottom-start" v-model="forwardVisible">
           <div class="item" slot="reference" @click.stop>
-            <img src="@/assets/icon/转发.png" alt="" />
+            <img src="@/assets/icon/zhaunfa.png" alt="" />
             <span>转发</span>
           </div>
           <div class="forward">
@@ -41,7 +41,7 @@
         </el-popover>
 
         <div class="item" @click.stop="showReport">
-          <img src="@/assets/icon/举报_黑色.png" alt="" />
+          <img src="@/assets/icon/jubao_fill_black.png" alt="" />
           <span>举报</span>
         </div>
       </div>
@@ -146,6 +146,7 @@ export default {
       white-space: nowrap;
       overflow: hidden;
       margin-top: 5px;
+      min-height: 30px;
     }
     .desc {
       height: 40px;

+ 2 - 2
src/components/image-text/image-text-recommend-image-card.vue

@@ -80,10 +80,10 @@ export default {
   }
   .cover-box {
     display: flex;
-    height: 200px;
     .cover {
       flex: 1;
-      height: 200px;
+      width: calc((100% - 40px) / 3);
+      aspect-ratio: 9/5;
       object-fit: cover;
     }
     .cover:not(:last-child) {

+ 1 - 1
src/components/information/information-collection-card.vue

@@ -14,7 +14,7 @@
         <div class="time">{{ info.release_time.slice(0, 10) }}</div>
       </div>
     </div>
-    <img class="vip" src="@/assets/icon/vip.png" />
+    <img v-if="info.is_vip" class="vip" src="@/assets/icon/vip.png" />
   </div>
 </template>
 

+ 1 - 1
src/components/layout/Header.vue

@@ -9,7 +9,7 @@
         @keydown.enter="handleSearch"
       />
       <div class="hot">
-        <img src="@/assets/icon/热搜榜.png" />
+        <img src="@/assets/icon/resoubang.png" />
         <span>热搜榜</span>
       </div>
       <div class="btn" @click="handleSearch">

+ 3 - 3
src/components/module/collection.vue

@@ -2,7 +2,7 @@
   <div class="collection" @click="$emit('toCollection')">
     <div class="left">
       <div class="top">
-        <img class="icon" src="@/assets/icon/合集_蓝色.png" alt="" />
+        <img class="icon" src="@/assets/icon/heji_file_blue.png" alt="" />
         <span class="title">{{ title || "---" }} </span>
         <img class="rightIcon" src="@/assets/icon/right.png" />
       </div>
@@ -16,8 +16,8 @@
       <img
         :src="
           require(follow_switch
-            ? '@/assets/icon/订阅_白色.png'
-            : '@/assets/icon/订阅_蓝框.png')
+            ? '@/assets/icon/dingyue_file_white.png'
+            : '@/assets/icon/dingyue_border_blue.png')
         "
         alt=""
       />

+ 1 - 1
src/components/module/contribute/contribute-upload.vue

@@ -10,7 +10,7 @@
       :accept="accept"
     >
       <div class="upload-content">
-        <img class="icon" src="@/assets/icon/云上传.png" alt="" />
+        <img class="icon" src="@/assets/icon/yunshangchuan.png" alt="" />
         <div class="info">{{ tipValue }}</div>
         <div class="btn">{{ btnValue }}</div>
       </div>

+ 7 - 7
src/components/module/detail-interactive.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="detail-interactive">
     <div class="item" @click="$emit('handleComment')">
-      <img class="icon" src="@/assets/icon/评论_灰色.png" alt="" />
+      <img class="icon" src="@/assets/icon/pinglun_fill_grey.png" alt="" />
       <div class="label">{{ info.comment_num || 0 }}</div>
     </div>
     <div class="item" @click="$emit('handleLike')">
@@ -9,8 +9,8 @@
         class="icon"
         :src="
           require(!info[keyDict.is_like]
-            ? '@/assets/icon/点赞_黑色.png'
-            : '@/assets/icon/点赞_蓝色.png')
+            ? '@/assets/icon/dianzan_fill_black.png'
+            : '@/assets/icon/dianzan_fill_blue.png')
         "
       />
       <div class="label" :class="{ blue: !!info[keyDict.is_like] }">
@@ -22,8 +22,8 @@
         class="icon"
         :src="
           require(!info[keyDict.is_collect]
-            ? '@/assets/icon/收藏_黑色.png'
-            : '@/assets/icon/收藏_蓝色.png')
+            ? '@/assets/icon/shoucang_fill_black.png'
+            : '@/assets/icon/shoucang_fill_blue.png')
         "
         alt=""
       />
@@ -33,7 +33,7 @@
     </div>
     <el-popover placement="bottom" v-model="forwardVisible">
       <div class="item" slot="reference">
-        <img class="icon" src="@/assets/icon/转发.png" alt="" />
+        <img class="icon" src="@/assets/icon/zhaunfa.png" alt="" />
         <div class="label">转发</div>
       </div>
       <div class="forward">
@@ -43,7 +43,7 @@
     </el-popover>
 
     <div class="item" @click="$emit('handleReport')">
-      <img class="icon" src="@/assets/icon/举报_黑色.png" alt="" />
+      <img class="icon" src="@/assets/icon/jubao_fill_black.png" alt="" />
       <div class="label">举报</div>
     </div>
 

+ 5 - 5
src/components/module/detail-title.vue

@@ -15,7 +15,7 @@
       </div>
       <div class="related">
         <div class="item" v-if="show_desc" @click="visible = true">
-          <img src="@/assets/icon/简介_蓝色.png" alt="" />
+          <img src="@/assets/icon/jianjie_fill_blue.png" alt="" />
           <span>简介</span>
         </div>
         <!-- <div
@@ -23,11 +23,11 @@
           v-if="info.goods_id"
           @click="$message.success('敬请期待')"
         >
-          <img src="@/assets/icon/产品_蓝色.png" alt="" />
+          <img src="@/assets/icon/chanpin_fill_blue.png" alt="" />
           <span>相关产品</span>
         </div> -->
         <div class="item" v-if="info.video_id" @click="$emit('toVideoDetail')">
-          <img src="@/assets/icon/视频.png" alt="" />
+          <img src="@/assets/icon/shipin.png" alt="" />
           <span>相关视频</span>
         </div>
         <!-- <div
@@ -35,7 +35,7 @@
           v-if="info.article_id && showImageTextBtn"
           @click="$emit('toImageTextDetail')"
         >
-          <img src="@/assets/icon/图文.png" alt="" />
+          <img src="@/assets/icon/tuwen.png" alt="" />
           <span>相关图文</span>
         </div>
         <div
@@ -43,7 +43,7 @@
           v-if="info.datum_id && showInformationBtn"
           @click="$emit('toInformationDetail')"
         >
-          <img src="@/assets/icon/资料.png" alt="" />
+          <img src="@/assets/icon/ziliao.png" alt="" />
           <span>相关资料</span>
         </div> -->
       </div>

+ 1 - 1
src/components/module/screen.vue

@@ -8,7 +8,7 @@
         @click="
           (_) => {
             current = item;
-            childrenCurrent = item.children[0];
+            childrenCurrent = childrenList[0];
           }
         "
       >

+ 1 - 1
src/components/module/to-contact.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="to-contact" v-if="show" @click="$router.push('contact-online')">
-    <img src="@/assets/icon/客服.png" alt="" />
+    <img src="@/assets/icon/kefu.png" alt="" />
   </div>
 </template>
 

+ 1 - 1
src/components/module/to-contribute.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="to-contribute" v-if="show" @click="handleContribute">
-    <img src="@/assets/icon/发布投稿.png" alt="" />
+    <img src="@/assets/icon/fabutougao.png" alt="" />
   </div>
 </template>
 

+ 1 - 1
src/components/module/to-top.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="to-top" :style="{ opacity: show ? 1 : 0 }" @click="toTop">
-    <img src="@/assets/icon/回到顶部.png" alt="" />
+    <img src="@/assets/icon/huidaodingbu.png" alt="" />
   </div>
 </template>
 

+ 3 - 3
src/components/search/search-sort.vue

@@ -13,9 +13,9 @@
       @click="changeSort(current == 2 ? 3 : 2)"
     >
       时间
-      <img src="@/assets/icon/排序_黑色.png" v-if="current == 1" />
-      <img src="@/assets/icon/升序_蓝色.png" v-else-if="current == 2" />
-      <img src="@/assets/icon/降序_蓝色.png" v-else />
+      <img src="@/assets/icon/paixu_fill_black.png" v-if="current == 1" />
+      <img src="@/assets/icon/shengxu_fill_blue.png" v-else-if="current == 2" />
+      <img src="@/assets/icon/jiangxu_fill_blue.png" v-else />
     </div>
   </div>
 </template>

+ 9 - 9
src/components/video/video-interactive.vue

@@ -5,8 +5,8 @@
         <img
           :src="
             require(currentVideo.is_praise === 0
-              ? '@/assets/icon/点赞_黑色.png'
-              : '@/assets/icon/点赞_蓝色.png')
+              ? '@/assets/icon/dianzan_fill_black.png'
+              : '@/assets/icon/dianzan_fill_blue.png')
           "
           alt=""
         />
@@ -16,8 +16,8 @@
         <img
           :src="
             require(currentVideo.is_collect === 0
-              ? '@/assets/icon/收藏_黑色.png'
-              : '@/assets/icon/收藏_蓝色.png')
+              ? '@/assets/icon/shoucang_fill_black.png'
+              : '@/assets/icon/shoucang_fill_blue.png')
           "
           alt=""
         />
@@ -25,7 +25,7 @@
       </div>
       <el-popover placement="bottom" v-model="forwardVisible">
         <div class="tags" slot="reference">
-          <img src="@/assets/icon/转发.png" alt="" />
+          <img src="@/assets/icon/zhaunfa.png" alt="" />
           <span>转发</span>
         </div>
         <div class="forward">
@@ -35,7 +35,7 @@
       </el-popover>
 
       <div class="tags" @click="reportVisible = true">
-        <img src="@/assets/icon/举报_黑色.png" alt="" />
+        <img src="@/assets/icon/jubao_fill_black.png" alt="" />
         <span>举报</span>
       </div>
       <div
@@ -59,15 +59,15 @@
         <span>查看ppt</span>
       </div> -->
       <div class="related" v-if="currentVideo.article_id" @click="toImageText">
-        <img src="@/assets/icon/图文.png" alt="" />
+        <img src="@/assets/icon/tuwen.png" alt="" />
         <span>跳转图文</span>
       </div>
       <div class="related" v-if="currentVideo.datum_id" @click="toInformation">
-        <img src="@/assets/icon/资料.png" alt="" />
+        <img src="@/assets/icon/ziliao.png" alt="" />
         <span>相关资料</span>
       </div>
       <!-- <div class="related" v-if="currentVideo.goods_id">
-        <img src="@/assets/icon/产品.png" alt="" />
+        <img src="@/assets/icon/chanpin.png" alt="" />
         <span>相关产品</span>
       </div> -->
     </div>

+ 6 - 3
src/components/video/video-player.vue

@@ -24,12 +24,12 @@
       >
         <span>{{
           userInfo.phone
-            ? userInfo.phone.replace(userInfo.phone.slice(3, 7),'****')
+            ? userInfo.phone.replace(userInfo.phone.slice(3, 7), "****")
             : ""
         }}</span>
         <span>{{
           userInfo.phone
-            ? userInfo.phone.replace(userInfo.phone.slice(3, 7),'****')
+            ? userInfo.phone.replace(userInfo.phone.slice(3, 7), "****")
             : ""
         }}</span>
       </div>
@@ -140,6 +140,9 @@ export default {
     this.selection_show = false;
     this.initPlayer();
   },
+  beforeDestroy() {
+    this.aliPlayer.dispose();
+  },
   methods: {
     initPlayer() {
       this.videoArrIndex = this.info.video_arr.findIndex(
@@ -300,7 +303,7 @@ export default {
         autoplay: true, // 自动播放
         isLive: false, // 是不是直播
         rePlay: false, // 播放器自动循环播放
-        playsinline: true, // H5是否内置播放
+        playsinline: false, // H5是否内置播放
         preload: true, // 播放器自动加载
         controlBarVisibility: "always", // 控制栏显示方式
         useH5Prism: true, // 指定使用H5播放器

+ 2 - 2
src/components/video/video-sidebar.vue

@@ -13,11 +13,11 @@
             v-if="info.follow_switch == 0"
             @click="switchSet"
           >
-            <img src="@/assets/icon/订阅_蓝色.png" alt="" />
+            <img src="@/assets/icon/dingyue_file_blue.png" alt="" />
             <span>订阅</span>
           </div>
           <div class="subscribe select" v-else @click="switchSet">
-            <img src="@/assets/icon/订阅_白色.png" alt="" />
+            <img src="@/assets/icon/dingyue_file_white.png" alt="" />
             <span>已订阅</span>
           </div>
         </div>

+ 1 - 1
src/components/vip/payment-window-wx.vue

@@ -26,7 +26,7 @@
           ></canvas>
         </div>
         <div class="tips">
-          <img class="left" src="@/assets/icon/扫一扫.png" alt="" />
+          <img class="left" src="@/assets/icon/saoyisao.png" alt="" />
           <div class="right">
             <div>打开手机微信</div>
             <div>扫一扫二维码</div>

+ 2 - 2
src/views/image-text/components/content.vue

@@ -84,7 +84,7 @@ export default {
       current: 0,
       recommendParams: {
         page: 1, // 页数
-        page_num: 10, // 每页数
+        page_num: 20, // 每页数
       },
       recommendList: [],
       loading: false,
@@ -94,7 +94,7 @@ export default {
         first_classify: 0, // 一级分类
         second_classify: 0, // 二级分类
         page: 1, // 页数
-        page_num: 10, // 每页数
+        page_num: 20, // 每页数
         sort_type: 1, // 排序方式
       },
       allList: [], //全部数据

+ 1 - 0
src/views/image-text/image-text-collection.vue

@@ -96,6 +96,7 @@ export default {
 .wrap {
   width: calc(100% - 20vw);
   min-width: 900px;
+  margin: 0 auto;
   .wrap-content {
     width: 100%;
     margin: 0 auto;

+ 1 - 1
src/views/index.vue

@@ -16,7 +16,7 @@
       <div class="search" @click="toSearch">
         <div class="search-content">
           <div class="hot">
-            <img src="@/assets/icon/热搜榜.png" />
+            <img src="@/assets/icon/resoubang.png" />
             <span>热搜榜</span>
           </div>
           <div class="search-btn">搜索</div>

+ 2 - 2
src/views/information/components/content.vue

@@ -82,7 +82,7 @@ export default {
       current: 0,
       recommendParams: {
         page: 1, // 页数
-        page_num: 10, // 每页数
+        page_num: 20, // 每页数
       },
       recommendList: [],
       loading: false,
@@ -92,7 +92,7 @@ export default {
         first_classify: 0, // 一级分类
         second_classify: 0, // 二级分类
         page: 1, // 页数
-        page_num: 10, // 每页数
+        page_num: 20, // 每页数
         sort_type: 1, // 排序方式
       },
       allList: [], //全部数据

+ 3 - 3
src/views/information/information-collection.vue

@@ -73,7 +73,7 @@
         v-if="!manageType && info.goods_id"
         @click="$message.success('敬请期待')"
       >
-        <img src="@/assets/icon/产品_蓝色.png" alt="" />
+        <img src="@/assets/icon/chanpin_fill_blue.png" alt="" />
         <span>相关产品</span>
       </div>
       <div
@@ -81,7 +81,7 @@
         v-if="!manageType && info.video_id"
         @click="toVideoDetail"
       >
-        <img src="@/assets/icon/视频.png" alt="" />
+        <img src="@/assets/icon/shipin.png" alt="" />
         <span>相关视频</span>
       </div>
       <div
@@ -89,7 +89,7 @@
         v-if="manageType && download_list.length"
         @click="handleClick"
       >
-        <img src="@/assets/icon/下载_白色.png" alt="" />
+        <img src="@/assets/icon/xiazai_fill_white.png" alt="" />
         <span>下载</span>
       </div>
     </div>

+ 2 - 2
src/views/video/components/content.vue

@@ -74,7 +74,7 @@ export default {
       current: 0,
       recommendParams: {
         page: 1, // 页数
-        page_num: 10, // 每页数
+        page_num: 20, // 每页数
       },
       recommendList: [],
       loading: false,
@@ -84,7 +84,7 @@ export default {
         first_classify: 0, // 一级分类
         second_classify: 0, // 二级分类
         page: 1, // 页数
-        page_num: 10, // 每页数
+        page_num: 20, // 每页数
         sort_type: 1, // 排序方式
       },
       allList: [], //全部数据

+ 5 - 5
src/views/vip/children/account.vue

@@ -131,7 +131,7 @@ export default {
   data() {
     return {
       avatar: require("@/assets/icon/avatar.png"),
-      noneLevel: require("@/assets/icon/vip/无等级.png"),
+      noneLevel: require("@/assets/icon/vip/wudengji.png"),
       levelList: [],
       nameVisible: false,
       name: "",
@@ -141,10 +141,10 @@ export default {
     ...mapState(["userInfo", "userLevel"]),
     levelIcon() {
       let icon = {
-        普通用户: require("@/assets/icon/vip/普通用户.png"),
-        白银会员: require("@/assets/icon/vip/白银会员.png"),
-        黄金会员: require("@/assets/icon/vip/黄金会员.png"),
-        铂金会员: require("@/assets/icon/vip/铂金会员.png"),
+        普通用户: require("@/assets/icon/vip/putongyonghu.png"),
+        白银会员: require("@/assets/icon/vip/baiyinhuiyuan.png"),
+        黄金会员: require("@/assets/icon/vip/huangjinhuiyuan.png"),
+        铂金会员: require("@/assets/icon/vip/bojinhuiyuan.png"),
       };
       return this.userInfo.level_id
         ? icon[

+ 1 - 1
src/views/vip/vip-invoice-detail.vue

@@ -8,7 +8,7 @@
         <div class="header">
           <div class="title">发票详情</div>
           <div class="download" v-if="info.bill_img" @click="downloadFill">
-            <img src="@/assets/icon/下载_蓝色.png" />
+            <img src="@/assets/icon/xiazai_fill_blue.png" />
             <span>下载</span>
           </div>
         </div>

+ 2 - 2
vue.config.js

@@ -62,9 +62,9 @@ module.exports = {
         proxy: {
             // 选项写法
             '/': {
-                target: 'https://ceshi.gyxqcdz.com',
+                // target: 'https://ceshi.gyxqcdz.com',
+                target: 'https://www.gyxqcdz.com',
                 // target: 'https://gaoyixia.hdlkeji.com',
-                // target: 'https://www.gyxqcdz.com',
                 // target: 'https://h5.gyxqcdz.com/index.php',
                 // target: 'https://h5.gyxqcdz.com',
                 changeOrigin: true,