From 91d5166af323d5fa3265726d42840ac72a6a6067 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Fri, 11 Oct 2019 16:51:03 +0800 Subject: [PATCH 01/41] =?UTF-8?q?=E6=9B=B4=E6=96=B0->=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=B8=E6=88=8Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/ApplyController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php index 156950d71..351cd05e7 100644 --- a/Application/Home/Controller/ApplyController.class.php +++ b/Application/Home/Controller/ApplyController.class.php @@ -1548,6 +1548,13 @@ class ApplyController extends BaseController $save['ratio'] = $gameData['ratio']; $save['money'] = $gameData['money']; + $gameSource = M('Game_source', 'tab_')->field('id,source_version')->where(['game_id' => $gameId])->find(); + if (!file_exists(get_game_source_file_url($gameId)) || null == $gameSource) { + $save['enable_status'] = -1; + } else { + $save['enable_status'] = 2; + } + $res = M('Apply', 'tab_')->add($save); if (!$res) { From b3aa8078af7f9105f7d29b0fe62decf476f55108 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 13:40:42 +0800 Subject: [PATCH 02/41] =?UTF-8?q?=E5=AE=98=E7=BD=91=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Public/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Media/View/default/Public/base.html b/Application/Media/View/default/Public/base.html index 7ac983a02..8f2f20a47 100644 --- a/Application/Media/View/default/Public/base.html +++ b/Application/Media/View/default/Public/base.html @@ -174,6 +174,7 @@ + From 1e014fe0b0fe6d3b643d9c541f4ccefb14b79b60 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 14:00:30 +0800 Subject: [PATCH 03/41] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/HomeController.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 700548de0..aaeddf328 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -117,15 +117,14 @@ class HomeController extends Controller { $gameData = M('Game', 'tab_') ->field('relation_game_id,sdk_version') - ->where(array('id' => $_GET['gid'])) + ->where(array('id' => intval($_GET['gid']))) ->find(); $RelationGameId = $gameData['relation_game_id']; $gameSdkType = $gameData['sdk_version']; $map['tab_game.relation_game_id'] = $RelationGameId; - $map['ta.promote_id'] = $_GET['pid']; - $data = M('game', 'tab_')->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs')->where($map)->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . $_GET['pid'])->select(); + $data = M('game', 'tab_')->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs')->where($map)->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . intval($_GET['pid']))->select(); foreach ($data as $key => $value) { if (!empty($value['flooring_page_imgs'])) { From 570ee35883fac7de6e0ed8d218a28f3c2493155f Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 14:23:22 +0800 Subject: [PATCH 04/41] =?UTF-8?q?=E5=AE=98=E7=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Public/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Media/View/default/Public/base.html b/Application/Media/View/default/Public/base.html index 8f2f20a47..0097f9e97 100644 --- a/Application/Media/View/default/Public/base.html +++ b/Application/Media/View/default/Public/base.html @@ -254,7 +254,7 @@ --> - + From 93cf48ef8ee1c33ac92e3704b6bfa07909180851 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 14:23:57 +0800 Subject: [PATCH 05/41] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/HomeController.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index aaeddf328..243f55a67 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -132,6 +132,11 @@ class HomeController extends Controller } } + if (I('get.cs',0) > 0) { + var_dump($data); + die; + } + $this->assign('data', $data); $this->assign('gameSdkType', $gameSdkType); $this->display(); From 7c360e40f6aa4b558c411dde22c3e508c4f25a5e Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 14:27:30 +0800 Subject: [PATCH 06/41] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/HomeController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 243f55a67..f1322139c 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -124,7 +124,7 @@ class HomeController extends Controller $gameSdkType = $gameData['sdk_version']; $map['tab_game.relation_game_id'] = $RelationGameId; - $data = M('game', 'tab_')->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs')->where($map)->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . intval($_GET['pid']))->select(); + $data = M('game', 'tab_')->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs,ta.promote_id')->where($map)->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . intval($_GET['pid']))->select(); foreach ($data as $key => $value) { if (!empty($value['flooring_page_imgs'])) { From 2fcca7fcaa556d691a5e9e1bf2fa0f18e2d451d7 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 14:41:33 +0800 Subject: [PATCH 07/41] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/HomeController.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index f1322139c..f8b481a16 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -124,7 +124,12 @@ class HomeController extends Controller $gameSdkType = $gameData['sdk_version']; $map['tab_game.relation_game_id'] = $RelationGameId; - $data = M('game', 'tab_')->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs,ta.promote_id')->where($map)->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . intval($_GET['pid']))->select(); + $data = M('game', 'tab_') + ->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs,ta.promote_id') + ->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . intval($_GET['pid'])) + ->where($map) + ->group('tab_game.id') + ->select(); foreach ($data as $key => $value) { if (!empty($value['flooring_page_imgs'])) { @@ -132,11 +137,6 @@ class HomeController extends Controller } } - if (I('get.cs',0) > 0) { - var_dump($data); - die; - } - $this->assign('data', $data); $this->assign('gameSdkType', $gameSdkType); $this->display(); From bfc4cd92e89fe35f9596b72bfa41a79a6d8722bf Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 14:53:25 +0800 Subject: [PATCH 08/41] =?UTF-8?q?=E5=AE=98=E7=BD=91=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Public/base.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Application/Media/View/default/Public/base.html b/Application/Media/View/default/Public/base.html index 8f2f20a47..ac620daac 100644 --- a/Application/Media/View/default/Public/base.html +++ b/Application/Media/View/default/Public/base.html @@ -129,7 +129,6 @@ -
  • {:C('PC_NAVIGATION_CLIENT')?C('PC_NAVIGATION_CLIENT'):'客户端'}
    • - +
    @@ -254,9 +253,7 @@ --> - - - + - + + + + +
    -
    当前位置： 客服中心
    +
    +
    + 当前位置： 客服中心 +
    +
    + + +
    +
    -
    +
    -

    {$title.title}

    - +

    {$title.title}

    +
      - -
    • -
      •{$er['zititle']}
      -
      -

       {$er['contend']}

      -


      -

      -
      -
      • -       + +
    • +
      •{$er['zititle']}
      +
      +

       {$er['contend']}

      +


      +

      +
      +
      • +
    暂无此类问题哦~
    -     +
    - - + +
    - - - + + + \ No newline at end of file From 53ebee76a868f6f6fa762df4713dfe54e4a47c23 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 17:59:49 +0800 Subject: [PATCH 12/41] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AE=98?= =?UTF-8?q?=E7=BD=91->=E5=AE=A2=E6=9C=8D=E5=B8=AE=E5=8A=A9->=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/static/icons_alibaba/iconfont.css | 16 ++++++++++------ Public/static/icons_alibaba/iconfont.eot | Bin 3108 -> 3256 bytes Public/static/icons_alibaba/iconfont.js | 2 +- Public/static/icons_alibaba/iconfont.svg | 3 +++ Public/static/icons_alibaba/iconfont.ttf | Bin 2940 -> 3088 bytes Public/static/icons_alibaba/iconfont.woff | Bin 1768 -> 1864 bytes Public/static/icons_alibaba/iconfont.woff2 | Bin 1280 -> 1364 bytes 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Public/static/icons_alibaba/iconfont.css b/Public/static/icons_alibaba/iconfont.css index 72ae30990..9cce5fc11 100644 --- a/Public/static/icons_alibaba/iconfont.css +++ b/Public/static/icons_alibaba/iconfont.css @@ -1,10 +1,10 @@ @font-face {font-family: "iconfont"; - src: url('iconfont.eot?t=1569546352126'); /* IE9 */ - src: url('iconfont.eot?t=1569546352126#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAUAAAsAAAAAC3wAAASyAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCEFgqILIY9ATYCJAMsCxgABCAFhG0HgS8brAkRFaQrkP08sG0eW1ljTcMvS4sUj54tD9Mwzf8cBPRb+rPsQgiXkxipm19TV6iq/oo41J7qBQDoMfuh0uKaEcqfjzCHcvbJo297aS4r8Oj/xlydekj6p9fWy93EHdVkkng0FhokHiGJePRMyBDKcmcYnuFCHMyHIQCLbBRB1KnXpA0mCnKUAMSg9GhPTFsEFSIVmH7D50KFWIKOqc3VbgCL1b8XXyklTNDQJeRRLfrV7UMNj0/FpRNz6CKn4+SXAm6XgQSKAArEIt/MHKTeVQSJ9XkLRRcghImG4Qkvr5/Td/3Vn4rHYh5eHj+HnbFqKpkoCBEhiRR6PxuQKAx0BBpxmMTn/c8zQJ4EyJzTbYEHR5DgiRSKfrZCBAO8vAg6+DkQBPg5ETTwXYQ48FchmOCvRoiHT8UjWJAeONwGkkAUBDEJMJu4NMoUdBkUEaKbISkpOUuWhGREZWE/0hofOnUvm775fvnwybtZ1YY7Y+btQTl7A+H5+4Xu7rMmhk7cyaI23i0bPn0/u77pXocOrEhJWTHPtlfZ7Va5+3emtm2/ev7etYP7RVe7++al9FmRiib0XTl/v9sz2i/MNd8SSlnpNWHePndinz1OQf/Uete+dKRFV6/bFS6Zt8cZ2meFs3d+WjSRz85m8khLrLKtFSlw2crUgGx1mjhhVacHD9o8fNj28eP2jx6NY652GrFij3A0GBK2E2KvMTLUjo1dQno4msNyO/dZ4z5uoOjTV8x/2/aRV4YcjtPWdMy2jrrlnv9DiSGHt6SMDH/90jYxUSpHqZYJLXOVzDnFnZuplLOmX/rnr2sy5oonxZxDiHtcxjXr1+/Lln2/HLImY+mMfPOjrBVlmsOdk+msIr3Hnr/ev8a4i2fG2j9uDsoN+l+4tm+KR+z01i3ns4/JeW7LVoq1TaM592/d4tqB05vXrDF6lOhhYMzXlzB62MZd2nJR/ftvXqRYEuEwx+374hvl3bsSOjdiAh24Qv3uw7Kw4FSxQ29aP5Unyz5eQkj4XIubS/zmwhY/LNxK2/3bw3lF+vp8Xu7RTL0CEHvtLTKHqryibLIm39cUjvannN61Tnqynx9Grhqw70cvkRHsFUuvLTO/NXK7h6v89hBQADw97g6D5ZijyMeykXqJbd2arTGXqK+dWPJYEH4IAghQBrlMU2DRVbAtF5J4lb8vNfZIEJikmqARR1aQmOShKmYRj16CFYKBSXWwKEz9ywMkMwKJUPFAIWYCEEQ4DBohLoMkwk2qYr4EHZvvwCAiJFi0E8k3DJAPLfjpLaOouIA8AavgNYvXJ230N1KzIlvtqvwfc+E6TP3o7P1CjzmPU8qe5lo16BwcfILHobUBYg47VLVfa43bYdB+H9Sr4C6e4i2jqLgA8gSwCl7L1vXJ9fvfSM2KHDLjx/Qfc+HtAxM9Ywzql8fHmrEuE8ueZirq0IC+jQwO+EQptLQrANF/vx2q2rOm6IhbBrSSjuvpy/e56W0/VWYh3/yMMEnRDIfLY/nx2k94OrKnA/KxCX9eg6eNh+PRodnau/eBa+N7Qk9LC/e/1HRHEW4h+TnaVjrFWVl8cew/w0pqIqOn9eW8ZZ3Rni4uAAA=') format('woff2'), - url('iconfont.woff?t=1569546352126') format('woff'), - url('iconfont.ttf?t=1569546352126') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('iconfont.svg?t=1569546352126#iconfont') format('svg'); /* iOS 4.1- */ + src: url('iconfont.eot?t=1570870899994'); /* IE9 */ + src: url('iconfont.eot?t=1570870899994#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAVUAAsAAAAADBAAAAUEAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCELAqJGIcgATYCJAMwCxoABCAFhG0HgTsbNQoRFaSZkH1xwJv6gmNIQk1g8ltlso971mEXikzzP0cQrensPSQpkwKU8QWyZWFI1YgIV0Blqmt0hfkvGJGDPGvSVAtI7QFI1ta9YAQAooxJVvi6bJlrytZHmJvybZefHrjA5ZkN4df/jbk69ZD0T6+tl7uJKuKeeDSWiJJ4hCTi2TIhWgiRh23BdhULqzD7pQ8T6LFAGbJv6+wNVDlxVCDujtIjgBqKyDOkoekviQtziAcgaaYUwjqAe/vv4x80gwqSIgPxqGOaTTSYP4MXaij2vwPBaBxgzaVwu4wMm0BOfJCZJ0Dd5k2onk9nolsAQ/KGKBXyTOaZ8XOJ5/jzohdq//9X4JKOUcUZhZNRPwzhxE3lvS8/kMmVCr1C0tDU6uSfV4Lw9CHzpaWXCrR12a2IyKmkESWVDKKgMkb0UosjgloCkahxgll1ISKa1EWIFj9qy/UM6fApYAzEEUB8Mua5K0lm0LNiSENCl5+Tk0tYmDnJThRWX5SRmfMq6+CuKKlqT49tYEeEWL59KbUZiJ0WJra0NoSEtzJeZ+3fFiZW7OiwDe2JkSp3/f0hn5s7P5WXt5DXtxBva+Dx8StKayk5SaMX4a2p3NH5PGxQTEFaGx5Bp2W50gIh7oKkQamt+PXoZkyBTpXhvJdGPnpRaWO2JLUZ6x6dj7Wk8dFL+XjrGXqeESnkZcznBi0r4GGSFfEhJxQG7u97Hxz43Lnjd3h4Rbl8HRIs7+/TWTLCvMyFVzjPOo2NwawkNnoDi3kbn7boUceR6Bgk7aHP4bOg9yDvw8OzvlN3kA6tPbgs7Y6ZjzaIdzAfKkb1wewtm/+xcrBiuiq0s+zX53j/L5rimh7MHpIaErfwFEFNrJh29OXrYgFJBhhrJgsSHyBQXFbWKirWZnYrFtASgDcUpUQkmMxNFjxL+ery2NwR8ysTw5d5P/DsrRscGZ9tvfUM/g/VVI+JXZIYra6R2NmULtFWUx3bAYaqiovJ4erhZI71anVyeGjAZPUE8c8f4oTEJjEc/gCmx2oV6M4Ois4KTtDBK2AXdqYOC0+pdj6Y/ESd1LmTLUj2TNubSfGGDPf3GTXyJl8PNPOPlsk+k7oIU1OEE1lZJwiATWI4/J3nlDY3FaVp+oSk/v4kdBJ4lJDEivo06Vr6+3B7G4Du/VSj4rZyukRRC35mFRjhBxrXXIo+Q2kUli5zXP8h2Sg7r/uZJPTcOEgV3/s+jM34K5XpeFnzvTR0npW7GBGa66EpUdh6JlgLLsi/dhHty99zo0cK9Gk7jRoTemSB7r8w4l4XvvHCvQlN4z4kDfOQaVqk5sxNKPRqQ6lpC3pssLu816hzgIqcAViXABCGdEEy4AsyQzaoOfMuFCa8hdJQoNDjEuG6Ya9lfNDDK6MSXEAfgUxOVsXlwen7ha4FxUG7Lf9DrlQHUz9G2z4xITdxSt25WcSC5RzhAx6HIWQonLdopF9FymYYLPVGvcnx7MEroxJcgD4CMjlZs7o8xH7/C10LijOm/Jj+IVfaPpj0xgLUT08qNOVQBtedmwlrtMDeeucIPlgKg2zOoND7bdFIb63QWDYGtpQt6um798U9bj+8phGfzhwlumFatuN6Pn97vlXJHSi5PdKhqXRac3IvCY5Ho6UQbt4Hro1uHSa3tHz7S003LsctND2W0GpniE3Ap0jp06P+N8WYaH05r1W5hOP91nftBKucnQEAAAA=') format('woff2'), + url('iconfont.woff?t=1570870899994') format('woff'), + url('iconfont.ttf?t=1570870899994') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('iconfont.svg?t=1570870899994#iconfont') format('svg'); /* iOS 4.1- */ } .iconfont { @@ -55,3 +55,7 @@ content: "\e82f"; } +.iconicon-test:before { + content: "\e63c"; +} + diff --git a/Public/static/icons_alibaba/iconfont.eot b/Public/static/icons_alibaba/iconfont.eot index 13b631613716bd2919af3b55b9626705526ea495..e738345bf7e8180b538ef30c17979a70c3d8abc8 100644 GIT binary patch delta 577 zcmX|8ziU%b6#mY;xB2zn)6!^~2-=o3bZApUz_ddQU3Ah#x=U!&MCfY@iKPxD2n9<) zNPVLD0~{QRgCSVZp@TohK17YiU6gpjf-okIHxEYcU(Ei2$V|NM7NPYnqFB*~ z0hsJ#z>ffe2sKm6mf-U5!LYbpoclrti9+bXXgF+2&WB)HMU>{#8$SBokMG za872f$?yg7Pm4_Cc8VGZ`3I41icC zBQ-Hatj+BKP!fdAGJpc?_n3Qt>^(rNl95|dp#x+vFfd*L5;{5g$%(9XY(_x65m&?*K#1`ePf*`6^zQ+=-Zyz%+;7yAGIGcY`3c&0M>ACtH^BT$6^gAjuV z5Q+iSGXwRpF|cknVwPm&>;PE`1YDCtSd1o5V(}IQh6O_n!y<+g3?CTP7^@gJG5%o^ c+x&$^mt}J==L9C8!{m6xCY$k;G6S^%0E-P%+W-In diff --git a/Public/static/icons_alibaba/iconfont.js b/Public/static/icons_alibaba/iconfont.js index f1cb7a52d..ca21a83cc 100644 --- a/Public/static/icons_alibaba/iconfont.js +++ b/Public/static/icons_alibaba/iconfont.js @@ -1 +1 @@ -!function(a){var t,c='',e=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss");if(e&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}!function(t){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(t,0);else{var e=function(){document.removeEventListener("DOMContentLoaded",e,!1),t()};document.addEventListener("DOMContentLoaded",e,!1)}else document.attachEvent&&(n=t,o=a.document,i=!1,(l=function(){try{o.documentElement.doScroll("left")}catch(t){return void setTimeout(l,50)}c()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,c())});function c(){i||(i=!0,n())}var n,o,i,l}(function(){var t,e;(t=document.createElement("div")).innerHTML=c,c=null,(e=t.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",function(t,e){e.firstChild?function(t,e){e.parentNode.insertBefore(t,e)}(t,e.firstChild):e.appendChild(t)}(e,document.body))})}(window); \ No newline at end of file +!function(a){var t,c='',e=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss");if(e&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}!function(t){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(t,0);else{var e=function(){document.removeEventListener("DOMContentLoaded",e,!1),t()};document.addEventListener("DOMContentLoaded",e,!1)}else document.attachEvent&&(o=t,n=a.document,i=!1,(l=function(){try{n.documentElement.doScroll("left")}catch(t){return void setTimeout(l,50)}c()})(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,c())});function c(){i||(i=!0,o())}var o,n,i,l}(function(){var t,e;(t=document.createElement("div")).innerHTML=c,c=null,(e=t.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",function(t,e){e.firstChild?function(t,e){e.parentNode.insertBefore(t,e)}(t,e.firstChild):e.appendChild(t)}(e,document.body))})}(window); \ No newline at end of file diff --git a/Public/static/icons_alibaba/iconfont.svg b/Public/static/icons_alibaba/iconfont.svg index c1bc5cc79..3a3f91969 100644 --- a/Public/static/icons_alibaba/iconfont.svg +++ b/Public/static/icons_alibaba/iconfont.svg @@ -50,6 +50,9 @@ Created by iconfont + + + diff --git a/Public/static/icons_alibaba/iconfont.ttf b/Public/static/icons_alibaba/iconfont.ttf index a647d9bd108ba77c105a5eba5bcefd722f101c7b..fe69cbe053b50bcd7b5df041f5912714a64d583c 100644 GIT binary patch delta 547 zcmYLGL2FY%5dLQO*`#@STCBdbf~6%*duUTbz_f>$dhwFcXs#Kt`1Za>-RR} zM}RVj$^6oz#T$0B1sJ!9S|OLcZ@;g50QQMgfka?WzofrSj24{AN`ej`yEKWV;zBmC z*^^|iPhWAeDBx?*I!;x0t@_l8#&mOIqp4|U@)IrD`JZFO$!=>RKl3+9 s8;kNw!AtD@dl29Y5PfsIxqO^a@#DNoBF65-5J4>@T8M=THkN`M8cmTi0VBpjVh|*Sgvg;{ z=MNABudvBau(Yue5llpE?Zh~D3AoGKnKv`<&DM+`y_P5)JmgjZ1q^*Bd$>JwAH4=- zf?;OT)|P&{_{vQWQyDGz!}R7zrN315IZ%P{Gm~S4hpLd^?dbNEYJ(bM&5>rgdG#^TY5@&2 z;>{TI%Qp9nJBL`)i#`nS)ww3vNkxF&6$IHW?E9AqyVWDq!5KELK<~BRc&9e^bfs`Q9b|w diff --git a/Public/static/icons_alibaba/iconfont.woff b/Public/static/icons_alibaba/iconfont.woff index 7416d85fa03af4dae57ab569ddc973d487491e5e..26361367ddba9bff8a93384ce3b22dbf87bca18b 100644 GIT binary patch delta 1321 zcmV+^1=jlL4ag1@cTYw}00961000L_01E&B000aSkrYdRr~m*0EK-Us@Mmm!W&i*J zC;$Kgxc~qJm^~J?&uC>~WB>pJOVAORUF06=bGZDjxe1$+Pi0Yv}+0&PB2{(W$7b94Xz2E+gW0D=Gj0J|YY4GohB z0epYa4T3-rMCSxi!4G4M@e>mGGob2CQ(GE^zL~AA4{&?~XsZ+!H5>DQGCtff*@nWX$w;M^G(_LY50TXPiL zU-4~&9rie+O$GjSOy}!+tD?I?-iw%*wSs?6!a5N%wL!#LuSLw$8$rk6qoDWjNiYTY zESLwDUZDH{kQf#sb-L(`_*(94DM5+jS_2jMf zP+BMyiU)f%=)vYvf*=$rrR~*&r$Rj#gNoN+(VL(r1yS@OD7aJK>?WzP!DZ*$nVo;P z-}lXXZwV#j_&wWYIWkPLgbZ0laP$jMwI;yS;{bU%r6-M&<$4vpY!}#^Uz_p(yeS$! z{p<13(KxLM%$>ZR5@GasH15~B`-J?hy>GWuR~pM^TjBoQP_^8lN!{ajx-v+8y<=AMcnUkvFAN5 z^zI^!VjyAOF2h%-^YutFqrtY|!tXNw<*L!2>@LBCX&@&!GW6)HM z5tUz36?hs|vuvH8PtT?K6;)5E@I*BWlg3rz)qo6h1sunVL&Q1xR zk7dVVu*Vl-rWJ*K*cWTQ0DHmuFnsd)!Eva?f;_a?9BMhFgyMyY?G$7sC5B;^#PF&W zF>Hp#$J%4*vGUk-IKgEc=;41BDCZQ|QUH{b>9eLkG~_o!+&Pk@qn!X@_n*MdbgviO z^nbtZMk987erF9fLZaw2D>_j)axCEztp1i~mTtjSSQFH|fkq69LA}0AIDJ_ftUoX(gPaV`#%WhU&q@SqrJ;YHiUt)|GHn8z z{3dL^h0=<{-_dK|M74iB*!~2!NcjK$V)yVkQF4ZmM7Ly05k&neSjDiYu2(f%tg*V< zU;)yX?ZPBG*w{E=h_lPnZD@7(5c!+-^zv-Di8xtklRwxt^&tQN0C=2ZU}Rum0OD^g zo8HIs+k9o(0~1IT0ChqPbCbUW78dXT07nu6b$Fa( zVPIfjAprvb1rPu+lj{T-BLYkS0C=2ZU}Rum;9)RfU}gXTCLrblLI#HaU_Ju?4(9<{ zvm*sh0e-?D5JcH(!M1qQ&*;HVLZsVGaH&vY_3I@edU8(l-i&BOO)vgOLjyb5LkkiV z9H4_92GDR6r^zsG#Q1cyWy9||FrL5iXD0Gq7CUEB=ooJ~sEQYf<#eTC@i~o_qV-PS fi3_AhHqq6g_BOi3zdEvk$JM1(h!3y-FkJuu>tjS! delta 1241 zcmV;~1Sb2)4(JUOcTYw}00961000K)01E&B000YokrYdRp8x;?7I(LAPiJg-W&i*J zAOHXYZ~y=VEI6_anP_EUWB>pJkN^MxF8}}lHWr3P;Am)NVE_OGzyJUM8~^|SBnRFD zjA(6icmMzd+yDRo4*&oFEGz&30Bmn#VE_OG>;M1&7ytkO7zI8CGHqdaZ~y=W1ONa4 z9{>OVAORRE06=bGZDjxe1tb6f0Yv}+0&PB2{(W$7b94Xz25bNT0C@la0IxSb7DST> z0epW!3c^4PMc>$3wTOs_>lWIb&-f+@e)ISp!9>NSS@B@>;|G*w7#8Z?I z-UL!jnua_tsPnw!C4J$@jw*)OTWg~&>#%JQiJdjlv+JJ<`g7&RUGI^vl~lSLwCA90 zr@X)7U+3JXud0))PD&^SC#4iSM?MmJCnbMrjgykI){)ED=*VwucH}&^ILd%^aHv1u z2rStEc$|GwO=uHA6rOKpyFW=tvrV$wq|jtj*tH0$m!>cMM07>j~;3*H1hDTtyM!Gk;X&E}`Z2A7#PKkx1Lee>R9oUxM+Vo!gR z*)%ILHsw_j*q6}q=Hc3DprYsPoKyE|VbgB-3t~BHFNQ$4$op$_Gd(kt=51xmr`L-r zjGxS;qxR6x*xy_MWAM^2Y~t~V&#posuTMj-EWxMI2%QpIVQn5~I3JxbO=x;b7n-g`9;BIs{|U-E<};*T_G@60b&Bq`gKkhC_fAzkzS)$jwBq zXkkZT(SODNVzv1%@sLr%Ea?4Kak_oki>9WcUf+N29&6h1ZfvplPvBs?KML+ezuyj{$qsb>5M7aBNm5!; zov0KAo>B>Kyyb;wd$^7b1ueT|`BGGld-@~UFxuc<+=?k<^Nd=4O2m3j=dAkjufq1QG=R zLof>p0C=2ZU}RumZusB85W~U%0zi_H0Tplq07nr5baO~le!Wc^Jvpa&Z-y!=Y3Y9~D(tXFjRpn>9MQs}qtoD&H&K3i*^<-uI4PgM z@@EDKp~-ekV%RI+(_{)>8_uVj*g2&2(o5`v?;fHV)+M><%TRh9{TyCIAJ052uK)l5 DrIRB} diff --git a/Public/static/icons_alibaba/iconfont.woff2 b/Public/static/icons_alibaba/iconfont.woff2 index 39089b19a1a02f77e1e35cdc8cd8d03898428f6a..c3d731404e1019decf024f38f6df048acc09b6a6 100644 GIT binary patch delta 1353 zcmV-P1-ANt3e*Z1cTYw#00961000G401E&B000aS000F9kr*C-EDDJjhadqq0we=4 z3mO0fAO(bN2Z1{qH3|_Gq?wR?alo7Uf@4TRO9| z@@F_CF48##Y zd@|;_D@kU5(6eGlLqeCIlaotWm^sN#6joo9k(u)<>)@^^scKJ;ZD2=)SiXHJwHb(= z7ACf|HiU$?GG1rx-xelT?C7u!?TL{pcm4e#pPM^Bm6x}W*S8RFYvA$mD@toAIZ2}z z;jO9M(fK@VP)tEu8y-QYWx3Jlu2U5h>(l%;yFzE8t<074ab_6bA0^dmkM5+_~d-cz8v*d>s-j@9)!D zGQzyfg;zMwI*pCNtRyyi1B-bZpSI{x$C2n5B<-Qk;j^IkAn(J&v%XVzkPfXqxGe3C znU6Mqh<7j_Dn|9e>@A!Bv2w6tx+=7@?APab|1X;2njXv^k{S}X@DxE!teAH6mw7+%?5!Id z8J}&v^$h+G)l`p(U6L5Bu94W;lrGU$QytrX0fwrIi^<{Y;be~WYISmWXuxFk1o6)w z;)KK|F&zE?rpIa(=*|v`&I(S@!7E@FcBT#sPpNi3nEXVY)VY%_NcK$In@RD84EOgL zHS#834>a?SmdQSox(HKKgcDg=CkTK|VmSPr=ae=#6{TtVgrxrdBy6^DY!7yoJ(GpwQzI;kse3Wqi=XE29!zKp%ljPFBU`!Rh;jt_8(GyDk4iu2ct8 zKStX=F(Ef`O5M3x#De7<;R7CrA!I0=w`inaMapIvEcHgc$?@#LE29!zfIb3$GC5hZ zx;(^w{|j9UiZiDCnEoMG+CG@{#sbt&PbxI!PzKkXn+a>Qz}|Z22tHT}gKW;A(EDxC zNN=ssST+W>lr8G%yZ6OCZa=)H5ueT+CAwi+w&Qv}e|x@F$sH)UJ<_46bXs$AFA0uE zqoojT-UqIYZXG7Kw0!$ZO*bwm$1OBHme6Wvh)uw!Na@p~{x`*#Xni@aRk?)Y{nmHw L1go5#0RR91QvHWV delta 1268 zcmV+`#Uogd9yr_vl0Xy$F$pl6xHQTXbQu&8qMIQpDLG4)gk(fzVL#Fu zA3Aj}o4)yfe);gpyIIwSJ7ebUK{ri~EZj=l{oBKNMf&=DUhdIMy#f$>?JY8gs=T6XvL@fx6pr?%oZhug zda|D%My?vL??*3@5$qL9uPrmbHFCR$tNiv5PyjqV?hb?Hn4`$YvXOd;ZQYu!F_)-+ zubo)(SP*^)0tiqBxlB`F(N(Z57m|3Dzb`fRND!E$nxGL!R*;zFp(1h95Um_^dEEK?E@1%V+`t- z$H$tnE)&b1W-98?fWD0k4){bVw6rS#(SN@ks@k)r=!jbew33eN>C5-I>1{t#Rc0aI z{ERS3(F}*nWBKvgPk1`Arvvh_34dOLr;Uf>(V^MeyZ3=><9k9+OAGhE)O1G?ZXx+O e+EzNnSy_B>>_5XwY9gbj_2s-}ozb2yE&u=my=!^^ From 5745fee3bdf95556a2999fc9699bcf73120a21ba Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Sat, 12 Oct 2019 18:08:21 +0800 Subject: [PATCH 13/41] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AE=98?= =?UTF-8?q?=E7=BD=91->=E5=AE=A2=E6=9C=8D=E5=B8=AE=E5=8A=A9->=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Service/detail.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Application/Media/View/default/Service/detail.html b/Application/Media/View/default/Service/detail.html index 4ed693f54..dc66c8ed9 100644 --- a/Application/Media/View/default/Service/detail.html +++ b/Application/Media/View/default/Service/detail.html @@ -86,7 +86,8 @@ } var oLis = DOM.getElesByClass("tabOption"); var flag = 0; - var upFlag = oLis.length;; (function() { + var upFlag = oLis.length; + (function() { function fn(e) { e = e || window.event; if (e.wheelDelta) { @@ -180,6 +181,12 @@ // console.log(url); window.location.href = url; }); + + $('#search_value').bind('keypress', function (event) { + if(event.keyCode == 13){ + $('#search_btn').click(); + } + }); })(); \ No newline at end of file From 9aa0dee8959bf8352f00066b344946ea5c61275f Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 14 Oct 2019 11:53:39 +0800 Subject: [PATCH 14/41] =?UTF-8?q?=E5=AE=98=E7=BD=91=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Public/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Media/View/default/Public/base.html b/Application/Media/View/default/Public/base.html index ac620daac..37e3cc7bd 100644 --- a/Application/Media/View/default/Public/base.html +++ b/Application/Media/View/default/Public/base.html @@ -213,7 +213,7 @@ 网络文化经营许可证编号：{:C('PC_SET_LICENSE')}
    {:C('PC_SET_COPYRIGHT')}
    - +
    From 84174b18e9ce42ff3ad7cd93546b8f9832ab0c05 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 17 Oct 2019 14:02:05 +0800 Subject: [PATCH 15/41] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Repository/SpendRepository.class.php | 14 +- .../Base/Repository/UserRepository.class.php | 6 +- .../Home/Controller/QueryController.class.php | 33 ++- Application/Home/View/default/Query/arpu.html | 4 +- .../Home/View/default/Query/gameArpu.html | 280 ++++++++++++++++++ 5 files changed, 316 insertions(+), 21 deletions(-) create mode 100644 Application/Home/View/default/Query/gameArpu.html diff --git a/Application/Base/Repository/SpendRepository.class.php b/Application/Base/Repository/SpendRepository.class.php index c7409113e..5b9431ab6 100644 --- a/Application/Base/Repository/SpendRepository.class.php +++ b/Application/Base/Repository/SpendRepository.class.php @@ -71,18 +71,6 @@ class SpendRepository { return $this->assembleRecords($items, $dayList, 'count'); } - /** - * 付费游戏数 - */ - public function getPayGameCountGroupByGame($params) - { - $gameIds = $params['game_ids'] ?? []; - $conditions = $this->getGameGroupConditions($params); - $field = 'game_id, count(*) count'; - $items = M('spend', 'tab_')->field($field)->where($conditions)->group('game_id')->select(); - return $this->assembleRecords($items, $gameIds, 'count', 'game_id'); - } - /** * 按天统计付款总额 */ @@ -124,7 +112,7 @@ class SpendRepository { $conditions = $this->getGameGroupConditions($params); $field = 'game_id, count(distinct user_id) count'; $items = M('spend', 'tab_')->field($field)->where($conditions)->group('game_id')->select(); - return $this->assembleRecords($items, $dayList, 'count', 'game_id'); + return $this->assembleRecords($items, $gameIds, 'count', 'game_id'); } /** diff --git a/Application/Base/Repository/UserRepository.class.php b/Application/Base/Repository/UserRepository.class.php index 696379bb5..0f58c6834 100644 --- a/Application/Base/Repository/UserRepository.class.php +++ b/Application/Base/Repository/UserRepository.class.php @@ -112,11 +112,11 @@ class UserRepository { $params['time_column'] = 'register_time'; $conditions = $this->getGameGroupConditions($params); - $items = M('user', 'tab_')->field('count(*) count, game_id') + $items = M('user', 'tab_')->field('count(*) count, fgame_id') ->where($conditions) - ->group('game_id') + ->group('fgame_id') ->select(); - return $this->assembleRecords($items, $gameIds, 'count', 'game_id'); + return $this->assembleRecords($items, $gameIds, 'count', 'fgame_id'); } /** diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 933295615..ce7a00127 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -760,6 +760,7 @@ class QueryController extends BaseController $time = I('time', date('Y-m-d')); $applys = M('Apply', 'tab_')->field('game_id, game_name')->where(['promote_id' => $promote['id']])->order('game_id desc')->select(); $gameIds = array_column($applys, 'game_id'); + $applys = index_by_column('game_id', $applys); $params = [ 'begin_time' => strtotime($time . ' 00:00:00'), @@ -768,10 +769,36 @@ class QueryController extends BaseController 'promote_ids' => $ids, ]; + $userRepository = new UserRepository(); $spendRepository = new SpendRepository(); - // $result = $spendRepository->getHistoryPayCountGroupByGame($params); - $result = $spendRepository->getPayGameCountGroupByGame($params); - var_dump($result); + $payUserCountList = $spendRepository->getPayUserCountGroupByGame($params); + $newPayUserCountList = $spendRepository->getNewPayUserCountGroupByGame($params); + $payAmountList = $spendRepository->getPayAmountGroupByGame($params); + $newPayAmountList = $spendRepository->getNewPayAmountGroupByGame($params); + $historyPayCountList = $spendRepository->getHistoryPayCountGroupByGame($params); + $loginCountList = $userRepository->getLoginCountGroupByGame($params); + $registerCountList = $userRepository->getRegisterCountGroupByGame($params); + + foreach ($gameIds as $gameId) { + $records[] = [ + 'gameId' => $gameId, + 'gameName' => $applys[$gameId]['game_name'], + 'payUserCount' => $payUserCountList[$gameId], + 'newPayUserCount' => $newPayUserCountList[$gameId], + 'payAmount' => number_format($payAmountList[$gameId], 2), + 'newPayAmount' => number_format($newPayAmountList[$gameId], 2), + 'historyPayCount' => $historyPayCountList[$gameId], + 'loginCount' => $loginCountList[$gameId], + 'registerCount' => $registerCountList[$gameId], + 'payRate' => $loginCountList[$gameId] == 0 ? '--' : round($payUserCountList[$gameId] / $loginCountList[$gameId] * 100, 2) . '%', + 'ratentionOneDay' => '--', + 'arpu' => $loginCountList[$gameId] == 0 ? '0.00' : number_format(round($payAmountList[$gameId] / $loginCountList[$gameId], 2), 2), + 'arppu' => $payUserCountList[$gameId] == 0 ? '0.00' : number_format(round($payAmountList[$gameId] / $payUserCountList[$gameId], 2), 2), + ]; + } + + $this->assign('records', $records); + $this->display('gameArpu'); } public function arpu_analysis() diff --git a/Application/Home/View/default/Query/arpu.html b/Application/Home/View/default/Query/arpu.html index 0ec23603b..f5d6c5108 100644 --- a/Application/Home/View/default/Query/arpu.html +++ b/Application/Home/View/default/Query/arpu.html @@ -223,7 +223,7 @@ {$vo.arppu} - 查看 + 查看 @@ -325,7 +325,7 @@ var gameId = $('#game-select').val(); function chakan(key) { var bangbi = $('#bangbi').val(); var promote_id = $('#promote_arpu').val(); - url = "/index.php?s=/Home/Query/cha_userarpu/time/"+key+"/bangbi/"+bangbi+"/promote_id/"+promote_id; + url = "/index.php?s=/Home/Query/gameArpu/time/"+key+"/bangbi/"+bangbi+"/promote_id/"+promote_id; timetitle = key; console.log(url); layer.open({ diff --git a/Application/Home/View/default/Query/gameArpu.html b/Application/Home/View/default/Query/gameArpu.html new file mode 100644 index 000000000..1078c5ddb --- /dev/null +++ b/Application/Home/View/default/Query/gameArpu.html @@ -0,0 +1,280 @@ + + + + + {$meta_title}-个人中心 + + + + + + + + {:hook('pageHeader')} + + + + + + + + + + + + +
    + +
    + +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    游戏名称新增玩家活跃玩家充值金额付费玩家新增付费用户付费率ARPUARPPU

    暂无数据

    {$record.gameName}{$record.registerCount}{$record.loginCount}{$record.payAmount}{$record.payUserCount}{$record.newPayUserCount}{$record.payRate}{$record.arpu}{$record.arppu}
    + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + From 5c5d879710886dfd322d383e0edc51fbe785a6c8 Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 17 Oct 2019 14:17:42 +0800 Subject: [PATCH 16/41] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=97=A5=E5=BF=97bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/TestResourceController.class.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php index 3c9ca4306..293d40906 100644 --- a/Application/Home/Controller/TestResourceController.class.php +++ b/Application/Home/Controller/TestResourceController.class.php @@ -198,9 +198,14 @@ class TestResourceController extends BaseController $arrUserId = array_column($data,'id'); $logId = implode(',',$arrUserId); - $logRead = M('protect_log_read','tab_') - ->where("log_id IN({$logId}) and promote_id = {$promote_id}") - ->select(); + if ($logId) { + $logRead = M('protect_log_read','tab_') + ->where("log_id IN({$logId}) and promote_id = {$promote_id}") + ->select(); + } + else { + $logRead = []; + } $upsetData = array_column($logRead,'log_id'); From a093dd3d5bc599e3aa235c7f3a488e55f0c7be5e Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 17 Oct 2019 15:48:33 +0800 Subject: [PATCH 17/41] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Public/bases.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Mobile/View/Public/bases.html b/Application/Mobile/View/Public/bases.html index 761c8759d..0383c36d7 100644 --- a/Application/Mobile/View/Public/bases.html +++ b/Application/Mobile/View/Public/bases.html @@ -87,10 +87,10 @@ }
    - + @@ -113,20 +113,20 @@

    商城

    --> - +     - +

    我的

     From 115ce7a35d214426a4938526d0abf5f37fbb3c31 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 17 Oct 2019 15:52:22 +0800 Subject: [PATCH 18/41] =?UTF-8?q?=E5=A2=9E=E5=8A=A0user=5Ftoken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index b1cab2369..61619fcb4 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -157,4 +157,7 @@ CREATE TABLE `tab_protect_log_read` ( `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id', `create_time` int(11) DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; \ No newline at end of file +) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; +-- 增加用户Token 验证用户 +ALTER TABLE `tab_user` +ADD COLUMN `user_token` char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '用户token 登入时下发' AFTER `token`; \ No newline at end of file From db956a2d7753037ac26ba225b67d1287db0e3862 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 17 Oct 2019 16:11:49 +0800 Subject: [PATCH 19/41] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 2 +- .../Home/View/default/Query/gameArpu.html | 2 +- .../Sdk/Controller/UserController.class.php | 23 ++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index ce7a00127..a0bc19e67 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1956,7 +1956,7 @@ class QueryController extends BaseController } else { $spendMap['_string'] = '1<>1'; } - $allRecharges = M('spend', 'tab_')->field('count(*) count, sum(cost) cost, game_player_id')->where($gameMap)->group('game_player_id')->select(); + $allRecharges = M('spend', 'tab_')->field('count(*) count, sum(cost) cost, game_player_id')->where($spendMap)->group('game_player_id')->select(); $allRecords = []; foreach ($allRecharges as $recharge) { $allRecords[$recharge['game_player_id']] = $recharge; diff --git a/Application/Home/View/default/Query/gameArpu.html b/Application/Home/View/default/Query/gameArpu.html index 1078c5ddb..ada236dfb 100644 --- a/Application/Home/View/default/Query/gameArpu.html +++ b/Application/Home/View/default/Query/gameArpu.html @@ -196,7 +196,7 @@ end: function () { // layer.open({ type: 2, - title: timetitle + ptitle + '游戏数据', + title: timetitle + ptitle + ' 游戏数据', shadeClose: true, shade: false, maxmin: true, //开启最大化最小化按钮 diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php index eaa979164..d8a701d54 100644 --- a/Application/Sdk/Controller/UserController.class.php +++ b/Application/Sdk/Controller/UserController.class.php @@ -1168,10 +1168,11 @@ class UserController extends BaseController $user = M('user', 'tab_'); $user_data = $user -> find($user_id); + $gameName = get_game_name($request['game_id']); $data['promote_id'] = $request['promote_id']; $data['promote_account'] = get_promote_account($request['promote_id']); $data['game_id'] = $request['game_id']; - $data['game_name'] = get_game_name($request['game_id']); + $data['game_name'] = $gameName; $data['server_id'] = $request['server_id']; $data['server_name'] = $request['server_name']; $data['role_name'] = $request['game_player_name']; @@ -1191,9 +1192,29 @@ class UserController extends BaseController $user_play->save($data); $this->updateLoginRecord($data); } else { + $data['create_time'] = time(); + $data['create_ip'] = get_client_ip(); + // $data['create_device_number'] = time(); + $user_play->add($data); $this->updateLoginRecord($data); } + + $server = M('server', 'tab_')->where(['server_id' => $request['server_id'], 'game_id' => $request['game_id']])->find(); + if (empty($server)) { + $serverData = [ + 'game_id' => $request['game_id'], + 'game_name' => $gameName, + 'server_name' => $request['server_name'], + 'server_num' => $request['server_id'], + 'server_id' => $request['server_id'], + 'server_version' => $request["sdk_version"], + 'create_time' => time(), + 'start_time' => time(), + ]; + M('server', 'tab_')->data($serverData)->add(); + } + $this -> set_message(200, "success", "成功"); } From e3d0e885f2770f2c7c56f56dd0a8841a07d6a082 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 17 Oct 2019 16:42:36 +0800 Subject: [PATCH 20/41] =?UTF-8?q?=E6=97=A0=E6=A3=80=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=8C=85=E6=8B=AC=E6=9C=AC=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index cc38aeb0c..694e82c7c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -39,8 +39,10 @@ class QueryController extends BaseController $childPromoteIds = getAllChildPromoteList(3); if (empty($childPromoteIds)) { - $map['tab_spend.promote_id'] = 0; + $map['tab_spend.promote_id'] = PID; } else { + $childPromoteIds .= ',' . PID; + $map['tab_spend.promote_id'] = ['in', $childPromoteIds]; } @@ -183,8 +185,10 @@ class QueryController extends BaseController $childPromoteIds = getAllChildPromoteList(3); if (empty($childPromoteIds)) { - $map['tab_user.promote_id'] = 0; + $map['tab_user.promote_id'] = PID; } else { + $childPromoteIds .= ',' . PID; + $map['tab_user.promote_id'] = ['in', $childPromoteIds]; } @@ -960,10 +964,12 @@ class QueryController extends BaseController { $childPromoteIds = getAllChildPromoteList(3); if (empty($childPromoteIds)) { - $userPlayInfoWhere['tab_user_play_info.promote_id'] = 0; - $userGameLoginWhere['tab_user_game_login_record.promote_id'] = 0; - $spendWhere['tab_spend.promote_id'] = 0; + $userPlayInfoWhere['tab_user_play_info.promote_id'] = PID; + $userGameLoginWhere['tab_user_game_login_record.promote_id'] = PID; + $spendWhere['tab_spend.promote_id'] = PID; } else { + $childPromoteIds .= ',' . PID; + $userPlayInfoWhere['tab_user_play_info.promote_id'] = ['in', $childPromoteIds]; $userGameLoginWhere['tab_user_game_login_record.promote_id'] = ['in', $childPromoteIds]; $spendWhere['tab_spend.promote_id'] = ['in', $childPromoteIds]; @@ -1209,11 +1215,13 @@ class QueryController extends BaseController $childPromoteIds = getAllChildPromoteList(3); if (empty($childPromoteIds)) { - $map['tab_apply.promote_id'] = 0; - $userPlayInfoMap['tab_user_play_info.promote_id'] = 0; - $userGameLoginMap['tab_user_game_login_record.promote_id'] = 0; - $spendMap['tab_spend.promote_id'] = 0; + $map['tab_apply.promote_id'] = PID; + $userPlayInfoMap['tab_user_play_info.promote_id'] = PID; + $userGameLoginMap['tab_user_game_login_record.promote_id'] = PID; + $spendMap['tab_spend.promote_id'] = PID; } else { + $childPromoteIds .= ',' . PID; + $map['tab_apply.promote_id'] = ['in', $childPromoteIds]; $userPlayInfoMap['tab_user_play_info.promote_id'] = ['in', $childPromoteIds]; $userGameLoginMap['tab_user_game_login_record.promote_id'] = ['in', $childPromoteIds]; From 059900320ba9b348222ca0d7f1fc66d6a2395019 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Thu, 17 Oct 2019 16:45:11 +0800 Subject: [PATCH 21/41] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E5=9B=9E?= =?UTF-8?q?=E8=B7=B3=E5=9C=B0=E5=9D=80=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81?= =?UTF-8?q?https=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/Ipa365Controller.class.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Application/Sdk/Controller/Ipa365Controller.class.php b/Application/Sdk/Controller/Ipa365Controller.class.php index 87e1a2360..6ceb63ded 100644 --- a/Application/Sdk/Controller/Ipa365Controller.class.php +++ b/Application/Sdk/Controller/Ipa365Controller.class.php @@ -162,9 +162,14 @@ class Ipa365Controller extends BaseController{ $param['body'] = $price; //$param['callback'] = "https://m.wmtxkj.com/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; //$param['notifyurl'] = "https://m.wmtxkj.com/callback.php/Notify/notify/apitype/alipay"; + if(stripos($_SERVER['HTTP_HOST'], '.wmtxkj.cn') || $_SERVER['HTTP_HOST']=='127.0.0.1'){ + $param['callback'] = "http://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; + $param['notifyurl'] = "http://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay"; + }else{ + $param['callback'] = "https://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; + $param['notifyurl'] = "https://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay"; + } - $param['callback'] = "https://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; - $param['notifyurl'] = "https://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay"; $ret = $this->alipay($param); $this->assign("url", $ret['url']); From ae6a18303a18bb3e2c9fbff6e02e421646a39bfb Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Thu, 17 Oct 2019 17:00:23 +0800 Subject: [PATCH 22/41] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=85=85=E5=80=BC=E6=B5=8B=E8=AF=95=E9=87=91=E9=A2=9D=E6=94=B9?= =?UTF-8?q?=E4=B8=BA0.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/Ipa365Controller.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/Controller/Ipa365Controller.class.php b/Application/Sdk/Controller/Ipa365Controller.class.php index 6ceb63ded..c73912243 100644 --- a/Application/Sdk/Controller/Ipa365Controller.class.php +++ b/Application/Sdk/Controller/Ipa365Controller.class.php @@ -7,7 +7,7 @@ use Mobile\Controller\SsgController; // a8eeac3335cef5ee117d357738598f691932513b class Ipa365Controller extends BaseController{ - const signprice = 10; // 超级签价格 + const signprice = 0.01; // 超级签价格 public $userinfo; public function __construct() { From a6c99cda3afee61fa202645f52603276bd390963 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 17 Oct 2019 17:04:44 +0800 Subject: [PATCH 23/41] =?UTF-8?q?1=EF=BC=8C=E4=BF=AE=E6=94=B9server=5Fid?= =?UTF-8?q?=E4=BC=A00=20=20=E5=A2=9E=E5=8A=A0game=5Fplayer=5Fid=202?= =?UTF-8?q?=EF=BC=8C=E5=BE=AE=E4=BF=A1=E9=99=90=E9=A2=9D=E3=80=8B=3D3000?= =?UTF-8?q?=203=EF=BC=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/WapPayController.class.php | 116 ++++++++++++++++-- ThinkPHP/Library/Think/Pay/PayVo.class.php | 15 +++ 2 files changed, 118 insertions(+), 13 deletions(-) diff --git a/Application/Sdk/Controller/WapPayController.class.php b/Application/Sdk/Controller/WapPayController.class.php index 50600d2a8..e66462acc 100644 --- a/Application/Sdk/Controller/WapPayController.class.php +++ b/Application/Sdk/Controller/WapPayController.class.php @@ -11,7 +11,7 @@ use Org\GoldPig\GoldPig; use Org\SqpaySDK\Sqpay; use Qiniu\json_decode; use Think\Log; -class WapPayController extends BaseController{ +class WapPayController extends BaseController{ private function pay($param=array()){ $table = $param['code'] == 1 ? "spend" : "deposit"; @@ -41,7 +41,8 @@ class WapPayController extends BaseController{ ->setGameId($param['game_id']) ->setGameName(get_game_name($param['game_id'])) ->setGameAppid($param['game_appid']) - ->setServerId(0) + ->setServerId($param['server_id']) + ->setGamePlayerId($param['game_player_id']) ->setGameplayerName($param['game_player_name']) ->setServerName($param['server_name']) ->setUserId($param['user_id']) @@ -452,7 +453,7 @@ class WapPayController extends BaseController{ $game_id = $request['game_id']; $data = array( 'status' => 200, - "url" => 'http://api.wmtxkj.com'."/sdk.php/WapPay/wap_shortcut_pay/user_id/{$user_id}/game_id/{$game_id}", + "url" => 'http://' . $_SERVER ['HTTP_HOST'] ."/sdk.php/WapPay/wap_shortcut_pay/user_id/{$user_id}/game_id/{$game_id}", "html" => '', "return_msg" => '', "paytype" => 'shortcut', @@ -497,7 +498,7 @@ class WapPayController extends BaseController{ C(api('Config/lists')); - $extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'game_id'=>$request['game_id'],'game_status'=>1))->find(); + $extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'game_id'=>$request['game_id'],'pay_status'=>1))->find(); if($extend_data){ redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>$request['game_id'].'订单号重复，请关闭支付页面重新支付'.$request['extend'])));exit; } @@ -545,7 +546,7 @@ class WapPayController extends BaseController{ $this->assign("pay_amount", $request['actual_amount']); $this->assign("user_id", $request['user_id']); $this->assign("game_id", $request['game_id']); - $this->display("index"); + $this->display(); } /** @@ -566,14 +567,14 @@ class WapPayController extends BaseController{ $this->set_message(1088, "fail", $payCheck['msg']); } C(api('Config/lists')); - if($request['price']*1<=0 || $request['price'] > C('WX_PAY_LIMIT')){ + if($request['price']*1<=0 || $request['price'] >= C('WX_PAY_LIMIT')){ $this->set_message(1011,"fail","充值金额有误"); } $game = M('Game','tab_')->where(['id'=>$request['game_id']])->field('pay_status')->find(); if($game['pay_status'] == 0){ $this->set_message(0,"fail","该游戏暂时无法充值，请联系客服！"); } - $extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'pay_status'=>1,'game_id'=>$request['game_id']))->find(); + $extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'pay_status'=>1,'game_id'=>$request['game_id']))->find(); if($extend_data){ $this->set_message(1089,"fail","订单号重复，请关闭支付页面重新支付"); } @@ -599,6 +600,7 @@ class WapPayController extends BaseController{ } // 绑币平台币优先处理 $this->other_price($request, $discountAmount); + $pay_amount = $request['price']; $game_set_data = get_game_set_info($request['game_id']); //$request['game_name'] @@ -633,10 +635,9 @@ class WapPayController extends BaseController{ $json_data['status'] = 500; $json_data['url'] = "http://" . $_SERVER['HTTP_HOST']; } - $json_data['cal_url'] = C("pay_header"); - - echo base64_encode(json_encode($json_data));exit; - // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]); + $json_data['cal_url'] = $_SERVER ['HTTP_HOST']; + echo base64_encode(json_encode($json_data));exit; + // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]); } else if(get_wx_pay_type() == 1){ // 威富通 if( empty(C('heepay.partner'))||empty(C('heepay.key'))){ $this->set_message(1009, "fail", "支付参数未配置"); @@ -905,7 +906,7 @@ class WapPayController extends BaseController{ $discount = $discount['discount']; $pay_amount = $discount * $request['price'] / 10; if ($pay_amount < 0.01) { - redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'充值金额有误.'.$pay_amount)));exit; + redirect(U('Spend/notice',array('user_id'=>$request['user_id'],'game_id'=>$request['game_id'],'msg'=>'充值金额有误.'.$pay_amount)));exit; } $this->other_price($request, $request['price']-$pay_amount); @@ -917,7 +918,7 @@ class WapPayController extends BaseController{ if($request['code']==1){ $this->add_spend($request,1); }else{ - $this->add_deposit($request); + $this->add_deposit($request, 1); } $sqpay=new Sqpay(); $returl = 'http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id']; @@ -947,4 +948,93 @@ class WapPayController extends BaseController{ } // redirect($json_data['url']); } + + /** + * 双乾小程序支付 + * 流程：1.app端唤起小程序 2，小程序请求服务端拿到支付参数 3，小程序发起支付之后 回调服务端 4，服务端通知客户端 + * return： 相关支付参数 回调url + */ + public function small_program() { + + $request = json_decode(base64_decode(file_get_contents("php://input")), true); + if (empty($request)) { + $this->set_message(1001, "fail", "登录数据不能为空"); + } + + if (!$request['openid'] || !$request['price'] || !$request['game_id']) { + $this->set_message(1001, "fail", "小程序参数有误"); + } + + $game = M('Game','tab_')->where(['id'=>$request['game_id']])->field('pay_status')->find(); + if($game['pay_status'] == 0){ + $this->set_message(0, "fail","该游戏暂时无法充值，请联系客服！"); + } + + if($request['price']*1<=0){ + $this->set_message(1011,"fail","充值金额有误"); + } + + $extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'game_id'=>$request['game_id'],'pay_status'=>1))->find(); + if($extend_data){ + $this->set_message(1089,"fail","订单号重复，请关闭支付页面重新支付"); + } + + $prefix = ($request['code'] == 1) ? "SP_" : "PF_"; + $request['pay_order_number'] = $prefix . date('Ymd') . date('His') . sp_random_string(4); + $request['pay_way'] = C('PAY_WAY.SQ_SMALL_PROGRAM'); + $request['pay_status'] = 0; + $request['spend_ip'] = get_client_ip(); + //折扣 + $user = get_user_entity($request['user_id']); + $discount = $this->get_discount($request['game_id'],$user['promote_id'],$request['user_id']); + $discount = $discount['discount']; + $discountAmount = 0; + if($prefix=='PF_'){ + $pay_amount = $request['price']; + }else{ + $pay_amount = $discount * $request['price'] / 10; + $discountAmount = $request['price'] - $pay_amount; + } + if(!empty($request['scheme'])) { + file_put_contents("./Application/Sdk/Scheme/".$request['game_id'].".txt",$request['scheme']); + } + // 绑币平台币优先处理 + $this->other_price($request, $discountAmount); + $pay_amount = $request['price']; + if($request['code']==1){ + $this->add_spend($request,1); + }else{ + $this->add_deposit($request, 1); + } + + $sqpay = new Sqpay(); + $data['userId'] = $request['openid']; + $data['order_no'] = $request['pay_order_number']; + $data['merno'] = C('sqpay.partner'); + $data['subject'] = '游戏充值'; + $data['ip'] = get_client_ip(); + $data['returnurl'] = C('pay_header'). "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id']; + $data['amount'] = $request['price']; + $data['appId'] = C('wei_xin.email'); + $data['secret'] = C('sqpay.key'); + $data['MerRemark'] = $data['order_no']; + + $ret = $sqpay->sq_wxsmallpay($data); + + if ($ret[0]['respCode'] == "000000") { + echo json_encode(array( + 'code' => 1, + 'Amount' => $ret[0]['Amount'], + 'orderNo' => $ret[0]['orderNo'], // 微信生成的订单号 + 'platformNumber' => $request['pay_order_number'], // 平台订单号 + 'wxjsapiStr' => $ret[0]['wxjsapiStr'] + )); + exit(); + } + echo json_encode(array( + 'code' => 1, + 'msg' => $ret[0]['respMess'], + )); + exit(); + } } \ No newline at end of file diff --git a/ThinkPHP/Library/Think/Pay/PayVo.class.php b/ThinkPHP/Library/Think/Pay/PayVo.class.php index bc52288a8..22344066b 100644 --- a/ThinkPHP/Library/Think/Pay/PayVo.class.php +++ b/ThinkPHP/Library/Think/Pay/PayVo.class.php @@ -24,6 +24,7 @@ class PayVo { protected $_serverid; protected $_serverName; protected $_gameplayerName; + protected $_gameplayerId; protected $_userid; protected $_account; protected $_userNickName; @@ -59,6 +60,12 @@ class PayVo { $this->_gameplayerName = $gameplayerName; return $this; } + + // 设置游戏玩家ID + public function setGameplayerId($gameplayerId) { + $this->_gameplayerId = $gameplayerId; + return $this; + } //退款批次号 public function setBatchNo($batchno) { @@ -445,6 +452,14 @@ class PayVo { public function getGameId() { return $this->_gameid; } + + /** + * 获取角色id + * @return type + */ + public function getGameplayerId() { + return $this->_gameplayerId; + } /** * 获取游戏名称 From 82e2c3faab21b479e69f3c9a7bb4c61809399921 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 17 Oct 2019 17:05:41 +0800 Subject: [PATCH 24/41] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Query/recharge.html | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index a058c0b95..5d9ef7097 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -186,10 +186,8 @@ 游戏名称 区服 角色名 - - 组长 - 推广员 - + 组长 + 推广员 付款时间 操作 @@ -210,14 +208,12 @@ {$vo.game_name} {$vo.server_name} {$vo.game_player_name} - - - {$vo.pro_account}({$vo.pro_real_name}) - {$vo.pro_account}({$vo.pro_real_name}) - - {$vo.p_pro_account}({$vo.p_pro_real_name}) - {$vo.pro_account}({$vo.pro_real_name}) - + + {$vo.pro_account}({$vo.pro_real_name}) + {$vo.pro_account}({$vo.pro_real_name}) + + {$vo.p_pro_account}({$vo.p_pro_real_name}) + {$vo.pro_account}({$vo.pro_real_name}) {$vo.pay_time|date='Y-m-d H:i:s',###} From cdb5e1e69996481a773235f8eab5733e74c45b8b Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 17 Oct 2019 17:14:12 +0800 Subject: [PATCH 25/41] =?UTF-8?q?=E5=8E=BB=E6=8E=89pay=5Fheader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/ExchangeController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Sdk/Controller/ExchangeController.class.php b/Application/Sdk/Controller/ExchangeController.class.php index 2768966a6..2abb0c8cb 100644 --- a/Application/Sdk/Controller/ExchangeController.class.php +++ b/Application/Sdk/Controller/ExchangeController.class.php @@ -77,7 +77,7 @@ class ExchangeController extends BaseController{ file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request))); - echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>C("pay_header").'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit; + echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>'http://'.$_SERVER['HTTP_HOST'].'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit; } else { @@ -107,7 +107,7 @@ class ExchangeController extends BaseController{ file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request))); - echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>C("pay_header").'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit; + echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>'http://'.$_SERVER['HTTP_HOST'].'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit; }elseif(!get_game_appstatus2($request['game_id'])&&$request['is_create_ordernumer']==1){ /* 苹果支付 */ From 8a5f8333356e173ee81832e2790b3455fd6c7722 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 17 Oct 2019 17:35:43 +0800 Subject: [PATCH 26/41] apple alipay --- .../Sdk/Controller/AppleController.class.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Application/Sdk/Controller/AppleController.class.php b/Application/Sdk/Controller/AppleController.class.php index 76b9bab76..d9a3a2d9c 100644 --- a/Application/Sdk/Controller/AppleController.class.php +++ b/Application/Sdk/Controller/AppleController.class.php @@ -9,6 +9,7 @@ use Org\GoldPig\GoldPig; use Org\SqpaySDK\Sqpay; use Org\HeepaySDK\Heepay; use Qiniu\json_decode; +use Think\Log; class AppleController extends BaseController{ @@ -88,18 +89,20 @@ class AppleController extends BaseController{ */ public function apple_alipay_pay($user_id,$game_id){ #获取SDK上POST方式传过来的数据 然后base64解密 然后将json字符串转化成数组 + //echo json_encode(['code'=>0,'msg'=> $user_id."game:".$game_id]);exit; $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); $request = json_decode(think_decrypt($file),true); C(api('Config/lists')); - /*$request['user_id'] = 1; + /* + $request['user_id'] = 1; $request['game_id'] = 1; $request['price'] = 1.01; - $request['extend'] = 21111183; + $request['extend'] = 21111184; $request['pay_order_number'] = 21111183; $request['sdk_version'] = 2; $request['code'] =1; - */ +*/ if (empty($request)) { echo json_encode(['code'=>0,'msg'=>'登录数据不能为空']);exit; } @@ -125,7 +128,7 @@ class AppleController extends BaseController{ $this->other_price($request); if(get_zfb_type()==0){ // 支付宝官方 - if(C('alipay.way')==1 || ($request['is_create_ordernumer']==1 && C('alipay.way')==0)){/* wap */ + if(C('alipay.way')==1 || ($request['is_create_ordernumer']==1 && C('alipay.way')==0)){ /* wap */ $game_set_data = get_game_set_info($request['game_id']); $request['apitype'] = "alipay"; @@ -324,7 +327,8 @@ class AppleController extends BaseController{ ->setGameId($param['game_id']) ->setGameName(get_game_name($param['game_id'])) ->setGameAppid($param['game_appid']) - ->setServerId(0) + ->setServerId($param['server_id']) + ->setGameplayerId($param['game_player_id']) ->setCallback($param['callback']) ->setNotifyUrl($param['notifyurl']) ->setGameplayerName($param['game_player_name']) @@ -354,6 +358,7 @@ class AppleController extends BaseController{ { $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt"); $request = json_decode(think_decrypt($file),true); +// Log::write("wxpay:".serialize($request)); /*$request['user_id'] = 1; $request['game_id'] = 1; $request['price'] = 157.01; From b72fc9ff7ce34b868101b20f9634269f174a7f87 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 17 Oct 2019 17:40:43 +0800 Subject: [PATCH 27/41] apple alipay --- ThinkPHP/Library/Think/Pay.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ThinkPHP/Library/Think/Pay.class.php b/ThinkPHP/Library/Think/Pay.class.php index 481a0c264..af718417e 100644 --- a/ThinkPHP/Library/Think/Pay.class.php +++ b/ThinkPHP/Library/Think/Pay.class.php @@ -313,6 +313,7 @@ class Pay $spend_data['game_name'] = $vo->getGameName(); $spend_data['server_id'] = $vo->getServerId(); $spend_data['server_name'] = $vo->getServerName(); + $spend_data['game_player_id'] = $vo->getGameplayerId(); $spend_data['game_player_name'] = $vo->getGameplayerName(); $spend_data['promote_id'] = $vo->getPromoteId(); $spend_data['promote_account'] = $vo->getPromoteName(); From 9fb953ea603badda8cc9a752eb1d6537af720faa Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 17 Oct 2019 17:44:57 +0800 Subject: [PATCH 28/41] =?UTF-8?q?=E6=A3=80=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Query/dailySummary.html | 5 ++++- Application/Home/View/default/Query/recharge.html | 5 ++++- Application/Home/View/default/Query/register.html | 5 ++++- Application/Home/View/default/Query/summary.html | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Application/Home/View/default/Query/dailySummary.html b/Application/Home/View/default/Query/dailySummary.html index 54ff2d148..dc95c9507 100644 --- a/Application/Home/View/default/Query/dailySummary.html +++ b/Application/Home/View/default/Query/dailySummary.html @@ -463,7 +463,10 @@ dataType: 'json', success: function (data) { var html = ""; - html += ""; + + if (promoteId > 0) { + html += ""; + } if (data.status == 1) { var promoteData = data.data; diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 5d9ef7097..e0b8414ec 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -285,7 +285,10 @@ dataType: 'json', success: function (data) { var html = ""; - html += ""; + + if (promoteId > 0) { + html += ""; + } if (data.status == 1) { var promoteData = data.data; diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html index 41e8643b2..d526d41ad 100644 --- a/Application/Home/View/default/Query/register.html +++ b/Application/Home/View/default/Query/register.html @@ -194,7 +194,10 @@ dataType: 'json', success: function (data) { var html = ""; - html += ""; + + if (promoteId > 0) { + html += ""; + } if (data.status == 1) { var promoteData = data.data; diff --git a/Application/Home/View/default/Query/summary.html b/Application/Home/View/default/Query/summary.html index 2ee6d53d6..974dd0b2e 100644 --- a/Application/Home/View/default/Query/summary.html +++ b/Application/Home/View/default/Query/summary.html @@ -250,7 +250,10 @@ dataType: 'json', success: function (data) { var html = ""; - html += ""; + + if (promoteId > 0) { + html += ""; + } if (data.status == 1) { var promoteData = data.data; From 81f85e672dc6a0370b217567add949170a5fd137 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 17 Oct 2019 18:00:40 +0800 Subject: [PATCH 29/41] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/WapPayController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Sdk/Controller/WapPayController.class.php b/Application/Sdk/Controller/WapPayController.class.php index e66462acc..aba65f93c 100644 --- a/Application/Sdk/Controller/WapPayController.class.php +++ b/Application/Sdk/Controller/WapPayController.class.php @@ -624,18 +624,18 @@ class WapPayController extends BaseController{ $json_data['paytype'] ="wx"; }else{ if(!empty($request['scheme'])) { - $redirect_url = (is_ssl()?'https://':'http://'). $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id']; + $redirect_url = (is_ssl()?'https://':'http://'). 'api.wmtxkj.com' . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id']; } else { - $redirect_url = (is_ssl()?'https://':'http://'). $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number']; + $redirect_url = (is_ssl()?'https://':'http://'). 'api.wmtxkj.com' . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number']; } $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.urlencode( $redirect_url ); $json_data['paytype'] ="wx"; } }else{ $json_data['status'] = 500; - $json_data['url'] = "http://" . $_SERVER['HTTP_HOST']; + $json_data['url'] = "http://" . 'api.wmtxkj.com'; } - $json_data['cal_url'] = $_SERVER ['HTTP_HOST']; + $json_data['cal_url'] = 'api.wmtxkj.com'; echo base64_encode(json_encode($json_data));exit; // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]); } else if(get_wx_pay_type() == 1){ // 威富通 From f05e7a31493539c88c53624ee755c41e7a948734 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 17 Oct 2019 18:02:55 +0800 Subject: [PATCH 30/41] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/WapPayController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/Controller/WapPayController.class.php b/Application/Sdk/Controller/WapPayController.class.php index aba65f93c..beb17f31c 100644 --- a/Application/Sdk/Controller/WapPayController.class.php +++ b/Application/Sdk/Controller/WapPayController.class.php @@ -635,7 +635,7 @@ class WapPayController extends BaseController{ $json_data['status'] = 500; $json_data['url'] = "http://" . 'api.wmtxkj.com'; } - $json_data['cal_url'] = 'api.wmtxkj.com'; + $json_data['cal_url'] = 'http://api.wmtxkj.com'; echo base64_encode(json_encode($json_data));exit; // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]); } else if(get_wx_pay_type() == 1){ // 威富通 From c3cb46cab0fc3d7a0c00daa00788596ddeb634ab Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Thu, 17 Oct 2019 18:05:53 +0800 Subject: [PATCH 31/41] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E5=85=85?= =?UTF-8?q?=E5=80=BCBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Callback/Controller/NotifyController.class.php | 2 +- Application/Sdk/Controller/Ipa365Controller.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Callback/Controller/NotifyController.class.php b/Application/Callback/Controller/NotifyController.class.php index 3f6688633..4b5af2e66 100644 --- a/Application/Callback/Controller/NotifyController.class.php +++ b/Application/Callback/Controller/NotifyController.class.php @@ -67,7 +67,7 @@ class NotifyController extends BaseController Log::write(serialize($order_info), Log::DEBUG); if ($order_info['status']) { $pay_where = substr($order_info['out_trade_no'], 0, 2); - + Log::write("PAY_SWI:".$pay_where, Log::DEBUG); $result = false; switch ($pay_where) { diff --git a/Application/Sdk/Controller/Ipa365Controller.class.php b/Application/Sdk/Controller/Ipa365Controller.class.php index c73912243..0996bacfe 100644 --- a/Application/Sdk/Controller/Ipa365Controller.class.php +++ b/Application/Sdk/Controller/Ipa365Controller.class.php @@ -162,7 +162,7 @@ class Ipa365Controller extends BaseController{ $param['body'] = $price; //$param['callback'] = "https://m.wmtxkj.com/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; //$param['notifyurl'] = "https://m.wmtxkj.com/callback.php/Notify/notify/apitype/alipay"; - if(stripos($_SERVER['HTTP_HOST'], '.wmtxkj.cn') || $_SERVER['HTTP_HOST']=='127.0.0.1'){ + if(stripos($_SERVER['HTTP_HOST'], '.wmtxkj.cn') || $_SERVER['HTTP_HOST']=='127.0.0.1' || stripos($_SERVER['HTTP_HOST'], '.free.idcfengye.com')){ $param['callback'] = "http://".$_SERVER['HTTP_HOST']."/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}"; $param['notifyurl'] = "http://".$_SERVER['HTTP_HOST']."/callback.php/Notify/notify/apitype/alipay"; }else{ From f7ca69eba6f7637f0465ec42a02c2d83ee41f1db Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 17 Oct 2019 18:06:32 +0800 Subject: [PATCH 32/41] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/Controller/WapPayController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Sdk/Controller/WapPayController.class.php b/Application/Sdk/Controller/WapPayController.class.php index beb17f31c..65408a71f 100644 --- a/Application/Sdk/Controller/WapPayController.class.php +++ b/Application/Sdk/Controller/WapPayController.class.php @@ -624,18 +624,18 @@ class WapPayController extends BaseController{ $json_data['paytype'] ="wx"; }else{ if(!empty($request['scheme'])) { - $redirect_url = (is_ssl()?'https://':'http://'). 'api.wmtxkj.com' . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id']; + $redirect_url = 'https://api.wmtxkj.com' . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id']; } else { - $redirect_url = (is_ssl()?'https://':'http://'). 'api.wmtxkj.com' . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number']; + $redirect_url = 'https://api.wmtxkj.com' . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number']; } $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.urlencode( $redirect_url ); $json_data['paytype'] ="wx"; } }else{ $json_data['status'] = 500; - $json_data['url'] = "http://" . 'api.wmtxkj.com'; + $json_data['url'] = "https://" . 'api.wmtxkj.com'; } - $json_data['cal_url'] = 'http://api.wmtxkj.com'; + $json_data['cal_url'] = 'https://api.wmtxkj.com'; echo base64_encode(json_encode($json_data));exit; // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]); } else if(get_wx_pay_type() == 1){ // 威富通 From a12002a56721e269b55b186d58906d68c2f7bd44 Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 17 Oct 2019 18:16:00 +0800 Subject: [PATCH 33/41] =?UTF-8?q?=E6=89=B6=E6=8C=81=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E7=99=BB=E5=BD=95bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TestResourceController.class.php | 1 + .../TestResource/supportNumberList.html | 25 +++---------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php index 293d40906..55a603c31 100644 --- a/Application/Home/Controller/TestResourceController.class.php +++ b/Application/Home/Controller/TestResourceController.class.php @@ -37,6 +37,7 @@ class TestResourceController extends BaseController $map['tab_test_resource.promote_account']=I('promote_name'); } + $map['user.promote_id']=session("promote_auth.pid"); $data = M('test_resource','tab_') ->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,check_status') ->join('left join tab_user as user on tab_test_resource.user_id = user.id') diff --git a/Application/Home/View/default/TestResource/supportNumberList.html b/Application/Home/View/default/TestResource/supportNumberList.html index 137979270..1843338e2 100644 --- a/Application/Home/View/default/TestResource/supportNumberList.html +++ b/Application/Home/View/default/TestResource/supportNumberList.html @@ -117,7 +117,7 @@

    暂无数据

    - + {$s.game_name} {$s.server_name} {$s.user_account} @@ -129,13 +129,13 @@ - 冻结 + 冻结 启用 {$s.create_time} - + 冻结 启用 @@ -377,25 +377,6 @@ } }) - $('.unfroze-btn').on({ - click: function() { - var id = $(this).parents('tr').eq(0).attr('data-id') - layer.confirm('是否确认启用帐号?', {icon: 3, title:'提示'}, function(index){ - $.ajax({ - url: "{:U('TestResource/unfreezeSupport')}", - data: {support_id: id}, - type: 'post', - dataType: 'json', - success: function(response) { - layer.msg(response.msg, {time: 1000}, function() { - window.location.href = window.location.href - }) - } - }) - }) - } - }) - $('.changePassward-btn').on({ click: function() { var id = $(this).attr('data-id') From 983b707d69bf71838ab2cf613f05d53c06f1a840 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Thu, 17 Oct 2019 18:42:34 +0800 Subject: [PATCH 34/41] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Index/product.html | 2 +- Application/Mobile/View/Public/bases.html | 26 ++++++++++----------- Application/Mobile/View/User/index.html | 4 ++-- Public/Mobile/css/public1.css | 10 ++++---- Public/Mobile/images/float_contact2.png | Bin 0 -> 5515 bytes 5 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 Public/Mobile/images/float_contact2.png diff --git a/Application/Mobile/View/Index/product.html b/Application/Mobile/View/Index/product.html index ecc0a3a05..370123230 100644 --- a/Application/Mobile/View/Index/product.html +++ b/Application/Mobile/View/Index/product.html @@ -115,7 +115,7 @@