update

crmeb/app/Request.php

@@ -54,7 +54,7 @@ class Request extends \think\Request
                 if (!isset($param[1])) $param[1] = null;
                 if (!isset($param[2])) $param[2] = '';
                 if (is_array($param[0])) {
-                    $name = is_array($param[1]) ? $param[0][0] . '/a' : (sys_config('param_filter_type') == 1 ? $param[0] : $param[0][0] . '/' . $param[0][1]);
+                    $name = is_array($param[1]) ? $param[0][0] . '/a' : $param[0][0] . '/' . $param[0][1];
                     $keyName = $param[0][0];
                 } else {
                     $name = is_array($param[1]) ? $param[0] . '/a' : $param[0];

crmeb/app/adminapi/controller/v1/setting/SystemConfig.php

@@ -406,6 +406,9 @@ class SystemConfig extends AuthController
                 return app('json')->fail('商品类型至少选择一项');
             }
         }
+        if (isset($post['yue_pay_status']) && $post['yue_pay_status'] == 1) {
+            $post['balance_func_status'] = 1;
+        }
         if (isset($post['pay_weixin_client_cert'])) {
             $certData = [
                 'type' => 'wechat',

crmeb/app/dao/system/config/SystemGroupDataDao.php

@@ -41,7 +41,9 @@ class SystemGroupDataDao extends BaseDao
      */
     public function getGroupDataList(array $where, int $page, int $limit)
     {
-        return $this->search($where)->page($page, $limit)->order('sort desc,id DESC')->select()->toArray();
+        return $this->search($where)->when($page && $limit, function ($query) use ($page, $limit) {
+            $query->page($page, $limit);
+        })->order('sort desc,id DESC')->select()->toArray();
     }
 
     /**

crmeb/app/dao/user/UserWechatUserDao.php

@@ -179,7 +179,7 @@ class UserWechatUserDao extends BaseDao
                 $model = $model->whereBetween($userAlias . 'integral', $where['integral']);
             } elseif ($where['integral'][0] != '' && $where['integral'][1] == '') {
                 $model = $model->where($userAlias . 'integral', '>', $where['integral'][0]);
-            } elseif ($where['integral'][0] == '' && $where['integral'][1] != ''){
+            } elseif ($where['integral'][0] == '' && $where['integral'][1] != '') {
                 $model = $model->where($userAlias . 'integral', '<', $where['integral'][1]);
             }
         }

crmeb/app/services/diy/DiyServices.php

@@ -334,9 +334,9 @@ class DiyServices extends BaseServices
         $systemGroupServices = app()->make(SystemGroupServices::class);
         $menus_gid = $systemGroupServices->value(['config_name' => 'routine_my_menus'], 'id');
         $banner_gid = $systemGroupServices->value(['config_name' => 'routine_my_banner'], 'id');
-        $routine_my_menus = $systemGroupDataServices->getGroupDataList(['gid' => $menus_gid]);
+        $routine_my_menus = $systemGroupDataServices->getGroupDataList(['gid' => $menus_gid], 'all');
         $routine_my_menus = $routine_my_menus['list'] ?? [];
-        $routine_my_banner = $systemGroupDataServices->getGroupDataList(['gid' => $banner_gid]);
+        $routine_my_banner = $systemGroupDataServices->getGroupDataList(['gid' => $banner_gid], 'all');
         $routine_my_banner = $routine_my_banner['list'] ?? [];
         $my_banner_status = boolval($info['my_banner_status']);
         return compact('status', 'order_status', 'routine_my_menus', 'routine_my_banner', 'color_change', 'my_banner_status');

crmeb/app/services/system/config/SystemGroupDataServices.php

@@ -74,9 +74,10 @@ class SystemGroupDataServices extends BaseServices
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getGroupDataList(array $where)
+    public function getGroupDataList(array $where, $type = 'limit')
     {
         [$page, $limit] = $this->getPageValue();
+        if ($type == 'all') $page = $limit = 0;
         $list = $this->dao->getGroupDataList($where, $page, $limit);
         $count = $this->dao->count($where);
         $type = '';

crmeb/app/services/system/crontab/SystemCrontabServices.php

@@ -245,6 +245,11 @@ class SystemCrontabServices extends BaseServices
         $crontabRunServices = app()->make(CrontabRunServices::class);
         // 创建一个每秒钟执行一次的定时任务
         new Crontab('*/1 * * * * *', function () use ($task, $crontabRunServices) {
+            // 写入时间戳，用于检测定时任务是否正常执行
+            $timerTime = file_get_contents(root_path() . 'runtime/.timer');
+            if ($timerTime < (time() - 60)) {
+                file_put_contents(root_path() . 'runtime/.timer', time());
+            }
             // 从缓存中获取定时任务列表
             $list = Cache::get('crontabCache');
             if (!$list) {

crmeb/public/admin/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><link rel=icon href=/admin/favicon.ico><link rel=manifest href=./manifest.json><title></title><link href=/admin/system_static/css/app.403aae46.css rel=preload as=style><link href=/admin/system_static/css/chunk-vendors.647afd4a.css rel=preload as=style><link href=/admin/system_static/js/app.9f8d1d5b.js rel=preload as=script><link href=/admin/system_static/js/chunk-vendors.06acbe6f.js rel=preload as=script><link href=/admin/system_static/css/chunk-vendors.647afd4a.css rel=stylesheet><link href=/admin/system_static/css/app.403aae46.css rel=stylesheet></head><body><noscript><strong>We're sorry but admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/admin/system_static/js/chunk-vendors.06acbe6f.js></script><script src=/admin/system_static/js/app.9f8d1d5b.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><link rel=icon href=/admin/favicon.ico><link rel=manifest href=./manifest.json><title></title><link href=/admin/system_static/css/app.d614432a.css rel=preload as=style><link href=/admin/system_static/css/chunk-vendors.2fbd6fd7.css rel=preload as=style><link href=/admin/system_static/js/app.6c740426.js rel=preload as=script><link href=/admin/system_static/js/chunk-vendors.81677757.js rel=preload as=script><link href=/admin/system_static/css/chunk-vendors.2fbd6fd7.css rel=stylesheet><link href=/admin/system_static/css/app.d614432a.css rel=stylesheet></head><body><noscript><strong>We're sorry but admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/admin/system_static/js/chunk-vendors.81677757.js></script><script src=/admin/system_static/js/app.6c740426.js></script></body></html>

crmeb/public/admin/system_static/css/chunk-08621198.9b7f83a8.css

@@ -1 +0,0 @@
-.code[data-v-13fb55eb]{position:relative}.QRpic[data-v-13fb55eb]{width:180px;height:259px}.QRpic img[data-v-13fb55eb]{width:100%;height:100%}.tabBox[data-v-13fb55eb]{width:100%;height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.tabBox .tabBox_img[data-v-13fb55eb]{width:36px;height:36px}.tabBox .tabBox_img img[data-v-13fb55eb]{width:100%;height:100%}.tabBox .tabBox_tit[data-v-13fb55eb]{width:60%;font-size:12px!important;margin:0 2px 0 10px;letter-spacing:1px;padding:5px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.pictrue-box[data-v-13fb55eb]{display:-webkit-box;display:-ms-flexbox;display:flex;align-item:center}.pictrue[data-v-13fb55eb]{width:25px;height:25px}.tab[data-v-13fb55eb]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.tab img[data-v-13fb55eb]{width:36px;height:36px;margin-right:10px}.w-250[data-v-13fb55eb]{max-width:250px}.w-120[data-v-13fb55eb]{width:120px}

crmeb/public/admin/system_static/css/chunk-20bcace6.eea8e7ae.css

@@ -0,0 +1 @@
+.code[data-v-0ef6a7a6]{position:relative}.QRpic[data-v-0ef6a7a6]{width:180px;height:259px}.QRpic img[data-v-0ef6a7a6]{width:100%;height:100%}.tabBox[data-v-0ef6a7a6]{width:100%;height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.tabBox .tabBox_img[data-v-0ef6a7a6]{width:36px;height:36px}.tabBox .tabBox_img img[data-v-0ef6a7a6]{width:100%;height:100%}.tabBox .tabBox_tit[data-v-0ef6a7a6]{width:60%;font-size:12px!important;margin:0 2px 0 10px;letter-spacing:1px;padding:5px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.pictrue-box[data-v-0ef6a7a6]{display:-webkit-box;display:-ms-flexbox;display:flex;align-item:center}.pictrue[data-v-0ef6a7a6]{width:25px;height:25px}.tab[data-v-0ef6a7a6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.tab img[data-v-0ef6a7a6]{width:36px;height:36px;margin-right:10px}.w-250[data-v-0ef6a7a6]{max-width:250px}.w-120[data-v-0ef6a7a6]{width:120px}

crmeb/public/admin/system_static/css/chunk-45f4109e.bccdda30.css

@@ -0,0 +1 @@
+.box[data-v-3b3c3c22]{width:100%;height:100%;background:#fff}[data-v-3b3c3c22] .el-card__body{min-height:700px;padding:16px 16px 16px 0}[data-v-3b3c3c22] .conter .linkList{max-width:100%}.nameStyle[data-v-3b3c3c22]{position:absolute;white-space:nowrap;z-index:9;background:#eee;height:20px;line-height:20px;color:#555;border:1px solid #ebebeb;padding:0 5px;left:56px;bottom:-18px}.tree_tit[data-v-3b3c3c22]{padding-top:7px;padding-bottom:22px}.treeBox[data-v-3b3c3c22]{width:100%;height:100%;max-width:180px}.Nav[data-v-3b3c3c22]{width:100%;border-right:1px solid #eee;min-width:220px;max-width:-webkit-max-content;max-width:-moz-max-content;max-width:max-content}[data-v-3b3c3c22] .tree .is-current{background-color:#fff!important}.trees-coadd[data-v-3b3c3c22]{width:100%;border-radius:4px;overflow:hidden;position:relative}.trees-coadd .scollhide[data-v-3b3c3c22]{overflow-x:hidden;overflow-y:scroll;padding:0 0 10px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.trees-coadd .scollhide .isTree[data-v-3b3c3c22]{min-height:374px;max-height:550px}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .file-name{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .file-name .name{max-width:7em}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .file-name .icon{width:12px;height:12px;margin-right:8px}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .el-tree-node{margin-right:16px}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .el-tree-node__children .el-tree-node{margin-right:0}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .el-tree-node__content{width:100%;height:36px}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .custom-tree-node{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding-right:20px;font-size:13px;font-weight:400;color:rgba(0,0,0,.6);line-height:13px}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .is-current{background:#f1f9ff!important;color:var(--prev-color-primary)!important}.trees-coadd .scollhide .isTree[data-v-3b3c3c22] .is-current .custom-tree-node{color:var(--prev-color-primary)!important}.trees-coadd .scollhide[data-v-3b3c3c22]::-webkit-scrollbar{display:none}.treeSel[data-v-3b3c3c22] .ivu-select-dropdown-list{padding:0 5px!important;-webkit-box-sizing:border-box;box-sizing:border-box;width:200px}.imagesNo[data-v-3b3c3c22]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:65px 0}.imagesNo .imagesNo_sp[data-v-3b3c3c22]{font-size:13px;color:#dbdbdb;line-height:3}.Modal[data-v-3b3c3c22]{width:100%;height:100%;background:#fff!important}.fill-window[data-v-3b3c3c22]{height:100vh}.colLeft[data-v-3b3c3c22]{padding-right:0!important;height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap}.conter[data-v-3b3c3c22]{width:100%;height:100%;margin-left:20px!important}.conter .iconliebiao[data-v-3b3c3c22]{font-size:12px}.conter .bnt[data-v-3b3c3c22]{width:100%;padding:0 0 20px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.conter .linkList[data-v-3b3c3c22]{overflow-x:hidden;overflow-y:auto;min-height:463px}.conter .linkList.is-modal[data-v-3b3c3c22]{max-height:480px}.conter .linkList img[data-v-3b3c3c22]{max-width:100%}.conter .linkList .img.on[data-v-3b3c3c22]{border:2px solid var(--prev-color-primary)}.conter .footer[data-v-3b3c3c22]{padding:0 20px 10px 20px}.card-tree[data-v-3b3c3c22]{background:#fff;height:72px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow-x:scroll;white-space:nowrap;overflow-y:hidden;border-radius:4px;scrollbar-width:none;-ms-overflow-style:none}.card-tree[data-v-3b3c3c22]::-webkit-scrollbar{display:none}

crmeb/public/admin/system_static/css/chunk-5d0c1789.ce080cd9.css

@@ -1 +0,0 @@
-.box[data-v-635b8128]{width:100%;height:100%;background:#fff}[data-v-635b8128] .el-card__body{min-height:700px;padding:16px 16px 16px 0}[data-v-635b8128] .conter .linkList{max-width:100%}.nameStyle[data-v-635b8128]{position:absolute;white-space:nowrap;z-index:9;background:#eee;height:20px;line-height:20px;color:#555;border:1px solid #ebebeb;padding:0 5px;left:56px;bottom:-18px}.tree_tit[data-v-635b8128]{padding-top:7px;padding-bottom:22px}.treeBox[data-v-635b8128]{width:100%;height:100%;max-width:180px}.Nav[data-v-635b8128]{width:100%;border-right:1px solid #eee;min-width:220px;max-width:-webkit-max-content;max-width:-moz-max-content;max-width:max-content}[data-v-635b8128] .tree .is-current{background-color:#fff!important}.trees-coadd[data-v-635b8128]{width:100%;border-radius:4px;overflow:hidden;position:relative}.trees-coadd .scollhide[data-v-635b8128]{overflow-x:hidden;overflow-y:scroll;padding:0 0 10px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.trees-coadd .scollhide .isTree[data-v-635b8128]{min-height:374px;max-height:550px}.trees-coadd .scollhide .isTree[data-v-635b8128] .file-name{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.trees-coadd .scollhide .isTree[data-v-635b8128] .file-name .name{max-width:7em}.trees-coadd .scollhide .isTree[data-v-635b8128] .file-name .icon{width:12px;height:12px;margin-right:8px}.trees-coadd .scollhide .isTree[data-v-635b8128] .el-tree-node{margin-right:16px}.trees-coadd .scollhide .isTree[data-v-635b8128] .el-tree-node__children .el-tree-node{margin-right:0}.trees-coadd .scollhide .isTree[data-v-635b8128] .el-tree-node__content{width:100%;height:36px}.trees-coadd .scollhide .isTree[data-v-635b8128] .custom-tree-node{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding-right:20px;font-size:13px;font-weight:400;color:rgba(0,0,0,.6);line-height:13px}.trees-coadd .scollhide .isTree[data-v-635b8128] .is-current{background:#f1f9ff!important;color:var(--prev-color-primary)!important}.trees-coadd .scollhide .isTree[data-v-635b8128] .is-current .custom-tree-node{color:var(--prev-color-primary)!important}.trees-coadd .scollhide[data-v-635b8128]::-webkit-scrollbar{display:none}.treeSel[data-v-635b8128] .ivu-select-dropdown-list{padding:0 5px!important;-webkit-box-sizing:border-box;box-sizing:border-box;width:200px}.imagesNo[data-v-635b8128]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:65px 0}.imagesNo .imagesNo_sp[data-v-635b8128]{font-size:13px;color:#dbdbdb;line-height:3}.Modal[data-v-635b8128]{width:100%;height:100%;background:#fff!important}.fill-window[data-v-635b8128]{height:100vh}.colLeft[data-v-635b8128]{padding-right:0!important;height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap}.conter[data-v-635b8128]{width:100%;height:100%;margin-left:20px!important}.conter .iconliebiao[data-v-635b8128]{font-size:12px}.conter .bnt[data-v-635b8128]{width:100%;padding:0 0 20px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.conter .linkList[data-v-635b8128]{overflow-x:hidden;overflow-y:auto;min-height:463px}.conter .linkList.is-modal[data-v-635b8128]{max-height:480px}.conter .linkList img[data-v-635b8128]{max-width:100%}.conter .linkList .img.on[data-v-635b8128]{border:2px solid var(--prev-color-primary)}.conter .footer[data-v-635b8128]{padding:0 20px 10px 20px}.card-tree[data-v-635b8128]{background:#fff;height:72px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow-x:scroll;white-space:nowrap;overflow-y:hidden;border-radius:4px;scrollbar-width:none;-ms-overflow-style:none}.card-tree[data-v-635b8128]::-webkit-scrollbar{display:none}