From d4b785ec7693c28955b94055b6a73c66e75e51ec Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 19 Jun 2023 16:27:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?faet:=20=E5=8F=96=E6=B6=88=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E5=AF=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/orderList/components/tableList.vue | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/template/admin/src/pages/order/orderList/components/tableList.vue b/template/admin/src/pages/order/orderList/components/tableList.vue index fb2da383a..19316ef7e 100644 --- a/template/admin/src/pages/order/orderList/components/tableList.vue +++ b/template/admin/src/pages/order/orderList/components/tableList.vue @@ -73,10 +73,12 @@ (row.status === 4 || row._status === 2 || row._status === 8) && row.shipping_type === 1 && (row.pinkStatus === null || row.pinkStatus === 2) && - row.is_del !== 1 + row.is_del !== 1 && + !row.is_stock_up " >发送货 + 取消商家寄件 配送信息 { + this.$Message.success(res.msg); + this.getList(); + }) + .catch((res) => { + this.$Message.error(res.msg); + }); + break; default: this.delfromData = { title: '删除订单', From 33c164c014b04cd40130e2444e625c4eb920244e Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 19 Jun 2023 16:27:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?improve:=20=E5=AE=A2=E6=9C=8D=E8=81=8A?= =?UTF-8?q?=E5=A4=A9=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/kefu/pc/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/template/admin/src/pages/kefu/pc/index.vue b/template/admin/src/pages/kefu/pc/index.vue index 420e99f54..d02d409a9 100644 --- a/template/admin/src/pages/kefu/pc/index.vue +++ b/template/admin/src/pages/kefu/pc/index.vue @@ -51,9 +51,7 @@
{{ item.productInfo.store_name }}
-
- 库存：{{ item.productInfo.stock }} 销量：{{ item.productInfo.sales }} -
+
库存：{{ item.productInfo.stock }} 销量：{{ item.productInfo.sales }}
¥ {{ item.productInfo.price }}
查看商品 > @@ -127,6 +125,7 @@
this.$refs.chatInput.focus()); } }, // 输入框选择表情 @@ -497,6 +497,7 @@ export default { sendText() { this.sendMsg(this.chatCon, 1); this.chatCon = ''; + this.$nextTick(() => this.$refs.chatInput.focus()); }, // 统一发送处理 @@ -941,4 +942,7 @@ export default { .emoji-box::-webkit-scrollbar { width: 0; } +.textarea-box /deep/ .ivu-input:focus{ + box-shadow: none; +} From 71ab6d168bc384bc20eb0559f7406ef840b4d3ee Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 19 Jun 2023 16:29:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?improve:=20=E6=96=87=E5=AD=97=E5=8F=8A?= =?UTF-8?q?=E6=B8=85=E6=A5=9A=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/order/orderList/handle/orderSend.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/admin/src/pages/order/orderList/handle/orderSend.vue b/template/admin/src/pages/order/orderList/handle/orderSend.vue index 29d45f647..51adf0e88 100644 --- a/template/admin/src/pages/order/orderList/handle/orderSend.vue +++ b/template/admin/src/pages/order/orderList/handle/orderSend.vue @@ -77,7 +77,7 @@ 今天 明天 - 后台 + 后天 @@ -525,6 +525,7 @@ export default { cancel(name) { this.modals = false; this.orderStatus = 0; + this.sendPrice = 0; this.splitSwitch = false; this.selectData = []; this.formItem.type = '1'; From 40b44c12ba3326606d5abf43fe2f48d37551445e Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 19 Jun 2023 16:42:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=98=E8=B4=B9=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8D=A1=E4=BD=BF=E7=94=A8=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/annex/vip_paid/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue index e0a053cc9..6b23f3ce0 100644 --- a/template/uni-app/pages/annex/vip_paid/index.vue +++ b/template/uni-app/pages/annex/vip_paid/index.vue @@ -769,7 +769,7 @@ data.from = 'routine'; // #endif uni.showLoading({ - title: this.$t(`active`) + title: this.$t(`激活中`) }); memberCardDraw(data).then(res => { let that = this; From ace0ddf87dd45c0b5848a2e345f7a7cec556f8fb Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 19 Jun 2023 16:42:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/services/product/product/StoreProductReplyServices.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/app/services/product/product/StoreProductReplyServices.php b/crmeb/app/services/product/product/StoreProductReplyServices.php index e5399edbb..5cbc1985b 100644 --- a/crmeb/app/services/product/product/StoreProductReplyServices.php +++ b/crmeb/app/services/product/product/StoreProductReplyServices.php @@ -216,7 +216,7 @@ class StoreProductReplyServices extends BaseServices [$page, $limit] = $this->getPageValue(); $list = $this->dao->replyList($id, $type, $page, $limit); foreach ($list as &$item) { - $item['suk'] = isset($item['cart_info']['productInfo']['attrInfo']) ? $item['cart_info']['productInfo']['attrInfo']['suk'] : ''; + $item['suk'] = $item['suk'] != '' ? $item['suk'] : (isset($item['cart_info']['productInfo']['attrInfo']) ? $item['cart_info']['productInfo']['attrInfo']['suk'] : ''); $item['nickname'] = anonymity($item['nickname']); $item['merchant_reply_time'] = date('Y-m-d H:i', $item['merchant_reply_time']); $item['add_time'] = time_tran($item['add_time']);