diff --git a/crmeb/app/adminapi/controller/v1/export/ExportExcel.php b/crmeb/app/adminapi/controller/v1/export/ExportExcel.php index 0fc03b224..3dd393675 100644 --- a/crmeb/app/adminapi/controller/v1/export/ExportExcel.php +++ b/crmeb/app/adminapi/controller/v1/export/ExportExcel.php @@ -72,7 +72,8 @@ class ExportExcel extends AuthController ['label_id', ''], ['now_money', 'normal'], ['field_key', ''], - ['isMember', ''] + ['isMember', ''], + ['ids', []] ]); return app('json')->success($this->service->exportUserList($where)); } diff --git a/crmeb/app/adminapi/controller/v1/user/UserLabel.php b/crmeb/app/adminapi/controller/v1/user/UserLabel.php index 034fc7736..f61f4077f 100644 --- a/crmeb/app/adminapi/controller/v1/user/UserLabel.php +++ b/crmeb/app/adminapi/controller/v1/user/UserLabel.php @@ -37,7 +37,11 @@ class UserLabel extends AuthController /** * 标签列表 + * @param int $label_cate * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function index($label_cate = 0) { @@ -60,8 +64,10 @@ class UserLabel extends AuthController /** * 保存标签表单数据 - * @param int $id * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function save() { diff --git a/crmeb/app/api/controller/v1/admin/StoreOrderController.php b/crmeb/app/api/controller/v1/admin/StoreOrderController.php index f966fd6c4..17ab9ec7d 100644 --- a/crmeb/app/api/controller/v1/admin/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/admin/StoreOrderController.php @@ -238,7 +238,7 @@ class StoreOrderController $start = $middle; } $space = bcsub($stop, $start, 0);//间隔时间段 - $front = bcsub($start, $space, 0);//第一个时间段 + $front = bcsub($start, $space, 0) - 1;//第一个时间段 /** @var StoreOrderServices $orderService */ $orderService = app()->make(StoreOrderServices::class); $order_where = [ @@ -246,10 +246,11 @@ class StoreOrderController 'paid' => 1, 'refund_status' => [0, 3], 'is_del' => 0, - 'is_system_del' => 0]; + 'is_system_del' => 0 + ]; if ($type == 1) {//销售额 - $frontPrice = $orderService->sum($order_where + ['time' => [$front, $start]], 'pay_price', true); + $frontPrice = $orderService->sum($order_where + ['time' => [$front, $start - 1]], 'pay_price', true); $afterPrice = $orderService->sum($order_where + ['time' => [$start, $stop]], 'pay_price', true); $chartInfo = $orderService->chartTimePrice($start, $stop); $data['chart'] = $chartInfo;//营业额图表数据 @@ -262,7 +263,7 @@ class StoreOrderController $data['increase_time'] = abs($increase); //同比上个时间区间增长营业额 $data['increase_time_status'] = $increase >= 0 ? 1 : 2; //同比上个时间区间增长营业额增长 1 减少 2 } else {//订单数 - $frontNumber = $orderService->count($order_where + ['time' => [$front, $start]]); + $frontNumber = $orderService->count($order_where + ['time' => [$front, $start - 1]]); $afterNumber = $orderService->count($order_where + ['time' => [$start, $stop]]); $chartInfo = $orderService->chartTimeNumber($start, $stop); $data['chart'] = $chartInfo;//订单数图表数据 diff --git a/crmeb/app/dao/user/UserWechatUserDao.php b/crmeb/app/dao/user/UserWechatUserDao.php index 20cddac5b..914c86641 100644 --- a/crmeb/app/dao/user/UserWechatUserDao.php +++ b/crmeb/app/dao/user/UserWechatUserDao.php @@ -244,6 +244,10 @@ class UserWechatUserDao extends BaseDao if (isset($where['is_del'])) { $model->where($userAlias . 'is_del', $where['is_del']); } + + if (isset($where['ids']) && count($where['ids'])) { + $model->whereIn($userAlias . 'uid', $where['ids']); + } return $field ? $model->field($field) : $model; } diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php index b0926ab9c..9acc00b13 100644 --- a/crmeb/app/services/order/StoreOrderRefundServices.php +++ b/crmeb/app/services/order/StoreOrderRefundServices.php @@ -245,7 +245,7 @@ class StoreOrderRefundServices extends BaseServices $this->storeOrderServices->update($splitOrderInfo['id'], [ 'status' => -2, 'refund_status' => 2, - 'refund_type' => $orderRefundInfo['refund_type'], + 'refund_type' => 6, 'refund_express' => $orderRefundInfo['refund_express'], 'refund_express_name' => $orderRefundInfo['refund_express_name'], 'refund_reason_wap_img' => $orderRefundInfo['refund_img'], diff --git a/template/admin/src/pages/kefu/index.vue b/template/admin/src/pages/kefu/index.vue index a074a1d6b..1cb469f13 100644 --- a/template/admin/src/pages/kefu/index.vue +++ b/template/admin/src/pages/kefu/index.vue @@ -548,7 +548,9 @@ a:link, a:visited, a:hover, a:active { background-position: left top !important; display: flex; } - + .wrapper-box .foot-box { + text-align: center !important; + } .content { display: none; } diff --git a/template/admin/src/pages/marketing/live/add_goods.vue b/template/admin/src/pages/marketing/live/add_goods.vue index cfb55274f..5d9fb61ca 100644 --- a/template/admin/src/pages/marketing/live/add_goods.vue +++ b/template/admin/src/pages/marketing/live/add_goods.vue @@ -24,7 +24,7 @@
- +
@@ -155,7 +155,7 @@ export default { this.selectIds = this.goodsList.map((i) => { return i.product_id; }); - console.log(this.selectIds,this.goodsList) + console.log(this.selectIds, this.goodsList); }, // 生成直播商品 liveGoods() { @@ -182,17 +182,21 @@ export default { }, 300); }); }, - bindDelete(index,item) { + bindDelete(index, item) { this.goodsList.splice(index, 1); - if (this.tabList.length) { - let i = this.tabList.findIndex((e) => e.id == item.product_id); - this.tabList.splice(i, 1); + let i = this.tabList.findIndex((e) => e.id == item.product_id); + this.tabList.splice(i, 1); + if (!this.goodsList.length) { + this.isShowBox = false; } }, del(row, index) { this.tabList.splice(index, 1); let i = this.goodsList.findIndex((e) => e.product_id == row.id); this.goodsList.splice(i, 1); + if (!this.tabList.length) { + this.isShowBox = false; + } }, // 提交 bindSub() { diff --git a/template/admin/src/pages/marketing/live/creat_live.vue b/template/admin/src/pages/marketing/live/creat_live.vue index 8f64caad3..a8e5048db 100644 --- a/template/admin/src/pages/marketing/live/creat_live.vue +++ b/template/admin/src/pages/marketing/live/creat_live.vue @@ -66,7 +66,7 @@
- +
diff --git a/template/admin/src/pages/user/list/index.vue b/template/admin/src/pages/user/list/index.vue index d3bd458fe..afec245bd 100644 --- a/template/admin/src/pages/user/list/index.vue +++ b/template/admin/src/pages/user/list/index.vue @@ -1048,6 +1048,9 @@ export default { }); this.userFrom.label_id = activeIds.join(','); } + if (this.ids.length) { + this.userFrom.ids = this.ids; + } this.userFrom.user_type = this.userFrom.user_type || ''; this.userFrom.status = this.userFrom.status || ''; this.userFrom.sex = this.userFrom.sex || ''; @@ -1335,14 +1338,15 @@ img { color: #808695; } } -.demo-drawer-footer{ - width: 100%; - position: absolute; - bottom: 0; - left: 0; - border-top: 1px solid #e8e8e8; - padding: 10px 16px; - text-align: right; - background: #fff; - } + +.demo-drawer-footer { + width: 100%; + position: absolute; + bottom: 0; + left: 0; + border-top: 1px solid #e8e8e8; + padding: 10px 16px; + text-align: right; + background: #fff; +} diff --git a/template/uni-app/pages/activity/goods_bargain_details/index.vue b/template/uni-app/pages/activity/goods_bargain_details/index.vue index d56ce1ace..df61d1ef2 100644 --- a/template/uni-app/pages/activity/goods_bargain_details/index.vue +++ b/template/uni-app/pages/activity/goods_bargain_details/index.vue @@ -1,7 +1,7 @@