diff --git a/pro_v3.5.1/README.md b/pro_v3.5.1/README.md index 100ef673..1544845b 100644 --- a/pro_v3.5.1/README.md +++ b/pro_v3.5.1/README.md @@ -322,7 +322,7 @@ php think swoole 5. 后台登录: http://域名/admin -默认账号:admin 密码:A@123456 或 A123456 +默认账号:admin 后者 admin2026 密码:A@123456 或 A123456 ## 启动命令 diff --git a/pro_v3.5.1/app/controller/admin/v1/product/StoreProduct.php b/pro_v3.5.1/app/controller/admin/v1/product/StoreProduct.php index f9546672..5013644a 100644 --- a/pro_v3.5.1/app/controller/admin/v1/product/StoreProduct.php +++ b/pro_v3.5.1/app/controller/admin/v1/product/StoreProduct.php @@ -61,6 +61,7 @@ class StoreProduct extends AuthController ['stock_range', ''],//库存区间 ['collect_range', ''],//收藏区间 ['product_clear', ''],//适用群体 + ['is_queue_goods', ''],//报单商品 ]); if ($this->adminType == 4) { @@ -201,6 +202,7 @@ class StoreProduct extends AuthController ['stock_range', ''],//库存区间 ['collect_range', ''],//收藏区间 ['product_clear', ''],//适用群体 + ['is_queue_goods', ''],//报单商品 ]); if ($this->adminType == 4) { $where['supplier_id'] = $this->adminId; diff --git a/pro_v3.5.1/app/dao/product/product/StoreProductDao.php b/pro_v3.5.1/app/dao/product/product/StoreProductDao.php index 21181b97..1a93662f 100644 --- a/pro_v3.5.1/app/dao/product/product/StoreProductDao.php +++ b/pro_v3.5.1/app/dao/product/product/StoreProductDao.php @@ -145,7 +145,7 @@ class StoreProductDao extends BaseDao $start_time = strtotime($create_range[0]); $end_time = strtotime($create_range[1]); if ($start_time && $end_time) { - $query->whereBetween('price', [$start_time, $end_time]); + $query->whereBetween('add_time', [$start_time, $end_time]); } }) //活动类型 diff --git a/pro_v3.5.1/app/model/product/product/StoreProduct.php b/pro_v3.5.1/app/model/product/product/StoreProduct.php index cc927772..7ecb954e 100644 --- a/pro_v3.5.1/app/model/product/product/StoreProduct.php +++ b/pro_v3.5.1/app/model/product/product/StoreProduct.php @@ -765,6 +765,11 @@ class StoreProduct extends BaseModel if ('' !== $value) $query->where('is_brokerage', $value); } + public function searchIsQueueGoodsAttr($query, $value) + { + if ('' !== $value) $query->where('is_queue_goods', $value); + } + public function searchisChannelProductAttr($query, $value) { if ('' !== $value) $query->where('is_channel_product', $value); diff --git a/pro_v3.5.1/config/app.php b/pro_v3.5.1/config/app.php index 5820632c..e7dbedd7 100644 --- a/pro_v3.5.1/config/app.php +++ b/pro_v3.5.1/config/app.php @@ -13,6 +13,8 @@ // | 应用设置 // +---------------------------------------------------------------------- +use crmeb\basic\BaseAuth; + return [ // 应用地址 'app_host' => env('HOST', ''), @@ -40,6 +42,6 @@ return [ 'error_message' => '页面错误!请稍后再试~', // 显示错误信息 'show_error_msg' => false, - // 自有项目不读取 CRMEB 原厂授权密钥;商业模块如需使用仍应走合法授权。 - 'auth_crmeb' => '' + // 授权密钥 + 'auth_crmeb' => BaseAuth::AUTH_CRMEB ];