Merge branch 'dev-jcq' of https://s-20coaj910c.zht2.com/cmy/distribution into dev-ly

css/jcq.css

@@ -452,11 +452,11 @@
 }
 
 .j-partition {
-    width: 104%;
+    width: 113%;
     height: 20px;
     background-color: #f2f2f5;
-    margin: 0 -15px;
-    margin-bottom: 10px;
+    margin: 0 -40px;
+    margin-bottom: 20px;
     box-shadow: 0 0 5px rgba(255, 255, 255, .05);
 }
 
@@ -489,6 +489,9 @@
     background-color: #fff;
     padding: 15px 5px;
     margin-bottom: 20px;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
 
 }
 
@@ -576,7 +579,7 @@
 
 .j-top-content {
     padding-top: 20px;
-    height: 417px;
+    min-height: 417px;
 }
 
 .j-top-content .table-wrap {
@@ -588,6 +591,16 @@
     padding: 0;
 }
 
+.buy-number .price-common .con .bottom .btn-buy {
+    background-color: #2168FB;
+    color: #fff;
+}
+
+.form-group label {
+    font-weight: 500 !important;
+    color: #151515 !important;
+}
+
 /* 移动端适配 */
 @media (max-width: 767px) {
     .warn-prompt-wrap1ass {
@@ -618,7 +631,6 @@
     .header .header-left {
         height: 100%;
         display: flex;
-        align-items: center;
     }
 
     .mobile-price .m-price-banner {
@@ -765,7 +777,7 @@
     }
 
     .tool-classs .con ul li:nth-of-type(odd) {
-        margin-right: .6rem;
+        margin-right: .2rem;
         margin-left: 0;
         margin-top: .2rem;
         padding: 0 .1rem;

source/index/footer.php

@@ -126,28 +126,107 @@ if (!defined('IN_ROOT')) {
         </div>
     </footer>
     <!--底部-->
-    <ul class="fixed-right right-float-window" style>
-        <li>
-            <a href="javascript:;" target="_blank" class="chatQQ">
-                <span class="iconfont icon-qq"></span>
-            </a>
-        </li>
-        <?php if (IN_WXQRCODE) { ?>
-            <li>
-                <a href="javascript:;">
-                    <span class="iconfont icon-weixin1"></span>
-                    <div class="wechat">
-                        <img src="/<?php echo IN_WXQRCODE ?>" alt="">
-                    </div>
-                </a>
-            </li>
-        <?php } ?>
-        <li class="go-top" style="display: none;">
-            <a href="javascript:;"><span class="iconfont icon-go-top"></span></a>
-        </li>
-    </ul>
+  <div class="contact-nav">
+    <div class="telegram">
+        <a href="#">
+            <img src="/static/index/image/telegram.png" alt="">
+        </a>
+    </div>
+    <div class="whatsapp">
+        <a href="#">
+            <img src="/static/index/image/whatsapp.png" alt="">
+        </a>
+    </div>
+    <div class="c-go-top top">
+        <a href="javascript:void(0);" id="scrollToTop">
+            <img src="/static/index/image/top.png" alt="">
+        </a>
+    </div>
+</div>
+<style>
+    
+.contact-nav {
+    position: fixed;
+    right: 24px;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 999;
+    height: 235px;
+}
+
+.contact-nav>div {
+    margin-bottom: 12px;
+}
+
+.contact-nav>div a {
+    display: block;
+    width: 60px;
+    height: 60px;
+}
+
+.contact-nav>div a img {
+    display: block;
+    width: 100%;
+    height: 100%;
+}
+
+.contact-nav .top {
+    margin-top: 24px;
+    filter: drop-shadow(0px 0px 15px rgba(7, 40, 78, 0.15));
+}
+.contact-nav .top {
+    display: none;
+    cursor: pointer;
+    transition: all 0.3s ease;
+}
+
+.contact-nav .top:hover {
+    transform: translateY(-2px);
+    box-shadow: 0 4px 8px rgba(0,0,0,0.2);
+}
+
+.contact-nav .top a {
+    display: block;
+    text-decoration: none;
+}
+
+.contact-nav .top img {
+    width: 100%;
+    height: auto;
+}
+
+@media (max-width: 767px) {
+    .contact-nav {
+        right: 8px;
+        display: none;
+    }
+
+    .show-right-nav .contact-nav {
+        display: block;
+    }
+
+    .contact-nav>div a {
+        width: 44px;
+        height: 44px;
+    }
+}
+</style>
     <script src="/static/index/js/clipboard.min.js"></script>
     <script>
+ // 滚动到顶部功能
+        $("#scrollToTop").on('click', function() {
+            $('html, body').animate({
+                scrollTop: 0
+            }, 800);
+        });
+        // 显示/隐藏回到顶部按钮
+        $(window).scroll(function() {
+            if ($(this).scrollTop() > 300) {
+                $('.c-go-top').fadeIn();
+            } else {
+                $('.c-go-top').fadeOut();
+            }
+        });
         if (!isHideFooter) {
             $('.right-float-window').show();
         }

source/index/public/footer.php

@@ -42,7 +42,7 @@
             <img src="/static/index/image/whatsapp.png" alt="">
         </a>
     </div>
-    <div class="top">
+    <div class="c-go-top top">
         <a href="javascript:void(0);" id="scrollToTop">
             <img src="/static/index/image/top.png" alt="">
         </a>
@@ -133,9 +133,9 @@
         // 显示/隐藏回到顶部按钮
         $(window).scroll(function() {
             if ($(this).scrollTop() > 300) {
-                $('.top').fadeIn();
+                $('.c-go-top').fadeIn();
             } else {
-                $('.top').fadeOut();
+                $('.c-go-top').fadeOut();
             }
         });
         

source/index/user_cash.php

@@ -177,7 +177,7 @@ class user_cash extends BaseUser
                                                 <?php 
                                                 if (IN_CASH && $this->user['promote_money'] > IN_CASH_MIN && isCashDate()) {
                                                     ?>                                                    
-                                                    <a href="javascript:;" class="ms-btn ms-btn-primary mt3 tx-j"
+                                                    <a href="javascript:;" class="ms-btn ms-btn-primary mt3 tx-j" style="margin-left: 25px;"
                                                        id="addcode">提现</a>
                                                 <?php 
                                                 }
@@ -434,7 +434,7 @@ class user_cash extends BaseUser
                                             aria-label="Close"
                                             onclick="$('#vipkeySC').toggle();">取消
                                     </button>
-                                    <button type="button" class="btn btn-primary" onclick="produce()">提交</button>
+                                    <button type="button" class="btn btn-primary" style="background: #2168fb; border-color: #2168fb;" onclick="produce()">提交</button>
                                 </div>
                             </div>
                         </div>

source/index/user_promote.php

@@ -480,7 +480,7 @@ class user_promote extends BaseUser
                                             aria-label="Close"
                                             onclick="$('#vipkeySC').toggle();">取消
                                     </button>
-                                    <button type="button" class="btn btn-primary" onclick="adduser()">添加</button>
+                                    <button type="button" class="btn btn-primary" style="background: #2168fb; border-color: #2168fb;" onclick="adduser()">添加</button>
                                 </div>
                             </div>
                         </div>

source/index/webview2.php

@@ -178,7 +178,7 @@ class webview2 extends BaseUser
                                             
                                             <!-- 自定义包名 -->
                                             <div class="form-group clearfix">
-                                                <label class="control-label col-sm-2">自定义包名</label>
+                                                <label class="control-label col-sm-2"><span>&nbsp;</span>自定义包名</label>
                                                 <div class="col-sm-6">
                                                     <div class="input-text">
                                                         <input type="text" id="bundle_id" name="bundle_id"
@@ -193,7 +193,7 @@ class webview2 extends BaseUser
                                             
                                             <!-- 自定义版本号 -->
                                             <div class="form-group clearfix">
-                                                <label class="control-label col-sm-2">自定义版本号</label>
+                                                <label class="control-label col-sm-2"><span>&nbsp;</span>自定义版本号</label>
                                                 <div class="col-sm-6">
                                                     <div class="input-text">
                                                         <input type="text" id="version" name="version"
@@ -354,7 +354,7 @@ class webview2 extends BaseUser
                                                 <!-- 收费标准 -->
                                                 <div class="form-group clearfix">
                                                     <div class="col-sm-2 col-xs-4 pay-num" id="price">
-                                                        <div class="fl">应支付</div>
+                                                        <div class="fl" style="color:#000000; font-weight: 500;">应支付</div>
                                                         <b class="color-danger"><span>￥</span><?php echo $_var_6[$_var_9]; ?></b>
                                                     </div>
                                                     <div class="col-sm-2 col-xs-4">

static/index/css/ly.css

@@ -22,7 +22,20 @@ tr td {
 .btn-20-7-radio4 {
   padding: 7px 20px;
   border-radius: 4px;
+}.pagination>.active>a,
+.pagination>.active>a:focus,
+.pagination>.active>a:hover,
+.pagination>.active>span,
+.pagination>.active>span:focus,
+.pagination>.active>span:hover {
+    background-color: #2168fb;
+    border-color:#2168fb;
+}
+.pagination>li>a,
+.pagination>li>span{
+    color:#2168fb;
 }
+
 /* 单选框相关 */
 .radio-container {
     position: relative;