Parcourir la source

feat: NG-15: 新会员注册时增加国家与语言选项.

zhangl il y a 1 an
Parent
commit
210cb38195

+ 2 - 2
frontendApi/modules/v1/controllers/BonusController.php

@@ -103,8 +103,8 @@ class BonusController extends BaseController {
 //        $wallet[] = ['walletType' => 'point', 'walletName' => '会员积分', 'amount' => Tool::formatPrice($data['RECONSUME_POINTS'])];
 //        $wallet[] = ['walletType' => 'exchange', 'walletName' => 'Exchange points', 'amount' => Tool::formatPrice($data['EXCHANGE_POINTS'])];//兑换点数
 //        $wallet[] = ['walletType' => 'tourism_points', 'walletName' => 'Travel points', 'amount' => Tool::formatPrice($data['TOURISM_POINTS'])];//旅游积分
-        $wallet[] = ['walletType' => 'garage_points', 'walletName' => Yii::t('app', 'carPoints'), 'amount' => Tool::formatPrice($data['GARAGE_POINTS'])];//车奖积分
-        $wallet[] = ['walletType' => 'villa_points', 'walletName' => Yii::t('app', 'villaPoints'), 'amount' => Tool::formatPrice($data['VILLA_POINTS'])];//房奖积分
+//        $wallet[] = ['walletType' => 'garage_points', 'walletName' => Yii::t('app', 'carPoints'), 'amount' => Tool::formatPrice($data['GARAGE_POINTS'])];//车奖积分
+//        $wallet[] = ['walletType' => 'villa_points', 'walletName' => Yii::t('app', 'villaPoints'), 'amount' => Tool::formatPrice($data['VILLA_POINTS'])];//房奖积分
 //        if ($showCFLX) {
 //            $wallet[] = ['walletType' => 'cf', 'walletName' => '福利积分一', 'amount' => Tool::formatPrice($data['CF'])];
 //            $wallet[] = ['walletType' => 'lx', 'walletName' => '福利积分二', 'amount' => Tool::formatPrice($data['LX'])];

+ 5 - 1
frontendApi/modules/v1/controllers/SiteController.php

@@ -402,8 +402,12 @@ class SiteController extends BaseController
         $yearEnd = 2029;
         for ($y = $yearStart; $y <= $yearEnd; $y++) {
             for ($i = 1; $i <= 12; $i++) {
+                // 月初
                 $date = "{$y}-{$i}-01 00:00:00";
-                $result[] = strtotime($date) - 60 * 60 * 7;
+                $result[] = strtotime($date);
+                // 月底
+//                $date = date('Y-m-t', strtotime("{$y}-{$i}")) . ' 23:59:59';
+//                $result[] = strtotime($date);
             }
         }