From be73c6a7d6ab1385ddf50bee6d9fb35046aa55a0 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 17 Sep 2020 18:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopTruckRegion.php       | 45 -------------------
 app/data/controller/ShopTruckTemplate.php     | 14 ++++++
 .../form_region.html}                         | 11 ++---
 3 files changed, 20 insertions(+), 50 deletions(-)
 delete mode 100644 app/data/controller/ShopTruckRegion.php
 rename app/data/view/{shop_truck_region/index.html => shop_truck_template/form_region.html} (85%)

diff --git a/app/data/controller/ShopTruckRegion.php b/app/data/controller/ShopTruckRegion.php
deleted file mode 100644
index 7847ad2c6..000000000
--- a/app/data/controller/ShopTruckRegion.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace app\data\controller;
-
-use think\admin\Controller;
-use think\admin\extend\DataExtend;
-
-/**
- * 快递配送区域管理
- * Class ShopTruckRegion
- * @package app\data\controller
- */
-class ShopTruckRegion extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    private $table = 'ShopTruckRegion';
-
-    /**
-     * 配送区域管理
-     * @auth true
-     * @menu true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function index()
-    {
-        $this->title = '配送区域管理';
-        $query = $this->_query($this->table);
-        $query->field('id,pid,name')->page(false);
-    }
-
-    /**
-     * 数据列表处理
-     * @param $data
-     */
-    protected function _page_filter(&$data)
-    {
-        $data = DataExtend::arr2tree($data);
-    }
-
-}
\ No newline at end of file
diff --git a/app/data/controller/ShopTruckTemplate.php b/app/data/controller/ShopTruckTemplate.php
index a360aca69..c5474cb42 100644
--- a/app/data/controller/ShopTruckTemplate.php
+++ b/app/data/controller/ShopTruckTemplate.php
@@ -35,6 +35,20 @@ class ShopTruckTemplate extends Controller
         $query->where(['deleted' => 0])->order('sort desc,id desc')->page();
     }
 
+    /**
+     * 配送区域管理
+     * @auth true
+     * @menu true
+     */
+    public function region()
+    {
+        if ($this->request->isGet()) {
+            $this->title = '配送区域管理';
+            $this->citys = TruckService::instance()->region(3);
+            $this->fetch('form_region');
+        }
+    }
+
     /**
      * 添加配送邮费模板
      * @auth true
diff --git a/app/data/view/shop_truck_region/index.html b/app/data/view/shop_truck_template/form_region.html
similarity index 85%
rename from app/data/view/shop_truck_region/index.html
rename to app/data/view/shop_truck_template/form_region.html
index f118a7c72..5b136d17a 100644
--- a/app/data/view/shop_truck_region/index.html
+++ b/app/data/view/shop_truck_template/form_region.html
@@ -14,7 +14,7 @@
         <div class="layui-card">
             <div class="layui-card-header"><b class="color-green">{{province.name}}</b> 可选区域</div>
             <div class="layui-card-body">
-                <a ng-repeat="x in province.sub" ng-bind="x.name" ng-click="SetActiveCity(x)"
+                <a ng-repeat="x in province.subs" ng-bind="x.name" ng-click="SetActiveCity(x)"
                    class="layui-btn layui-btn-radius layui-btn-normal margin-left-0 margin-right-5 margin-bottom-5"
                 ></a>
             </div>
@@ -22,7 +22,7 @@
         <div class="layui-card">
             <div class="layui-card-header"><b class="color-green">{{city.name}}</b> 可选区域</div>
             <div class="layui-card-body">
-                <a ng-repeat="x in city.sub" ng-bind="x.name"
+                <a ng-repeat="x in city.subs" ng-bind="x.name"
                    class="layui-btn layui-btn-radius layui-btn-normal margin-left-0 margin-right-5 margin-bottom-5"
                 ></a>
             </div>
@@ -35,20 +35,21 @@
 </div>
 
 <label class="layui-hide">
-    <textarea class="layui-textarea" id="RegionData">{$list|json_encode|raw}</textarea>
+    <textarea class="layui-textarea" id="RegionData">{$citys|json_encode|raw}</textarea>
 </label>
 <script>
     require(['angular'], function () {
         var app = angular.module("TruckForm", []).run(callback);
         var _data = document.getElementById('RegionData').value || '[]';
+        console.log(_data)
         angular.bootstrap(document.getElementById(app.name), [app.name]);
 
         function callback($rootScope) {
             $rootScope.items = angular.fromJson(_data);
             $rootScope.province = $rootScope.items[0];
-            $rootScope.city = $rootScope.province.sub[0];
+            $rootScope.city = $rootScope.province.subs[0];
             $rootScope.SetActiveProvince = function (province) {
-                $rootScope.city = province.sub[0];
+                $rootScope.city = province.subs[0];
                 $rootScope.province = province;
             };
             $rootScope.SetActiveCity = function (city) {