Merge pull request 'dev' (#18) from dev into master

Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/18

.gitignore

@@ -9,7 +9,7 @@ public/static/download/*
 public/phpExcel/*
 app/controller/api/Test.php
 public/protocol.html
-/runtime/*
-runtime/swoole.pid
+runtime/*
 cert_crmeb copy.key
 dump.rdb
+config/swoole.php

app/common/dao/article/ArticleCategoryDao.php

@@ -81,6 +81,8 @@ class ArticleCategoryDao extends BaseDao
             $query->where('status', $where['status']);
         })->when(isset($where['pid']) && $where['pid'] !== '', function ($query) use ($where) {
             $query->where('pid', $where['pid']);
+        })->when(isset($where['is_home']) && $where['is_home'] !== '', function ($query) use ($where) {
+            $query->where('is_home', $where['is_home']);
         })->order('sort DESC, article_category_id DESC');
     }
 

app/common/repositories/article/ArticleCategoryRepository.php

@@ -65,9 +65,9 @@ class ArticleCategoryRepository extends BaseRepository
      * @author xaboy
      * @day 2020/9/18
      */
-    public function apiGetArticleCategory()
+    public function apiGetArticleCategory($isHome = 0)
     {
-        return $this->dao->search(['status' => 1, 'pid' => 0])->select();
+        return $this->dao->search(['status' => 1, 'pid' => 0, 'is_home' => $isHome])->select();
     }
 
     /**
@@ -94,6 +94,7 @@ class ArticleCategoryRepository extends BaseRepository
             Elm::input('info', '分类简介'),
             Elm::frameImage('image', '分类图片', '/' . config('admin.admin_prefix') . '/setting/uploadPicture?field=image&type=1')->width('896px')->height('480px')->props(['footer' => false])->modal(['modal' => false, 'custom-class' => 'suibian-modal']),
             Elm::switches('status', '状态', 1)->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开'),
+            Elm::switches('is_home', '首页显示', 1)->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开'),
             Elm::number('sort', '排序', 0)->precision(0)->max(99999),
         ]);
 

app/common/repositories/store/order/StoreOrderRepository.php

@@ -1756,7 +1756,7 @@ class StoreOrderRepository extends BaseRepository
     }
 
     public function getOrderStatusV2($order) {
-        //订单状态 1 未支付 2待发货 3待收货 4待评价 5交易完成 6已退款 7待核销 8先货后款待结算
+        //订单状态 1 未支付 2待发货 3待收货 4待评价 5交易完成 6已退款 7待核销 8先货后款待结算 9待商家确认
         $order->order_status = 0;
         if ($order->paid == 0) {
             $order->order_status = 1;
@@ -1783,6 +1783,9 @@ class StoreOrderRepository extends BaseRepository
         if ($order->paid == 1 && $order->status == 2 && $order->pay_type == 8) {
             $order->order_status = 8;
         }
+        if ($order->status == 12) {
+            $order->order_status = 9;
+        }
         return $order->order_status;
     }
 

app/common/repositories/system/merchant/MerchantTypeRepository.php

@@ -52,7 +52,7 @@ class MerchantTypeRepository extends BaseRepository
     public function getSelect($getAll = true, $siftStore = false)
     {
         $merTypeIds = $this->userApply ? Merchant::AllowApply : Merchant::AllowDisplay;
-        // 特殊处理市级云仓
+        // 搜索商家时屏蔽市级供应链
         // Merchant::TypeSupplyChain
         if ($siftStore == true) {
             foreach($merTypeIds as $k=>$v) {

app/controller/admin/article/ArticleCategory.php

@@ -120,7 +120,6 @@ class ArticleCategory extends BaseController
             return app('json')->fail('数据不存在');
         if ($data['pid'] && !$this->repository->merExists(0, $data['pid']))
             return app('json')->fail('上级分类不存在');
-
         $this->repository->update($id, $data);
         return app('json')->success('编辑成功');
     }
@@ -181,7 +180,7 @@ class ArticleCategory extends BaseController
      */
     public function checkParams(ArticleCategoryValidate $validate)
     {
-        $data = $this->request->params([['pid', 0], 'title', 'info', 'status', 'image', 'sort']);
+        $data = $this->request->params([['pid', 0], 'title', 'info', 'status', 'is_home', 'image', 'sort']);
         $validate->check($data);
         return $data;
     }

app/controller/api/Auth.php

@@ -919,6 +919,7 @@ class Auth extends BaseController
         $typeId       = $this->request->param('type_id', 0);
         $startDate    = $this->request->param('start_date', '');
         $endDate      = $this->request->param('end_date', '');
+        $sql          = $this->request->param('sql', 0);
         $queryBuilder = Db::name('ProductOrderLog')->where('status', 1);
         //根据商户分类店铺类型筛选商户
         $queryMerBuilder = Db::name('Merchant');
@@ -931,19 +932,49 @@ class Auth extends BaseController
         $merIdArray = $queryMerBuilder->fetchSql(false)->column('mer_id');
         $queryBuilder = $queryBuilder->whereIn('mer_id', $merIdArray);
         if ($cityCode) {
-            $queryBuilder = $queryBuilder->where('city_code', $cityCode);
+            $cityCodeArray = explode(',', $cityCode );
+            if (count($cityCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('city_code', $cityCode);
+            }
+            if (count($cityCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('city_code', $cityCodeArray);
+            }
         }
         if ($districtCode) {
-            $queryBuilder = $queryBuilder->where('district_code', $districtCode);
+            $districtCodeArray = explode(',', $districtCode);
+            if (count($districtCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('district_code', $districtCode);
+            }
+            if (count($districtCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('district_code', $districtCodeArray);
+            }
         }
         if ($streetCode) {
-            $queryBuilder = $queryBuilder->where('street_code', $streetCode);
+            $streetCodeArray = explode(',', $streetCode);
+            if (count($streetCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('street_code', $streetCode);
+            }
+            if (count($streetCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('street_code', $streetCodeArray);
+            }
         }
         if ($villageCode) {
-            $queryBuilder = $queryBuilder->where('village_code', $villageCode);
+            $villageCodeArray = explode(',', $villageCode);
+            if (count($villageCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('village_code', $villageCode);
+            }
+            if (count($villageCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('village_code', $villageCodeArray);
+            }
         }
         if ($brigadeId) {
-            $queryBuilder = $queryBuilder->where('brigade_id', $brigadeId);
+            $brigadeIdArray = explode(',', $brigadeId);
+            if (count($brigadeIdArray) == 1) {
+                $queryBuilder = $queryBuilder->where('brigade_id', $brigadeId);
+            }
+            if (count($brigadeIdArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('brigade_id', $brigadeIdArray);
+            }
         }
         if ($startDate) {
             $queryBuilder = $queryBuilder->whereTime('create_time', '>=', trim($startDate));
@@ -951,7 +982,7 @@ class Auth extends BaseController
         if ($endDate) {
             $queryBuilder = $queryBuilder->whereTime('create_time', '<=', trim($endDate) . ' 23:59:59');
         }
-        $orderNum   = $queryBuilder->fetchSql(false)->count();
+        $orderNum   = $queryBuilder->fetchSql((bool)$sql)->count();
         $productNum = $queryBuilder->sum('product_num');
         $totalPrice = $queryBuilder->sum('total_price');
         $data = [
@@ -976,6 +1007,7 @@ class Auth extends BaseController
         $typeId       = $this->request->param('type_id', 0);
         $startDate    = $this->request->param('start_date', '');
         $endDate      = $this->request->param('end_date', '');
+        $sql          = $this->request->param('sql', 0);
         $queryBuilder = Db::name('ProductOrderLog')->where('status', 1);
         //根据商户分类店铺类型筛选商户
         $queryMerBuilder = Db::name('Merchant');
@@ -988,19 +1020,49 @@ class Auth extends BaseController
         $merIdArray = $queryMerBuilder->fetchSql(false)->column('mer_id');
         $queryBuilder = $queryBuilder->whereIn('mer_id', $merIdArray);
         if ($cityCode) {
-            $queryBuilder = $queryBuilder->where('city_code', $cityCode);
+            $cityCodeArray = explode(',', $cityCode );
+            if (count($cityCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('city_code', $cityCode);
+            }
+            if (count($cityCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('city_code', $cityCodeArray);
+            }
         }
         if ($districtCode) {
-            $queryBuilder = $queryBuilder->where('district_code', $districtCode);
+            $districtCodeArray = explode(',', $districtCode);
+            if (count($districtCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('district_code', $districtCode);
+            }
+            if (count($districtCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('district_code', $districtCodeArray);
+            }
         }
         if ($streetCode) {
-            $queryBuilder = $queryBuilder->where('street_code', $streetCode);
+            $streetCodeArray = explode(',', $streetCode);
+            if (count($streetCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('street_code', $streetCode);
+            }
+            if (count($streetCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('street_code', $streetCodeArray);
+            }
         }
         if ($villageCode) {
-            $queryBuilder = $queryBuilder->where('village_code', $villageCode);
+            $villageCodeArray = explode(',', $villageCode);
+            if (count($villageCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('village_code', $villageCode);
+            }
+            if (count($villageCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('village_code', $villageCodeArray);
+            }
         }
         if ($brigadeId) {
-            $queryBuilder = $queryBuilder->where('brigade_id', $brigadeId);
+            $brigadeIdArray = explode(',', $brigadeId);
+            if (count($brigadeIdArray) == 1) {
+                $queryBuilder = $queryBuilder->where('brigade_id', $brigadeId);
+            }
+            if (count($brigadeIdArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('brigade_id', $brigadeIdArray);
+            }
         }
         if ($startDate) {
             $queryBuilder = $queryBuilder->whereTime('create_time', '>=', trim($startDate));
@@ -1008,7 +1070,7 @@ class Auth extends BaseController
         if ($endDate) {
             $queryBuilder = $queryBuilder->whereTime('create_time', '<=', trim($endDate) . ' 23:59:59');
         }
-        $count = $queryBuilder->fetchSql(false)->count();
+        $count = $queryBuilder->fetchSql((bool)$sql)->count();
         $list  = $queryBuilder->setOption('field', [])->field(['id', 'order_id', 'product_num', 'product_price', 'total_price', 'city_code', 'district_code', 'street_code', 'village_code', 'brigade_id', 'create_time'])->order('id', 'desc')->page($page, $limit)->fetchSql(false)->select();
         $orderIdList = [];
         if ($list) {
@@ -1034,7 +1096,17 @@ class Auth extends BaseController
         $typeId       = $this->request->param('type_id', 0);
         $startDate    = $this->request->param('start_date', '');
         $endDate      = $this->request->param('end_date', '');
-        $villageId    = Db::name('GeoVillage')->where('village_code', $villageCode)->fetchSql(false)->value('village_id', 0);
+        $sql          = $this->request->param('sql', 0);
+        $villageIdArray = [];
+        if ($villageCode) {
+            $villageCodeArray = explode(',', $villageCode);
+            if (count($villageCodeArray) == 1) {
+                $villageIdArray = Db::name('GeoVillage')->where('village_code', $villageCode)->fetchSql(false)->column('village_id');
+            }
+            if (count($villageCodeArray) > 1) {
+                $villageIdArray = Db::name('GeoVillage')->whereIn('village_code', $villageCodeArray)->fetchSql(false)->column('village_id');
+            }
+        }
         $queryBuilder = Db::name('Merchant');
         if ($categoryId) {
             $queryBuilder = $queryBuilder->where('category_id', $categoryId);
@@ -1043,13 +1115,25 @@ class Auth extends BaseController
             $queryBuilder = $queryBuilder->where('type_id', $typeId);
         }
         if ($districtCode) {
-            $queryBuilder = $queryBuilder->where('area_id', $districtCode);
+            $districtCodeArray = explode(',', $districtCode);
+            if (count($districtCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('area_id', $districtCode);
+            }
+            if (count($districtCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('area_id', $districtCodeArray);
+            }
         }
         if ($streetCode) {
-            $queryBuilder = $queryBuilder->where('street_id', $streetCode);
+            $streetCodeArray = explode(',', $streetCode);
+            if (count($streetCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('street_id', $streetCode);
+            }
+            if (count($streetCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('street_id', $streetCodeArray);
+            }
         }
-        if ($villageId) {
-            $queryBuilder = $queryBuilder->where('village_id', $villageId);
+        if (count($villageIdArray)) {
+            $queryBuilder = $queryBuilder->whereIn('village_id', $villageIdArray);
         }
         if ($startDate) {
             $queryBuilder = $queryBuilder->whereTime('create_time', '>=', trim($startDate));
@@ -1057,7 +1141,7 @@ class Auth extends BaseController
         if ($endDate) {
             $queryBuilder = $queryBuilder->whereTime('create_time', '<=', trim($endDate) . ' 23:59:59');
         }
-        $merNum = $queryBuilder->fetchSql(false)->count();
+        $merNum = $queryBuilder->fetchSql((bool)$sql)->count();
         $data = [
             'where'   => $this->request->param(),
             'mer_num' => $merNum
@@ -1075,7 +1159,17 @@ class Auth extends BaseController
         $typeId       = $this->request->param('type_id', 0);
         $startDate    = $this->request->param('start_date', '');
         $endDate      = $this->request->param('end_date', '');
-        $villageId    = Db::name('GeoVillage')->where('village_code', $villageCode)->fetchSql(false)->value('village_id', 0);
+        $sql          = $this->request->param('sql', 0);
+        $villageIdArray = [];
+        if ($villageCode) {
+            $villageCodeArray = explode(',', $villageCode);
+            if (count($villageCodeArray) == 1) {
+                $villageIdArray = Db::name('GeoVillage')->where('village_code', $villageCode)->fetchSql(false)->column('village_id');
+            }
+            if (count($villageCodeArray) > 1) {
+                $villageIdArray = Db::name('GeoVillage')->whereIn('village_code', $villageCodeArray)->fetchSql(false)->column('village_id');
+            }
+        }
         $queryBuilder = Db::name('Merchant');
         if ($categoryId) {
             $queryBuilder = $queryBuilder->where('category_id', $categoryId);
@@ -1084,13 +1178,25 @@ class Auth extends BaseController
             $queryBuilder = $queryBuilder->where('type_id', $typeId);
         }
         if ($districtCode) {
-            $queryBuilder = $queryBuilder->where('area_id', $districtCode);
+            $districtCodeArray = explode(',', $districtCode);
+            if (count($districtCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('area_id', $districtCode);
+            }
+            if (count($districtCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('area_id', $districtCodeArray);
+            }
         }
         if ($streetCode) {
-            $queryBuilder = $queryBuilder->where('street_id', $streetCode);
+            $streetCodeArray = explode(',', $streetCode);
+            if (count($streetCodeArray) == 1) {
+                $queryBuilder = $queryBuilder->where('street_id', $streetCode);
+            }
+            if (count($streetCodeArray) > 1) {
+                $queryBuilder = $queryBuilder->whereIn('street_id', $streetCodeArray);
+            }
         }
-        if ($villageId) {
-            $queryBuilder = $queryBuilder->where('village_id', $villageId);
+        if (count($villageIdArray)) {
+            $queryBuilder = $queryBuilder->whereIn('village_id', $villageIdArray);
         }
         $merIdArray = $queryBuilder->fetchSql(false)->column('mer_id');
         $prodQueryBuilder = Db::name('StoreProduct')->where('is_show', 1)->where('status', 1)->whereIn('mer_id', $merIdArray);
@@ -1100,10 +1206,11 @@ class Auth extends BaseController
         if ($endDate) {
             $prodQueryBuilder = $prodQueryBuilder->whereTime('create_time', '<=', trim($endDate) . ' 23:59:59');
         }
-        $goodsNum = $prodQueryBuilder->fetchSql(false)->count();
+        $goodsNum = $prodQueryBuilder->fetchSql((bool)$sql)->count();
         $data = [
             'where'     => $this->request->param(),
-            'goods_num' => $goodsNum
+            'goods_num' => $goodsNum,
+            'merid'     => $merIdArray
         ];
         return app('json')->success($data);
     }

app/controller/api/article/ArticleCategory.php

@@ -43,6 +43,7 @@ class ArticleCategory extends BaseController
      */
     public function lst()
     {
-        return app('json')->success($this->repository->apiGetArticleCategory());
+        $isHome = $this->request->param('is_home', 0);
+        return app('json')->success($this->repository->apiGetArticleCategory($isHome));
     }
 }

app/controller/api/community/Community.php

@@ -61,6 +61,9 @@ class Community extends BaseController
     public function lst()
     {
         $where = $this->request->params(['keyword','topic_id','is_hot','category_id','spu_id', 'is_type', 'resale_type']);
+        if (isset($where['category_id']) && $where['category_id'] == 0) {
+            $where['is_type'] = $this->repository::COMMUNIT_TYPE_FONT;
+        }
         if (!$where['category_id']) {
             unset($where['category_id']);
         } else  if ($where['category_id'] == -1) {

config/swoole.php

@@ -1,116 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-
-
-use app\webscoket\Manager;
-use Swoole\Table;
-use think\swoole\websocket\socketio\Parser;
-
-return [
-    'server'     => [
-        'host'      => env('SWOOLE_HOST', '0.0.0.0'), // 监听地址
-        'port'      => env('SWOOLE_PORT', 8324), // 监听端口
-        'mode'      => SWOOLE_PROCESS, // 运行模式 默认为SWOOLE_PROCESS
-        'sock_type' => SWOOLE_SOCK_TCP, // sock type 默认为SWOOLE_SOCK_TCP
-        'options'   => [
-            'pid_file'              => runtime_path() . 'swoole.pid',
-            'log_file'              => runtime_path() . 'swoole.log',
-            'daemonize'             => false,
-            // Normally this value should be 1~4 times larger according to your cpu cores.
-            'reactor_num'           => swoole_cpu_num(),
-            'worker_num'            => swoole_cpu_num(),
-            'task_worker_num'       => swoole_cpu_num(),
-            'task_enable_coroutine' => false,
-            'task_max_request'      => 2000,
-            'enable_static_handler' => true,
-            'document_root'         => root_path('public'),
-            'package_max_length'    => 50 * 1024 * 1024,
-            'buffer_output_size'    => 10 * 1024 * 1024,
-            'socket_buffer_size'    => 128 * 1024 * 1024,
-            'max_request'           => 3000,
-            'send_yield'            => true,
-            'reload_async'          => true,
-        ],
-    ],
-    'websocket'  => [
-        'enable'        => true,
-        'handler'       => Manager::class,
-        'parser'        => Parser::class,
-        'ping_interval' => 25000, //1000 = 1秒
-        'ping_timeout'  => 60000, //1000 = 1秒
-        'room'          => [
-            'type'  => 'table',
-            'table' => [
-                'room_rows'   => 4096,
-                'room_size'   => 2048,
-                'client_rows' => 8192,
-                'client_size' => 2048,
-            ],
-            'redis' => [
-            
-            ],
-        ],
-        'listen'        => [],
-        'subscribe'     => [],
-    ],
-    'rpc'        => [
-        'server' => [
-            'enable'   => false,
-            'port'     => 9000,
-            'services' => [
-            ],
-        ],
-        'client' => [
-        ],
-    ],
-    'hot_update' => [
-        'enable'  => env('APP_DEBUG', false),
-        'name'    => ['*.php'],
-        'include' => [app_path(),root_path().'crmeb'],
-        'exclude' => [],
-    ],
-    //连接池
-    'pool'       => [
-        'db'    => [
-            'enable'        => true,
-            'max_active'    => 3,
-            'max_wait_time' => 5,
-        ],
-        'cache' => [
-            'enable'        => true,
-            'max_active'    => 3,
-            'max_wait_time' => 5,
-        ],
-    ],
-    'coroutine'  => [
-        'enable' => false,
-        'flags'  => SWOOLE_HOOK_ALL,
-    ],
-    'tables' => [
-        'user' => [
-            'size' => 204800,
-            'columns' => [
-                ['name' => 'fd', 'type' => Table::TYPE_INT],
-                ['name' => 'type', 'type' => Table::TYPE_INT],
-                ['name' => 'uid', 'type' => Table::TYPE_INT]
-            ]
-        ]
-    ],
-    //每个worker里需要预加载以共用的实例
-    'concretes'  => [],
-    //重置器
-    'resetters'  => [],
-    //每次请求前需要清空的实例
-    'instances'  => [],
-    //每次请求前需要重新执行的服务
-    'services'   => [],
-    'locks' => ['group_buying'],
-];

public/index.dev.html

@@ -0,0 +1,5 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>加载中...</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+						if(window.location.protocol == 'https:'){
+							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
+						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.db7f358e.js></script></body></html>

public/index.html

@@ -1,5 +1,5 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>加载中...</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-						if(window.location.protocol == 'https:'){
-							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
-						}</script><link rel=stylesheet href=/static/index.5841170f.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.3f0852cf.js></script><script src=/static/js/index.f102bb5d.js></script></body></html>
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>加载中...</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+						if(window.location.protocol == 'https:'){
+							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
+						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.efaedbe7.js></script></body></html>

public/pages.dev/store/static/images/settledSuccessful.svg

@@ -0,0 +1,65 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="378" height="314" viewBox="0 0 378 314">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.621" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#ffbc6c"/>
+      <stop offset="1" stop-color="#fd8a24"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-2" x1="0.054" y1="1" x2="0.559" y2="0.427" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#fd9c46"/>
+      <stop offset="1" stop-color="#fc9235"/>
+    </linearGradient>
+  </defs>
+  <g id="组_3776" data-name="组 3776" transform="translate(-186 -260)">
+    <g id="矩形_1754" data-name="矩形 1754" transform="translate(186 260)" fill="#fff" stroke="#707070" stroke-width="1" opacity="0">
+      <rect width="378" height="314" stroke="none"/>
+      <rect x="0.5" y="0.5" width="377" height="313" fill="none"/>
+    </g>
+    <g id="组_3775" data-name="组 3775" transform="translate(11 13)">
+      <g id="组_3733" data-name="组 3733" transform="translate(5 4)">
+        <line id="直线_2" data-name="直线 2" x2="91.209" transform="translate(390.71 321.419)" fill="none" stroke="#fff0de" stroke-width="2"/>
+        <line id="直线_3" data-name="直线 3" y1="45.162" transform="translate(481.919 321.419)" fill="none" stroke="#fff0de" stroke-width="2"/>
+        <line id="直线_4" data-name="直线 4" x2="40.734" transform="translate(441.185 366.581)" fill="none" stroke="#fff0de" stroke-width="2"/>
+        <circle id="椭圆_13" data-name="椭圆 13" cx="4.5" cy="4.5" r="4.5" transform="translate(477 317)" fill="#fff0de"/>
+        <circle id="椭圆_14" data-name="椭圆 14" cx="4.5" cy="4.5" r="4.5" transform="translate(477 362)" fill="#fff0de"/>
+      </g>
+      <rect id="矩形_1736" data-name="矩形 1736" width="170" height="96" rx="4" transform="translate(206 385)" fill="#fff0de" opacity="0.35"/>
+      <rect id="矩形_1738" data-name="矩形 1738" width="161" height="134" rx="4" transform="translate(356 414)" fill="#fff0de" opacity="0.35"/>
+      <rect id="矩形_1735" data-name="矩形 1735" width="130" height="72" rx="4" transform="translate(226 397)" fill="#fff0de"/>
+      <rect id="矩形_1739" data-name="矩形 1739" width="123" height="77" rx="4" transform="translate(375 425)" fill="#fff0de"/>
+      <rect id="矩形_1740" data-name="矩形 1740" width="36" height="22" rx="4" transform="translate(462 511)" fill="#fff0de"/>
+      <rect id="矩形_1737" data-name="矩形 1737" width="155" height="74" rx="4" transform="translate(266 300)" fill="#fff0de"/>
+      <g id="椭圆_15" data-name="椭圆 15" transform="translate(491 281)" fill="none" stroke="#ffdeb7" stroke-width="2">
+        <circle cx="7" cy="7" r="7" stroke="none"/>
+        <circle cx="7" cy="7" r="6" fill="none"/>
+      </g>
+      <g id="椭圆_17" data-name="椭圆 17" transform="translate(468 299)" fill="none" stroke="#ffdeb7" stroke-width="1">
+        <circle cx="4.5" cy="4.5" r="4.5" stroke="none"/>
+        <circle cx="4.5" cy="4.5" r="4" fill="none"/>
+      </g>
+      <circle id="椭圆_19" data-name="椭圆 19" cx="3" cy="3" r="3" transform="translate(260 527)" fill="#ffdeb7"/>
+      <g id="椭圆_20" data-name="椭圆 20" transform="translate(221 502)" fill="none" stroke="#ffdeb7" stroke-width="2">
+        <circle cx="8.5" cy="8.5" r="8.5" stroke="none"/>
+        <circle cx="8.5" cy="8.5" r="7.5" fill="none"/>
+      </g>
+      <circle id="椭圆_18" data-name="椭圆 18" cx="2.5" cy="2.5" r="2.5" transform="translate(391 283)" fill="#ffdeb7"/>
+      <g id="组_3734" data-name="组 3734" transform="translate(-16.078 -39.078)">
+        <rect id="矩形_1741" data-name="矩形 1741" width="21" height="5" rx="2.5" transform="translate(447.078 309.078)" fill="#ffdeb7"/>
+        <rect id="矩形_1742" data-name="矩形 1742" width="21" height="5" rx="2.5" transform="translate(455.078 322.078) rotate(-90)" fill="#ffdeb7"/>
+        <circle id="椭圆_16" data-name="椭圆 16" cx="2.5" cy="2.5" r="2.5" transform="translate(455.078 309.078)" fill="#fff"/>
+      </g>
+      <g id="组_3726" data-name="组 3726" transform="translate(290.558 342.65)">
+        <path id="减去_3" data-name="减去 3" d="M106.857,175.894H16a16,16,0,0,1-16-16V16A16,16,0,0,1,16,0H140.351a16,16,0,0,1,16,16v86.214A44.408,44.408,0,0,0,91.626,160.06a44.708,44.708,0,0,0,15.228,15.832Z" transform="translate(0 0)" fill="#f9c98f" stroke="rgba(0,0,0,0)" stroke-width="1"/>
+        <path id="减去_4" data-name="减去 4" d="M106.855,175.9H15.634A15.653,15.653,0,0,1,0,160.258V15.634A15.652,15.652,0,0,1,15.634,0H97.719l58.633,58.631v43.588a44.409,44.409,0,1,0-49.506,73.671Z" transform="translate(0.004 0)" stroke="rgba(0,0,0,0)" stroke-width="1" fill="url(#linear-gradient)"/>
+        <path id="圆角矩形_2" data-name="圆角矩形 2" d="M491.632,613.632H445.344A12.344,12.344,0,0,1,433,601.288V555" transform="translate(-335.278 -555)" fill="url(#linear-gradient-2)"/>
+        <rect id="矩形_95" data-name="矩形 95" width="78.942" height="11.841" rx="5.921" transform="translate(11.842 51.312)" fill="#fff"/>
+        <rect id="矩形_94" data-name="矩形 94" width="78.942" height="11.841" rx="5.921" transform="translate(11.842 78.942)" fill="#fff"/>
+        <rect id="矩形_96" data-name="矩形 96" width="55.259" height="11.841" rx="5.921" transform="translate(11.842 23.683)" fill="#fff"/>
+        <g id="椭圆_6" data-name="椭圆 6" transform="translate(91.772 99.665)" fill="none" stroke="#fd8a24" stroke-width="6">
+          <circle cx="38.484" cy="38.484" r="38.484" stroke="none"/>
+          <circle cx="38.484" cy="38.484" r="35.484" fill="none"/>
+        </g>
+        <path id="路径_1446" data-name="路径 1446" d="M0,25.784V0H16.317" transform="translate(128.942 147.286) rotate(-135)" fill="none" stroke="#fd8a24" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/>
+      </g>
+    </g>
+  </g>
+</svg>

public/pages/store/static/images/settledSuccessful.svg

@@ -1,65 +1,65 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="378" height="314" viewBox="0 0 378 314">
-  <defs>
-    <linearGradient id="linear-gradient" x1="0.5" x2="0.621" y2="1" gradientUnits="objectBoundingBox">
-      <stop offset="0" stop-color="#ffbc6c"/>
-      <stop offset="1" stop-color="#fd8a24"/>
-    </linearGradient>
-    <linearGradient id="linear-gradient-2" x1="0.054" y1="1" x2="0.559" y2="0.427" gradientUnits="objectBoundingBox">
-      <stop offset="0" stop-color="#fd9c46"/>
-      <stop offset="1" stop-color="#fc9235"/>
-    </linearGradient>
-  </defs>
-  <g id="组_3776" data-name="组 3776" transform="translate(-186 -260)">
-    <g id="矩形_1754" data-name="矩形 1754" transform="translate(186 260)" fill="#fff" stroke="#707070" stroke-width="1" opacity="0">
-      <rect width="378" height="314" stroke="none"/>
-      <rect x="0.5" y="0.5" width="377" height="313" fill="none"/>
-    </g>
-    <g id="组_3775" data-name="组 3775" transform="translate(11 13)">
-      <g id="组_3733" data-name="组 3733" transform="translate(5 4)">
-        <line id="直线_2" data-name="直线 2" x2="91.209" transform="translate(390.71 321.419)" fill="none" stroke="#fff0de" stroke-width="2"/>
-        <line id="直线_3" data-name="直线 3" y1="45.162" transform="translate(481.919 321.419)" fill="none" stroke="#fff0de" stroke-width="2"/>
-        <line id="直线_4" data-name="直线 4" x2="40.734" transform="translate(441.185 366.581)" fill="none" stroke="#fff0de" stroke-width="2"/>
-        <circle id="椭圆_13" data-name="椭圆 13" cx="4.5" cy="4.5" r="4.5" transform="translate(477 317)" fill="#fff0de"/>
-        <circle id="椭圆_14" data-name="椭圆 14" cx="4.5" cy="4.5" r="4.5" transform="translate(477 362)" fill="#fff0de"/>
-      </g>
-      <rect id="矩形_1736" data-name="矩形 1736" width="170" height="96" rx="4" transform="translate(206 385)" fill="#fff0de" opacity="0.35"/>
-      <rect id="矩形_1738" data-name="矩形 1738" width="161" height="134" rx="4" transform="translate(356 414)" fill="#fff0de" opacity="0.35"/>
-      <rect id="矩形_1735" data-name="矩形 1735" width="130" height="72" rx="4" transform="translate(226 397)" fill="#fff0de"/>
-      <rect id="矩形_1739" data-name="矩形 1739" width="123" height="77" rx="4" transform="translate(375 425)" fill="#fff0de"/>
-      <rect id="矩形_1740" data-name="矩形 1740" width="36" height="22" rx="4" transform="translate(462 511)" fill="#fff0de"/>
-      <rect id="矩形_1737" data-name="矩形 1737" width="155" height="74" rx="4" transform="translate(266 300)" fill="#fff0de"/>
-      <g id="椭圆_15" data-name="椭圆 15" transform="translate(491 281)" fill="none" stroke="#ffdeb7" stroke-width="2">
-        <circle cx="7" cy="7" r="7" stroke="none"/>
-        <circle cx="7" cy="7" r="6" fill="none"/>
-      </g>
-      <g id="椭圆_17" data-name="椭圆 17" transform="translate(468 299)" fill="none" stroke="#ffdeb7" stroke-width="1">
-        <circle cx="4.5" cy="4.5" r="4.5" stroke="none"/>
-        <circle cx="4.5" cy="4.5" r="4" fill="none"/>
-      </g>
-      <circle id="椭圆_19" data-name="椭圆 19" cx="3" cy="3" r="3" transform="translate(260 527)" fill="#ffdeb7"/>
-      <g id="椭圆_20" data-name="椭圆 20" transform="translate(221 502)" fill="none" stroke="#ffdeb7" stroke-width="2">
-        <circle cx="8.5" cy="8.5" r="8.5" stroke="none"/>
-        <circle cx="8.5" cy="8.5" r="7.5" fill="none"/>
-      </g>
-      <circle id="椭圆_18" data-name="椭圆 18" cx="2.5" cy="2.5" r="2.5" transform="translate(391 283)" fill="#ffdeb7"/>
-      <g id="组_3734" data-name="组 3734" transform="translate(-16.078 -39.078)">
-        <rect id="矩形_1741" data-name="矩形 1741" width="21" height="5" rx="2.5" transform="translate(447.078 309.078)" fill="#ffdeb7"/>
-        <rect id="矩形_1742" data-name="矩形 1742" width="21" height="5" rx="2.5" transform="translate(455.078 322.078) rotate(-90)" fill="#ffdeb7"/>
-        <circle id="椭圆_16" data-name="椭圆 16" cx="2.5" cy="2.5" r="2.5" transform="translate(455.078 309.078)" fill="#fff"/>
-      </g>
-      <g id="组_3726" data-name="组 3726" transform="translate(290.558 342.65)">
-        <path id="减去_3" data-name="减去 3" d="M106.857,175.894H16a16,16,0,0,1-16-16V16A16,16,0,0,1,16,0H140.351a16,16,0,0,1,16,16v86.214A44.408,44.408,0,0,0,91.626,160.06a44.708,44.708,0,0,0,15.228,15.832Z" transform="translate(0 0)" fill="#f9c98f" stroke="rgba(0,0,0,0)" stroke-width="1"/>
-        <path id="减去_4" data-name="减去 4" d="M106.855,175.9H15.634A15.653,15.653,0,0,1,0,160.258V15.634A15.652,15.652,0,0,1,15.634,0H97.719l58.633,58.631v43.588a44.409,44.409,0,1,0-49.506,73.671Z" transform="translate(0.004 0)" stroke="rgba(0,0,0,0)" stroke-width="1" fill="url(#linear-gradient)"/>
-        <path id="圆角矩形_2" data-name="圆角矩形 2" d="M491.632,613.632H445.344A12.344,12.344,0,0,1,433,601.288V555" transform="translate(-335.278 -555)" fill="url(#linear-gradient-2)"/>
-        <rect id="矩形_95" data-name="矩形 95" width="78.942" height="11.841" rx="5.921" transform="translate(11.842 51.312)" fill="#fff"/>
-        <rect id="矩形_94" data-name="矩形 94" width="78.942" height="11.841" rx="5.921" transform="translate(11.842 78.942)" fill="#fff"/>
-        <rect id="矩形_96" data-name="矩形 96" width="55.259" height="11.841" rx="5.921" transform="translate(11.842 23.683)" fill="#fff"/>
-        <g id="椭圆_6" data-name="椭圆 6" transform="translate(91.772 99.665)" fill="none" stroke="#fd8a24" stroke-width="6">
-          <circle cx="38.484" cy="38.484" r="38.484" stroke="none"/>
-          <circle cx="38.484" cy="38.484" r="35.484" fill="none"/>
-        </g>
-        <path id="路径_1446" data-name="路径 1446" d="M0,25.784V0H16.317" transform="translate(128.942 147.286) rotate(-135)" fill="none" stroke="#fd8a24" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/>
-      </g>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="378" height="314" viewBox="0 0 378 314">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.621" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#ffbc6c"/>
+      <stop offset="1" stop-color="#fd8a24"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-2" x1="0.054" y1="1" x2="0.559" y2="0.427" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#fd9c46"/>
+      <stop offset="1" stop-color="#fc9235"/>
+    </linearGradient>
+  </defs>
+  <g id="组_3776" data-name="组 3776" transform="translate(-186 -260)">
+    <g id="矩形_1754" data-name="矩形 1754" transform="translate(186 260)" fill="#fff" stroke="#707070" stroke-width="1" opacity="0">
+      <rect width="378" height="314" stroke="none"/>
+      <rect x="0.5" y="0.5" width="377" height="313" fill="none"/>
+    </g>
+    <g id="组_3775" data-name="组 3775" transform="translate(11 13)">
+      <g id="组_3733" data-name="组 3733" transform="translate(5 4)">
+        <line id="直线_2" data-name="直线 2" x2="91.209" transform="translate(390.71 321.419)" fill="none" stroke="#fff0de" stroke-width="2"/>
+        <line id="直线_3" data-name="直线 3" y1="45.162" transform="translate(481.919 321.419)" fill="none" stroke="#fff0de" stroke-width="2"/>
+        <line id="直线_4" data-name="直线 4" x2="40.734" transform="translate(441.185 366.581)" fill="none" stroke="#fff0de" stroke-width="2"/>
+        <circle id="椭圆_13" data-name="椭圆 13" cx="4.5" cy="4.5" r="4.5" transform="translate(477 317)" fill="#fff0de"/>
+        <circle id="椭圆_14" data-name="椭圆 14" cx="4.5" cy="4.5" r="4.5" transform="translate(477 362)" fill="#fff0de"/>
+      </g>
+      <rect id="矩形_1736" data-name="矩形 1736" width="170" height="96" rx="4" transform="translate(206 385)" fill="#fff0de" opacity="0.35"/>
+      <rect id="矩形_1738" data-name="矩形 1738" width="161" height="134" rx="4" transform="translate(356 414)" fill="#fff0de" opacity="0.35"/>
+      <rect id="矩形_1735" data-name="矩形 1735" width="130" height="72" rx="4" transform="translate(226 397)" fill="#fff0de"/>
+      <rect id="矩形_1739" data-name="矩形 1739" width="123" height="77" rx="4" transform="translate(375 425)" fill="#fff0de"/>
+      <rect id="矩形_1740" data-name="矩形 1740" width="36" height="22" rx="4" transform="translate(462 511)" fill="#fff0de"/>
+      <rect id="矩形_1737" data-name="矩形 1737" width="155" height="74" rx="4" transform="translate(266 300)" fill="#fff0de"/>
+      <g id="椭圆_15" data-name="椭圆 15" transform="translate(491 281)" fill="none" stroke="#ffdeb7" stroke-width="2">
+        <circle cx="7" cy="7" r="7" stroke="none"/>
+        <circle cx="7" cy="7" r="6" fill="none"/>
+      </g>
+      <g id="椭圆_17" data-name="椭圆 17" transform="translate(468 299)" fill="none" stroke="#ffdeb7" stroke-width="1">
+        <circle cx="4.5" cy="4.5" r="4.5" stroke="none"/>
+        <circle cx="4.5" cy="4.5" r="4" fill="none"/>
+      </g>
+      <circle id="椭圆_19" data-name="椭圆 19" cx="3" cy="3" r="3" transform="translate(260 527)" fill="#ffdeb7"/>
+      <g id="椭圆_20" data-name="椭圆 20" transform="translate(221 502)" fill="none" stroke="#ffdeb7" stroke-width="2">
+        <circle cx="8.5" cy="8.5" r="8.5" stroke="none"/>
+        <circle cx="8.5" cy="8.5" r="7.5" fill="none"/>
+      </g>
+      <circle id="椭圆_18" data-name="椭圆 18" cx="2.5" cy="2.5" r="2.5" transform="translate(391 283)" fill="#ffdeb7"/>
+      <g id="组_3734" data-name="组 3734" transform="translate(-16.078 -39.078)">
+        <rect id="矩形_1741" data-name="矩形 1741" width="21" height="5" rx="2.5" transform="translate(447.078 309.078)" fill="#ffdeb7"/>
+        <rect id="矩形_1742" data-name="矩形 1742" width="21" height="5" rx="2.5" transform="translate(455.078 322.078) rotate(-90)" fill="#ffdeb7"/>
+        <circle id="椭圆_16" data-name="椭圆 16" cx="2.5" cy="2.5" r="2.5" transform="translate(455.078 309.078)" fill="#fff"/>
+      </g>
+      <g id="组_3726" data-name="组 3726" transform="translate(290.558 342.65)">
+        <path id="减去_3" data-name="减去 3" d="M106.857,175.894H16a16,16,0,0,1-16-16V16A16,16,0,0,1,16,0H140.351a16,16,0,0,1,16,16v86.214A44.408,44.408,0,0,0,91.626,160.06a44.708,44.708,0,0,0,15.228,15.832Z" transform="translate(0 0)" fill="#f9c98f" stroke="rgba(0,0,0,0)" stroke-width="1"/>
+        <path id="减去_4" data-name="减去 4" d="M106.855,175.9H15.634A15.653,15.653,0,0,1,0,160.258V15.634A15.652,15.652,0,0,1,15.634,0H97.719l58.633,58.631v43.588a44.409,44.409,0,1,0-49.506,73.671Z" transform="translate(0.004 0)" stroke="rgba(0,0,0,0)" stroke-width="1" fill="url(#linear-gradient)"/>
+        <path id="圆角矩形_2" data-name="圆角矩形 2" d="M491.632,613.632H445.344A12.344,12.344,0,0,1,433,601.288V555" transform="translate(-335.278 -555)" fill="url(#linear-gradient-2)"/>
+        <rect id="矩形_95" data-name="矩形 95" width="78.942" height="11.841" rx="5.921" transform="translate(11.842 51.312)" fill="#fff"/>
+        <rect id="矩形_94" data-name="矩形 94" width="78.942" height="11.841" rx="5.921" transform="translate(11.842 78.942)" fill="#fff"/>
+        <rect id="矩形_96" data-name="矩形 96" width="55.259" height="11.841" rx="5.921" transform="translate(11.842 23.683)" fill="#fff"/>
+        <g id="椭圆_6" data-name="椭圆 6" transform="translate(91.772 99.665)" fill="none" stroke="#fd8a24" stroke-width="6">
+          <circle cx="38.484" cy="38.484" r="38.484" stroke="none"/>
+          <circle cx="38.484" cy="38.484" r="35.484" fill="none"/>
+        </g>
+        <path id="路径_1446" data-name="路径 1446" d="M0,25.784V0H16.317" transform="translate(128.942 147.286) rotate(-135)" fill="none" stroke="#fd8a24" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/>
+      </g>
+    </g>
+  </g>
+</svg>