diff --git a/app/admin/controller/Api.php b/app/admin/controller/Api.php
index 68e7b0b..7345488 100644
--- a/app/admin/controller/Api.php
+++ b/app/admin/controller/Api.php
@@ -1282,6 +1282,16 @@ class Api extends BaseController
return to_assign(0, '操作失败');
}
-
+ public function category_arr($id=0){
+ $where[]=['is_show','=',1];
+ $where[]=['mer_id','=',0];
+ if($id!=0){
+ $where[1]=['mer_id','=',$id];
+ }
+ $list=Db::connect('shop')->table('eb_store_category')->where($where)
+ ->field('store_category_id id,pid,cate_name name')->select();
+ $category_arr=create_tree_list(0,$list,0);
+ return to_assign(0,'操作成功', $category_arr);
+ }
}
diff --git a/app/admin/controller/StoreProduct.php b/app/admin/controller/StoreProduct.php
index 567d95a..45d1eac 100644
--- a/app/admin/controller/StoreProduct.php
+++ b/app/admin/controller/StoreProduct.php
@@ -36,6 +36,8 @@ class StoreProduct extends BaseController
if (request()->isAjax()) {
$param = get_params();
$where[] = ['admin_id','=',$this->uid];
+ $where[] = ['status','=',1];
+ $where[] = ['is_del','=',0];
if (isset($param['keywords']) && !empty($param['keywords'])){
$where[]=['store_name','like','%'.$param['keywords'].'%'];
}
@@ -1286,8 +1288,49 @@ class StoreProduct extends BaseController
}
}
+// 商品库存列表
+ public function stock(){
+ if (request()->isAjax()) {
+ $param = get_params();
+// $where[] = ['admin_id','=',$this->uid];
+ $where[] = ['status','=',1];
+ $where[] = ['is_del','=',0];
+ if (isset($param['keywords']) && !empty($param['keywords'])){
+ $where[]=['store_name|bar_code','like','%'.$param['keywords'].'%'];
+ }
+ if (isset($param['store_cate']) && !empty($param['store_cate'])){
+ $www[]=['b.cate_id','=',$param['store_cate']];
+ }
+ $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+ $order = empty($param['order']) ? 'product_id desc' : $param['order'];
+ $bar_code_arr = Db::table('cms_store_product')->where($where)->order($order)->column('bar_code');
+ $www[]=['a.bar_code','in',$bar_code_arr];
+
+ $list = Db::connect('shop')->table('eb_store_product_attr_value')
+ ->alias('a')
+ ->join('eb_store_product b','a.product_id =b.product_id')
+ ->field('a.*,b.cate_id,b.store_name')
+ ->withAttr('shangjia',function ($value,$data){
+ return Db::table('cms_admin')->where('id',$this->uid)->value('nickname');
+ })
+ ->withAttr('cate_id',function ($value,$data){
+ $www2['store_category_id'] = $data['cate_id'];
+ return Db::connect('shop')->table('eb_store_category')->where($www2)->value('cate_name');
+ })
+ ->where($www)
+ ->order($order)
+ ->paginate($rows, false, ['query' => $param]);
+
+ return table_assign(0, '', $list);
+ }
+ else{
+ return view();
+ }
+ }
+
+//
}
diff --git a/app/admin/view/store_product/add.html b/app/admin/view/store_product/add.html
index 0919051..2eb69da 100644
--- a/app/admin/view/store_product/add.html
+++ b/app/admin/view/store_product/add.html
@@ -119,7 +119,11 @@
-
+
+ | 商品编码* |
+ |
+
| 单位* |
|
- 品牌选择*
- |
-
-
- |
-
-
- | 商户分类*
- |
-
-
- |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
| 商品封面图 |
@@ -126,6 +126,12 @@
+
+ | 商品编码* |
+ |
+
+
| 单位* |
|
- 品牌选择*
- |
-
-
- |
-
-
- | 商户分类*
- |
-
-
- |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
| 商品封面图 |
@@ -120,6 +120,12 @@
+
+ | 商品编码* |
+ |
+
+
| 单位* |
+{block name="body"}
+
+
+
+
+
+
+
+{/block}
+
+
+{block name="script"}
+
+{/block}
+
\ No newline at end of file
|