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 fc5f6ff13..afc885152 100644 Binary files a/Public/static/icons_alibaba/iconfont.eot and b/Public/static/icons_alibaba/iconfont.eot differ diff --git a/Public/static/icons_alibaba/iconfont.js b/Public/static/icons_alibaba/iconfont.js index 9c02c96ce..467c3e36b 100644 --- a/Public/static/icons_alibaba/iconfont.js +++ b/Public/static/icons_alibaba/iconfont.js @@ -1 +1 @@ -!function(a){var t,o='',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&&(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 552caa9fc..b3825e3f0 100644 Binary files a/Public/static/icons_alibaba/iconfont.ttf and b/Public/static/icons_alibaba/iconfont.ttf differ diff --git a/Public/static/icons_alibaba/iconfont.woff b/Public/static/icons_alibaba/iconfont.woff index 7ac524679..bf9e20673 100644 Binary files a/Public/static/icons_alibaba/iconfont.woff and b/Public/static/icons_alibaba/iconfont.woff differ diff --git a/Public/static/icons_alibaba/iconfont.woff2 b/Public/static/icons_alibaba/iconfont.woff2 index 649a6d02f..fb47ac138 100644 Binary files a/Public/static/icons_alibaba/iconfont.woff2 and b/Public/static/icons_alibaba/iconfont.woff2 differ