Merge branch 'master' of 47.111.118.107:/srv/git/platform into dev

Conflicts: Application/Admin/Controller/StatController.class.php
5 years ago · 2cc68f3086
parent 695b7c8895 245e07fc3f
commit 2cc68f3086
3 changed files with 6 additions and 6 deletions
--- a/Application/Admin/Controller/StatController.class.php
+++ b/Application/Admin/Controller/StatController.class.php
@ -1407,7 +1407,7 @@ class StatController extends ThinkController
            $model = M('device_statistics','tab_');

 		    if ($type == 0) {
-		        $return = $model->where(['time'=>['neq',0]])->sum('new_device');
+		        $return = $model->where(array('time'=>array('neq',0)))->sum('new_device');
 //                $return = $device->all_device();
            } else if($type == 1) {
                $return = $model->where(['time'=>array('between',[$todaystart,$todaystart+86399])])->sum('new_device');
--- a/Application/Home/View/default/Finance/settlementDtl.html
+++ b/Application/Home/View/default/Finance/settlementDtl.html
@ -164,11 +164,11 @@
                    <td>{$vo.promote_account}</td>
                    <td>{$vo.pay_amount}</td>
                    <if condition="$vo.pay_way eq -1">
-                      <td>0</td>
+                      <td>0.00</td>
                      <td>{$vo.pay_amount}</td>
                      <else/>
                      <td>{$vo.pay_amount}</td>
-                      <td>0</td>
+                      <td>0.00</td>
                    </if>
                    <td>{$vo.selle_ratio}%|{$vo.selle_ratio}%</td>
                    <td>{$vo.income}</td>