Merge branch 'dev-ly' into dev-cmn

css/jcq.css

@@ -433,7 +433,7 @@
 .user-center1 .account-management .pwd .ms-btn {
     width: auto;
     padding: 7px 30px;
-    margin-left: 100px;
+    margin-left: 124px;
 }
 
 .user-center1 .aside-right .balance-recharge .b-num {
@@ -603,6 +603,15 @@
 
 /* 移动端适配 */
 @media (max-width: 767px) {
+    .form-group .input-text.radio{
+        min-width: 180px;
+        width: auto;
+        justify-content: flex-start;
+    }
+    .form-group .input-text.radio>label:not(:first-child) {
+        margin-left: .4rem;
+
+    }
     .warn-prompt-wrap1ass {
         border: none;
         font-size: .24rem;
@@ -619,6 +628,16 @@
         top: .48rem;
         right: 0px;
     }
+    .j-search-btn{
+       margin-top: .2rem;
+       margin-bottom: .2rem;
+    }
+    .j-icon-search{
+        display: none;
+    }
+        .j-search-btn input:first-child{
+            margin-left: 0 !important;
+        }
 
     .j-top-wrap dl.clearfix {
         position: relative;
@@ -699,7 +718,8 @@
     .mobile-price .m-price-common .con .b-price {
         font-size: .4rem;
         position: absolute;
-        right: 1.2rem;
+        /* right: 1.2rem; */
+        left: 66%;
         bottom: 1.2rem;
         color: #ff7429;
     }
@@ -766,6 +786,7 @@
         font-size: .24rem;
         padding: 0 .1rem;
         margin-top: .8rem;
+        text-align: left;
     }
 
     .tool-classs .con ul li .tit {
@@ -887,20 +908,45 @@
         border-right: none;
     }
 
+    .j-label-text{
+        width: auto !important;
+    }
+    .j-label-text-radio{
+        width: 3.6rem !important;
+    }
+        .j-label-text-je{
+            width: 3.2rem !important;
+        }
+        .j-label-open {
+            width: 1.6rem !important;
+        }
+        .size-list{
+            overflow-y: scroll;
+            max-height: calc(100vh - 3.8rem);
+        }
+                .footer .left dl{
+                    margin-right: .6rem;
+                }
     .warn-prompt {
         flex-wrap: wrap;
-        padding: 0;
+        padding: .1rem .2rem;
+        margin-top: 0 !important;
     }
+        .warn-prompt span:not(:first-child) {
+            margin-top: .1rem;
+        }
 
     .warn-prompt .iconfont {
         margin-right: 0;
         font-size: .24rem;
         padding-left: 0;
+        float: left;
     }
 
     .warn-prompt span b {
         padding-left: 0;
         font-weight: 400;
+        font-size: 14px;
     }
 
     .table_top.clearfix.j-top {
@@ -1007,7 +1053,8 @@
     }
 
     .ms-btn.w140 {
-        width: 74vw;
+        width: 84vw;
+        margin: 0 auto;
     }
 
 }

source/index/apps.php

@@ -77,7 +77,11 @@ class apps extends BaseUser
             <?php
             $this->header();
             ?>
-
+            <style>
+                .apps-table {
+                    overflow-x: auto;
+                }
+            </style>
 
             <link rel="stylesheet" href="/static/pack/font-awesome-4.7.0/css/font-awesome.css" />
             <script src="/static/index/js/bootstrap-paginator.js"></script>
@@ -257,7 +261,9 @@ class apps extends BaseUser
                                                             </dd>
                                                             <dt class="fl">
                                                                 <a href="/index/item_price"
-                                                                    class="ms-btn ms-btn-primary mt3 w60">充值</a>
+                                                                    class="ms-btn ms-btn-primary mt3 w60 apps-buyBtn">
+                                                                    <img style="transform: translate(1px, 1px);display: inline-block;" src="/images/icon/add.svg">
+                                                                    <span class="apps-buyBtn-font">充值</span></a>
                                                             </dt>
                                                         <?php
                                                         }
@@ -306,9 +312,13 @@ class apps extends BaseUser
                                                                 </dd>
                                                             <?php
                                                             }
-                                                            ?> <dt class="fl"><a
-                                                                    href="/index/item_price?type=4"
-                                                                    class="ms-btn ms-btn-primary mt3 w60">购买</a></dt>
+                                                            ?>
+                                                            <dt class="fl">
+                                                                <a href="/index/item_price?type=4"
+                                                                    class="ms-btn ms-btn-primary mt3 w60 apps-buyBtn">
+                                                                    <img style="transform: translate(1px, 1px);display: inline-block;" src="/images/icon/add.svg">
+                                                                    <span class="apps-buyBtn-font">购买</span></a>
+                                                            </dt>
                                                         <?php
                                                         }
                                                         ?>
@@ -368,7 +378,7 @@ class apps extends BaseUser
                                             </div>
                                             <div class="app-table-wrap">
                                                 <div class="table-wrap">
-                                                    <div class="table-responsive">
+                                                    <div class="table-responsive apps-table">
                                                         <table class="table app-table">
                                                             <tr>
                                                                 <th class="app-th-name">名称</th>
@@ -431,7 +441,7 @@ class apps extends BaseUser
                                                                         </div>
                                                                     </td>
                                                                     <td><?php echo $_var_23["in_bsvs"]; ?></td>
-                                                                    <td>
+                                                                    <td style="min-width: 80px">
                                                                         <?php echo formatsize($_var_23["in_size"]); ?>
 
                                                                     </td><?php
@@ -473,8 +483,8 @@ class apps extends BaseUser
                                                                                                                                             }
                                                                                                                                             if ($this->action == "apps") {
                         ?><td><?php echo intval($_var_23["in_downloads"]); ?></td>
-                                                                                <td><?php echo $_var_23["in_deduct"]; ?><?php echo IN_POINTNAME; ?></td>
-                                                                                <td><?php echo ["-2" => "下架", "-1" => "审核中", "正常", "锁定"][$_var_23["in_applock"]]; ?></td><?php
+                                                                                <td style="min-width: 80px"><?php echo $_var_23["in_deduct"]; ?><?php echo IN_POINTNAME; ?></td>
+                                                                                <td style="min-width: 50px"><?php echo ["-2" => "下架", "-1" => "审核中", "正常", "锁定"][$_var_23["in_applock"]]; ?></td><?php
                                                                                                                                                                     }
                                                                                                                                                                     if ($this->action == "sign") {
                                                                                                                                                                         if ($_var_23["in_sign"]) {
@@ -494,7 +504,7 @@ class apps extends BaseUser
                                                                                 ?><td><?php echo $_var_27; ?></td>
                                                                                 <td class="in_super<?php echo $_var_23["in_id"]; ?>"><?php echo $_var_23["in_super"] ? "已开启" : "未开启"; ?></td><?php
                                                                                                                                                                                         }
-                                                                                                                                                                                            ?><td><?php
+                                                                                                                                                                                            ?><td style="min-width: 300px"><?php
                                                                 if ($this->action == "apps" && IN_DIST_ON || $this->action == "super" && IN_SUPER) {
                                                                     if ($_var_23["in_kid"]) {
                     ?><a app_id="<?php echo bees_encrypt($_var_23["in_id"]); ?>" ext="ipa" class="table-btn color-hover ms-btn-secondary cancel_merge" data-toggle="modal" data-target="#myModal2" <?php echo $_var_23["in_applock"] ? "disabled=\"disabled\"" : ""; ?>>取消合并</a><?php
@@ -521,7 +531,7 @@ class apps extends BaseUser
                                                                                                                                                                                                                                                                                                                                                                                     }
                                                                                                                                                                                                                                                                                                                                                                                 }
                                                                                                                                                             ?><a href="<?php echo $_var_23["in_applock"] ? "javascript:;" : "/index/publish_detail/" . $this->action . "?id=" . bees_encrypt($_var_23["in_id"]); ?>" class="table-btn color-hover" <?php echo $_var_23["in_applock"] ? "disabled=\"disabled\"" : ""; ?>>详情</a>
-                                                                                <a href="javascript:;" app_id="<?php echo bees_encrypt($_var_23["in_id"]); ?>" style="color:#FF7429" class="table-btn color-delete delete-app">删除</a>
+                                                                                <a href="javascript:;" app_id="<?php echo bees_encrypt($_var_23["in_id"]); ?>" class="table-btn color-delete delete-app">删除</a>
                                                                             </td>
                                                                 </tr><?php
                                                                     }

source/index/domain.php

@@ -118,8 +118,12 @@ class domain extends BaseUser
                                                                     <td>
                                                                         <div style="display: flex; align-items: center; justify-content: center;">
                                                                             <a id="copylink<?php echo $_var_2["id"]; ?>"
-                                                                                style="margin:0 5px;color:#157df1;font-size:14px;"
-                                                                                class="fl" target="_blank"
+                                                                                style="margin:0 5px;color:#157df1;font-size:14px;max-width: 200px;"
+                                                                                class="fl ell" target="_blank"
+                                                                                data-container="body"
+                                                                                data-toggle="popover" data-placement="top"
+                                                                                data-trigger="hover"
+                                                                                data-content="http://<?php echo $_var_2["domain"]; ?>"
                                                                                 href="http://<?php echo $_var_2["domain"]; ?>">http://<?php echo $_var_2["domain"]; ?></a>
                                                                             <button class="copy table-btn fl"
                                                                                 style="padding: 0 5px;border:0;font-size:14px;background:transparent;"

source/index/footer.php

@@ -107,7 +107,37 @@ if (!defined('IN_ROOT')) {
                 </div>
             </div>
             <div class="footer visible-xs">
-                <div class="con">
+                <div class="fl left clearfix">
+                        <dl class="fl">
+                            <dt>产品服务</dt>
+                            <dd class="line"></dd>
+                            <dd><a href="/index/publish/apps" target="_blank">托管分发</a></dd>
+                            <dd><a href="/index/price" target="_blank">价格服务</a></dd>
+                            <dd><a href="/index/feedback" target="_blank">建议和反馈</a></dd>
+                            <dd><a href="/index/utils" target="_blank">工具箱</a></dd>
+                        </dl>
+                        <dl class="fl">
+                            <dt>关于我们</dt>
+                            <dd class="line"></dd>
+                            <dd><a href="/index/about" target="_blank">公司简介</a></dd>
+                            <dd><a href="/index/about/privacy" target="_blank">隐私政策</a></dd>
+                            <dd><a href="/index/about/agreement" target="_blank">服务协议</a></dd>
+                            <dd><a href="/index/about/specification" target="_blank">应用审核规范</a></dd>
+                        </dl>
+                       
+                        <dl class="fl">
+                            <dt>联系我们</dt>
+                            <dd class="line"></dd>
+                            <dd>
+                                <a href="javascript:;" target="_blank" class="chatQQ">Telegram</a>
+                            </dd>
+                            <dd>
+                                <a href="javascript:;" target="_blank" class="chatQQ">WhatsApp</a>
+                            </dd>
+                            
+                        </dl>
+                    </div>
+                <!-- <div class="con">
                     <a href="/index/about" target="_blank">公司简介</a><span>|</span><a href="/index/about/agreement"
                                                                                     target="_blank">服务协议</a><span>|</span><a
                             href="/index/about/log" target="_blank">更新日志</a><span>|</span><a href="/index/about/privacy"
@@ -115,13 +145,15 @@ if (!defined('IN_ROOT')) {
                 </div>
                 <p class="p1">
                     Copyright © <?php echo IN_BUSINESS ?> <?php echo IN_NAME ?> 
-					<a style="color:#ffffff" href="http://www.beian.miit.gov.cn/" target="_blank"><?php echo IN_ICP ?></a>
+					<a style="color:#ffffff" href="http://www.beian.miit.gov.cn/" target="_blank">
+                        //<?php echo IN_ICP ?>
+                    </a>
                 </p>
                 <p class="p2">
                     <a target="_blank" href="http://www.beian.gov.cn/"
                        style="text-decoration:none; height:20px; line-height:20px; margin-left: 10px;">
 					   <img src="/static/index/image/jh.png"><span style="height:20px; line-height:20px; margin: 0px 0px 0px 5px; color:#fff;"><?php echo IN_GANICP ?></a>
-                </p>
+                </p> -->
             </div>
         </div>
     </footer>

source/index/icon_make.php

@@ -34,7 +34,8 @@ class icon_make extends Base
         <body>
         <?php 
 		$this->header();
-		?>        <span class="icon-menu iconfont phone-menu visible-xs"></span>
+		?>        
+        <!-- <span class="icon-menu iconfont phone-menu visible-xs"></span> -->
         <div class="phone-shadow"></div>
         <script src="/static/index/js/html2canvas.js"></script>
         <script src="/static/index/js/canvas2image.js"></script>

source/index/item_price.php

@@ -51,6 +51,14 @@ class item_price extends BaseUser
                 [v-cloak] {
                     display: none;
                 }
+                @media (min-width: 768px) {
+                    .price-pay .pay-money .money {
+                        padding: 20px 30px;
+                    }
+                    .price-pay .pay-money .ms-btn {
+                        margin-left: 30px;
+                    }
+                }
             </style>
 
         <body>

source/index/price.php

@@ -1302,9 +1302,11 @@ class price extends Base
                     </div>
                 </div>
             </div>
-            <?php 
-		include 'footer.php';
-		?>
+
+        </div>
+                        </div>
+                         <?php $this->footer() ?>
+           
     </body>
 
 </html>

source/index/super_cert.php

@@ -37,7 +37,9 @@ class super_cert extends BaseUser
             <title>应用管理 - <?php echo IN_NAME;?> - 免费应用内测托管平台|iOS应用Beta测试分发|Android应用内测分发</title>
             <?php 
 		$this->static_();
-		?>        </head>
+		?>        
+        <link rel="stylesheet" href="/css/jcq.css">
+        </head>
         <body>
         <?php 
 		$this->header();
@@ -84,13 +86,14 @@ class super_cert extends BaseUser
                                     <div class="table-list">
                                         <div class="a-top mb10 clearfix">
                                             <div class="input-search fl">
-                                                <input type="text" class="fl" placeholder="输入开发者账号" name="search_input"
+                                                <input class="super-search" type="text" class="fl" placeholder="输入开发者账号" name="search_input"
                                                        id="keyword" value="<?php echo $_var_1;?>">
                                                 <span class="iconfont icon-search"></span>
                                             </div>
+                                            <div class="super-btn-box">
                                             <div class="fr clearfix how-many">
                                                 <dl class="clearfix">
-                                                    <dd class="fl">
+                                                    <dd class="fl total">
                                                         <div class="clearfix">
                                                             <div class="fr">
                                                                 <p class="p1">
@@ -107,10 +110,10 @@ class super_cert extends BaseUser
                                                         <div class="p2 clearfix">
                                                             <span><?php echo $_var_5;?></span>
                                                         </div>
-                                                        <div class="right-line">
+                                                        <div class="right-line mob-none">
                                                         </div>
                                                     </dd>
-                                                    <dt class="fl">
+                                                    <dt class="fl btn-box">
                                                         <a href="https://appstoreconnect.apple.com/access/api"
                                                            class="ms-btn ms-btn-primary mt3" target="_blank">p8证书</a>
                                                         <?php 
@@ -126,6 +129,7 @@ class super_cert extends BaseUser
 		?>                                                    </dt>
                                                 </dl>
                                             </div>
+                                            </div>
                                         </div>
                                         <div class="app-table-wrap">
                                             <div class="table-wrap">
@@ -261,43 +265,41 @@ class super_cert extends BaseUser
                             <form id="upload" method="post" target="post_frame" enctype="multipart/form-data">
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">账号(<span
-                                                    style="color:red;">*</span>)：</label>
-                                        <input type="text"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">账号<span
+                                                    style="color:red;margin-left:2px">*</span>：</label>
+                                        <input class="j-label-text" type="text"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                placeholder="(必填)" name="team_id" id="team_id">
                                     </div>
                                     <div style="margin-top:10px;">
-                                        <label style="width:100px;text-align:right;">Iss(<span
-                                                    style="color:red;">*</span>)：</label>
-                                        <input type="text"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">Iss<span
+                                                    style="color:red;margin-left:2px">*</span>：</label>
+                                        <input class="j-label-text" type="text"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                placeholder="(必填)" name="iss" id="iss">
                                     </div>
                                     <div style="margin-top:10px;">
-                                        <label style="width:100px;text-align:right;">Kid(<span
-                                                    style="color:red;">*</span>)：</label>
-                                        <input type="text"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">Kid<span
+                                                    style="color:red;margin-left:2px">*</span>：</label>
+                                        <input class="j-label-text" type="text"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                placeholder="(必填)" name="kid" id="kid">
                                     </div>
 
                                     <div style="margin-top:10px;">
-                                        <label style="width:100px;text-align:right;">备注：</label>
-                                        <input type="text"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">备注：</label>
+                                        <input class="j-label-text" type="text"
                                                style="width:420px;padding-left:10px;height:70px;border:1px solid #e0e0e0;"
                                                placeholder="(选填)" name="mark" id="mark">
                                     </div>
                                     <br>
-                                    <div class="form-group" style="margin-top:10px;">
-                                        <label class="col-sm-3 control-label" style="text-align:right;">P8密钥(<span
-                                                    style="color:red;">*</span>)：</label>
-                                        <div class="col-sm-9">
-                                            <input type="file" class="form-control"
-                                                   style="height:35px;border:1px solid #e0e0e0;" placeholder="(必填)"
+                                    <div style="margin-top:10px;">
+                                        <label class="j-label-open" style="text-align:right;">P8密钥<span
+                                                    style="color:red;margin-left:2px">*</span>：</label>
+                                            <input class="j-label-text-je" type="file" class="form-control"
+                                                   style="display: inline-block; height:35px;border:1px solid #e0e0e0;" placeholder="(必填)"
                                                    accept=".p8"
                                                    name="p8" id="p8">
-                                        </div>
                                     </div>
 
 
@@ -310,23 +312,25 @@ class super_cert extends BaseUser
                                             </div>
                                         </div>
                                     </div>
-                                    <div style="text-align:right;margin-top:30px;">
-                                        <div style="border-top:1px solid #eee;">
-                                            <div class="text-right mt30">
-                                                <button type="button" class="btn btn-default" data-dismiss="modal"
-                                                        aria-label="Close" onclick="$('#vipp8SC').toggle();">取消
-                                                </button>
-                                                <input type="hidden" name="user_id"
-                                                       value="<?php echo $_COOKIE["in_userid"];?>"/>
-                                                <button type="button" class="btn btn-primary" onclick="addCert()">
-                                                    立即添加
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
+
 
                                 </div>
                             </form>
+                            
+                        </div>
+                        <div style="text-align:right;margin-top:30px;">
+                            <div style="border-top:1px solid #eee;">
+                                <div class="text-right mt30">
+                                    <button type="button" class="btn btn-default" data-dismiss="modal"
+                                            aria-label="Close" onclick="$('#vipp8SC').toggle();">取消
+                                    </button>
+                                    <input type="hidden" name="user_id"
+                                            value="<?php echo $_COOKIE["in_userid"];?>"/>
+                                    <button type="button" class="btn btn-primary" onclick="addCert()">
+                                        立即添加
+                                    </button>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>

source/index/super_code.php

@@ -60,7 +60,9 @@ class super_code extends BaseUser
             <title>应用管理 - <?php echo IN_NAME;?> - 免费应用内测托管平台|iOS应用Beta测试分发|Android应用内测分发</title>
             <?php 
 		$this->static_();
-		?>        </head>
+		?>       
+        <link rel="stylesheet" href="/css/jcq.css"/>    
+    </head>
         <body>
         <?php 
 		$this->header();
@@ -147,9 +149,10 @@ class super_code extends BaseUser
                                                 <input type="text" class="fl" placeholder="输入授权码或设备号"
                                                        name="search_input"
                                                        id="keyword" value="<?php echo $_var_6;?>">
-                                                <span class="iconfont icon-search"></span>
+                                                <span class="iconfont icon-search j-icon-search"></span>
                                             </div>
-                                            <div class="input-search fl">
+                                            <div class="icon-search app-bloder-btn">搜索</div>
+                                            <div class="input-search fl j-search-btn">
                                                 <input type="button" class="fl" value="导出全部" onclick="import_codes()"
                                                        style="background:#157df1;border:#157df1;color:#fff;width: 75px;padding-right: 10px;margin-left: 10px;">
                                                          <input type="button" class="fl" value="导出未使用" onclick="import_codesall()"
@@ -346,8 +349,8 @@ class super_code extends BaseUser
                             <form id="upload" method="post" target="post_frame" enctype="multipart/form-data">
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">剩余数量&nbsp;&nbsp;</label>
-                                        <input type="text" name="max_num" disabled="disabled" id="max_num"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">剩余数量&nbsp;&nbsp;</label>
+                                        <input class="j-label-text" type="text" name="max_num" disabled="disabled" id="max_num"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
 
                                                value="<?php echo $_var_21["max_super_code"];?>">
@@ -356,8 +359,8 @@ class super_code extends BaseUser
 
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">生成数量&nbsp;&nbsp;</label>
-                                        <input type="number"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">生成数量&nbsp;&nbsp;</label>
+                                        <input class="j-label-text" type="number"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                placeholder="(必填)" name="nums" id="nums"
                                                oninput="value=value.replace(/[^\d]/g,'')">
@@ -365,8 +368,8 @@ class super_code extends BaseUser
                                 </div>
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">有效时长&nbsp;&nbsp;</label>
-                                        <input type="number"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">有效时长&nbsp;&nbsp;</label>
+                                        <input class="j-label-text" type="number"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                placeholder="(天)" name="days" id="days"
                                                oninput="value=value.replace(/[^\d]/g,'')">
@@ -374,9 +377,9 @@ class super_code extends BaseUser
                                 </div>
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">生成类型&nbsp;&nbsp;</label>
+                                        <label class="j-label-open" style="width:100px;text-align:right;">生成类型&nbsp;&nbsp;</label>
                                         <input type="hidden" value="1" id="type"/>
-                                        <ul class="clearfix download-way"
+                                        <ul class="clearfix download-way j-label-text-radio"
                                             style="width:420px;float:right;margin-right:10px;">
                                             <li class="clearfix active" style="float:left;">
                                                 <span class="icon icon-radio icon-radio-checked fl" id="gkcheck"></span>
@@ -392,8 +395,7 @@ class super_code extends BaseUser
                                     </div>
                                 </div>
                             </form>
-                        </div>
-                        <div class="form-group" style="margin-top:10px;">
+                             <div class="form-group" style="margin-top:10px;">
                             <div class="tipPanel"
                                  style="margin: 10px;padding: 10px;font-size: 14px;border: 1px dotted gray;border-radius: 8px;">
                                 <div class="tipItem" id="codeInfo">
@@ -405,6 +407,8 @@ class super_code extends BaseUser
                                 </div>
                             </div>
                         </div>
+                        </div>
+                       
                         <div style="text-align:right;margin-top:30px;">
                             <div style="border-top:1px solid #eee;">
                                 <div class="text-right mt30">

source/index/udid.php

@@ -101,8 +101,7 @@ class udid extends Base
 		if (!isset($_var_3)) {
 			?>            <!--获取udid-->
             <div class="udid-phone visible-xs">
-                <a class="logo"><img src="<?php echo IN_PATH;?>static/index/image/phone-logo.png" alt=""
-                                     class="img-responsive"></a>
+                
                 <div class="warn-prompt"><span class="icon-warn iconfont"></span>请点击右上角按钮，然后在弹出的菜单里，点击Safari中打开。</div>
                 <div class="udid clearfix">
                     <div class="text-center">

source/index/user_cash.php

@@ -312,24 +312,24 @@ class user_cash extends BaseUser
                             <form id="upload" method="post" target="post_frame" enctype="multipart/form-data">
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">可提现金额&nbsp;&nbsp;</label>
-                                        <input type="text" name="max_num" disabled="disabled" id="max_num"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">可提现金额&nbsp;&nbsp;</label>
+                                        <input class="j-label-text" type="text" name="max_num" disabled="disabled" id="max_num"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                value="<?php echo $this->user['promote_money'];?>">
                                     </div>
                                 </div>
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">姓名&nbsp;&nbsp;</label>
-                                        <input type="text"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">姓名&nbsp;&nbsp;</label>
+                                        <input class="j-label-text" type="text"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                placeholder="你的真实姓名(必填)" name="name">
                                     </div>
                                 </div>
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">账号&nbsp;&nbsp;</label>
-                                        <input type="text"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">账号&nbsp;&nbsp;</label>
+                                        <input class="j-label-text" type="text"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                placeholder="银行卡号或支付宝账号(必填)" name="account">
                                     </div>
@@ -337,8 +337,8 @@ class user_cash extends BaseUser
 
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">金额&nbsp;&nbsp;</label>
-                                        <input type="number"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">金额&nbsp;&nbsp;</label>
+                                        <input class="j-label-text-je" type="number"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                                placeholder="(必填)" name="money"
                                                oninput="value=value.replace(/[^\d]/g,'')"
@@ -349,8 +349,8 @@ class user_cash extends BaseUser
 
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">提现方式&nbsp;&nbsp;</label>
-                                        <ul class="clearfix download-way"
+                                        <label class="j-label-open" style="width:100px;text-align:right;">提现方式&nbsp;&nbsp;</label>
+                                        <ul class="clearfix download-way j-label-text-je"
                                             style="width:420px;float:right;margin-right:10px;">
                                             <?php 
 		$active = 'icon-radio-checked';
@@ -379,15 +379,13 @@ class user_cash extends BaseUser
                                 </div>
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">备注&nbsp;&nbsp;</label>
+                                        <label class="j-label-open" style="width:100px;text-align:right;">备注&nbsp;&nbsp;</label>
                                         <textarea name="note" maxlength="50" placeholder="可为空，50个字以内"
-                                                  style="width:420px;padding-left:10px;height:100px;border:1px solid #e0e0e0;"></textarea>
+                                                  class="j-label-text" style="width:420px;padding-left:10px;height:100px;border:1px solid #e0e0e0;"></textarea>
                                     </div>
                                 </div>
                             </form>
-                        </div>
-                        <br><br>
-                        <div class="form-group" style="margin-top:10px;">
+                             <div class="form-group" style="margin-top:10px;">
                             <div class="tipPanel"
                                  style="margin: 10px;padding: 10px;font-size: 14px;border: 1px dotted gray;border-radius: 8px;">
                                 <div class="tipItem" id="codeInfo">
@@ -426,6 +424,8 @@ class user_cash extends BaseUser
                                 </div>
                             </div>
                         </div>
+                        </div>
+                       
                         <div style="text-align:right;margin-top:30px;">
                             <div style="border-top:1px solid #eee;">
                                 <div class="text-right mt30">

source/index/user_promote.php

@@ -453,8 +453,8 @@ class user_promote extends BaseUser
                             <form id="upload" method="post" target="post_frame" enctype="multipart/form-data">
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">用户名&nbsp;&nbsp;</label>
-                                        <input type="text" name="username" placeholder="(必填)" value=""
+                                        <label class="j-label-open" style="width:100px;text-align:right;">用户名&nbsp;&nbsp;</label>
+                                        <input  class="j-label-text" type="text" name="username" placeholder="(必填)" value=""
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                         >
                                     </div>
@@ -462,8 +462,8 @@ class user_promote extends BaseUser
 
                                 <div style="padding-left:30px;">
                                     <div style="margin-top:20px;">
-                                        <label style="width:100px;text-align:right;">登录密码&nbsp;&nbsp;</label>
-                                        <input type="text" placeholder="(必填)" name="password"
+                                        <label  class="j-label-open" style="width:100px;text-align:right;">登录密码&nbsp;&nbsp;</label>
+                                        <input  class="j-label-text" type="text" placeholder="(必填)" name="password"
                                                style="width:420px;padding-left:10px;height:35px;border:1px solid #e0e0e0;"
                                         >
                                     </div>

source/index/webview_index.php

@@ -273,9 +273,9 @@
                                             }
                                             ?>
                                         </div>
-                                        <div class="step2 step-common">
+                                        <div class="step2  step-common">
                                             <div class="form-group clearfix">
-                                                <label class="control-label col-sm-2"><span>*</span>APP图标</label>
+                                                <label class="control-label col-sm-2 "><span>*</span><span class="w500-c15">APP图标</span></label>
                                                 <div class="clearfix col-sm-6">
                                                     <input type="file" id="upload_a_icon" onchange="upload_icon()"
                                                         style="display:none">
@@ -295,7 +295,7 @@
                                                     <div class="img-note fl">
                                                         <div>
                                                             <a class="ms-btn ms-btn-secondary mb5"
-                                                                href="<?php echo IN_PATH; ?>index/icon_make"
+                                                                href="<?php echo IN_PATH; ?>index/icon_make" style="border-radius: 5px;"
                                                                 target="_blank">在线制作图标</a>
                                                             <p>200*200尺寸，圆形或白色背景LOGO<br>PNG格式</p>
                                                         </div>
@@ -303,7 +303,7 @@
                                                 </div>
                                             </div>
                                             <div class="form-group clearfix">
-                                                <label class="control-label col-sm-2"><span>*</span>启动图</label>
+                                                <label class="control-label col-sm-2 w500-c15"><span>*</span><span class="w500-c15">启动图</span></label>
                                                 <div class="clearfix col-sm-6">
                                                     <input type="file" id="upload_l_image"
                                                         onchange="upload_launch()"
@@ -329,33 +329,39 @@
                                                 </div>
                                             </div>
                                             <div class="form-group clearfix">
-                                                <label class="control-label col-sm-2"><span>*</span>显示时间</label>
+                                                <label class="control-label col-sm-2 w500-c15"><span>*</span><span class="w500-c15">显示时间</span></label>
                                                 <div class="col-sm-6">
+                                                     
                                                     <div class="input-text">
-                                                        <label>
+                                                        <label class="radio-container">
                                                             <input type="radio" name="splashTime"
                                                                 value="0" <?php echo $data["config"]["splashTime"] == 0 ? "checked" : ""; ?>>
+                                                                 <span class="radio-custom"></span>
                                                             不显示
                                                         </label>
-                                                        <label>
+                                                        <label class="<?php echo $data["splashTime"] == 1 ? "selon" : ""; ?> radio-container">
 
                                                             <input type="radio" name="splashTime"
                                                                 value="1" <?php echo $data["config"]["splashTime"] == 1 ? "checked" : ""; ?>>
+                                                                <span class="radio-custom"></span>
                                                             1秒
                                                         </label>
-                                                        <label>
+                                                        <label class="<?php echo $data["splashTime"] == 2 ? "selon" : ""; ?> radio-container">
                                                             <input type="radio" class="active" name="splashTime"
                                                                 value="2" <?php echo $data["config"]["splashTime"] == 2 ? "checked" : ""; ?>>
+                                                                <span class="radio-custom"></span>
                                                             2秒
                                                         </label>
-                                                        <label>
+                                                        <label class="<?php echo $data["splashTime"] == 3 ? "selon" : ""; ?> radio-container">
                                                             <input type="radio" name="splashTime"
                                                                 value="3" <?php echo $data["config"]["splashTime"] == 3 ? "checked" : ""; ?>>
+                                                                <span class="radio-custom"></span>
                                                             3秒
                                                         </label>
-                                                        <label>
+                                                        <label class="<?php echo $data["splashTime"] == 41 ? "selon" : ""; ?> radio-container">
                                                             <input type="radio" name="splashTime"
                                                                 value="4" <?php echo $data["config"]["splashTime"] == 4 ? "checked" : ""; ?>>
+                                                                <span class="radio-custom"></span>
                                                             4秒
                                                         </label>
                                                     </div>
@@ -1989,7 +1995,7 @@
                                                                                         data-html="true"
                                                                                         data-container="body"
                                                                                         data-toggle="popover"
-                                                                                        data-placement="right"
+                                                                                        data-placement="bottom"
                                                                                         data-content="&lt;div class=&#39;color-333&#39;&gt;&lt;b&gt;系统分享&lt;/b&gt;：无需申请第三方平台的分享Key，操作简单。&lt;b&gt;&lt;br&gt;APP分享：&lt;/b&gt;需要申请第三方平台的分享Key，操作复杂。暂时只支持微信平台。&lt;br&gt;"
                                                                                         data-original-title=""
                                                                                         title="">两种分享方式的差别</a>
@@ -4085,7 +4091,7 @@
                                             if (!$id) {
                                             ?>
                                                 <div class="common">
-                                                    <div class="tit" style="border: none;padding-bottom: 10px">选择有效期</div>
+                                                    <div class="tit" style="border: none;padding: 0 0 10px">选择有效期</div>
                                                 </div>
                                                 <div class="textggggd">
                                                     <p class="fl"><span id="appNameText"></span> </p>
@@ -4236,7 +4242,7 @@
                                                 </div>
 
                                                 <div class="common">
-                                                    <div class="tit" style="border: none;padding-bottom: 10px">选择支付方式</div>
+                                                    <div class="tit" style="border: none;padding:0 0 10px">选择支付方式</div>
                                                     <a class="ms-btnna ms-btn-secondarya" style="margin-left: 25px; padding: 13px;"><img style="
                                                         display: inline-block;
                                                         margin-right: 10px;" src="/images/icon/setpPay.svg" alt="">余额支付￥<?php echo $this->user["money"]; ?></a>
@@ -4249,7 +4255,7 @@
                                                 </div>
                                                 <div class="common">
                                                     <div class="pay-money" id="price">
-                                                        <div class="money w500-c15">应支付<span class="dangerr">￥<?php echo $IN_WEBVIEWPOINTS[$index]; ?>.00</span></div>
+                                                        <div class="money w500-c15">应支付<span class="dangerr"><span class="money-icon">￥</span><?php echo $IN_WEBVIEWPOINTS[$index]; ?>.00</span></div>
 
                                                     </div>
 

static/index/css/base.css

@@ -1946,7 +1946,7 @@ ul.period li {
 .warn-prompt-wrap1ass {
     width: 1275px;
     height: auto;
-    border: 1px dashed rgba(0,0,0,.5);
+    /* border: 1px dashed rgba(0,0,0,.5); */
     border-radius: 15px;
     margin: 0 auto;
 }

static/index/css/h5.css

@@ -1637,7 +1637,7 @@
 
     .signature1 .left {
         height: auto;
-        padding: 10px 0;
+        /* padding: 10px 0; */
     }
 
     .signature1 .right .app-table {
@@ -2311,7 +2311,7 @@
     }
 
     .release-app2 .aside-right .app-table>tbody>tr>td .download-code {
-        width: 160px;
+        /* width: 160px; */
     }
 
     .app-details .details-bottom {

static/index/css/ly.css

@@ -2,6 +2,15 @@ tr td {
     max-width: 300px !important;
     overflow: hidden;
 }
+tr th {
+    min-width: 80px !important;
+}
+.ell {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    display: inline-block;
+}
 .f16-w500-c151515 {
   font-size: 16px !important;
   font-weight: 500 !important;
@@ -258,6 +267,33 @@ body .price-pay .price-list3 .list3 li {
 .step1 label span {
     float: right;
 }
+.step2 label span {
+    float: right;
+}
+.encapsulation .upload-icon#preview_a_icon{
+    width: 144px;
+    height: 144px;
+    background-position: center 45px;
+}
+.encapsulation .step2 div.img-note{
+    height: 144px;
+}
+.encapsulation .step2 div.img-note1 {
+    height: 282px;
+}
+.encapsulation .upload-img#preview_l_image{
+    width: 174px;
+    height: 282px;
+}
+.encapsulation .upload-icon div.text{
+    margin-top: 100px;
+}
+.encapsulation .upload-img div.text{
+    margin-top: 155px;
+}
+.price-pay .pay-money .money .money-icon {
+    font-size: 14px;
+}
 /* 移动端样式适配 */
 @media (max-width: 767px) {
     .apps-num {
@@ -378,6 +414,7 @@ body .price-pay .price-list3 .list3 li {
     .price-pay .common .list1 .right {
         font-size: .48rem !important;
         padding-left: .32rem !important;
+        padding-top: .07rem !important;
     }
     .price-pay .common .list1 li .left {
         padding-right: .28rem !important;
@@ -397,10 +434,10 @@ body .price-pay .price-list3 .list3 li {
         padding: 0 !important;
     }
     .ms-btn-secondarya {
-        width: 3.8rem;
+        width: 4rem;
         height: 1.2rem;
         margin-left: .4rem !important;
-        padding: .4rem .2rem !important;
+        padding: .2rem !important;
     }
     body .price-pay .common .list3 li {
         width: 1.82rem;
@@ -438,4 +475,22 @@ body .price-pay .price-list3 .list3 li {
     .price-pay .pay-money {
         margin-bottom: 1rem;
     }
+    .plugin-share .app-share .label-wrap a {
+        top: 0 !important;
+    }
+    /* .popover.fade {
+        left: 30px !important;
+    } */
+    /* .popover.fade .arrow{
+        display: none !important;
+    } */
+    .price-pay .pay-money .money .money-icon {
+        font-size: .28rem;
+    }
+    .input-search .super-search {
+        width: 3rem !important;
+    }
+    .super-btn-box .total {
+        float: none;
+    }
 }

static/index/css/main.css

@@ -2296,7 +2296,7 @@ footer {
 }
 
 .price-pay .common .tit {
-    /* padding: 25px 30px 20px; */
+    padding: 25px 30px 20px;
     border-bottom: 1px solid #e5e5e5;
     font-size: 16px !important;
     font-weight: 700 !important;
@@ -2493,7 +2493,7 @@ footer {
 }
 
 .price-pay .pay-money {
-    padding-left: 25px;
+    /* padding-left: 25px; */
     border-top: 1px solid #e5e5e5;
     margin-top: 20px;
     padding-bottom: 40px;
@@ -7057,6 +7057,7 @@ a:hover {
 
 .table-list .app-table .table-btn.color-delete {
     border-color:  #FF7429;
+    color: #FF7429;
     margin-right: 0;
 }
 
@@ -7260,7 +7261,7 @@ a:hover {
 }
 
 .encapsulation3 .plugin-list .col-sm-2 {
-    width: 20%;
+    width: 140px;
     margin-bottom: 20px;
 }
 

static/pack/webview/lib.js

@@ -125,17 +125,17 @@ function next_view() {
     }
     var type = $('input:radio[name=type]:checked').val();
     if (step == 2) {
-        if ($("#preview_a_icon img").length < 1) {
-            alert("请上传应用图标！");
-            return;
-        }
+        // if ($("#preview_a_icon img").length < 1) {
+        //     alert("请上传应用图标！");
+        //     return;
+        // }
 
 
 
-        if ($("#preview_l_image img").length < 1) {
-            alert("请上传启动图片！");
-            return;
-        }
+        // if ($("#preview_l_image img").length < 1) {
+        //     alert("请上传启动图片！");
+        //     return;
+        // }
         step++;
         $('.step' + step).show().siblings('.step-common').hide();
         $('ul.fz-step-box li').eq(step - 1).addClass('active').siblings().removeClass('active')