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

fix：bugs

luoy 1 天之前
父節點
176573b8e1
當前提交
a3062678b3
共有 7 個文件被更改，包括 25 次插入 和 15 次删除
統一視圖 顯示文件統計
  1. 1 0
      .gitignore
  2. 8 2
      source/index/apps.php
  3. 4 3
      source/index/combine.php
  4. 4 4
      source/index/public/header.php
  5. 4 3
      source/index/webview2.php
  6. 1 1
      static/index/css/ly.css
  7. 3 2
      static/index/css/main.css

+ 1 - 0
.gitignore
查看文件 

@@ -11,3 +11,4 @@ think-orm
 
 *.ipa
 
 *.ipa
 
 data/attachment/o_1j35b8fk5psa1qv5198aice1dlr9.apk
 
 data/attachment/o_1j35b8fk5psa1qv5198aice1dlr9.apk
 
 data/attachment/o_1j35o54p88s1cjcg1a16gted99.apk
 
 data/attachment/o_1j35o54p88s1cjcg1a16gted99.apk
 
+data/attachment/

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

@@ -399,11 +399,17 @@ class apps extends BaseUser
 
                                                                 ?> <?php
 
                                                                 ?> <?php
 
             if ($this->action == "apps") {
 
             if ($this->action == "apps") {
 
             ?> <th>下载次数</th>
 
             ?> <th>下载次数</th>
 
-                                                                    <th>下载扣除<span data-container="body"
 
+                                                                    <th>下载扣除
 
+                                                                        <!-- <span data-container="body"
 
                                                                             data-toggle="popover"
 
                                                                             data-toggle="popover"
 
                                                                             data-placement="top" data-trigger="hover"
 
                                                                             data-placement="top" data-trigger="hover"
 
                                                                             data-html="true"
 
                                                                             data-html="true"
 
-                                                                            data-content="<?php echo $_var_19; ?>">？</span>
 
+                                                                            data-content="<?php echo $_var_19; ?>">？</span> -->
 
+                                                                            <img src="/images/icon/Vector.svg"
 
+                                                                            style="margin-top: -3px;"
 
+                                                                            data-container="body" 
+                                                                            data-toggle="popover" data-placement="top" data-trigger="hover" 
+                                                                            data-html="true" data-content="<?php echo $_var_19; ?>" data-original-title="" title="">
 
                                                                     </th>
 
                                                                     </th>
 
                                                                 <?php
 
                                                                 <?php
 
                                                             }
 
                                                             }

+ 4 - 3
source/index/combine.php
查看文件 

@@ -23,6 +23,7 @@ class combine extends BaseUser
 
         // 使用分页查询
 
         // 使用分页查询
 
         $result = db("combine")->where("userid", $this->userid)->order("id desc")->paginate(["page" => $page, 'list_rows' => 5]);
 
         $result = db("combine")->where("userid", $this->userid)->order("id desc")->paginate(["page" => $page, 'list_rows' => 5]);
 
         $count = $result->total();
 
         $count = $result->total();
 
+				$this -> action = 'apps'
 
 ?>
 
 ?>
 
         <!DOCTYPE html>
 
         <!DOCTYPE html>
 
         <html lang="zh-cn">
 
         <html lang="zh-cn">
 
@@ -699,7 +700,7 @@ class combine extends BaseUser
 
 																	<td><div style="min-width: 135px;"><?php echo date('Y-m-d H:i:s', $item['ctime']); ?></div></td>
 
 																	<td><div style="min-width: 135px;"><?php echo date('Y-m-d H:i:s', $item['ctime']); ?></div></td>
 
 																	<td>
 
 																	<td>
 
 																		<!-- <div><a href="<?php echo $item['link']; ?>" target="_blank" class="btn-detail">查看</a></div> -->
 
 																		<!-- <div><a href="<?php echo $item['link']; ?>" target="_blank" class="btn-detail">查看</a></div> -->
 
-																		<div><a href="#" class="btn-del btn-detail" data-id="<?php echo htmlspecialchars($item['id']); ?>">删除</a></div>
 
+																		<div><a href="#" style="color: #FF7429;border-color:#FF7429" class="btn-del app-bloder-btn" data-id="<?php echo htmlspecialchars($item['id']); ?>">删除</a></div>
 
 																	</td>
 
 																	</td>
 
 																</tr>
 
 																</tr>
 
 																<?php endforeach; ?>
 
 																<?php endforeach; ?>
 
@@ -710,7 +711,7 @@ class combine extends BaseUser
 
 															<?php endif; ?>
 
 															<?php endif; ?>
 
 														</tbody>
 
 														</tbody>
 
 													</table>
 
 													</table>
 
-													<?php 
+													<!-- <?php 
 													if ($count == 0) {
 
 													if ($count == 0) {
 
 													?>
 
 													?>
 
 													<div class="text-center no-content">
 
 													<div class="text-center no-content">
 
@@ -721,7 +722,7 @@ class combine extends BaseUser
 
 													</div>
 
 													</div>
 
 													<?php 
 													<?php 
 													}
 
 													}
 
-													?>
 
+													?> -->
 
 												</div>
 
 												</div>
 
 												<div class="pagination-box">
 
 												<div class="pagination-box">
 
 													<?php echo getRender($result, $page); ?>
 
 													<?php echo getRender($result, $page); ?>

+ 4 - 4
source/index/public/header.php
查看文件 

@@ -146,16 +146,16 @@ document.addEventListener('DOMContentLoaded', () => {
 
                                         <!--用户等级-->
 
                                         <!--用户等级-->
 
                                         <div class="yes" style="/*display: none;*/">
 
                                         <div class="yes" style="/*display: none;*/">
 
                                             <?php if ($this->user['in_svip'] == 0) { ?>
 
                                             <?php if ($this->user['in_svip'] == 0) { ?>
 
-                                                <div class="y-tit">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;体验会员</div>
 
+                                                <div class="y-tit">体验会员</div>
 
                                             <?php } ?>
 
                                             <?php } ?>
 
                                             <?php if ($this->user['in_svip'] == 1) { ?>
 
                                             <?php if ($this->user['in_svip'] == 1) { ?>
 
-                                                <div class="y-tit">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;初级会员</div>
 
+                                                <div class="y-tit">初级会员</div>
 
                                             <?php } ?>
 
                                             <?php } ?>
 
                                             <?php if ($this->user['in_svip'] == 2) { ?>
 
                                             <?php if ($this->user['in_svip'] == 2) { ?>
 
-                                                <div class="y-tit">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;中级会员</div>
 
+                                                <div class="y-tit">中级会员</div>
 
                                             <?php } ?>
 
                                             <?php } ?>
 
                                             <?php if ($this->user['in_svip'] == 3) { ?>
 
                                             <?php if ($this->user['in_svip'] == 3) { ?>
 
-                                                <div class="y-tit">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;高级会员</div>
 
+                                                <div class="y-tit">高级会员</div>
 
                                             <?php } ?>
 
                                             <?php } ?>
 
                                             <?php if ($this->user['in_svip'] != 0) { ?>
 
                                             <?php if ($this->user['in_svip'] != 0) { ?>

+ 4 - 3
source/index/webview2.php
查看文件 

@@ -345,7 +345,7 @@ class webview2 extends BaseUser
 
                                                                 $(this).addClass('active').siblings().removeClass('active');
 
                                                                 $(this).addClass('active').siblings().removeClass('active');
 
                                                                 $('ul.period>li .icon-radio').removeClass('icon-radio-checked');
 
                                                                 $('ul.period>li .icon-radio').removeClass('icon-radio-checked');
 
                                                                 $(this).find('.icon-radio').addClass('icon-radio-checked');
 
                                                                 $(this).find('.icon-radio').addClass('icon-radio-checked');
 
-                                                                $('#price').html('<b class="color-danger">' + $(this).attr('data-price') + '</b>元');
 
+                                                                $('#price').html('<b class="color-danger">￥' + $(this).attr('data-price') + '</b>元');
 
                                                             });
 
                                                             });
 
                                                         </script>
 
                                                         </script>
 
                                                     </div>
 
                                                     </div>
 
@@ -353,9 +353,10 @@ class webview2 extends BaseUser
 
                                                 
                                                 
                                                 <!-- 收费标准 -->
 
                                                 <!-- 收费标准 -->
 
                                                 <div class="form-group clearfix">
 
                                                 <div class="form-group clearfix">
 
+                                                    <div class="fl" style="color:#000000; font-weight: 500;margin-right: -15px;">应支付</div>          
                                                     <div class="col-sm-2 col-xs-4 pay-num" id="price">
 
                                                     <div class="col-sm-2 col-xs-4 pay-num" id="price">
 
-                                                        <div class="fl" style="color:#000000; font-weight: 500;">应支付</div>
 
-                                                        <b class="color-danger"><span>￥</span><?php echo $_var_6[$_var_9]; ?></b>
 
+                                                        <b class="color-danger">￥<?php echo $_var_6[$_var_9]; ?></b>
 
+                                                        元
 
                                                     </div>
 
                                                     </div>
 
                                                     <div class="col-sm-2 col-xs-4">
 
                                                     <div class="col-sm-2 col-xs-4">
 
                                                         <a class="ms-btn ms-btn-secondary" href="<?php echo IN_PATH; ?>index/item_price" target="_blank">充值购买</a>
 
                                                         <a class="ms-btn ms-btn-secondary" href="<?php echo IN_PATH; ?>index/item_price" target="_blank">充值购买</a>

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

@@ -683,6 +683,6 @@ body .price-pay .price-list3 .list3 li {
 
     overflow-y: scroll;
 
     overflow-y: scroll;
 
 }
 
 }
 
 
 
-.crumbs {
 
+.crumbs  a {
 
     pointer-events: none;
 
     pointer-events: none;
 
 }
 
 }

+ 3 - 2
static/index/css/main.css
查看文件 

@@ -674,12 +674,13 @@ header {
 
 
 
 .header .login-in .n-drop-down .n-con .yes {
 
 .header .login-in .n-drop-down .n-con .yes {
 
     max-height: 330px;
 
     max-height: 330px;
 
-    padding: 15px
 
+    padding: 15px 0;
 
 }
 
 }
 
 
 
 .header .login-in .n-drop-down .n-con .y-tit {
 
 .header .login-in .n-drop-down .n-con .y-tit {
 
     color: #666;
 
     color: #666;
 
-    margin-bottom: 10px
 
+    margin-bottom: 10px;
 
+    text-align: center;
 
 }
 
 }
 
 
 
 .header .login-in .n-drop-down .n-con .msg-list {
 
 .header .login-in .n-drop-down .n-con .msg-list {