fix:bug修复

source/index/login.php

@@ -87,7 +87,7 @@ class login extends Base
             <script src="/static/index/js/jquery.validate.min.js"></script>
             <div class="login-common">
                 <div class="tit-tabs">
-                    <div id="acc_login" class="tit active" style="display:inline-block;cursor:pointer">账号登录</div>
+                    <div id="acc_login" class="tit active" style="display:inline-block;cursor:pointer">账户登录</div>
 
                     <?php if (IN_SMS666666) { ?>
                         &nbsp; &nbsp; &nbsp;
@@ -127,7 +127,7 @@ class login extends Base
                 </form>
 
                 <form role="form" id="loginValid_code" novalidate="novalidate" style="display:none">
-                    <font color="#FF0000">未设置短信，请使用左边的账号登录。<br>需要测试短信登录功能请联系客服设置。</font>
+                    <!-- <font color="#FF0000">未设置短信，请使用左边的账号登录。<br>需要测试短信登录功能请联系客服设置。</font> -->
                     <div class="form-group">
                         <label class="iconfont icon-user" for="phone"></label>
                         <input type="text" class="form-control input-lg" id="phone" name="phone"

source/index/public/header.php

@@ -90,8 +90,8 @@ document.addEventListener('DOMContentLoaded', () => {
                         <span class="ms-badge">分发</span>
                     </li>
 
-                    <!-- <?php if ($this->userlogined) { ?>
-                       
+                    <?php if ($this->userlogined) { ?>
+                    
                     <?php }
 
                             if (IN_SUPER) { ?>
@@ -100,9 +100,9 @@ document.addEventListener('DOMContentLoaded', () => {
                         </li>
                     <?php } ?>
                         
-                      <li class="<?php if ($this->module == 'sign') echo 'active' ?>">
+                    <li class="<?php if ($this->module == 'sign') echo 'active' ?>">
                         <a href="<?php echo IN_PATH . 'index/apps/sign' ?>">企业签名</a>
-                    </li> -->
+                    </li>
 
 
                     <li class="<?php if ($this->module == 'webview' or $this->module == 'webview2' or $this->module == 'pack') echo 'active' ?>">

source/index/publish.php

@@ -243,7 +243,7 @@ class publish extends BaseUser
                                                                     ?> 
                                                                 </div>
                                                                 <div id="_drop1">点击按钮选择应用的安装包，或拖拽文件到此<br class="visible-xs">区域<br class="hidden-xs">
-                                                                    支持<?php echo $this->action == "apps" ? "{ipa,apk,mobileconfig}" : "{ipa}"; ?> 文件，单个
+                                                                    支持<?php echo $this->action == "apps" ? "(ipa,apk,mobileconfig)" : "(ipa)"; ?> 文件，单个
                                                                     <br class="visible-xs">
                                                                     文件最大支持
                                                                     <span><?php echo get_user_in_filesize($this->user, true); ?></span>

source/index/publish_detail.php

@@ -53,7 +53,8 @@ class publish_detail extends BaseUser
                             <span>/</span>
                             <a href="/index/apps/apps">应用列表</a>
                             <span>/</span>
-                            <?php echo $row["in_name"]; ?>
+                            <!-- <?php echo $row["in_name"]; ?> -->
+                            应用详情
                         </div>
                         <div class="row clearfix">
                             <?php
@@ -76,7 +77,7 @@ class publish_detail extends BaseUser
                                                             <tr>
                                                                 <th><span class="th-line">包名（BundleID）</span></th>
                                                                 <th><span class="th-line">状态</span></th>
-                                                                <th><span class="th-line">下载链接</span></th>
+                                                                <th><span class="th-line">下载地址</span></th>
                                                             </tr>
                                                             <tr>
                                                                 <td>
@@ -163,7 +164,7 @@ class publish_detail extends BaseUser
                                                                 <th>
                                                                     <span class="th-line">下载扣除</span>
                                                                 </th>
-                                                                <?php
+                                                                <!-- <?php
                                                                 if (IN_SIGN && $row["in_form"] == "iOS") {
                                                                 ?> <th>
                                                                         <span class="th-line">签名期限</span>
@@ -171,7 +172,7 @@ class publish_detail extends BaseUser
                                                                 <?php
                                                                 } else {
                                                                 ?><th></th>
-                                                                <?php } ?>
+                                                                <?php } ?> -->
                                                                 </td>
                                                             </tr>
                                                             <tr>
@@ -191,7 +192,7 @@ class publish_detail extends BaseUser
                                                                         data-trigger="hover">
                                                                         <?php echo $fnum; ?><?php echo $ftype; ?> </div>
                                                                 </td>
-                                                                <?php
+                                                                <!-- <?php
                                                                 if (IN_SIGN && $row["in_form"] == "iOS") {
                                                                 ?> <td>
                                                                         <div class="test-download clearfix">
@@ -207,7 +208,7 @@ class publish_detail extends BaseUser
                                                                 <?php
                                                                 } else {
                                                                 ?><th></th>
-                                                                <?php } ?>
+                                                                <?php } ?> -->
                                                             </tr>
                                                         </table>
                                                     </div>
@@ -276,7 +277,7 @@ class publish_detail extends BaseUser
 
                                                         <!-- 第三行：签名期限 + 下载扣除 -->
                                                         <div class="info-container">
-                                                            <?php if (IN_SIGN && $row["in_form"] == "iOS"): ?>
+                                                            <!-- <?php if (IN_SIGN && $row["in_form"] == "iOS"): ?>
                                                                 <div class="info-group" style="width: 55%;">
                                                                     <span class="info-label">签名期限</span>
                                                                     <span class="info-value">
@@ -287,9 +288,9 @@ class publish_detail extends BaseUser
                                                                         </a>
                                                                     </span>
                                                                 </div>
-                                                            <?php endif; ?>
+                                                            <?php endif; ?> -->
 
-                                                            <div class="info-group" style="width: <?php echo (IN_SIGN && $row["in_form"] == "iOS") ? '45%' : '100%'; ?>;">
+                                                            <div class="info-group" style="width: <?php echo (IN_SIGN && $row["in_form"] == "iOS") ? '100%' : '100%'; ?>;">
                                                                 <span class="info-label">下载扣除</span>
                                                                 <span class="info-value"
                                                                     data-popover="true"

source/index/publish_success.php

@@ -81,8 +81,8 @@ class publish_success extends BaseUser
 
                 .release-app .uploaded-success .up-btn .ms-btn {
                     font-size: 18px;
-                    line-height: 50px;
-                    height: 50px;
+                    line-height: 44px;
+                    height: 44px;
                     border-radius: 4px;
                     background-color: rgba(33, 104, 251, 1);
                     color: #fff;
@@ -127,7 +127,7 @@ class publish_success extends BaseUser
                 <div class="container">
                     <div class="release-app">
                         <div class="crumbs">
-                            <a href="/index/apps/apps">我的应用</a><span>/</span>发布
+                            <a href="/index/apps/apps">我的应用</a><span>/</span>上传应用
                         </div>
                         <div class="uploaded-success">
                             <div class="img-wrap">
@@ -136,7 +136,7 @@ class publish_success extends BaseUser
                                     alt="" class="img-responsive">
                             </div>
                             <div class="tit">
-                                发布成功
+                                <?php echo $row['in_name']; ?>
                             </div>
                             <div class="p1">
                                 您的应用<?php echo $row['in_name']; ?>已经上传成功啦！

source/index/publish_tab_version.php

@@ -39,11 +39,7 @@ if ($count > 3) {
                         <?php
                         if ($value["in_form"] == "iOS") {
                         ?> 
-                        <div class="bundle-length" data-container="body"
-                             data-toggle="popover" data-placement="bottom"
-                             data-content="<?php echo $value["in_team"]; ?>"
-                             data-trigger="hover" data-original-title=""
-                             title="">
+                        <div title="<?php echo $value["in_team"]; ?>">
                             <?php echo $value["in_team"]; ?>
                         </div>
                         <?php

source/index/reg.php

@@ -34,29 +34,59 @@ class reg extends Base
                 }
             </script>
             <style>
-                /* .tit {
-                    display: table;
-                    width: 100%;
+                .login-common .form-group:nth-child(5) {
+                    margin-bottom: 0;
                 }
 
-                .tit a {
-                    line-height: 35px;
-                    font-size: 15px;
-                    display: table-cell;
-                    width: 48%;
-                    text-align: center;
-                    border-bottom: 2px solid beige;
+                /* 自定义checkbox样式 */
+                .custom-checkbox {
+                    position: relative;
+                    display: inline-block;
+                    width: 18px;
+                    height: 18px;
+                    vertical-align: middle;
+                    cursor: pointer;
+                    background: #fff;
+                    transition: all 0.3s ease;
+                    margin: 0;
+                    border: 1px solid #ddd;
                 }
 
-                .tit a.active {
-                    font-size: 18px;
-                    color: #333;
-                    border-bottom: 2px solid #fff;
+                .custom-checkbox:hover {
+                    border-color: #2168fb;
+                    box-shadow: 0 0 5px rgba(33, 104, 251, 0.3);
                 }
 
-                .index1 {
-                    display: block;
-                } */
+                .custom-checkbox.checked {
+                    background: url(/static/index/image/login/check-on.svg) center / 100% no-repeat;
+                    border-color: #2168fb;
+                    border: unset;
+                }
+
+                .login-common .checkbox {
+                    display: flex;
+                    align-items: center;
+                    margin: 0;
+                }
+                
+                .login-common .checkbox span {
+                    margin-left: 8px;
+                }
+
+                /* 响应式设计 */
+                @media (max-width: 767px) {
+                    .custom-checkbox {
+                        width: 0.32rem;
+                        height: 0.32rem;
+                    }
+                
+                    .login-common .checkbox span {
+                        margin-left: 0.16rem;
+                    }
+                    .register-common .form-group .form-control {
+                        padding-left: 0.8rem;
+                    }
+                }
             </style>
         </head>
         <body>
@@ -121,7 +151,7 @@ class reg extends Base
                         
                 </div>
                 <div class="checkbox">
-                    <input type="checkbox" checked>
+                    <div class="custom-checkbox checked" id="agreementCheckbox"></div>
                     <span>我已阅读并同意<a href="/index/about/agreement" target="_blank" class="color-hover">《服务协议》</a>及<a
                                 href="/index/about/privacy" target="_blank" class="color-hover">《隐私政策》</a></span>
                 </div>
@@ -134,6 +164,11 @@ class reg extends Base
         </div>
         <script>
             $(function () {
+                // 自定义checkbox点击事件
+                $('#agreementCheckbox').click(function() {
+                    $(this).toggleClass('checked');
+                });
+
                 function settime(countdown) {
                     if (countdown == 0) {
                         $('#sendcode' + regtype).attr("disabled", false);
@@ -184,6 +219,12 @@ class reg extends Base
                 });
 
                 $("#submitButton").click(function () {
+                    // 检查是否同意协议
+                    if (!$('#agreementCheckbox').hasClass('checked')) {
+                        alert('请先阅读并同意服务协议和隐私政策');
+                        return;
+                    }
+
                     var nickname = $("#nickname").val();
                     var email = $("#email").val();
                     var mobile = $("#mobile").val();

source/template/pc/moban2/index.php

@@ -571,7 +571,7 @@ if (!defined('IN_ROOT')) {
           <h3 class="number-1">
             <?php echo IN_AUTOGRAPH ?>
           </h3>
-          <p>累计封装</p>
+          <p>累计在线</p>
         </li>
         <li>
           <h3 class="number-2">

static/index/css/apps-aside.css

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

static/index/css/apps-detail.css

@@ -68,7 +68,7 @@
 
 /* 标签页样式 */
 .tabs {
-    margin: 12px 0;
+    margin: 12px 0 0 0;
     padding: 10px 30px;
 }
 

static/index/css/apps-info-top.css

@@ -29,6 +29,15 @@
     font-size: 24px;
     line-height: 23px;
     margin-right: 13px;
+          /* 禁止换行 */
+    overflow: hidden;        /* 隐藏溢出内容 */
+     /* 显示省略号 */
+                 /* 或指定一个固定宽度 */
+    height: 23px;
+    display: inline-block;
+    max-width: calc(100% - 100px);
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .app-details .my-apps-detail-top .information dt .version {
@@ -114,6 +123,7 @@
     width: 379px;
     margin-top: 0;
     flex-shrink: 0;
+    display: flex;
 }
 
 .my-apps-detail-top .iconfont {

static/index/css/header.css

@@ -2,6 +2,28 @@ header a {
     color: #fff;
 }
 
+@media (min-width: 768px) and (max-width: 1200px) {
+    header .container {
+        width: 100%;
+    }
+
+    .header .ms-nav {
+        margin: 26px 0 0 15px;
+    }
+    
+    .header .ms-nav>li {
+        margin: 0 5px;
+    }
+    
+    .header .ms-nav>li>a {
+        padding: 0 0 5px;
+    }
+    
+    .header .ms-nav>li a:hover {
+        color: #ffffff;
+    }
+}
+
 @media (max-width: 767px) {
     header .iconfont {
         background: url(/static/index/image/m/moban2/icon-menu.svg) no-repeat center center;

static/index/css/login.css

@@ -45,6 +45,11 @@
         width: 100%;
         height: 0.82rem;
         line-height: 0.82rem;
+        padding: 0.22rem 0.28rem;
+    }
+
+    .login-common .form-group .form-control::placeholder {
+        font-size: 0.32rem;
     }
 
     .login-common .verification-code .form-control {

static/index/css/main.css

@@ -453,7 +453,7 @@ header {
     margin: 0 10px;
 }
 
-@media (min-width: 1200px) {
+@media (min-width: 768px) {
     .header .ms-nav>li>a {
         padding: 0 10px 5px;
         border-bottom: 2px solid transparent;
@@ -1306,6 +1306,12 @@ footer {
     font-size: 16px;
 }
 
+.login-common .form-group .form-control::placeholder {
+  font-size: 16px;
+  color: #999;   
+  opacity: 1;    
+}
+
 .login-common .btn-action {
     display: flex;
     justify-content: space-between;
@@ -1444,8 +1450,25 @@ footer {
     color: rgba(33, 104, 251, 1);
 }
 
+.login-common .form-group .iconfont {
+    width: 20px;
+    height: 20px;
+}
+
+.login-common .form-group .iconfont:before {
+    content: '';
+}
+
 .login-common .form-group .icon-user {
-    font-size: 20px;
+    background: url(/static/index/image/login/icon-user.svg) center / 100% no-repeat;
+}
+
+.login-common .form-group .icon-tel {
+    background: url(/static/index/image/login/icon-leg.svg) center / 100% no-repeat;
+}
+
+.login-common .form-group .icon-pwd {
+    background: url(/static/index/image/login/icon-pwd.svg) center / 100% no-repeat;
 }
 
 .login-common .form-group .icon-email {
@@ -15630,6 +15653,11 @@ aside.aside-left ul li:hover a .iconfont {
 }
 
 @media (max-width: 768px) {
+    .login-common .form-group .iconfont {
+        width: 0.4rem;
+        height: 0.4rem;
+    }
+
     aside.aside-left {
         padding: 0.24rem 0;
     }

static/index/image/login/check-on.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="16" height="16" fill="#2168FB"/>
+<path d="M3 9L7 12L13 4" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

static/index/image/login/icon-leg.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.49802 3.84302C8.86132 3.84302 9.19602 4.04003 9.37237 4.35765L10.5956 6.56105C10.7557 6.84955 10.7633 7.1985 10.6157 7.49365L9.43727 9.8505C9.43727 9.8505 9.77877 11.6062 11.208 13.0354C12.6372 14.4646 14.387 14.8002 14.387 14.8002L16.7435 13.622C17.0388 13.4743 17.388 13.482 17.6766 13.6424L19.8863 14.8709C20.2036 15.0474 20.4004 15.3819 20.4004 15.7449V18.2817C20.4004 19.5735 19.2004 20.5066 17.9764 20.0935C15.4624 19.2453 11.5601 17.6302 9.08667 15.1567C6.61322 12.6833 4.99812 8.78095 4.14985 6.267C3.73684 5.04295 4.66989 3.84302 5.96172 3.84302H8.49802Z" stroke="#8F959F" stroke-width="1.5"/>
+</svg>

static/index/image/login/icon-pwd.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 11H4C3.44772 11 3 11.4477 3 12V21C3 21.5523 3.44772 22 4 22H20C20.5523 22 21 21.5523 21 21V12C21 11.4477 20.5523 11 20 11Z" stroke="#8F959F" stroke-width="1.5"/>
+<path d="M7 11V7C7 4.23857 9.2386 2 12 2C14.7614 2 17 4.23857 17 7V11" stroke="#8F959F" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M12 15V18" stroke="#8F959F" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

static/index/image/login/icon-user.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 10C14.2091 10 16 8.20914 16 6C16 3.79086 14.2091 2 12 2C9.79086 2 8 3.79086 8 6C8 8.20914 9.79086 10 12 10Z" stroke="#8F959F" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M21 22C21 17.0294 16.9706 13 12 13C7.02945 13 3 17.0294 3 22" stroke="#8F959F" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

static/index/js/publish/packageParser.js

@@ -82,7 +82,9 @@ var packageParser = function () {
                         }
                         // u.setOption({chunk_size: 4000000});
 
-                        $(".tolsize").html("<span class='process100' style='width: auto;font-size: 14px;'></span> / " + (f.size / 1024 / 1024).toFixed(2) + "MB");
+                        var appDisplayName = a.appName || f.name;
+                        var versionDisplay = a.version || "1.0";
+                        $(".tolsize").html(appDisplayName + "_" + versionDisplay + "." + a.ext + "：" + "<span class='process100' style='width: auto;font-size: 14px;'></span> / " + (f.size / 1024 / 1024).toFixed(2) + "MB");
                         $("#upprocess").show();
                         $("#upbtn").hide()
                         console.log('BeforeUpload');