dever 3 yıl önce
ebeveyn
işleme
9e503ad3c6

+ 4 - 0
app/factory/admin/Auth.php

@@ -383,11 +383,15 @@ class Auth
             $type = implode(',', $type);
         }
 
+        $this->msg = 0;
+
+        /*
         if ($info && Dever::project('message')) {
             $this->msg = Dever::load('message/lib/data')->num($info['factory_id'], 4, $type);
         } else {
             $this->msg = 0;
         }
+        */
 
         return $data;
     }

+ 1 - 1
app/factory/admin/Msg.php

@@ -8,7 +8,7 @@ class Msg extends Core
     # 列表
     public function getList()
     {
-        $data = Dever::load('message/lib/data')->read($this->id, $this->user['msg_type'], false, false, 4);
+        $data = Dever::load('message/lib/data')->read($this->id, $this->user['msg_type'], true, false, 4);
 
         $html = '';
 		if ($data) {

+ 1 - 1
app/mshop/src/Data.php

@@ -265,7 +265,7 @@ class Data extends Core
     }
 
     # 赠送优惠券
-    public function giveCoupon()
+    public function giveCoupon_commit()
     {
         $coupon_id = Dever::input('coupon_id');
         $coupon = explode(',', $coupon_id);

+ 1 - 0
app/shop/lib/Coupon.php

@@ -111,6 +111,7 @@ class Coupon
     # 领取
     public function take($uid, $shop, $shop_coupon, $num = 1)
     {
+        $id = false;
         $add_num = 0;
         for ($i = 0; $i < $num; $i++) {
             $data['uid'] = $uid;

+ 3 - 0
app/store/admin/Auth.php

@@ -404,11 +404,14 @@ class Auth
             $type = implode(',', $type);
         }
 
+        $this->msg = 0;
+        /*
         if ($info && Dever::project('message')) {
             $this->msg = Dever::load('message/lib/data')->num($info['store_id'], 3, $type);
         } else {
             $this->msg = 0;
         }
+        */
 
         return $data;
     }

+ 1 - 1
app/store/admin/Msg.php

@@ -8,7 +8,7 @@ class Msg extends Core
     # 列表
     public function getList()
     {
-        $data = Dever::load('message/lib/data')->read($this->id, $this->user['msg_type'], false, false, 3);
+        $data = Dever::load('message/lib/data')->read($this->id, $this->user['msg_type'], true, false, 3);
 
         $html = '';
 		if ($data) {

+ 1 - 1
app/store/admin/Order.php

@@ -82,7 +82,7 @@ class Order extends Core
     	$config = array
         (
         	array('value' => '0', 'name' => '全部'),
-            array('value' => 3, 'name' => '待生产发货'),
+            array('value' => 3, 'name' => '待发货'),
             array('value' => 4, 'name' => '已发货'),
             array('value' => '5,6', 'name' => '已到货'),
             array('value' => '7,8,11', 'name' => '已取消'),