diff --git a/app/common/dao/store/product/ProductDao.php b/app/common/dao/store/product/ProductDao.php index a90a723..c73bf97 100644 --- a/app/common/dao/store/product/ProductDao.php +++ b/app/common/dao/store/product/ProductDao.php @@ -136,6 +136,8 @@ class ProductDao extends BaseDao else if ($where['hot_type'] == 'best') $query->where('is_best', 1); else if ($where['hot_type'] == 'good') + $query->where('is_good', 1); + else if ($where['hot_type'] == 'benefit') $query->where('is_benefit', 1); }) ->when(isset($where['us_status']) && $where['us_status'] !== '', function ($query) use ($where) { diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index e4fd6b9..127abc6 100755 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -60,7 +60,7 @@ class ProductRepository extends BaseRepository protected $dao; const CREATE_PARAMS = [ - "image", "slider_image", "store_name", "store_info", "keyword", "bar_code", "guarantee_template_id", "cate_id", "mer_cate_id", "unit_name", "sort" , "is_show", "is_good", 'is_gift_bag', 'integral_rate', "video_link", "temp_id", "content", "spec_type", "extension_type", "attr", 'mer_labels', 'delivery_way', 'delivery_free','param_temp_id','extend', + "image", "slider_image", "store_name", "store_info", "keyword", "bar_code", "guarantee_template_id", "cate_id", "mer_cate_id", "unit_name", "sort" , "is_show", "is_good","is_hot","is_benefit","is_best","is_new", 'is_gift_bag', 'integral_rate', "video_link", "temp_id", "content", "spec_type", "extension_type", "attr", 'mer_labels', 'delivery_way', 'delivery_free','param_temp_id','extend', ["brand_id",0], ['once_max_count',0], ['once_min_count',0], @@ -454,6 +454,10 @@ class ProductRepository extends BaseRepository 'is_show' => $data['is_show'] ?? 0, 'is_used' => (isset($data['status']) && $data['status'] == 1) ? 1 : 0, 'is_good' => $data['is_good'] ?? 0, + 'is_hot' => $data['is_hot'] ?? 0, + 'is_benefit' => $data['is_benefit'] ?? 0, + 'is_best' => $data['is_best'] ?? 0, + 'is_new' => $data['is_new'] ?? 0, 'video_link' => $data['video_link']??'', 'temp_id' => $data['delivery_free'] ? 0 : ($data['temp_id'] ?? 0), 'extension_type' => $data['extension_type']??0, diff --git a/app/controller/merchant/store/product/Product.php b/app/controller/merchant/store/product/Product.php index efa05be..2df686d 100755 --- a/app/controller/merchant/store/product/Product.php +++ b/app/controller/merchant/store/product/Product.php @@ -47,7 +47,7 @@ class Product extends BaseController public function lst() { [$page, $limit] = $this->getPage(); - $where = $this->request->params(['temp_id','cate_id','keyword',['type',1],'mer_cate_id','is_gift_bag','status','us_status','product_id','mer_labels',['order','sort'],'is_ficti','svip_price_type']); + $where = $this->request->params(['temp_id','cate_id','keyword',['type',1],'mer_cate_id','is_gift_bag','status','us_status','product_id','mer_labels',['order','sort'],'is_ficti','hot_type']); $where = array_merge($where,$this->repository->switchType($where['type'],$this->request->merId(),0)); return app('json')->success($this->repository->getList($this->request->merId(),$where, $page, $limit)); } diff --git a/app/controller/merchant/user/UserMerchant.php b/app/controller/merchant/user/UserMerchant.php index ce80d5d..d9b55c1 100644 --- a/app/controller/merchant/user/UserMerchant.php +++ b/app/controller/merchant/user/UserMerchant.php @@ -18,6 +18,7 @@ use app\common\repositories\store\coupon\StoreCouponUserRepository; use app\common\repositories\store\order\StoreOrderRepository; use app\common\repositories\user\UserLabelRepository; use app\common\repositories\user\UserMerchantRepository; +use app\common\repositories\user\UserRepository; use crmeb\basic\BaseController; use FormBuilder\Exception\FormBuilderException; use think\App; @@ -56,9 +57,17 @@ class UserMerchant extends BaseController */ public function getList() { - $where = $this->request->params(['nickname', 'sex', 'is_promoter', 'user_time_type', 'user_time', 'pay_count', 'label_id', 'user_type']); + $where = $this->request->params(['nickname', 'sex', 'is_promoter', 'user_time_type', 'user_time', 'pay_count', 'label_id', 'user_type', 'phone']); [$page, $limit] = $this->getPage(); $where['mer_id'] = $this->request->merId(); + + /** + * @var UserRepository $userRepository + */ + $userRepository = \app()->make(UserRepository::class); + $user = $userRepository->getUserByPhone($where['phone'] ?? ''); + if($where['phone'])$where['uids'] = $user ? [$user->uid] : array(); + return app('json')->success($this->repository->getList($where, $page, $limit)); } diff --git a/public/mer.html b/public/mer.html index b087ea7..9d5d15b 100644 --- a/public/mer.html +++ b/public/mer.html @@ -1 +1 @@ -加载中...
\ No newline at end of file +加载中...
\ No newline at end of file diff --git a/public/system.html b/public/system.html index 76cde33..179c285 100644 --- a/public/system.html +++ b/public/system.html @@ -1,3 +1,3 @@ -加载中...
\ No newline at end of file diff --git a/view/admin/.env.development b/view/admin/.env.development index fc9c806..2997b1b 100644 --- a/view/admin/.env.development +++ b/view/admin/.env.development @@ -8,7 +8,7 @@ VUE_APP_BASE_API = 'https://b2.njrenzhou.com' # socket 连接地址 #VUE_APP_WS_URL = 'ws://0.0.0.0:8324' -VUE_APP_WS_URL = 'ws://mer1.crmeb.net' +VUE_APP_WS_URL = 'wss://b2.njrenzhou.com' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/view/admin/.env.production b/view/admin/.env.production index f9f4d1d..b77fd01 100644 --- a/view/admin/.env.production +++ b/view/admin/.env.production @@ -4,4 +4,4 @@ ENV = 'production' # base api VUE_APP_BASE_API ='https://b2.njrenzhou.com' # socket 连接地址 -VUE_APP_WS_URL ='ws://mer1.crmeb.net' +VUE_APP_WS_URL ='wss://b2.njrenzhou.com' diff --git a/view/mer/.env.development b/view/mer/.env.development index 05427c2..cf9754a 100644 --- a/view/mer/.env.development +++ b/view/mer/.env.development @@ -6,7 +6,7 @@ ENV = 'development' VUE_APP_BASE_API = 'https://b2.njrenzhou.com' # socket 连接地址 #VUE_APP_WS_URL = 'ws://192.168.3.20:8324' -VUE_APP_WS_URL = 'ws://mer1.crmeb.net' +VUE_APP_WS_URL = 'wss://b2.njrenzhou.com' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/view/mer/.env.production b/view/mer/.env.production index 897ee46..7b8ba16 100644 --- a/view/mer/.env.production +++ b/view/mer/.env.production @@ -4,5 +4,5 @@ ENV = 'production' # base api VUE_APP_BASE_API ='https://b2.njrenzhou.com' # socket 连接地址 -VUE_APP_WS_URL ='ws://mer1.crmeb.net' +VUE_APP_WS_URL ='wss://b2.njrenzhou.com' diff --git a/view/mer/src/views/product/addProduct/index.vue b/view/mer/src/views/product/addProduct/index.vue index 0d643f8..9d7e3b1 100644 --- a/view/mer/src/views/product/addProduct/index.vue +++ b/view/mer/src/views/product/addProduct/index.vue @@ -85,6 +85,13 @@ /> + + + + {{ item.name }} + + + - - -
- {{ tag.title }} - - 选择优惠券 -
- - + + + + + + + + + + + + + + + + + + + + @@ -451,7 +458,7 @@ - - - - - - {{ item.name }} - - - - - - - - 单独设置 - 默认设置 - -
- - % -
- - - - - - 否 - 是 - - - - - -
1. 选择开启礼包后，不可修改
-
- 2. - 用户购买该分销礼包商品后，可自动成为分销员（即已成为分销员的用户在移动端看不到该分销礼包商品） -
-
- 3. - 该商品设置为分销礼包后会展示在平台后台的【分销】-【分销礼包】（即不会展示在平台后台-【商品列表】） -
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +
@@ -1083,7 +1090,7 @@ :key="item.value" :label="item.label" :value="item.value" - + /> @@ -1156,7 +1163,7 @@ >上一步 下一步 { this.setSort() }) @@ -1735,6 +1754,18 @@ export default { this.checkboxGroup.includes('is_good') ? (this.formValidate.is_good = 1) : (this.formValidate.is_good = 0) + this.checkboxGroup.includes('is_hot') + ? (this.formValidate.is_hot = 1) + : (this.formValidate.is_hot = 0) + this.checkboxGroup.includes('is_benefit') + ? (this.formValidate.is_benefit = 1) + : (this.formValidate.is_benefit = 0) + this.checkboxGroup.includes('is_best') + ? (this.formValidate.is_best = 1) + : (this.formValidate.is_best = 0) + this.checkboxGroup.includes('is_new') + ? (this.formValidate.is_new = 1) + : (this.formValidate.is_new = 0) }, watCh(val) { const tmp = {} @@ -2201,6 +2232,10 @@ export default { once_max_count: info.once_max_count || 1, once_min_count: info.once_min_count || 0, is_good: info.is_good, + is_hot: info.is_hot, + is_benefit: info.is_benefit, + is_best: info.is_best, + is_new: info.is_new, temp_id: info.temp_id, guarantee_template_id: info.guarantee_template_id ? info.guarantee_template_id @@ -2259,6 +2294,18 @@ export default { if (this.formValidate.is_good === 1) { this.checkboxGroup.push("is_good"); } + if (this.formValidate.is_hot === 1) { + this.checkboxGroup.push("is_hot"); + } + if (this.formValidate.is_benefit === 1) { + this.checkboxGroup.push("is_benefit"); + } + if (this.formValidate.is_best === 1) { + this.checkboxGroup.push("is_best"); + } + if (this.formValidate.is_new === 1) { + this.checkboxGroup.push("is_new"); + } this.fullscreenLoading = false; }, //关闭淘宝弹窗并生成数据； diff --git a/view/mer/src/views/product/productList/index.vue b/view/mer/src/views/product/productList/index.vue index 9af21c5..ff28637 100644 --- a/view/mer/src/views/product/productList/index.vue +++ b/view/mer/src/views/product/productList/index.vue @@ -15,57 +15,58 @@ - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -77,20 +78,20 @@ 添加商品 - 商品采集 + 批量下架 批量上架 - 批量设置标签 - 批量设置运费 - 批量设置佣金 - 批量设置会员价 + + + +
- @@ -173,20 +174,20 @@ -