From 2fb2cae76f7ed455b310deecf3dd0402470fb220 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Wed, 29 Mar 2023 17:36:27 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/integral/StoreIntegralOrderServices.php | 9 ++++----- .../admin/src/pages/user/list/handle/userDetails.vue | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crmeb/app/services/activity/integral/StoreIntegralOrderServices.php b/crmeb/app/services/activity/integral/StoreIntegralOrderServices.php index c36a1b39f..b7d778696 100644 --- a/crmeb/app/services/activity/integral/StoreIntegralOrderServices.php +++ b/crmeb/app/services/activity/integral/StoreIntegralOrderServices.php @@ -160,8 +160,7 @@ class StoreIntegralOrderServices extends BaseServices if (!$addressId) { throw new ApiException(410045); } - if (!$addressInfo = $addressServices->getOne(['uid' => $uid, 'id' => $addressId, 'is_del' => 0])) - throw new ApiException(410046); + if (!$addressInfo = $addressServices->getOne(['uid' => $uid, 'id' => $addressId, 'is_del' => 0])) throw new ApiException(410046); $addressInfo = $addressInfo->toArray(); $total_price = bcmul($productInfo['price'], $num, 2); /** @var UserBillServices $userBillServices */ @@ -226,7 +225,7 @@ class StoreIntegralOrderServices extends BaseServices $res2 = false !== $userServices->bcDec($userInfo['uid'], 'integral', $priceIntegral, 'uid'); /** @var UserBillServices $userBillServices */ $userBillServices = app()->make(UserBillServices::class); - $res3 = $userBillServices->income('storeIntegral_use_integral', $uid, $priceIntegral, $userInfo['integral'], $orderId); + $res3 = $userBillServices->income('storeIntegral_use_integral', $uid, $priceIntegral, $userInfo['integral'] - $priceIntegral, $orderId); $res2 = $res2 && false != $res3; } if (!$res2) { @@ -334,7 +333,7 @@ class StoreIntegralOrderServices extends BaseServices /** @var StoreProductAttrValueServices $StoreProductAttrValueServices */ $StoreProductAttrValueServices = app()->make(StoreProductAttrValueServices::class); $attrValue = $StoreProductAttrValueServices->uniqueByField($unique, 'product_id,suk,price,image,unique'); - if(!$attrValue || !isset($attrValue['storeIntegral']) || !$attrValue['storeIntegral']){ + if (!$attrValue || !isset($attrValue['storeIntegral']) || !$attrValue['storeIntegral']) { throw new ApiException(410295); } $data = []; @@ -734,7 +733,7 @@ class StoreIntegralOrderServices extends BaseServices if (!$remark) throw new AdminException(400106); if (!$id) throw new AdminException(100100); if (!$order = $this->dao->get($id)) { - throw new AdminException(100025); + throw new AdminException(100025); } $order->remark = $remark; diff --git a/template/admin/src/pages/user/list/handle/userDetails.vue b/template/admin/src/pages/user/list/handle/userDetails.vue index acb6f4d18..895b76109 100644 --- a/template/admin/src/pages/user/list/handle/userDetails.vue +++ b/template/admin/src/pages/user/list/handle/userDetails.vue @@ -214,7 +214,7 @@ export default { minWidth: 120, }, { - title: '变化前积分', + title: '变化后积分', key: 'balance', minWidth: 120, }, From 56efb28b32f678874831b04552cc310518c61f50 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 10:01:07 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/marketing/StoreCombination.php | 14 +++++++++++++- .../app/dao/activity/combination/StorePinkDao.php | 2 ++ crmeb/app/dao/order/StoreOrderDao.php | 4 ++-- .../combination/StoreCombinationServices.php | 4 ++-- .../activity/combination/StorePinkServices.php | 3 +++ .../admin/src/pages/marketing/live/creat_live.vue | 4 ++-- .../marketing/storeCombination/statistics.vue | 4 ++-- 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php b/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php index 11449be1c..a02808cd6 100644 --- a/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php +++ b/crmeb/app/adminapi/controller/v1/marketing/StoreCombination.php @@ -182,7 +182,11 @@ class StoreCombination extends AuthController /** * 拼团人列表 + * @param $id * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function order_pink($id) { @@ -207,12 +211,20 @@ class StoreCombination extends AuthController * 活动参与人 * @param $id * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function combinationStatisticsList($id) { + $where = $this->request->getMore([ + ['real_name', '', '', 'keyword'], + ['status', ''] + ]); + $where['cid'] = $id; /** @var StorePinkServices $storePinkServices */ $storePinkServices = app()->make(StorePinkServices::class); - $list = $storePinkServices->systemPage(['cid' => $id]); + $list = $storePinkServices->systemPage($where); return app('json')->success($list); } diff --git a/crmeb/app/dao/activity/combination/StorePinkDao.php b/crmeb/app/dao/activity/combination/StorePinkDao.php index 042272623..433086504 100644 --- a/crmeb/app/dao/activity/combination/StorePinkDao.php +++ b/crmeb/app/dao/activity/combination/StorePinkDao.php @@ -56,6 +56,8 @@ class StorePinkDao extends BaseDao { return $this->search($where)->when($where['k_id'] != 0, function ($query) use ($where) { $query->whereOr('id', $where['k_id']); + })->when(isset($where['keyword']) && $where['keyword'] != '', function ($query) use ($where) { + $query->where('uid|nickname', 'like', '%' . $where['keyword'] . '%'); })->with('getProduct')->when($page != 0, function ($query) use ($page, $limit) { $query->page($page, $limit); })->order('add_time desc')->select()->toArray(); diff --git a/crmeb/app/dao/order/StoreOrderDao.php b/crmeb/app/dao/order/StoreOrderDao.php index 166e5a6df..a32c3f941 100644 --- a/crmeb/app/dao/order/StoreOrderDao.php +++ b/crmeb/app/dao/order/StoreOrderDao.php @@ -967,9 +967,9 @@ class StoreOrderDao extends BaseDao */ public function combinationStatisticsOrder($id, $where, $page = 0, $limit = 0) { - return $this->search($where)->where('combination_id', $id) + return $this->search($where)->where('combination_id', $id)->where('paid', 1)->whereIn('refund_type', [0, 3])->where('is_del', 0) ->when($page && $limit, function ($query) use ($page, $limit) { $query->page($page, $limit); - })->field(['order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->select()->toArray(); + })->field(['uid', 'order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->order('add_time desc')->select()->toArray(); } } diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php index 07b7f34ec..a894d7789 100644 --- a/crmeb/app/services/activity/combination/StoreCombinationServices.php +++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php @@ -643,8 +643,8 @@ class StoreCombinationServices extends BaseServices $spread_count = $pinkServices->getDistinctCount([['cid', '=', $id], ['k_id', '>', 0]], 'uid', false); $start_count = $pinkServices->count(['cid' => $id, 'k_id' => 0]); $success_count = $pinkServices->count(['cid' => $id, 'k_id' => 0, 'status' => 2]); - $pay_price = $orderServices->sum(['combination_id' => $id, 'paid' => 1], 'pay_price', true); - $pay_count = $orderServices->getDistinctCount([['combination_id', '=', $id], ['paid', '=', 1]], 'uid', false); + $pay_price = $orderServices->sum([['combination_id', '=', $id], ['paid', '=', 1], ['refund_type', 'in', [0, 3]], ['is_del', '=', 0]], 'pay_price', false); + $pay_count = $orderServices->getDistinctCount([['combination_id', '=', $id], ['paid', '=', 1], ['refund_type', 'in', [0, 3]], ['is_del', '=', 0]], 'uid', false); return compact('people_count', 'spread_count', 'start_count', 'success_count', 'pay_price', 'pay_count'); } diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php index 535ab831b..4da1e716c 100644 --- a/crmeb/app/services/activity/combination/StorePinkServices.php +++ b/crmeb/app/services/activity/combination/StorePinkServices.php @@ -56,6 +56,9 @@ class StorePinkServices extends BaseServices /** * @param array $where * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function systemPage(array $where) { diff --git a/template/admin/src/pages/marketing/live/creat_live.vue b/template/admin/src/pages/marketing/live/creat_live.vue index 4b5e22794..8f64caad3 100644 --- a/template/admin/src/pages/marketing/live/creat_live.vue +++ b/template/admin/src/pages/marketing/live/creat_live.vue @@ -117,7 +117,7 @@ /> - + diff --git a/template/admin/src/pages/marketing/storeCombination/statistics.vue b/template/admin/src/pages/marketing/storeCombination/statistics.vue index 41b6fb337..a3567354e 100644 --- a/template/admin/src/pages/marketing/storeCombination/statistics.vue +++ b/template/admin/src/pages/marketing/storeCombination/statistics.vue @@ -42,7 +42,7 @@ search enter-button v-model="pagination.real_name" - placeholder="请输入用户姓名|手机号|UID" + :placeholder="type == 1 ? '请输入用户|订单号|UID' : '请输入用户姓名|UID'" @on-search="searchList" /> @@ -292,7 +292,7 @@ export default { }, { title: '金额', - key: 'price', + key: 'total_price', }, { title: '订单状态', From 9b20b377490200e4bae78144ec5f915e3269ecf4 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 17:46:36 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/export/ExportExcel.php | 3 ++- .../adminapi/controller/v1/user/UserLabel.php | 8 ++++++- crmeb/app/dao/user/UserWechatUserDao.php | 4 ++++ template/admin/src/pages/user/list/index.vue | 24 +++++++++++-------- 4 files changed, 27 insertions(+), 12 deletions(-) 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/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/template/admin/src/pages/user/list/index.vue b/template/admin/src/pages/user/list/index.vue index 961cf1be1..5d0aac0f2 100644 --- a/template/admin/src/pages/user/list/index.vue +++ b/template/admin/src/pages/user/list/index.vue @@ -1043,6 +1043,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 || ''; @@ -1353,14 +1356,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; +} From 08e41ae0a875f1c8e8a26b8454eba0549f683eed Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 17:46:50 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/goods/goods_comment_con/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/pages/goods/goods_comment_con/index.vue b/template/uni-app/pages/goods/goods_comment_con/index.vue index b9f5cf1b0..b05d64d74 100644 --- a/template/uni-app/pages/goods/goods_comment_con/index.vue +++ b/template/uni-app/pages/goods/goods_comment_con/index.vue @@ -9,7 +9,7 @@ {{productInfo.store_name}} - {{$t(`￥`)}}{{productInfo.price}} + {{$t(`￥`)}}{{productInfo.attrInfo.price}} x{{cart_num}} From aa2b20c66efed075bc2a8cad392ea2942fcb4b85 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 20:46:52 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E5=A4=8D=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/api/controller/v1/admin/StoreOrderController.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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;//订单数图表数据 From 830a52a617410e7025cd8cce81f5b1bf8fbf59f3 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 20:47:15 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84refund=5Ftype=E4=B8=BA6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/order/StoreOrderRefundServices.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'], From a32b1b42abab91ef5de57bb6d7fc79b651f2201c Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 20:47:32 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E7=89=88=E6=9C=AC=E5=89=A7=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/kefu/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } From 0b55d74696423ed66a7dae3fd288fc557d0fe5dc Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 20:49:18 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=96=84=E5=93=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=97=B6=E5=80=99=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=92=8C=E9=A1=B6=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/src/pages/marketing/live/add_goods.vue | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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() { From 5a02c4864d8ecdb87812742cbc432f303e377735 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 20:49:42 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E9=97=B4=E6=97=B6=E5=80=99=E7=9A=84=E5=88=86=E4=BA=AB=E5=9B=BE?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/marketing/live/creat_live.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@
- +
From 45ed8cdd87a8c9b33fa97c6b5fcdb1e6aefdfd1b Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 30 Mar 2023 20:50:22 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E5=9C=A8=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E4=B8=8A=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/activity/goods_bargain_details/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@