Ver código fonte

fix:bug修复

cmy 10 horas atrás
pai
commit
d560affd89

+ 1 - 0
css/index.css

@@ -418,6 +418,7 @@
 
 .platform-advantage ul li {
   text-align: center;
+  width: 20%;
 }
 
 .platform-advantage ul li img {

+ 8 - 3
source/index/BaseUser.php

@@ -8,14 +8,19 @@ class BaseUser extends Base
     function initialize()
     {
         parent::initialize();
-        if (!$this->userlogined) {
+        // 如果用户未登录,并且是apps、sign、super页面,则跳转到登录页面,并传递当前页面URL
+        if (!$this->userlogined && ($this->action == "apps" || $this->action == "sign" || $this->action == "super")) {
+            $current_url = $_SERVER['REQUEST_URI'];
+            redirect('/index/login?redirect=' . urlencode($current_url));
+            return;
+        }else if (!$this->userlogined) {
             redirect("/index/login");
         }
     }
-    
 
     function inc_merge()
     {
+
 ?> <div class="modal inmodal fade in" id="selApp" tabindex="-1" role="dialog" aria-hidden="false"
             style="display: none;">
             <div class="modal-dialog modal-lg">
@@ -309,7 +314,7 @@ class BaseUser extends Base
                             class="ms-btn ml10 details-merge cancel_merge" data-toggle="modal"
                             data-target="#myModal2">
                             <span class="iconfont icon-merge"></span>
-                            <span class="text">取消合并</span>
+                            <span class="text">取消</span>
                         </button>
                     <?php
                     } else {

+ 14 - 2
source/index/login.php

@@ -169,6 +169,14 @@ class login extends Base
                 <!--新增QQ互联登录-->
             </div>
             <script>
+                // 获取URL参数的函数
+                function getUrlParameter(name) {
+                    name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
+                    var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
+                    var results = regex.exec(location.search);
+                    return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
+                }
+                
                 $(function() {
 
                     countdown = 60;
@@ -277,7 +285,9 @@ class login extends Base
                                     localStorage.removeItem('password');
                                     localStorage.removeItem('bit');
                                     // }
-                                    window.location.href = '/index/apps/apps';
+                                    // 获取登录前的页面URL,如果没有则跳转到默认页面
+                                    var redirectUrl = getUrlParameter('redirect') || '/index/apps/apps';
+                                    window.location.href = redirectUrl;
                                 }
                             }, 'json');
                     });
@@ -314,7 +324,9 @@ class login extends Base
                                         localStorage.removeItem('password');
                                         localStorage.removeItem('bit');
                                     }
-                                    window.location.href = '/index/apps/apps';
+                                    // 获取登录前的页面URL,如果没有则跳转到默认页面
+                                    var redirectUrl = getUrlParameter('redirect') || '/index/apps/apps';
+                                    window.location.href = redirectUrl;
                                 }
                             }, 'json');
                     });

+ 14 - 2
source/index/pack.php

@@ -14,7 +14,19 @@ class pack extends Base
 	}
 	function index()
 	{
-		?>        <!DOCTYPE html>
+        // 如果用户未登录,直接跳转到登录页面,并传递当前页面URL
+        if (!$this->userlogined) {
+            $current_url = $_SERVER['REQUEST_URI'];
+            redirect('/index/login?redirect=' . urlencode($current_url));
+            return;
+        }
+        
+        // 已登录用户跳转到用户封装页面
+        redirect('/index/webview');
+        return;
+        
+		/*
+        <!DOCTYPE html>
         <html lang="">
         <head>
             <meta charset="utf-8">
@@ -275,6 +287,6 @@ class pack extends Base
 		include 'footer.php';
 		?>        </body>
         </html>
-        <?php 
+        */
 	}
 }

+ 323 - 303
source/index/promote.php

@@ -5,168 +5,125 @@ namespace app\index;
 
 class promote extends Base
 {
-	public function initialize()
-	{
-		parent::initialize();
-		if ($this->userlogined) {
-			redirect('/index/user_promote');
-		}
-	}
-	function index()
-	{
-		?>        <!DOCTYPE html>
+    public function initialize()
+    {
+        parent::initialize();
+        if ($this->userlogined) {
+            redirect('/index/user_promote');
+        }
+    }
+    function index()
+    {
+        // 如果用户未登录,直接跳转到登录页面,并传递当前页面URL
+        if (!$this->userlogined) {
+            $current_url = $_SERVER['REQUEST_URI'];
+            redirect('/index/login?redirect=' . urlencode($current_url));
+            return;
+        }
+        
+        // 已登录用户跳转到用户推广页面
+        redirect('/index/user_promote');
+        return;
+        
+        /*
+        <!DOCTYPE html>
         <html lang="">
+
         <head>
             <meta charset="utf-8">
-            <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/>
-            <meta name="keywords" content="<?php echo IN_KEYWORDS;?>"/>
-            <meta name="description" content="<?php echo IN_DESCRIPTION;?>"/>
-            <title>推广加盟 - <?php echo IN_NAME;?> - 免费应用内测托管平台|iOS应用Beta测试分发|Android应用内测分发</title>
-           <style>
-.ambassador-banner .b-btn {
-    color: #157df1;
-    width: 160px;
-    padding: 9px;
-    background-color: #fff;
-    font-size: 16px;
-    
-}
-.hidden-xs {
-    font-size: 15px;
-    margin-bottom: 25px;
-}
-      </style>
-            <?php 
-		include 'static.php';
-		?>        </head>
+            <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" />
+            <meta name="keywords" content="<?php echo IN_KEYWORDS; ?>" />
+            <meta name="description" content="<?php echo IN_DESCRIPTION; ?>" />
+            <title>推广加盟 - <?php echo IN_NAME; ?> - 免费应用内测托管平台|iOS应用Beta测试分发|Android应用内测分发</title>
+            <style>
+                .ambassador-banner .b-btn {
+                    color: #157df1;
+                    width: 160px;
+                    padding: 9px;
+                    background-color: #fff;
+                    font-size: 16px;
+
+                }
+
+                .hidden-xs {
+                    font-size: 15px;
+                    margin-bottom: 25px;
+                }
+            </style>
+            <?php
+            include 'static.php';
+            ?>
+        </head>
+
         <body>
-        <?php 
-		$this->header();
-		?>  
-		<link rel="stylesheet" href="/static/pack/font-awesome-4.7.0/css/font-awesome.css"/>
-		<link rel="stylesheet" href="/css/shouye.css"/>
-        <link rel="stylesheet" href="/static/css/app.169f3e45b533bbb32452056fa2e942a7.css"/>
-        <script src="/static/index/js/bootstrap-paginator.js"></script>
-        <div data-v-601a2d01="" class="topbanner">
-        <div data-v-601a2d01="" class="content">
-        <div data-v-601a2d01="" class="texts">
-        <p data-v-601a2d01="" class="title">加入推广大使 可获得%20现金返利</p>
-        <p class="hidden-xs">
-         通过推广专属的推广链接,吸引其他用户注册登录,用户购买云分发的产品服务<br>
-         您即可获得每单20%的返现,零风险、零成本、高回报
-        </p>
-      
-        <div class="ambassador-banner">
-        <button type="button" class="b-btn ms-btn hidden-xs"><a href="/index/apps/apps"><font color="#333">免费加入</font></a></button>
-        </div>             
-        </p>
-        </div>
-        <img data-v-601a2d01="" src="https://ssdtp.oss-cn-beijing.aliyuncs.com/eideasImg/diypack/banner/tgimg.png" alt="" class="rightimg">
-        </div>
-        </div>
-        <!--/banner-->
+            <?php
+            $this->header();
+            ?>
+            <link rel="stylesheet" href="/static/pack/font-awesome-4.7.0/css/font-awesome.css" />
+            <link rel="stylesheet" href="/css/shouye.css" />
+            <link rel="stylesheet" href="/static/css/app.169f3e45b533bbb32452056fa2e942a7.css" />
+            <script src="/static/index/js/bootstrap-paginator.js"></script>
+            <div data-v-601a2d01="" class="topbanner">
+                <div data-v-601a2d01="" class="content">
+                    <div data-v-601a2d01="" class="texts">
+                        <p data-v-601a2d01="" class="title">加入推广大使 可获得%20现金返利</p>
+                        <p class="hidden-xs">
+                            通过推广专属的推广链接,吸引其他用户注册登录,用户购买云分发的产品服务<br>
+                            您即可获得每单20%的返现,零风险、零成本、高回报
+                        </p>
 
-        <!--为什么要加入推广大使-->
-        <div class="container">
-            <div class="ambassador-common ambassador-join">
-                <div class="h1">为什么要加入推广大使</div>
-                <div class="h5">零成本推广,可获得高额返现,轻松赚钱</div>
-                <div class="row">
-                    <div class="col-sm-4 col-xs-6">
-                        <div class="ms-thumbnail">
-                            <div class="img-wrap"><img class="img-responsive" src="/static/index/image/tt-1.png"></div>
-                            <div class="ms-caption">
-                                <div class="tit">可长期获得高额返现</div>
-                                <p>
-                                    <?php echo IN_NAME;?>的服务按照时长和次数收费<br>
-                                    所推广用户都将产生长期的付费<br>
-                                    推广者即可获得持续性的返现
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-4 col-xs-6">
-                        <div class="ms-thumbnail">
-                            <div class="img-wrap"><img class="img-responsive" src="/static/index/image/tt-2.png"></div>
-                            <div class="ms-caption">
-                                <div class="tit">便捷的自动结算服务</div>
-                                <p>
-                                    用户购买成功后,返现金额将立即<br>
-                                    自动转到推广账户,30天后即可提现至支付宝
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-4 col-xs-6">
-                        <div class="ms-thumbnail">
-                            <div class="img-wrap"><img class="img-responsive" src="/static/index/image/tt-3.png"></div>
-                            <div class="ms-caption">
-                                <div class="tit">可靠的售后服务</div>
-                                <p>
-                                    <?php echo IN_NAME;?>所有服务都是7*24小时自动服务<br>
-                                    同时提供免费技术咨询<br>
-                                    保障用户的疑难问题得到及时回复
-                                </p>
-                            </div>
+                        <div class="ambassador-banner">
+                            <button type="button" class="b-btn ms-btn hidden-xs"><a href="/index/apps/apps">
+                                    <font color="#333">免费加入</font>
+                                </a></button>
                         </div>
+                        </p>
                     </div>
+                    <img data-v-601a2d01="" src="https://ssdtp.oss-cn-beijing.aliyuncs.com/eideasImg/diypack/banner/tgimg.png" alt="" class="rightimg">
                 </div>
             </div>
-        </div>
-        <!--/为什么要加入推广大使-->
+            <!--/banner-->
 
-        <!--完整的产品服务-->
-        <div class="ambassador-service-wrap">
+            <!--为什么要加入推广大使-->
             <div class="container">
-                <div class="ambassador-service ambassador-common">
-                    <div class="h1">完整的产品服务</div>
-                    <div class="h5">
-                        <?php echo IN_NAME;?>提供简单易用的移动APP服务,涵盖企业签名、封装APP、内测分发风服务<br>
-                        改变APP开发方式,缩短开发周期,让您的APP尽快上线与用户见面
-                    </div>
+                <div class="ambassador-common ambassador-join">
+                    <div class="h1">为什么要加入推广大使</div>
+                    <div class="h5">零成本推广,可获得高额返现,轻松赚钱</div>
                     <div class="row">
-                        <div class="col-sm-3 col-xs-6">
-                            <div class="ms-thumbnail">
-                                <img src="/static/index/image/ttt-1.png" class="img-responsive">
-                                <div class="ms-caption">
-                                    <div class="tit">iOS企业签名</div>
-                                    <p>
-                                        解决苹果APP安装问题
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-3 col-xs-6">
+                        <div class="col-sm-4 col-xs-6">
                             <div class="ms-thumbnail">
-                                <img src="/static/index/image/ttt-2.png" class="img-responsive">
+                                <div class="img-wrap"><img class="img-responsive" src="/static/index/image/tt-1.png"></div>
                                 <div class="ms-caption">
-                                    <div class="tit">封装APP</div>
+                                    <div class="tit">可长期获得高额返现</div>
                                     <p>
-                                        网站在线打包成安卓、苹果APP
+                                        <?php echo IN_NAME; ?>的服务按照时长和次数收费<br>
+                                        所推广用户都将产生长期的付费<br>
+                                        推广者即可获得持续性的返现
                                     </p>
                                 </div>
                             </div>
                         </div>
-                        <div class="col-sm-3 col-xs-6">
+                        <div class="col-sm-4 col-xs-6">
                             <div class="ms-thumbnail">
-                                <img src="/static/index/image/ttt-3.png" class="img-responsive">
+                                <div class="img-wrap"><img class="img-responsive" src="/static/index/image/tt-2.png"></div>
                                 <div class="ms-caption">
-                                    <div class="tit">无闪退封装APP</div>
+                                    <div class="tit">便捷的自动结算服务</div>
                                     <p>
-                                        封装好的苹果APP无需企业签名<br>
-                                        即可直接安装
+                                        用户购买成功后,返现金额将立即<br>
+                                        自动转到推广账户,30天后即可提现至支付宝
                                     </p>
                                 </div>
                             </div>
                         </div>
-                        <div class="col-sm-3 col-xs-6">
+                        <div class="col-sm-4 col-xs-6">
                             <div class="ms-thumbnail">
-                                <img src="/static/index/image/ttt-4.png" class="img-responsive">
+                                <div class="img-wrap"><img class="img-responsive" src="/static/index/image/tt-3.png"></div>
                                 <div class="ms-caption">
-                                    <div class="tit">发布内测</div>
+                                    <div class="tit">可靠的售后服务</div>
                                     <p>
-                                        一键上传APP
-                                        即可获得下载链接和二维码
+                                        <?php echo IN_NAME; ?>所有服务都是7*24小时自动服务<br>
+                                        同时提供免费技术咨询<br>
+                                        保障用户的疑难问题得到及时回复
                                     </p>
                                 </div>
                             </div>
@@ -174,195 +131,258 @@ class promote extends Base
                     </div>
                 </div>
             </div>
-        </div>
-        <!--/完整的产品服务-->
+            <!--/为什么要加入推广大使-->
 
-        <!--推广流程-->
-        <div class="promote-process-wrap">
-            <div class="container">
-                <div class="promote-process ambassador-common">
-                    <div class="h1">推广流程</div>
-                    <ul class="clearfix">
-                        <li>
-                            <div class="ms-thumbnail">
-                                <img src="/static/index/image/tt-4.png" class="img-responsive">
-                                <div class="ms-caption">
-                                    <div class="tit clearfix">
-                                        <img src="/static/index/image/ttt-5.png">
-                                        <span>注册<?php echo IN_NAME;?>账号</span>
+            <!--完整的产品服务-->
+            <div class="ambassador-service-wrap">
+                <div class="container">
+                    <div class="ambassador-service ambassador-common">
+                        <div class="h1">完整的产品服务</div>
+                        <div class="h5">
+                            <?php echo IN_NAME; ?>提供简单易用的移动APP服务,涵盖企业签名、封装APP、内测分发风服务<br>
+                            改变APP开发方式,缩短开发周期,让您的APP尽快上线与用户见面
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-3 col-xs-6">
+                                <div class="ms-thumbnail">
+                                    <img src="/static/index/image/ttt-1.png" class="img-responsive">
+                                    <div class="ms-caption">
+                                        <div class="tit">iOS企业签名</div>
+                                        <p>
+                                            解决苹果APP安装问题
+                                        </p>
                                     </div>
-                                    <div class="p1">注册<?php echo IN_NAME;?>账号,加入推广大使</div>
                                 </div>
                             </div>
-                        </li>
-                        <li></li>
-                        <li>
-                            <div class="ms-thumbnail">
-                                <img src="/static/index/image/tt-5.png" class="img-responsive">
-                                <div class="ms-caption">
-                                    <div class="tit clearfix">
-                                        <img src="/static/index/image/ttt-6.png">
-                                        <span>获取推广链接</span>
-                                    </div>
-                                    <div class="p1">
-                                        前往个人中心-推广大使<br>
-                                        获得推广链接
+                            <div class="col-sm-3 col-xs-6">
+                                <div class="ms-thumbnail">
+                                    <img src="/static/index/image/ttt-2.png" class="img-responsive">
+                                    <div class="ms-caption">
+                                        <div class="tit">封装APP</div>
+                                        <p>
+                                            网站在线打包成安卓、苹果APP
+                                        </p>
                                     </div>
                                 </div>
                             </div>
-                        </li>
-                        <li></li>
-                        <li>
-                            <div class="ms-thumbnail">
-                                <img src="/static/index/image/tt-6.png" class="img-responsive">
-                                <div class="ms-caption">
-                                    <div class="tit clearfix">
-                                        <img src="/static/index/image/ttt-7.png">
-                                        <span>各渠道推广</span>
+                            <div class="col-sm-3 col-xs-6">
+                                <div class="ms-thumbnail">
+                                    <img src="/static/index/image/ttt-3.png" class="img-responsive">
+                                    <div class="ms-caption">
+                                        <div class="tit">无闪退封装APP</div>
+                                        <p>
+                                            封装好的苹果APP无需企业签名<br>
+                                            即可直接安装
+                                        </p>
                                     </div>
-                                    <div class="p1">
-                                        吸引用户到<?php echo IN_NAME;?><br>
-                                        了解并使用其产品服务
+                                </div>
+                            </div>
+                            <div class="col-sm-3 col-xs-6">
+                                <div class="ms-thumbnail">
+                                    <img src="/static/index/image/ttt-4.png" class="img-responsive">
+                                    <div class="ms-caption">
+                                        <div class="tit">发布内测</div>
+                                        <p>
+                                            一键上传APP
+                                            即可获得下载链接和二维码
+                                        </p>
                                     </div>
                                 </div>
                             </div>
-                        </li>
-                        <li></li>
-                        <li>
-                            <div class="ms-thumbnail">
-                                <img src="/static/index/image/tt-7.png" class="img-responsive">
-                                <div class="ms-caption">
-                                    <div class="tit clearfix">
-                                        <img src="/static/index/image/ttt-8.png">
-                                        <span>推广成功,30后取现</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!--/完整的产品服务-->
+
+            <!--推广流程-->
+            <div class="promote-process-wrap">
+                <div class="container">
+                    <div class="promote-process ambassador-common">
+                        <div class="h1">推广流程</div>
+                        <ul class="clearfix">
+                            <li>
+                                <div class="ms-thumbnail">
+                                    <img src="/static/index/image/tt-4.png" class="img-responsive">
+                                    <div class="ms-caption">
+                                        <div class="tit clearfix">
+                                            <img src="/static/index/image/ttt-5.png">
+                                            <span>注册<?php echo IN_NAME; ?>账号</span>
+                                        </div>
+                                        <div class="p1">注册<?php echo IN_NAME; ?>账号,加入推广大使</div>
                                     </div>
-                                    <div class="p1">
-                                        30天后金额即可提现至支付宝
+                                </div>
+                            </li>
+                            <li></li>
+                            <li>
+                                <div class="ms-thumbnail">
+                                    <img src="/static/index/image/tt-5.png" class="img-responsive">
+                                    <div class="ms-caption">
+                                        <div class="tit clearfix">
+                                            <img src="/static/index/image/ttt-6.png">
+                                            <span>获取推广链接</span>
+                                        </div>
+                                        <div class="p1">
+                                            前往个人中心-推广大使<br>
+                                            获得推广链接
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </li>
-                    </ul>
+                            </li>
+                            <li></li>
+                            <li>
+                                <div class="ms-thumbnail">
+                                    <img src="/static/index/image/tt-6.png" class="img-responsive">
+                                    <div class="ms-caption">
+                                        <div class="tit clearfix">
+                                            <img src="/static/index/image/ttt-7.png">
+                                            <span>各渠道推广</span>
+                                        </div>
+                                        <div class="p1">
+                                            吸引用户到<?php echo IN_NAME; ?><br>
+                                            了解并使用其产品服务
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                            <li></li>
+                            <li>
+                                <div class="ms-thumbnail">
+                                    <img src="/static/index/image/tt-7.png" class="img-responsive">
+                                    <div class="ms-caption">
+                                        <div class="tit clearfix">
+                                            <img src="/static/index/image/ttt-8.png">
+                                            <span>推广成功,30后取现</span>
+                                        </div>
+                                        <div class="p1">
+                                            30天后金额即可提现至支付宝
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
             </div>
-        </div>
-        <!--/推广流程-->
+            <!--/推广流程-->
 
-        <!--常见问题-->
-        <div class="bg-f4f8fe">
-            <div class="container">
-                <div class="help ambassador-help">
-                    <div class="tit">常见问题</div>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">什么样的用户才能成为自己的推广用户?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">第一,通过您的推广链接,进行首次注册,该账户以前没有注册过。</span>
-                        </dd>
-                    </dl>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">满足什么样的情况,符合推广返现?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">①对方用户注册过,通过您的推广链接进行注册,②账户余额充值成功,③购买签名/封装/次数成功,且没有退款,
-③推广出去的用户不管是新购买产品,抑或是续费,都将进行20%的返利操作。
-</span>
-                        </dd>
-                    </dl>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">多少天后才可以提现?提现到哪里?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">购买成功后,20天后即可提现,目前仅支持提现到支付宝账户。例如1号购买支付成功,则21号可以返现。
+            <!--常见问题-->
+            <div class="bg-f4f8fe">
+                <div class="container">
+                    <div class="help ambassador-help">
+                        <div class="tit">常见问题</div>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">什么样的用户才能成为自己的推广用户?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">第一,通过您的推广链接,进行首次注册,该账户以前没有注册过。</span>
+                            </dd>
+                        </dl>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">满足什么样的情况,符合推广返现?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">①对方用户注册过,通过您的推广链接进行注册,②账户余额充值成功,③购买签名/封装/次数成功,且没有退款,
+                                    ③推广出去的用户不管是新购买产品,抑或是续费,都将进行20%的返利操作。
+                                </span>
+                            </dd>
+                        </dl>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">多少天后才可以提现?提现到哪里?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">购买成功后,20天后即可提现,目前仅支持提现到支付宝账户。例如1号购买支付成功,则21号可以返现。
 
-</span>
-                        </dd>
-                    </dl>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">自己注册账号推广自己,是否可以返现?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">推广大使如果自行购买产品,无法享受到返利优惠。</span>
-                        </dd>
-                    </dl>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">如何查看自己的推广用户和推广用户的购买订单?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">登录<?php echo IN_NAME;?>网站,登录成功后,鼠标点击【右上角账号】,点击【账号设置—推广大使】即可查看推广用户明细和返利明细。</span>
-                        </dd>
-                    </dl>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">加入推广大使后,如何进行推广,有哪些推广方法或渠道?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">①找到需要推荐客户群的活动范围,如线上群/IT论坛/QQ群等;②编辑图文或者文字,介绍<?php echo IN_NAME;?>产品的产品服务介绍或者产品优点等③发送推广注册链接给用户,进行注册使用;用户下单后直接返利。
-</span>
-                        </dd>
-                    </dl>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">推广返利的的比列是固定不变的吗?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">目前暂定<?php echo IN_PROMOTE_RATE;?>%,后续可能会根据活动情况,做出相应调整。</span>
-                        </dd>
-                    </dl>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">推广的客户发生退款了, 如何处理?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">退款订单将按照推广用户实际使用周期结合产品退款情况,来计算返利。</span>
-                        </dd>
-                    </dl>
-                    <dl>
-                        <dt class="clearfix">
-                            <span class="left">Q :</span>
-                            <span class="right">做<?php echo IN_NAME;?>推广大使,需要了解哪些基本知识?</span>
-                        </dt>
-                        <dd class="clearfix">
-                            <span class="left">A :</span>
-                            <span class="right">为了更好地和用户进行推广,建议您对企业签名和封装APP相关的功能操作有个大致了解,
-建议您可以去点击导航栏【文档】中,查看具体的具体教程和常见问题。
-</span>
-                        </dd>
-                    </dl>
+                                </span>
+                            </dd>
+                        </dl>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">自己注册账号推广自己,是否可以返现?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">推广大使如果自行购买产品,无法享受到返利优惠。</span>
+                            </dd>
+                        </dl>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">如何查看自己的推广用户和推广用户的购买订单?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">登录<?php echo IN_NAME; ?>网站,登录成功后,鼠标点击【右上角账号】,点击【账号设置—推广大使】即可查看推广用户明细和返利明细。</span>
+                            </dd>
+                        </dl>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">加入推广大使后,如何进行推广,有哪些推广方法或渠道?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">①找到需要推荐客户群的活动范围,如线上群/IT论坛/QQ群等;②编辑图文或者文字,介绍<?php echo IN_NAME; ?>产品的产品服务介绍或者产品优点等③发送推广注册链接给用户,进行注册使用;用户下单后直接返利。
+                                </span>
+                            </dd>
+                        </dl>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">推广返利的的比列是固定不变的吗?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">目前暂定<?php echo IN_PROMOTE_RATE; ?>%,后续可能会根据活动情况,做出相应调整。</span>
+                            </dd>
+                        </dl>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">推广的客户发生退款了, 如何处理?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">退款订单将按照推广用户实际使用周期结合产品退款情况,来计算返利。</span>
+                            </dd>
+                        </dl>
+                        <dl>
+                            <dt class="clearfix">
+                                <span class="left">Q :</span>
+                                <span class="right">做<?php echo IN_NAME; ?>推广大使,需要了解哪些基本知识?</span>
+                            </dt>
+                            <dd class="clearfix">
+                                <span class="left">A :</span>
+                                <span class="right">为了更好地和用户进行推广,建议您对企业签名和封装APP相关的功能操作有个大致了解,
+                                    建议您可以去点击导航栏【文档】中,查看具体的具体教程和常见问题。
+                                </span>
+                            </dd>
+                        </dl>
+                    </div>
                 </div>
             </div>
-        </div>
-        <!--/常见问题-->
+            <!--/常见问题-->
+
+            <!--立即成为我们的推广大使吧-->
+            <a class="join-ambassador" href="/index/login">
+                <div class="h1"><span>轻松推广</span><span>轻松赚钱</span></div>
+                <button class="ms-btn" type="button">我要加入</button>
+            </a>
+            <!--/立即成为我们的推广大使吧-->
+            <?php $this->footer() ?>
+        </body>
 
-        <!--立即成为我们的推广大使吧-->
-        <a class="join-ambassador" href="/index/login">
-            <div class="h1"><span>轻松推广</span><span>轻松赚钱</span></div>
-            <button class="ms-btn" type="button">我要加入</button>
-        </a>
-        <!--/立即成为我们的推广大使吧-->
-        <?php $this->footer() ?>        </body>
         </html>
-        <?php 
-	}
-}
+        */
+    }
+}

+ 11 - 24
source/index/public/header.php

@@ -30,22 +30,6 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 })
 </script>
-<style>
-    .ms-badge12 {
-        background-color: #ffffff;
-        width: 50px;
-        height: 25px;
-        line-height: 26px;
-        display: inline-block;
-        color: #e60000;
-        border-radius: 10%;
-        font-size: 12px;
-        text-align: center;
-        position: relative;
-        top: -3px;
-        left: 0;
-    }
-</style>
 <link rel="stylesheet" href="/static/index/css/header.css">
 <header>
     <div class="container">
@@ -61,16 +45,16 @@ document.addEventListener('DOMContentLoaded', () => {
                     <span class="phone-user-name visible-xs">
                         <span class="iconfont">
                             <?php if ($this->user['in_svip'] == 0) { ?>
-                                <img src="<?php echo IN_PATH ?>static/index/image/inner-nav/nav-vip1.png" width="22px">
+                                <img src="<?php echo IN_PATH ?>static/index/image/nav/nav-vip1.svg" width="22px">
                             <?php } ?>
                             <?php if ($this->user['in_svip'] == 1) { ?>
-                                <img src="<?php echo IN_PATH ?>static/index/image/inner-nav/nav-vip2.png" width="22px">
+                                <img src="<?php echo IN_PATH ?>static/index/image/nav/nav-vip2.svg" width="22px">
                             <?php } ?>
                             <?php if ($this->user['in_svip'] == 2) { ?>
-                                <img src="<?php echo IN_PATH ?>static/index/image/inner-nav/nav-vip3.png" width="22px">
+                                <img src="<?php echo IN_PATH ?>static/index/image/nav/nav-vip3.svg" width="22px">
                             <?php } ?>
                             <?php if ($this->user['in_svip'] == 3) { ?>
-                                <img src="<?php echo IN_PATH ?>static/index/image/inner-nav/nav-vip4.png" width="22px">
+                                <img src="<?php echo IN_PATH ?>static/index/image/nav/nav-vip4.svg" width="22px">
                             <?php } ?>
                         </span><?php echo $this->user['in_username'] ?>
                         <?php if ($this->user['in_verify'] == 1) { ?>
@@ -142,18 +126,21 @@ document.addEventListener('DOMContentLoaded', () => {
                             <div class="notification fl">
                                 <span class="iconfont">
                                     <?php if ($this->user['in_svip'] == 0) { ?>
-                                        <img src="<?php echo IN_PATH ?>static/index/image/user.png" width="22px">
+                                        <img src="<?php echo IN_PATH ?>static/index/image/nav/nav-vip1.svg" width="22px">
                                     <?php } ?>
                                     <?php if ($this->user['in_svip'] == 1) { ?>
-                                        <img src="<?php echo IN_PATH ?>static/index/image/user_1.png" width="22px">
+                                        <img src="<?php echo IN_PATH ?>static/index/image/nav/nav-vip2.svg" width="22px">
                                     <?php } ?>
                                     <?php if ($this->user['in_svip'] == 2) { ?>
-                                        <img src="<?php echo IN_PATH ?>static/index/image/user_2.png" width="22px">
+                                        <img src="<?php echo IN_PATH ?>static/index/image/nav/nav-vip3.svg" width="22px">
                                     <?php } ?>
                                     <?php if ($this->user['in_svip'] == 3) { ?>
-                                        <img src="<?php echo IN_PATH ?>static/index/image/user_3.png" width="22px">
+                                        <img src="<?php echo IN_PATH ?>static/index/image/nav/nav-vip4.svg" width="22px">
                                     <?php } ?>
                                 </span>
+                                <span class="user-name">
+                                    <?php echo $this->user['in_username'] ?>
+                                </span>
                                 <span class="ms-badge"></span>
                                 <div class="n-drop-down">
                                     <div class="n-con">

+ 4 - 0
source/index/publish_detail.php

@@ -164,6 +164,8 @@ class publish_detail extends BaseUser
                                                                 <th>
                                                                     <span class="th-line">下载扣除</span>
                                                                 </th>
+                                                                <th>
+                                                                </th>
                                                                 <!-- <?php
                                                                 if (IN_SIGN && $row["in_form"] == "iOS") {
                                                                 ?> <th>
@@ -192,6 +194,8 @@ class publish_detail extends BaseUser
                                                                         data-trigger="hover">
                                                                         <?php echo $fnum; ?><?php echo $ftype; ?> </div>
                                                                 </td>
+                                                                <td>
+                                                                </td>
                                                                 <!-- <?php
                                                                 if (IN_SIGN && $row["in_form"] == "iOS") {
                                                                 ?> <td>

+ 2 - 1
source/index/publish_sign.php

@@ -69,7 +69,8 @@ class publish_sign extends BaseUser
         <body>
         <?php 
 		$this->header();
-		?>        <div class="release-app-wrap">
+		?>
+        <div class="release-app-wrap">
             <div class="container">
                 <div class="release-app2">
                     <div class="crumbs">

+ 2 - 2
source/template/mobile/moban2/index.php

@@ -51,7 +51,7 @@ if (!defined('IN_ROOT')) {
                             </div>
 
                             <a href="/index/apps/apps">
-                                <button class="btn-login">注册登录</button>
+                                <button class="btn-login">立即分发</button>
                             </a>
                         </div>
                     </div>
@@ -171,7 +171,7 @@ if (!defined('IN_ROOT')) {
                 <h3 class="number-1">
                     <?php echo IN_AUTOGRAPH ?>
                 </h3>
-                <p>累计封装</p>
+                <p>累计在线</p>
             </li>
             <li>
                 <h3 class="number-2">

+ 2 - 0
static/index/css/apps-aside.css

@@ -1,3 +1,5 @@
+
+
 .release-app2>.row>.col-sm-2 {
     /* background-color: transparent; */
 }

+ 228 - 220
static/index/css/apps-detail.css

@@ -23,6 +23,7 @@
 
 .app-details2 .d-table-wrap table td {
     padding: 0;
+    overflow: visible;
 }
 
 .app-details2 .d-table-wrap table td>div,
@@ -183,7 +184,7 @@
 }
 
 /* 通用icon样式 */
-.iconfont {
+.release-app2 .iconfont {
     background: url(/static/index/image/inner-nav/icon1.svg) no-repeat center center;
     background-size: 100% 100%;
     width: 23px;
@@ -194,10 +195,14 @@
     pointer-events: none;
 }
 
-.iconfont::before {
+.release-app2 .iconfont::before {
     content: '';
 }
 
+.release-app2 .iconfont.icon-date:before {
+    content: "\e6aa";
+}
+
 .icon-date {
     background-image: url(/static/index/image/my-app/icon-date.svg);
     margin-right: 0;
@@ -329,71 +334,6 @@
     border: unset;
 }
 
-@media (max-width: 768px) {
-
-    /* 移动端导航优化 */
-    .tabs {
-        padding: 0 0.3rem 0.72rem 0.3rem;
-    }
-
-    .tabs .nav-tabs>li>a {
-        padding: 0.2rem 0.08rem;
-        margin-right: 0.48rem;
-        font-size: 0.28rem;
-        line-height: 0.4rem;
-    }
-
-    .tabs .tab-content {
-        padding: 0.36rem 0 0 0;
-    }
-
-    #tab-basic {
-        margin-top: 0.14rem;
-    }
-
-    .tabs .tab-pane {
-        min-height: unset;
-    }
-
-    /* 表单页 */
-
-    .form-control {
-        width: 100%;
-        height: 0.68rem;
-        font-size: 0.28rem;
-        padding: 0 0.24rem;
-    }
-
-    .form-group .col-sm-6,
-    .form-group .col-sm-10 {
-        padding: 0;
-    }
-
-    /* 表格 */
-
-    .table>tbody>tr>th {
-        height: 0.72rem;
-        font-size: 0.28rem;
-        line-height: 0.36rem;
-    }
-
-    .table>tbody>tr>td {
-        padding: 0 0.3rem !important;
-        height: 1rem;
-        font-size: 0.28rem;
-        line-height: 0.26rem;
-    }
-
-    .pagination-wrap {
-        display: flex;
-        justify-content: center;
-    }
-
-    .pagination>li:first-child {
-        padding: 0.14rem 0 0.14rem 0.24rem;
-    }
-}
-
 /* 应用版本 */
 .app-details-update .form-control {
     width: 450px;
@@ -485,49 +425,6 @@
     font-size: 14px;
 }
 
-@media (max-width: 768px) {
-    .basic .form-group .control-label {
-        text-align: left;
-        margin-bottom: 0.16rem;
-        width: unset;
-        font-size: 0.28rem;
-        line-height: 0.46rem;
-    }
-
-    .basic .short-link .col-sm-6 {
-        margin-bottom: 0.2rem;
-    }
-
-    .ms-modal .modal-dialog {
-        margin: 1rem 0.3rem 0.2rem;
-    }
-
-    .basic .short-link .link {
-        width: 4.4rem;
-        height: 0.68rem;
-        line-height: 0.68rem;
-        padding-left: 0.24rem;
-        color: rgba(0, 0, 0, 1);
-        font-size: 0.28rem;
-    }
-
-    #url {
-        width: 1.86rem;
-    }
-
-    .basic .form-group {
-        margin-bottom: 0.4rem;
-    }
-
-    .btn-apps-save {
-        margin: 0.28rem 0 0 1.56rem;
-        width: 3.12rem;
-        line-height: 0.68rem;
-        border-radius: 0.08rem;
-        padding: 0 0.4rem;
-    }
-}
-
 /* 高级设置样式 */
 
 .senior .form-group {
@@ -605,51 +502,6 @@
     transition: all 0.3s ease;
 }
 
-/* 响应式高级设置 */
-@media (max-width: 768px) {
-    .senior .form-group .control-label {
-        text-align: left;
-        margin-bottom: 0.24rem;
-        width: unset;
-        font-size: 0.28rem;
-        line-height: 0.4rem;
-    }
-
-    .senior .trust li,
-    .senior .download-way li {
-        float: left;
-        margin-right: 0.8rem;
-        margin-bottom: 0;
-        padding: 0;
-    }
-
-    .senior .download-way {
-        margin-bottom: 0;
-    }
-
-    .senior .form-group .col-sm-10 {
-        padding: 0;
-    }
-
-    .senior {
-        margin-top: 0.14rem;
-    }
-
-    .senior .form-group {
-        margin-bottom: 0.4rem;
-    }
-
-    .senior textarea.form-control {
-        width: 100%;
-        height: 1.64rem;
-        padding: 0.2rem 0.24rem;
-    }
-
-    .senior #submitAdvancedButton {
-        margin-top: 0.48rem;
-    }
-}
-
 /* 模板设置样式 */
 
 .download-template .form-group {
@@ -776,71 +628,6 @@
     display: none;
 }
 
-@media (max-width: 768px) {
-
-    .download-template .form-group .control-label {
-        text-align: left;
-        width: unset;
-        font-size: 0.28rem;
-        line-height: 0.4rem;
-        margin-bottom: 0.24rem;
-    }
-
-    .download-template .template-language li {
-        float: left;
-        margin-right: 0.48rem;
-        margin-bottom: 0;
-        padding: 0;
-    }
-
-    .download-template .template-language li:nth-child(3) {
-        margin-right: 0;
-    }
-
-    .form-group ul li .icon.icon-radio {
-        width: 0.4rem;
-        height: 0.4rem;
-        margin-right: 0.28rem;
-    }
-
-    .senior .trust li,
-    .senior .download-way li {
-        float: left;
-        margin-right: 0.8rem;
-        margin-bottom: 0;
-        padding: 0;
-    }
-
-    .download-template .template-list li {
-        margin: 0 0.36rem 0.36rem 0;
-        width: 1.6rem;
-        height: 2rem;
-    }
-
-    .download-template .template-list li:nth-last-child(1),
-    .download-template .template-list li:nth-last-child(2),
-    .download-template .template-list li:nth-last-child(3) {
-        margin-bottom: 0;
-    }
-
-    .download-template .form-group {
-        margin-bottom: 0.6rem;
-    }
-
-    .download-template .form-group:last-child {
-        margin-bottom: 0;
-    }
-
-    #tab-template {
-        margin-bottom: 0.18rem;
-    }
-
-    .download-template .template-list li .t-checked::after {
-        width: 0.32rem;
-        height: 0.32rem;
-    }
-}
-
 /* 下载记录样式 */
 .download-details {
     background-color: #fff;
@@ -937,6 +724,221 @@
 
 @media (max-width: 768px) {
 
+    /* 移动端导航优化 */
+    .tabs {
+        padding: 0 0.3rem 0.72rem 0.3rem;
+    }
+
+    .tabs .nav-tabs>li>a {
+        padding: 0.2rem 0.08rem;
+        margin-right: 0.48rem;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+    }
+
+    .tabs .tab-content {
+        padding: 0.36rem 0 0 0;
+    }
+
+    #tab-basic {
+        margin-top: 0.14rem;
+    }
+
+    .tabs .tab-pane {
+        min-height: unset;
+    }
+
+    /* 表单页 */
+
+    .form-control {
+        width: 100%;
+        height: 0.68rem;
+        font-size: 0.28rem;
+        padding: 0 0.24rem;
+    }
+
+    #updateModal .modal-body {
+        padding: 15px;
+    }
+
+    .app-details-update .form-control {
+        width: 100% !important;
+    }
+
+    .form-group .col-sm-6,
+    .form-group .col-sm-10 {
+        padding: 0;
+    }
+
+    /* 表格 */
+
+    .table>tbody>tr>th {
+        height: 0.72rem;
+        font-size: 0.28rem;
+        line-height: 0.36rem;
+    }
+
+    .table>tbody>tr>td {
+        padding: 0 0.3rem !important;
+        height: 1rem;
+        font-size: 0.28rem;
+        line-height: 0.26rem;
+    }
+
+    .pagination-wrap {
+        display: flex;
+        justify-content: center;
+    }
+
+    .pagination>li:first-child {
+        padding: 0.14rem 0 0.14rem 0.24rem;
+    }
+
+    .basic .form-group .control-label {
+        text-align: left;
+        margin-bottom: 0.16rem;
+        width: unset;
+        font-size: 0.28rem;
+        line-height: 0.46rem;
+    }
+
+    .basic .short-link .col-sm-6 {
+        margin-bottom: 0.2rem;
+    }
+
+    .ms-modal .modal-dialog {
+        margin: 1rem 0.3rem 0.2rem;
+    }
+
+    .basic .short-link .link {
+        width: 4.4rem;
+        height: 0.68rem;
+        line-height: 0.68rem;
+        padding-left: 0.24rem;
+        color: rgba(0, 0, 0, 1);
+        font-size: 0.28rem;
+    }
+
+    #url {
+        width: 1.86rem;
+    }
+
+    .basic .form-group {
+        margin-bottom: 0.4rem;
+    }
+
+    .btn-apps-save {
+        margin: 0.28rem 0 0 1.56rem;
+        width: 3.12rem;
+        line-height: 0.68rem;
+        border-radius: 0.08rem;
+        padding: 0 0.4rem;
+    }
+
+    .senior .form-group .control-label {
+        text-align: left;
+        margin-bottom: 0.24rem;
+        width: unset;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+    }
+
+    .senior .trust li,
+    .senior .download-way li {
+        float: left;
+        margin-right: 0.8rem;
+        margin-bottom: 0;
+        padding: 0;
+    }
+
+    .senior .download-way {
+        margin-bottom: 0;
+    }
+
+    .senior .form-group .col-sm-10 {
+        padding: 0;
+    }
+
+    .senior {
+        margin-top: 0.14rem;
+    }
+
+    .senior .form-group {
+        margin-bottom: 0.4rem;
+    }
+
+    .senior textarea.form-control {
+        width: 100%;
+        height: 1.64rem;
+        padding: 0.2rem 0.24rem;
+    }
+
+    .senior #submitAdvancedButton {
+        margin-top: 0.48rem;
+    }
+
+    .download-template .form-group .control-label {
+        text-align: left;
+        width: unset;
+        font-size: 0.28rem;
+        line-height: 0.4rem;
+        margin-bottom: 0.24rem;
+    }
+
+    .download-template .template-language li {
+        float: left;
+        margin-right: 0.48rem;
+        margin-bottom: 0;
+        padding: 0;
+    }
+
+    .download-template .template-language li:nth-child(3) {
+        margin-right: 0;
+    }
+
+    .form-group ul li .icon.icon-radio {
+        width: 0.4rem;
+        height: 0.4rem;
+        margin-right: 0.28rem;
+    }
+
+    .senior .trust li,
+    .senior .download-way li {
+        float: left;
+        margin-right: 0.8rem;
+        margin-bottom: 0;
+        padding: 0;
+    }
+
+    .download-template .template-list li {
+        margin: 0 0.36rem 0.36rem 0;
+        width: 1.6rem;
+        height: 2rem;
+    }
+
+    .download-template .template-list li:nth-last-child(1),
+    .download-template .template-list li:nth-last-child(2),
+    .download-template .template-list li:nth-last-child(3) {
+        margin-bottom: 0;
+    }
+
+    .download-template .form-group {
+        margin-bottom: 0.6rem;
+    }
+
+    .download-template .form-group:last-child {
+        margin-bottom: 0;
+    }
+
+    #tab-template {
+        margin-bottom: 0.18rem;
+    }
+
+    .download-template .template-list li .t-checked::after {
+        width: 0.32rem;
+        height: 0.32rem;
+    }
+
     /* 表格的搜索栏 */
     .download-details .d-top {
         display: flex;
@@ -1004,6 +1006,12 @@
         padding: 0 0.4rem;
     }
 
+    .release-app2 .iconfont.icon-date:before {
+        font-size: 0.26rem;
+        top: 0;
+        position: absolute;
+    }
+
     /* 表格 */
     .download-details {
         min-height: unset;

+ 1 - 0
static/index/css/apps-info-top.css

@@ -202,6 +202,7 @@
         font-size: 0.4rem;
         line-height: 0.46rem;
         margin-right: 0.4rem;
+        height: 0.46rem;
     }
 
     .app-details .my-apps-detail-top .information dt .version {

+ 0 - 1
static/index/css/apps.css

@@ -48,7 +48,6 @@
     }
 
     .release-app2>.row>.col-sm-2 {
-        padding-right: 0;
         margin-bottom: 0.24rem;
     }
 

+ 2 - 2
static/index/css/h5.css

@@ -183,8 +183,8 @@
     }
 
     .header .ms-nav .phone-user-center .user1 a {
-        line-height: 40px;
-        font-size: .32rem;
+        line-height: 44px;
+        font-size: 16px;
         color: #333;
     }
 

+ 93 - 12
static/index/css/header.css

@@ -2,17 +2,55 @@ header a {
     color: #fff;
 }
 
-@media (min-width: 768px) and (max-width: 1200px) {
+.ms-badge12 {
+    /* width: 50px; */
+    padding: 0 20px;
+    line-height: 32px;
+    display: inline-block;
+    color: #ffffff;
+    font-size: 12px;
+    text-align: center;
+    border: 1px solid rgba(255, 255, 255, 1);
+    background: rgba(255, 255, 255, 0.05);
+    height: 34px;
+    border-width: 1px;
+    border-radius: 4px;
+}
+
+.user-name {
+    color: #ffffff;
+    font-size: 14px;
+    line-height: 22px;
+}
+
+header .notification .iconfont {
+    margin-top: -5px;
+}
+
+.icon-arrow-bottom {
+    width: 12px;
+    height: 25px;
+    background: url(/static/index/image/nav/nav-arrow-down.svg) no-repeat center center;
+    background-size: 100% 100%;
+}
+
+.icon-arrow-bottom:before {
+    content: '';
+}
+
+@media (min-width: 1001px) and (max-width: 1200px) {
     header .container {
         width: 100%;
+        padding-right: 5px;
+        padding-left: 05px;
     }
 
     .header .ms-nav {
-        margin: 26px 0 0 15px;
+        margin: 26px 0 0;
     }
     
     .header .ms-nav>li {
-        margin: 0 5px;
+        margin: 0 1.2vw;
     }
     
     .header .ms-nav>li>a {
@@ -22,6 +60,41 @@ header a {
     .header .ms-nav>li a:hover {
         color: #ffffff;
     }
+    .user-name {
+        color: #ffffff;
+    }
+}
+
+@media (min-width: 768px) and (max-width: 1000px) {
+    header .container {
+        width: 100%;
+        padding-right: 0;
+        padding-left: 0;
+    }
+
+    .header .ms-nav {
+        margin: 26px 0 0 -25px;
+    }
+
+    .header .ms-nav>li {
+        margin: 0 1vw;
+    }
+    
+    .header .ms-nav>li>a {
+        padding: 0 0 5px;
+    }
+
+    .header .header-left img.hidden-xs {
+        transform: scale(0.7) translateX(-10px);
+    }
+
+    .user-name {
+        color: #ffffff;
+        display: none;
+    }
+    .ms-badge12 {
+        padding: 0 10px;
+    }
 }
 
 @media (max-width: 767px) {
@@ -30,9 +103,9 @@ header a {
         background-size: 100% 100%;
         width: 34px;
         height: 34px;
-        display: inline-block;
-        vertical-align: middle;
-        position: absolute;
+        /* display: inline-block; */
+        /* vertical-align: middle; */
+        /* position: absolute; */
         pointer-events: none;
         margin: unset;
     }
@@ -56,9 +129,9 @@ header a {
 
     .header .phone-menu {
         background-image: url(/static/index/image/m/moban2/icon-menu.svg);
-        margin-top: 0;
-        top: 17px;
-        right: 0;
+        margin-top: 17px;
+        /* top: 17px; */
+        /* right: 0; */
         pointer-events: auto;
     }
 
@@ -84,12 +157,19 @@ header a {
     /* nav */
 
     .header .phone-user-name .iconfont {
-        position: relative;
-        width: 24px;
+        /* position: relative; */
+        width: 30px;
         height: 24px;
-        top: -2px;
+        /* top: -2px; */
+        background: unset;
         margin-right: 12px;
     }
+
+    .header .phone-user-name .iconfont img {
+        display: block;
+        width: 30px;
+        height: 24px;
+    }
     
     .header .phone-user-name {
         line-height: 24px;
@@ -99,6 +179,7 @@ header a {
         font-size: 14px;
         color: rgba(21, 21, 21, 1);
         margin-bottom: 12px;
+        display: inline-flex!important;
     }
 
     .header .phone-user-name .certified {

+ 27 - 13
static/index/css/main.css

@@ -562,7 +562,7 @@ header {
 .login-in .name-certified {
     color: #348dee;
     margin-right: 10px;
-    padding-top: 25px;
+    padding-top: 20px;
 }
 
 .login-in .icon-arrow-bottom {
@@ -596,6 +596,10 @@ header {
     text-align: center;
 }
 
+.login-in .login-user dl dt a {
+    color: #666;
+}
+
 .login-in .login-user dl dt a:hover {
     color: #157df1;
 }
@@ -627,7 +631,7 @@ header {
 
 /*通知中心*/
 .header .login-in .notification {
-    padding-top: 22px;
+    padding-top: 25px;
     margin-right: 2px;
     position: relative;
     cursor: pointer;
@@ -9892,6 +9896,9 @@ aside.aside-left ul li a {
     font-family: Source Han Sans SC;
     font-weight: 500;
     font-size: 16px;
+    display: inline-flex;
+    align-items: center;
+    width: 100%;
 }
 
 aside.aside-left ul li a .iconfont {
@@ -9900,9 +9907,9 @@ aside.aside-left ul li a .iconfont {
     width: 24px;
     height: 24px;
     line-height: 24px;
-    position: relative;
-    display: inline-block;
-    vertical-align: middle;
+    /* position: relative; */
+    /* display: inline-block; */
+    /* vertical-align: middle; */
 }
 
 aside.aside-left ul li a .iconfont::before {
@@ -9913,11 +9920,11 @@ aside.aside-left ul li a .iconfont::before {
     width: 24px;
     height: 24px;
     display: inline-block;
-    position: absolute;
-    top: 50%;
-    left: 0;
+    /* position: absolute; */
+    /* top: 50%; */
+    /* left: 0; */
     background-image: url(../image/inner-nav/nav-3.png);
-    transform: translateY(-50%);
+    /* transform: translateY(-50%); */
 }
 
 aside.aside-left ul li a .iconfont.icon-upload1::before {
@@ -11099,6 +11106,13 @@ aside.aside-left ul li:hover a .iconfont {
     margin-top: 0;
 }
 
+@media (max-width: 767px) {
+    .user-center1>.row>.col-sm-2,
+    .release-app2>.row>.col-sm-2 {
+        padding-right: 0;
+    }  
+}
+
 /*侧栏增加大包上传入口*/
 .big-bag-upload {
     margin-bottom: 40px;
@@ -15682,14 +15696,14 @@ aside.aside-left ul li:hover a .iconfont {
         margin-right: 0.24rem;
         font-size: 0.48rem;
         width: 0.48rem;
-        height: 0.88rem;
-        line-height: 0.48rem;
+        /* height: 0.88rem; */
+        /* line-height: 0.48rem; */
     }
 
     aside.aside-left ul li a .iconfont::before {
         width: 0.48rem;
         height: 0.48rem;
-        top: 50%;
-        transform: translateY(-50%);
+        /* top: 50%; */
+        /* transform: translateY(-50%); */
     }
 }

BIN
static/index/image/inner-nav/nav-vip1.png


BIN
static/index/image/inner-nav/nav-vip2.png


BIN
static/index/image/inner-nav/nav-vip3.png


BIN
static/index/image/inner-nav/nav-vip4.png


+ 3 - 0
static/index/image/nav/nav-arrow-down.svg

@@ -0,0 +1,3 @@
+<svg width="12" height="6" viewBox="0 0 12 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 6L11.1962 0H0.803848L6 6Z" fill="white"/>
+</svg>

Diferenças do arquivo suprimidas por serem muito extensas
+ 6 - 0
static/index/image/nav/nav-vip1.svg


Diferenças do arquivo suprimidas por serem muito extensas
+ 6 - 0
static/index/image/nav/nav-vip2.svg


Diferenças do arquivo suprimidas por serem muito extensas
+ 6 - 0
static/index/image/nav/nav-vip3.svg


Diferenças do arquivo suprimidas por serem muito extensas
+ 6 - 0
static/index/image/nav/nav-vip4.svg


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff