From 24b06496159f3000820ddc6d3100a31790f060bb Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Fri, 11 Oct 2019 13:09:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E->=E6=B8=B8=E6=88=8F=E5=88=86?= =?UTF-8?q?=E5=8C=85=E6=89=93=E5=8C=85=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AutoPackController.class.php | 2 +- Application/Admin/View/Apply/and_lists.html | 105 ++++++++++++------ Data/update.sql | 5 +- 3 files changed, 75 insertions(+), 37 deletions(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index 39ed6e914..1c9ff623b 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -314,7 +314,7 @@ class AutoPackController extends Think $apply_data = $applyModel -> field('id,game_id,game_name,promote_id,promote_account,sdk_version') -> where($map) - -> order('id desc') + -> order('bale_sort desc,id desc') -> limit(200) -> select(); diff --git a/Application/Admin/View/Apply/and_lists.html b/Application/Admin/View/Apply/and_lists.html index 7434d52d8..4bd2de52d 100644 --- a/Application/Admin/View/Apply/and_lists.html +++ b/Application/Admin/View/Apply/and_lists.html @@ -27,7 +27,7 @@ } .select2-results__option[aria-selected] {font-size:12px;} - +
class="tabchose" href="{:U('and_lists',array('type'=>1))}">安卓分包 @@ -40,9 +40,9 @@

说明：此处功能是对推广员后台申请的苹果游戏渠道包进行审核并打包。

- - - + + +
@@ -127,6 +127,7 @@ 审核状态 打包状态 审核时间 + 打包顺序 下载状态 分成比例 注册单价 @@ -156,14 +157,23 @@ 已打包 准备打包 - 打包中 + 打包中 打包失败 未打包 - + {:set_show_time($data['dispose_time'],'','other')} + + +
+ {$data.bale_sort} +
+
@@ -179,8 +189,8 @@
class="span_font_color_red"> @@ -190,8 +200,8 @@
class="span_font_color_red"> @@ -227,6 +237,7 @@ 审核状态 打包状态 审核时间 + 打包顺序 下载状态 分成比例 注册单价 @@ -249,25 +260,33 @@ {$data.launch_count|default=0} 0 - + {:set_show_time($data['apply_time'])} {:get_info_status($data['status'],5)}{:get_info_status($data['status'],5)} - + 打包成功 准备打包 - 打包中 + 打包中 打包失败 未打包 - + {:set_show_time($data['dispose_time'],'','other')} - + + +
+ {$data.bale_sort} +
+
@@ -281,8 +300,8 @@
class="span_font_color_red"> @@ -292,8 +311,8 @@
class="span_font_color_red"> @@ -303,7 +322,7 @@ 打包 - + 查看 @@ -320,7 +339,7 @@ 导出 {$_page|default=''}
- +
@@ -329,7 +348,7 @@
已添加添加至常用设置
- + @@ -369,12 +388,12 @@ $(function(){ var url= $(this).data('url'); var urll="http://"+"{$_SERVER['HTTP_HOST']}"+url; if(url){ - layer.alert(urll,{icon: 1}); + layer.alert(urll,{icon: 1}); }else{ layer.alert('暂未打包',{icon: 2}); } }); - + $('.jslaunchlist').click(function() { var that = $(this),url = that.attr('data-url'); var url = @@ -386,7 +405,7 @@ $(function(){ area: ['1062px', '80%'], content: url,//iframe的url }); - + return false; }); @@ -396,7 +415,7 @@ $(function(){ $("#search").click(); } }); - + $('#time-start').datetimepicker({ format: 'yyyy-mm-dd', language:"zh-CN", @@ -422,7 +441,7 @@ $(function(){ } else { updateAlert('请选择需要操作的数据','tip_error'); setTimeout(function(){ - $('#tip').find('.tipclose').click(); + $('#tip').find('.tipclose').click(); },1500); } return false; @@ -442,7 +461,7 @@ function gameView(obj){ break; case 1: window.open(obj.attr('url')); - return false; + return false; break; case 2: $msg = '准备打包'; @@ -459,15 +478,31 @@ $(".editTab").click(function(){ var title = that.attr("data-title"); var game_id = that.attr("game-id"); var promote_id = that.attr("promote-id"); - var field = that.attr('field'); + var field = that.attr('field'); layer.prompt({title:title,formType:0},function(value,index) { - if (!/^(((\d|[1-9]\d)(\.\d{1,2})?)|100|100.0|100.00)$/.test(value)) { - updateAlert('分成比例输入错误','tip_error'); - setTimeout(function(){ - $('#tip').find('.tipclose').click(); - },2000); - return false; + if (field == 'promote_ratio' || field == 'promote_money') { + if (!/^(((\d|[1-9]\d)(\.\d{1,2})?)|100|100.0|100.00)$/.test(value)) { + if (field == 'promote_ratio') { + updateAlert('分成比例输入错误','tip_error'); + } else { + updateAlert('游戏注册单价输入错误','tip_error'); + } + + setTimeout(function(){ + $('#tip').find('.tipclose').click(); + },2000); + return false; + } + } else if (field = 'bale_sort') { + if (!/^(?:0|[1-9][0-9]*)$/.test(value)) { + updateAlert('请输入正整数','tip_error'); + setTimeout(function(){ + $('#tip').find('.tipclose').click(); + },2000); + return false; + } } + $.ajax({ async: false, url:"{:U('Apply/setRatio')}", diff --git a/Data/update.sql b/Data/update.sql index 3c812eda2..95a8b522c 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -61,4 +61,7 @@ INSERT INTO `tab_promote_quick_menu` VALUES ('18', '1', '1', '1569720739'); -- 2019-10-01 alter table tab_game_source add column `original_url` varchar(255) NOT NULL default '' COMMENT '原包路径'; -alter table tab_game_source add column `org_plist_url` varchar(255) NOT NULL default '' COMMENT '原包Plist路径'; \ No newline at end of file +alter table tab_game_source add column `org_plist_url` varchar(255) NOT NULL default '' COMMENT '原包Plist路径'; + +-- 2019-10-11 cxj +ALTER TABLE `tab_apply` ADD COLUMN `bale_sort` int(5) NOT NULL DEFAULT 0 COMMENT '打包顺序' AFTER `offline_status`; \ No newline at end of file