From 909ff8babc5d0aabc5144e5980a81e31458032f9 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 23 Feb 2023 14:38:30 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E9=80=9A=E9=80=80=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/notification/sms/SmsConfig.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/notification/sms/SmsConfig.php b/crmeb/app/adminapi/controller/v1/notification/sms/SmsConfig.php index cbdc04895..1b38c220b 100644 --- a/crmeb/app/adminapi/controller/v1/notification/sms/SmsConfig.php +++ b/crmeb/app/adminapi/controller/v1/notification/sms/SmsConfig.php @@ -103,14 +103,10 @@ class SmsConfig extends AuthController */ public function logout() { - $res = CacheService::delete('sms_account'); - if ($res) { - $this->services->updateSmsConfig('', ''); - CacheService::clear(); - return app('json')->success(100042); - } else { - return app('json')->fail(100043); - } + CacheService::delete('sms_account'); + $this->services->updateSmsConfig('', ''); + CacheService::clear(); + return app('json')->success(100042); } /** From 149a9c363f3b40319c70f129a794201d44e9709e Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Thu, 23 Feb 2023 17:33:23 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=A6=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E8=8F=9C=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/styles/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/admin/src/styles/style.css b/template/admin/src/styles/style.css index 42c6c32f6..57a26d013 100644 --- a/template/admin/src/styles/style.css +++ b/template/admin/src/styles/style.css @@ -507,7 +507,7 @@ body { border: 0; } .i-layout-page-header { - margin: 0 -18px; + margin: 0; /* display: none; */ background-color: #fff; padding: 7px 32px 0 32px; @@ -687,4 +687,4 @@ body { } .pt10{ padding-top: 10px; -} \ No newline at end of file +} From 666a5ddc68353dc206402ba240b22b2f4b95eed0 Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Thu, 23 Feb 2023 17:33:45 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E8=B7=9D=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/main/components/side-menu/side-menu.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/admin/src/components/main/components/side-menu/side-menu.vue b/template/admin/src/components/main/components/side-menu/side-menu.vue index 07de96187..6a283dd3f 100644 --- a/template/admin/src/components/main/components/side-menu/side-menu.vue +++ b/template/admin/src/components/main/components/side-menu/side-menu.vue @@ -464,11 +464,11 @@ export default { } .ivu-menu-submenu { .ivu-menu-item { - padding-left: 16px !important; + padding-left: 23px !important; } .ivu-menu-submenu { .ivu-menu-submenu-title { - padding-left: 16px !important; + padding-left: 23px !important; } } } From 5cb6623f66dee78c512e9dd5cafffee837467163 Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Thu, 23 Feb 2023 17:35:59 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/marketing/recharge/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/template/admin/src/pages/marketing/recharge/index.vue b/template/admin/src/pages/marketing/recharge/index.vue index fef27a192..805aa5c15 100644 --- a/template/admin/src/pages/marketing/recharge/index.vue +++ b/template/admin/src/pages/marketing/recharge/index.vue @@ -1386,7 +1386,6 @@ export default { padding: 20px; background-color: #fff; border-radius: 5px; - margin: 20px; } .iview-video-style { From 181f4e668150d3a870073bdb733618e0407e06b9 Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Thu, 23 Feb 2023 17:40:04 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/system/group/visualization.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/template/admin/src/pages/system/group/visualization.vue b/template/admin/src/pages/system/group/visualization.vue index 7ef0b1713..0bb6e2246 100644 --- a/template/admin/src/pages/system/group/visualization.vue +++ b/template/admin/src/pages/system/group/visualization.vue @@ -1801,7 +1801,6 @@ export default { padding: 20px; background-color: #fff; border-radius: 5px; - margin: 20px; } .iview-video-style { From a83cf127baa79799d503252f60855e5acb9601bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Thu, 23 Feb 2023 18:04:23 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85?= =?UTF-8?q?sql=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=A1=B5=E9=9D=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/install/crmeb.sql | 12 ++++++------ crmeb/public/install/css/install.css | 2 +- crmeb/public/install/css/step1.css | 1 + crmeb/public/install/templates/step3.php | 14 +++++++------- template/admin/src/pages/system/crontab/index.vue | 12 +++++++++++- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index dd03efbf1..0f6d0a465 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -33321,7 +33321,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (13, 'wechat_appid', 'text', 'input', 2, '', 1, '', 0, 0, '\"\"', 'AppID', '微信公众号的AppID', 99, 1), (14, 'wechat_appsecret', 'text', 'input', 2, '', 1, '', 0, 0, '\"\"', 'AppSecret', '微信公众号的AppSecret', 95, 1), (15, 'wechat_token', 'text', 'input', 2, '', 1, '', 0, 0, '\"\"', '微信验证TOKEN', '微信验证TOKEN', 88, 1), -(16, 'wechat_encode', 'radio', 'input', 2, '0=>明文模式\n1=>兼容模式\n2=>安全模式', 1, '', 0, 0, '0', '消息加解密方式', '如需使用安全模式请在管理中心修改，仅限服务号和认证订阅号', 84, 0), +(16, 'wechat_encode', 'radio', 'input', 2, '0=>明文模式\n1=>兼容模式\n2=>安全模式', 1, '', 0, 0, '0', '消息加解密方式', '如需使用安全模式请在管理中心修改，仅限服务号和认证订阅号', 84, 1), (17, 'wechat_encodingaeskey', 'text', 'input', 2, '', 1, '', 0, 0, '\"\"', 'EncodingAESKey', '公众号消息加解密Key,在使用安全模式情况下要填写该值，请先在管理中心修改，然后填写该值，仅支持认证服务号', 80, 1), (18, 'wechat_share_img', 'upload', '', 70, '', 1, '', 0, 0, '\"\\/statics\\/system_images\\/share_image.jpeg\"', '微信分享图片', '若填写此图片地址，则分享网页出去时会分享此图片。可有效防止分享图片变形', 0, 1), (19, 'wechat_qrcode', 'upload', 'input', 2, '', 1, '', 0, 0, '\"\"', '公众号关注二维码', '引导关注公众号显示的公众号关注二维码', 76, 1), @@ -33381,7 +33381,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (159, 'extract_time', 'text', 'input', 73, '', 0, '', 100, 0, '\"0\"', '冻结时间', '防止用户退款，佣金被提现了，所以需要设置佣金冻结时间(天)', 0, 1), (160, 'store_brokerage_price', 'text', 'input', 72, '', 0, '', 100, 0, '\"100\"', '满额分销最低金额', '满额分销满足金额开通分销权限', 0, 1), (162, 'price_revision_switch', 'radio', 'input', 20, '0=>关闭\n1=>开启', 0, '', 0, 0, '0', '改价短信提醒开关', '改价短信提醒开关', 0, 1), -(168, 'site_logo_square', 'upload', 'input', 26, '', 1, '', 0, 0, '\"\\/statics\\/system_images\\/admin_logo_small.png\"', '后台小LOGO', '后台菜单缩进小LOGO，尺寸180*180', 6, 1), +(168, 'site_logo_square', 'upload', 'input', 26, '', 1, '', 0, 0, '\"\\/statics\\/system_images\\/admin_logo_small.png\"', '后台小LOGO', '后台菜单缩进小LOGO，尺寸180*180', 6, 0), (170, 'yue_pay_status', 'radio', 'input', 109, '1=>开启\n2=>关闭', 1, '', 0, 0, '\"1\"', '余额支付', '余额支付请选择开启或关闭', 95, 1), (171, 'login_logo', 'upload', 'input', 26, '', 1, '', 0, 0, '\"\\/statics\\/system_images\\/admin_login_logo.png\"', '后台登录页LOGO', '后台登录页LOGO，建议尺寸270x75', 8, 1), (173, 'qiniu_accessKey', 'text', 'input', 80, '', 0, '', 100, 0, '\"\"', 'accessKey', '七牛云accessKey', 0, 1), @@ -33427,9 +33427,9 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (328, 'record_No', 'text', 'input', 26, '', 1, '', 0, 0, '\"\"', '备案号', '网站的备案号，显示在H5和PC端底部', 0, 1), (329, 'routine_contact_type', 'radio', 'input', 7, '0=>跟随系统\n1=>小程序客服', 1, '', 0, 0, '0', '小程序客服类型', '跟随系统：跟随系统使用默认客服、电话或者跳转链接；小程序客服：需要在小程序后台配置客服用户；', 0, 1), (330, 'station_open', 'radio', 'input', 26, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"1\"', '站点开启', '站点开始|关闭（用于升级等临时关闭），关闭后前端会弹窗显示站点升级中，请稍后访问', 11, 1), -(331, 'uni_brokerage_price', 'text', 'input', 73, '', 0, '', 100, 0, '\"2\"', '推广佣金单价（每推广一个用户）', '分销推广佣金单价（每推广一个用户）', 93, 1), +(331, 'uni_brokerage_price', 'text', 'input', 73, '', 0, '', 100, 0, '\"2\"', '推广佣金单价', '分销推广佣金单价（每推广一个用户）', 93, 1), (332, 'day_brokerage_price_upper', 'text', 'input', 73, '', 0, '', 100, 0, '\"-1\"', '每日推广佣金上限', '每日推广佣金上限（0:不发佣金-1:不限制；注最好是推广佣金单价的整数倍）', 92, 1), -(333, 'is_self_brokerage', 'radio', '', 73, '0=>关闭\n1=>开启', 0, '', 0, 0, '0', '自购返佣', '是否开启自购返佣（开启：分销员自己购买商品，享受一级返佣，上级享受二级返佣； 关闭：分销员自己购买商品没有返佣）', 94, 1), +(333, 'is_self_brokerage', 'radio', '', 73, '0=>关闭\n1=>开启', 0, '', 0, 0, '0', '自购返佣', '是否开启自购返佣（开启：分销员自己购买商品，享受一级返佣，上级享受二级返佣； 关闭：分销员自己购买商品没有返佣）', 99, 1), (334, 'store_brokerage_binding_status', 'radio', '', 72, '1=>永久\n2=>有效期\n3=>临时', 0, '', 0, 0, '1', '绑定模式', '永久”一次绑定永久有效，“有效期”绑定后一段时间内有效，“临时” 临时有效', 91, 1), (335, 'store_brokerage_binding_time', 'text', 'input', 72, '', 0, '', 100, 0, '\"1\"', '绑定有效期', '绑定有效期（绑定后N天内有效）', 90, 1), (336, 'refund_name', 'text', 'input', 71, '', 1, '', 0, 0, '\"\"', '退货收货人姓名', '用户退货退款后台同意之后，显示在退货订单详情显示的接受退货的人员姓名', 90, 1), @@ -33507,10 +33507,10 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (423, 'allin_private_key', 'text', 'input', 108, '', 1, '', 100, 5, '\"\"', '通联MD5私钥', '通联支付的MD5私钥，可以在商户后台设置中进行配置', 96, 1), (425, 'allin_cusid', 'text', '', 108, '', 1, '', 0, 0, '\"\"', '通联商户号', '通联支付商户号，由贵公司申请获得', 99, 1), (426, 'allin_appid', 'text', '', 108, '', 1, '', 100, 0, '\"\"', '通联支付Appid', '通联商户后台的设置-》对接设置中查看', 98, 1), -(428, 'queue_open', 'radio', 'input', 26, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '消息队列', '是否启用消息队列，启用后提升程序运行速度，启用前必须配置Redis缓存', 0, 1), +(428, 'queue_open', 'radio', 'input', 26, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '消息队列', '是否启用消息队列，启用后提升程序运行速度，启用前必须配置Redis缓存，文档地址：https://doc.crmeb.com/single/crmeb_v4/7217', 0, 1), (429, 'get_avatar', 'radio', 'input', 7, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '强制获取昵称头像', '是否在小程序用户授权之后，弹窗获取用户的昵称和头像', 0, 1), (430, 'share_qrcode', 'radio', 'input', 2, '0=>商城\n1=>公众号', 1, '', 0, 0, '\"0\"', '公众号推广码类型', '公众号生成的推广码类型：商城：扫码直接进入商城，公众号：扫码进入公众号后推送商城的链接', 0, 1), -(431, 'member_brokerage', 'radio', 'input', 73, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"0\"', '购买付费会员返佣', '购买付费会员是否按照设置的佣金比例进行返佣', 0, 1); +(431, 'member_brokerage', 'radio', 'input', 73, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"0\"', '购买付费会员返佣', '购买付费会员是否按照设置的佣金比例进行返佣', 98, 1); -- -------------------------------------------------------- diff --git a/crmeb/public/install/css/install.css b/crmeb/public/install/css/install.css index eff3c91c7..acacc65fc 100755 --- a/crmeb/public/install/css/install.css +++ b/crmeb/public/install/css/install.css @@ -332,7 +332,7 @@ input[type=checkbox]:checked:after { display:block; overflow-y:scroll; padding: 20px 50px; - margin:20px auto; + margin:30px auto 10px auto; font-size:12px; line-height:1.5; outline:none; diff --git a/crmeb/public/install/css/step1.css b/crmeb/public/install/css/step1.css index 53ccb027f..c311cda87 100755 --- a/crmeb/public/install/css/step1.css +++ b/crmeb/public/install/css/step1.css @@ -43,6 +43,7 @@ .section { height: 100%; z-index: 11; + text-align: left; position: absolute; background: rgba(34, 34, 34, 0.6); border-radius: 36px 36px 36px 36px; diff --git a/crmeb/public/install/templates/step3.php b/crmeb/public/install/templates/step3.php index f745a1860..961400b3b 100755 --- a/crmeb/public/install/templates/step3.php +++ b/crmeb/public/install/templates/step3.php @@ -34,13 +34,6 @@
- - 数据库名： - - -
- - 数据库密码： @@ -48,6 +41,13 @@
+ + 数据库名： + + +
+ + 高级设置： diff --git a/template/admin/src/pages/system/crontab/index.vue b/template/admin/src/pages/system/crontab/index.vue index efd6f28fa..a911b1379 100644 --- a/template/admin/src/pages/system/crontab/index.vue +++ b/template/admin/src/pages/system/crontab/index.vue @@ -1,5 +1,11 @@