更新前端

crmeb/app/jobs/CheckQueueJob.php

@@ -29,7 +29,7 @@ class CheckQueueJob extends BaseJobs
 
     public function handle($key)
     {
-        $path = runtime_path() . '.queue';
+        $path = root_path('runtime') . '.queue';
         file_put_contents($path, $key);
     }
 }

crmeb/app/listener/admin/AdminLogin.php

@@ -22,6 +22,8 @@ class AdminLogin
 
     public function handle($event)
     {
+        $res = false;
+        $res1 = false;
         try {
             [$key] = $event;
             //检测消息队列是否执行
@@ -29,9 +31,20 @@ class AdminLogin
             $content = file_get_contents($path);
             $res = $key === $content;
             unlink($path);
-            return $res;
         } catch (\Throwable $e) {
-            return false;
         }
+
+        try {
+
+            $timerPath = root_path('runtime') . '.timer';
+            $timer = file_get_contents($timerPath);
+            if ($timer && $timer <= time() && $timer > (time() - 10)) {
+                $res1 = true;
+            }
+
+        } catch (\Throwable $e) {
+        }
+
+        return [$res, $res1];
     }
 }

crmeb/app/services/system/admin/SystemAdminServices.php

@@ -95,7 +95,7 @@ class SystemAdminServices extends BaseServices
         /** @var SystemMenusServices $services */
         $services = app()->make(SystemMenusServices::class);
         [$menus, $uniqueAuth] = $services->getMenusList($adminInfo->roles, (int)$adminInfo['level']);
-        $queue = Event::until('admin.login', [$key]);
+        [$queue, $timer] = Event::until('admin.login', [$key]);
         return [
             'token' => $tokenInfo['token'],
             'expires_time' => $tokenInfo['params']['exp'],
@@ -110,7 +110,8 @@ class SystemAdminServices extends BaseServices
             'logo_square' => sys_config('site_logo_square'),
             'version' => get_crmeb_version(),
             'newOrderAudioLink' => get_file_link(sys_config('new_order_audio_link', '')),
-            'queue' => $queue
+            'queue' => $queue,
+            'timer' => $timer
         ];
     }
 

crmeb/public/admin/css/chunk-04a4707c.385992c3.css

@@ -0,0 +1 @@
+.fa[data-v-29c6cc61]{color:#0a6aa1;display:block}.sheng[data-v-29c6cc61]{color:red;display:block}.tabBox_img[data-v-29c6cc61]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-29c6cc61]{width:100%;height:100%}

crmeb/public/admin/css/chunk-067f29b2.8e484ccd.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-1bd28c16] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-1bd28c16]{margin-bottom:14px}.radio[data-v-1bd28c16] .name{width:125px;text-align:right;padding-right:12px}

crmeb/public/admin/css/chunk-070dfa98.f0c4c872.css

@@ -0,0 +1 @@
+.clear_tit[data-v-18b59e8f]{margin-top:150px}

crmeb/public/admin/css/chunk-1030bcc7.cb178963.css

@@ -0,0 +1 @@
+.QRpic[data-v-2d51ff33]{width:180px;height:180px}.QRpic img[data-v-2d51ff33]{width:100%;height:100%}.upload-box[data-v-2d51ff33]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:60px;height:60px;background:#ccc}.box[data-v-2d51ff33]{width:60px;height:60px;margin-bottom:10px}.box img[data-v-2d51ff33]{width:100%;height:100%}

crmeb/public/admin/css/chunk-161b7bd0.67de22cb.css

@@ -0,0 +1 @@
+.list[data-v-10f721a4]{height:80%;min-height:500px}.pictrue[data-v-10f721a4]{width:100%;max-width:300px;height:360px}.right[data-v-10f721a4]{padding-right:75px}.left[data-v-10f721a4]{padding-left:75px}.num[data-v-10f721a4]{margin-bottom:24px;color:#515a6e;font-weight:600;font-size:72px;line-height:72px}.desc[data-v-10f721a4]{margin-bottom:16px;color:#808695;font-size:20px;line-height:28px}

crmeb/public/admin/css/chunk-1672552e.67de22cb.css

@@ -0,0 +1 @@
+.list[data-v-10f721a4]{height:80%;min-height:500px}.pictrue[data-v-10f721a4]{width:100%;max-width:300px;height:360px}.right[data-v-10f721a4]{padding-right:75px}.left[data-v-10f721a4]{padding-left:75px}.num[data-v-10f721a4]{margin-bottom:24px;color:#515a6e;font-weight:600;font-size:72px;line-height:72px}.desc[data-v-10f721a4]{margin-bottom:16px;color:#808695;font-size:20px;line-height:28px}

crmeb/public/admin/css/chunk-17335ca4.0f743c7c.css

@@ -0,0 +1 @@
+.btn_box[data-v-f18fddc6] .ivu-form-item-content{margin-left:0!important}

crmeb/public/admin/css/chunk-20d17e92.471236f1.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-4811353e]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-4811353e]{width:100%;height:100%}

crmeb/public/admin/css/chunk-22ca2fdb.cb93e25a.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-1271c2f4]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-1271c2f4]{width:100%;height:100%}

crmeb/public/admin/css/chunk-233b181c.8e484ccd.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-1bd28c16] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-1bd28c16]{margin-bottom:14px}.radio[data-v-1bd28c16] .name{width:125px;text-align:right;padding-right:12px}

crmeb/public/admin/css/chunk-23920a75.ed019706.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-53f85254]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-53f85254]{width:100%;height:100%}.modelBox .ivu-table-header[data-v-53f85254],.modelBox[data-v-53f85254]{width:100%!important}.trees-coadd[data-v-53f85254]{width:100%;height:385px}.trees-coadd .scollhide[data-v-53f85254]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.scollhide[data-v-53f85254]::-webkit-scrollbar{display:none}

crmeb/public/admin/css/chunk-2da28c50.1f6cc519.css

@@ -0,0 +1 @@
+[data-v-42c3ba4f] .ivu-modal{top:20%!important}[data-v-42c3ba4f] .ivu-input{width:80px}

crmeb/public/admin/css/chunk-32b1d1c7.8e484ccd.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-1bd28c16] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-1bd28c16]{margin-bottom:14px}.radio[data-v-1bd28c16] .name{width:125px;text-align:right;padding-right:12px}

crmeb/public/admin/css/chunk-32e5e1e4.578e2238.css

@@ -0,0 +1 @@
+.ivu-form-label-left[data-v-6a19eab7] .ivu-form-item-label{text-align:right}.tabform .export[data-v-6a19eab7]{margin-left:10px}.red[data-v-6a19eab7]{color:#ff5722}.green[data-v-6a19eab7]{color:#009688}.ivu-mt[data-v-6a19eab7] .ivu-select-placeholder{height:32px}

crmeb/public/admin/css/chunk-32ea5e0b.0f2ba2bc.css

@@ -0,0 +1 @@
+.code[data-v-22717c7c]{position:relative}.QRpic[data-v-22717c7c]{width:180px}.QRpic img[data-v-22717c7c]{width:100%;height:100%}

crmeb/public/admin/css/chunk-3519f2c9.04cdb7cd.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-b57f14ac]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-b57f14ac]{width:100%;height:100%}

crmeb/public/admin/css/chunk-367a7f79.4934d457.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-457602fc]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-457602fc]{width:100%;height:100%}

crmeb/public/admin/css/chunk-3e8f8352.4e5eef8e.css

@@ -0,0 +1 @@
+.iview-video-style[data-v-490a9db9]{width:40%;height:180px;border-radius:10px;background-color:#707070;margin-top:10px;position:relative;overflow:hidden}.iview-video-style .iconv[data-v-490a9db9]{color:#fff;line-height:180px;width:50px;height:50px;display:inherit;font-size:26px;position:absolute;top:-74px;left:50%;margin-left:-25px}.iview-video-style .mark[data-v-490a9db9]{position:absolute;width:100%;height:30px;top:0;background-color:rgba(0,0,0,.5);text-align:center}

crmeb/public/admin/css/chunk-42594e2e.4c7a92dc.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-75b79c2b]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-75b79c2b]{width:100%;height:100%}

crmeb/public/admin/css/chunk-45fb5758.c3bc089b.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-d9948fc4]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-d9948fc4]{width:100%;height:100%}.prize[data-v-d9948fc4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.prize img[data-v-d9948fc4]{width:36px;height:36px;border-radius:4px;cursor:pointer;margin-right:5px}.trips[data-v-d9948fc4]{color:#ccc}

crmeb/public/admin/css/chunk-48a4563e.27487607.css

@@ -0,0 +1 @@
+[data-v-5ae52255] .ivu-form-item-content{line-height:unset!important}

crmeb/public/admin/css/chunk-4c0655d2.6fbd5365.css

@@ -0,0 +1 @@
+.ivu-tabs[data-v-6c075dff]{margin-bottom:18px}.fromBox[data-v-6c075dff]{min-height:600px}

crmeb/public/admin/css/chunk-53fa23f6.5765ce40.css

@@ -0,0 +1 @@
+.cur[data-v-1248d368]{cursor:pointer}.goupBox[data-v-1248d368] .ivu-form-item-content{margin-left:43px!important}

crmeb/public/admin/css/chunk-55755438.b06213d8.css

@@ -0,0 +1 @@
+.QRpic[data-v-4a9b5374]{width:180px;height:180px}.QRpic img[data-v-4a9b5374]{width:100%;height:100%}

crmeb/public/admin/css/chunk-5624ef45.9f35ae25.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-1bd28c16] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-1bd28c16]{margin-bottom:14px}.radio[data-v-1bd28c16] .name{width:125px;text-align:right;padding-right:12px}.tabBox_img[data-v-def6502a]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-def6502a]{width:100%;height:100%}

crmeb/public/admin/css/chunk-57b96778.38337c8b.css

@@ -0,0 +1 @@
+.rulesBox[data-v-20b8b7b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}.attrFrom[data-v-20b8b7b0] .ivu-form-item{margin-bottom:0!important}

crmeb/public/admin/css/chunk-58647ef2.70ce7466.css

@@ -0,0 +1 @@
+[data-v-50d24a8c] .ivu-tag-cyan .ivu-tag-text{color:#19be6b!important}.ivu-tag-cyan[data-v-50d24a8c]{background:rgba(25,190,170,.1);border-color:#19be6b!important}.tabBox_img[data-v-50d24a8c]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-50d24a8c]{width:100%;height:100%}

crmeb/public/admin/css/chunk-592bb6df.92833eb5.css

@@ -0,0 +1 @@
+[data-v-c5bc9586] .ivu-tag-cyan .ivu-tag-text{color:#19be6b!important}.ivu-tag-cyan[data-v-c5bc9586]{background:rgba(25,190,170,.1);border-color:#19be6b!important}.tabBox_img[data-v-c5bc9586]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-c5bc9586]{width:100%;height:100%}

crmeb/public/admin/css/chunk-5e2949d4.aed6acf4.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-28805de7]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-28805de7]{width:100%;height:100%}

crmeb/public/admin/css/chunk-5f46a14c.a3d25404.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-1bd28c16] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-1bd28c16]{margin-bottom:14px}.radio[data-v-1bd28c16] .name{width:125px;text-align:right;padding-right:12px}.treeSel[data-v-4950a2ac] .ivu-select-dropdown-list{padding:0 10px!important;-webkit-box-sizing:border-box;box-sizing:border-box}.tabBox_img[data-v-4950a2ac]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-4950a2ac]{width:100%;height:100%}

crmeb/public/admin/css/chunk-5fc4c133.2993188e.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-1bd28c16] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-1bd28c16]{margin-bottom:14px}.radio[data-v-1bd28c16] .name{width:125px;text-align:right;padding-right:12px}.ivu-col:first-of-type .ivu-form-item .ivu-form-item-label[data-v-7efdc83c]{width:80px!important}.ivu-col:first-of-type .ivu-form-item .ivu-form-item-content[data-v-7efdc83c]{margin-left:80px!important}

crmeb/public/admin/css/chunk-67c5a1d9.a4e7de8c.css

@@ -0,0 +1 @@
+[data-v-1d60b1ca] .ivu-table-cell-tree{border:0;font-size:15px;background-color:unset}[data-v-1d60b1ca] .ivu-table-cell-tree .ivu-icon-ios-add:before{content:"\F11F"}[data-v-1d60b1ca] .ivu-table-cell-tree .ivu-icon-ios-remove:before{content:"\F116"}.button[data-v-1d60b1ca]{width:300px}

crmeb/public/admin/css/chunk-6ae9a618.0cfa8533.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-532a3ed6]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-532a3ed6]{width:100%;height:100%}