From 8b208ab7459ce8b1ced6b20a8fd74452cc406029 Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Sat, 11 Mar 2023 18:12:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AD=9B=E9=80=89=E4=B8=8E?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/product/Product.php | 30 +- .../controller/product/StoreCategory.php | 56 +++ app/admin/model/EbStoreProduct.php | 164 ++++--- app/admin/model/StoreCategory.php | 32 ++ app/admin/model/store/Product.php | 6 + app/admin/model/store/ProductCate.php | 4 +- app/admin/model/user/UserMerchant.php | 157 +++++++ app/admin/route/product.php | 128 +++++ .../view/product/product/index.back.html | 437 ++++++++++++++++++ app/admin/view/product/product/index.html | 118 +++-- app/common/controller/FormatList.php | 16 +- app/common/model/merchant/user/UserLabel.php | 1 + .../model/merchant/user/UserMerchant.php | 136 +++++- 13 files changed, 1166 insertions(+), 119 deletions(-) create mode 100644 app/admin/controller/product/StoreCategory.php create mode 100644 app/admin/model/user/UserMerchant.php create mode 100644 app/admin/view/product/product/index.back.html diff --git a/app/admin/controller/product/Product.php b/app/admin/controller/product/Product.php index d4b44aa..8f44d77 100644 --- a/app/admin/controller/product/Product.php +++ b/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); diff --git a/app/admin/controller/product/StoreCategory.php b/app/admin/controller/product/StoreCategory.php new file mode 100644 index 0000000..ef7d927 --- /dev/null +++ b/app/admin/controller/product/StoreCategory.php @@ -0,0 +1,56 @@ +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); + } + +} \ No newline at end of file diff --git a/app/admin/model/EbStoreProduct.php b/app/admin/model/EbStoreProduct.php index d127f64..8fa5554 100644 --- a/app/admin/model/EbStoreProduct.php +++ b/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') - ->where('Merchant.is_trader', $where['is_trader']) - ->when(($merId !== null), - function ($query) use ($merId) { - $query->where('Product.mer_id', $merId); - } - ); - + // hasWhere添加别名不生效 alias， 改为Join // $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( - isset($where['pid']) && $where['pid'] !== '', + ->when(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; + } } diff --git a/app/admin/model/StoreCategory.php b/app/admin/model/StoreCategory.php index dcb7979..529dc37 100644 --- a/app/admin/model/StoreCategory.php +++ b/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 diff --git a/app/admin/model/store/Product.php b/app/admin/model/store/Product.php index 2c2358d..ec16fc5 100644 --- a/app/admin/model/store/Product.php +++ b/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 diff --git a/app/admin/model/store/ProductCate.php b/app/admin/model/store/ProductCate.php index a9d07d6..bd5cbc6 100644 --- a/app/admin/model/store/ProductCate.php +++ b/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) diff --git a/app/admin/model/user/UserMerchant.php b/app/admin/model/user/UserMerchant.php new file mode 100644 index 0000000..7f88115 --- /dev/null +++ b/app/admin/model/user/UserMerchant.php @@ -0,0 +1,157 @@ +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'); + } +} diff --git a/app/admin/route/product.php b/app/admin/route/product.php index 5526b86..c138d1f 100644 --- a/app/admin/route/product.php +++ b/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([ diff --git a/app/admin/view/product/product/index.back.html b/app/admin/view/product/product/index.back.html new file mode 100644 index 0000000..d3dced9 --- /dev/null +++ b/app/admin/view/product/product/index.back.html @@ -0,0 +1,437 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+ +
+ +
+
+
+
+
+ +
+ + +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ +
+ + + +
+
+ + +
+
+ +
+ +
+ + +
+ +
+ + +
+
+ + +
+
+ + + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/product/product/index.html b/app/admin/view/product/product/index.html index 56e78f9..7a9d803 100644 --- a/app/admin/view/product/product/index.html +++ b/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%; + }
+
+
    +
  • 出售中的商品
    • +
  • 仓库中的商品
    • +
  • 已售罄的商品
    • +
  • 警戒库存
    • +
  • 待审核商品
    • +
  • 审核未通过商品
    • +
  • 回收站商品
    • +
+
+ +
- +
@@ -39,11 +58,8 @@
- + +
@@ -71,8 +87,8 @@
@@ -90,10 +106,6 @@
@@ -108,8 +120,6 @@ - -
@@ -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(){ - var rate = layui.rate; + 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; - //基础效果 - 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 $v) { if ($v['pid'] == $pid) { + $v['title'] = ''; if ($pid != 0) { $v['title'] = $space[$level] . $v['title']; } diff --git a/app/common/model/merchant/user/UserLabel.php b/app/common/model/merchant/user/UserLabel.php index 6fb528e..64a5468 100644 --- a/app/common/model/merchant/user/UserLabel.php +++ b/app/common/model/merchant/user/UserLabel.php @@ -11,4 +11,5 @@ use think\Model; class UserLabel extends Model { // + } diff --git a/app/common/model/merchant/user/UserMerchant.php b/app/common/model/merchant/user/UserMerchant.php index 5413e54..fadf563 100644 --- a/app/common/model/merchant/user/UserMerchant.php +++ b/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'); + } }