From 4a50df36d48b0a6baac80330855db6577099f99f Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 14:59:37 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/setting/SystemMenus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php b/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php index 1446d4587..42a4fb951 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemMenus.php @@ -111,7 +111,7 @@ class SystemMenus extends AuthController ['is_show', 0], ['is_show_path', 0], ]); - + $data['is_show_path'] = $data['is_show']; if (!$data['menu_name']) return app('json')->fail(400198); $data['path'] = implode('/', $data['path']); From 8adf067232ea96e5c9dc1dda2937a1fdc4932e83 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 15:00:11 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/common.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crmeb/app/common.php b/crmeb/app/common.php index ac7806836..8d8575b0d 100644 --- a/crmeb/app/common.php +++ b/crmeb/app/common.php @@ -682,10 +682,10 @@ if (!function_exists('get_file_link')) { if (!$link) { return ''; } - if (strstr('http', $link) === false) { - return app()->request->domain() . $link; - } else { + if (substr($link, 0, 4) === "http" || substr($link, 0, 2) === "//") { return $link; + } else { + return app()->request->domain() . $link; } } } From 43c48f1e0723c1cdc5e6212b5f459bca1b29e120 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 15:00:35 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=95=BF=E9=93=BE=E6=8E=A5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/config/workerman.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/crmeb/config/workerman.php b/crmeb/config/workerman.php index ace47652f..cfa7b7f2c 100644 --- a/crmeb/config/workerman.php +++ b/crmeb/config/workerman.php @@ -9,6 +9,16 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- return [ + + // 系统程序接收到发送过来的消息，通过此端口推送给对应的客户或者客服，以及后台新订单弹窗提醒 + 'channel' => [ + //内部通讯监听端口 + 'port' => 40003, + //内部通讯地址 + 'ip' => '127.0.0.1', + ], + + // notice 新订单和新退款单发送消息给程序，后台的消息通知 'admin' => [ //协议 'protocol' => 'websocket', @@ -20,6 +30,7 @@ return [ 'serverCount' => 1, ], + // msg 客户或者客服发送消息给程序，客服消息通知 'chat' => [ //协议 'protocol' => 'websocket', @@ -30,12 +41,4 @@ return [ //设置当前Worker实例启动多少个进程 'serverCount' => 1, ], - - 'channel' => [ - //内部通讯监听端口 - 'port' => 40003, - //内部通讯地址 - 'ip' => '127.0.0.1', - ], - ]; From 7937a1c7bd13d25570fd90a660b9bb16c55ab15b Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 15:00:53 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemMenus/components/menusFrom.vue | 22 ++++++++++++++----- .../src/pages/system/systemMenus/index.vue | 4 ++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/template/admin/src/pages/system/systemMenus/components/menusFrom.vue b/template/admin/src/pages/system/systemMenus/components/menusFrom.vue index 5a2a2b88c..62cfcb543 100644 --- a/template/admin/src/pages/system/systemMenus/components/menusFrom.vue +++ b/template/admin/src/pages/system/systemMenus/components/menusFrom.vue @@ -47,12 +47,19 @@ + + + + + - @@ -369,10 +376,13 @@ export default { datas: this.formValidate, }; if (!this.formValidate.menu_name) { - return this.$Message.warning('请填写按钮名称'); + return this.$Message.warning('请填写菜单/按钮/接口名称'); } - if (!this.formValidate.menu_path) { - return this.$Message.warning('请填写路由地址'); + if (!this.formValidate.menu_path && this.authType != 2) { + return this.$Message.warning('请填写页面地址'); + } + if (!this.formValidate.api_url && this.authType == 2) { + return this.$Message.warning('请填写接口地址'); } this.valids = true; addMenusApi(data) diff --git a/template/admin/src/pages/system/systemMenus/index.vue b/template/admin/src/pages/system/systemMenus/index.vue index 181f9ebf8..a26858a66 100644 --- a/template/admin/src/pages/system/systemMenus/index.vue +++ b/template/admin/src/pages/system/systemMenus/index.vue @@ -71,10 +71,10 @@ 选择权限 - 添加下级 + 添加下级 - + 编辑 删除 From 837feb0d75caee87d569cff657a02d3e431f0e4b Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 15:01:15 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=88=86=E7=B1=BB2=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uni-app/components/d_goodList/index.vue | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/template/uni-app/components/d_goodList/index.vue b/template/uni-app/components/d_goodList/index.vue index d491f7ee6..dfc82a551 100644 --- a/template/uni-app/components/d_goodList/index.vue +++ b/template/uni-app/components/d_goodList/index.vue @@ -2,9 +2,12 @@ - {{$t(`秒杀`)}} - {{$t(`砍价`)}} - {{$t(`拼团`)}} + {{$t(`秒杀`)}} + {{$t(`砍价`)}} + {{$t(`拼团`)}} @@ -17,7 +20,8 @@ - {{$t(`立即购买`)}} + {{$t(`立即购买`)}} + @@ -26,7 +30,8 @@ - {{$t(`加入购物车`)}} + {{$t(`加入购物车`)}} + {{item.cart_num}} @@ -98,15 +103,20 @@ margin-bottom: 63rpx; .pictrue { - width: 100%; - height: 290rpx; + // width: 100%; + // height: 290rpx; border-radius: 16rpx; position: relative; + padding-top: 40%; image { + border-radius: 10rpx; + position: absolute; + top: 0; + left: 0; width: 100%; height: 100%; - border-radius: 10rpx; + object-fit: cover; } } @@ -186,4 +196,4 @@ } } } - + \ No newline at end of file From 26809e21b8e1d4223149add6a14945a373096e96 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 15:02:59 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=88=86=E7=B1=BB2=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/goods_cate/goods_cate2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/pages/goods_cate/goods_cate2.vue b/template/uni-app/pages/goods_cate/goods_cate2.vue index a7180c621..9f4a86039 100644 --- a/template/uni-app/pages/goods_cate/goods_cate2.vue +++ b/template/uni-app/pages/goods_cate/goods_cate2.vue @@ -969,7 +969,7 @@ margin-bottom: 33rpx !important; .pictrue { - height: 216rpx; + // height: 216rpx; } .text { From fc6869be318199570330e7c1756de1bdbc8a381a Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 17:36:25 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=B8=80=E5=8F=B7=E9=80=9A=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E5=88=A0=E9=99=A4=E5=9F=9F=E5=90=8D=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/notify/smsConfig/components/register.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/admin/src/pages/notify/smsConfig/components/register.vue b/template/admin/src/pages/notify/smsConfig/components/register.vue index 44319d306..e7285b55c 100644 --- a/template/admin/src/pages/notify/smsConfig/components/register.vue +++ b/template/admin/src/pages/notify/smsConfig/components/register.vue @@ -25,9 +25,9 @@ - - - + + + @@ -81,7 +81,7 @@ export default { ruleInline: { account: [{ required: true, message: '请输入短信平台账号', trigger: 'blur' }], password: [{ required: true, message: '请输入密码', trigger: 'blur' }], - url: [{ required: true, message: '请输入网址域名', trigger: 'blur' }], + // url: [{ required: true, message: '请输入网址域名', trigger: 'blur' }], phone: [{ required: true, validator: validatePhone, trigger: 'blur' }], sign: [{ required: true, message: '请输入短信签名', trigger: 'blur' }], verify_code: [{ required: true, message: '请输入验证码', trigger: 'blur' }], From 5d89cd557a0018b642a90f2b6aa38750b717e6bf Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 17:36:46 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=98=BE=E7=A4=BA=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/src/pages/order/orderList/handle/orderDetails.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue index e74eff00e..da07739af 100644 --- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue +++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue @@ -48,8 +48,8 @@ 退款金额：{{ parseFloat(orderDatalist.orderInfo.refund_price) }}退款金额：{{ parseFloat(orderDatalist.orderInfo.refunded_price) }} 使用积分：{{ parseFloat(orderDatalist.orderInfo.use_integral) }} Date: Tue, 30 May 2023 17:40:41 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BB=98=E8=B4=B9=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8D=A1=E5=AF=86=E9=A1=B5=E9=9D=A2=E4=B8=8B=E8=BD=BD=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E6=94=B9=E4=B8=BA=E5=8D=A1=E5=AF=86=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/user/grade/card/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/pages/user/grade/card/index.vue b/template/admin/src/pages/user/grade/card/index.vue index 21fb27a80..81401968f 100644 --- a/template/admin/src/pages/user/grade/card/index.vue +++ b/template/admin/src/pages/user/grade/card/index.vue @@ -18,7 +18,7 @@ - + From b147cfc9cea126aedf56b8b2787fb72f698729e7 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 30 May 2023 17:40:59 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=89=8B=E9=A3=8E=E7=90=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/store/module/themeConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/store/module/themeConfig.js b/template/admin/src/store/module/themeConfig.js index 696f33f50..04b11e606 100644 --- a/template/admin/src/store/module/themeConfig.js +++ b/template/admin/src/store/module/themeConfig.js @@ -42,7 +42,7 @@ const themeConfigModule = { // 是否开启菜单水平折叠效果 isCollapse: false, // 是否开启菜单手风琴效果 - isUniqueOpened: false, + isUniqueOpened: true, // 是否开启固定 Header isFixedHeader: true, From b6fb32e85ceb0a3034e516207b1271781aa22c4c Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 1 Jun 2023 09:28:27 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/Request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/app/Request.php b/crmeb/app/Request.php index 1c1aed939..97766195b 100644 --- a/crmeb/app/Request.php +++ b/crmeb/app/Request.php @@ -33,7 +33,7 @@ class Request extends \think\Request * 不过滤变量名 * @var array */ - protected $except = ['menu_path', 'api_url', 'unique_auth', 'description', 'custom_form', 'content']; + protected $except = ['menu_path', 'api_url', 'unique_auth', 'description', 'custom_form', 'content', 'tableField']; /** * 获取请求的数据 From 463382a641b82ff1869478988a9f67a193c9fdf6 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 1 Jun 2023 09:28:50 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/user/UserSignServices.php | 20 ++++++++----------- .../uni-app/pages/users/user_sgin/index.vue | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/crmeb/app/services/user/UserSignServices.php b/crmeb/app/services/user/UserSignServices.php index b3d8c8de4..d3e1d9651 100644 --- a/crmeb/app/services/user/UserSignServices.php +++ b/crmeb/app/services/user/UserSignServices.php @@ -139,21 +139,17 @@ class UserSignServices extends BaseServices if (!$user) { throw new ApiException(410032); } - if ($this->getIsSign($uid, 'today')) { - throw new ApiException(410293); - } +// if ($this->getIsSign($uid, 'today')) { +// throw new ApiException(410293); +// } $sign_num = 0; - $user_sign_num = $user['sign_num']; //检测昨天是否签到 - if ($this->getIsSign($uid, 'yesterday')) { - if ($user->sign_num > (count($sign_list) - 1)) { - $user->sign_num = 0; - } - } else { - $user->sign_num = 0; - } +// if (!$this->getIsSign($uid, 'yesterday')) { +// $user->sign_num = 0; +// } + foreach ($sign_list as $key => $item) { - if ($key == $user->sign_num) { + if ($key == $user->sign_num || ($user->sign_num > 6 && $key == 6)) { $sign_num = $item['sign_num']; break; } diff --git a/template/uni-app/pages/users/user_sgin/index.vue b/template/uni-app/pages/users/user_sgin/index.vue index f77c0c695..2e074e51e 100644 --- a/template/uni-app/pages/users/user_sgin/index.vue +++ b/template/uni-app/pages/users/user_sgin/index.vue @@ -27,7 +27,7 @@ {{(item.day==$t(`第七天`) || item.day==$t(`第7天`))?$t(`奖励`):$t(item.day)}} + :class="(index + 1 === signSystemList.length ? 'venusSelect' : '') + ' ' +(sign_index >= index + 1 ? 'venusSelect' : '')"> +{{item.sign_num}}