wesmiler

public/themes/admin_simpleboot3/admin/setting/site.html

@@ -249,14 +249,14 @@
                             <label class="col-sm-2 control-label">拼团开始时间</label>
                             <div class="col-md-4 col-sm-6">
                                 <input type="text" class="form-control" name="options[collage_start_time]" value="{$site_info.collage_start_time|default=''}"  autocomplete="off" placeholder="拼团开启时间">
-                                <span class="help-block">开始拼团的时间如：08:00</span>
+                                <span class="help-block">开始拼团的时间如：08:00，默认00:00开始</span>
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">拼团截止时间</label>
                             <div class="col-md-4 col-sm-6">
                                 <input type="text" class="form-control" name="options[collage_end_time]" value="{$site_info.collage_end_time|default=''}" autocomplete="off" placeholder="拼团截止时间">
-                                <span class="help-block">结束拼团的时间如：22:00</span>
+                                <span class="help-block">结束拼团的时间如：22:00，默认24:00结束</span>
                             </div>
                         </div>
                         <div class="form-group">

vendor/thinkcmf/cmf-app/src/weixin/model/Order.php

@@ -55,9 +55,9 @@ class Order
         $closeTime = isset($orderConfig['closeTime'])? intval($orderConfig['closeTime']) : 300;
         $config = cmf_get_option('site_info');
         $collageStartTime = isset($config['collage_start_time'])? trim($config['collage_start_time']) : '';
-        $collageStartTime = $collageStartTime? date('Y-m-d '.$collageStartTime.':00') : date('Y-m-d 00:00:00');
+        $collageStartTime = $collageStartTime? date('Y-m-d '.$collageStartTime.':00') : date('Y-m-d 00:00');
         $collageEndTime = isset($config['collage_end_time'])? trim($config['collage_end_time']) : '';
-        $collageEndTime = $collageEndTime? date('Y-m-d '.$collageEndTime.':00') : date('Y-m-d H:i:s',strtotime(date('Y-m-d'))+86400);
+        $collageEndTime = $collageEndTime? date('Y-m-d '.$collageEndTime.':00') : date('Y-m-d H:i',strtotime(date('Y-m-d'))+86400);
 
         $dataList = \think\Db::name('orders')->alias('o')
             ->join('user u','u.id=o.user_id','left')
@@ -76,12 +76,12 @@ class Order
             })
             ->field($field)
             ->paginate($pageSize)
-            ->each(function($item, $k) use($collageStartTime, $collageEndTime, $printType){
+            ->each(function($item, $k) use($collageStartTime, $collageEndTime, $type){
                 $clusterNums = isset($item['cluster_nums'])? $item['cluster_nums'] : 0;
                 $clusterId = isset($item['id'])? $item['id'] : 0;
                 $type = isset($item['type'])? $item['type'] : 0;
                 $curDate = date('Y-m-d H:i:s');
-                if($printType == 2 && $collageStartTime && $collageEndTime){
+                if($type == 2 && $collageStartTime && $collageEndTime){
                     $item['collage_status'] = $curDate < $collageStartTime? 1 : ($curDate>$collageEndTime? 3 : 2);
                     $item['closeTime'] = $collageEndTime? strtotime($collageEndTime) -time() : 0;
                 }