diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index dc695e5..72bb879 100755 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -84,7 +84,7 @@ class Auth extends BaseController // } // app(UserAssetsLogRepository::class)->shareAward(1); -// app(DepositRecordDailyRepository::class)->runDaily(); + app(DepositRecordDailyRepository::class)->runDaily(); // event('pay_success_user_recharge', array('order_sn' => 'wxu2024041817195114')); return app('json')->success(); } diff --git a/app/controller/merchant/store/product/Product.php b/app/controller/merchant/store/product/Product.php index 464a8d8..76aeb24 100755 --- a/app/controller/merchant/store/product/Product.php +++ b/app/controller/merchant/store/product/Product.php @@ -51,7 +51,7 @@ class Product extends BaseController { [$page, $limit] = $this->getPage(); $type = $this->request->param('type', 1); - $where = $this->request->params(['temp_id', 'cate_id', 'keyword', 'mer_cate_id', 'is_gift_bag', 'status', 'us_status', 'product_id', 'mer_labels', ['order', 'sort'], 'is_ficti', 'svip_price_type', 'filters_type', 'is_action', 'is_good', 'not_product_id', 'form_id']); + $where = $this->request->params(['temp_id', 'cate_id', 'keyword', 'mer_cate_id', 'is_gift_bag', 'status', 'us_status', 'product_id', 'mer_labels', ['order', 'sort'], 'is_ficti', 'is_hot', 'svip_price_type', 'filters_type', 'is_action', 'is_good', 'not_product_id', 'form_id']); $where = array_merge($where, $this->repository->switchType($type, $this->request->merId(), 0)); return app('json')->success($this->repository->getList($this->request->merId(), $where, $page, $limit)); } diff --git a/public/mer.html b/public/mer.html index 48b301a..197cfb5 100755 --- 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 091c0bf..f56815a 100755 --- a/public/system.html +++ b/public/system.html @@ -1,3 +1,3 @@ -加载中...
\ No newline at end of file diff --git a/view/mer/src/views/order/index.vue b/view/mer/src/views/order/index.vue index 042d382..8451540 100644 --- a/view/mer/src/views/order/index.vue +++ b/view/mer/src/views/order/index.vue @@ -219,15 +219,15 @@ {{ original.delivery_id }} - - - 手动发货 - {{orderType == 1 ? '虚拟发货' : '无需物流'}} - 电子面单打印 - 自己配送 - 同城配送 - - + + + + + + + + +
快递单号：
{{ orderDetailList.delivery_id ? orderDetailList.delivery_id : '-' }}
- 物流查询 diff --git a/view/mer/src/views/product/productList/index.vue b/view/mer/src/views/product/productList/index.vue index 43418fc..31acf22 100644 --- a/view/mer/src/views/product/productList/index.vue +++ b/view/mer/src/views/product/productList/index.vue @@ -19,7 +19,7 @@ - + @@ -500,6 +500,7 @@ export default { form_id: '', type: this.$route.query.type ? this.$route.query.type : '1', is_ficti: "", + is_hot: "", is_gift_bag: '', us_status: '', mer_labels: '', @@ -518,8 +519,7 @@ export default { ], productTypeList: [ { label: '普通商品', value: 0 }, - { label: '虚拟商品', value: 1 }, - { label: '卡密商品', value: 2 } + { label: '爆单商品', value: 1 }, ], tempRule: { temp_id: [{required: true,message: '请选择运费模板',trigger: 'change'}]