景龙 / xingqiu · 提交

转到一个项目

作者 景龙
提交 9416a964ca9ae889f20704fc3f724ff36af2f2e8 1 个父辈 7b71baeb
1 个管道 的构建 通过 耗费 0 秒

整合右侧点赞等菜单栏

内嵌 并排对比
正在显示 14 个修改的文件 包含 36 行增加 和 203 行删除
@@ -63,26 +63,7 @@ @@ -63,26 +63,7 @@
63 </div> 63 </div>
64 </main> 64 </main>
65 <!-- 侧边栏 --> 65 <!-- 侧边栏 -->
66 - <div class="sidebar">  
67 - <!-- 收藏 -->  
68 - <div class="collections">  
69 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
70 - </div>  
71 - <!-- 喜欢 -->  
72 - <div class="likes">  
73 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
74 - </div>  
75 - <!-- wx分享 -->  
76 - <div class="wx_go">  
77 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
78 - <p>168</p>  
79 - </div>  
80 - <!-- wb分享 -->  
81 - <div class="wb_go">  
82 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
83 - <p>168</p>  
84 - </div>  
85 - </div> 66 + <include file="public@slide"/>
86 <include file="public@footer"/> 67 <include file="public@footer"/>
87 <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script> 68 <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
88 <script src="__TMPL__/public/assets/js/swiper4/swiper.min.js"></script> 69 <script src="__TMPL__/public/assets/js/swiper4/swiper.min.js"></script>
@@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
17 <div class="mask"> 17 <div class="mask">
18 18
19 </div> 19 </div>
  20 + <!-- 侧边栏 -->
  21 + <include file="public@slide"/>
20 <!--主体内容--> 22 <!--主体内容-->
21 <div class="show_2"> 23 <div class="show_2">
22 <!--banner--> 24 <!--banner-->
@@ -29,15 +29,15 @@ @@ -29,15 +29,15 @@
29 <a href="/portal/star/getStoryDetail?id={$vo.id}"> 29 <a href="/portal/star/getStoryDetail?id={$vo.id}">
30 <!-- 左侧图片 --> 30 <!-- 左侧图片 -->
31 <img class="show_indexImg1" src="{:cmf_get_image_url($vo.thumbnail)}" alt=""> 31 <img class="show_indexImg1" src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
32 - <!-- 文字 -->  
33 - <div class="show_index_con2Txt2">  
34 - {$vo.excerpt}  
35 - </div>  
36 - <!-- 进度条 -->  
37 - <div class="show_index_progress">  
38 - <img src="__TMPL__/public/assets/starImg/aicon_15.png" alt="">  
39 - </div>  
40 </a> 32 </a>
  33 + <!-- 文字 -->
  34 + <div class="show_index_con2Txt2">
  35 + {$vo.excerpt}
  36 + </div>
  37 + <!-- 进度条 -->
  38 + <div class="show_index_progress">
  39 + <img src="__TMPL__/public/assets/starImg/aicon_15.png" alt="">
  40 + </div>
41 </div> 41 </div>
42 </volist> 42 </volist>
43 43
@@ -15,26 +15,7 @@ @@ -15,26 +15,7 @@
15 <div class="mask"> 15 <div class="mask">
16 </div> 16 </div>
17 <!-- 侧边栏 --> 17 <!-- 侧边栏 -->
18 - <div class="sidebar">  
19 - <!-- 收藏 -->  
20 - <div class="collections">  
21 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
22 - </div>  
23 - <!-- 喜欢 -->  
24 - <div class="likes">  
25 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
26 - </div>  
27 - <!-- wx分享 -->  
28 - <div class="wx_go">  
29 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
30 - <p>168</p>  
31 - </div>  
32 - <!-- wb分享 -->  
33 - <div class="wb_go">  
34 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
35 - <p>168</p>  
36 - </div>  
37 - </div> 18 + <include file="public@slide"/>
38 <!-- 主体内容 --> 19 <!-- 主体内容 -->
39 <div class="show_4 clearfix"> 20 <div class="show_4 clearfix">
40 <!-- 内容一 --> 21 <!-- 内容一 -->
@@ -17,26 +17,7 @@ @@ -17,26 +17,7 @@
17 17
18 </div> 18 </div>
19 <!-- 侧边栏 --> 19 <!-- 侧边栏 -->
20 - <div class="sidebar">  
21 - <!-- 收藏 -->  
22 - <div class="collections">  
23 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
24 - </div>  
25 - <!-- 喜欢 -->  
26 - <div class="likes">  
27 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
28 - </div>  
29 - <!-- wx分享 -->  
30 - <div class="wx_go">  
31 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
32 - <p>168</p>  
33 - </div>  
34 - <!-- wb分享 -->  
35 - <div class="wb_go">  
36 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
37 - <p>168</p>  
38 - </div>  
39 - </div> 20 + <include file="public@slide"/>
40 <div class="show_6"> 21 <div class="show_6">
41 <!-- 内容 --> 22 <!-- 内容 -->
42 <div class="show6_con"> 23 <div class="show6_con">
@@ -17,26 +17,7 @@ @@ -17,26 +17,7 @@
17 17
18 </div> 18 </div>
19 <!-- 侧边栏 --> 19 <!-- 侧边栏 -->
20 - <div class="sidebar">  
21 - <!-- 收藏 -->  
22 - <div class="collections">  
23 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
24 - </div>  
25 - <!-- 喜欢 -->  
26 - <div class="likes">  
27 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
28 - </div>  
29 - <!-- wx分享 -->  
30 - <div class="wx_go">  
31 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
32 - <p>168</p>  
33 - </div>  
34 - <!-- wb分享 -->  
35 - <div class="wb_go">  
36 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
37 - <p>168</p>  
38 - </div>  
39 - </div> 20 + <include file="public@slide"/>
40 <div class="show_6"> 21 <div class="show_6">
41 <!-- 内容 --> 22 <!-- 内容 -->
42 <div class="show6_con"> 23 <div class="show6_con">
@@ -82,20 +82,20 @@ @@ -82,20 +82,20 @@
82 <div class="swiper-wrapper"> 82 <div class="swiper-wrapper">
83 <volist name="res_xqgs" id="vo"> 83 <volist name="res_xqgs" id="vo">
84 <div class="swiper-slide"> 84 <div class="swiper-slide">
85 - <a href="/portal/star/getStoryDetail?id={$vo.id}">  
86 - <div class="show_index_con2Txt clearfix"> 85 + <div class="show_index_con2Txt clearfix">
  86 + <a href="/portal/star/getStoryDetail?id={$vo.id}">
87 <!-- 左侧图片 --> 87 <!-- 左侧图片 -->
88 <img class="show_indexImg1" src="{:cmf_get_image_url($vo.thumbnail)}" alt=""> 88 <img class="show_indexImg1" src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
89 - <!-- 文字 -->  
90 - <div class="show_index_con2Txt2">  
91 - {$vo.excerpt}  
92 - </div>  
93 - <!-- 进度条 -->  
94 - <div class="show_index_progress">  
95 - <img src="__TMPL__/public/assets/starImg/aicon_15.png" alt="">  
96 - </div> 89 + </a>
  90 + <!-- 文字 -->
  91 + <div class="show_index_con2Txt2">
  92 + {$vo.excerpt}
97 </div> 93 </div>
98 - </a> 94 + <!-- 进度条 -->
  95 + <div class="show_index_progress">
  96 + <img src="__TMPL__/public/assets/starImg/aicon_15.png" alt="">
  97 + </div>
  98 + </div>
99 </div> 99 </div>
100 </volist> 100 </volist>
101 </div> 101 </div>
@@ -15,26 +15,7 @@ @@ -15,26 +15,7 @@
15 <div class="mask"> 15 <div class="mask">
16 </div> 16 </div>
17 <!-- 侧边栏 --> 17 <!-- 侧边栏 -->
18 - <div class="sidebar">  
19 - <!-- 收藏 -->  
20 - <div class="collections">  
21 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
22 - </div>  
23 - <!-- 喜欢 -->  
24 - <div class="likes">  
25 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
26 - </div>  
27 - <!-- wx分享 -->  
28 - <div class="wx_go">  
29 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
30 - <p>168</p>  
31 - </div>  
32 - <!-- wb分享 -->  
33 - <div class="wb_go">  
34 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
35 - <p>168</p>  
36 - </div>  
37 - </div> 18 + <include file="public@slide"/>
38 <!--主体内容--> 19 <!--主体内容-->
39 <div class="show_2"> 20 <div class="show_2">
40 <!--banner--> 21 <!--banner-->
@@ -15,26 +15,7 @@ @@ -15,26 +15,7 @@
15 <div class="mask"> 15 <div class="mask">
16 </div> 16 </div>
17 <!-- 侧边栏 --> 17 <!-- 侧边栏 -->
18 - <div class="sidebar">  
19 - <!-- 收藏 -->  
20 - <div class="collections">  
21 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
22 - </div>  
23 - <!-- 喜欢 -->  
24 - <div class="likes">  
25 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
26 - </div>  
27 - <!-- wx分享 -->  
28 - <div class="wx_go">  
29 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
30 - <p>168</p>  
31 - </div>  
32 - <!-- wb分享 -->  
33 - <div class="wb_go">  
34 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
35 - <p>168</p>  
36 - </div>  
37 - </div> 18 + <include file="public@slide"/>
38 <!--主体内容--> 19 <!--主体内容-->
39 <div class="show_2"> 20 <div class="show_2">
40 <!--banner--> 21 <!--banner-->
@@ -16,7 +16,8 @@ @@ -16,7 +16,8 @@
16 <!--弹窗--> 16 <!--弹窗-->
17 <div class="mask"> 17 <div class="mask">
18 </div> 18 </div>
19 - 19 + <!-- 侧边栏 -->
  20 + <include file="public@slide"/>
20 <div class="happy_house clearfix"> 21 <div class="happy_house clearfix">
21 <!-- 标题 --> 22 <!-- 标题 -->
22 <h1>{$res.post_title}</h1> 23 <h1>{$res.post_title}</h1>
@@ -15,26 +15,7 @@ @@ -15,26 +15,7 @@
15 <div class="mask"> 15 <div class="mask">
16 </div> 16 </div>
17 <!-- 侧边栏 --> 17 <!-- 侧边栏 -->
18 - <div class="sidebar">  
19 - <!-- 收藏 -->  
20 - <div class="collections">  
21 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
22 - </div>  
23 - <!-- 喜欢 -->  
24 - <div class="likes">  
25 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
26 - </div>  
27 - <!-- wx分享 -->  
28 - <div class="wx_go">  
29 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
30 - <p>168</p>  
31 - </div>  
32 - <!-- wb分享 -->  
33 - <div class="wb_go">  
34 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
35 - <p>168</p>  
36 - </div>  
37 - </div> 18 + <include file="public@slide"/>
38 <!--主体内容--> 19 <!--主体内容-->
39 <div class="show_2"> 20 <div class="show_2">
40 <!--banner--> 21 <!--banner-->
@@ -18,26 +18,7 @@ @@ -18,26 +18,7 @@
18 18
19 </div> 19 </div>
20 <!-- 侧边栏 --> 20 <!-- 侧边栏 -->
21 - <div class="sidebar">  
22 - <!-- 收藏 -->  
23 - <div class="collections">  
24 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
25 - </div>  
26 - <!-- 喜欢 -->  
27 - <div class="likes">  
28 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
29 - </div>  
30 - <!-- wx分享 -->  
31 - <div class="wx_go">  
32 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
33 - <p>168</p>  
34 - </div>  
35 - <!-- wb分享 -->  
36 - <div class="wb_go">  
37 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
38 - <p>168</p>  
39 - </div>  
40 - </div> 21 + <include file="public@slide"/>
41 <div class="show_5"> 22 <div class="show_5">
42 <!-- 星球故事盒子 --> 23 <!-- 星球故事盒子 -->
43 <div class="show_InMain_box show_InMain_box2"> 24 <div class="show_InMain_box show_InMain_box2">
@@ -17,26 +17,7 @@ @@ -17,26 +17,7 @@
17 17
18 </div> 18 </div>
19 <!-- 侧边栏 --> 19 <!-- 侧边栏 -->
20 - <div class="sidebar">  
21 - <!-- 收藏 -->  
22 - <div class="collections">  
23 - <img src="__TMPL__/public/assets/starImg/bicon_02.png" alt="">  
24 - </div>  
25 - <!-- 喜欢 -->  
26 - <div class="likes">  
27 - <img src="__TMPL__/public/assets/starImg/bicon_03.png" alt="">  
28 - </div>  
29 - <!-- wx分享 -->  
30 - <div class="wx_go">  
31 - <img src="__TMPL__/public/assets/starImg/bicon_04.png" alt="">  
32 - <p>168</p>  
33 - </div>  
34 - <!-- wb分享 -->  
35 - <div class="wb_go">  
36 - <img src="__TMPL__/public/assets/starImg/bicon_05.png" alt="">  
37 - <p>168</p>  
38 - </div>  
39 - </div> 20 + <include file="public@slide"/>
40 <div class="happy_travel"> 21 <div class="happy_travel">
41 <div class="happy_travel_con1 clearfix"> 22 <div class="happy_travel_con1 clearfix">
42 <!-- 图片 --> 23 <!-- 图片 -->
@@ -50,10 +50,11 @@ @@ -50,10 +50,11 @@
50 <div class="show_INMain_con2_2"> 50 <div class="show_INMain_con2_2">
51 <notempty name="res_xqgs"> 51 <notempty name="res_xqgs">
52 <div class="swiper-slide"> 52 <div class="swiper-slide">
53 - <a href="/portal/star/getStoryDetail?id={$res_xqgs.id}">  
54 <div class="show_index_con2Txt clearfix"> 53 <div class="show_index_con2Txt clearfix">
55 - <!-- 左侧图片 -->  
56 - <img class="show_indexImg1" src="{:cmf_get_image_url($res_xqgs.thumbnail)}" alt=""> 54 + <a href="/portal/star/getStoryDetail?id={$res_xqgs.id}">
  55 + <!-- 左侧图片 -->
  56 + <img class="show_indexImg1" src="{:cmf_get_image_url($res_xqgs.thumbnail)}" alt="">
  57 + </a>
57 <!-- 文字 --> 58 <!-- 文字 -->
58 <div class="show_index_con2Txt2"> 59 <div class="show_index_con2Txt2">
59 {$res_xqgs.excerpt} 60 {$res_xqgs.excerpt}