From f00924339976877ea33373d1208a58cc8ff54c4e Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 5 Dec 2019 17:07:50 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=AE=98=E7=BD=91=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Ssg/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/View/Ssg/login.html b/Application/Mobile/View/Ssg/login.html index 645cc3b28..7f396c1bb 100644 --- a/Application/Mobile/View/Ssg/login.html +++ b/Application/Mobile/View/Ssg/login.html @@ -366,7 +366,7 @@ var PhoneObj = { alert(result.ResultMsg); GetVerityCode(); } else { - if (gameId) { + if (gameId>0) { window.location.href = "/mobile.php?s=/Ssg/pay/game_id/"+gameId+".html" } else { window.location.href = "/mobile.php?s=/Ssg/index.html" From 6b13ab0c66acfbb0002596669bc5153834a67e34 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Thu, 5 Dec 2019 17:13:21 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=8B=9B=E5=95=86=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=95=86=E5=8A=A1=E5=90=88=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Index/business.html | 2 +- Application/Mobile/View/Index/index.html | 2 +- Application/Mobile/View/Index/introduce.html | 2 +- Application/Mobile/View/User/index.html | 2 +- Application/Mobile/View/User/login.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Mobile/View/Index/business.html b/Application/Mobile/View/Index/business.html index d00a386ef..38b27a6a9 100644 --- a/Application/Mobile/View/Index/business.html +++ b/Application/Mobile/View/Index/business.html @@ -61,7 +61,7 @@
- 招商合作 + 商务合作
diff --git a/Application/Mobile/View/Index/index.html b/Application/Mobile/View/Index/index.html index c676b03d9..919e99bee 100644 --- a/Application/Mobile/View/Index/index.html +++ b/Application/Mobile/View/Index/index.html @@ -71,7 +71,7 @@
- 招商合作 + 商务合作
diff --git a/Application/Mobile/View/Index/introduce.html b/Application/Mobile/View/Index/introduce.html index b30913d8a..dbe3a5b6a 100644 --- a/Application/Mobile/View/Index/introduce.html +++ b/Application/Mobile/View/Index/introduce.html @@ -46,7 +46,7 @@
- 招商合作 + 商务合作
diff --git a/Application/Mobile/View/User/index.html b/Application/Mobile/View/User/index.html index 846c51f04..7eb0bd4eb 100644 --- a/Application/Mobile/View/User/index.html +++ b/Application/Mobile/View/User/index.html @@ -76,7 +76,7 @@
- 招商合作 + 商务合作
diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html index 55080ffd7..52e38600a 100644 --- a/Application/Mobile/View/User/login.html +++ b/Application/Mobile/View/User/login.html @@ -59,7 +59,7 @@
- 招商合作 + 商务合作
From 0c3225a9bcf9c20489b4a630e62440d89e42f918 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Thu, 5 Dec 2019 17:28:04 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E3=80=90=E5=AE=B6=E9=95=BF=E7=9B=91?= =?UTF-8?q?=E6=8A=A4=E3=80=91=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BB=8B=E7=BB=8D=E8=AF=A6=E7=BB=86=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Article/article/detail1.html | 4 ++-- Application/Mobile/View/Index/business.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Media/View/default/Article/article/detail1.html b/Application/Media/View/default/Article/article/detail1.html index c45f8f2a6..b32639c92 100644 --- a/Application/Media/View/default/Article/article/detail1.html +++ b/Application/Media/View/default/Article/article/detail1.html @@ -70,7 +70,7 @@
  • 监护工程概述
  • 申请服务流程
    • -
  • 监护工程概述
    • +
  • 介绍详细说明
  • 健康提示
  • 纠纷处理
    • @@ -121,7 +121,7 @@
    -
    监护工程概述
    +
    介绍详细说明

    网络游戏未成年人家长监护工程”是一项由文化部指导，义乌市其豪网络科技有限公司旨在加强家长对未成年人参与网络游戏的监护，引导未成年人健康、绿色参与网络游戏，和谐家庭关系的行业自律行动。

    2010年2月5日，首批试点的六家企业共同启动“监护工程”，开始了游戏企业与未成年人家长联合共同预防未成年人沉迷网络游戏的有益尝试。实践中一些成功的案例让我们看到 “监护工程”提供了一种切实可行的方法，一种家长实施监控的管道，使家长纠正部分未成年子女沉迷网游成为可能。

    “监护工程”引导家长和未成年人正确面对网络游戏文化，加强相互沟通，在共同约定和认可的时间或规则下健康游戏，既保护了未成年人不受过度沉迷的伤害，也为家长指导未成年人健康游戏提供了有力的技术保障。

    diff --git a/Application/Mobile/View/Index/business.html b/Application/Mobile/View/Index/business.html index 38b27a6a9..949beb895 100644 --- a/Application/Mobile/View/Index/business.html +++ b/Application/Mobile/View/Index/business.html @@ -15,7 +15,7 @@
    商务合作
    -
    Business cooperation
    +
    BUSINESS COOPERATION
    《海南万盟天下科技有限公司》，致力于引进和传播手机游戏，我们愿与广大开发者一同成长，将快乐分享给每一个玩家。欢迎广大开发者与工作人员联系，让您的游戏为我们平台锦上添花。
    市场合作
    From 93d46b74ae77c9f5c4c239cb59d9491791166682 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Thu, 5 Dec 2019 17:52:06 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Member/device_bans_list.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Application/Admin/View/Member/device_bans_list.html b/Application/Admin/View/Member/device_bans_list.html index 9eb370005..4ac5aebf3 100644 --- a/Application/Admin/View/Member/device_bans_list.html +++ b/Application/Admin/View/Member/device_bans_list.html @@ -25,6 +25,12 @@ height:26px;line-height:26px;font-size:12px; } .select2-results__option[aria-selected] {font-size:12px;} + .select2-dropdown { + z-index: 1; + } + .device-bans-tag{ + width: 25%; + }
    @@ -98,7 +104,7 @@ {$data.id} {$data.type_name} - {$data.tag} + {$data.tag} {:get_admin_nickname($data['operator_id'])} {$data.create_time|date='Y-m-d H:i:s',###} From fd7481a9404c99b470df37a4773d157025bd8b6d Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Thu, 5 Dec 2019 18:16:12 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Member/device_bans_list.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Application/Admin/View/Member/device_bans_list.html b/Application/Admin/View/Member/device_bans_list.html index 4ac5aebf3..62730c29c 100644 --- a/Application/Admin/View/Member/device_bans_list.html +++ b/Application/Admin/View/Member/device_bans_list.html @@ -28,9 +28,7 @@ .select2-dropdown { z-index: 1; } - .device-bans-tag{ - width: 25%; - } +
    @@ -104,7 +102,7 @@ {$data.id} {$data.type_name} - {$data.tag} + {$data.tag} {:get_admin_nickname($data['operator_id'])} {$data.create_time|date='Y-m-d H:i:s',###} From dce35b6ff17326e87b137e75f84e26d4746e5525 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 5 Dec 2019 18:22:58 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BC=96=E8=BE=91=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E9=99=90=E5=88=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FileController.class.php | 8 ++++ Application/Admin/View/Game/edit.html | 41 +++++++++++-------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Application/Admin/Controller/FileController.class.php b/Application/Admin/Controller/FileController.class.php index 0e1304463..c96c5d31d 100644 --- a/Application/Admin/Controller/FileController.class.php +++ b/Application/Admin/Controller/FileController.class.php @@ -200,6 +200,14 @@ class FileController extends AdminController /* 调用文件上传组件上传文件 */ $Picture = D('Picture'); $pic_driver = C('PICTURE_UPLOAD_DRIVER'); + + if (I('icon')) { + if ($_FILES['file']['size'] > 51200) { + $return = array('status' => 1001, 'info' => '图片大小不得超过50k', 'data' => ''); + $this->ajaxReturn($return); + } + } + $info = $Picture->upload( $_FILES, C('PICTURE_UPLOAD'), diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 1108fc7a0..3efde07c9 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -251,7 +251,7 @@
    - 尺寸不得小于512*512px，圆角半径113px，不强制要求，可直接提供512*512方图 + 尺寸不得小于125*125px，大小不得超过50K @@ -1678,7 +1678,8 @@ } - diff --git a/Application/Media/View/default/Index/index.html b/Application/Media/View/default/Index/index.html index 5c6204008..6fb32465c 100644 --- a/Application/Media/View/default/Index/index.html +++ b/Application/Media/View/default/Index/index.html @@ -45,7 +45,7 @@
    - +
    - +
    \ No newline at end of file From aadfb0af62946acbbd54c75f12ef332d5c348bfc Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 6 Dec 2019 11:00:52 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=97=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Recharge/pay.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Media/View/default/Recharge/pay.html b/Application/Media/View/default/Recharge/pay.html index fff73faba..1e07bc58f 100644 --- a/Application/Media/View/default/Recharge/pay.html +++ b/Application/Media/View/default/Recharge/pay.html @@ -169,7 +169,7 @@
    您当前选择的是：支付宝
    - +
    账户充值
    From 1a9b90d5cc077fea9cd47a75265d44c99dfe7ff6 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 6 Dec 2019 11:28:37 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E8=A7=A3=E7=BB=91=E6=89=8B=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Recharge/pay.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Media/View/default/Recharge/pay.html b/Application/Media/View/default/Recharge/pay.html index 1e07bc58f..684f0617e 100644 --- a/Application/Media/View/default/Recharge/pay.html +++ b/Application/Media/View/default/Recharge/pay.html @@ -171,7 +171,7 @@
    您当前选择的是：支付宝
    -
    账户充值
    +
    账户充值
    From 3c6ca71bb64ed3d550fe97c3aa58018d64ac230b Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 6 Dec 2019 11:29:23 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E8=A7=A3=E7=BB=91=E6=89=8B=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Model/GameModel.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Model/GameModel.class.php b/Application/Admin/Model/GameModel.class.php index a83665f45..7a7afb347 100644 --- a/Application/Admin/Model/GameModel.class.php +++ b/Application/Admin/Model/GameModel.class.php @@ -76,12 +76,12 @@ class GameModel extends Model{ */ public function detail($id,$display_site=''){ /* 获取基础数据 */ - $map['relation_game_id']=$id; + $map['relation_game_id'] = $id; $map['game_status'] = 1; $map['display_site'] = ['like','%'.$display_site.'%']; $info = $this->field(true)->where($map)->group('relation_game_id')->select(); - $info= game_merge($info,$map); - $info=reset($info); + $info = game_merge($info,$map); + $info = reset($info); if(!(is_array($info) || $info['game_status']!=1)){ $this->error = '游戏被禁用或已删除！'; return false; From f9eedf339be1de8228899008f946722612c63b33 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 6 Dec 2019 12:01:21 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/User/userauth.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/View/User/userauth.html b/Application/Mobile/View/User/userauth.html index 9619d8ce9..19650f553 100644 --- a/Application/Mobile/View/User/userauth.html +++ b/Application/Mobile/View/User/userauth.html @@ -39,7 +39,7 @@
    真实姓名：{$user['real_name']}
    身份证号：{$user['idcard']}
    -
    返回个人中心
    +
    返回设置中心
    From ef879b9bfb65e1cb0bd3a29cc4c4ed6f8544ba63 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 6 Dec 2019 12:09:37 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Mobile/js/home.js | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/Public/Mobile/js/home.js b/Public/Mobile/js/home.js index 9c8a6ef15..a131a6b20 100644 --- a/Public/Mobile/js/home.js +++ b/Public/Mobile/js/home.js @@ -1,17 +1,27 @@ $(function(){ var img = $(".swiper-container .swiper-slide").length; - var swiper = new Swiper('.swiper-container', { - loop: true, - pagination: { - el: '.swiper-pagination', - clickable: true, - }, - /*autoplay: { - delay: 3000, - stopOnLastSlide: false, - disableOnInteraction: false, - },*/ - autoplay: img > 1, - }); + + if(img<=1){ + var swiper = new Swiper('.swiper-container', { + loop: true, + autoplay: img > 1, + pagination: { + el: '.swiper-pagination', + clickable: true, + }, + }); + }else{ + var swiper = new Swiper('.swiper-container', { + loop: true, + pagination: { + el: '.swiper-pagination', + clickable: true, + }, + autoplay: { + stopOnLastSlide: false, + disableOnInteraction: false, + }, + }); + } }); \ No newline at end of file From 58399f4c69bfa3ac3cd67d9ed618c538b9dd57ad Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Fri, 6 Dec 2019 13:51:09 +0800 Subject: [PATCH 14/14] =?UTF-8?q?PC=E5=AE=98=E7=BD=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Media/css/supervise.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Public/Media/css/supervise.css b/Public/Media/css/supervise.css index 0b5c91ade..b7973f266 100644 --- a/Public/Media/css/supervise.css +++ b/Public/Media/css/supervise.css @@ -54,6 +54,10 @@ background-color: #00A3E1; color: #fff; } + +.service_left .list li:hover{ + cursor:pointer; +} .service_left .content{ width: 100%; height: 400px;