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/15] =?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/15] =?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/15] =?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/15] =?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/15] =?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/15] =?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/15] =?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/15] =?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 @@
-
@@ -254,9 +253,7 @@
-->
-
-
-
+
-
+
+
+
+
+
-
当前位置: 客服中心
+
+
+ 当前位置: 客服中心
+
+
+
+
+
+
-
+
-
{$title.title}
-
+ {$title.title}
+
-
- -
-
•{$er['zititle']}
-
-
-
+
+ -
+
•{$er['zititle']}
+
+
+
暂无此类问题哦~
-
+
-
-
+
+
-
-
-
+
+
+
\ 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/15] =?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@TohK
17YiU6gpjf-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~VposuTMj-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/15] =?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/15] =?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 a093dd3d5bc599e3aa235c7f3a488e55f0c7be5e Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 17 Oct 2019 15:48:33 +0800
Subject: [PATCH 15/15] =?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 @@
}