From 0927417ce96e0d461ee2af78b56c98ef87cd21e4 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 7 Jan 2020 10:21:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=BB=93=E7=AE=97--=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PromoteGameRatioController.class.php | 69 +++++- .../View/PromoteGameRatio/applyRatio.html | 215 +++++++++++++++++- Data/update.sql | 10 + Public/static/icons_alibaba/iconfont.css | 28 ++- Public/static/icons_alibaba/iconfont.eot | Bin 3452 -> 3988 bytes Public/static/icons_alibaba/iconfont.js | 2 +- Public/static/icons_alibaba/iconfont.svg | 12 + Public/static/icons_alibaba/iconfont.ttf | Bin 3284 -> 3820 bytes Public/static/icons_alibaba/iconfont.woff | Bin 1972 -> 2192 bytes Public/static/icons_alibaba/iconfont.woff2 | Bin 1476 -> 1644 bytes 10 files changed, 317 insertions(+), 19 deletions(-) diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php index aa3852bc7..fae9c3e32 100644 --- a/Application/Admin/Controller/PromoteGameRatioController.class.php +++ b/Application/Admin/Controller/PromoteGameRatioController.class.php @@ -69,15 +69,20 @@ class PromoteGameRatioController extends ThinkController $thisPromoteStatus = '待审核'; $thisPromoteVerStatus = '未知'; $thisGameName = '未知'; - $thisGameRatio = '0.00'; - $thisLastRatio = $promoteGameRatio['last_ratio']; + $thisGameRatio = '0.00%'; + $thisLastRatio = $promoteGameRatio['last_ratio'] . '%'; + $thisLastTurnoverRatio = $promoteGameRatio['last_turnover_ratio'] ? json_decode($promoteGameRatio['last_turnover_ratio'], true) : []; + $thisLastRatio = $thisLastTurnoverRatio ? "{$thisLastRatio} - " . $thisLastTurnoverRatio[count($thisLastTurnoverRatio) - 1]['ratio'] . '%' : $thisLastRatio; + $thisRatio = $promoteGameRatio['ratio'] . '%'; + $thisTurnoverRatio = $promoteGameRatio['turnover_ratio'] ? json_decode($promoteGameRatio['turnover_ratio'], true) : []; + $thisRatio = $thisTurnoverRatio ? "{$thisRatio} - " . $thisTurnoverRatio[count($thisTurnoverRatio) - 1]['ratio'] . '%' : $thisRatio; $thisLastRatioStatus = $promoteGameRatio['last_ratio_status']; $thisStatusText = self::$statusList[$promoteGameRatio['status']]; $thisStatusText = ($promoteGameRatio['status'] == -1) ? '' . $thisStatusText . '' : $thisStatusText; $thisApplicant = get_admin_account($promoteGameRatio['applicant_id']); $thisReviewer = $promoteGameRatio['reviewer_id'] ? get_admin_account($promoteGameRatio['reviewer_id']) : '待确认'; - $thisBeninTime = date('Y/m/d', $promoteGameRatio['begin_time']); - $thisEndTime = $promoteGameRatio['end_time'] ? date('Y/m/d', $promoteGameRatio['end_time']) : '永久'; + $thisBeninTime = date('Y/m', $promoteGameRatio['begin_time']); + $thisEndTime = $promoteGameRatio['end_time'] ? date('Y/m', $promoteGameRatio['end_time']) : '永久'; $validDate = $thisBeninTime . ' - ' . $thisEndTime; if ($issetPromote) { $thisPromoteAccount = $promotes[$thisPromoteId]['account']; @@ -90,7 +95,7 @@ class PromoteGameRatioController extends ThinkController if ($issetGame) { $thisGameName = $games[$thisGameId]['game_name']; $thisGameRatio = $games[$thisGameId]['ratio']; - $thisGameRatio = $thisGameRatio ?? '0.00'; + $thisGameRatio = ($thisGameRatio ?? '0.00') . '%'; } $record = [ @@ -102,8 +107,8 @@ class PromoteGameRatioController extends ThinkController 'promote_status_text' => $thisPromoteStatus, 'promote_ver_status_text' => $thisPromoteVerStatus, 'game_name' => $thisGameName, - 'last_ratio' => (($thisLastRatioStatus == 1) ? $thisLastRatio : $thisGameRatio) . '%', - 'ratio' => $promoteGameRatio['ratio'] . '%', + 'last_ratio' => (($thisLastRatioStatus == 1) ? $thisLastRatio : $thisGameRatio), + 'ratio' => $thisRatio, 'valid_date' => $validDate, 'remark' => $promoteGameRatio['remark'], 'status_text' => $thisStatusText, @@ -167,6 +172,50 @@ class PromoteGameRatioController extends ThinkController $this->error('结束时间不得小于开始时间'); } } + if (!isset($params['ratio']) || $params['ratio'] === '') { + $this->error('默认分成比例不能为空'); + } + $save['turnover_ratio'] = ''; + if (!empty(array_filter($params['turnover'])) || !empty(array_filter($params['turnover_ratio']))) { + if (is_array($params['turnover']) && is_array($params['turnover_ratio'])) { + foreach ($params['turnover'] as $turnover) { + if (empty($turnover)) { + $this->error('月流水不能为空'); + } + } + foreach ($params['turnover_ratio'] as $turnoverRatio) { + if (empty($turnoverRatio)) { + $this->error('月流水分成比例不能为空'); + } + } + $turnoverCount = count($params['turnover']); + $sortTurnover = $params['turnover']; + sort($sortTurnover); + if ($params['turnover'] != $sortTurnover || $turnoverCount != count(array_unique($params['turnover']))) { + $this->error('月流水必须以正序的方式填写，且必须大于上一个月流水'); + } + $ratio = $params['ratio'] ?? 0; + if ($params['turnover_ratio'][0] <= $ratio) { + $this->error('月流水分成比例必须大于默认分成比例'); + } + $turnoverRatioCount = count($params['turnover_ratio']); + $sortTurnoverRatio = $params['turnover_ratio']; + sort($sortTurnoverRatio); + if ($params['turnover_ratio'] != $sortTurnoverRatio || $turnoverRatioCount != count(array_unique($params['turnover_ratio']))) { + $this->error('月流水分成比例必须以正序的方式填写，且必须大于上一个月流水分成比例'); + } + + $save['turnover_ratio'] = []; + foreach ($params['turnover'] as $key => $turnover) { + $save['turnover_ratio'][] = [ + 'turnover' => bcdiv($turnover, 1, 2), + 'ratio' => bcdiv($params['turnover_ratio'][$key], 1, 2), + ]; + } + $save['turnover_ratio'] = json_encode($save['turnover_ratio']); + } + } + $save['ratio'] = $params['ratio'] ?? 0; $save['begin_time'] = strtotime($params['begin_time']); $save['end_time'] = $params['end_time'] ? strtotime($params['end_time']) : 0; @@ -183,6 +232,7 @@ class PromoteGameRatioController extends ThinkController $this->isWithdraw($promoteId, $save['begin_time']);//是否存在开始时间后已提现数据 if ($promoteGameRatio['status'] == 1) { + $save['last_turnover_ratio'] = $promoteGameRatio['turnover_ratio']; $save['last_ratio'] = $promoteGameRatio['ratio']; $save['last_ratio_status'] = 1; } @@ -237,8 +287,9 @@ class PromoteGameRatioController extends ThinkController if (empty($promoteGameRatio)) { $this->error('数据异常'); } - $promoteGameRatio['begin_time'] = $promoteGameRatio['begin_time'] ? date('Y-m-d', $promoteGameRatio['begin_time']) : ''; - $promoteGameRatio['end_time'] = $promoteGameRatio['end_time'] ? date('Y-m-d', $promoteGameRatio['end_time']) : ''; + $promoteGameRatio['begin_time'] = $promoteGameRatio['begin_time'] ? date('Y-m', $promoteGameRatio['begin_time']) : ''; + $promoteGameRatio['end_time'] = $promoteGameRatio['end_time'] ? date('Y-m', $promoteGameRatio['end_time']) : ''; + $promoteGameRatio['turnover_ratio'] = $promoteGameRatio['turnover_ratio'] ? json_decode($promoteGameRatio['turnover_ratio'], true) : $promoteGameRatio['turnover_ratio']; if ($promoteGameRatio['last_ratio_status'] == 1) { $lastRatio = $promoteGameRatio['last_ratio']; } else { diff --git a/Application/Admin/View/PromoteGameRatio/applyRatio.html b/Application/Admin/View/PromoteGameRatio/applyRatio.html index 3ce73e049..7d14a96be 100644 --- a/Application/Admin/View/PromoteGameRatio/applyRatio.html +++ b/Application/Admin/View/PromoteGameRatio/applyRatio.html @@ -3,6 +3,7 @@ + @@ -22,6 +23,48 @@ .tabcon1711 .mustmark { margin-left:-7px; } + .list-ratio { + display: table; + } + .list-ratio .li-ratio { + display: flex; + margin-bottom: 20px; + align-items: center; + } + .list-ratio .li-ratio .turnover, .list-ratio .li-ratio .turnover-ratio { + position: relative; + } + .list-ratio .li-ratio .turnover span, .list-ratio .li-ratio .turnover-ratio .error-message { + color: red; + position: absolute; + left: 0; + top: 30px; + white-space: nowrap; + display: none; + } + .iconfont-btn { + cursor: pointer; + } + .iconfont-style { + font-size: 18px; + color: #fff; + border-radius: 4px; + border: 0; + padding: 5px; + margin-left: 10px; + } + .iconfont-selected { + background-color: #0A9AF2; + } + .iconfont-selected:hover { + background-color: #03a9f4; + } + .iconfont-unselected { + background-color: #999; + } + .iconfont-unselected:hover { + background-color: #ababab; + }

{$meta_title}

@@ -83,11 +126,62 @@ 现分成比例： - + + % 当前需要修改成的分成比例 + + + + +
+ +
+ +
+ + +
+ +
+ + % + sadasdas +
+ + +
+ + +
+ +
+ + +
+ +
+ + % + +
+ + + + + + + + +
+ + +
+ + + *开始时间： @@ -147,13 +241,15 @@ $(".select_gallery").select2(); $(function(){ $('.time').datetimepicker({ - format: 'yyyy-mm-dd', + format: 'yyyy-mm', language: "zh-CN", - minView: 2, autoclose: true, scrollMonth: false, scrollTime: false, scrollInput: false, + startView: 'year', + minView:'year', + maxView:'year', }); showTab(); @@ -239,6 +335,119 @@ $(function(){ } }); }); + + $('.iconfont-btn-add').click(function (e) { + var delBtn = $('.iconfont-btn-del'); + var html = ''; + html += '
'; + html += ''; + html += '
'; + html += ''; + html += ''; + html += '
'; + html += ''; + html += '
'; + html += ''; + html += '%'; + html += ''; + html += '
'; + html += '
'; + + $('.list-ratio').append(html); + + if ($('.list-ratio').children().length > 1 && delBtn.children('i').hasClass('iconfont-unselected')) { + delBtn.children('i').removeClass('iconfont-unselected'); + delBtn.children('i').addClass('iconfont-selected'); + } + + $('.list-ratio').children(':last-child').children('.turnover').children('input').change(function (e) { + turnoverChangeHandle(); + }); + + $('.list-ratio').children(':last-child').children('.turnover-ratio').children('input').change(function (e) { + turnoverRatioChangeHandle(); + }); + }); + + $('.list-ratio').children('.li-ratio').children('.turnover').children('input').change(function (e) { + turnoverChangeHandle(); + }); + + $('.list-ratio').children('.li-ratio').children('.turnover-ratio').children('input').change(function (e) { + turnoverRatioChangeHandle(); + }); + + function turnoverChangeHandle() + { + $('.list-ratio').children('.li-ratio').children('.turnover').children('input').each(function () { + var that = $(this); + var thatLiRatio = that.parent().parent(); + var thatLiRatioIndex = thatLiRatio.index(); + var prevTurnover = 0; + var prev = thatLiRatio.prev().children().children('input'); + var thatTurnover = parseFloat(that.val()); + + if (thatLiRatioIndex > 0) { + prevTurnover = parseFloat(prev.val()); + prevTurnoverHandle(thatTurnover, prevTurnover, that); + } + }); + } + + function turnoverRatioChangeHandle() { + var ratio = parseFloat($('#ratio').val()); + $('.list-ratio').children('.li-ratio').children('.turnover-ratio').children('input').each(function () { + var that = $(this); + var thatLiRatio = that.parent().parent(); + var thatLiRatioIndex = thatLiRatio.index(); + var thatTurnoverRatio = parseFloat(that.val()); + + if (thatLiRatioIndex === 0) { + console.log(111) + prevTurnoverRatio = ratio; + prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, true); + } else { + var prev = thatLiRatio.prev().children('.turnover-ratio').children('input'); + var prevTurnoverRatio = parseFloat(prev.val()); + prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that); + } + }); + } + + function prevTurnoverHandle(thatTurnover, prevTurnover, that) + { + if (thatTurnover <= prevTurnover) { + that.parent().children('span').text('月流水必须大于上一个月流水'); + that.parent().children('span').show(); + } else { + that.parent().children('span').hide(); + } + return true; + } + + function prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, isDefault = false) + { + if (thatTurnoverRatio <= prevTurnoverRatio) { + var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; + that.parent().children('.error-message').text(msg); + that.parent().children('.error-message').show(); + } else { + that.parent().children('.error-message').hide(); + } + return true; + } + + $('.iconfont-btn-del').click(function (e) { + var that = $(this); + + if ($('.list-ratio').children().length > 1) { + $('.list-ratio').children(':last-child').remove(); + if ($('.list-ratio').children().length === 1) { + that.children('i').removeClass('iconfont-selected'); + that.children('i').addClass('iconfont-unselected'); + } + } + }); }); diff --git a/Data/update.sql b/Data/update.sql index 5b4eb6b2e..47b957b90 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -949,3 +949,13 @@ MODIFY COLUMN `mime` char(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NU ALTER TABLE `tab_spend` MODIFY COLUMN `selle_status` int(11) NOT NULL DEFAULT 0 COMMENT '渠道结算 0未结算1 结算', MODIFY COLUMN `selle_ratio` double(5, 2) DEFAULT 0.00 COMMENT '渠道分成比例'; + +-- 2020 01-06 cxj +ALTER TABLE `tab_promote_game_ratio` +ADD COLUMN `turnover_ratio` varchar(2000) NOT NULL COMMENT '流水分成比例' AFTER `last_ratio_status`; +ALTER TABLE `tab_promote_game_ratio` +ADD COLUMN `last_turnover_ratio` varchar(2000) NOT NULL COMMENT '上次流水分成比例' AFTER `turnover_ratio`; + +-- 2020 01-07 cxj +ALTER TABLE `tab_withdraw` +ADD COLUMN `game_ratio` varchar(5000) NOT NULL COMMENT '游戏提现实际分成比例'; diff --git a/Public/static/icons_alibaba/iconfont.css b/Public/static/icons_alibaba/iconfont.css index 4f48a8e51..435ceab81 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=1574318572037'); /* IE9 */ - src: url('iconfont.eot?t=1574318572037#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAXEAAsAAAAADNQAAAV3AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCEXgqJfIdpATYCJAM8CyAABCAFhG0HgVgb2QrIDiUFOVaVJ6RZZvD85191X1W1MLCyWTi1uxfA72xhR8yYA/oz62izPfv/9736O9OFkN1HsdMmabbwgp1H8tfnH9TVfr/6xRANSRdv9HL3RO8YFhWLNH5CPDGEJOKRoTOEaClFTMKz10xIKn+FiY9DAD/5NMbXu+/g0RCBgY8TQGZOozxExNIwBSGCN9mtuNQgW3HhVevULWCL+/fyg2aJAIVLw0/qH+sjQnebzt7aczxG65lY3eUAi6tAA7UABuS0Mu8oaL+uFg7/7n0MCwGSSYBD2WKX2e0dRR2JV2tfN+vs7ThgY5emrYXWNbaeo3FLIZkU0sSaYc36Bx6gMbhxEUZQePDiw0+AICEQNzCD5LxRHwYbMxEabEEMWCkQN1gZEBdYOxIRho7CRAh0FCEKLAHEA7YbiBdsDxLhg86GRPihsycSAOsFJAjWG30IARCxL8kHyARkECAPYD7T1ZU4xa65pFJUlGJnJien5OYGs6Mmx8Aoja8ZTF4Wd+ZRnmvr43aR0w9zzaYHxevPgrHORcdvuOALTZyPqgifepBjNj9sEzn7ON+15dH44bAqJXXngrT03WlD1yQO7k4dMm7thv3r1RhdmziwIGXyqjTpMWX1hoNBPk6K9IURTN2V1WP9gWDF5H1WA3XOxmDarCY9vnb/nuLg9fu8tuIqa//C9HgtntZO7wVRvt3p/lWpmKGrUwOhazPklDUjnzwZ/fTpmOfPxz17VmroYz0aLX3yhIYKUtODleeww+exeXI4NBLvYGZ652NWfe4MEaf4Fn4c88yeFMcgxqZhWkHESX31GP3smTn06nPf4NJortrwvNuQ1oAsb4zX846x3G3P/g8nhj3TK7Tq4rdvG+woaS5sHhAzorhF0erguqxmax2Z9ubHusxiH6R65zFNd8vau3HjgbyCC3abdZktWbxXWdYHZq/1mZd1XuNJJRfvSt1LL98oSf+cVuLcQrp050C1jXP22LaL+YsLLmzbLsTbMl5wcPu21C5wfeu6dWHTG6eHETHnN3dPj3W7cvRyyP//5rIQm1pq2C3wrOEQd/8hB20zUahUBv3GGW2IlNP08uOzH25mtz3fyrR4vP2Np3r1puF/Nm2X/X88bbmTHSi3SxZBt5tseFYadIuUQTvXlgTVfmXLFoU0NadQw91vNrp3r2FprL1/7pVTc6EpSvfP1Yvbx2rvUH8f1rwDcB7poxq5EddUvu7hp++Ee+o3N7Nug36pYyoiends/KyX6QTSPVRbAAhQ3XULlX/0XP3LOgxx8idOi+/81xv9Z1vw8t/I91TqeAaGaYcXBZWl35FUcZrZK5weMdvJN49AgAitcJ+YHPBLEThUlMzD4Xha5Y4geEkLQeEhDzReSq3GWQsuArSCGy/dwE8N/a4OkIIFhxgfUM1sDYQoR0ER5iZooty2GucDcJHOB3ATFQ78DJXkWwYoF+bvNR/zDhZRoAwxQdeIkelEeZ1HYuoqvBVV3LCx2LJZJWpR35hs7Ic1bHVxhl1MWzoOQcTSVdRXexpWFB0Zll6EBaep5DhGx2YNMdUHNRV0FaLohQWGxwEjgghQBoIhoKNBbO8OUanfHwmG4qLAYxWMuks6FoyFDds5ogVNaV7B2s/UKo06lZ42xVBa4ug1BARZdNRRQfTVczCK1OkgDPVBRWAEHJoiNagx6EgzfTZS1Ww6PFcf9xWAH/6kiCjRYsQlbvGIV3zil4AEJSRhiUiUlBiv0VKm0RLMSl1eK5d0jaZmqKsawhQlbHuo5LJwOkWjoquHH3JahNESdwiwaGOmazcRmCUoOEadpu3a2abLWzhT2mihRm9DKQux51hOpNWmiaiXaOF+rmtEPhitmzjYdgAA') format('woff2'), - url('iconfont.woff?t=1574318572037') format('woff'), - url('iconfont.ttf?t=1574318572037') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('iconfont.svg?t=1574318572037#iconfont') format('svg'); /* iOS 4.1- */ + src: url('iconfont.eot?t=1578289573084'); /* IE9 */ + src: url('iconfont.eot?t=1578289573084#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), + url('iconfont.woff?t=1578289573084') format('woff'), + url('iconfont.ttf?t=1578289573084') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('iconfont.svg?t=1578289573084#iconfont') format('svg'); /* iOS 4.1- */ } .iconfont { @@ -23,6 +23,14 @@ content: "\e721"; } +.iconjiahao1:before { + content: "\e727"; +} + +.iconjianhao:before { + content: "\e729"; +} + .iconfanhui:before { content: "\e600"; } @@ -51,6 +59,14 @@ content: "\e797"; } +.iconminus-square-fill:before { + content: "\e84b"; +} + +.iconplus-square-fill:before { + content: "\e84c"; +} + .iconreply:before { content: "\e82f"; } diff --git a/Public/static/icons_alibaba/iconfont.eot b/Public/static/icons_alibaba/iconfont.eot index fc5f6ff132259ed70e9510b6313dcf0f0438a903..afc88515289f53c496618258b68ab4976646aead 100644 GIT binary patch delta 1112 zcmZXTJ8aWX6o${ePV7LMmy;%?MJ4Vdr6N%1!?aR)v;ia_0}=>yM zWoBvRQkXy;U_gk43NZlUA$4Y8Kn$n@vMt2G0D^%g{5J+c!S;9W@qL{CKR5A@#<>mh zT!`pXa8}km10##2+1=O5LqzN{5gk2QFp8J9eDf0VBzSNpf9bS;iAo1Z*sgl6K#?L5+0xkBX6L9kGqoI1aMUjqaKZ?Pz9o?@--QDRsON{b@{qoKjCt(XU0iCGwCk-auiD_$+3%TZ6V{ zci5fwRr`k1q!Gwd9!R!u`n3^D9)r1iL)f89w+QXBGmNhTjD zq(YTL!9#1H>!%=vpctV#3c!VoEETgTdCgIeyw?%c;8KOE3-XYK+6Bl6FD}SUR=W#S z$QpDZ)x76vDt8ds0J>y%y1)V1S6$$R?0FY)8ukqr_#>yw1y0Esc7bPdGA?jW&K?)k zLC!%JR74JbeL-3jSG#n&O!w#|IV{L@mS@k|cRtKZ{1Jc6E&fH~Qoq^nT`5_*1k@If1Qs9(KuGDs!UhXK6+X zqwbm|;YXMePGCb;v{Xl*zFmtaq~c0a2=ZmL&zMq~Q5aKLQDIV84gQ&{924VPMT0;3 zU->uHY^}cPK)=CUug@qewGLg{8r@pp)Wc(`@VbxC|Cbf8mRG`9Klcs?I4=2s7xhXb9A Fegc|z@TdR) delta 658 zcmZ9I&ubGw6vw}BcC%@IZd#?SQE0@bPzcmhP>H2YBX|@M!HW`_YLKQ4m_wCl=)seM zhNUl=khj$dons$EZ?z9zmYI003ZG9KmM(HPfm%gKgesT=(@V5 z`|3nzcNhuuU<`K!u5nuJ!bFRaW5`fZjyQRz159vF;fW{lc`ay!&gI4$_6t01kgO zfL1Ibgr;!vA+(3XHU}WBKbfaHn}AE05AJpdGsE2pVGZ!+LV^Z(.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}")}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&&(c=t,i=a.document,l=!1,(n=function(){try{i.documentElement.doScroll("left")}catch(t){return void setTimeout(n,50)}o()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,o())});function o(){l||(l=!0,c())}var c,i,l,n}(function(){var t,e;(t=document.createElement("div")).innerHTML=o,o=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,n='',c=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss");if(c&&!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 c=function(){document.removeEventListener("DOMContentLoaded",c,!1),t()};document.addEventListener("DOMContentLoaded",c,!1)}else document.attachEvent&&(e=t,i=a.document,l=!1,(n=function(){try{i.documentElement.doScroll("left")}catch(t){return void setTimeout(n,50)}o()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,o())});function o(){l||(l=!0,e())}var e,i,l,n}(function(){var t,c,o,e,i,l;(t=document.createElement("div")).innerHTML=n,n=null,(c=t.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",o=c,(e=document.body).firstChild?(i=o,(l=e.firstChild).parentNode.insertBefore(i,l)):e.appendChild(o))})}(window); \ No newline at end of file diff --git a/Public/static/icons_alibaba/iconfont.svg b/Public/static/icons_alibaba/iconfont.svg index e098e00a7..1d4340a2e 100644 --- a/Public/static/icons_alibaba/iconfont.svg +++ b/Public/static/icons_alibaba/iconfont.svg @@ -26,6 +26,12 @@ Created by iconfont + + + + + + @@ -47,6 +53,12 @@ Created by iconfont + + + + + + diff --git a/Public/static/icons_alibaba/iconfont.ttf b/Public/static/icons_alibaba/iconfont.ttf index 552caa9fc48f630df727f9f3ec9851dbe1de4642..b3825e3f07d5a4b6e3d146bbaebbb1b01bd5f574 100644 GIT binary patch delta 1124 zcmZXTO-vI(6vyA2E!`?@>29HbAEe8t#BV;TCMXKVMB!kJF&YoJQLva6DrlmKrWg-; ztXaQK8V`C<;|1eM31Gt6g9l@x;k3Ik9z1B|LhFAz#?RgUX5P%3dH?sOvv2D^uPrp? z_Ym zwO^g6RGBPY-|hrKtdES1}Hekh6H? zzPQuC4|vd-<%7;5$DEjmA6qDUh-OJETN}`?#PS6SkgTPSVwefJ?6$Z)p5?W9?cNpd zj=$O8>kpPnL@v3_@FahFZo|{(50pyIoT%Nw*uRR_;BEN%CMikHh+9EHWT%q}RRM(n zt$=PNMX3sk#`IHRaNfs4`Iu5hfsN#%7zsi^T!CQZwkQym+#ZG8>m?PkK+jUhgYnuF zkSDKQfkeo=qR1mB@@^~Ssd#r3$dmld3S>-vp8~m)->*OwbsGV5uk06YAg_iXb*oxouwF;r-afGEWT0x7U?s7^pADN8I1Zf0y ztF^5=warS@YPsd46cmeSXIL*5bY`7%I%_dA`rB7LD(APz2H(IR@z&E`g-V=#`s>s4Iwtzd;8{miJH rw#T>1ehh|_4)-@1+0n7{lN%?`p0_84H;#;EGO=9d?+NEgxSi<-gg@?o delta 631 zcmZ9I%}X0W7{;HOti~j|@e8%m+6|h55YUsl~P$WH3wG%%|S(tp?LFP z*;cQ$2ccJU>A^$ksegb61t~qvrsAQOLMdD0Gftt<8GifDJoA3-dvWXd#!i2E6cB3w zp3Hh~aSLNl0oh8P&o8XJ_%MvSfVD%yLf)P0?*4v4-*053Kq2}y!Z#d|fr3|B&ho%~ z$NXd$mS)}9Vf>u2Mcy6HT`r27c)<4_eP49F{Mc0Qr;j{PS*oiDAB(ityH8EDy_0XDyRf|wV_(BUI!G^05yl&F0~1*{kH_;JJH46 z!`;gbX0y-+{rK(TiXV_DU}EKq3!^FeXc8fHe| z81z2{DTAIvP%*G9f?Wd}K(J?+VlSu-8T24(69yz`Ck<$(%^A?bf_jZ$4e#*`yJSY*lMm&F|I7MQtu%(RnvcJUh@}6!rO$WljQ`A@^gr8!S0O`+kN^Mx diff --git a/Public/static/icons_alibaba/iconfont.woff b/Public/static/icons_alibaba/iconfont.woff index 7ac52467996f4bbddea472e3f8abbcab33a6f482..bf9e20673f8b6a1b729c38d6cb41293ab675fa2f 100644 GIT binary patch delta 1731 zcmV;!20Zz+50DWQcTYw}00961000P(01E&B000i`krY3FL1S%UZ~y=SfB*mh>;M1) zu6Zu^1!rt|W&i*JYybcQg#Z8sa0^?ekZ5ILWB>pK^Z)<=F8}}lHW!f@N@!?hVE_OI zBme*a8~^|SBnRFDlxS^qcmMzfKmY&$4*&oFOiTa(0Bmn#VE_OIPyhe`C;$KeC=Z?y z9&KTGZ~y={26zAf03QGV03ZP%06=bGZDjxe2ABW<0Yv}+0&PB2{(W$7b94Xz2jBnz z0IdK30TW3^7?6_)0b+mfVQ%=}z!1aS%+LT7W(3Ir0OJx2Gp zC@W)(c_a`*V!{PjAv?GfcQ9}rR~}{BTj1YUmU;r)d@q^y%}l3%foq^A-bDlDn?l%^ zqNR)Xxa;B#pISfjsK}s}INR>-+N=Ds`qzd&z$smD%_%GQV2Ui7&j$ z-!9(DXGCRv2HY^wKUcc5;Z~L0^T1d&JTYXX?fpN_{ZBURzJ6IvLW3mKttC-6rA(r} zQs;>}OkF3j*V-i1w`rpOV~ZrF#g<7-j2#lGgB_EY7&|3W3|}SE4&NkF5&uY}C%#Rj zEWS(PWxh`s{Q!Twj!lDjoPAVHY!gQmo^Qt4_1ebC`ezp>CC=K4w^5{|vg0)eeoR54 z*PhxF$pH}wDN@9N99fkE$tALokfJIA!j(f$Nc4c~0^%Bh+8Yv_TB&MPE|prTJK@dl z+Qh`d+IjoN^XB{B_xzq2XYAmOxG!edI4d(Y<}AQ9&!B(hOv5&_Kt(H>1*_rIy{5TT ztBQ8u&v}41$D?=fO*WUya$nh*4`0uzFn*BB27dpXvBO+0V{o$2P2zEg&s=~&Q5%O= zSwxMVCC@6O<<+Ngg!A?RONfM)(L_SrFbbvA>L0069%3fu?T5;TG9XmJIX&N{Ci5_^ z{%PbV8GV01xf}?eOE#r4A#F;jQ_+-IQmpin=%t!imd|pZBbIhb)zyPsU zbZE9_gYsD7MY(}3rBhx`bDqX-s#Gwrg)Nd~(07016B&7#&ilH0;^_d3xa$O?TLegn z;4f^+jZ|UMz^=lgdy}8U^7+5wCZi+`XoV;rmq1(a7QkP~3-)nzlh#C1ewozqB%Lga z4SA~6F3F2YvzWw>Nz1^qbXo7?eJ_3!S5(a@H7d5PV6A$~h>&CLoXJa>^6?Dz2Wl^uu@~+iM{jv)bet-GScjfy6PL>xL|$#y+^VJ*)w1k{T3)NER!vYNQXf(q zQWw$ykVD%n_~RYuU+CD;0sVvfQ#TkJ3%ZfL`zn!mbvLxQ|50GYbtS6OQTNE3AJjXxSml7lWB_zTT4cf_2`(N=O-+A87mr z$HC{kGsHK==Gh|g4OPM&s?uowku@2W$>?ev&593l8jq&&BUVj!YHrhOIhHNf57Bhv zD(I>rV&X8a{5GxubT))PKN7!Mq(vOnkf))RWfvPq`9^6!$~;2&U^WwsdeWdx(?EZ- zp0H~S+wvN=e?{Y}D_`@k|5jc7&z;@hah*lE`_#uid1H*_4HONu(L+zRW&HM)Gx*=> z@wU2^kHdHvHaJr_Y}SAX?}yhzj{n3hYK=5IK{xyDuP;E&LX##U8j!lzvU{Slw$>4$ z<z6>Eu8Qv^Dwrx#>&T=*8r`(+{~V#GrHM}i5a2rxqk zi8&%H5MzlI*4SW+9rj3&iuA15+=)%6>FyOjOULH$F~824td$p1rE>YOxhG-YDm_V~ z*_^zSqs&9o9~~*KtZ%Y{>cZ;fmADtp&8u22kHN@yzd<%U+5V(&V^-_RK7z*8Z8VJR Z$NS1Hn-%af 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 ViKv%o;eM`bL_Qd;n>g5Z001SXzRLgr