Browse Source

admin refill order task comments

xiaoyu 3 years ago
parent
commit
0da994bb37

+ 3 - 0
admin/control/refill_order.php

@@ -172,6 +172,9 @@ class refill_orderControl extends SystemControl
             {
                 $stat = $task->result();
                 Tpl::output('stat', $stat);
+                Tpl::output('comments', false);
+            }else{
+                Tpl::output('comments', true);
             }
         }
 

+ 8 - 2
admin/templates/default/refill.order.index.php

@@ -410,8 +410,14 @@
         <table class="table tb-type2" id="prompt" style="min-width:1400px">
             <tbody>
             <tr class="space odd">
-                <th colspan="12"><div class="title"><h5>
-                            金额统计<?php echo $output['ftoday'] == true ? "(今日)" : "" ?></h5><span class="arrow"></span></div></th>
+                <th colspan="12">
+                    <div class="title"><h5>
+                            金额统计<?php echo $output['ftoday'] == true ? "(今日)" : "" ?></h5><span class="arrow"></span>
+                    </div>
+                    <?php if($output['comments']){?>
+                    <span style="display: biock; margin-left: 35px;">统计数据已加入后台任务,请稍后以相同条件再次统计获取结果</span>
+                    <?php }?>
+                </th>
             </tr>
             <tr>
                 <td>

+ 22 - 12
docker/compose/xiaoyu/docker-compose.yml

@@ -147,22 +147,32 @@ services:
       - "websrv"
       - "searcher"
 
-  cronsec:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - /d/phpstudy_pro/WWW/xyzshop:/var/www/html
-      - /d/phpstudy_pro/WWW/xyzshop/docker/conf/etc/localtime:/etc/localtime:ro
-      - /d/phpstudy_pro/WWW/xyzshop/docker/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - /d/phpstudy_pro/WWW/xyzshop/data/upload:/var/www/html/data/upload
-    container_name: "panda-cronsec"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
+#  cronsec:
+#    image: php-zts-debug:7.3.18
+#    volumes:
+#      - /d/phpstudy_pro/WWW/xyzshop:/var/www/html
+#      - /d/phpstudy_pro/WWW/xyzshop/docker/conf/etc/localtime:/etc/localtime:ro
+#      - /d/phpstudy_pro/WWW/xyzshop/docker/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+#      - /d/phpstudy_pro/WWW/xyzshop/data/upload:/var/www/html/data/upload
+#    container_name: "panda-cronsec"
+#    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
+#
+#  accedit:
+#    image: php-zts-debug:7.3.18
+#    volumes:
+#      - /d/phpstudy_pro/WWW/xyzshop:/var/www/html
+#      - /d/phpstudy_pro/WWW/xyzshop/docker/conf/etc/localtime:/etc/localtime:ro
+#      - /d/phpstudy_pro/WWW/xyzshop/docker/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+#      - /d/phpstudy_pro/WWW/xyzshop/data/upload:/var/www/html/data/upload
+#    container_name: "panda-accedit"
+#    command: [php,"/var/www/html/crontab/index.php",'minutes','account_edit']
 
-  accedit:
+  crontask:
     image: php-zts-debug:7.3.18
     volumes:
       - /d/phpstudy_pro/WWW/xyzshop:/var/www/html
       - /d/phpstudy_pro/WWW/xyzshop/docker/conf/etc/localtime:/etc/localtime:ro
       - /d/phpstudy_pro/WWW/xyzshop/docker/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - /d/phpstudy_pro/WWW/xyzshop/data/upload:/var/www/html/data/upload
-    container_name: "panda-accedit"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','account_edit']
+    container_name: "panda-task"
+    command: [ php,"/var/www/html/crontab/index.php",'minutes','task' ]