商品筛选与列表状态切换

app/admin/controller/product/Product.php

@@ -12,14 +12,16 @@ use think\facade\View;
 use app\admin\model\Merchant; // 商户模型
 use app\admin\model\EbStoreProduct; // 商品模型
 use app\admin\model\StoreCategory; // 商品分类模型
-use app\admin\model\GeoCity; // 省市模型
-use app\admin\model\GeoArea; // 区域模型
-use app\admin\model\GeoStreet; // 街道模型
-use app\admin\model\SupplyChain; // 供应链模型
-use app\api\model\Area as AreaModel; // 市场区域模型
-use app\api\model\AreaManager as AreaManagerModel; // 区域负责人模型
 use app\common\controller\FormatList;
 
+// use app\admin\model\GeoCity; // 省市模型
+// use app\admin\model\GeoArea; // 区域模型
+// use app\admin\model\GeoStreet; // 街道模型
+use app\admin\model\SupplyChain; // 供应链模型
+// use app\api\model\Area as AreaModel; // 市场区域模型
+// use app\api\model\AreaManager as AreaManagerModel; // 区域负责人模型
+
+
 /**
  * 
  * 商品控制器
@@ -31,6 +33,7 @@ class Product extends BaseController
     protected $adminInfo;
     protected $url;
     protected $product;
+    protected $mer_id = 4;//待开发成自动获取商城登陆商户id
 
     public function __construct(EbStoreProduct $product)
     {
@@ -71,12 +74,12 @@ class Product extends BaseController
 
     /**
      * 
-     * 供应链团队列表
+     * 商户商品列表
      * 
      */
     public function index(StoreCategory $category)
     {
-        if (true) {
+        if (request()->isAjax()) {
             // request()->isAjax()
             // Ajax 前端获取数据
             $params= get_params();
@@ -101,9 +104,9 @@ class Product extends BaseController
             // product
             $where['is_gift_bag'] = empty($params['is_gift'])?'':$params['is_gift'];
             $where['is_show'] = empty($params['state'])?'':$params['state'];
-            // $where['temp_id'] = empty($params['shipping_tem'])?'':$params['shipping_tem'];
+            $where['temp_id'] = empty($params['shipping_tem'])?'':$params['shipping_tem'];
             $where['labels'] = empty($params['tag'])?'':$params['tag'];
-            $where['type'] = 1;//实体商品：0 虚拟商品:1
+            $where['type'] = empty($params['type'])?'':$params['type'];//实体商品：0 虚拟商品:1
             // $where['status'] = 0;//管理、审核、通过
 
 
@@ -111,12 +114,13 @@ class Product extends BaseController
             // $where['product_id'] = 0;
             // ['order','sort']
             // soft //软删除
-            if (!empty(get_params('mer_id'))) {
+            // $params['mer_id'] = $this->mer_id;
+            if (!empty($params['mer_id'])) {
                 $mer_id = get_params('mer_id');
                 $where = array_merge($where, $this->switchType($where['type'],$mer_id,0));
             }
-            $mer_id = 77;
+            $mer_id = isset($params['mer_id'])?$params['mer_id']:NULL;
-
+           
             $data = $this->product->getList($mer_id, $where, $page, $limit);
 
             

app/admin/controller/product/StoreCategory.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * @date ：2023年03月11日
+ * @author：刘孝全
+ * @email：q8197264@126.com
+ * 
+ * @ 商品分类列表
+ */
+namespace app\admin\controller\product;
+
+use app\admin\BaseController;
+use app\admin\model\StoreCategory as StoreCategoryModel;
+use app\common\controller\FormatList;
+
+use app\common\model\merchant\user\UserMerchant;
+
+class StoreCategory extends BaseController
+{
+    protected $category;
+    protected $mer_id = 4;
+
+    public function __construct(StoreCategoryModel $category)
+    {
+        $this->category = $category;
+    }
+
+    protected function getMerId(UserMerchant $user)
+    {
+        // $user->isMerUser($uid, $mer_id);
+    }
+
+    /**
+     * 平台商品分类Tree列表
+     * 
+     */
+    public function getList()
+    {
+        $where['mer_id'] = 0;
+        $where['is_show'] = 0;
+        $list = $this->category->getList($where);
+        $list = FormatList::DropDownMenu($list);
+
+        return to_assign(0,'', $list);
+    }
+
+    /**
+     * 商户商品分类Tree列表
+     */
+    public function getStoreCategoryList(){
+        $data = $this->category->getStoreCategoryList($this->mer_id, 1);
+        $list = FormatList::FormatCategory($data,'store_category_id', 'pid', 'cate_name','child', 'id', 'title');
+
+        return to_assign(0, '', $list);
+    }
+
+}

app/admin/model/EbStoreProduct.php

@@ -14,46 +14,6 @@ use think\Model;
 use app\admin\model\store\ProductCate;
 
 
-if (!function_exists('hasMany')) {
-  function hasMany($collection, $field, $model, $searchKey, $insertKey, $where = [] ,$select = '*')
-  {
-      $ids = [];
-      $link = [];
-
-      if (!$collection) return [];
-      $collection = $collection->toArray();
-      foreach ($collection as $k => $item) {
-          if (is_array($item[$field])) {
-              $link[$k] = array_unique($item[$field]);
-              $ids = array_merge($item[$field], $ids);
-          } else {
-              $link[$k] = array_unique(explode(',', $item[$field]));
-          }
-          $ids = array_merge($link[$k], $ids);
-          if (isset($collection[$k][$insertKey])) unset($collection[$k][$insertKey]);
-      }
-      $ids = array_filter(array_unique($ids));
-      if (!count($ids)) {
-          return $collection;
-      }
-      $many = $model::whereIn($searchKey, array_unique($ids))->where($where)->field($select)->select();
-
-      if (!$many) return $collection;
-      $many = $many->toArray();
-      foreach ($link as $k => $val) {
-          foreach ($many as $item) {
-              if (in_array($item[$searchKey], $val)) {
-
-                  if (!isset($collection[$k][$insertKey])) $collection[$k][$insertKey] = [];
-
-                  $collection[$k][$insertKey][] = $item;
-              }
-          }
-      }
-
-      return $collection;
-  }
-}
 class EbStoreProduct extends Model
 {
   // 设置当前模型的数据库连接
@@ -71,9 +31,9 @@ class EbStoreProduct extends Model
    * 
    */
   public function merchant()
-    {
+  {
-        return $this->hasOne(Merchant::class,'mer_id','mer_id')->field('is_trader,type_id,mer_id,mer_name,mer_avatar,product_score,service_score,postage_score,service_phone,care_count');
+      return $this->hasOne(Merchant::class,'mer_id','mer_id')->field('is_trader,type_id,mer_id,mer_name,mer_avatar,product_score,service_score,postage_score,service_phone,care_count');
-    }
+  }
 
   public function storeCategory()
   {
@@ -81,13 +41,14 @@ class EbStoreProduct extends Model
   }
   public function merCateId()
   {
-      return $this->hasMany(ProductCate::class,'product_id','product_id')->field('product_id,mer_cate_id');
+      return $this->hasMany(ProductCate::class,'product_id','product_id')->field('product_id, mer_cate_id');
   }
 
   public function brand()
-    {
+  {
-        return $this->hasOne(StoreBrand::class,'brand_id','brand_id')->field('brand_id,brand_name');
+      return $this->hasOne(StoreBrand::class,'brand_id','brand_id')->field('brand_id,brand_name');
-    }
+  }
+
 
   /**
    * TODO 商户商品列表
@@ -102,13 +63,15 @@ class EbStoreProduct extends Model
   public function getList(?int $mer_id, array $where, int $page, int $limit)
   {
     $query = self::search($mer_id, $where)
-    ->with(['merCateId.category', 'storeCategory', 'brand']);
+    ->with(['merCateId.category', 'storeCategory', 'brand', 'Merchant']);
     $count = $query->count();
     $data = $query->field($this->filed)->page($page, $limit)
-    ->order('product_id desc')
+    ->order('Product.product_id desc')
+    // ->fetchSql()
     ->select();
+    // echo $data;exit('--');
     $data->append(['us_status']);
-
+    
     $list = hasMany(
       $data,
       'mer_labels',
@@ -152,22 +115,17 @@ class EbStoreProduct extends Model
 
     $query = self::alias('Product');
     if (isset($where['is_trader']) && $where['is_trader'] !== '') {
-      $query->Join('Merchant', 'Merchant.mer_id = Product.mer_id')
+      // hasWhere添加别名不生效 alias， 改为Join
-      ->where('Merchant.is_trader', $where['is_trader'])
-      ->when(($merId !== null), 
-        function ($query) use ($merId) {
-          $query->where('Product.mer_id', $merId);
-        }
-      );
-
       // $query->hasWhere('merchant', 
       //   function ($query) use ($where) {
       //     $query->where('is_trader', $where['is_trader']);
       //   }
       // );
+      $query->Join('Merchant', 'Merchant.mer_id = Product.mer_id')
+      ->where('Merchant.is_trader', $where['is_trader']);
     }
-
     $query->withSearch($keyArray, $whereArr)
+    
     ->Join('StoreSpu U', 'Product.product_id = U.product_id')
     ->where('U.product_type', $where['product_type'] ?? 0)
     ->when(($merId !== null), 
@@ -187,8 +145,7 @@ class EbStoreProduct extends Model
           $query->where('is_benefit', 1);
       }
     )
-    ->when(
+    ->when(isset($where['pid']) && $where['pid'] !== '',
-      isset($where['pid']) && $where['pid'] !== '',
       function ($query) use ($where) {
         $ids = array_merge(self::findChildrenId((int)$where['pid']), [(int)$where['pid']]);
         if (count($ids)) $query->whereIn('cate_id', $ids);
@@ -239,8 +196,93 @@ class EbStoreProduct extends Model
     return $query;
   }
 
+  /**
+   * 
+   */
   public function findChildrenId($id)
   {
     return StoreCategory::whereLike('path', '%/' . $id . '/%')->column('store_category_id');
   }
+
+  protected function hasMany1($collection, $field, $model, $searchKey, $insertKey, $where = [] ,$select = '*')
+  {
+      $ids = [];
+      $link = [];
+
+      if (!$collection) return [];
+      $collection = $collection->toArray();
+      foreach ($collection as $k => $item) {
+          if (is_array($item[$field])) {
+              $link[$k] = array_unique($item[$field]);
+              $ids = array_merge($item[$field], $ids);
+          } else {
+              $link[$k] = array_unique(explode(',', $item[$field]));
+          }
+          $ids = array_merge($link[$k], $ids);
+          if (isset($collection[$k][$insertKey])) unset($collection[$k][$insertKey]);
+      }
+      $ids = array_filter(array_unique($ids));
+      if (!count($ids)) {
+          return $collection;
+      }
+      $many = $model::whereIn($searchKey, array_unique($ids))->where($where)->field($select)->select();
+
+      if (!$many) return $collection;
+      $many = $many->toArray();
+      foreach ($link as $k => $val) {
+          foreach ($many as $item) {
+              if (in_array($item[$searchKey], $val)) {
+
+                  if (!isset($collection[$k][$insertKey])) $collection[$k][$insertKey] = [];
+
+                  $collection[$k][$insertKey][] = $item;
+              }
+          }
+      }
+
+      return $collection;
+  }
+}
+
+
+
+if (!function_exists('hasMany')) {
+  function hasMany($collection, $field, $model, $searchKey, $insertKey, $where = [] ,$select = '*')
+  {
+      $ids = [];
+      $link = [];
+
+      if (!$collection) return [];
+      $collection = $collection->toArray();
+      foreach ($collection as $k => $item) {
+          if (is_array($item[$field])) {
+              $link[$k] = array_unique($item[$field]);
+              $ids = array_merge($item[$field], $ids);
+          } else {
+              $link[$k] = array_unique(explode(',', $item[$field]));
+          }
+          $ids = array_merge($link[$k], $ids);
+          if (isset($collection[$k][$insertKey])) unset($collection[$k][$insertKey]);
+      }
+      $ids = array_filter(array_unique($ids));
+      if (!count($ids)) {
+          return $collection;
+      }
+      $many = $model::whereIn($searchKey, array_unique($ids))->where($where)->field($select)->select();
+
+      if (!$many) return $collection;
+      $many = $many->toArray();
+      foreach ($link as $k => $val) {
+          foreach ($many as $item) {
+              if (in_array($item[$searchKey], $val)) {
+
+                  if (!isset($collection[$k][$insertKey])) $collection[$k][$insertKey] = [];
+
+                  $collection[$k][$insertKey][] = $item;
+              }
+          }
+      }
+
+      return $collection;
+  }
 }

app/admin/model/StoreCategory.php

@@ -44,6 +44,38 @@
       return $list;
    }
 
+   public function getStoreCategoryList(int $merId = 0,$status = 0)
+   {
+      $data = self::getAllOptions($merId,$status);
+      return $data;
+   }
+
+   /**
+    * 获取列表 -- 筛选用
+    * @Date: 2020/5/16
+    * @param int|null $mer_id
+    * @return mixed
+    */
+   protected function getAllOptions($mer_id = null,$status = null,$level = null)
+   {
+      $field = 'pid,cate_name';
+      $query = StoreCategory::when(($mer_id !== null),
+         function($query)use($mer_id){
+               $query->where('mer_id', $mer_id);
+         })
+         ->when($status,function($query)use($status){
+               $query->where('is_show',$status);
+         })
+         ->when(($level != '' && $level != null),function($query)use($level){
+               $query->where('level','<',$level);
+         }
+      );
+      
+      
+      return $query->order('sort DESC,'.$this->getPk().' DESC')->column($field, $this->getPk());
+   }
+
+
    /**
     * 查询语句构建
     *@author Liuxiaoquan

app/admin/model/store/Product.php

@@ -31,12 +31,18 @@ use think\db\BaseQuery;
 use think\facade\Db;
 use think\model\concern\SoftDelete;
 
+/**
+ * TODO: 
+ */
 class Product extends BaseModel
 {
     use SoftDelete;
 
+
     protected $deleteTime = 'is_del';
     protected $defaultSoftDelete = 0;
+
+
     /**
      * @Author:Qinii
      * @Date: 2020/5/8

app/admin/model/store/ProductCate.php

@@ -18,11 +18,11 @@ use app\admin\model\StoreCategory;
 class ProductCate extends Model
 {
     protected $connection = 'shop';
-    protected $table = 'store_product_cate';
+    protected $table = 'eb_store_product_cate';
 
     public function category()
     {
-        return $this->hasOne(StoreCategory::class,'store_category_id','mer_cate_id')->field('store_category_id,cate_name');
+        return $this->hasOne(StoreCategory::class,'store_category_id','mer_cate_id')->field('store_category_id, cate_name');
     }
 
     public function searchProductIdAttr($query, $value)

app/admin/model/user/UserMerchant.php

@@ -0,0 +1,157 @@
+<?php
+
+namespace app\common\dao\user;
+
+
+// use app\common\model\user\UserLabel;
+use think\db\BaseQuery;
+use think\Model;
+
+/**
+ * Class UserMerchant 
+ */
+class UserMerchant extends Model
+{
+    /**
+     * @return string|null
+     * @author xaboy
+     */
+    public static function tablePk(): ?string
+    {
+        return 'user_merchant_id';
+    }
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public static function tableName(): string
+    {
+        return 'user_merchant';
+    }
+
+    public function user()
+    {
+        return $this->hasOne(User::class, 'uid', 'uid');
+    }
+
+    /**
+     * @param $value
+     * @return array
+     * @author xaboy
+     * @day 2020-05-09
+     */
+    public function getLabelIdAttr($value)
+    {
+        return $value ? explode(',', $value) : [];
+    }
+
+    /**
+     * @param $value
+     * @return string
+     * @author xaboy
+     * @day 2020-05-09
+     */
+    public function setLabelIdAttr($value)
+    {
+        return implode(',', $value);
+    }
+
+    public function getAuthLabelAttr()
+    {
+        return app()->make(UserLabel::class)->whereIn('label_id', $this->label_id)->where('mer_id', $this->mer_id)->where('type', 1)->column('label_id');
+    }
+
+
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    protected function getModel(): string
+    {
+        return UserMerchant::class;
+    }
+
+    /**
+     * @param $uid
+     * @param $mer_id
+     * @return bool
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public function isMerUser($uid, $mer_id)
+    {
+        return $this->existsWhere(compact('uid', 'mer_id'));
+    }
+
+    /**
+     * @param $uid
+     * @param $mer_id
+     * @return int
+     * @throws \think\db\exception\DbException
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public function updateLastTime($uid, $mer_id)
+    {
+        return UserMerchant::getDB()->where(compact('uid', 'mer_id'))->update([
+            'last_time' => date('Y-m-d H:i:s')
+        ]);
+    }
+
+    /**
+     * @param array $where
+     * @return mixed
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public function search(array $where)
+    {
+        return UserMerchant::getDB()->alias('A')->leftJoin('User B', 'A.uid = B.uid')
+            ->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {
+                $query->where('A.mer_id', $where['mer_id']);
+            })->when(isset($where['nickname']) && $where['nickname'], function (BaseQuery $query) use ($where) {
+                return $query->where('B.nickname', 'like', '%' . $where['nickname'] . '%');
+            })->when(isset($where['sex']) && $where['sex'] !== '', function (BaseQuery $query) use ($where) {
+                return $query->where('B.sex', intval($where['sex']));
+            })->when(isset($where['is_promoter']) && $where['is_promoter'] !== '', function (BaseQuery $query) use ($where) {
+                return $query->where('B.is_promoter', $where['is_promoter']);
+            })->when(isset($where['uids']), function (BaseQuery $query) use ($where) {
+                return $query->whereIn('A.uid', $where['uids']);
+            })->when(isset($where['user_time_type']) && $where['user_time_type'] !== '' && $where['user_time'] != '', function ($query) use ($where) {
+                if ($where['user_time_type'] == 'visit') {
+                    getModelTime($query, $where['user_time'], 'A.last_time');
+                }
+                if ($where['user_time_type'] == 'add_time') {
+                    getModelTime($query, $where['user_time'], 'A.create_time');
+                }
+            })->when(isset($where['pay_count']) && $where['pay_count'] !== '', function ($query) use ($where) {
+                if ($where['pay_count'] == -1) {
+                    $query->where('A.pay_num', 0);
+                } else {
+                    $query->where('A.pay_num', '>', $where['pay_count']);
+                }
+            })->when(isset($where['label_id']) && $where['label_id'] !== '', function (BaseQuery $query) use ($where) {
+                return $query->whereRaw('CONCAT(\',\',A.label_id,\',\') LIKE \'%,' . $where['label_id'] . ',%\'');
+            })->when(isset($where['user_type']) && $where['user_type'] !== '', function (BaseQuery $query) use ($where) {
+                return $query->where('B.user_type', $where['user_type']);
+            })->where('A.status', 1);
+    }
+
+    public function numUserIds($mer_id, $min, $max = null)
+    {
+        return UserMerchant::getDB()->where('mer_id', $mer_id)->where('pay_num', '>=', $min)->when(!is_null($max), function ($query) use ($max) {
+            $query->where('pay_num', '<=', $max);
+        })->group('uid')->column('uid');
+    }
+
+    public function priceUserIds($mer_id, $min, $max = null)
+    {
+        return UserMerchant::getDB()->where('mer_id', $mer_id)->where('pay_price', '>=', $min)->when(!is_null($max), function ($query) use ($max, $min) {
+            $query->where('pay_price', $min == $max ? '<=' : '<', $max);
+        })->group('uid')->column('uid');
+    }
+}

app/admin/route/product.php

@@ -134,6 +134,134 @@ Route::group(function () {
     ]);
 
 
+    //商品分类
+    Route::group('store/category', function () {
+        Route::get('create/form', '/createForm')->name('merchantStoreCategoryCreateForm')->option([
+            '_alias' => '添加表单',
+            '_auth' => false,
+            '_form' => 'merchantStoreCategoryCreate',
+        ]);
+        Route::get('update/form/:id', '/updateForm')->name('merchantStoreCategoryUpdateForm')->option([
+            '_alias' => '编辑表单',
+            '_auth' => false,
+            '_form' => 'merchantStoreCategoryUpdate',
+        ]);
+        Route::post('update/:id', '/update')->name('merchantStoreCategoryUpdate')->option([
+            '_alias' => '编辑',
+        ]);
+        Route::get('lst', '/lst')->name('merchantStoreCategoryLst')->option([
+            '_alias' => '列表',
+        ]);
+        Route::get('detail/:id', '/detail')->name('merchantStoreCategoryDtailt')->option([
+            '_alias' => '详情',
+        ]);
+        Route::post('create', '/create')->name('merchantStoreCategoryCreate')->option([
+            '_alias' => '添加',
+        ]);
+        Route::delete('delete/:id', '/delete')->name('merchantStoreCategoryDelete')->option([
+            '_alias' => '删除',
+        ]);
+        Route::post('status/:id', '/switchStatus')->name('merchantStoreCategorySwitchStatus')->option([
+            '_alias' => '修改状态',
+        ]);
+        Route::get('list', '/getList')->option([
+            '_alias' => '筛选',
+            '_auth'  => false,
+        ])->append(['type' => 1]);
+        Route::get('select', '/getStoreCategoryList')->option([
+            '_alias' => '',
+            '_auth'  => false,
+        ]);
+        Route::get('brandlist', '/BrandList')->option([
+            '_alias' => '品牌列表',
+            '_auth'  => false,
+        ]);
+    })->prefix('product.StoreCategory')->option([
+        '_path' => '/product/classify',
+        '_auth' => true,
+        '_append'=> [
+            [
+                '_name'  =>'merchantUploadImage',
+                '_path'  =>'/product/classify',
+                '_alias' => '上传图片',
+                '_auth'  => true,
+            ],
+            [
+                '_name'  =>'merchantAttachmentLst',
+                '_path'  =>'/product/classify',
+                '_alias' => '图片列表',
+                '_auth'  => true,
+            ],
+        ]
+    ]);
+
+    //品牌分类
+    Route::group('store/brand/category', function () {
+        Route::get('create/form', '/createForm')->name('systemStoreBrandCategoryCreateForm')->option([
+            '_alias' => '添加表单',
+            '_auth' => false,
+            '_form' => 'systemStoreBrandCategoryCreate',
+        ]);
+        Route::get('update/form/:id', '/updateForm')->name('systemStoreBrandCategoryUpdateForm')->option([
+            '_alias' => '编辑表单',
+            '_auth' => false,
+            '_form' => 'systemStoreBrandCategoryUpdate',
+        ]);
+        Route::post('update/:id', '/update')->name('systemStoreBrandCategoryUpdate')->option([
+            '_alias' => '编辑',
+            ]);
+        Route::get('lst', '/lst')->name('systemStoreBrandCategoryLst')->option([
+            '_alias' => '列表',
+            ]);
+        Route::get('detail/:id', '/detail')->name('systemStoreBrandCategoryDtailt')->option([
+            '_alias' => '详情',
+            ]);
+        Route::post('create', '/create')->name('systemStoreBrandCategoryCreate')->option([
+            '_alias' => '添加',
+            ]);
+        Route::delete('delete/:id', '/delete')->name('systemStoreBrandCategoryDelete')->option([
+            '_alias' => '删除',
+            ]);
+        Route::post('status/:id', '/switchStatus')->name('systemStoreBrandCategorySwitchStatus')->option([
+            '_alias' => '修改状态',
+            ]);
+    })->prefix('admin.store.StoreBrandCategory')->option([
+        '_path' => '/product/band/brandClassify',
+        '_auth' => true,
+    ]);
+
+    //品牌
+    Route::group('store/brand', function () {
+        Route::get('create/form', '/createForm')->name('systemStoreBrandCreateForm')->option([
+            '_alias' => '添加表单',
+            '_auth' => false,
+            '_form' => 'systemStoreBrandCreate',
+        ]);
+        Route::get('update/form/:id', '/updateForm')->name('systemStoreBrandUpdateForm')->option([
+            '_alias' => '编辑表单',
+            '_auth' => false,
+            '_form' => 'systemStoreBrandUpdate',
+        ]);
+        Route::get('lst', '/lst')->name('systemStoreBrandLst')->option([
+            '_alias' => '列表',
+        ]);
+        Route::post('status/:id', '/switchStatus')->name('systemStoreBrandSwithStatus')->option([
+            '_alias' => '修改状态',
+        ]);
+        Route::post('create', '/create')->name('systemStoreBrandCreate')->option([
+            '_alias' => '添加',
+        ]);
+        Route::post('update/:id', '/update')->name('systemStoreBrandUpdate')->option([
+            '_alias' => '编辑',
+        ]);
+        Route::delete('delete/:id', '/delete')->name('systemStoreBrandDelete')->option([
+            '_alias' => '删除',
+        ]);
+    })->prefix('admin.store.StoreBrand')->option([
+        '_path' => '/product/band/brandList',
+        '_auth' => true,
+    ]);
+
     //商品标签
     Route::group('product/label', function () {
         Route::get('lst', '/lst')->name('merchantStoreProductLabelLst')->option([

app/admin/view/product/product/index.back.html

@@ -0,0 +1,437 @@
+{extend name="common/base"/}
+<!-- 主体 -->
+{block name="body"}
+<style>
+	.layui-input-inline{
+		width:35% !important;
+	}
+	.layui-input-inline .layui-form-item{
+		display:flex;
+	}
+	.layui-input-inline .layui-form-item .layui-form-label{
+		width:30%;
+	}
+	.layui-input-block{
+		margin-left:unset !important;
+		width:75%;
+	}
+	#seleform{
+		border-color: #eee;
+		background-color: #fff;
+		color:#a39f9f;
+		width:100%;
+	}
+</style>
+<div class="p-3">
+	<div class="layui-form">
+		<form id="filterform" class="layui-form gg-form-bar border-t border-x"  >
+
+			<div class="layui-form-item">
+
+                <div class="layui-input-inline">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">平台商品分类</label>
+                        <div class="layui-input-block">
+                            <select id="plate_cate" name="plate_cate" lay-filter="seleform">
+                                <option value="">请选择商品分类</option>
+                                {volist name="$cate_list" id="v"}
+									<option value="{$v.id}" >{$v.title}{$v.cate_name} </option>
+								{/volist}
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-input-inline">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">商户商品分类</label>
+                        <div class="layui-input-block">
+							<input id="store_cate" type="hidden" readonly="readonly" name="store_cate">
+							<button id="seleform" lay-filter="seleform" class="layui-btn">请选择</button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="layui-form-item">
+
+                <div class="layui-input-inline">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">是否为礼包</label>
+                        <div class="layui-input-block">
+                            <select name="is_gift"  lay-filter="seleform">
+                                <option value=""></option>
+                                <option value="0">是</option>
+                                <option value="1">否</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-input-inline">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">商品状态</label>
+                        <div class="layui-input-block">
+                            <select name="state" lay-filter="seleform">
+                                <option value=""></option>
+                                <option value="1">上架</option>
+                                <option value="0">下架</option>
+                                <option value="2">平台关闭</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+			<div class="layui-form-item">
+
+                <div class="layui-input-inline">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">标签</label>
+                        <div class="layui-input-block">
+                            <select name="tag" lay-filter="seleform"  data-type="reload">
+                                <option value=""></option>
+                                <option value="0">写作</option>
+                                <option value="1">阅读</option>
+                                <option value="2">游戏</option>
+                                <option value="3">音乐</option>
+                                <option value="4">旅行</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-input-inline">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">运费模板</label>
+                        <div class="layui-input-block">
+                            <select name="shipping_tem" lay-filter="seleform">
+                                <option value=""></option>
+                                <option value="0">写作</option>
+                                <option value="1">阅读</option>
+                                <option value="2">游戏</option>
+                                <option value="3">音乐</option>
+                                <option value="4">旅行</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+
+
+			<div  class="layui-form-item">
+				<div class="layui-input-inline" style="display:flex;">
+					<label class="layui-form-label">关键字搜索</label>
+
+					<div class="layui-input-block" style="display:flex">
+						<div class="layui-input-inline" style="width: 78% !important">
+						<input type="text" name="keywords" placeholder="请输入商品名称、关键字" class="layui-input" autocomplete="off" />
+					</div>
+					<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="searchform">搜索</button>
+					</div>
+
+					
+				</div>
+
+			</div>
+
+
+		</form>
+	</div>
+	
+	
+	<table class="layui-hide" id="article" lay-filter="article"></table>
+</div>
+
+<script type="text/html" id="status">
+	<i class="layui-icon {{#  if(d.status == 1){ }}layui-icon-ok{{#  } else { }}layui-icon-close{{#  } }}"></i>
+</script>
+<script type="text/html" id="is_home">
+	<i class="layui-icon {{#  if(d.is_home == 1){ }}layui-icon-ok{{#  } else { }}layui-icon-close{{#  } }}"></i>
+</script>
+<script type="text/html" id="thumb">
+
+</script>
+<!-- <script type="text/html" id="toolbarDemo">
+	<div class="layui-btn-container">
+		{if {:auth_cache(session('gougu_admin')['id'],$url[1])}==true}
+		<span class="layui-btn layui-btn-sm" lay-event="add" data-title="添加虚拟评论">+ 添加虚拟评论</span>
+		{/if}
+	</div>
+</script> -->
+
+<script type="text/html" id="barDemo">
+	<div class="layui-btn-group">
+		{if {:auth_cache(session('gougu_admin')['id'],$url[2])}==true}
+			<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="read">查看</a>
+		{/if}
+		{if {:auth_cache(session('gougu_admin')['id'],$url[2])}==true}
+			<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+		{/if}
+		{if {:auth_cache(session('gougu_admin')['id'],$url[3])}==true}
+			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+		{/if}
+	</div>
+</script>
+
+{/block}
+<!-- /主体 -->
+
+<!-- 脚本 -->
+{block name="script"}
+<script>
+	const moduleInit = ['tool'];
+	function gouguInit() {
+		var table = layui.table,tool = layui.tool, form = layui.form;
+
+		layui.pageTable = table.render({
+			elem: '#article',
+			title: '列表',
+			toolbar: '#toolbarDemo',
+			url: '{$url[0]}',
+			page: true,
+			limit: 20,
+			cols: [
+				[
+					{
+						fixed: 'left',
+						field: 'product_id',
+						title: '编号',
+						align: 'center',
+						width:80,
+					},{
+						field: 'image',
+						title: '商品图',
+						align: 'center',
+						width:120,
+						templet: function (d)
+						{   
+							var html = `<div data-v-d854fb86="" class="el-image" style="width: 36px; height: 36px;">
+									<img style="width:100%;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQQAAACUCAYAAAB1GVf9AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABBKADAAQAAAABAAAAlAAAAAD7OG/zAAAH8ElEQVR4Ae3dWXPUOBQGUGcYoKCAByi2///f2LewE5bAzVSXIBPfdu8y9/gFpdVedKT+4pbtcHRycnI6WAgQIPBL4B8KBAgQWAgIhIWEfwkQcIZgDBAg0AScITQLJQLlBQRC+SEAgEATEAjNQolAeQGBUH4IACDQBARCs1AiUF5AIJQfAgAINAGB0CyUCJQXEAjlhwAAAk1AIDQLJQLlBQRC+SEAgEATEAjNQolAeQGBUH4IACDQBARCs1AiUF5AIJQfAgAINAGB0CyUCJQXEAjlhwAAAk1AIDQLJQLlBQRC+SEAgEATEAjNQolAeQGBUH4IACDQBARCs1AiUF5AIJQfAgAINAGB0CyUCJQXEAjlhwAAAk1AIDQLJQLlBQRC+SEAgEATEAjNQolAeQGBUH4IACDQBARCs1AiUF5AIJQfAgAINAGB0CyUCJQXEAjlhwAAAk1AIDQLJQLlBQRC+SEAgEATEAjNQolAeQGBUH4IACDQBARCs1AiUF5AIJQfAgAINAGB0CyUCJQXEAjlhwAAAk1AIDQLJQLlBQRC+SEAgEATEAjNQolAeQGBUH4IACDQBARCs1AiUF5AIJQfAgAINAGB0CyUCJQXEAjlhwAAAk1AIDQLJQLlBQRC+SEAgEATEAjNQolAeQGBUH4IACDQBP5tRaW5CLx//374+PHjcHJyMnz//n24dOnScOXKleH69evDjRs35tIMx9mhwNGvQXXa4XE5pAsEvn79Orx8+XL48uXLBbX/vXT16tXhzp07w+XLl0ffo4LAmIBAGJPp7PUIgadPnw6np8vz++joaLh///4Q4WAhsIqAOYRVtA703giB58+fTwqDOMRV379Jsz5//jwcHx9vsgnrdiQgEDrqjLFDefv27dlcwVj9Ra/H3EKst8vl27dvZ0H15s2bs/mMXe7LtvcjIBD247zRXj59+rTW+uuuN2VncRby4sWL4cePH2dvj7kNy/wFBMIM+jCuJqyzrLvelH29evXqj8nN2FecKVjmLSAQ5t1/Bzn6d+/eDXHp8/wScwm7DKHz+/Pz9gUEwvZNt77FuMdgnWXd9bJ9xdWOODsYW3x1GJOZx+sCYQb9dO3atbWOct31xnYWE5VxtSNb4gzh9evX2VvUdSwgEDrunMWh3bp16+xuxMXPU/6NuxdjvalLXD5ctjx79mzS1Y64uuGrwzLNPusFQp/98sdRxY1Gd+/eHeLfKcuq74/T/Ljp6cOHD6Obj/es8iGPKxBTbqIa3aGKgwgIhIOwr77TuOvw4cOHS+8+nPq+xRHElYHFBGF8iOMZifNL1C/ec75u7Oe4zdpVhzGdfl9363K/fTN6ZPHh3MbDTbGdiyYB7927NyzmH2IS8cmTJ6PHsqziwYMHS0Ns2TbU709AIOzPuqs9RaBkE4TxLEQ8IPX48eNJ8wZjjYttxJnN1K87Y9vx+n4EBMJ+nLvay5QHpeIDHB/mVeYNxhp58+bN4fbt22PVXu9IwBxCR52xj0OJD3hcLVg24Rf12wiDaFPcyBQhZOlfQCD030dbO8J4GCnCYPH8wdY2PGFDrjpMQOrgLQKhg07YxyFECEy9j2AXxxNhlN3huIt92ubqAgJhdbPZrRGn/3GfQVwKPOQSVzWm3AB1yGOsvm+BUGAExNWEbc0HbMoVlzmXzV9sug/rry8gENa3m8Wa8QHc5d9FWBUhvjp41mFVtf29XyDsz3pre4r5gHjQaNkSH7xV7zBcts1t1MdVh55Cahtt+lu2IRBm1pPxQXr06NHZ3YPZnEB86Hb9J9Q2oYszl0Nc7djkmCusKxBm0svxvTtm6RdXCuLUO24pvuj6fjyk1PuMfpzh+OrQ3+ATCP31yf+OKCYE48Mfv/V/X+I3bFw9+P2BpJjFj2v+c1h6/DozB7ddHqP/uWmXulvYdoRA9ts+zhziKkL85yzxF5LiDMJCYF0BgbCu3I7Xi1PqVa4QxHvj+QOX9HbcMX/55gVChx0cXwHWmXQTBh125swOSSB01mERBL5bd9YphQ7HpGJnnS0MOuuQYocjEIp1uOYSyAQEQqajjkAxAYFQrMM1l0AmIBAyHXUEigkIhGIdrrkEMgGBkOmoI1BMwF9dLtbhmksgE3CGkOmoI1BMQCAU63DNJZAJCIRMRx2BYgICoViHay6BTEAgZDrqCBQTEAjFOlxzCWQCAiHTUUegmIBAKNbhmksgExAImY46AsUEBEKxDtdcApmAQMh01BEoJiAQinW45hLIBARCpqOOQDEBgVCswzWXQCYgEDIddQSKCQiEYh2uuQQyAYGQ6agjUExAIBTrcM0lkAkIhExHHYFiAgKhWIdrLoFMQCBkOuoIFBMQCMU6XHMJZAICIdNRR6CYgEAo1uGaSyATEAiZjjoCxQQEQrEO11wCmYBAyHTUESgmIBCKdbjmEsgEBEKmo45AMQGBUKzDNZdAJiAQMh11BIoJCIRiHa65BDIBgZDpqCNQTEAgFOtwzSWQCQiETEcdgWICAqFYh2sugUxAIGQ66ggUExAIxTpccwlkAgIh01FHoJiAQCjW4ZpLIBMQCJmOOgLFBARCsQ7XXAKZgEDIdNQRKCYgEIp1uOYSyAQEQqajjkAxAYFQrMM1l0AmIBAyHXUEigkIhGIdrrkEMgGBkOmoI1BMQCAU63DNJZAJCIRMRx2BYgICoViHay6BTEAgZDrqCBQTEAjFOlxzCWQCPwEYef7DpS5s4AAAAABJRU5ErkJggg==">
+								</div>`;
+							if(d.image)
+							{
+								html = `<div data-v-d854fb86="" class="el-image" style="width: 36px; height: 36px;">
+									<img style="width:100%;" src="` + d.image + `" />
+								</div>`;
+							}
+							return html;
+						},
+					},{
+						field: 'store_name',
+						title: '商品名称',
+						align: 'center',
+						width:120
+					},{
+						field: 'product_score',
+						title: '商户类别',
+						align: 'center',
+						width:150,
+						templet: function (d)
+						{
+							return d.storeCategory ? d.storeCategory.cate_name : '待定';
+						}
+					},{
+						field: 'price',
+						title: '商品售价',
+						align: 'center',
+						width:150,
+					},{
+						field: 'sales',
+						title: '销量',
+						align: 'center',
+						width:150,
+					},{
+						field: 'stock',
+						title: '库存',
+						align: 'center',
+						width:150,
+					},{
+						field: 'is_good',
+						title: '推荐级别',
+						align: 'center',
+						width:120,
+					},{
+						field: 'sort',
+						title: '排序',
+						align: 'center',
+						width:120,
+					},{
+						field: 'is_used',
+						title: '是否显示',
+						align: 'center',
+						width:150,
+						templet: function (d)
+						{   
+							var html = d.is_used ? '显示' : '隐藏';
+							return html;
+						},
+					},{
+						field: 'is_show',
+						title: '商品状态',
+						align: 'center',
+						width:150,
+						templet: function (d)
+						{   
+							var html = d.is_show ? '上架显示' : '平台关闭';
+							return html;
+						},
+					},{
+						field: 'keyword',
+						title: '标签',
+						align: 'center',
+						width:150,
+					},{
+						fixed: 'right',
+						field: 'right',
+						title: '操作',
+						toolbar: '#barDemo',
+						align: 'center',
+						width:180,
+					}
+				]
+			]
+		});
+
+		//监听表头工具栏事件
+		table.on('toolbar(article)', function(obj){
+			if (obj.event === 'add') {
+				tool.side('{$url[1]}');
+				return false;
+			}
+		});
+
+		//监听表格行工具事件
+		table.on('tool(article)', function(obj) {
+			var data = obj.data;
+			if (obj.event === 'read') {
+				tool.side('{$url[2]}?id='+obj.data.reply_id);
+			}
+			else if (obj.event === 'edit') {
+				tool.side('{$url[2]}?id='+obj.data.reply_id);
+			}
+			else if (obj.event === 'del') {
+				layer.confirm('确定要删除该记录吗?', {
+					icon: 3,
+					title: '提示'
+				}, function(index) {
+					let callback = function (e) {
+						layer.msg(e.msg);
+						if (e.code == 0) {
+							obj.del();
+						}
+					}
+					tool.delete('{$url[3]}', { id: data.reply_id }, callback);
+					layer.close(index);
+				});
+			}
+			return false;
+		});
+
+		
+
+		layui.use(['rate','dropdown', 'util', 'layer', 'table'], function(){
+			var dropdown = layui.dropdown
+			,util = layui.util
+			,layer = layui.layer
+			,rate = layui.rate
+			// ,table = layui.table
+			,$ = layui.jquery;
+			
+			var $ = layui.$, active = {
+				reload: function(){
+					let dataRload = getformdata();;
+					console.log(dataRload)
+					//执行重载
+					table.reload('article', {
+						page: {
+						curr: 1 //重新从第 1 页开始
+						}
+						,where: {
+							...dataRload
+						}
+					});
+				}
+			};
+
+			//商户商品分类菜单
+			$.ajax({
+				url: '/admin/store/category/select',
+				method: "get",
+				data: {},
+				success: function(res) {
+					if (res.code!==0)return ;
+
+					//高级演示 - 各种组合
+					dropdown.render({
+						elem: '#seleform'
+						,isAllowSpread: false //禁止菜单组展开收缩
+						,style: 'width: 200px' //定义宽度，默认自适应
+						,id: 'test777' //定义唯一索引
+						,title: 'title1'
+						,data: res.data
+						,click: function(item){
+							$('#seleform').text(item.title);
+							$('#seleform').css({color:'rgba(0,0,0,.85)'});
+							$('#store_cate').val(item.id);
+
+							active['reload'] ? active['reload'].call(this) : '';
+						}
+					});
+				},
+				fail:function(){}
+			});
+
+			
+			
+			//基础效果
+			rate.render({
+				elem: '#is_good'
+			})
+
+			
+			
+
+			//监听搜索提交
+			form.on('submit(searchform)', function(data) {
+				layui.pageTable.reload({
+					where: {
+						...data.field
+					},
+					page: {
+						curr: 1
+					}
+				});
+				return false;
+			});
+
+			//监听select提交
+			form.on('select(seleform)', function(data) {
+				active['reload'] ? active['reload'].call(this) : '';
+
+				return false;
+			});
+
+		});
+
+
+		// 获取表单所有参数
+        function getformdata() {
+            var form = $('#filterform').serializeArray();
+
+            var data = new Array();
+            for(let i=0;i<form.length; i++){
+                data[form[i].name] = form[i].value;
+            }
+
+            return data;
+        }
+        
+	}
+	
+</script>
+{/block}
+<!-- /脚本 -->

app/admin/view/product/product/index.html

@@ -15,11 +15,30 @@
 		margin-left:unset !important;
 		width:75%;
 	}
+	#seleform{
+		border-color: #eee;
+		background-color: #fff;
+		color:#a39f9f;
+		width:100%;
+	}
 </style>
 <div class="p-3">
+	<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+        <ul class="layui-tab-title">
+            <li class="layui-this site-demo-active" type="1" data-type="reload">出售中的商品</li>
+            <li class="site-demo-active" type="2" data-type="reload">仓库中的商品</li>
+			<li class="site-demo-active" type="3" data-type="reload">已售罄的商品</li>
+			<li class="site-demo-active" type="4" data-type="reload">警戒库存</li>
+			<li class="site-demo-active" type="6" data-type="reload">待审核商品</li>
+			<li class="site-demo-active" type="7" data-type="reload">审核未通过商品</li>
+			<li class="site-demo-active" type="5" data-type="reload">回收站商品</li>
+        </ul>
+    </div>
+
+
 	<div class="layui-form">
 		<form id="filterform" class="layui-form gg-form-bar border-t border-x"  >
-
+			<input id="protype" type="hidden" name="type" value="">
 			<div class="layui-form-item">
 
                 <div class="layui-input-inline">
@@ -39,11 +58,8 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">商户商品分类</label>
                         <div class="layui-input-block">
-                            <select name="store_cate" lay-filter="seleform">
+							<input id="store_cate" type="hidden" readonly="readonly" name="store_cate">
-                                <option value=""></option>
+							<button id="seleform" lay-filter="seleform" class="layui-btn">请选择</button>
-                                <option value="10">自营</option>
-                                <option value="11">非自营</option>
-                            </select>
                         </div>
                     </div>
                 </div>
@@ -71,8 +87,8 @@
                         <div class="layui-input-block">
                             <select name="state" lay-filter="seleform">
                                 <option value=""></option>
-                                <option value="0">上架</option>
+                                <option value="1">上架</option>
-                                <option value="1">下架</option>
+                                <option value="0">下架</option>
                                 <option value="2">平台关闭</option>
                             </select>
                         </div>
@@ -90,10 +106,6 @@
                             <select name="tag" lay-filter="seleform"  data-type="reload">
                                 <option value=""></option>
                                 <option value="0">写作</option>
-                                <option value="1">阅读</option>
-                                <option value="2">游戏</option>
-                                <option value="3">音乐</option>
-                                <option value="4">旅行</option>
                             </select>
                         </div>
                     </div>
@@ -108,8 +120,6 @@
                                 <option value="0">写作</option>
                                 <option value="1">阅读</option>
                                 <option value="2">游戏</option>
-                                <option value="3">音乐</option>
-                                <option value="4">旅行</option>
                             </select>
                         </div>
                     </div>
@@ -183,6 +193,7 @@
 	const moduleInit = ['tool'];
 	function gouguInit() {
 		var table = layui.table,tool = layui.tool, form = layui.form;
+
 		layui.pageTable = table.render({
 			elem: '#article',
 			title: '列表',
@@ -221,16 +232,6 @@
 						title: '商品名称',
 						align: 'center',
 						width:120
-					},{
-						field: 'type_name',
-						title: '商户类型',
-						align: 'center',
-						width:150,
-						templet: function (d)
-						{
-							return d.merchant.merchantType ? d.merchant.merchantType.type_name : '待定';
-						}
-					
 					},{
 						field: 'product_score',
 						title: '商户类别',
@@ -238,7 +239,7 @@
 						width:150,
 						templet: function (d)
 						{
-							return d.merchant.category ? d.merchant.category.category_name : '待定';
+							return d.storeCategory ? d.storeCategory.cate_name : '待定';
 						}
 					},{
 						field: 'price',
@@ -276,13 +277,13 @@
 							return html;
 						},
 					},{
-						field: 'is_used',
+						field: 'is_show',
 						title: '商品状态',
 						align: 'center',
 						width:150,
 						templet: function (d)
 						{   
-							var html = d.is_used ? '上架显示' : '平台关闭';
+							var html = d.is_show ? '上架显示' : '平台关闭';
 							return html;
 						},
 					},{
@@ -339,18 +340,17 @@
 
 		
 
-		layui.use(['rate','table'], function(){
+		layui.use(['rate','dropdown', 'util', 'layer', 'table'], function(){
-			var rate = layui.rate;
+			var dropdown = layui.dropdown
+			,util = layui.util
+			,layer = layui.layer
+			,rate = layui.rate
+			// ,table = layui.table
+			,$ = layui.jquery;
 			
-			//基础效果
-			rate.render({
-				elem: '#is_good'
-			})
-
 			var $ = layui.$, active = {
 				reload: function(){
 					let dataRload = getformdata();;
-					console.log(dataRload)
 					//执行重载
 					table.reload('article', {
 						page: {
@@ -360,8 +360,45 @@
 							...dataRload
 						}
 					});
-				}
+				},
 			};
+
+			//商户商品分类菜单
+			$.ajax({
+				url: '/admin/store/category/select',
+				method: "get",
+				data: {},
+				success: function(res) {
+					if (res.code!==0)return ;
+
+					//高级演示 - 各种组合
+					dropdown.render({
+						elem: '#seleform'
+						,isAllowSpread: false //禁止菜单组展开收缩
+						,style: 'width: 200px' //定义宽度，默认自适应
+						,id: 'test777' //定义唯一索引
+						,title: 'title1'
+						,data: res.data
+						,click: function(item){
+							$('#seleform').text(item.title);
+							$('#seleform').css({color:'rgba(0,0,0,.85)'});
+							$('#store_cate').val(item.id);
+
+							active['reload'] ? active['reload'].call(this) : '';
+						}
+					});
+				},
+				fail:function(){}
+			});
+
+			
+			
+			//基础效果
+			rate.render({
+				elem: '#is_good'
+			})
+
+			
 			
 
 			//监听搜索提交
@@ -380,16 +417,23 @@
 			//监听select提交
 			form.on('select(seleform)', function(data) {
 				active['reload'] ? active['reload'].call(this) : '';
-
 				return false;
 			});
 
+			// tab 状态列表切换
+			$('.site-demo-active').on('click', function(){
+				var othis = $(this), type = othis.data('type');
+				$('#protype').val(this.getAttribute('type'));
+				active[type] ? active[type].call(this, othis) : '';
+			});
+
 		});
 
 
 		// 获取表单所有参数
         function getformdata() {
             var form = $('#filterform').serializeArray();
+
             var data = new Array();
             for(let i=0;i<form.length; i++){
                 data[form[i].name] = form[i].value;

app/common/controller/FormatList.php

@@ -17,21 +17,26 @@ class FormatList
      * @param string $idName 主键
      * @param string $fieldName 父级字段
      * @param string $childrenKey 子级字段名
-     * @return array
+     * @param array $option          重命名字段 id 与 name
+     * @return array 
      * 
      * @date 2023-03-3
      */
-    static function FormatCategory(array $data, string $idName = "id", string $fieldName = 'pid', $childrenKey = 'children')
+    static function FormatCategory(array $data, string $idName = "id", string $parentId = 'pid', string $fieldName='name', $childrenKey = 'children', ?string $addId='', ?string $addtitle='')
     {
         $items = [];
         foreach ($data as $item) {
+            if (!empty($addId))
+                $item[$addId] = $item[$idName];
+            if (!empty($addtitle))
+                $item[$addtitle] = $item[$fieldName];
             $items[$item[$idName]] = $item;
         }
         $result = array();
         foreach ($items as $item) {
-            if (isset($items[$item[$fieldName]])) {
+            if (isset($items[$item[$parentId]])) {
-                $items[$item[$fieldName]][$childrenKey][] = &$items[$item[$idName]];
+                $items[$item[$parentId]][$childrenKey][] = &$items[$item[$idName]];
-            } else if ($item[$fieldName] == 0) {
+            } else if ($item[$parentId] == 0) {
                 $result[] = &$items[$item[$idName]];
             }
         }
@@ -57,6 +62,7 @@ class FormatList
         $level++;
         foreach ($data as $k => $v) {
             if ($v['pid'] == $pid) {
+                $v['title'] = '';
                 if ($pid != 0) {
                     $v['title'] = $space[$level] . $v['title'];
                 }

app/common/model/merchant/user/UserLabel.php

@@ -11,4 +11,5 @@ use think\Model;
 class UserLabel extends Model
 {
     //
+    
 }

app/common/model/merchant/user/UserMerchant.php

@@ -4,11 +4,145 @@ declare (strict_types = 1);
 namespace app\common\model\merchant\user;
 
 use think\Model;
+use think\db\BaseQuery;
 
 /**
  * @mixin \think\Model
  */
 class UserMerchant extends Model
 {
-    //
+        /**
+     * @return string|null
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public static function tablePk(): ?string
+    {
+        return 'user_merchant_id';
+    }
+
+    /**
+     * @return string
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public static function tableName(): string
+    {
+        return 'user_merchant';
+    }
+
+    public function user()
+    {
+        return $this->hasOne(User::class, 'uid', 'uid');
+    }
+
+    /**
+     * @param $value
+     * @return array
+     * @author xaboy
+     * @day 2020-05-09
+     */
+    public function getLabelIdAttr($value)
+    {
+        return $value ? explode(',', $value) : [];
+    }
+
+    /**
+     * @param $value
+     * @return string
+     * @author xaboy
+     * @day 2020-05-09
+     */
+    public function setLabelIdAttr($value)
+    {
+        return implode(',', $value);
+    }
+
+    public function getAuthLabelAttr()
+    {
+        return app()->make(UserLabel::class)->whereIn('label_id', $this->label_id)->where('mer_id', $this->mer_id)->where('type', 1)->column('label_id');
+    }
+
+    /**
+     * @param $uid
+     * @param $mer_id
+     * @return bool
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public function isMerUser($uid, $mer_id)
+    {
+        return $this->existsWhere(compact('uid', 'mer_id'));
+    }
+
+    /**
+     * @param $uid
+     * @param $mer_id
+     * @return int
+     * @throws \think\db\exception\DbException
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public function updateLastTime($uid, $mer_id)
+    {
+        return UserMerchant::where(compact('uid', 'mer_id'))->update([
+            'last_time' => date('Y-m-d H:i:s')
+        ]);
+    }
+
+    /**
+     * @param array $where
+     * @return mixed
+     * @author xaboy
+     * @day 2020/10/20
+     */
+    public function search(array $where)
+    {
+        return UserMerchant::alias('A')->leftJoin('User B', 'A.uid = B.uid')
+            ->when(isset($where['mer_id']) && $where['mer_id'] !== '', 
+                function ($query) use ($where) {
+                    $query->where('A.mer_id', $where['mer_id']);
+                }
+            )
+            ->when(isset($where['nickname']) && $where['nickname'], function (BaseQuery $query) use ($where) {
+                return $query->where('B.nickname', 'like', '%' . $where['nickname'] . '%');
+            })->when(isset($where['sex']) && $where['sex'] !== '', function (BaseQuery $query) use ($where) {
+                return $query->where('B.sex', intval($where['sex']));
+            })->when(isset($where['is_promoter']) && $where['is_promoter'] !== '', function (BaseQuery $query) use ($where) {
+                return $query->where('B.is_promoter', $where['is_promoter']);
+            })->when(isset($where['uids']), function (BaseQuery $query) use ($where) {
+                return $query->whereIn('A.uid', $where['uids']);
+            })->when(isset($where['user_time_type']) && $where['user_time_type'] !== '' && $where['user_time'] != '', function ($query) use ($where) {
+                if ($where['user_time_type'] == 'visit') {
+                    getModelTime($query, $where['user_time'], 'A.last_time');
+                }
+                if ($where['user_time_type'] == 'add_time') {
+                    getModelTime($query, $where['user_time'], 'A.create_time');
+                }
+            })->when(isset($where['pay_count']) && $where['pay_count'] !== '', function ($query) use ($where) {
+                if ($where['pay_count'] == -1) {
+                    $query->where('A.pay_num', 0);
+                } else {
+                    $query->where('A.pay_num', '>', $where['pay_count']);
+                }
+            })->when(isset($where['label_id']) && $where['label_id'] !== '', function (BaseQuery $query) use ($where) {
+                return $query->whereRaw('CONCAT(\',\',A.label_id,\',\') LIKE \'%,' . $where['label_id'] . ',%\'');
+            })->when(isset($where['user_type']) && $where['user_type'] !== '', function (BaseQuery $query) use ($where) {
+                return $query->where('B.user_type', $where['user_type']);
+            })->where('A.status', 1);
+    }
+
+    public function numUserIds($mer_id, $min, $max = null)
+    {
+        return UserMerchant::where('mer_id', $mer_id)->where('pay_num', '>=', $min)->when(!is_null($max), function ($query) use ($max) {
+            $query->where('pay_num', '<=', $max);
+        })->group('uid')->column('uid');
+    }
+
+    public function priceUserIds($mer_id, $min, $max = null)
+    {
+        return UserMerchant::where('mer_id', $mer_id)->where('pay_price', '>=', $min)->when(!is_null($max), function ($query) use ($max, $min) {
+            $query->where('pay_price', $min == $max ? '<=' : '<', $max);
+        })->group('uid')->column('uid');
+    }    
 }