From 53a5b64eddd74abd9783451763f4d7a0ec31197e Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sat, 18 Feb 2023 09:55:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA=E6=8B=BC=E5=9B=A2=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combination/StorePinkServices.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php index df25e87b7..223390680 100644 --- a/crmeb/app/services/activity/combination/StorePinkServices.php +++ b/crmeb/app/services/activity/combination/StorePinkServices.php @@ -151,8 +151,23 @@ class StorePinkServices extends BaseServices $where['cid'] = $id; $where['k_id'] = 0; $where['is_refund'] = 0; - $list = $this->dao->pinkList($where); - $ids = array_column($list, 'id'); + $pinkList = $this->dao->pinkList($where); + $ids = array_column($pinkList, 'id'); + $orderIdKey = array_column($pinkList, 'order_id_key'); + $refunList = []; + if ($orderIdKey) { + $refunList = app()->make(StoreOrderRefundServices::class)->getColumn([['store_order_id', 'in', $orderIdKey]], 'id', 'store_order_id'); + } + if ($refunList) { + $list = []; + foreach ($pinkList as $item) { + if (!isset($refunList[$item['order_id_key']])) { + $list[] = $item; + } + } + } else { + $list = $pinkList; + } $counts = $this->dao->getPinkPeopleCount($ids); if ($type) { $pinkAll = []; From c3f5a39cb295f03e6c5ed35886c39fe7f3754a02 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 18 Feb 2023 09:57:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?improve:=20=E4=BC=98=E5=8C=96=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= 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 +- template/uni-app/pages/goods_details/index.vue | 8 ++++---- template/uni-app/pages/index/visualization/index.vue | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue index 49df53fcc..29de79881 100644 --- a/template/uni-app/pages/annex/vip_paid/index.vue +++ b/template/uni-app/pages/annex/vip_paid/index.vue @@ -50,7 +50,7 @@ @click="checkType(item)"> {{item.title}} {{$t(`￥`)}}{{item.pre_price | moneyFormat}} - {{$t(`试用`)}}{{item.vip_day}}{{$t(`天.`)}} + {{$t(`试用`)}}{{item.vip_day}}{{$t(`天`)}} {{$t(`￥`)}}{{item.price | moneyFormat}} diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue index 3887020f2..1ca72ba48 100644 --- a/template/uni-app/pages/goods_details/index.vue +++ b/template/uni-app/pages/goods_details/index.vue @@ -757,10 +757,10 @@ summary: that.storeInfo.store_info, imageUrl: that.storeInfo.small_image, success: function(res) { - uni.showToast({ - title: that.$t(`分享成功`), - icon: "success", - }); + // uni.showToast({ + // title: that.$t(`分享成功`), + // icon: "success", + // }); that.posters = false; }, fail: function(err) { diff --git a/template/uni-app/pages/index/visualization/index.vue b/template/uni-app/pages/index/visualization/index.vue index 837926dd3..96bf02933 100644 --- a/template/uni-app/pages/index/visualization/index.vue +++ b/template/uni-app/pages/index/visualization/index.vue @@ -59,12 +59,10 @@ - - - + Date: Sat, 18 Feb 2023 09:58:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?improve:=20=E6=8E=A7=E5=88=B6=E5=8F=B0?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/users/auth/index.vue | 2 +- .../uni-app/pages/users/components/login_mobile/index.vue | 2 +- .../pages/users/components/verify/{verify.vue => index.vue} | 2 +- .../verify/verifySlider/{verifySlider.vue => index.vue} | 0 template/uni-app/pages/users/login/index.vue | 4 ++-- template/uni-app/pages/users/user_phone/index.vue | 2 +- template/uni-app/pages/users/user_pwd_edit/index.vue | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename template/uni-app/pages/users/components/verify/{verify.vue => index.vue} (99%) rename template/uni-app/pages/users/components/verify/verifySlider/{verifySlider.vue => index.vue} (100%) diff --git a/template/uni-app/pages/users/auth/index.vue b/template/uni-app/pages/users/auth/index.vue index 9540e783e..05ea17617 100644 --- a/template/uni-app/pages/users/auth/index.vue +++ b/template/uni-app/pages/users/auth/index.vue @@ -51,7 +51,7 @@ import { registerVerify } from '@/api/user.js' - import Verify from '../components/verify/verify.vue'; + import Verify from '../components/verify/index.vue'; export default { name: "Auth", components: { diff --git a/template/uni-app/pages/users/components/login_mobile/index.vue b/template/uni-app/pages/users/components/login_mobile/index.vue index b26738082..ded603b08 100644 --- a/template/uni-app/pages/users/components/login_mobile/index.vue +++ b/template/uni-app/pages/users/components/login_mobile/index.vue @@ -21,7 +21,7 @@ const app = getApp(); import sendVerifyCode from "@/mixins/SendVerifyCode"; import Routine from '@/libs/routine'; - import Verify from '../verify/verify.vue'; + import Verify from '../verify/index.vue'; import Cache from '@/utils/cache'; import { loginMobile, diff --git a/template/uni-app/pages/users/components/verify/verify.vue b/template/uni-app/pages/users/components/verify/index.vue similarity index 99% rename from template/uni-app/pages/users/components/verify/verify.vue rename to template/uni-app/pages/users/components/verify/index.vue index 2c613309b..9bce1e35c 100644 --- a/template/uni-app/pages/users/components/verify/verify.vue +++ b/template/uni-app/pages/users/components/verify/index.vue @@ -38,7 +38,7 @@ * Verify 验证码组件 * @description 分发验证码使用 * */ - import VerifySlide from './verifySlider/verifySlider' + import VerifySlide from './verifySlider/index.vue' import verifySliderPc from './verifySlider/verifySliderPc' import VerifyPoint from "./verifyPoint/verifyPoint" diff --git a/template/uni-app/pages/users/components/verify/verifySlider/verifySlider.vue b/template/uni-app/pages/users/components/verify/verifySlider/index.vue similarity index 100% rename from template/uni-app/pages/users/components/verify/verifySlider/verifySlider.vue rename to template/uni-app/pages/users/components/verify/verifySlider/index.vue diff --git a/template/uni-app/pages/users/login/index.vue b/template/uni-app/pages/users/login/index.vue index b6ab79ab4..9921e7292 100644 --- a/template/uni-app/pages/users/login/index.vue +++ b/template/uni-app/pages/users/login/index.vue @@ -129,7 +129,7 @@ // #endif const BACK_URL = "login_back_url"; import colors from '@/mixins/color.js'; - import Verify from '../components/verify/verify.vue'; + import Verify from '../components/verify/index.vue'; export default { name: "Login", components: { @@ -845,4 +845,4 @@ .main-color { color: var(--view-theme); } - + diff --git a/template/uni-app/pages/users/user_phone/index.vue b/template/uni-app/pages/users/user_phone/index.vue index dd62bd118..af4c3e298 100644 --- a/template/uni-app/pages/users/user_phone/index.vue +++ b/template/uni-app/pages/users/user_phone/index.vue @@ -25,7 +25,7 @@