diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php index 08172daa0..eca3e177a 100644 --- a/Application/Admin/Controller/MendController.class.php +++ b/Application/Admin/Controller/MendController.class.php @@ -31,7 +31,11 @@ class MendController extends ThinkController { $map['register_type'] = array('in','(0,1,2,3,4,5,6,7)'); parent::lists("user",$p,$map); } - + /** + * 补链记录 + * @param integer $p 分页 + * @return void + */ public function recordList($p=1) { $page = intval($p); @@ -41,7 +45,6 @@ class MendController extends ThinkController { } else { $row = 10; } - if(isset($_REQUEST['account'])){ if ($_REQUEST['account']=='全部') { unset($_REQUEST['account']); @@ -51,13 +54,27 @@ class MendController extends ThinkController { } $data = M("Mend","tab_") + ->field("id,user_account,promote_account,promote_account_to,op_account,order_time,create_time,remark") ->where($map) ->order("create_time desc") ->page($page, $row) ->select(); - $count = M("Mend","tab_")->where($map)->count(); + //格式化信息 + foreach ($data as $key => $value) { + $data[$key]['create_time'] = date("Y-m-d H:i:s",$value['create_time']); + $data[$key]['order_time'] = date("Y-m-d",$value['order_time']); + } + if(IS_POST){ + $page = set_pagination($_REQUEST['row_count'],$row); + $this->ajaxReturn(array( + "list_data"=>$data, + "page"=>$page + )); + die(); + } - $this->assign('show_status',1); + $count = M("Mend","tab_")->where($map)->count(); + $this->assign('row_count',$count); $this->assign('list_data', $data); $page = set_pagination($count,$row); diff --git a/Application/Admin/View/Mend/lists.html b/Application/Admin/View/Mend/lists.html index 82544ba27..c8a7f016a 100644 --- a/Application/Admin/View/Mend/lists.html +++ b/Application/Admin/View/Mend/lists.html @@ -181,7 +181,7 @@ + -
推广补链 @@ -27,9 +33,8 @@
-
- 搜索 + 搜索
@@ -37,60 +42,6 @@
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
玩家账号注册时间最后登录时间注册来源注册IP源上次登录所属推广员操作
aOh! 暂时还没有内容!
{$data.account}{$data.register_time|date='Y-m-d H:i:s',###}{$data.login_time|date='Y-m-d H:i:s',###}{:get_registertype($data['register_type'])}{$data.register_ip}{$data.login_time|date='Y-m-d H:i:s',###} - - {$data['promote_account']}{:get_parent_promoteto($data['promote_id'])} - - {:get_promote_name($data['promote_id'])} - - - 补链 - - 补链中 - - -
-
-
@@ -102,7 +53,7 @@ - + @@ -110,7 +61,7 @@ - + @@ -118,13 +69,13 @@ - - - + + - - + + @@ -132,15 +83,13 @@
玩家账号 补链前渠道 补链后渠道备注备注 切分时间 补链时间 操作人员
aOh! 暂时还没有内容!
{$data['user_account']}{:get_promote_name($data['promote_id'])}{:get_promote_name($data['promote_id_to'])} - {:get_title($data['remark'])} + {$data['promote_account']}{$data['promote_account_to']} + {$data['remark']} {$data.order_time|date='Y-m-d H:i:s',###}{$data.create_time|date='Y-m-d H:i:s',###}{$data.order_time}{$data.create_time} {$data.op_account}
-
- - 导出 - - 导出 - - {$_page|default=''} + 导出 +
+ {$_page|default=''} +
+
@@ -156,6 +105,22 @@ + if(C('COLOR_STYLE')=='blue_color') echo ''; @@ -165,6 +130,7 @@ + diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php index 7fe9e4803..29e2fe24f 100644 --- a/Application/Common/Common/extend.php +++ b/Application/Common/Common/extend.php @@ -375,8 +375,29 @@ function get_custom_category_title($id=0,$title=0) { */ function set_pagination($count, $row,$request='') { - $aside = ''; - $count=$count?$count:0; + $aside = ''; + }else{ + $aside .= ''; + } + + $count=$count?$count:0; $row=$row?$row:10; if ($count > $row) { $page = new \Think\Page($count, $row,$request); diff --git a/Public/static/juicer-min.js b/Public/static/juicer-min.js new file mode 100644 index 000000000..978b50d65 --- /dev/null +++ b/Public/static/juicer-min.js @@ -0,0 +1 @@ +!function(){var e=function(){var t=[].slice.call(arguments);return t.push(e.options),t[0].match(/^\s*#([\w:\-\.]+)\s*$/gim)&&t[0].replace(/^\s*#([\w:\-\.]+)\s*$/gim,function(e,n){var o=document,i=o&&o.getElementById(n);t[0]=i?i.value||i.innerHTML:e}),e.documentHTML&&(e.compile.call(e,e.documentHTML),e.documentHTML=""),1==arguments.length?e.compile.apply(e,t):arguments.length>=2?e.to_html.apply(e,t):void 0},t={escapehash:{"<":"<",">":">","&":"&",'"':""","'":"'","/":"/"},escapereplace:function(e){return t.escapehash[e]},escaping:function(e){return"string"!=typeof e?e:e.replace(/[&<>"']/gim,this.escapereplace)},detection:function(e){return"undefined"==typeof e?"":e}},n=function(e){if("undefined"!=typeof console){if(console.warn)return void console.warn(e);if(console.log)return void console.log(e)}throw e},o=function(e,t){if(e=e!==Object(e)?{}:e,e.__proto__)return e.__proto__=t,e;var n=function(){},o=Object.create?Object.create(t):new(n.prototype=t,n);for(var i in e)e.hasOwnProperty(i)&&(o[i]=e[i]);return o},i=function(e){var t,n,o,i=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,r=/,/,s=/^\s*(_?)(\S+?)\1\s*$/,a=/^function[^{]+{([\s\S]*)}/m,c=[];"function"==typeof e?e.length&&(t=e.toString()):"string"==typeof e&&(t=e),t=t.trim(),o=t.match(i),n=t.match(a)[1].trim();for(var p=0;p1&&(e=i.shift(),o=i.shift().split(","),r="_method."+o.shift()+".call(this, "+[e].concat(o)+")"),"<%= "+(t?"_method.__escapehtml.escaping":"")+"("+(n&&n.detection===!1?"":"_method.__escapehtml.detection")+"("+r+")) %>"},this.__removeShell=function(t,o){var r=0;return t=t.replace(e.settings.helperRegister,function(t,n,o){var r=i(o),s=r[0],a=r[1],c=new Function(s.join(","),a);return e.register(n,c),t}).replace(e.settings.forstart,function(e,t,n,o){var n=n||"value",o=o&&o.substr(1),i="i"+r++;return"<% ~function() {for(var "+i+" in "+t+") {if("+t+".hasOwnProperty("+i+")) {var "+n+"="+t+"["+i+"];"+(o?"var "+o+"="+i+";":"")+" %>"}).replace(e.settings.forend,"<% }}}(); %>").replace(e.settings.ifstart,function(e,t){return"<% if("+t+") { %>"}).replace(e.settings.ifend,"<% } %>").replace(e.settings.elsestart,function(){return"<% } else { %>"}).replace(e.settings.elseifstart,function(e,t){return"<% } else if("+t+") { %>"}).replace(e.settings.noneencode,function(e,t){return n.__interpolate(t,!1,o)}).replace(e.settings.interpolate,function(e,t){return n.__interpolate(t,!0,o)}).replace(e.settings.inlinecomment,"").replace(e.settings.rangestart,function(e,t,n,o){var i="j"+r++;return"<% ~function() {for(var "+i+"="+n+";"+i+"<"+o+";"+i+"++) {{var "+t+"="+i+"; %>"}).replace(e.settings.include,function(e,t,n){return t.match(/^file\:\/\//gim)?e:"<%= _method.__juicer("+t+", "+n+"); %>"}),o&&o.errorhandling===!1||(t="<% try { %>"+t,t+='<% } catch(e) {_method.__throw("Juicer Render Exception: "+e.message);} %>'),t},this.__toNative=function(e,t){return this.__convert(e,!t||t.strip)},this.__lexicalAnalyze=function(t){var n=[],o=[],i="",r=["if","each","_","_method","console","break","case","catch","continue","debugger","default","delete","do","finally","for","function","in","instanceof","new","return","switch","this","throw","try","typeof","var","void","while","with","null","typeof","class","enum","export","extends","import","super","implements","interface","let","package","private","protected","public","static","yield","const","arguments","true","false","undefined","NaN"],s=function(e,t){if(Array.prototype.indexOf&&e.indexOf===Array.prototype.indexOf)return e.indexOf(t);for(var n=0;n=,\(\)\[\]]\s*([A-Za-z_0-9]+)/gim,a);for(var c=0;c"},this.__convert=function(e,t){var n=[].join("");return n+="'use strict';",n+="var _=_||{};",n+="var _out='';_out+='",n+=t!==!1?e.replace(/\\/g,"\\\\").replace(/[\r\t\n]/g," ").replace(/'(?=[^%]*%>)/g," ").split("'").join("\\'").split(" ").join("'").replace(/<%=(.+?)%>/g,"';_out+=$1;_out+='").split("<%").join("';").split("%>").join("_out+='")+"';return _out;":e.replace(/\\/g,"\\\\").replace(/[\r]/g,"\\r").replace(/[\t]/g,"\\t").replace(/[\n]/g,"\\n").replace(/'(?=[^%]*%>)/g," ").split("'").join("\\'").split(" ").join("'").replace(/<%=(.+?)%>/g,"';_out+=$1;_out+='").split("<%").join("';").split("%>").join("_out+='")+"';return _out.replace(/[\\r\\n]\\s+[\\r\\n]/g, '\\r\\n');"},this.parse=function(e,t){var i=this;return t&&t.loose===!1||(e=this.__lexicalAnalyze(e)+e),e=this.__removeShell(e,t),e=this.__toNative(e,t),this._render=new Function("_, _method",e),this.render=function(e,t){return t&&t===n.options._method||(t=o(t,n.options._method)),i._render.call(this,e,t)},this}},e.compile=function(e,t){t&&t===this.options||(t=o(t,this.options));var i=this,r={get:function(e){return t.cachestore?t.cachestore.get(e):i.__cache[e]},set:function(e,n){return t.cachestore?t.cachestore.set(e,n):i.__cache[e]=n}};try{var s=r.get(e)?r.get(e):new this.template(this.options).parse(e,t);return t&&t.cache===!1||r.set(e,s),s}catch(a){return n("Juicer Compile Exception: "+a.message),{render:function(){}}}},e.to_html=function(e,t,n){return n&&n===this.options||(n=o(n,this.options)),this.compile(e,n).render(t,n._method)},"undefined"!=typeof global&&"undefined"==typeof window&&e.set("cache",!1),"undefined"!=typeof document&&document.body&&(e.documentHTML=document.body.innerHTML),"undefined"!=typeof module&&module.exports?module.exports=e:this.juicer=e}(); \ No newline at end of file