From df2124a1615e4cbdbc4ffe471a97e0d176d6d01b Mon Sep 17 00:00:00 2001 From: linyaostalker <602604991@qq.com> Date: Wed, 4 Dec 2019 19:19:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9E=B6=E6=9E=84=EF=BC=8C=E6=94=B9=E4=B8=BA1?= =?UTF-8?q?=E4=B8=BB=E5=A4=9Amodule=E7=9A=84=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- antgoods/controllers/CategoryController.php | 16 ++-- antgoods/controllers/GoodsController.php | 22 ++--- .../controllers/ShopCategoryController.php | 16 ++-- antgoods/logic/goods/GoodsManager.php | 6 +- antgoods/models/ars/Category.php | 2 +- antgoods/models/ars/Goods.php | 2 +- antgoods/models/ars/ShopCategory.php | 2 +- antgoods/views/goods/view.php | 2 +- backend/config/main.php | 2 +- backend/controllers/ConfigController.php | 2 +- .../controllers/ExpressTemplateController.php | 12 +-- backend/controllers/OrderController.php | 4 +- backend/controllers/SiteController.php | 4 +- backend/controllers/TakingSiteController.php | 8 +- backend/logic/file/FileManager.php | 4 +- .../migrations/m130524_201442_init.php | 0 .../migrations/m140506_102106_rbac_init.php | 0 ...c_add_index_on_auth_assignment_user_id.php | 0 ...38_rbac_updates_indexes_without_prefix.php | 0 ...erification_token_column_to_user_table.php | 0 .../m190802_072830_add_category.php | 0 .../m191111_101658_create_table_area.php | 0 .../m191111_102644_create_table_province.php | 0 .../m191111_102730_create_table_city.php | 0 .../m191111_102925_create_table_cart.php | 0 .../m191111_112559_create_table_address.php | 0 ...m191111_113455_create_table_after_sale.php | 0 ...112_005106_create_table_search_history.php | 0 ...m191112_005545_create_table_collection.php | 0 .../m191112_005702_create_table_comment.php | 0 .../m191112_010421_create_table_order.php | 0 ...191112_011517_create_table_order_goods.php | 0 ...191112_012449_create_table_taking_site.php | 0 ...2_014508_create_table_express_template.php | 0 .../m191112_015939_create_table_delivery.php | 0 ...191112_020830_create_table_payment_log.php | 0 ...m191112_021528_create_table_refund_log.php | 0 .../m191112_022131_create_table_file.php | 0 .../m191112_022532_create_table_tem_file.php | 0 ...column_weight_in_table_ats_order_goods.php | 0 ...column_sku_id_in_table_ats_order_goods.php | 0 ...nce_city_area_in_table_ats_taking_site.php | 0 ...olumn_address_in_table_ats_taking_site.php | 0 ...mn_is_default_in_table_ats_taking_site.php | 0 ..._add_column_address_in_table_ats_order.php | 0 ...112307_add_data_to_table_city_and_area.php | 0 ...mn_discount_description_in_table_order.php | 0 ...culation_in_table_ats_express_template.php | 0 ...c_amount_in_table_ats_express_template.php | 0 .../migrations/schema-mysql.sql | 0 .../migrations/sql/add_category.sql | 0 .../migrations/sql/add_data.sql | 0 {console => backend}/migrations/sql/area.sql | 0 {console => backend}/migrations/sql/city.sql | 0 .../migrations/sql/province.sql | 0 {common => backend}/models/Cat.php | 2 +- {common => backend}/models/Category.php | 2 +- {common => backend}/models/CategorySearch.php | 6 +- {common => backend}/models/LoginForm.php | 2 +- {common => backend}/models/User.php | 2 +- {common => backend}/models/ars/Address.php | 2 +- {common => backend}/models/ars/AfterSale.php | 2 +- {common => backend}/models/ars/Area.php | 2 +- {common => backend}/models/ars/Cart.php | 2 +- {common => backend}/models/ars/City.php | 2 +- {common => backend}/models/ars/Collection.php | 2 +- {common => backend}/models/ars/Comment.php | 2 +- {common => backend}/models/ars/Config.php | 2 +- {common => backend}/models/ars/Delivery.php | 2 +- .../models/ars/ExpressTemplate.php | 6 +- {common => backend}/models/ars/File.php | 2 +- {common => backend}/models/ars/Order.php | 2 +- {common => backend}/models/ars/OrderGoods.php | 2 +- {common => backend}/models/ars/PaymentLog.php | 2 +- {common => backend}/models/ars/Province.php | 2 +- {common => backend}/models/ars/RefundLog.php | 2 +- .../models/ars/SearchHistory.php | 2 +- {common => backend}/models/ars/TakingSite.php | 2 +- {common => backend}/models/ars/TemFile.php | 2 +- .../models/searchs/ExpressTemplateSearch.php | 6 +- .../models/searchs/OrderSearch.php | 6 +- .../models/searchs/TakingSiteSearch.php | 6 +- backend/views/express-template/_form.php | 96 ++++++++++++++++++- backend/views/express-template/_search.php | 2 +- backend/views/express-template/area.php | 2 +- backend/views/express-template/create.php | 2 +- backend/views/express-template/index.php | 2 +- backend/views/express-template/update.php | 2 +- backend/views/express-template/view.php | 6 +- backend/views/order/_form.php | 2 +- backend/views/order/_search.php | 2 +- backend/views/order/create.php | 2 +- backend/views/order/index.php | 2 +- backend/views/order/update.php | 2 +- backend/views/order/view.php | 2 +- backend/views/site/login.php | 2 +- backend/views/site/test.php | 2 +- backend/views/taking-site/_form.php | 4 +- backend/views/taking-site/_search.php | 2 +- backend/views/taking-site/create.php | 2 +- backend/views/taking-site/index.php | 2 +- backend/views/taking-site/update.php | 6 +- backend/views/taking-site/view.php | 2 +- 103 files changed, 208 insertions(+), 116 deletions(-) rename {console => backend}/migrations/m130524_201442_init.php (100%) rename {console => backend}/migrations/m140506_102106_rbac_init.php (100%) rename {console => backend}/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php (100%) rename {console => backend}/migrations/m180523_151638_rbac_updates_indexes_without_prefix.php (100%) rename {console => backend}/migrations/m190124_110200_add_verification_token_column_to_user_table.php (100%) rename {console => backend}/migrations/m190802_072830_add_category.php (100%) rename {console => backend}/migrations/m191111_101658_create_table_area.php (100%) rename {console => backend}/migrations/m191111_102644_create_table_province.php (100%) rename {console => backend}/migrations/m191111_102730_create_table_city.php (100%) rename {console => backend}/migrations/m191111_102925_create_table_cart.php (100%) rename {console => backend}/migrations/m191111_112559_create_table_address.php (100%) rename {console => backend}/migrations/m191111_113455_create_table_after_sale.php (100%) rename {console => backend}/migrations/m191112_005106_create_table_search_history.php (100%) rename {console => backend}/migrations/m191112_005545_create_table_collection.php (100%) rename {console => backend}/migrations/m191112_005702_create_table_comment.php (100%) rename {console => backend}/migrations/m191112_010421_create_table_order.php (100%) rename {console => backend}/migrations/m191112_011517_create_table_order_goods.php (100%) rename {console => backend}/migrations/m191112_012449_create_table_taking_site.php (100%) rename {console => backend}/migrations/m191112_014508_create_table_express_template.php (100%) rename {console => backend}/migrations/m191112_015939_create_table_delivery.php (100%) rename {console => backend}/migrations/m191112_020830_create_table_payment_log.php (100%) rename {console => backend}/migrations/m191112_021528_create_table_refund_log.php (100%) rename {console => backend}/migrations/m191112_022131_create_table_file.php (100%) rename {console => backend}/migrations/m191112_022532_create_table_tem_file.php (100%) rename {console => backend}/migrations/m191130_071623_add_column_weight_in_table_ats_order_goods.php (100%) rename {console => backend}/migrations/m191203_022720_add_column_sku_id_in_table_ats_order_goods.php (100%) rename {console => backend}/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php (100%) rename {console => backend}/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php (100%) rename {console => backend}/migrations/m191203_031446_drop_column_is_default_in_table_ats_taking_site.php (100%) rename {console => backend}/migrations/m191203_034004_add_column_address_in_table_ats_order.php (100%) rename {console => backend}/migrations/m191203_112307_add_data_to_table_city_and_area.php (100%) rename {console => backend}/migrations/m191203_114421_update_column_discount_description_in_table_order.php (100%) rename {console => backend}/migrations/m191204_004849_update_column_calculation_in_table_ats_express_template.php (100%) rename {console => backend}/migrations/m191204_012240_update_columns_basic_price_basic_amount_in_table_ats_express_template.php (100%) rename {console => backend}/migrations/schema-mysql.sql (100%) rename {console => backend}/migrations/sql/add_category.sql (100%) rename {console => backend}/migrations/sql/add_data.sql (100%) rename {console => backend}/migrations/sql/area.sql (100%) rename {console => backend}/migrations/sql/city.sql (100%) rename {console => backend}/migrations/sql/province.sql (100%) rename {common => backend}/models/Cat.php (97%) rename {common => backend}/models/Category.php (99%) rename {common => backend}/models/CategorySearch.php (97%) rename {common => backend}/models/LoginForm.php (98%) rename {common => backend}/models/User.php (99%) rename {common => backend}/models/ars/Address.php (98%) rename {common => backend}/models/ars/AfterSale.php (98%) rename {common => backend}/models/ars/Area.php (96%) rename {common => backend}/models/ars/Cart.php (98%) rename {common => backend}/models/ars/City.php (96%) rename {common => backend}/models/ars/Collection.php (98%) rename {common => backend}/models/ars/Comment.php (98%) rename {common => backend}/models/ars/Config.php (98%) rename {common => backend}/models/ars/Delivery.php (98%) rename {common => backend}/models/ars/ExpressTemplate.php (95%) rename {common => backend}/models/ars/File.php (98%) rename {common => backend}/models/ars/Order.php (99%) rename {common => backend}/models/ars/OrderGoods.php (98%) rename {common => backend}/models/ars/PaymentLog.php (98%) rename {common => backend}/models/ars/Province.php (96%) rename {common => backend}/models/ars/RefundLog.php (98%) rename {common => backend}/models/ars/SearchHistory.php (98%) rename {common => backend}/models/ars/TakingSite.php (98%) rename {common => backend}/models/ars/TemFile.php (98%) rename {common => backend}/models/searchs/ExpressTemplateSearch.php (97%) rename {common => backend}/models/searchs/OrderSearch.php (97%) rename {common => backend}/models/searchs/TakingSiteSearch.php (97%) diff --git a/antgoods/controllers/CategoryController.php b/antgoods/controllers/CategoryController.php index fcc2366..ab9f50d 100644 --- a/antgoods/controllers/CategoryController.php +++ b/antgoods/controllers/CategoryController.php @@ -3,7 +3,7 @@ namespace antgoods\controllers; use antgoods\logic\goods\GoodsManager; -use common\models\ars\File; +use backend\models\ars\File; use Yii; use antgoods\models\ars\Category; use antgoods\models\searchs\CategorySearch; @@ -193,7 +193,7 @@ class CategoryController extends Controller */ public function actionSaveFile() { - if(!class_exists('\common\models\ars\TemFile') || !class_exists('\backend\logic\file\FileManager')){ + if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\logic\file\FileManager')){ return ''; } @@ -201,7 +201,7 @@ class CategoryController extends Controller $file_name = Yii::$app->request->get('fileName')[0]; if ($data['status'] == true) { - $model = new \common\models\ars\TemFile(); + $model = new \backend\models\ars\TemFile(); $model->user_id = Yii::$app->user->identity->id; $model->name = $file_name; $file_manager = new \backend\logic\file\FileManager(); @@ -223,7 +223,7 @@ class CategoryController extends Controller public function actionImgIdDel() { //判断该类是否存在 - if(!class_exists('\common\models\ars\TemFile') || !class_exists('\common\models\ars\File')){ + if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\models\ars\File')){ return ''; } @@ -231,13 +231,13 @@ class CategoryController extends Controller $img_id_arr = explode(',', $img_id); if(isset(Yii::$app->request->get('data')['alias'])) { $alias = Yii::$app->request->get('data')['alias']; - $tem_file = \common\models\ars\TemFile::findOne(['alias' => $alias]); + $tem_file = \backend\models\ars\TemFile::findOne(['alias' => $alias]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } }else{ foreach (Yii::$app->request->get() as $key => $value) { - $tem_file = \common\models\ars\File::findOne(['alias' => $value]); + $tem_file = \backend\models\ars\File::findOne(['alias' => $value]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } @@ -254,13 +254,13 @@ class CategoryController extends Controller public function actionImageFile() { //判断该类是否存在 - if(!class_exists('\common\models\ars\File')){ + if(!class_exists('\backend\models\ars\File')){ return false; } $file_id_str = Yii::$app->request->get('fileidstr'); $file_id_arr = explode(',', $file_id_str); - $data = \common\models\ars\File::find()->where(['id' => $file_id_arr])->all(); + $data = \backend\models\ars\File::find()->where(['id' => $file_id_arr])->all(); $res = array(); if($data) { $i = 0; diff --git a/antgoods/controllers/GoodsController.php b/antgoods/controllers/GoodsController.php index c2891cc..8c43427 100644 --- a/antgoods/controllers/GoodsController.php +++ b/antgoods/controllers/GoodsController.php @@ -4,8 +4,8 @@ namespace antgoods\controllers; use antgoods\models\ars\GoodsAttr; use antgoods\models\ars\GoodsSku; -use common\models\ars\OrderGoods; -use common\models\ars\TemFile; +use backend\models\ars\OrderGoods; +use backend\models\ars\TemFile; use MongoDB\Driver\Manager; use Yii; use antgoods\models\ars\Goods; @@ -14,7 +14,7 @@ use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use antgoods\logic\goods\GoodsManager; -use common\models\ars\File; +use backend\models\ars\File; use yii\web\Response; use antgoods\models\ars\Attribute; @@ -203,7 +203,7 @@ class GoodsController extends Controller */ public function actionSaveFile() { - if(!class_exists('\common\models\ars\TemFile') || !class_exists('\backend\logic\file\FileManager')){ + if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\logic\file\FileManager')){ return ''; } @@ -211,7 +211,7 @@ class GoodsController extends Controller $file_name = Yii::$app->request->get('fileName')[0]; if ($data['status'] == true) { - $model = new \common\models\ars\TemFile(); + $model = new \backend\models\ars\TemFile(); $model->user_id = Yii::$app->user->identity->id; $model->name = $file_name; $file_manager = new \backend\logic\file\FileManager(); @@ -233,7 +233,7 @@ class GoodsController extends Controller public function actionImgIdDel() { //判断该类是否存在 - if(!class_exists('\common\models\ars\TemFile') || !class_exists('\common\models\ars\File')){ + if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\models\ars\File')){ return ''; } @@ -241,13 +241,13 @@ class GoodsController extends Controller $img_id_arr = explode(',', $img_id); if(isset(Yii::$app->request->get('data')['alias'])) { $alias = Yii::$app->request->get('data')['alias']; - $tem_file = \common\models\ars\TemFile::findOne(['alias' => $alias]); + $tem_file = \backend\models\ars\TemFile::findOne(['alias' => $alias]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } }else{ foreach (Yii::$app->request->get() as $key => $value) { - $tem_file = \common\models\ars\File::findOne(['alias' => $value]); + $tem_file = \backend\models\ars\File::findOne(['alias' => $value]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } @@ -264,7 +264,7 @@ class GoodsController extends Controller public function actionImageFile() { //判断该类是否存在 - if(!class_exists('\common\models\ars\File')){ + if(!class_exists('\backend\models\ars\File')){ return false; } @@ -272,9 +272,9 @@ class GoodsController extends Controller $file_id_str = Yii::$app->request->get('fileidstr'); $file_id_arr = explode(',', $file_id_str); if ($rule_verify == 1) { - $data = \common\models\ars\TemFile::find()->where(['id' => $file_id_arr])->all(); + $data = \backend\models\ars\TemFile::find()->where(['id' => $file_id_arr])->all(); } else { - $data = \common\models\ars\File::find()->where(['id' => $file_id_arr])->all(); + $data = \backend\models\ars\File::find()->where(['id' => $file_id_arr])->all(); } $res = array(); if($data) { diff --git a/antgoods/controllers/ShopCategoryController.php b/antgoods/controllers/ShopCategoryController.php index 3a32b55..e277fdd 100644 --- a/antgoods/controllers/ShopCategoryController.php +++ b/antgoods/controllers/ShopCategoryController.php @@ -3,7 +3,7 @@ namespace antgoods\controllers; use antgoods\logic\goods\GoodsManager; -use common\models\ars\File; +use backend\models\ars\File; use Yii; use antgoods\models\ars\ShopCategory; use antgoods\models\searchs\ShopCategorySearch; @@ -204,7 +204,7 @@ class ShopCategoryController extends Controller */ public function actionSaveFile() { - if(!class_exists('\common\models\ars\TemFile') || !class_exists('\backend\logic\file\FileManager')){ + if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\logic\file\FileManager')){ return ''; } @@ -212,7 +212,7 @@ class ShopCategoryController extends Controller $file_name = Yii::$app->request->get('fileName')[0]; if ($data['status'] == true) { - $model = new \common\models\ars\TemFile(); + $model = new \backend\models\ars\TemFile(); $model->user_id = Yii::$app->user->identity->id; $model->name = $file_name; $file_manager = new \backend\logic\file\FileManager(); @@ -234,7 +234,7 @@ class ShopCategoryController extends Controller public function actionImgIdDel() { //判断该类是否存在 - if(!class_exists('\common\models\ars\TemFile') || !class_exists('\common\models\ars\File')){ + if(!class_exists('\backend\models\ars\TemFile') || !class_exists('\backend\models\ars\File')){ return ''; } @@ -242,13 +242,13 @@ class ShopCategoryController extends Controller $img_id_arr = explode(',', $img_id); if(isset(Yii::$app->request->get('data')['alias'])) { $alias = Yii::$app->request->get('data')['alias']; - $tem_file = \common\models\ars\TemFile::findOne(['alias' => $alias]); + $tem_file = \backend\models\ars\TemFile::findOne(['alias' => $alias]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } }else{ foreach (Yii::$app->request->get() as $key => $value) { - $tem_file = \common\models\ars\File::findOne(['alias' => $value]); + $tem_file = \backend\models\ars\File::findOne(['alias' => $value]); if ($tem_file) { $img_id_arr = array_diff($img_id_arr, [$tem_file->id]); } @@ -265,13 +265,13 @@ class ShopCategoryController extends Controller public function actionImageFile() { //判断该类是否存在 - if(!class_exists('\common\models\ars\File')){ + if(!class_exists('\backend\models\ars\File')){ return false; } $file_id_str = Yii::$app->request->get('fileidstr'); $file_id_arr = explode(',', $file_id_str); - $data = \common\models\ars\File::find()->where(['id' => $file_id_arr])->all(); + $data = \backend\models\ars\File::find()->where(['id' => $file_id_arr])->all(); $res = array(); if($data) { $i = 0; diff --git a/antgoods/logic/goods/GoodsManager.php b/antgoods/logic/goods/GoodsManager.php index c9d134d..834348b 100644 --- a/antgoods/logic/goods/GoodsManager.php +++ b/antgoods/logic/goods/GoodsManager.php @@ -1,7 +1,7 @@ false, 'info' => '操作失败']; } @@ -321,7 +321,7 @@ class GoodsManager /** * @param $attrId * @param $goodsId - * @return GoodsAttr[]|GoodsSku[]|array|File[]|\common\models\ars\TemFile[]|\yii\db\ActiveRecord[] + * @return GoodsAttr[]|GoodsSku[]|array|File[]|\backend\models\ars\TemFile[]|\yii\db\ActiveRecord[] * 获取属性值 */ public static function getAttrValue($attrId, $goodsId) diff --git a/antgoods/models/ars/Category.php b/antgoods/models/ars/Category.php index 181da3e..d84b4ee 100644 --- a/antgoods/models/ars/Category.php +++ b/antgoods/models/ars/Category.php @@ -4,7 +4,7 @@ namespace antgoods\models\ars; use Yii; use yii\behaviors\TimestampBehavior; -use common\models\ars\File; +use backend\models\ars\File; /** * This is the model class for table "antgoods_category". diff --git a/antgoods/models/ars/Goods.php b/antgoods/models/ars/Goods.php index ebc748e..6140430 100644 --- a/antgoods/models/ars/Goods.php +++ b/antgoods/models/ars/Goods.php @@ -6,7 +6,7 @@ use Yii; use yii\behaviors\TimestampBehavior; use antgoods\models\ars\Category; use antgoods\models\ars\ShopCategory; -use common\models\ars\File; +use backend\models\ars\File; use antgoods\models\ars\Brand; use antgoods\models\ars\Supplier; diff --git a/antgoods/models/ars/ShopCategory.php b/antgoods/models/ars/ShopCategory.php index 1212ec2..51d8603 100644 --- a/antgoods/models/ars/ShopCategory.php +++ b/antgoods/models/ars/ShopCategory.php @@ -4,7 +4,7 @@ namespace antgoods\models\ars; use Yii; use yii\behaviors\TimestampBehavior; -use common\models\ars\File; +use backend\models\ars\File; /** * This is the model class for table "antgoods_shop_category". diff --git a/antgoods/views/goods/view.php b/antgoods/views/goods/view.php index 8c61b50..7d08515 100644 --- a/antgoods/views/goods/view.php +++ b/antgoods/views/goods/view.php @@ -3,7 +3,7 @@ use antgoods\models\ars\Goods; use yii\bootstrap4\Html; use yii\widgets\DetailView; -use common\models\ars\File; +use backend\models\ars\File; /* @var $this yii\web\View */ /* @var $model antgoods\models\ars\Goods */ diff --git a/backend/config/main.php b/backend/config/main.php index b85cfe4..c236292 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -22,7 +22,7 @@ return [ 'csrfParam' => '_csrf-api', ], 'user' => [ - 'identityClass' => 'common\models\User', + 'identityClass' => 'backend\models\User', 'enableAutoLogin' => true, 'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true], ], diff --git a/backend/controllers/ConfigController.php b/backend/controllers/ConfigController.php index 1a0b743..53da01f 100755 --- a/backend/controllers/ConfigController.php +++ b/backend/controllers/ConfigController.php @@ -3,7 +3,7 @@ namespace backend\controllers; use Yii; -use common\models\ars\Category; +use backend\models\ars\Category; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; diff --git a/backend/controllers/ExpressTemplateController.php b/backend/controllers/ExpressTemplateController.php index 40926f9..ac33f09 100644 --- a/backend/controllers/ExpressTemplateController.php +++ b/backend/controllers/ExpressTemplateController.php @@ -2,11 +2,11 @@ namespace backend\controllers; -use common\models\ars\City; -use common\models\ars\Province; +use backend\models\ars\City; +use backend\models\ars\Province; use Yii; -use common\models\ars\ExpressTemplate; -use common\models\searchs\ExpressTemplateSearch; +use backend\models\ars\ExpressTemplate; +use backend\models\searchs\ExpressTemplateSearch; use yii\caching\Cache; use yii\web\Controller; use yii\web\NotFoundHttpException; @@ -72,11 +72,11 @@ class ExpressTemplateController extends Controller { $model = new ExpressTemplate(); $model->calculation = ExpressTemplate::CALCULATION_NUMBER; - $model->basic_amount = 0; + $model->basic_amount = 1; $model->basic_price = '0.00'; if (Yii::$app->request->isPost) { - $data = Yii::$app->request->post('ExpressTemplate');d($data);die(); + $data = Yii::$app->request->post('ExpressTemplate'); if (Yii::$app->request->isAjax) { $model->load($data, ''); Yii::$app->response->format = Response::FORMAT_JSON; diff --git a/backend/controllers/OrderController.php b/backend/controllers/OrderController.php index fd50941..322a2f0 100755 --- a/backend/controllers/OrderController.php +++ b/backend/controllers/OrderController.php @@ -3,8 +3,8 @@ namespace backend\controllers; use Yii; -use common\models\ars\Order; -use common\models\searchs\OrderSearch; +use backend\models\ars\Order; +use backend\models\searchs\OrderSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php index f566346..796c0f6 100755 --- a/backend/controllers/SiteController.php +++ b/backend/controllers/SiteController.php @@ -6,8 +6,8 @@ use Yii; use yii\web\Controller; use yii\filters\VerbFilter; use yii\filters\AccessControl; -use common\models\LoginForm; -use common\models\CategorySearch; +use backend\models\LoginForm; +use backend\models\CategorySearch; /** * Site controller diff --git a/backend/controllers/TakingSiteController.php b/backend/controllers/TakingSiteController.php index d83fe6a..65d2f0a 100644 --- a/backend/controllers/TakingSiteController.php +++ b/backend/controllers/TakingSiteController.php @@ -2,11 +2,11 @@ namespace backend\controllers; -use common\models\ars\Area; -use common\models\ars\City; +use backend\models\ars\Area; +use backend\models\ars\City; use Yii; -use common\models\ars\TakingSite; -use common\models\searchs\TakingSiteSearch; +use backend\models\ars\TakingSite; +use backend\models\searchs\TakingSiteSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; diff --git a/backend/logic/file/FileManager.php b/backend/logic/file/FileManager.php index 88624d9..831a9b9 100644 --- a/backend/logic/file/FileManager.php +++ b/backend/logic/file/FileManager.php @@ -3,8 +3,8 @@ namespace backend\logic\file; -use common\models\ars\File; -use common\models\ars\TemFile; +use backend\models\ars\File; +use backend\models\ars\TemFile; class FileManager { diff --git a/console/migrations/m130524_201442_init.php b/backend/migrations/m130524_201442_init.php similarity index 100% rename from console/migrations/m130524_201442_init.php rename to backend/migrations/m130524_201442_init.php diff --git a/console/migrations/m140506_102106_rbac_init.php b/backend/migrations/m140506_102106_rbac_init.php similarity index 100% rename from console/migrations/m140506_102106_rbac_init.php rename to backend/migrations/m140506_102106_rbac_init.php diff --git a/console/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php b/backend/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php similarity index 100% rename from console/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php rename to backend/migrations/m170907_052038_rbac_add_index_on_auth_assignment_user_id.php diff --git a/console/migrations/m180523_151638_rbac_updates_indexes_without_prefix.php b/backend/migrations/m180523_151638_rbac_updates_indexes_without_prefix.php similarity index 100% rename from console/migrations/m180523_151638_rbac_updates_indexes_without_prefix.php rename to backend/migrations/m180523_151638_rbac_updates_indexes_without_prefix.php diff --git a/console/migrations/m190124_110200_add_verification_token_column_to_user_table.php b/backend/migrations/m190124_110200_add_verification_token_column_to_user_table.php similarity index 100% rename from console/migrations/m190124_110200_add_verification_token_column_to_user_table.php rename to backend/migrations/m190124_110200_add_verification_token_column_to_user_table.php diff --git a/console/migrations/m190802_072830_add_category.php b/backend/migrations/m190802_072830_add_category.php similarity index 100% rename from console/migrations/m190802_072830_add_category.php rename to backend/migrations/m190802_072830_add_category.php diff --git a/console/migrations/m191111_101658_create_table_area.php b/backend/migrations/m191111_101658_create_table_area.php similarity index 100% rename from console/migrations/m191111_101658_create_table_area.php rename to backend/migrations/m191111_101658_create_table_area.php diff --git a/console/migrations/m191111_102644_create_table_province.php b/backend/migrations/m191111_102644_create_table_province.php similarity index 100% rename from console/migrations/m191111_102644_create_table_province.php rename to backend/migrations/m191111_102644_create_table_province.php diff --git a/console/migrations/m191111_102730_create_table_city.php b/backend/migrations/m191111_102730_create_table_city.php similarity index 100% rename from console/migrations/m191111_102730_create_table_city.php rename to backend/migrations/m191111_102730_create_table_city.php diff --git a/console/migrations/m191111_102925_create_table_cart.php b/backend/migrations/m191111_102925_create_table_cart.php similarity index 100% rename from console/migrations/m191111_102925_create_table_cart.php rename to backend/migrations/m191111_102925_create_table_cart.php diff --git a/console/migrations/m191111_112559_create_table_address.php b/backend/migrations/m191111_112559_create_table_address.php similarity index 100% rename from console/migrations/m191111_112559_create_table_address.php rename to backend/migrations/m191111_112559_create_table_address.php diff --git a/console/migrations/m191111_113455_create_table_after_sale.php b/backend/migrations/m191111_113455_create_table_after_sale.php similarity index 100% rename from console/migrations/m191111_113455_create_table_after_sale.php rename to backend/migrations/m191111_113455_create_table_after_sale.php diff --git a/console/migrations/m191112_005106_create_table_search_history.php b/backend/migrations/m191112_005106_create_table_search_history.php similarity index 100% rename from console/migrations/m191112_005106_create_table_search_history.php rename to backend/migrations/m191112_005106_create_table_search_history.php diff --git a/console/migrations/m191112_005545_create_table_collection.php b/backend/migrations/m191112_005545_create_table_collection.php similarity index 100% rename from console/migrations/m191112_005545_create_table_collection.php rename to backend/migrations/m191112_005545_create_table_collection.php diff --git a/console/migrations/m191112_005702_create_table_comment.php b/backend/migrations/m191112_005702_create_table_comment.php similarity index 100% rename from console/migrations/m191112_005702_create_table_comment.php rename to backend/migrations/m191112_005702_create_table_comment.php diff --git a/console/migrations/m191112_010421_create_table_order.php b/backend/migrations/m191112_010421_create_table_order.php similarity index 100% rename from console/migrations/m191112_010421_create_table_order.php rename to backend/migrations/m191112_010421_create_table_order.php diff --git a/console/migrations/m191112_011517_create_table_order_goods.php b/backend/migrations/m191112_011517_create_table_order_goods.php similarity index 100% rename from console/migrations/m191112_011517_create_table_order_goods.php rename to backend/migrations/m191112_011517_create_table_order_goods.php diff --git a/console/migrations/m191112_012449_create_table_taking_site.php b/backend/migrations/m191112_012449_create_table_taking_site.php similarity index 100% rename from console/migrations/m191112_012449_create_table_taking_site.php rename to backend/migrations/m191112_012449_create_table_taking_site.php diff --git a/console/migrations/m191112_014508_create_table_express_template.php b/backend/migrations/m191112_014508_create_table_express_template.php similarity index 100% rename from console/migrations/m191112_014508_create_table_express_template.php rename to backend/migrations/m191112_014508_create_table_express_template.php diff --git a/console/migrations/m191112_015939_create_table_delivery.php b/backend/migrations/m191112_015939_create_table_delivery.php similarity index 100% rename from console/migrations/m191112_015939_create_table_delivery.php rename to backend/migrations/m191112_015939_create_table_delivery.php diff --git a/console/migrations/m191112_020830_create_table_payment_log.php b/backend/migrations/m191112_020830_create_table_payment_log.php similarity index 100% rename from console/migrations/m191112_020830_create_table_payment_log.php rename to backend/migrations/m191112_020830_create_table_payment_log.php diff --git a/console/migrations/m191112_021528_create_table_refund_log.php b/backend/migrations/m191112_021528_create_table_refund_log.php similarity index 100% rename from console/migrations/m191112_021528_create_table_refund_log.php rename to backend/migrations/m191112_021528_create_table_refund_log.php diff --git a/console/migrations/m191112_022131_create_table_file.php b/backend/migrations/m191112_022131_create_table_file.php similarity index 100% rename from console/migrations/m191112_022131_create_table_file.php rename to backend/migrations/m191112_022131_create_table_file.php diff --git a/console/migrations/m191112_022532_create_table_tem_file.php b/backend/migrations/m191112_022532_create_table_tem_file.php similarity index 100% rename from console/migrations/m191112_022532_create_table_tem_file.php rename to backend/migrations/m191112_022532_create_table_tem_file.php diff --git a/console/migrations/m191130_071623_add_column_weight_in_table_ats_order_goods.php b/backend/migrations/m191130_071623_add_column_weight_in_table_ats_order_goods.php similarity index 100% rename from console/migrations/m191130_071623_add_column_weight_in_table_ats_order_goods.php rename to backend/migrations/m191130_071623_add_column_weight_in_table_ats_order_goods.php diff --git a/console/migrations/m191203_022720_add_column_sku_id_in_table_ats_order_goods.php b/backend/migrations/m191203_022720_add_column_sku_id_in_table_ats_order_goods.php similarity index 100% rename from console/migrations/m191203_022720_add_column_sku_id_in_table_ats_order_goods.php rename to backend/migrations/m191203_022720_add_column_sku_id_in_table_ats_order_goods.php diff --git a/console/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php b/backend/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php similarity index 100% rename from console/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php rename to backend/migrations/m191203_030210_update_columns_province_city_area_in_table_ats_taking_site.php diff --git a/console/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php b/backend/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php similarity index 100% rename from console/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php rename to backend/migrations/m191203_030911_update_column_address_in_table_ats_taking_site.php diff --git a/console/migrations/m191203_031446_drop_column_is_default_in_table_ats_taking_site.php b/backend/migrations/m191203_031446_drop_column_is_default_in_table_ats_taking_site.php similarity index 100% rename from console/migrations/m191203_031446_drop_column_is_default_in_table_ats_taking_site.php rename to backend/migrations/m191203_031446_drop_column_is_default_in_table_ats_taking_site.php diff --git a/console/migrations/m191203_034004_add_column_address_in_table_ats_order.php b/backend/migrations/m191203_034004_add_column_address_in_table_ats_order.php similarity index 100% rename from console/migrations/m191203_034004_add_column_address_in_table_ats_order.php rename to backend/migrations/m191203_034004_add_column_address_in_table_ats_order.php diff --git a/console/migrations/m191203_112307_add_data_to_table_city_and_area.php b/backend/migrations/m191203_112307_add_data_to_table_city_and_area.php similarity index 100% rename from console/migrations/m191203_112307_add_data_to_table_city_and_area.php rename to backend/migrations/m191203_112307_add_data_to_table_city_and_area.php diff --git a/console/migrations/m191203_114421_update_column_discount_description_in_table_order.php b/backend/migrations/m191203_114421_update_column_discount_description_in_table_order.php similarity index 100% rename from console/migrations/m191203_114421_update_column_discount_description_in_table_order.php rename to backend/migrations/m191203_114421_update_column_discount_description_in_table_order.php diff --git a/console/migrations/m191204_004849_update_column_calculation_in_table_ats_express_template.php b/backend/migrations/m191204_004849_update_column_calculation_in_table_ats_express_template.php similarity index 100% rename from console/migrations/m191204_004849_update_column_calculation_in_table_ats_express_template.php rename to backend/migrations/m191204_004849_update_column_calculation_in_table_ats_express_template.php diff --git a/console/migrations/m191204_012240_update_columns_basic_price_basic_amount_in_table_ats_express_template.php b/backend/migrations/m191204_012240_update_columns_basic_price_basic_amount_in_table_ats_express_template.php similarity index 100% rename from console/migrations/m191204_012240_update_columns_basic_price_basic_amount_in_table_ats_express_template.php rename to backend/migrations/m191204_012240_update_columns_basic_price_basic_amount_in_table_ats_express_template.php diff --git a/console/migrations/schema-mysql.sql b/backend/migrations/schema-mysql.sql similarity index 100% rename from console/migrations/schema-mysql.sql rename to backend/migrations/schema-mysql.sql diff --git a/console/migrations/sql/add_category.sql b/backend/migrations/sql/add_category.sql similarity index 100% rename from console/migrations/sql/add_category.sql rename to backend/migrations/sql/add_category.sql diff --git a/console/migrations/sql/add_data.sql b/backend/migrations/sql/add_data.sql similarity index 100% rename from console/migrations/sql/add_data.sql rename to backend/migrations/sql/add_data.sql diff --git a/console/migrations/sql/area.sql b/backend/migrations/sql/area.sql similarity index 100% rename from console/migrations/sql/area.sql rename to backend/migrations/sql/area.sql diff --git a/console/migrations/sql/city.sql b/backend/migrations/sql/city.sql similarity index 100% rename from console/migrations/sql/city.sql rename to backend/migrations/sql/city.sql diff --git a/console/migrations/sql/province.sql b/backend/migrations/sql/province.sql similarity index 100% rename from console/migrations/sql/province.sql rename to backend/migrations/sql/province.sql diff --git a/common/models/Cat.php b/backend/models/Cat.php similarity index 97% rename from common/models/Cat.php rename to backend/models/Cat.php index 008a51b..4622d39 100644 --- a/common/models/Cat.php +++ b/backend/models/Cat.php @@ -1,6 +1,6 @@ 255], [['basic_amount', 'basic_price', 'extra_price', 'extra_amount'], 'checkNegative'], ]; diff --git a/common/models/ars/File.php b/backend/models/ars/File.php similarity index 98% rename from common/models/ars/File.php rename to backend/models/ars/File.php index e75e597..9725e8c 100644 --- a/common/models/ars/File.php +++ b/backend/models/ars/File.php @@ -1,6 +1,6 @@ @@ -19,3 +19,95 @@ use common\models\ars\ExpressTemplate; field($model, 'extra_amount')->textInput() ?> field($model, 'extra_price')->textInput() ?> + +registerJs($js) + +?> \ No newline at end of file diff --git a/backend/views/express-template/_search.php b/backend/views/express-template/_search.php index 803dbd1..3e1b1b7 100644 --- a/backend/views/express-template/_search.php +++ b/backend/views/express-template/_search.php @@ -5,7 +5,7 @@ use yii\widgets\ActiveForm; use \blobt\widgets\DateRangePicker; /* @var $this yii\web\View */ -/* @var $model common\models\searchs\ExpressTemplateSearch */ +/* @var $model backend\models\searchs\ExpressTemplateSearch */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/backend/views/express-template/area.php b/backend/views/express-template/area.php index 6b48b14..006c17e 100644 --- a/backend/views/express-template/area.php +++ b/backend/views/express-template/area.php @@ -206,7 +206,7 @@ xj\babel\BrowserAsset::register($this); {{province.province}}
diff --git a/backend/views/express-template/create.php b/backend/views/express-template/create.php index df1198e..306e96a 100644 --- a/backend/views/express-template/create.php +++ b/backend/views/express-template/create.php @@ -5,7 +5,7 @@ use yii\bootstrap4\ActiveForm; use kartik\tabs\TabsX; /* @var $this yii\web\View */ -/* @var $model common\models\ars\ExpressTemplate */ +/* @var $model backend\models\ars\ExpressTemplate */ $this->title = '创建运费模板'; $this->params['breadcrumbs'][] = ['label' => 'Express Templates', 'url' => ['index']]; diff --git a/backend/views/express-template/index.php b/backend/views/express-template/index.php index 0e83051..844a810 100644 --- a/backend/views/express-template/index.php +++ b/backend/views/express-template/index.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use iron\grid\GridView; /* @var $this yii\web\View */ -/* @var $searchModel common\models\searchs\ExpressTemplateSearch */ +/* @var $searchModel backend\models\searchs\ExpressTemplateSearch */ /* @var $dataProvider yii\data\ActiveDataProvider */ $this->title = '运费模板'; diff --git a/backend/views/express-template/update.php b/backend/views/express-template/update.php index 3e5d1c8..c8d8046 100644 --- a/backend/views/express-template/update.php +++ b/backend/views/express-template/update.php @@ -5,7 +5,7 @@ use yii\bootstrap4\ActiveForm; use kartik\tabs\TabsX; /* @var $this yii\web\View */ -/* @var $model common\models\ars\ExpressTemplate */ +/* @var $model backend\models\ars\ExpressTemplate */ $this->title = '编辑运费模板: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => 'Express Templates', 'url' => ['index']]; diff --git a/backend/views/express-template/view.php b/backend/views/express-template/view.php index 2c314b4..f8f544e 100644 --- a/backend/views/express-template/view.php +++ b/backend/views/express-template/view.php @@ -2,10 +2,10 @@ use yii\helpers\Html; use yii\widgets\DetailView; -use common\models\ars\ExpressTemplate; +use backend\models\ars\ExpressTemplate; /* @var $this yii\web\View */ -/* @var $model common\models\ars\ExpressTemplate */ +/* @var $model backend\models\ars\ExpressTemplate */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => 'Express Templates', 'url' => ['index']]; @@ -39,7 +39,7 @@ $this->params['breadcrumbs'][] = $this->title; 'value' => function ($model) { $array = explode(',', $model->city); $cities = []; - foreach (\common\models\ars\City::find()->andWhere(['in', 'city_id', $array])->all() as $city) { + foreach (\backend\models\ars\City::find()->andWhere(['in', 'city_id', $array])->all() as $city) { $cities[] = $city->name; } return implode(' // ', $cities); diff --git a/backend/views/order/_form.php b/backend/views/order/_form.php index 14352e4..881787b 100755 --- a/backend/views/order/_form.php +++ b/backend/views/order/_form.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; /* @var $this yii\web\View */ -/* @var $model common\models\ars\Order */ +/* @var $model backend\models\ars\Order */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/backend/views/order/_search.php b/backend/views/order/_search.php index 70abd34..c5bfab4 100755 --- a/backend/views/order/_search.php +++ b/backend/views/order/_search.php @@ -5,7 +5,7 @@ use yii\widgets\ActiveForm; use \blobt\widgets\DateRangePicker; /* @var $this yii\web\View */ -/* @var $model common\models\searchs\OrderSearch */ +/* @var $model backend\models\searchs\OrderSearch */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/backend/views/order/create.php b/backend/views/order/create.php index f80b79a..bcc8654 100755 --- a/backend/views/order/create.php +++ b/backend/views/order/create.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model common\models\ars\Order */ +/* @var $model backend\models\ars\Order */ $this->title = '创建 Order'; $this->params['breadcrumbs'][] = ['label' => 'Orders', 'url' => ['index']]; diff --git a/backend/views/order/index.php b/backend/views/order/index.php index 0446af5..618d3d1 100755 --- a/backend/views/order/index.php +++ b/backend/views/order/index.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use iron\grid\GridView; /* @var $this yii\web\View */ -/* @var $searchModel common\models\searchs\OrderSearch */ +/* @var $searchModel backend\models\searchs\OrderSearch */ /* @var $dataProvider yii\data\ActiveDataProvider */ $this->title = 'Orders'; diff --git a/backend/views/order/update.php b/backend/views/order/update.php index a69012c..47f7f5f 100755 --- a/backend/views/order/update.php +++ b/backend/views/order/update.php @@ -3,7 +3,7 @@ use yii\helpers\Html; /* @var $this yii\web\View */ -/* @var $model common\models\ars\Order */ +/* @var $model backend\models\ars\Order */ $this->title = '编辑 Order: ' . $model->id; $this->params['breadcrumbs'][] = ['label' => 'Orders', 'url' => ['index']]; diff --git a/backend/views/order/view.php b/backend/views/order/view.php index 7cd4293..04e42f5 100755 --- a/backend/views/order/view.php +++ b/backend/views/order/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model common\models\ars\Order */ +/* @var $model backend\models\ars\Order */ $this->title = $model->id; $this->params['breadcrumbs'][] = ['label' => 'Orders', 'url' => ['index']]; diff --git a/backend/views/site/login.php b/backend/views/site/login.php index 461327c..7c251d1 100755 --- a/backend/views/site/login.php +++ b/backend/views/site/login.php @@ -1,7 +1,7 @@ params['subtitle'] = '这是一个小小的测试'; $this->params['breadcrumbs'][] = $this->title; /* @var $this yii\web\View */ -/* @var $model common\models\CategorySearch */ +/* @var $model backend\models\CategorySearch */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/backend/views/taking-site/_form.php b/backend/views/taking-site/_form.php index 814c8d5..bedc12c 100644 --- a/backend/views/taking-site/_form.php +++ b/backend/views/taking-site/_form.php @@ -4,12 +4,12 @@ use yii\bootstrap4\Html; use yii\bootstrap4\ActiveForm; use blobt\widgets\Icheck; use kartik\depdrop\DepDrop; -use common\models\ars\Province; +use backend\models\ars\Province; use yii\helpers\ArrayHelper; use yii\helpers\Url; /* @var $this yii\web\View */ -/* @var $model common\models\ars\TakingSite */ +/* @var $model backend\models\ars\TakingSite */ /* @var $form yii\widgets\ActiveForm */ $provinces = Province::find()->select('province_id as id,name')->asArray()->all(); $data = ArrayHelper::map($provinces, 'id', 'name'); diff --git a/backend/views/taking-site/_search.php b/backend/views/taking-site/_search.php index 4fff175..6d1d771 100644 --- a/backend/views/taking-site/_search.php +++ b/backend/views/taking-site/_search.php @@ -5,7 +5,7 @@ use yii\widgets\ActiveForm; use \blobt\widgets\DateRangePicker; /* @var $this yii\web\View */ -/* @var $model common\models\searchs\TakingSiteSearch */ +/* @var $model backend\models\searchs\TakingSiteSearch */ /* @var $form yii\widgets\ActiveForm */ ?> diff --git a/backend/views/taking-site/create.php b/backend/views/taking-site/create.php index e29a8c0..94319fc 100644 --- a/backend/views/taking-site/create.php +++ b/backend/views/taking-site/create.php @@ -3,7 +3,7 @@ use yii\bootstrap4\Html; /* @var $this yii\web\View */ -/* @var $model common\models\ars\TakingSite */ +/* @var $model backend\models\ars\TakingSite */ $this->title = '创建 Taking Site'; $this->params['breadcrumbs'][] = ['label' => 'Taking Sites', 'url' => ['index']]; diff --git a/backend/views/taking-site/index.php b/backend/views/taking-site/index.php index 44af872..5b9ae51 100644 --- a/backend/views/taking-site/index.php +++ b/backend/views/taking-site/index.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use iron\grid\GridView; /* @var $this yii\web\View */ -/* @var $searchModel common\models\searchs\TakingSiteSearch */ +/* @var $searchModel backend\models\searchs\TakingSiteSearch */ /* @var $dataProvider yii\data\ActiveDataProvider */ $this->title = '上门自提'; diff --git a/backend/views/taking-site/update.php b/backend/views/taking-site/update.php index 7b0136a..3484212 100644 --- a/backend/views/taking-site/update.php +++ b/backend/views/taking-site/update.php @@ -1,11 +1,11 @@ title = '编辑: ' . $model->name; $this->params['breadcrumbs'][] = ['label' => 'Taking Sites', 'url' => ['index']]; diff --git a/backend/views/taking-site/view.php b/backend/views/taking-site/view.php index dd5add5..acc33b9 100644 --- a/backend/views/taking-site/view.php +++ b/backend/views/taking-site/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\widgets\DetailView; /* @var $this yii\web\View */ -/* @var $model common\models\ars\TakingSite */ +/* @var $model backend\models\ars\TakingSite */ $this->title = $model->name; $this->params['breadcrumbs'][] = ['label' => 'Taking Sites', 'url' => ['index']];