各处时间格式

application/api/controller/Demo.php

@@ -40,6 +40,16 @@ class Demo extends Api
         })
      */
 
+    public function test2(){
+        $a = time();
+        $b = $this->date_lang($a);
+        dump($b);
+
+        $b = $this->weekdatetime_lang($a);
+        dump($b);
+
+    }
+
     public function testweek(){
         $a = '1704609069';
         $b = date('w',$a);

application/api/controller/Usercenter.php

@@ -34,11 +34,7 @@ class Usercenter extends Api
                 //转换remain
                 $val['remain'] = floatval($val['remain']);
                 //日期
-                if($this->lang == 'zh-cn'){
-                    $val['time_text'] = date('m月d,Y',$val['starttime']).'-'.date('m月d,Y',$val['endtime']);
-                }else{
-                    $val['time_text'] = date('M d,Y',$val['starttime']).'-'.date('M d,Y',$val['endtime']);
-                }
+                $val['time_text'] = $this->date_lang($val['starttime']).'-'.$this->date_lang($val['endtime']);
                 //是否有延期按钮
                 $val['expired'] = 0;
                 if($val['endtime'] < time()){
@@ -71,12 +67,8 @@ class Usercenter extends Api
             //转换remain
             $order['remain'] = floatval($order['remain']);
             //日期
-            if($this->lang == 'zh-cn'){
-                $order['showtime_text'] = date('m月d,Y',$order['starttime']).'-'.date('m月d,Y',$order['endtime']);
-            }else{
-                $order['showtime_text'] = date('M d,Y',$order['starttime']).'-'.date('M d,Y',$order['endtime']);
-            }
-            
+            $order['showtime_text'] = $this->date_lang($order['starttime']).'-'.$this->date_lang($order['endtime']);
+
             $order['remark'] = '购买套餐赠送';
         }
 
@@ -126,7 +118,7 @@ class Usercenter extends Api
                 $order['package_name_en']   = $package_order['name_en'];
                 $order['package_starttime'] = $package_order['starttime'];
                 $order['package_endtime']   = $package_order['endtime'];
-                $order['package_showtime_text'] = date('Y-m-d H:i',$package_order['starttime']).'-'.date('Y-m-d H:i',$package_order['endtime']);
+                $order['package_showtime_text'] = $this->date_lang($package_order['starttime']).'-'.$this->date_lang($package_order['endtime']);
             }
             if($order['paytype'] == 4){
                 $trylesson_order = Db::name('trylesson_order')->alias('order')
@@ -137,12 +129,12 @@ class Usercenter extends Api
                 $order['package_name_en']   = $trylesson_order['name_en'];
                 $order['package_starttime'] = $trylesson_order['starttime'];
                 $order['package_endtime']   = $trylesson_order['endtime'];
-                $order['package_showtime_text'] = date('Y-m-d H:i',$trylesson_order['starttime']).'-'.date('Y-m-d H:i',$trylesson_order['endtime']);
+                $order['package_showtime_text'] = $this->date_lang($trylesson_order['starttime']).'-'.$this->date_lang($trylesson_order['endtime']);
             }
 
 
             //显示时间
-            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+            $order['showtime_text'] = $this->weektime_lang($order['starttime']);
 
         }
 
@@ -184,7 +176,7 @@ class Usercenter extends Api
             $order['coach_text'] = substr($coach_text,0,-1);
 
             //显示时间
-            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+            $order['showtime_text'] = $this->weektime_lang($order['starttime']);
 
             //放入支付套餐
             /*if($order['paytype'] == 1){
@@ -311,7 +303,7 @@ class Usercenter extends Api
             $order['coach_text'] = substr($coach_text,0,-1);
 
             //时间
-            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+            $order['showtime_text'] = $this->weektime_lang($order['starttime']);
 
             //放入支付套餐
             /*if($order['paytype'] == 1){
@@ -377,7 +369,7 @@ class Usercenter extends Api
             }
 
             //显示时间
-            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+            $order['showtime_text'] = $this->weektime_lang($order['starttime']);
 
             //放入支付套餐
             /*if($order['paytype'] == 1){
@@ -431,7 +423,7 @@ class Usercenter extends Api
             $order['coach_text'] = substr($coach_text,0,-1);
 
             //显示时间
-            $order['showtime_text'] = date('Y-m-d H:i',$order['starttime']);
+            $order['showtime_text'] = $this->weektime_lang($order['starttime']);
 
             //放入支付套餐
             /*if($order['paytype'] == 1){
@@ -469,7 +461,7 @@ class Usercenter extends Api
 
         foreach($list as $key => &$order){
             //显示时间
-            $order['showtime_text'] = date('m月d,Y',$order['starttime']).'-'.date('m月d,Y',$order['endtime']);
+            $order['showtime_text'] = $this->date_lang($order['starttime']).'-'.$this->date_lang($order['endtime']);
         }
 
         $this->success(1,$list);
@@ -497,12 +489,8 @@ class Usercenter extends Api
             foreach($list as $key => &$val){
                 //转换remain
                 $val['remain'] = floatval($val['remain']);
-                //日期
-                if($this->lang == 'zh-cn'){
-                    $val['time_text'] = date('m月d,Y',$val['starttime']).'-'.date('m月d,Y',$val['endtime']);
-                }else{
-                    $val['time_text'] = date('M d,Y',$val['starttime']).'-'.date('M d,Y',$val['endtime']);
-                }
+
+                $val['time_text'] = $this->date_lang($val['starttime']).'-'.$this->date_lang($val['endtime']);
                 //是否有延期按钮
                 $val['expired'] = 0;
                 if($val['endtime'] < time()){
@@ -611,7 +599,7 @@ class Usercenter extends Api
                 //hours转换
                 $val['hours'] = floatval($val['hours']);
                 //日期
-                $val['showtime_text'] = date('Y-m-d H:i',$val['starttime']);
+                $val['showtime_text'] = $this->datetime_lang($val['starttime']);
             }
         }
 

application/common/controller/Api.php

@@ -200,6 +200,35 @@ class Api
         return $data;
     }
 
+    //Jun 19,2024
+    //6月19,2024
+    protected function date_lang($time){
+        if($this->lang == 'en'){
+            return date('M d,Y',$time);
+        }else{
+            return date('n月d,Y',$time);
+        }
+    }
+
+    protected function datetime_lang($time){
+        if($this->lang == 'en'){
+            return date('M d,Y H:i',$time);
+        }else{
+            return date('n月d,Y H:i',$time);
+        }
+    }
+
+    //Wed,10:41am
+    //星期3,10:41am
+    protected function weektime_lang($time){
+        if($this->lang == 'en'){
+            return date('D,H:ia',$time);
+        }else{
+            return date('星期N,H:ia',$time);
+        }
+    }
+
+
     /**
      * 操作成功返回的数据
      * @param string $msg    提示信息