首頁 探索 說明
登入
cmy
/
distribution
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'dev-ly' into dev-cmn

cmy 2 天之前
父節點
a99e5f268e 3ba5c35c23
當前提交
cd1ec1be8a
共有 13 個文件被更改，包括 71 次插入 和 22 次删除
分割檢視 顯示文件統計
  1. 1 0
      .gitignore
  2. 10 2
      css/jcq.css
  3. 二進制
      data/attachment/o_1j2lo8oc511q81535q6q1qqr1fod9.apk
  4. 二進制
      data/attachment/o_1j2loge1371f1i4ovupulh8p9.apk
  5. 3 1
      source/index/jiexi.php
  6. 6 1
      source/index/publish_detail.php
  7. 16 11
      source/index/publish_statistics.php
  8. 1 1
      source/index/super_cert.php
  9. 2 2
      source/index/super_code.php
  10. 1 1
      source/index/webview_index.php
  11. 1 1
      static/index/css/header.css
  12. 24 0
      static/index/css/ly.css
  13. 6 2
      static/index/js/js.js

+ 1 - 0
.gitignore
查看文件 

@@ -8,3 +8,4 @@ phpmailer
 
 cos-sdk-v5
 
 polyfill-intl-idn
 
 think-orm
 
+*.ipa

+ 10 - 2
css/jcq.css
查看文件 

@@ -507,6 +507,7 @@
 
 
 .table_top.clearfix.j-top a:last-child {
 
     border-right: none;
 
+    margin-left: 0px;
 
 }
 
 
 .table_top.clearfix.j-top p {
 
@@ -568,6 +569,7 @@
 
 
 .j-top-wrap dl.clearfix .ms-btn.ms-btn-primary.mt3.w60 {
 
     margin-left: 20px;
 
+
 
 }
 
 
 .j-top-title,
 
@@ -605,8 +607,12 @@
 
     float: left;
 
 }
 
 
+
 
 /* 移动端适配 */
 
 @media (max-width: 767px) {
 
+    .cleanUp{
 
+        margin-top: .2rem;
 
+    }
 
     .form-group .input-text.radio{
 
         min-width: 180px;
 
         width: auto;
 
@@ -626,9 +632,11 @@
 
         padding: .1rem .4rem;
 
         width: auto;
 
     }
 
+        .j-top-wrap dl.clearfix .ms-btn.ms-btn-primary.mt3.w60{
 
+            margin-left: 0;
 
+        }
 
 
     .j-goumai {
 
-        position: absolute;
 
         top: .48rem;
 
         right: 0px;
 
     }
 
@@ -884,7 +892,7 @@
 
     }
 
 
     .table_top.clearfix.j-top a:nth-last-child(-n+2) {
 
-        margin-bottom: 0;
 
+        /* margin-bottom: 0; */
 
     }
 
 
     .table_top.clearfix.j-top p.b-num {

二進制
data/attachment/o_1j2lo8oc511q81535q6q1qqr1fod9.apk
查看文件


二進制
data/attachment/o_1j2loge1371f1i4ovupulh8p9.apk
查看文件


+ 3 - 1
source/index/jiexi.php
查看文件 

@@ -83,6 +83,8 @@ class jiexi extends Base
 
 footer {
 
     position: fixed;
 
     bottom: 0;
 
+    left: 0;
 
+    right: 0;
 
 }
 
 @media (max-width: 767px) {
 
     footer {
 
@@ -117,7 +119,7 @@ footer {
 
 		?>  
 
 
-        <div class="generate_qrcode_box tab-content clearfix">
 
+        <div class="generate_qrcode_box tab-content clearfix j-box-qrcode">
 
     <div id="decode_box">
 
     	<div class="col-md-6 decode_upload_box clearfix">
 
     		<div class="decode_upload_left">

+ 6 - 1
source/index/publish_detail.php
查看文件 

@@ -34,6 +34,11 @@ class publish_detail extends BaseUser
 
             $this->static_();
 
             ?>
 
             <link rel="stylesheet" href="/static/index/css/apps-detail.css" />
 
+            <style>
 
+                .app-details{
 
+                    min-height:auto;
 
+                }
 
+            </style>
 
         </head>
 
 
         <body>
 
@@ -344,7 +349,7 @@ class publish_detail extends BaseUser
 
                                             </div>
 
                                         </div>
 
                                         <!-- 应用版本  基本设置  高级设置  模板设置  下载明细 -->
 
-                                        <div class="tabs">
 
+                                        <div class="tabs" style="background: #fff;">
 
                                             <ul class="nav nav-tabs" role="tablist">
 
                                                 <li role="presentation" class="<?php echo ($tab == 'version') ? 'active' : ''; ?>">
 
                                                     <a href="?id=<?php echo bees_encrypt($id); ?>&tab=version" aria-controls="tab-version" role="tab">应用版本</a>

+ 16 - 11
source/index/publish_statistics.php
查看文件 

@@ -45,6 +45,11 @@ class publish_statistics extends BaseUser
 
     <?php 
         $this->static_();
 
         ?>
 
+        
+        <link rel="stylesheet" href="/css/jcq.css">
 
+        <style>
 
+       
+        </style>
 
 </head>
 
 
 <body>
 
@@ -70,15 +75,15 @@ class publish_statistics extends BaseUser
 
                         $this->publish_app_list();
 
                     ?>
 
                     <div class="col-sm-10">
 
-                        <div class="aside-right">
 
+                        <div class="aside-right ">
 
                             <div class="app-details app-details2">
 
                                 <?php 
                                     $this->publish_top($row);
 
                                     ?>
 
                                 <hr>
 
-                                <div class="download-details">
 
-                                    <div class="d-top clearfix">
 
-                                        <div class="date date1">
 
+                                <div class="download-details" style="padding: 0 20px;">
 
+                                    <div class="d-top clearfix" style="margin-top: 10px;">
 
+                                        <div class="date date1 fl" style="position: relative; ">
 
                                             <input class="form-control" type="text" id="datetimepicker1" value="<?php 
                                                 if (empty($start_date)) {
 
                                                     ?><?php echo date(" Y/m/d", strtotime(date("Y/m/d") . '-1 week' ));?>
 
@@ -89,12 +94,12 @@ class publish_statistics extends BaseUser
 
                                                 <?php 
                                                 }
 
                                                 ?>">
 
-                                            <span class="iconfont icon-date"></span>
 
+                                            <span class="iconfont icon-date" style="position: absolute; right: 10px; top: 50%; transform: translateY(-50%);"></span>
 
                                         </div>
 
                                         <div class="fl line">
 
                                             _
 
                                         </div>
 
-                                        <div class="date date2">
 
+                                        <div class="date date2 fl" style="position: relative;">
 
                                             <input class="form-control" type="text" id="datetimepicker2" value="<?php 
                                                 if (empty($end_date)) {
 
                                                     ?><?php echo date(" Y/m/d");?>
 
@@ -105,18 +110,18 @@ class publish_statistics extends BaseUser
 
                                                 <?php 
                                                 }
 
                                                 ?>">
 
-                                            <span class="iconfont icon-date"></span>
 
+                                            <span class="iconfont icon-date" style="position: absolute; right: 10px; top: 50%; transform: translateY(-50%);"></span>
 
                                         </div>
 
-                                        <button type="button" class="ms-btn ms-btn-secondary fl query">查询</button>
 
-                                        <span class="fl num">累计总下载 <i>
 
+                                        <button type="button" class="ms-btn ms-btn-secondary fl query" style="margin-left: 10px;">查询</button>
 
+                                        <span class="fl num" style="margin-left: 10px; line-height: 34px;">累计总下载 <i>
 
                                                 <?php echo $row['in_downloads'];?>
 
                                             </i> 次</span>
 
                                         <button type="button" class="ms-btn ms-btn-secondary fr cleanUp"
 
                                             data-app-id="<?php echo bees_encrypt($row['in_id']);?>">清空统计数据
 
                                         </button>
 
                                     </div>
 
-                                    <div class="table-responsive">
 
-                                        <table class="table">
 
+                                    <div class="table-responsive" style="margin-top: 10px;">
 
+                                        <table class="table app-table">
 
                                             <tr>
 
                                                 <th>时间</th>
 
                                                 <th>应用名称</th>

+ 1 - 1
source/index/super_cert.php
查看文件 

@@ -326,7 +326,7 @@ class super_cert extends BaseUser
 
                                     </button>
 
                                     <input type="hidden" name="user_id"
 
                                             value="<?php echo $_COOKIE["in_userid"];?>"/>
 
-                                    <button type="button" class="btn btn-primary" onclick="addCert()">
 
+                                    <button type="button" class="btn btn-primary" onclick="addCert()" style="background:#157df1;">
 
                                         立即添加
 
                                     </button>
 
                                 </div>

+ 2 - 2
source/index/super_code.php
查看文件 

@@ -417,7 +417,7 @@ class super_code extends BaseUser
 
                                             aria-label="Close"
 
                                             onclick="$('#vipkeySC').toggle();">取消
 
                                     </button>
 
-                                    <button type="button" class="btn btn-primary" onclick="produce()">生成</button>
 
+                                    <button type="button" class="btn btn-primary" style="background:#157df1" onclick="produce()">生成</button>
 
                                 </div>
 
                             </div>
 
                         </div>
 
@@ -509,7 +509,7 @@ class super_code extends BaseUser
 
                             $('.modal-title').html('生成结果');
 
                             $('#modal_body').html('<textarea id="copybox" rows="8">' + ret.data.codes + '</textarea>' +
 
                                 '<div style="text-align: center;padding-top: 15px">' +
 
-                                '<button type="button" class="btn btn-primary copy-btn"  data-clipboard-action="copy" data-clipboard-target="#copybox">复制</button>' +
 
+                                '<button type="button" class="btn btn-primary copy-btn"  style="background:#157df1" data-clipboard-action="copy" data-clipboard-target="#copybox">复制</button>' +
 
                                 '<button type="button" class="btn btn-default" data-dismiss="modal" aria-label="Close" onclick="location.reload()">关闭</button></div>');
 
                         } else {

+ 1 - 1
source/index/webview_index.php
查看文件 

@@ -4275,7 +4275,7 @@
 
                                                         onclick="prev_view();">
 
                                                         上一步
 
                                                     </button>
 
-                                                    <button class="ms-btn ms-btn-primary btn-20-7-radio4 ng-binding h-100" type="button"
 
+                                                    <button class="ms-btn ms-btn-primary btn-20-7-radio4 ng-binding h-100 " type="button"
 
                                                         id="web_view_btn"
 
                                                         onclick="next_view();">
 
                                                         下一步

+ 1 - 1
static/index/css/header.css
查看文件 

@@ -3,7 +3,7 @@ header a {
 
 }
 
 
 .ms-badge12 {
 
-    /* width: 50px; */
 
+    width: auto;
 
     padding: 0 20px;
 
     line-height: 32px;
 
     display: inline-block;

+ 24 - 0
static/index/css/ly.css
查看文件 

@@ -294,8 +294,24 @@ body .price-pay .price-list3 .list3 li {
 
 .price-pay .pay-money .money .money-icon {
 
     font-size: 14px;
 
 }
 
+.generate_qrcode_box{
 
+    margin: 0 auto;
 
+    
+}
 
+.j-box-qrcode{
 
+    width: 1200px;
 
+}
 
 /* 移动端样式适配 */
 
 @media (max-width: 767px) {
 
+    .table-responsive{
 
+        border: none;
 
+    }
 
+        .app-details .my-apps-detail-top .information dd{
 
+            width: 4.2rem;
 
+        }
 
+    .encapsulation .step2 div.img-note{
 
+        width: 29vw;
 
+    }
 
     .apps-num {
 
         font-size: .48rem !important;
 
     }
 
@@ -510,4 +526,12 @@ body .price-pay .price-list3 .list3 li {
 
     #decode_box .decode_results_textarea {
 
         width: 80%;
 
     }
 
+    .generate_qrcode_box .roww {
 
+        margin-right: 0 !important;
 
+
 
+    }
 
+    .col-md-32 {
 
+        width: auto !important;
 
+        float: none !important;
 
+    }
 
 }

+ 6 - 2
static/index/js/js.js
查看文件 

@@ -1466,9 +1466,13 @@ $(function () {
 
     setRem();
 
     $(window).resize(setRem);
 
 
-    $("[data-toggle='tooltip']").tooltip();
 
+    try {
 
+       $("[data-toggle='tooltip']").tooltip();
 
+       $("[data-toggle='popover']").popover();
 
+    } catch (e) {
 
+        console.error(e);
 
+    }
 
 
-    $("[data-toggle='popover']").popover();
 
 
     // 返回顶部
 
     $(window).scroll(function () {