rabin 2 rokov pred
rodič
commit
8e3be7c751

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

@@ -31,7 +31,7 @@ class Goods extends Core
         $manage_config = Dever::db('main/manage_config')->find();
         $sell_config = Dever::db('main/sell_config')->find();
         $main_config = Dever::db('main/config')->find();
-        $data = Dever::load('shop/lib/info')->getGoodsSku($this->shop_id);
+        $data = Dever::load('shop/lib/info')->getGoodsSku($this->shop_id, false);
 
 
         $pdf = Dever::load('pdf/lib/base')->init();

+ 33 - 0
app/shop/database/goods_sku.php

@@ -293,6 +293,39 @@ $config = array
             'col' => '*,t_2.name,t_2.cover,t_2.id as id,t_1.total_num-t_1.sell_num as total,t_1.sell_num',
         ),
 
+        'getAllData' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'shop_id' => array('yes-t_1.shop_id'),
+                'name' => array('yes-t_2.name', 'like'),
+                'total' => array('yes|t_1.total_num-t_1.sell_num', '<'),
+                'column' => array('yes-t_2.column_id', 'like'),
+                'category' => array('yes-t_2.category', 'like'),
+                'top_category_id' => array('yes-t_2.top_category_id'),
+                'second_category_id' => array('yes-t_2.second_category_id'),
+                'category_id' => array('yes-t_2.category_id'),
+                'status' => array('yes-t_2.status', 1),
+                'state' => array('yes-t_2.state', 1),
+                'state_1' => array('yes-t_1.state', 1),
+            ),
+            # 联表
+            'join' => array
+            (
+                array
+                (
+                    'table' => 'goods/info',
+                    'type' => 'left join',
+                    'on' => array('goods_id','id'),
+                    'col' => 'goods_id',
+                ),
+            ),
+            'type' => 'all',
+            'order' => array('t_2.reorder' => 'desc', 't_2.id' => 'desc', 't_2.price' => 'asc'),
+            'col' => '*,t_2.name,t_2.cover,t_2.id as id,t_1.total_num-t_1.sell_num as total,t_1.sell_num',
+        ),
+
        # 列表
         'getData' => array
         (

+ 6 - 2
app/shop/lib/Info.php

@@ -173,11 +173,15 @@ class Info
     }
 
     # 获取店铺的商品SKU列表
-    public function getGoodsSku($shop)
+    public function getGoodsSku($shop, $page = true)
     {
         $table = 'shop/goods_sku';
         $where['shop_id'] = isset($shop['id']) ? $shop['id'] : $shop;
-        $method = 'getDataPage';
+        if ($page) {
+            $method = 'getDataPage';
+        } else {
+            $method = 'getAllData';
+        }
         
         $name = Dever::input('name');
         if ($name) {

+ 1 - 0
service/agent/database/member.php

@@ -682,6 +682,7 @@ return array
         'insert' => false,
         'delete' => false,
         'edit' => false,
+        'excel' => true,
         'button' => $button,
 
         'list_button' => $list_button,