Merge branch 'release' of 47.111.118.107:wmtx/platform into release

Application/Admin/Controller/ToolController.class.php

@@ -39,13 +39,11 @@ class ToolController extends ThinkController {
             $map_['name']=array("in",'wei_xin,wei_xin_app,weixin');
             M('tool','tab_')->where($map_)->setField('status','0');
         }
-        if (!is_numeric($config['channel_rate'])) {
+        if (isset($config['channel_rate']) && ($config['channel_rate'] > 100 || !is_numeric($config['channel_rate']))) {
             $this->error('请输入正确的渠道费率');
         }
-        if ($config['channel_rate'] > 100) {
-            $this->error('渠道费率最大值为100%');
-        }
-        $config['channel_rate'] = round($config['channel_rate'], 2);
+        if (isset($config['channel_rate'])) $config['channel_rate'] =  round($config['channel_rate'], 2);
+        
         $flag   = M('Tool','tab_')->where($map)->setField($data);
         if($flag !== false){
             $config['status']=$_POST['status'];

Application/Home/Controller/SafeController.class.php

@@ -523,7 +523,7 @@ class SafeController extends BaseController{
         }
         $page = intval(I('get.p', 1));
         $page = $page ? $page : 1; //默认显示第一页数据arraypage
-        $rs = M('promote_action_logs','tab_')->where($map)->order('create_time')
+        $rs = M('promote_action_logs','tab_')->where($map)->order('create_time DESC')
             ->page($page, $row)->select();
         foreach($rs as $key => $v) {
                 $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);