Merge branch 'dev/v4.8.48_yf' of qmx/jy into feature/v4.8.48

src/web/staticres/css/pc.css

@@ -370,7 +370,8 @@ form{
 .j-bottom{
 	background-color: #2B2D30;
 	color: #fff;
-	padding: 40px 0px 25px 0px;
+	/* padding: 40px 0px 25px 0px; */
+	padding: 0px 0px 25px 0px;
 	text-align: center;
 	font-weight: normal;
 }
@@ -1963,7 +1964,7 @@ form{
 
 
 .jy_classify{
- padding: 32px 0 68px;
+ padding: 40px 0 68px;
  display: flex;
  justify-content: space-between;
 }

src/web/staticres/css/pc/index.css

@@ -1758,3 +1758,8 @@ margin-top: 2px;
 text-align: center;
 
 }
+
+/* 首页底部pc-bottom单独设置的样式 */
+.jy_classify{
+  padding-top: 32px!important;
+}

src/web/staticres/public-pc/css/pc-bottom.css

@@ -752,9 +752,16 @@
   display: none!important;
 }
 .jy_classify_r{
-  position: relative;
+  /* position: relative; */
+  display: inline-block;
+  padding-left: 64px;
+  padding-right: 20px;
+  border-left: 1px solid rgba(255, 255, 255, 0.12);
+}
+.jy_classify_r_box{
+  display: inline-block;
 }
-.jy_classify_r::after{
+/* .jy_classify_r::after{
   position: absolute;
   content: '';
   top: 0;
@@ -764,7 +771,7 @@
   background: rgba(255, 255, 255, 0.12);
   z-index: 9;
 
-}
+} */
 
 .right-side-box {
   display: none;

src/web/templates/common/friend-link.html

@@ -0,0 +1,31 @@
+<style>
+  .friend-link-container{
+    background-color: #2B2D30;
+    color: #fff;
+    padding: 40px 0px 0 0px;
+    text-align: center;
+    font-weight: normal;
+  }
+  .jy_friendlink{
+    color: rgba(255,255,255,.8);
+    display: flex;
+    padding: 0px 0 32px;
+    border-bottom: 1px solid rgba(255,255,255,0.12);
+  }
+</style>
+<div class="friend-link-container">
+  <div class="w jy_friendlink">
+    <div class="jy_friendlink_title">友情链接</div>
+    <div class="jy_friendlink_content">
+      <ul>
+        {{range $i,$v := Ad "jy-pc-index-friendlink" -1 .Host}}
+          <li>
+            <a href="{{$v.S_link}}" target="_blank" style="font-weight: 400;font-size: 12px;line-height: 18px;color: rgba(255, 255, 255, 0.6);">
+              {{$v.S_remark}}
+            </a>
+          </li>
+        {{end}}
+      </ul>
+    </div>
+  </div>
+</div>

src/web/templates/common/pcbottom.html

@@ -2,21 +2,7 @@
 <div class="j-bottom" style="display: none">
 	<div>
 		<div class="jy_proandcify">
-			<div class="jy_friendlink">
-				<div class="jy_friendlink_title">友情链接</div>
-				<div class="jy_friendlink_content">
-          <ul>
-            {{range $i,$v := Ad "jy-pc-index-friendlink" -1 .Host}}
-              <li>
-                <a href="{{$v.S_link}}" target="_blank" style="font-weight: 400;font-size: 12px;line-height: 18px;color: rgba(255, 255, 255, 0.6);">
-<!--                  <img src="{{$v.S_pic}}" alt="">-->
-                  {{$v.S_remark}}
-                </a>
-              </li>
-            {{end}}
-          </ul>
-				</div>
-			</div>
+      <!-- 友情链接已移到common文件friend-link.html -->
 			<div class="jy_classify">
 				<div class="jy_classify_l">
           {{$BottomLink :=JyBottomLink .Request.URL.Path}}
@@ -29,51 +15,53 @@
             </dl>
           {{end}}
         </div>
-                <div class="jy_classify_r">
-                    <div class="jy_classify_kefu">
-                        <img src='{{Msg "seo" "cdn"}}/images/pc/logo.png?v={{Msg "seo" "version"}}' alt="" />
-                        <span>400-108-6670</span>
-                    </div>
-                    <!-- <div class="jy_classify_list">
-                        <ul>
-                            <li class="active">
-                                <span></span>
-                                <div>
-                                    <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
-                                    <p>扫码下载</p>
-                                </div>
-                            </li>
-                            <li style="display:none;">
-                                <span><a href='{{Msg "seo" "pcHelper.downloadUrl_win"}}?source=pc_index'></a></span>
+        <div class="jy_classify_r">
+          <div class="jy_classify_r_box">
+            <div class="jy_classify_kefu">
+                <img src='{{Msg "seo" "cdn"}}/images/pc/logo.png?v={{Msg "seo" "version"}}' alt="" />
+                <span>400-108-6670</span>
+            </div>
+            <!-- <div class="jy_classify_list">
+                <ul>
+                    <li class="active">
+                        <span></span>
+                        <div>
+                            <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+                            <p>扫码下载</p>
+                        </div>
+                    </li>
+                    <li style="display:none;">
+                        <span><a href='{{Msg "seo" "pcHelper.downloadUrl_win"}}?source=pc_index'></a></span>
 
-                            </li>
-                            <li>
-                                <span><a href='{{Msg "seo" "pcHelper.downloadUrl_mac"}}?source=pc_index'></a></span>
+                    </li>
+                    <li>
+                        <span><a href='{{Msg "seo" "pcHelper.downloadUrl_mac"}}?source=pc_index'></a></span>
 
-                            </li>
-                            <li>
-                                <span></span>
-                                <div>
-                                    <img data-share-img src="/front/share/10" alt="">
-                                    <p>扫码关注</p>
-                                </div>
-                            </li>
-                            <li>
-                                <span id="share-sqq" ></span>
-                            </li>
-                        </ul>
-                    </div> -->
-                    <div class="qr_box">
-                      <div>
-                        <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
-                        <p>扫码下载</p>
-                    </div>
-                    <div>
-                      <img data-share-img src="/front/share/10" alt="">
-                      <p>扫码关注</p>
-                    </div>
-                    </div>
-                </div>
+                    </li>
+                    <li>
+                        <span></span>
+                        <div>
+                            <img data-share-img src="/front/share/10" alt="">
+                            <p>扫码关注</p>
+                        </div>
+                    </li>
+                    <li>
+                        <span id="share-sqq" ></span>
+                    </li>
+                </ul>
+            </div> -->
+            <div class="qr_box">
+              <div>
+                <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+                <p>扫码下载</p>
+              </div>
+              <div>
+                <img data-share-img src="/front/share/10" alt="">
+                <p>扫码关注</p>
+              </div>
+            </div>
+          </div>
+        </div>
 			</div>
 		</div>
         <div class="jy_renzheng">

src/web/templates/pc/index.html

@@ -539,6 +539,7 @@
       <div class="pc-index-bottom">
         <img class="bottom-member-ad" adv_name="PC首页广告位-底部" src="" alt="底部广告位">
       </div>
+      {{include "/common/friend-link.html"}}
       {{include "/common/pcbottom.html"}}
 		</section>