diff --git a/backend/controllers/TakingSiteController.php b/backend/controllers/TakingSiteController.php
new file mode 100644
index 0000000..01ef5d7
--- /dev/null
+++ b/backend/controllers/TakingSiteController.php
@@ -0,0 +1,149 @@
+ [
+ 'class' => VerbFilter::className(),
+ 'actions' => [
+ 'delete' => ['POST'],
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * Lists all TakingSite models.
+ * @return mixed
+ */
+ public function actionIndex()
+ {
+ $searchModel = new TakingSiteSearch();
+ $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+ return $this->render('index', [
+ 'searchModel' => $searchModel,
+ 'dataProvider' => $dataProvider,
+ 'columns' => $searchModel->columns()
+ ]);
+ }
+
+ /**
+ * Displays a single TakingSite model.
+ * @param integer $id
+ * @return mixed
+ * @throws NotFoundHttpException if the model cannot be found
+ */
+ public function actionView($id)
+ {
+ return $this->render('view', [
+ 'model' => $this->findModel($id),
+ ]);
+ }
+
+ /**
+ * Creates a new TakingSite model.
+ * If creation is successful, the browser will be redirected to the 'view' page.
+ * @return mixed
+ */
+ public function actionCreate()
+ {
+ $model = new TakingSite();
+
+ if ($model->load(Yii::$app->request->post()) && $model->save()) {
+ return $this->redirect('index');
+ }
+
+ return $this->render('create', [
+ 'model' => $model,
+ ]);
+ }
+
+ /**
+ * Updates an existing TakingSite model.
+ * If update is successful, the browser will be redirected to the 'view' page.
+ * @param integer $id
+ * @return mixed
+ * @throws NotFoundHttpException if the model cannot be found
+ */
+ public function actionUpdate($id)
+ {
+ $model = $this->findModel($id);
+
+ if ($model->load(Yii::$app->request->post()) && $model->save()) {
+ return $this->redirect('index');
+ }
+
+ return $this->render('update', [
+ 'model' => $model,
+ ]);
+ }
+
+ /**
+ * Deletes an existing TakingSite model.
+ * If deletion is successful, the browser will be redirected to the 'index' page.
+ * @param integer $id
+ * @return mixed
+ * @throws NotFoundHttpException if the model cannot be found
+ */
+ public function actionDelete($id)
+ {
+ $this->findModel($id)->delete();
+
+ return $this->redirect(['index']);
+ }
+
+ /**
+ * Finds the TakingSite model based on its primary key value.
+ * If the model is not found, a 404 HTTP exception will be thrown.
+ * @param integer $id
+ * @return TakingSite the loaded model
+ * @throws NotFoundHttpException if the model cannot be found
+ */
+ protected function findModel($id)
+ {
+ if (($model = TakingSite::findOne($id)) !== null) {
+ return $model;
+ }
+
+ throw new NotFoundHttpException('The requested page does not exist.');
+ }
+ /**
+ * @author iron
+ * 文件导出
+ */
+ public function actionExport()
+ {
+ $searchModel = new TakingSiteSearch();
+ $params = Yii::$app->request->queryParams;
+ if ($params['page-type'] == 'all') {
+ $dataProvider = $searchModel->allData($params);
+ } else {
+ $dataProvider = $searchModel->search($params);
+ }
+ \iron\widget\Excel::export([
+ 'models' => $dataProvider->getModels(),
+ 'format' => 'Xlsx',
+ 'asAttachment' => true,
+ 'fileName' =>'Taking Sites'. "-" .date('Y-m-d H/i/s', time()),
+ 'columns' => $searchModel->columns()
+ ]);
+ }
+}
diff --git a/backend/views/layouts/sidebar.php b/backend/views/layouts/sidebar.php
index 93ec000..d2215e9 100755
--- a/backend/views/layouts/sidebar.php
+++ b/backend/views/layouts/sidebar.php
@@ -20,7 +20,7 @@ use iron\widgets\Menu;
['label' => '基础配置', 'url' => ['config/index', 'tag' => 'new']],
]
],
- ['label' => '商品管理', 'url' => '#', 'icon' => 'far fa-archive', 'items' => [
+ ['label' => '商品管理', 'url' => '#', 'icon' => 'far fa-box', 'items' => [
['label' => '后台商品分类', 'url' => ['/antgoods/category/index']],
['label' => '规格管理', 'url' => ['/antgoods/attribute/index']],
['label' => '前端商品分类', 'url' => ['/antgoods/shop-category/index']],
@@ -31,6 +31,10 @@ use iron\widgets\Menu;
],
['label' => '订单管理', 'url' => '#', 'icon' => 'far fa-list-alt', 'items' => [
['label' => '订单列表', 'url' => ['/order/index', 'tag' => 'new']],
+ ],
+ ],
+ ['label' => '配送服务', 'url' => '#', 'icon' => 'far fa-shipping-fast', 'items' => [
+ ['label' => '上门自提', 'url' => ['/taking-site/index']],
]
],
diff --git a/backend/views/taking-site/_form.php b/backend/views/taking-site/_form.php
new file mode 100644
index 0000000..c115e02
--- /dev/null
+++ b/backend/views/taking-site/_form.php
@@ -0,0 +1,34 @@
+
+
+
diff --git a/backend/views/taking-site/_search.php b/backend/views/taking-site/_search.php
new file mode 100644
index 0000000..4fff175
--- /dev/null
+++ b/backend/views/taking-site/_search.php
@@ -0,0 +1,49 @@
+
+
+ ['index'],
+ 'method' => 'get',
+ 'validateOnType' => true,
+ ]);
+?>
+
+
+ = $form->field($model, 'id', [
+ "template" => "{input}{error}",
+ "inputOptions" => [
+ "placeholder" => "检索ID",
+ "class" => "form-control",
+ ],
+ "errorOptions" => [
+ "class" => "error-tips"
+ ]
+ ])
+ ?>
+
+
+ = $form->field($model, "created_at_range", [
+ "template" => "{input}{error}",
+ "inputOptions" => [
+ "placeholder" => "创建时间",
+ ],
+ "errorOptions" => [
+ "class" => "error-tips"
+ ]
+ ])->widget(DateRangePicker::className());
+ ?>
+
+
+ = Html::submitButton('', ['class' => 'btn btn-default']) ?>
+ = Html::resetButton('', ['class' => 'btn btn-default']) ?>
+
+
+
\ No newline at end of file
diff --git a/backend/views/taking-site/create.php b/backend/views/taking-site/create.php
new file mode 100644
index 0000000..e3725b6
--- /dev/null
+++ b/backend/views/taking-site/create.php
@@ -0,0 +1,18 @@
+title = '创建 Taking Site';
+$this->params['breadcrumbs'][] = ['label' => 'Taking Sites', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+
+ = $this->render('_form', [
+ 'model' => $model,
+ ]) ?>
+
+
diff --git a/backend/views/taking-site/index.php b/backend/views/taking-site/index.php
new file mode 100644
index 0000000..5efb74c
--- /dev/null
+++ b/backend/views/taking-site/index.php
@@ -0,0 +1,28 @@
+title = 'Taking Sites';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+
+ = GridView::widget([
+ 'dataProvider' => $dataProvider,
+ 'filter' => $this->render("_search", ['model' => $searchModel]),
+ 'batch' => [
+ [
+ "label" => "删除",
+ "url" => "taking-site/deletes"
+ ],
+ ],
+ 'columns' => $columns
+ ]);
+ ?>
+
+
\ No newline at end of file
diff --git a/backend/views/taking-site/update.php b/backend/views/taking-site/update.php
new file mode 100644
index 0000000..2940c34
--- /dev/null
+++ b/backend/views/taking-site/update.php
@@ -0,0 +1,19 @@
+title = '编辑 Taking Site: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => 'Taking Sites', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = 'Update ';
+?>
+
+
+ = $this->render('_form', [
+ 'model' => $model,
+ ]) ?>
+
+
diff --git a/backend/views/taking-site/view.php b/backend/views/taking-site/view.php
new file mode 100644
index 0000000..576709a
--- /dev/null
+++ b/backend/views/taking-site/view.php
@@ -0,0 +1,35 @@
+title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => 'Taking Sites', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+\yii\web\YiiAsset::register($this);
+?>
+
+
+
+ = Html::a('返回列表', ['index'], ['class' => 'btn btn-success']) ?>
+
+
+ = DetailView::widget([
+ 'model' => $model,
+ 'attributes' => [
+ 'id',
+ 'name',
+ 'province',
+ 'city',
+ 'area',
+ 'address:ntext',
+ 'is_default',
+ 'updated_at',
+ 'created_at',
+ ],
+ ]) ?>
+
+
diff --git a/common/models/searchs/TakingSiteSearch.php b/common/models/searchs/TakingSiteSearch.php
new file mode 100644
index 0000000..b41646f
--- /dev/null
+++ b/common/models/searchs/TakingSiteSearch.php
@@ -0,0 +1,149 @@
+ 'blobt\grid\CheckboxColumn',
+ 'width' => '2%',
+ 'align' => 'center'
+ ],
+ 'id',
+ 'name',
+ 'province',
+ 'city',
+ 'area',
+ //'address',
+ //'is_default',
+ //'updated_at',
+ //'created_at',
+ [
+ 'class' => 'iron\grid\ActionColumn',
+ 'align' => 'center',
+ ],
+ ];
+ }
+ /**
+ * @param $params
+ * @return ActiveDataProvider
+ * 不分页的所有数据
+ */
+ public function allData($params)
+ {
+ $query = TakingSite::find();
+ $dataProvider = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => false,
+ 'sort' => false
+ ]);
+ $this->load($params);
+ return $this->filter($query, $dataProvider);
+ }
+
+ /**
+ * Creates data provider instance with search query applied
+ *
+ * @param array $params
+ *
+ * @return ActiveDataProvider
+ */
+ public function search($params)
+ {
+ $query = TakingSite::find();
+
+ // add conditions that should always apply here
+
+ $dataProvider = new ActiveDataProvider([
+ 'query' => $query,
+ 'pagination' => [
+ 'pageSizeLimit' => [1, 200]
+ ],
+ 'sort' => [
+ 'defaultOrder' => [
+ 'id' => SORT_DESC,
+ ]
+ ],
+ ]);
+
+ $this->load($params);
+ return $this->filter($query, $dataProvider);
+ }
+ /**
+ * @param $query
+ * @param $dataProvider
+ * @return ActiveDataProvider
+ * 条件筛选
+ */
+ private function filter($query, $dataProvider){
+ if (!$this->validate()) {
+ // uncomment the following line if you do not want to return any records when validation fails
+ // $query->where('0=1');
+ return $dataProvider;
+ }
+
+ // grid filtering conditions
+ $query->andFilterWhere([
+ 'id' => $this->id,
+ 'is_default' => $this->is_default,
+ 'updated_at' => $this->updated_at,
+ 'created_at' => $this->created_at,
+ ]);
+
+ $query->andFilterWhere(['like', 'name', $this->name])
+ ->andFilterWhere(['like', 'province', $this->province])
+ ->andFilterWhere(['like', 'city', $this->city])
+ ->andFilterWhere(['like', 'area', $this->area])
+ ->andFilterWhere(['like', 'address', $this->address]);
+ if ($this->created_at_range) {
+ $arr = explode(' ~ ', $this->created_at_range);
+ $start = strtotime($arr[0]);
+ $end = strtotime($arr[1]) + 3600 * 24;
+ $query->andFilterWhere(['between', 'created_at', $start, $end]);
+ }
+ return $dataProvider;
+ }
+}