From 4bdfbbac05aacb3d82377405faa6a7a56f02dc97 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Tue, 3 Dec 2019 15:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../m191112_014508_create_table_express_template.php     | 9 +++------
 ...lumns_province_city_area_in_table_ats_taking_site.php | 6 +++---
 ...11_update_column_address_in_table_ats_taking_site.php | 2 +-
 vendor/antgoods/goods/src/views/goods/create.php         | 6 ------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/console/migrations/m191112_014508_create_table_express_template.php b/console/migrations/m191112_014508_create_table_express_template.php
index 4b788a5..4396c90 100755
--- a/console/migrations/m191112_014508_create_table_express_template.php
+++ b/console/migrations/m191112_014508_create_table_express_template.php
@@ -19,14 +19,11 @@ class m191112_014508_create_table_express_template extends Migration
             'province'=>$this->text()->comment('省份'),
             'city'=>$this->text()->comment('城市'),
             'area'=>$this->text()->comment('区域'),
-            'billing_type'=>$this->tinyInteger(1)->defaultValue(0)->comment('账单类型'),
-            'extra_weight_type'=>$this->tinyInteger(2)->defaultValue(0)->comment('续重重量类型'),
-            'exemption_type'=>$this->tinyInteger(1)->defaultValue(0)->comment('包邮类型'),
+            'calculation'=>$this->tinyInteger(2)->defaultValue(0)->comment('计算方式'),
             'basic_price'=>$this->integer(20)->defaultValue(null)->comment('基本运费'),
+            'basic_amount'=>$this->integer(20)->defaultValue(null)->comment('基本数量'),
             'extra_price'=>$this->integer(20)->defaultValue(null)->comment('续重运费'),
-            'exemption_amount'=>$this->integer(20)->defaultValue(null)->comment('包邮金额'),
-            'support_taking'=>$this->tinyInteger(1)->defaultValue(0)->comment('是否支持自提，1为不支持'),
-            'taking_site'=>$this->text()->comment('自提地点'),
+            'extra_amount'=>$this->integer(20)->defaultValue(null)->comment('续重运费'),
             'updated_at'=>$this->integer(11)->defaultValue(null)->comment('更新时间'),
             'created_at'=>$this->integer(11)->defaultValue(null)->comment('创建时间'),
         ],$tableOptions);
diff --git a/console/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php b/console/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php
index 7d0c87d..5fae9fa 100644
--- a/console/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php
+++ b/console/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php
@@ -10,11 +10,11 @@ class m191203_030210_update_columns_province_city_area_in_table_ats_taking_site
     public function up()
     {
         $this->dropColumn('ats_taking_site', 'province');
-        $this->addColumn('ats_taking_site', 'province', $this->string(10)->notNull()->defaultValue(null)->comment('省份'));
+        $this->addColumn('ats_taking_site', 'province', $this->string(64)->defaultValue('')->notNull()->comment('省份'));
         $this->dropColumn('ats_taking_site', 'city');
-        $this->addColumn('ats_taking_site', 'city', $this->string(10)->notNull()->defaultValue(null)->comment('城市'));
+        $this->addColumn('ats_taking_site', 'city', $this->string(64)->defaultValue('')->notNull()->comment('城市'));
         $this->dropColumn('ats_taking_site', 'area');
-        $this->addColumn('ats_taking_site', 'area', $this->string(10)->notNull()->defaultValue(null)->comment('区域'));
+        $this->addColumn('ats_taking_site', 'area', $this->string(64)->defaultValue('')->notNull()->comment('区域'));
     }
 
     public function down()
diff --git a/console/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php b/console/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php
index b5b623b..5574799 100644
--- a/console/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php
+++ b/console/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php
@@ -10,7 +10,7 @@ class m191203_030911_update_column_address_in_table_ats_taking_site extends Migr
     public function up()
     {
         $this->dropColumn('ats_taking_site', 'address');
-        $this->addColumn('ats_taking_site', 'address', $this->text()->notNull()->comment('地址'));
+        $this->addColumn('ats_taking_site', 'address', $this->text()->defaultValue('')->notNull()->comment('地址'));
     }
 
     public function down()
diff --git a/vendor/antgoods/goods/src/views/goods/create.php b/vendor/antgoods/goods/src/views/goods/create.php
index 608d117..ba38f73 100644
--- a/vendor/antgoods/goods/src/views/goods/create.php
+++ b/vendor/antgoods/goods/src/views/goods/create.php
@@ -68,11 +68,5 @@ Yii::$app->params['bsVersion'] = '4.x';
 
         <?php ActiveForm::end(); ?>
 
-    <?php
-//    $this->render('_form', [
-//        'model' => $model,
-//    ])
-    ?>
-
     </div>
 </div>