From 2acfda87b0606112e92be64cfb93223cd87b17c1 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 15:29:25 +0800
Subject: [PATCH 01/21] =?UTF-8?q?=E8=8E=B7=E5=8F=96=20=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E4=B8=8B=20=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=20=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=BA=97=E9=93=BA=E4=B8=8B=E5=95=86=E5=93=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/GoodsController.php         |  6 ++++++
 app/Controller/v3/StoreController.php         | 17 +++++++++++++++
 .../v3/Implementations/GoodsService.php       | 21 +++++++++++++++++++
 .../v3/Interfaces/GoodsServiceInterface.php   |  2 ++
 config/routes.php                             |  2 ++
 5 files changed, 48 insertions(+)

diff --git a/app/Controller/v3/GoodsController.php b/app/Controller/v3/GoodsController.php
index 7846c01..29a37d3 100644
--- a/app/Controller/v3/GoodsController.php
+++ b/app/Controller/v3/GoodsController.php
@@ -77,4 +77,10 @@ class GoodsController extends BaseController
         }
         return $this->success($res);
     }
+
+    public function update()
+    {
+        $res = $this->goodsService->update($this->request->all());
+        return $this->success($res);
+    }
 }
\ No newline at end of file
diff --git a/app/Controller/v3/StoreController.php b/app/Controller/v3/StoreController.php
index 2afc46e..164dd98 100644
--- a/app/Controller/v3/StoreController.php
+++ b/app/Controller/v3/StoreController.php
@@ -6,6 +6,7 @@ use App\Controller\BaseController;
 use App\Request\v3\StoreIndexRequest;
 use App\Service\v3\Interfaces\CategoryServiceInterface;
 use App\Service\v3\Interfaces\CollectStoreServiceInterface;
+use App\Service\v3\Interfaces\GoodsServiceInterface;
 use App\Service\v3\Interfaces\StoreServiceInterface;
 use Hyperf\Di\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface;
@@ -38,6 +39,12 @@ class StoreController extends BaseController
      */
     protected $businessHoursService;
 
+    /**
+     * @Inject
+     * @var GoodsServiceInterface
+     */
+    protected $goodsService;
+
     /**
      * 商户详情页
      * 1、商户id用来查询的，还要有user_id
@@ -82,4 +89,14 @@ class StoreController extends BaseController
         $res = $this->businessHoursService->do($storeId,$isRest,$time1,$time2,$time3,$time4);
         return $this->success($res);
     }
+
+    public function getGoodsByType()
+    {
+        $storeId = $this->request->input('store_id');
+        $typeId = $this->request->input('type_id','');
+        $page = $this->request->input('page',1);
+        $pagesize = $this->request->input('pagesize',10);
+        $goods = $this->goodsService->getByType($storeId,$typeId,$page,$pagesize);
+        return $this->success($goods);
+    }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Implementations/GoodsService.php b/app/Service/v3/Implementations/GoodsService.php
index 6740d92..4933d21 100644
--- a/app/Service/v3/Implementations/GoodsService.php
+++ b/app/Service/v3/Implementations/GoodsService.php
@@ -70,4 +70,25 @@ class GoodsService implements GoodsServiceInterface
         $res = Goods::query()->with('store')->where('id',$goodsId)->first();
         return $res;
     }
+
+    public function getByType($storeId,$typeId, $page=1, $pagesize=10)
+    {
+        $builder = Goods::query()->where(['store_id' => $storeId,'category_id' => $typeId]);
+
+        $paginate = $builder->orderByDesc('on_sale')->orderByDesc('created_at')->paginate($pagesize);
+        $goods = $paginate->toArray();
+        return ['has_more_pages' => $paginate->hasMorePages(), 'goods' => $goods['data']];
+    }
+
+    public function update($params)
+    {
+        $goods = Goods::find($params['id']);
+        if (empty($goods)) {
+            return ErrorCode::GOODS_NOT_EXISTS;
+        }
+        foreach ($params as $k => $v){
+            $goods->$k = $v;
+        }
+        return $goods->save();
+    }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Interfaces/GoodsServiceInterface.php b/app/Service/v3/Interfaces/GoodsServiceInterface.php
index 53c4b43..32c0251 100644
--- a/app/Service/v3/Interfaces/GoodsServiceInterface.php
+++ b/app/Service/v3/Interfaces/GoodsServiceInterface.php
@@ -10,4 +10,6 @@ interface GoodsServiceInterface
     public function check(Goods $goods,$num = 1);
     public function undo();
     public function getBanner($goodsId);
+    public function getByType($storeId,$typeId, $page=1, $pagesize=10);
+    public function update($params);
 }
\ No newline at end of file
diff --git a/config/routes.php b/config/routes.php
index fa8aa28..c029b54 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -150,6 +150,8 @@ Router::addGroup('/v3/', function () {
     Router::post('device/list', 'App\Controller\v3\DeviceController@list');
     Router::post('device/unbind', 'App\Controller\v3\DeviceController@unbind');
     Router::post('orderOffline/completePage', 'App\Controller\v3\OrderOfflineController@completePage');
+    Router::post('store/getGoodsByType', 'App\Controller\v3\StoreController@getGoodsByType');
+    Router::post('goods/update', 'App\Controller\v3\GoodsController@update');
 },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]);
 
 // 微信支付回调

From e3507c7b2ea0312d0541a1662a28137fe46b989a Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 16:48:49 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/StoreController.php              | 14 ++++++++++++++
 app/Service/v3/Implementations/StoreService.php    |  9 +++++++++
 .../v3/Interfaces/StoreServiceInterface.php        |  1 +
 config/routes.php                                  |  1 +
 4 files changed, 25 insertions(+)

diff --git a/app/Controller/v3/StoreController.php b/app/Controller/v3/StoreController.php
index 164dd98..57d8760 100644
--- a/app/Controller/v3/StoreController.php
+++ b/app/Controller/v3/StoreController.php
@@ -3,6 +3,7 @@
 namespace App\Controller\v3;
 
 use App\Controller\BaseController;
+use App\Model\v3\ServicePersonnel;
 use App\Request\v3\StoreIndexRequest;
 use App\Service\v3\Interfaces\CategoryServiceInterface;
 use App\Service\v3\Interfaces\CollectStoreServiceInterface;
@@ -99,4 +100,17 @@ class StoreController extends BaseController
         $goods = $this->goodsService->getByType($storeId,$typeId,$page,$pagesize);
         return $this->success($goods);
     }
+
+    public function getList()
+    {
+        $userId = $this->request->input('user_id');
+        $page = $this->request->input('page',1);
+        $pagesize = $this->request->input('pagesize',10);
+        $personnel = ServicePersonnel::query()->where('user_id',$userId)->first();
+        if(empty($personnel)){
+            return $this->success(['personnel' => false]);
+        }
+        $res['market'] = $this->storeService->getList($personnel->market_id,$page,$pagesize);
+        return $this->success($res);
+    }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Implementations/StoreService.php b/app/Service/v3/Implementations/StoreService.php
index 8389ae4..16ab639 100644
--- a/app/Service/v3/Implementations/StoreService.php
+++ b/app/Service/v3/Implementations/StoreService.php
@@ -3,6 +3,7 @@
 
 namespace App\Service\v3\Implementations;
 
+use App\Model\v3\Market;
 use App\Model\v3\Store;
 use App\Service\v3\Interfaces\StoreServiceInterface;
 
@@ -52,4 +53,12 @@ class StoreService implements StoreServiceInterface
             ->where('id',$storeId)
             ->first();
     }
+
+    public function getList($marketId, $page=1, $pagesize=10)
+    {
+        return Market::query()->with(['stores' => function($query) use ($pagesize){
+            $stores = $query->paginate($pagesize);
+            return $stores['data'];
+        }])->where('id',$marketId)->get();
+    }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Interfaces/StoreServiceInterface.php b/app/Service/v3/Interfaces/StoreServiceInterface.php
index 376575e..7d355e9 100644
--- a/app/Service/v3/Interfaces/StoreServiceInterface.php
+++ b/app/Service/v3/Interfaces/StoreServiceInterface.php
@@ -8,4 +8,5 @@ interface StoreServiceInterface
     public function check($storeId);
     public function undo();
     public function detail($storeId);
+    public function getList($marketId ,$page=1, $pagesize=10);
 }
\ No newline at end of file
diff --git a/config/routes.php b/config/routes.php
index c029b54..85acf94 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -152,6 +152,7 @@ Router::addGroup('/v3/', function () {
     Router::post('orderOffline/completePage', 'App\Controller\v3\OrderOfflineController@completePage');
     Router::post('store/getGoodsByType', 'App\Controller\v3\StoreController@getGoodsByType');
     Router::post('goods/update', 'App\Controller\v3\GoodsController@update');
+    Router::post('store/getList', 'App\Controller\v3\StoreController@getList');
 },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]);
 
 // 微信支付回调

From 7dcf476f180cd26f28d3e4937b04402d5f498659 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 17:01:30 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/GoodsService.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Service/v3/Implementations/GoodsService.php b/app/Service/v3/Implementations/GoodsService.php
index 4933d21..e50e04f 100644
--- a/app/Service/v3/Implementations/GoodsService.php
+++ b/app/Service/v3/Implementations/GoodsService.php
@@ -87,7 +87,9 @@ class GoodsService implements GoodsServiceInterface
             return ErrorCode::GOODS_NOT_EXISTS;
         }
         foreach ($params as $k => $v){
-            $goods->$k = $v;
+            if(isset($goods->$k)){
+                $goods->$k = $v;
+            }
         }
         return $goods->save();
     }

From c81db8a8c34cad55ccfba666ebcb612314d87d00 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 18:10:11 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/StoreService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Service/v3/Implementations/StoreService.php b/app/Service/v3/Implementations/StoreService.php
index 16ab639..4481db3 100644
--- a/app/Service/v3/Implementations/StoreService.php
+++ b/app/Service/v3/Implementations/StoreService.php
@@ -57,7 +57,7 @@ class StoreService implements StoreServiceInterface
     public function getList($marketId, $page=1, $pagesize=10)
     {
         return Market::query()->with(['stores' => function($query) use ($pagesize){
-            $stores = $query->paginate($pagesize);
+            $stores = $query->paginate(intval($pagesize));
             return $stores['data'];
         }])->where('id',$marketId)->get();
     }

From 33d5db59f022f718b834e939616d61726f80b405 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 18:11:03 +0800
Subject: [PATCH 05/21] envoy

---
 Envoy.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Envoy.blade.php b/Envoy.blade.php
index e7a1442..39d6cc9 100644
--- a/Envoy.blade.php
+++ b/Envoy.blade.php
@@ -10,7 +10,7 @@
 
 @task('git_dev')
     cd /lanzu_api
-    git pull origin phoenix
+    git pull origin develop
     @if($composer == true)
         composer update --lock
     @endif

From ee1eb5439fdd1c457931bf878ed6e60551bcb9d9 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 19:41:57 +0800
Subject: [PATCH 06/21] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/StoreService.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Service/v3/Implementations/StoreService.php b/app/Service/v3/Implementations/StoreService.php
index 4481db3..5f78d80 100644
--- a/app/Service/v3/Implementations/StoreService.php
+++ b/app/Service/v3/Implementations/StoreService.php
@@ -56,9 +56,11 @@ class StoreService implements StoreServiceInterface
 
     public function getList($marketId, $page=1, $pagesize=10)
     {
-        return Market::query()->with(['stores' => function($query) use ($pagesize){
-            $stores = $query->paginate(intval($pagesize));
-            return $stores['data'];
-        }])->where('id',$marketId)->get();
+        $market = Market::query()->find($marketId);
+        $builder = Store::query();
+        $paginate = $builder->where('market_id',$marketId)->paginate($pagesize);
+        $stores = $paginate->toArray();
+        $market->stores = $stores['data'];
+        return ['has_more_pages' => $paginate->hasMorePages(), 'market' => $market];
     }
 }
\ No newline at end of file

From 5510c501406c8174ff7e25c638a3d23c6dfd9135 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 19:55:31 +0800
Subject: [PATCH 07/21] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implementations/UserCenterBlockService.php   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php
index 2572c42..4cfc7f7 100644
--- a/app/Service/v3/Implementations/UserCenterBlockService.php
+++ b/app/Service/v3/Implementations/UserCenterBlockService.php
@@ -47,7 +47,13 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
             'type'  => 'store_user',
             'title' => '商家相关',
             'items' => [
-                ['name' => '商家入口', 'icon' => $img_host . 'user_icons/shop_enter2.png', 'type' => 'page', 'path' => '/pages/shopLogin/shopLogin','command'=>'store_login']
+                ['name' => '商家入口', 'icon' => $img_host . 'user_icons/shop_enter2.png', 'type' => 'page', 'path' => '/pages/shopLogin/shopLogin','command'=>'store_login'],
+                [
+                    'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
+                    'type' => 'webview',
+                    'path' => '/pages/webview/webview?data=%22%7bwebview_url%3a+%27http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%27%7d%22',
+                    'command'=>'sp_login'
+                ]
             ]
         ];
 
@@ -69,7 +75,13 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                     'type'  => 'sp_user',
                     'title' => '服务专员',
                     'items' => [
-                        ['name' => '评价', 'icon' => $img_host . 'user_icons/service2.png', 'type' => 'page', 'path' => '/zh_cjdianc/pages/appraise/index?service_personnel_id='.$item['data']['id'],'command'=>'sp_login']
+                        ['name' => '评价', 'icon' => $img_host . 'user_icons/service2.png', 'type' => 'page', 'path' => '/zh_cjdianc/pages/appraise/index?service_personnel_id='.$item['data']['id'],'command'=>'sp_login'],
+                        [
+                            'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
+                            'type' => 'webview',
+                            'path' => '/pages/webview/webview?data=%22%7bwebview_url%3a+%27http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%27%7d%22',
+                            'command'=>'sp_login'
+                        ]
                     ]
                 ];
             }

From d0d678096322d95a6e7ca7049d23497e653dd1b8 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 20:06:58 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/StoreController.php                     | 2 +-
 app/Service/v3/Implementations/UserCenterBlockService.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controller/v3/StoreController.php b/app/Controller/v3/StoreController.php
index 57d8760..b5c29c1 100644
--- a/app/Controller/v3/StoreController.php
+++ b/app/Controller/v3/StoreController.php
@@ -110,7 +110,7 @@ class StoreController extends BaseController
         if(empty($personnel)){
             return $this->success(['personnel' => false]);
         }
-        $res['market'] = $this->storeService->getList($personnel->market_id,$page,$pagesize);
+        $res = $this->storeService->getList($personnel->market_id,$page,$pagesize);
         return $this->success($res);
     }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php
index 4cfc7f7..8d3cd29 100644
--- a/app/Service/v3/Implementations/UserCenterBlockService.php
+++ b/app/Service/v3/Implementations/UserCenterBlockService.php
@@ -51,7 +51,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                 [
                     'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                     'type' => 'webview',
-                    'path' => '/pages/webview/webview?data=%22%7bwebview_url%3a+%27http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%27%7d%22',
+                    'path' => '/pages/webview/webview?data=%22%7b%22webview_url%22%3a%22http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%22%7d%22',
                     'command'=>'sp_login'
                 ]
             ]
@@ -79,7 +79,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                         [
                             'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                             'type' => 'webview',
-                            'path' => '/pages/webview/webview?data=%22%7bwebview_url%3a+%27http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%27%7d%22',
+                            'path' => '/pages/webview/webview?data=%22%7b%22webview_url%22%3a%22http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%22%7d%22',
                             'command'=>'sp_login'
                         ]
                     ]

From 7a886ba906cbe4d9ce005493b1449c64929da9c1 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 20:14:25 +0800
Subject: [PATCH 09/21] webview

---
 app/Service/v3/Implementations/UserCenterBlockService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php
index 8d3cd29..9b66e32 100644
--- a/app/Service/v3/Implementations/UserCenterBlockService.php
+++ b/app/Service/v3/Implementations/UserCenterBlockService.php
@@ -51,7 +51,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                 [
                     'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                     'type' => 'webview',
-                    'path' => '/pages/webview/webview?data=%22%7b%22webview_url%22%3a%22http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%22%7d%22',
+                    'path' => '/pages/webview/webview?data=%27%7b%22webview_url%22%3a%22http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%22%7d%27',
                     'command'=>'sp_login'
                 ]
             ]
@@ -79,7 +79,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                         [
                             'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                             'type' => 'webview',
-                            'path' => '/pages/webview/webview?data=%22%7b%22webview_url%22%3a%22http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%22%7d%22',
+                            'path' => '/pages/webview/webview?data=%27%7b%22webview_url%22%3a%22http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%22%7d%27',
                             'command'=>'sp_login'
                         ]
                     ]

From 2d54fe236001562f0e4a5a8ad3a5114d6a2756df Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 21 Sep 2020 20:47:56 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=95=86=E5=93=81=20?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=88=86=E9=A1=B5=20=20webview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/StoreController.php                  |  4 +---
 app/Service/v3/Implementations/GoodsService.php        | 10 +++-------
 .../v3/Implementations/UserCenterBlockService.php      |  4 ++--
 app/Service/v3/Interfaces/GoodsServiceInterface.php    |  2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/Controller/v3/StoreController.php b/app/Controller/v3/StoreController.php
index b5c29c1..1d4f463 100644
--- a/app/Controller/v3/StoreController.php
+++ b/app/Controller/v3/StoreController.php
@@ -95,9 +95,7 @@ class StoreController extends BaseController
     {
         $storeId = $this->request->input('store_id');
         $typeId = $this->request->input('type_id','');
-        $page = $this->request->input('page',1);
-        $pagesize = $this->request->input('pagesize',10);
-        $goods = $this->goodsService->getByType($storeId,$typeId,$page,$pagesize);
+        $goods = $this->goodsService->getByType($storeId,$typeId);
         return $this->success($goods);
     }
 
diff --git a/app/Service/v3/Implementations/GoodsService.php b/app/Service/v3/Implementations/GoodsService.php
index e50e04f..2350987 100644
--- a/app/Service/v3/Implementations/GoodsService.php
+++ b/app/Service/v3/Implementations/GoodsService.php
@@ -67,17 +67,13 @@ class GoodsService implements GoodsServiceInterface
 
     public function detail($goodsId)
     {
-        $res = Goods::query()->with('store')->where('id',$goodsId)->first();
+        $res = Goods::query()->with('store')->where('id',$goodsId)->select('*','name as goods_name')->first();
         return $res;
     }
 
-    public function getByType($storeId,$typeId, $page=1, $pagesize=10)
+    public function getByType($storeId,$typeId)
     {
-        $builder = Goods::query()->where(['store_id' => $storeId,'category_id' => $typeId]);
-
-        $paginate = $builder->orderByDesc('on_sale')->orderByDesc('created_at')->paginate($pagesize);
-        $goods = $paginate->toArray();
-        return ['has_more_pages' => $paginate->hasMorePages(), 'goods' => $goods['data']];
+        return Goods::query()->where(['store_id' => $storeId,'category_id' => $typeId])->orderByDesc('on_sale')->orderByDesc('created_at')->get()->toArray();
     }
 
     public function update($params)
diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php
index 9b66e32..eea8dcd 100644
--- a/app/Service/v3/Implementations/UserCenterBlockService.php
+++ b/app/Service/v3/Implementations/UserCenterBlockService.php
@@ -51,7 +51,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                 [
                     'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                     'type' => 'webview',
-                    'path' => '/pages/webview/webview?data=%27%7b%22webview_url%22%3a%22http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%22%7d%27',
+                    'path' => 'http://localhost:8080/#/pages/goodsManagement/goodsManagement?market_id=1&user_id=694&store_id=5',
                     'command'=>'sp_login'
                 ]
             ]
@@ -79,7 +79,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                         [
                             'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                             'type' => 'webview',
-                            'path' => '/pages/webview/webview?data=%27%7b%22webview_url%22%3a%22http%3a%2f%2flocalhost%3a8080%2f%23%2fpages%2fgoodsManagement%2fgoodsManagement%3fmarket_id%3d1%26user_id%3d694%26store_id%3d5%22%7d%27',
+                            'path' => 'http://localhost:8080/#/pages/goodsManagement/goodsManagement?market_id=1&user_id=694&store_id=5',
                             'command'=>'sp_login'
                         ]
                     ]
diff --git a/app/Service/v3/Interfaces/GoodsServiceInterface.php b/app/Service/v3/Interfaces/GoodsServiceInterface.php
index 32c0251..2ff7952 100644
--- a/app/Service/v3/Interfaces/GoodsServiceInterface.php
+++ b/app/Service/v3/Interfaces/GoodsServiceInterface.php
@@ -10,6 +10,6 @@ interface GoodsServiceInterface
     public function check(Goods $goods,$num = 1);
     public function undo();
     public function getBanner($goodsId);
-    public function getByType($storeId,$typeId, $page=1, $pagesize=10);
+    public function getByType($storeId,$typeId);
     public function update($params);
 }
\ No newline at end of file

From 29812ae081c3870afbe31f8332e250e71ebad209 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Tue, 22 Sep 2020 10:22:48 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=93=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/UserCenterBlockService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php
index eea8dcd..defc9e7 100644
--- a/app/Service/v3/Implementations/UserCenterBlockService.php
+++ b/app/Service/v3/Implementations/UserCenterBlockService.php
@@ -79,7 +79,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                         [
                             'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                             'type' => 'webview',
-                            'path' => 'http://localhost:8080/#/pages/goodsManagement/goodsManagement?market_id=1&user_id=694&store_id=5',
+                            'path' => 'http://localhost:8080/#/pages/index/index?user_id=680&personal_id=68',
                             'command'=>'sp_login'
                         ]
                     ]

From 4bbb98af1894ee20f3e40dd61dd7e318e60a9a50 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Tue, 22 Sep 2020 10:34:44 +0800
Subject: [PATCH 12/21] =?UTF-8?q?goods=E6=A8=A1=E5=9E=8B=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E4=B8=8B=E6=9E=B6=E5=95=86=E5=93=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/GoodsService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Service/v3/Implementations/GoodsService.php b/app/Service/v3/Implementations/GoodsService.php
index 2350987..08f0c32 100644
--- a/app/Service/v3/Implementations/GoodsService.php
+++ b/app/Service/v3/Implementations/GoodsService.php
@@ -78,9 +78,9 @@ class GoodsService implements GoodsServiceInterface
 
     public function update($params)
     {
-        $goods = Goods::find($params['id']);
+        $goods = Goods::query()->withoutGlobalScope('normal')->find($params['id']);
         if (empty($goods)) {
-            return ErrorCode::GOODS_NOT_EXISTS;
+            throw new ErrorCodeException( ErrorCode::GOODS_NOT_EXISTS);
         }
         foreach ($params as $k => $v){
             if(isset($goods->$k)){

From 9c8c167f3ec1cb3b1249ee1c2d6cf9cfa9444859 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Tue, 22 Sep 2020 14:43:54 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=20=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=20=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=95=86=E5=93=81=20=20=E5=8C=85=E6=8B=AC=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/GoodsController.php         |  7 +++++
 .../v3/Implementations/GoodsService.php       | 10 +++++--
 .../UserCenterBlockService.php                | 28 ++++++++-----------
 .../v3/Implementations/UserInfoService.php    |  4 +--
 .../v3/Interfaces/GoodsServiceInterface.php   |  2 ++
 config/routes.php                             |  1 +
 6 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/app/Controller/v3/GoodsController.php b/app/Controller/v3/GoodsController.php
index 29a37d3..2d46258 100644
--- a/app/Controller/v3/GoodsController.php
+++ b/app/Controller/v3/GoodsController.php
@@ -83,4 +83,11 @@ class GoodsController extends BaseController
         $res = $this->goodsService->update($this->request->all());
         return $this->success($res);
     }
+
+    public function info()
+    {
+        $goodsId = $this->request->input('goods_id',0);
+        $res = $this->goodsService->info($goodsId);
+        return $this->success($res);
+    }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Implementations/GoodsService.php b/app/Service/v3/Implementations/GoodsService.php
index 08f0c32..c215408 100644
--- a/app/Service/v3/Implementations/GoodsService.php
+++ b/app/Service/v3/Implementations/GoodsService.php
@@ -67,13 +67,13 @@ class GoodsService implements GoodsServiceInterface
 
     public function detail($goodsId)
     {
-        $res = Goods::query()->with('store')->where('id',$goodsId)->select('*','name as goods_name')->first();
+        $res = Goods::query()->with('store')->where('id',$goodsId)->first();
         return $res;
     }
 
     public function getByType($storeId,$typeId)
     {
-        return Goods::query()->where(['store_id' => $storeId,'category_id' => $typeId])->orderByDesc('on_sale')->orderByDesc('created_at')->get()->toArray();
+        return Goods::query()->withoutGlobalScope('normal')->where(['store_id' => $storeId,'category_id' => $typeId])->orderByDesc('on_sale')->orderByDesc('created_at')->get()->toArray();
     }
 
     public function update($params)
@@ -89,4 +89,10 @@ class GoodsService implements GoodsServiceInterface
         }
         return $goods->save();
     }
+
+    public function info($goodsId)
+    {
+        $res = Goods::query()->withoutGlobalScope('normal')->where('id',$goodsId)->select('*','name as goods_name')->first();
+        return $res;
+    }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php
index defc9e7..376c48c 100644
--- a/app/Service/v3/Implementations/UserCenterBlockService.php
+++ b/app/Service/v3/Implementations/UserCenterBlockService.php
@@ -47,28 +47,22 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
             'type'  => 'store_user',
             'title' => '商家相关',
             'items' => [
-                ['name' => '商家入口', 'icon' => $img_host . 'user_icons/shop_enter2.png', 'type' => 'page', 'path' => '/pages/shopLogin/shopLogin','command'=>'store_login'],
-                [
-                    'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
-                    'type' => 'webview',
-                    'path' => 'http://localhost:8080/#/pages/goodsManagement/goodsManagement?market_id=1&user_id=694&store_id=5',
-                    'command'=>'sp_login'
-                ]
+                ['name' => '商家入口', 'icon' => $img_host . 'user_icons/shop_enter2.png', 'type' => 'page', 'path' => '/pages/shopLogin/shopLogin','command'=>'store_login']
             ]
         ];
 
         foreach ($roles as $key => $item) {
             # code...
 
-            // if($item['key'] == 'store'){
-            //     $blocks[] = [
-            //         'type'  => 'store_user',
-            //         'title' => '商户相关',
-            //         'items' => [
-            //             ['name' => '商家入口', 'icon' => $img_host . 'user_icons/shop_enter.png', 'type' => 'page', 'path' => '/pages/shopLogin/shopLogin','command'=>'store_login']
-            //         ]
-            //     ];
-            // }
+            if($item['key'] == 'store'){
+                $goodsEditor = [
+                    'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
+                    'type' => 'webview',
+                    'path' => 'http://localhost:8080/#/pages/goodsManagement/goodsManagement?market_id='.$item['data']['market_id'].'&user_id='.$item['data']['user_id'].'&store_id='.$item['data']['id'],
+                    'command'=>'sp_login'
+                ];
+                array_push($blocks[1]['items'],$goodsEditor);
+            }
 
             if($item['key'] == 'sp'){
                 $blocks[] = [
@@ -79,7 +73,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                         [
                             'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                             'type' => 'webview',
-                            'path' => 'http://localhost:8080/#/pages/index/index?user_id=680&personal_id=68',
+                            'path' => 'http://localhost:8080/#/pages/index/index?user_id='.$item['data']['user_id'].'&personal_id='.$item['data']['id'],
                             'command'=>'sp_login'
                         ]
                     ]
diff --git a/app/Service/v3/Implementations/UserInfoService.php b/app/Service/v3/Implementations/UserInfoService.php
index c663af9..168590a 100644
--- a/app/Service/v3/Implementations/UserInfoService.php
+++ b/app/Service/v3/Implementations/UserInfoService.php
@@ -79,13 +79,13 @@ class UserInfoService implements UserInfoServiceInterface
 
     public function getStoreByUID($userId)
     {
-        $store = Store::where('user_id',$userId)->select(['id','name'])->first();
+        $store = Store::where('user_id',$userId)->select(['id','name','user_id','market_id'])->first();
         return $store;
     }
 
     public function getServicePersonnelByUID($userId)
     {
-        $sp = ServicePersonnel::where('user_id',$userId)->select(['id'])->first();
+        $sp = ServicePersonnel::where('user_id',$userId)->select('id','user_id')->first();
         return $sp;
     }
     
diff --git a/app/Service/v3/Interfaces/GoodsServiceInterface.php b/app/Service/v3/Interfaces/GoodsServiceInterface.php
index 2ff7952..0ea31b3 100644
--- a/app/Service/v3/Interfaces/GoodsServiceInterface.php
+++ b/app/Service/v3/Interfaces/GoodsServiceInterface.php
@@ -9,7 +9,9 @@ interface GoodsServiceInterface
     public function do($goodsId);
     public function check(Goods $goods,$num = 1);
     public function undo();
+    public function detail($goodsId);
     public function getBanner($goodsId);
     public function getByType($storeId,$typeId);
     public function update($params);
+    public function info($goodsId);
 }
\ No newline at end of file
diff --git a/config/routes.php b/config/routes.php
index 85acf94..767d3ad 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -153,6 +153,7 @@ Router::addGroup('/v3/', function () {
     Router::post('store/getGoodsByType', 'App\Controller\v3\StoreController@getGoodsByType');
     Router::post('goods/update', 'App\Controller\v3\GoodsController@update');
     Router::post('store/getList', 'App\Controller\v3\StoreController@getList');
+    Router::post('goods/info', 'App\Controller\v3\GoodsController@info');
 },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]);
 
 // 微信支付回调

From 13df9a6196537257eeb2e6b5099cd70283731899 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Tue, 22 Sep 2020 16:40:26 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E5=95=86=E5=93=81=20=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/v3/Goods.php                          | 6 ++++++
 app/Service/v3/Implementations/GoodsService.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Model/v3/Goods.php b/app/Model/v3/Goods.php
index ff1eaba..6ed70f0 100644
--- a/app/Model/v3/Goods.php
+++ b/app/Model/v3/Goods.php
@@ -63,6 +63,7 @@ class Goods extends Model
         'is_effective',
         'noneffective_note',
         'details_imgs_url',
+        'goods_name'
     ];
 
     protected function boot(): void
@@ -125,6 +126,11 @@ class Goods extends Model
         });
     }
 
+    public function getGoodsNameAttribute()
+    {
+        return $this->attributes['name'];
+    }
+
     public function getNameAttribute($value)
     {
         return $value . ' ' . $this->attributes['goods_unit'];
diff --git a/app/Service/v3/Implementations/GoodsService.php b/app/Service/v3/Implementations/GoodsService.php
index c215408..56512fb 100644
--- a/app/Service/v3/Implementations/GoodsService.php
+++ b/app/Service/v3/Implementations/GoodsService.php
@@ -92,7 +92,7 @@ class GoodsService implements GoodsServiceInterface
 
     public function info($goodsId)
     {
-        $res = Goods::query()->withoutGlobalScope('normal')->where('id',$goodsId)->select('*','name as goods_name')->first();
+        $res = Goods::query()->withoutGlobalScope('normal')->where('id',$goodsId)->first();
         return $res;
     }
 }
\ No newline at end of file

From 7c60913dff3561700377665a19ae400e67c04a3b Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Tue, 22 Sep 2020 17:25:25 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/StoreController.php         |  7 ++++++
 .../v3/Implementations/CategoryService.php    | 25 +++++++++++++++++++
 .../Interfaces/CategoryServiceInterface.php   |  2 +-
 config/routes.php                             |  1 +
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app/Controller/v3/StoreController.php b/app/Controller/v3/StoreController.php
index 1d4f463..4664de2 100644
--- a/app/Controller/v3/StoreController.php
+++ b/app/Controller/v3/StoreController.php
@@ -111,4 +111,11 @@ class StoreController extends BaseController
         $res = $this->storeService->getList($personnel->market_id,$page,$pagesize);
         return $this->success($res);
     }
+
+    public function getCategory()
+    {
+        $storeId = $this->request->input('store_id');
+        $res = $data['goods_types'] = $this->categoryService->allForStoreIncludeOff($storeId);
+        return $this->success($res);
+    }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Implementations/CategoryService.php b/app/Service/v3/Implementations/CategoryService.php
index 63fa60e..268c04a 100644
--- a/app/Service/v3/Implementations/CategoryService.php
+++ b/app/Service/v3/Implementations/CategoryService.php
@@ -95,4 +95,29 @@ class CategoryService implements CategoryServiceInterface
 
         return array_values($returnData);
     }
+
+    public function allForStoreIncludeOff($storeId)
+    {
+        $goodsTypeIds = Goods::query()
+            ->withoutGlobalScope('normal')
+            ->where(['store_id' => $storeId])
+            ->groupBy('category_id', 'id')
+            ->pluck('category_id');
+
+        $categories = Category::query()
+            ->with(['goodsCategory'])
+            ->whereIn('id', $goodsTypeIds)
+            ->orderBy('sort', 'DESC')
+            ->orderBy('id', 'DESC')
+            ->get()->toArray();
+
+        foreach ($categories as $key => &$item) {
+            $item['goods_category_ids'] = '';
+            if (isset($item['goods_category']) && $item['goods_category']) {
+                $item['goods_category_ids'] = implode(',', array_values(array_column($item['goods_category'], 'id')));
+            }
+        }
+
+        return $categories;
+    }
 }
\ No newline at end of file
diff --git a/app/Service/v3/Interfaces/CategoryServiceInterface.php b/app/Service/v3/Interfaces/CategoryServiceInterface.php
index fdac37b..d79acab 100644
--- a/app/Service/v3/Interfaces/CategoryServiceInterface.php
+++ b/app/Service/v3/Interfaces/CategoryServiceInterface.php
@@ -11,5 +11,5 @@ interface CategoryServiceInterface
     public function all();
     public function allForStore($storeId);
     public function allForAppletIndex();
-
+    public function allForStoreIncludeOff($storeId);
 }
\ No newline at end of file
diff --git a/config/routes.php b/config/routes.php
index 767d3ad..43efb05 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -154,6 +154,7 @@ Router::addGroup('/v3/', function () {
     Router::post('goods/update', 'App\Controller\v3\GoodsController@update');
     Router::post('store/getList', 'App\Controller\v3\StoreController@getList');
     Router::post('goods/info', 'App\Controller\v3\GoodsController@info');
+    Router::post('store/getCategory', 'App\Controller\v3\StoreController@getCategory');
 },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]);
 
 // 微信支付回调

From 8ef353aa29b3a38c2b5f7546bcc3db84d90f9e7e Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Tue, 22 Sep 2020 17:31:07 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/StoreController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/v3/StoreController.php b/app/Controller/v3/StoreController.php
index 4664de2..5fe8e05 100644
--- a/app/Controller/v3/StoreController.php
+++ b/app/Controller/v3/StoreController.php
@@ -116,6 +116,6 @@ class StoreController extends BaseController
     {
         $storeId = $this->request->input('store_id');
         $res = $data['goods_types'] = $this->categoryService->allForStoreIncludeOff($storeId);
-        return $this->success($res);
+        return $this->success(['goods_types' => $res]);
     }
 }
\ No newline at end of file

From 74ac1da5f3f2196edd31e77049eb99b3230d4cda Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 23 Sep 2020 10:04:39 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B4=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php           | 11 +++++++++--
 app/Service/v3/Implementations/UserAddressService.php |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index b89558a..15865f0 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -108,19 +108,26 @@ class OrderOnlineController extends BaseController
         }
         $deliveryDistance = config('distance.delivery_distance');
         if(isset($distance) && $distance < $deliveryDistance){
+            if($distance >= 1000){
+                $distance_text = '距离' . bcdiv($distance,1000,2) . ' km';
+            }else{
+                $distance_text = '距离' . $distance . ' m';
+            }
             $distributionPrice = $this->distributionPriceService->do($distance);
             $res['location'] = [
                 'address' => $address,
                 'distribution_price' => $distributionPrice,
                 'distance' => $distance,
-                'within' => true
+                'within' => true,
+                'distribution_text' => '¥ '.$distributionPrice .'(' .$distance_text .')'
             ];
         }else{
             $res['location'] = [
                 'address' => '',
                 'distribution_price' => 3.5,
                 'distance' => $distance,
-                'within' => false
+                'within' => false,
+                'distribution_text' => ''
             ];
         }
         //返回预约送达时间 数组
diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php
index 646d95f..60fe819 100644
--- a/app/Service/v3/Implementations/UserAddressService.php
+++ b/app/Service/v3/Implementations/UserAddressService.php
@@ -98,9 +98,15 @@ class UserAddressService implements UserAddressServiceInterface
 
         $distance = $this->locationService->getDistanceByTencent($market->lng,$market->lat,$address['address']->lng,$address['address']->lat);
         $distributionPrice = $this->distributionPriceService->do($distance);
+        if($distance >= 1000){
+            $distance_text = '距离' . bcdiv($distance,1000,2) . ' km';
+        }else{
+            $distance_text = '距离' . $distance . ' m';
+        }
         $res['address'] = $address;
         $res['delivery_distance'] = $distance;
         $res['distribution_price'] = $distributionPrice;
+        $res['distribution_text'] = '¥ '.$distributionPrice .'(' .$distance_text .')';
         return $res;
     }
 

From ab3b82c2600814980ced1147e69564c7056ae776 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 23 Sep 2020 10:36:41 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php           | 6 +++---
 app/Service/v3/Implementations/UserAddressService.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index 15865f0..d71b502 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -109,9 +109,9 @@ class OrderOnlineController extends BaseController
         $deliveryDistance = config('distance.delivery_distance');
         if(isset($distance) && $distance < $deliveryDistance){
             if($distance >= 1000){
-                $distance_text = '距离' . bcdiv($distance,1000,2) . ' km';
+                $distance_text = '距 ' . bcdiv($distance,1000,2) . 'km';
             }else{
-                $distance_text = '距离' . $distance . ' m';
+                $distance_text = '距 ' . $distance . 'm';
             }
             $distributionPrice = $this->distributionPriceService->do($distance);
             $res['location'] = [
@@ -119,7 +119,7 @@ class OrderOnlineController extends BaseController
                 'distribution_price' => $distributionPrice,
                 'distance' => $distance,
                 'within' => true,
-                'distribution_text' => '¥ '.$distributionPrice .'(' .$distance_text .')'
+                'distribution_text' => '¥ '.$distributionPrice .'（' .$distance_text .'）'
             ];
         }else{
             $res['location'] = [
diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php
index 60fe819..3a158df 100644
--- a/app/Service/v3/Implementations/UserAddressService.php
+++ b/app/Service/v3/Implementations/UserAddressService.php
@@ -99,14 +99,14 @@ class UserAddressService implements UserAddressServiceInterface
         $distance = $this->locationService->getDistanceByTencent($market->lng,$market->lat,$address['address']->lng,$address['address']->lat);
         $distributionPrice = $this->distributionPriceService->do($distance);
         if($distance >= 1000){
-            $distance_text = '距离' . bcdiv($distance,1000,2) . ' km';
+            $distance_text = '距 ' . bcdiv($distance,1000,2) . 'km';
         }else{
-            $distance_text = '距离' . $distance . ' m';
+            $distance_text = '距 ' . $distance . 'm';
         }
         $res['address'] = $address;
         $res['delivery_distance'] = $distance;
         $res['distribution_price'] = $distributionPrice;
-        $res['distribution_text'] = '¥ '.$distributionPrice .'(' .$distance_text .')';
+        $res['distribution_text'] = '¥ '.$distributionPrice .'（' .$distance_text .'）';
         return $res;
     }
 

From db2027beb400977af9c7ac61ff6c04f9864e02a4 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 23 Sep 2020 10:41:19 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index d71b502..2e47174 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -127,7 +127,7 @@ class OrderOnlineController extends BaseController
                 'distribution_price' => 3.5,
                 'distance' => $distance,
                 'within' => false,
-                'distribution_text' => ''
+                'distribution_text' => '¥ 3.5'
             ];
         }
         //返回预约送达时间 数组

From e49532936635bbc10f592a6b8417169be7624b58 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 23 Sep 2020 11:13:45 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=93=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/UserCenterBlockService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php
index 376c48c..ebfe12a 100644
--- a/app/Service/v3/Implementations/UserCenterBlockService.php
+++ b/app/Service/v3/Implementations/UserCenterBlockService.php
@@ -73,7 +73,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                         [
                             'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
                             'type' => 'webview',
-                            'path' => 'http://localhost:8080/#/pages/index/index?user_id='.$item['data']['user_id'].'&personal_id='.$item['data']['id'],
+                            'path' => '/pages/shopList/shopList?personal_id='.$item['data']['id'],
                             'command'=>'sp_login'
                         ]
                     ]

From fa20eeea46ffad4bff3a5ff6be6b839f5d5156cf Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 23 Sep 2020 11:15:42 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserCenterBlockService.php                | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php
index ebfe12a..14777b9 100644
--- a/app/Service/v3/Implementations/UserCenterBlockService.php
+++ b/app/Service/v3/Implementations/UserCenterBlockService.php
@@ -54,15 +54,15 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
         foreach ($roles as $key => $item) {
             # code...
 
-            if($item['key'] == 'store'){
-                $goodsEditor = [
-                    'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
-                    'type' => 'webview',
-                    'path' => 'http://localhost:8080/#/pages/goodsManagement/goodsManagement?market_id='.$item['data']['market_id'].'&user_id='.$item['data']['user_id'].'&store_id='.$item['data']['id'],
-                    'command'=>'sp_login'
-                ];
-                array_push($blocks[1]['items'],$goodsEditor);
-            }
+            // if($item['key'] == 'store'){
+            //     $goodsEditor = [
+            //         'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
+            //         'type' => 'webview',
+            //         'path' => 'http://localhost:8080/#/pages/goodsManagement/goodsManagement?market_id='.$item['data']['market_id'].'&user_id='.$item['data']['user_id'].'&store_id='.$item['data']['id'],
+            //         'command'=>'sp_login'
+            //     ];
+            //     array_push($blocks[1]['items'],$goodsEditor);
+            // }
 
             if($item['key'] == 'sp'){
                 $blocks[] = [
@@ -72,7 +72,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
                         ['name' => '评价', 'icon' => $img_host . 'user_icons/service2.png', 'type' => 'page', 'path' => '/zh_cjdianc/pages/appraise/index?service_personnel_id='.$item['data']['id'],'command'=>'sp_login'],
                         [
                             'name' => '商品管理', 'icon' => $img_host . 'user_icons/service2.png',
-                            'type' => 'webview',
+                            'type' => 'page',
                             'path' => '/pages/shopList/shopList?personal_id='.$item['data']['id'],
                             'command'=>'sp_login'
                         ]