瀏覽代碼

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

kevin 1 年之前
父節點
當前提交
31518c2344
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      common/models/FreeTemplate.php
  2. 1 1
      common/models/forms/FreeTemplateForm.php

+ 3 - 3
common/models/FreeTemplate.php

@@ -8,7 +8,7 @@ use Yii;
 /**
  * This is the model class for table "{{%FREE_TEMPLATE}}".
  *
- * @property int id
+ * @property string ID
  * @property string country_id 国家ID
  * @property double freight 运费
  * @property double free_shipping 免运费阈值
@@ -44,7 +44,7 @@ class FreeTemplate extends \common\components\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => 'ID',
+            'ID' => 'ID',
             'country_id' => '国家ID',
             'freight' => '运费',
             'free_shipping' => '免运费阈值',
@@ -85,7 +85,7 @@ class FreeTemplate extends \common\components\ActiveRecord
      */
     public static function getAllData()
     {
-        return static::find()->indexBy('id')->orderBy('id ASC')->asArray()->all();
+        return static::find()->indexBy('ID')->orderBy('ID ASC')->asArray()->all();
     }
 
     /**

+ 1 - 1
common/models/forms/FreeTemplateForm.php

@@ -78,7 +78,7 @@ class FreeTemplateForm extends Model
             $this->modelClass::deleteOne($this->countryId);
             // 添加/修改数据
             $model = new FreeTemplate();
-            $model->id = PageSnowFake::instance()->generateId();
+            $model->ID = PageSnowFake::instance()->generateId();
             $model->country_id = $this->countryId;
             $model->freight = $this->freight;
             $model->free_shipping = $this->freeShipping;