Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

5 years ago · 01dfe50442
parent 3092dcb237 2d1d850468
commit 01dfe50442
9 changed files with 159 additions and 146 deletions
--- a/Application/Admin/Event/UserEvent.class.php
+++ b/Application/Admin/Event/UserEvent.class.php
@ -157,7 +157,7 @@ class UserEvent extends BaseEvent {
        }


-				if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
+        if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 50;}

        //读取模型数据列表
        $name = $model['m_name'];
@ -175,7 +175,22 @@ class UserEvent extends BaseEvent {
            ->page($page, $row)
            /* 执行查询 */
            ->select();
-            $count=count($data);
+
+        $count = M($name,"tab_")
+            ->field($model['fields'])
+            ->join($model['join'])
+            ->join($model['joins'])
+            ->join($model['joinss'])
+            // 查询条件
+            ->where($model['map'])
+            /* 默认通过id逆序排列 */
+            ->order($model['order'])
+            ->group($model['group'])
+            /* 数据分页 */
+            /* 执行查询 */
+            ->count();
+
+        //$count=count($data);
        //分页

        $page = set_pagination($count,$row);
@ -188,10 +203,10 @@ class UserEvent extends BaseEvent {
            $this->assign('userarpu_order_type',$data_order_type);
        }
        $data=my_sort($data,$data_order_type,(int)$data_order);
-        $size=$row;//每页显示的记录数
-        $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
+        //$size=$row;//每页显示的记录数
+        //$pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
        //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度)
-        $data = array_slice($data, ($arraypage-1)*$size, $size);
+        //$data = array_slice($data, ($arraypage-1)*$size, $size);
        $this->assign('model', $model);
        $this->assign('list_data', $data);
        $this->meta_title = $model['title'].'列表';
--- a/Application/Base/Repository/SpendRepository.class.php
+++ b/Application/Base/Repository/SpendRepository.class.php
@ -34,14 +34,14 @@ class SpendRepository
        $gameIds = $params['game_ids'] ?? [];

        $conditions = [];
-        $conditions['pay_status'] = 1;
        $conditions['promote_id'] = ['in', $ids];
-        $conditions['pay_time'] = ['between', [$beginTime, $endTime]];
        $conditions['game_id'] = ['in', $gameIds];
-        $conditions['pay_way'] = $isBan ? ['neq', '-10'] : ['neq', '-1'];
        if (!empty($params['server_id'])) {
            $conditions['server_id'] = $params['server_id'];
        }
+        $conditions['pay_way'] = $isBan ? ['neq', '-10'] : ['neq', '-1'];
+        $conditions['pay_status'] = 1;
+        $conditions['pay_time'] = ['between', [$beginTime, $endTime]];

        return $conditions;
    }
@ -56,7 +56,6 @@ class SpendRepository
        $conditions = [];
        $conditions['pay_status'] = 1;
        $conditions['promote_id'] = ['in', $ids];
-        $conditions['pay_time'] = ['between', [$beginTime, $endTime]];
        $conditions['game_id'] = ['in', $gameIds];
        if (!empty($params['server_id'])) {
            $conditions['server_id'] = $params['server_id'];
@ -64,6 +63,7 @@ class SpendRepository
        if (isset($params['pay_way'])) {
            $conditions['pay_way'] = $params['pay_way'];
        }
+        $conditions['pay_time'] = ['between', [$beginTime, $endTime]];

        return $conditions;
    }
--- a/Application/Base/Repository/UserRepository.class.php
+++ b/Application/Base/Repository/UserRepository.class.php
@ -65,13 +65,13 @@ class UserRepository

        $conditions = [];
        $conditions['promote_id'] = ['in', $ids];
-        $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];
        if (!empty($gameIds)) {
            $conditions['game_id'] = ['in', $gameIds];
            if (!empty($params['server_id'])) {
                $conditions['server_id'] = $params['server_id'];
            }
        }
+        $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];

        return $conditions;
    }
@ -107,11 +107,11 @@ class UserRepository

        $conditions = [];
        $conditions['promote_id'] = ['in', $ids];
-        $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];
        $conditions['game_id'] = ['in', $gameIds];
        if ($serverId > 0) {
            $conditions['server_id'] = $serverId;
        }
+        $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];

        return $conditions;
    }
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@ -1316,10 +1316,7 @@ class QueryController extends BaseController
        $allData['spend_voucher'] = 0;
        if (!empty($data)) {
            if (intval($endTime - $begTime) / (24 * 3600) <= 31) {
-                $gameIds = [];
-                foreach ($data as $list) {
-                    $gameIds[] = $list['game_id'];
-                }
+                $gameIds = array_column($data, 'game_id');
                $params['game_ids'] = $gameIds;

                $userRepository = new UserRepository();
@ -1856,7 +1853,7 @@ class QueryController extends BaseController
        $records = [];
        foreach ($roles as $role) {
            $records[] = [
-                'user_account' => $role['user_account'],
+                'user_account' => encryption($role['user_account']),
                'game_name' => $role['game_name'],
                'role_name' => $role['role_name'],
                'role_id' => $role['role_id'],
--- a/Application/Media/View/default/Article/article/detail1.html
+++ b/Application/Media/View/default/Article/article/detail1.html
@ -63,13 +63,12 @@

 	<div class="service_swiper">
 		<img src="__IMG__/lunbo3.png" alt="">
-		<a href="{:U('Index/index')}" style="z-index: 9999" id="back_to_index" class="back_to_index">
-			<img src="__IMG__/black.png" alt=""></a>
 	</div>
+	<a href="{:U('Index/index')}" style="z-index: 9999" id="back_to_index" class="back_to_index"><img src="__IMG__/black.png" alt=""></a>
 	<div class="service_info">
 		<div class="service_left">
 			<div class="list">
-				<li class="selected" >监护工程概述</li>
+				<li class="selected"  onclick="javascript:void (alert('123'))">监护工程概述</li>
 				<li class="" >申请服务流程</li>
 				<li class="" >监护工程概述</li>
 				<li class="" >健康提示</li>
@ -259,19 +258,18 @@
 	<script src="__JS__/service.js"></script>
 	<script type="text/javascript">

+		// jQuery("#header_1_p").slide({
+		// 	type:"menu",// 效果类型,针对菜单/导航而引入的参数(默认slide)
+		// 	titCell:".nLi", //鼠标触发对象
+		// 	targetCell:".sub", //titCell里面包含的要显示/消失的对象
+		// 	effect:"slideDown", //targetCell下拉效果
+		// 	delayTime:300 , //效果时间
+		// 	triggerTime:0, //鼠标延迟触发时间(默认150)
+		// 	returnDefault:true //鼠标移走后返回默认状态,例如默认频道是"预告片",鼠标移走后会返回"预告片"(默认false)
+		// });

-// jQuery("#header_1_p").slide({
-// 	type:"menu",// 效果类型,针对菜单/导航而引入的参数(默认slide)
-// 	titCell:".nLi", //鼠标触发对象
-// 	targetCell:".sub", //titCell里面包含的要显示/消失的对象
-// 	effect:"slideDown", //targetCell下拉效果
-// 	delayTime:300 , //效果时间
-// 	triggerTime:0, //鼠标延迟触发时间(默认150)
-// 	returnDefault:true //鼠标移走后返回默认状态,例如默认频道是"预告片",鼠标移走后会返回"预告片"(默认false)
-// });
-
-//添加收藏夹
-function addBookmark(url,title){
+		//添加收藏夹
+		function addBookmark(url,title){
 			url = url || window.location.href;;
 			title = title || document.title;
 			if (window.sidebar) {
@ -282,9 +280,9 @@ function addBookmark(url,title){
 				alert('加入收藏失败，请使用 Ctrl+D 进行添加');
 				return true;
 			}
-}
-$(".collect").click(function(){addBookmark();})
-$(function(){
+		}
+		$(".collect").click(function(){addBookmark();})
+		$(function(){
 			setTimeout(function(){
 				jQuery(".sideMenu").slide({
 					titCell:"h3", //鼠标触发对象
@ -321,10 +319,10 @@ $(function(){
 			});


-});
+		});

-</script>
-<script>
+	</script>
+	<script>
 		$('.tab_head ul li').click(function(){
 			var that = $(this);
 			that.siblings('li').removeClass('current');
--- a/Application/Media/View/default/Public/base.html
+++ b/Application/Media/View/default/Public/base.html
@ -90,7 +90,7 @@

 <script type="text/javascript" src="__JS__/jquery.zclip.js"></script>
 <script type="text/javascript" src="__JS__/get_cdk_index.js"></script>
-<script type="text/javascript" src="__JS__/main.js"></script>
+<!--<script type="text/javascript" src="__JS__/main.js"></script>-->
 </head>
 <body>

--- a/Public/Media/css/heard.css
+++ b/Public/Media/css/heard.css
@ -19,6 +19,7 @@
 }
 .heard_tabbar ul{
    display: flex;
+    align-items: center;
    font-size: 0.24rem;
    color: #5B5B5B;
    margin-top: 0.54rem;
--- a/Public/Media/css/supervise.css
+++ b/Public/Media/css/supervise.css
@ -2,6 +2,7 @@
    width: 100%;
    height: 8rem;
    position: relative;
+    z-index: -1;
 }
 .service_swiper>img:first-child{
    width: 100%;
@ -9,7 +10,7 @@
    position: relative;
    z-index: -1;
 }
-.service_swiper>a{
+.back_to_index{
    position: absolute;
    width: 1.20rem;
    height: 0.4rem;
@ -18,7 +19,7 @@
    font-size: 0.2rem;
    cursor: pointer;
 }
-.service_swiper> a img{
+.back_to_index img{
    width: 100%;
    height: 100%;
 }
--- a/Public/Mobile/js/home.js
+++ b/Public/Mobile/js/home.js
@ -1,16 +1,17 @@
 $(function(){
- 
+    var img = $(".swiper-container .swiper-slide").length;
    var swiper = new Swiper('.swiper-container', {
        loop: true,
        pagination: {
        el: '.swiper-pagination',
        clickable: true,
        },
-        autoplay: {
+        /*autoplay: {
            delay: 3000,
            stopOnLastSlide: false,
            disableOnInteraction: false,
-        },
+        },*/
+        autoplay: img > 1,
  });
  
 });