Your Name 3 rokov pred
rodič
commit
ef6f8f1aa3
2 zmenil súbory, kde vykonal 5 pridanie a 6 odobranie
  1. 3 0
      learn/active/src/User.php
  2. 2 6
      service/mail/lib/Manage.php

+ 3 - 0
learn/active/src/User.php

@@ -171,6 +171,9 @@ Class User extends Core
     	if ($data['user']) {
     		$data['user']['role_name'] = '';
     		$data['user']['title_name'] = '';
+            if ($data['user']['birthday']) {
+                $data['user']['birthday'] = date('Y-m-d',$data['user']['birthday']);
+            }
     		$member = Dever::db('agent/member')->find(array('mobile'=>$data['user']['mobile']));
     		if ($member) {
     			$role = Dever::db('setting/role')->find($member['role']);

+ 2 - 6
service/mail/lib/Manage.php

@@ -707,9 +707,7 @@ class Manage
                 $price = ($v['price'] - $c_price);
                 $total += $price;
                 $shop[$v['type_id']] += $price * $per;
-            }
-            foreach ($shop as $k => $v) {
-                $shop[$k] = round($shop[$k], 2);
+                $shop[$v['type_id']] = round($shop[$v['type_id']], 2);
             }
         }
         
@@ -730,9 +728,7 @@ class Manage
                 $price = $v['buy'];
                 $total += $price;
                 $shop[$v['shop_id']] += $price * $per;
-            }
-            foreach ($shop as $k => $v) {
-                $shop[$k] = round($shop[$k], 2);
+                $shop[$v['shop_id']] = round($shop[$v['shop_id']], 2);
             }
         }
         return array(round($total, 2), round($total*$per, 2), $shop);