diff --git a/app/Http/Middleware/ShopAuthenticate.php b/app/Http/Middleware/ShopAuthenticate.php index 43ef82fb..82eb9b3a 100644 --- a/app/Http/Middleware/ShopAuthenticate.php +++ b/app/Http/Middleware/ShopAuthenticate.php @@ -2,6 +2,8 @@ namespace App\Http\Middleware; +use Illuminate\Http\Request; +use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\Middleware\Authenticate as Middleware; class ShopAuthenticate extends Middleware @@ -9,14 +11,29 @@ class ShopAuthenticate extends Middleware /** * Get the path the user should be redirected to when they are not authenticated. * - * @param \Illuminate\Http\Request $request - * @return string|null + * @param Request $request */ protected function redirectTo($request) { - if (! $request->expectsJson()) { - // 后台 + if (!$request->expectsJson()) { return shop_route('login.index'); } } + + + /** + * Handle an unauthenticated user. + * + * @param Request $request + * @param array $guards + * @return void + * + * @throws AuthenticationException + */ + protected function unauthenticated($request, array $guards) + { + throw new AuthenticationException( + trans('common.unauthenticated'), $guards, $this->redirectTo($request) + ); + } } diff --git a/beike/Admin/Http/Controllers/RegionController.php b/beike/Admin/Http/Controllers/RegionController.php index f202da24..fab2a674 100644 --- a/beike/Admin/Http/Controllers/RegionController.php +++ b/beike/Admin/Http/Controllers/RegionController.php @@ -21,7 +21,7 @@ class RegionController public function index() { $data = [ - 'regions' => Region::query()->with('regionZones.zone')->get(), + 'regions' => RegionRepo::getList(), 'countries' => CountryRepo::all() ]; diff --git a/beike/Admin/Repositories/RegionRepo.php b/beike/Admin/Repositories/RegionRepo.php index 3a1bf390..16b3185f 100644 --- a/beike/Admin/Repositories/RegionRepo.php +++ b/beike/Admin/Repositories/RegionRepo.php @@ -15,6 +15,11 @@ use Beike\Models\Region; class RegionRepo { + public static function getList() + { + return Region::query()->with('regionZones.zone')->get(); + } + public static function createOrUpdate($data) { $id = $data['id'] ?? 0; diff --git a/beike/Models/Base.php b/beike/Models/Base.php index 615d5965..e843714b 100644 --- a/beike/Models/Base.php +++ b/beike/Models/Base.php @@ -11,9 +11,13 @@ namespace Beike\Models; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Model; class Base extends Model { - + protected function serializeDate(\DateTimeInterface $date): string + { + return Carbon::createFromFormat('Y-m-d H:i:s', $date)->format('Y-m-d H:i:s'); + } } diff --git a/beike/Repositories/CartRepo.php b/beike/Repositories/CartRepo.php index e7a94458..fed1576d 100644 --- a/beike/Repositories/CartRepo.php +++ b/beike/Repositories/CartRepo.php @@ -12,11 +12,20 @@ namespace Beike\Repositories; use Beike\Models\Cart; -use Beike\Models\CartProduct; use Beike\Models\Customer; +use Beike\Models\CartProduct; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; class CartRepo { + /** + * 创建购物车 + * + * @param $customer + * @return Builder|Model|object|null + */ public static function createCart($customer) { if (is_numeric($customer)) { @@ -49,6 +58,12 @@ class CartRepo return $cart; } + + /** + * 清空购物车以及购物车已选中商品 + * + * @param $customer + */ public static function clearSelectedCartProducts($customer) { if (is_numeric($customer)) { @@ -56,6 +71,45 @@ class CartRepo } $customerId = $customer->id; Cart::query()->where('customer_id', $customerId)->delete(); - CartProduct::query()->where('customer_id', $customerId)->where('selected', true)->delete(); + self::selectedCartProductsBuilder($customerId)->delete(); + } + + + /** + * 获取已选中购物车商品列表 + * + * @param $customerId + * @return Builder[]|Collection + */ + public static function selectedCartProducts($customerId) + { + return self::selectedCartProductsBuilder($customerId)->get(); + } + + + /** + * 已选中购物车商品 builder + * + * @param $customerId + * @return Builder + */ + public static function selectedCartProductsBuilder($customerId): Builder + { + return self::allCartProductsBuilder($customerId)->where('selected', true); + } + + + /** + * 当前购物车所有商品 builder + * + * @param $customerId + * @return Builder + */ + public static function allCartProductsBuilder($customerId): Builder + { + return CartProduct::query() + ->with(['product.description', 'sku.product.description']) + ->where('customer_id', $customerId) + ->orderByDesc('id'); } } diff --git a/beike/Shop/Http/Controllers/CheckoutController.php b/beike/Shop/Http/Controllers/CheckoutController.php index 1ceb42e1..09d3e3a8 100644 --- a/beike/Shop/Http/Controllers/CheckoutController.php +++ b/beike/Shop/Http/Controllers/CheckoutController.php @@ -19,8 +19,12 @@ class CheckoutController extends Controller { public function index() { - $data = (new CheckoutService)->checkoutData(); - return view('checkout', $data); + try { + $data = (new CheckoutService)->checkoutData(); + return view('checkout', $data); + } catch (\Exception $e) { + return redirect(shop_route('carts.index')); + } } @@ -32,19 +36,27 @@ class CheckoutController extends Controller */ public function update(Request $request): array { - $requestData = $request->all(); - return (new CheckoutService)->update($requestData); + try { + $requestData = $request->all(); + return (new CheckoutService)->update($requestData); + } catch (\Exception $e) { + return json_fail($e->getMessage()); + } } /** * 确认提交订单 * - * @return Order + * @return mixed * @throws \Throwable */ - public function confirm(): Order + public function confirm() { - return (new CheckoutService)->confirm(); + try { + return (new CheckoutService)->confirm(); + } catch (\Exception $e) { + return json_fail($e->getMessage()); + } } } diff --git a/beike/Shop/Services/CartService.php b/beike/Shop/Services/CartService.php index f950547c..35698434 100644 --- a/beike/Shop/Services/CartService.php +++ b/beike/Shop/Services/CartService.php @@ -11,6 +11,7 @@ namespace Beike\Shop\Services; +use Beike\Repositories\CartRepo; use Exception; use Beike\Models\CartProduct; use Beike\Shop\Http\Resources\CartDetail; @@ -29,10 +30,7 @@ class CartService if (empty($customer)) { return []; } - $cartBuilder = CartProduct::query() - ->with(['product', 'sku.product.description']) - ->where('customer_id', $customer->id) - ->orderByDesc('id'); + $cartBuilder = CartRepo::allCartProductsBuilder($customer->id); if ($selected) { $cartBuilder->where('selected', true); } diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php index 5462f02e..922d5db3 100644 --- a/beike/Shop/Services/CheckoutService.php +++ b/beike/Shop/Services/CheckoutService.php @@ -27,7 +27,12 @@ class CheckoutService { private $customer; private $cart; + private $selectedProducts; + + /** + * @throws \Exception + */ public function __construct($customer = null) { if (is_int($customer) || empty($customer)) { @@ -37,6 +42,10 @@ class CheckoutService throw new \Exception("购物车客户无效"); } $this->cart = CartRepo::createCart($this->customer); + $this->selectedProducts = CartRepo::selectedCartProducts($this->customer->id); + if ($this->selectedProducts->count() == 0) { + throw new \Exception("购物车商品为空"); + } } /** @@ -146,6 +155,6 @@ class CheckoutService 'totals' => $totalService->getTotals(), ]; - return $data; + return hook_filter('checkout.data', $data); } } diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index 75cecdad..e8f37568 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -406,11 +406,7 @@ } .page-title-box { - z-index: 9; - right: 0; - padding: 1.4rem 0 0; - display: flex; - align-items: center; + height: 64px; } .page-title-box .page-title { font-size: 1rem; diff --git a/public/build/beike/admin/js/app.js b/public/build/beike/admin/js/app.js index 48ae3196..10eea3b3 100644 --- a/public/build/beike/admin/js/app.js +++ b/public/build/beike/admin/js/app.js @@ -1,33 +1,33 @@ /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ "./node_modules/axios/index.js": -/*!*************************************!*\ - !*** ./node_modules/axios/index.js ***! - \*************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/index.js": +/*!***************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/index.js ***! + \***************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -module.exports = __webpack_require__(/*! ./lib/axios */ "./node_modules/axios/lib/axios.js"); +module.exports = __webpack_require__(/*! ./lib/axios */ "./node_modules/_axios@0.21.4@axios/lib/axios.js"); /***/ }), -/***/ "./node_modules/axios/lib/adapters/xhr.js": -/*!************************************************!*\ - !*** ./node_modules/axios/lib/adapters/xhr.js ***! - \************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/adapters/xhr.js": +/*!**************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/adapters/xhr.js ***! + \**************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); -var settle = __webpack_require__(/*! ./../core/settle */ "./node_modules/axios/lib/core/settle.js"); -var cookies = __webpack_require__(/*! ./../helpers/cookies */ "./node_modules/axios/lib/helpers/cookies.js"); -var buildURL = __webpack_require__(/*! ./../helpers/buildURL */ "./node_modules/axios/lib/helpers/buildURL.js"); -var buildFullPath = __webpack_require__(/*! ../core/buildFullPath */ "./node_modules/axios/lib/core/buildFullPath.js"); -var parseHeaders = __webpack_require__(/*! ./../helpers/parseHeaders */ "./node_modules/axios/lib/helpers/parseHeaders.js"); -var isURLSameOrigin = __webpack_require__(/*! ./../helpers/isURLSameOrigin */ "./node_modules/axios/lib/helpers/isURLSameOrigin.js"); -var createError = __webpack_require__(/*! ../core/createError */ "./node_modules/axios/lib/core/createError.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var settle = __webpack_require__(/*! ./../core/settle */ "./node_modules/_axios@0.21.4@axios/lib/core/settle.js"); +var cookies = __webpack_require__(/*! ./../helpers/cookies */ "./node_modules/_axios@0.21.4@axios/lib/helpers/cookies.js"); +var buildURL = __webpack_require__(/*! ./../helpers/buildURL */ "./node_modules/_axios@0.21.4@axios/lib/helpers/buildURL.js"); +var buildFullPath = __webpack_require__(/*! ../core/buildFullPath */ "./node_modules/_axios@0.21.4@axios/lib/core/buildFullPath.js"); +var parseHeaders = __webpack_require__(/*! ./../helpers/parseHeaders */ "./node_modules/_axios@0.21.4@axios/lib/helpers/parseHeaders.js"); +var isURLSameOrigin = __webpack_require__(/*! ./../helpers/isURLSameOrigin */ "./node_modules/_axios@0.21.4@axios/lib/helpers/isURLSameOrigin.js"); +var createError = __webpack_require__(/*! ../core/createError */ "./node_modules/_axios@0.21.4@axios/lib/core/createError.js"); module.exports = function xhrAdapter(config) { return new Promise(function dispatchXhrRequest(resolve, reject) { @@ -211,20 +211,20 @@ module.exports = function xhrAdapter(config) { /***/ }), -/***/ "./node_modules/axios/lib/axios.js": -/*!*****************************************!*\ - !*** ./node_modules/axios/lib/axios.js ***! - \*****************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/axios.js": +/*!*******************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/axios.js ***! + \*******************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./utils */ "./node_modules/axios/lib/utils.js"); -var bind = __webpack_require__(/*! ./helpers/bind */ "./node_modules/axios/lib/helpers/bind.js"); -var Axios = __webpack_require__(/*! ./core/Axios */ "./node_modules/axios/lib/core/Axios.js"); -var mergeConfig = __webpack_require__(/*! ./core/mergeConfig */ "./node_modules/axios/lib/core/mergeConfig.js"); -var defaults = __webpack_require__(/*! ./defaults */ "./node_modules/axios/lib/defaults.js"); +var utils = __webpack_require__(/*! ./utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var bind = __webpack_require__(/*! ./helpers/bind */ "./node_modules/_axios@0.21.4@axios/lib/helpers/bind.js"); +var Axios = __webpack_require__(/*! ./core/Axios */ "./node_modules/_axios@0.21.4@axios/lib/core/Axios.js"); +var mergeConfig = __webpack_require__(/*! ./core/mergeConfig */ "./node_modules/_axios@0.21.4@axios/lib/core/mergeConfig.js"); +var defaults = __webpack_require__(/*! ./defaults */ "./node_modules/_axios@0.21.4@axios/lib/defaults.js"); /** * Create an instance of Axios @@ -257,18 +257,18 @@ axios.create = function create(instanceConfig) { }; // Expose Cancel & CancelToken -axios.Cancel = __webpack_require__(/*! ./cancel/Cancel */ "./node_modules/axios/lib/cancel/Cancel.js"); -axios.CancelToken = __webpack_require__(/*! ./cancel/CancelToken */ "./node_modules/axios/lib/cancel/CancelToken.js"); -axios.isCancel = __webpack_require__(/*! ./cancel/isCancel */ "./node_modules/axios/lib/cancel/isCancel.js"); +axios.Cancel = __webpack_require__(/*! ./cancel/Cancel */ "./node_modules/_axios@0.21.4@axios/lib/cancel/Cancel.js"); +axios.CancelToken = __webpack_require__(/*! ./cancel/CancelToken */ "./node_modules/_axios@0.21.4@axios/lib/cancel/CancelToken.js"); +axios.isCancel = __webpack_require__(/*! ./cancel/isCancel */ "./node_modules/_axios@0.21.4@axios/lib/cancel/isCancel.js"); // Expose all/spread axios.all = function all(promises) { return Promise.all(promises); }; -axios.spread = __webpack_require__(/*! ./helpers/spread */ "./node_modules/axios/lib/helpers/spread.js"); +axios.spread = __webpack_require__(/*! ./helpers/spread */ "./node_modules/_axios@0.21.4@axios/lib/helpers/spread.js"); // Expose isAxiosError -axios.isAxiosError = __webpack_require__(/*! ./helpers/isAxiosError */ "./node_modules/axios/lib/helpers/isAxiosError.js"); +axios.isAxiosError = __webpack_require__(/*! ./helpers/isAxiosError */ "./node_modules/_axios@0.21.4@axios/lib/helpers/isAxiosError.js"); module.exports = axios; @@ -278,10 +278,10 @@ module.exports["default"] = axios; /***/ }), -/***/ "./node_modules/axios/lib/cancel/Cancel.js": -/*!*************************************************!*\ - !*** ./node_modules/axios/lib/cancel/Cancel.js ***! - \*************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/cancel/Cancel.js": +/*!***************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/cancel/Cancel.js ***! + \***************************************************************/ /***/ ((module) => { "use strict"; @@ -308,16 +308,16 @@ module.exports = Cancel; /***/ }), -/***/ "./node_modules/axios/lib/cancel/CancelToken.js": -/*!******************************************************!*\ - !*** ./node_modules/axios/lib/cancel/CancelToken.js ***! - \******************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/cancel/CancelToken.js": +/*!********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/cancel/CancelToken.js ***! + \********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var Cancel = __webpack_require__(/*! ./Cancel */ "./node_modules/axios/lib/cancel/Cancel.js"); +var Cancel = __webpack_require__(/*! ./Cancel */ "./node_modules/_axios@0.21.4@axios/lib/cancel/Cancel.js"); /** * A `CancelToken` is an object that can be used to request cancellation of an operation. @@ -376,10 +376,10 @@ module.exports = CancelToken; /***/ }), -/***/ "./node_modules/axios/lib/cancel/isCancel.js": -/*!***************************************************!*\ - !*** ./node_modules/axios/lib/cancel/isCancel.js ***! - \***************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/cancel/isCancel.js": +/*!*****************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/cancel/isCancel.js ***! + \*****************************************************************/ /***/ ((module) => { "use strict"; @@ -392,21 +392,21 @@ module.exports = function isCancel(value) { /***/ }), -/***/ "./node_modules/axios/lib/core/Axios.js": -/*!**********************************************!*\ - !*** ./node_modules/axios/lib/core/Axios.js ***! - \**********************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/Axios.js": +/*!************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/Axios.js ***! + \************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); -var buildURL = __webpack_require__(/*! ../helpers/buildURL */ "./node_modules/axios/lib/helpers/buildURL.js"); -var InterceptorManager = __webpack_require__(/*! ./InterceptorManager */ "./node_modules/axios/lib/core/InterceptorManager.js"); -var dispatchRequest = __webpack_require__(/*! ./dispatchRequest */ "./node_modules/axios/lib/core/dispatchRequest.js"); -var mergeConfig = __webpack_require__(/*! ./mergeConfig */ "./node_modules/axios/lib/core/mergeConfig.js"); -var validator = __webpack_require__(/*! ../helpers/validator */ "./node_modules/axios/lib/helpers/validator.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var buildURL = __webpack_require__(/*! ../helpers/buildURL */ "./node_modules/_axios@0.21.4@axios/lib/helpers/buildURL.js"); +var InterceptorManager = __webpack_require__(/*! ./InterceptorManager */ "./node_modules/_axios@0.21.4@axios/lib/core/InterceptorManager.js"); +var dispatchRequest = __webpack_require__(/*! ./dispatchRequest */ "./node_modules/_axios@0.21.4@axios/lib/core/dispatchRequest.js"); +var mergeConfig = __webpack_require__(/*! ./mergeConfig */ "./node_modules/_axios@0.21.4@axios/lib/core/mergeConfig.js"); +var validator = __webpack_require__(/*! ../helpers/validator */ "./node_modules/_axios@0.21.4@axios/lib/helpers/validator.js"); var validators = validator.validators; /** @@ -551,16 +551,16 @@ module.exports = Axios; /***/ }), -/***/ "./node_modules/axios/lib/core/InterceptorManager.js": -/*!***********************************************************!*\ - !*** ./node_modules/axios/lib/core/InterceptorManager.js ***! - \***********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/InterceptorManager.js": +/*!*************************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/InterceptorManager.js ***! + \*************************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); function InterceptorManager() { this.handlers = []; @@ -616,17 +616,17 @@ module.exports = InterceptorManager; /***/ }), -/***/ "./node_modules/axios/lib/core/buildFullPath.js": -/*!******************************************************!*\ - !*** ./node_modules/axios/lib/core/buildFullPath.js ***! - \******************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/buildFullPath.js": +/*!********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/buildFullPath.js ***! + \********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var isAbsoluteURL = __webpack_require__(/*! ../helpers/isAbsoluteURL */ "./node_modules/axios/lib/helpers/isAbsoluteURL.js"); -var combineURLs = __webpack_require__(/*! ../helpers/combineURLs */ "./node_modules/axios/lib/helpers/combineURLs.js"); +var isAbsoluteURL = __webpack_require__(/*! ../helpers/isAbsoluteURL */ "./node_modules/_axios@0.21.4@axios/lib/helpers/isAbsoluteURL.js"); +var combineURLs = __webpack_require__(/*! ../helpers/combineURLs */ "./node_modules/_axios@0.21.4@axios/lib/helpers/combineURLs.js"); /** * Creates a new URL by combining the baseURL with the requestedURL, @@ -647,16 +647,16 @@ module.exports = function buildFullPath(baseURL, requestedURL) { /***/ }), -/***/ "./node_modules/axios/lib/core/createError.js": -/*!****************************************************!*\ - !*** ./node_modules/axios/lib/core/createError.js ***! - \****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/createError.js": +/*!******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/createError.js ***! + \******************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var enhanceError = __webpack_require__(/*! ./enhanceError */ "./node_modules/axios/lib/core/enhanceError.js"); +var enhanceError = __webpack_require__(/*! ./enhanceError */ "./node_modules/_axios@0.21.4@axios/lib/core/enhanceError.js"); /** * Create an Error with the specified message, config, error code, request and response. @@ -676,19 +676,19 @@ module.exports = function createError(message, config, code, request, response) /***/ }), -/***/ "./node_modules/axios/lib/core/dispatchRequest.js": -/*!********************************************************!*\ - !*** ./node_modules/axios/lib/core/dispatchRequest.js ***! - \********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/dispatchRequest.js": +/*!**********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/dispatchRequest.js ***! + \**********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); -var transformData = __webpack_require__(/*! ./transformData */ "./node_modules/axios/lib/core/transformData.js"); -var isCancel = __webpack_require__(/*! ../cancel/isCancel */ "./node_modules/axios/lib/cancel/isCancel.js"); -var defaults = __webpack_require__(/*! ../defaults */ "./node_modules/axios/lib/defaults.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var transformData = __webpack_require__(/*! ./transformData */ "./node_modules/_axios@0.21.4@axios/lib/core/transformData.js"); +var isCancel = __webpack_require__(/*! ../cancel/isCancel */ "./node_modules/_axios@0.21.4@axios/lib/cancel/isCancel.js"); +var defaults = __webpack_require__(/*! ../defaults */ "./node_modules/_axios@0.21.4@axios/lib/defaults.js"); /** * Throws a `Cancel` if cancellation has been requested. @@ -769,10 +769,10 @@ module.exports = function dispatchRequest(config) { /***/ }), -/***/ "./node_modules/axios/lib/core/enhanceError.js": -/*!*****************************************************!*\ - !*** ./node_modules/axios/lib/core/enhanceError.js ***! - \*****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/enhanceError.js": +/*!*******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/enhanceError.js ***! + \*******************************************************************/ /***/ ((module) => { "use strict"; @@ -822,16 +822,16 @@ module.exports = function enhanceError(error, config, code, request, response) { /***/ }), -/***/ "./node_modules/axios/lib/core/mergeConfig.js": -/*!****************************************************!*\ - !*** ./node_modules/axios/lib/core/mergeConfig.js ***! - \****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/mergeConfig.js": +/*!******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/mergeConfig.js ***! + \******************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); /** * Config-specific merge-function which creates a new config-object @@ -920,16 +920,16 @@ module.exports = function mergeConfig(config1, config2) { /***/ }), -/***/ "./node_modules/axios/lib/core/settle.js": -/*!***********************************************!*\ - !*** ./node_modules/axios/lib/core/settle.js ***! - \***********************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/settle.js": +/*!*************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/settle.js ***! + \*************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var createError = __webpack_require__(/*! ./createError */ "./node_modules/axios/lib/core/createError.js"); +var createError = __webpack_require__(/*! ./createError */ "./node_modules/_axios@0.21.4@axios/lib/core/createError.js"); /** * Resolve or reject a Promise based on response status. @@ -956,17 +956,17 @@ module.exports = function settle(resolve, reject, response) { /***/ }), -/***/ "./node_modules/axios/lib/core/transformData.js": -/*!******************************************************!*\ - !*** ./node_modules/axios/lib/core/transformData.js ***! - \******************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/transformData.js": +/*!********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/transformData.js ***! + \********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); -var defaults = __webpack_require__(/*! ./../defaults */ "./node_modules/axios/lib/defaults.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var defaults = __webpack_require__(/*! ./../defaults */ "./node_modules/_axios@0.21.4@axios/lib/defaults.js"); /** * Transform the data for a request or a response @@ -989,19 +989,19 @@ module.exports = function transformData(data, headers, fns) { /***/ }), -/***/ "./node_modules/axios/lib/defaults.js": -/*!********************************************!*\ - !*** ./node_modules/axios/lib/defaults.js ***! - \********************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/defaults.js": +/*!**********************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/defaults.js ***! + \**********************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -/* provided dependency */ var process = __webpack_require__(/*! process/browser.js */ "./node_modules/process/browser.js"); +/* provided dependency */ var process = __webpack_require__(/*! process/browser.js */ "./node_modules/_process@0.11.10@process/browser.js"); -var utils = __webpack_require__(/*! ./utils */ "./node_modules/axios/lib/utils.js"); -var normalizeHeaderName = __webpack_require__(/*! ./helpers/normalizeHeaderName */ "./node_modules/axios/lib/helpers/normalizeHeaderName.js"); -var enhanceError = __webpack_require__(/*! ./core/enhanceError */ "./node_modules/axios/lib/core/enhanceError.js"); +var utils = __webpack_require__(/*! ./utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var normalizeHeaderName = __webpack_require__(/*! ./helpers/normalizeHeaderName */ "./node_modules/_axios@0.21.4@axios/lib/helpers/normalizeHeaderName.js"); +var enhanceError = __webpack_require__(/*! ./core/enhanceError */ "./node_modules/_axios@0.21.4@axios/lib/core/enhanceError.js"); var DEFAULT_CONTENT_TYPE = { 'Content-Type': 'application/x-www-form-urlencoded' @@ -1017,10 +1017,10 @@ function getDefaultAdapter() { var adapter; if (typeof XMLHttpRequest !== 'undefined') { // For browsers use XHR adapter - adapter = __webpack_require__(/*! ./adapters/xhr */ "./node_modules/axios/lib/adapters/xhr.js"); + adapter = __webpack_require__(/*! ./adapters/xhr */ "./node_modules/_axios@0.21.4@axios/lib/adapters/xhr.js"); } else if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') { // For node use HTTP adapter - adapter = __webpack_require__(/*! ./adapters/http */ "./node_modules/axios/lib/adapters/xhr.js"); + adapter = __webpack_require__(/*! ./adapters/http */ "./node_modules/_axios@0.21.4@axios/lib/adapters/xhr.js"); } return adapter; } @@ -1135,10 +1135,10 @@ module.exports = defaults; /***/ }), -/***/ "./node_modules/axios/lib/helpers/bind.js": -/*!************************************************!*\ - !*** ./node_modules/axios/lib/helpers/bind.js ***! - \************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/bind.js": +/*!**************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/bind.js ***! + \**************************************************************/ /***/ ((module) => { "use strict"; @@ -1157,16 +1157,16 @@ module.exports = function bind(fn, thisArg) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/buildURL.js": -/*!****************************************************!*\ - !*** ./node_modules/axios/lib/helpers/buildURL.js ***! - \****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/buildURL.js": +/*!******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/buildURL.js ***! + \******************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); function encode(val) { return encodeURIComponent(val). @@ -1238,10 +1238,10 @@ module.exports = function buildURL(url, params, paramsSerializer) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/combineURLs.js": -/*!*******************************************************!*\ - !*** ./node_modules/axios/lib/helpers/combineURLs.js ***! - \*******************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/combineURLs.js": +/*!*********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/combineURLs.js ***! + \*********************************************************************/ /***/ ((module) => { "use strict"; @@ -1263,16 +1263,16 @@ module.exports = function combineURLs(baseURL, relativeURL) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/cookies.js": -/*!***************************************************!*\ - !*** ./node_modules/axios/lib/helpers/cookies.js ***! - \***************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/cookies.js": +/*!*****************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/cookies.js ***! + \*****************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); module.exports = ( utils.isStandardBrowserEnv() ? @@ -1327,10 +1327,10 @@ module.exports = ( /***/ }), -/***/ "./node_modules/axios/lib/helpers/isAbsoluteURL.js": -/*!*********************************************************!*\ - !*** ./node_modules/axios/lib/helpers/isAbsoluteURL.js ***! - \*********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/isAbsoluteURL.js": +/*!***********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/isAbsoluteURL.js ***! + \***********************************************************************/ /***/ ((module) => { "use strict"; @@ -1352,10 +1352,10 @@ module.exports = function isAbsoluteURL(url) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/isAxiosError.js": -/*!********************************************************!*\ - !*** ./node_modules/axios/lib/helpers/isAxiosError.js ***! - \********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/isAxiosError.js": +/*!**********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/isAxiosError.js ***! + \**********************************************************************/ /***/ ((module) => { "use strict"; @@ -1374,16 +1374,16 @@ module.exports = function isAxiosError(payload) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/isURLSameOrigin.js": -/*!***********************************************************!*\ - !*** ./node_modules/axios/lib/helpers/isURLSameOrigin.js ***! - \***********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/isURLSameOrigin.js": +/*!*************************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/isURLSameOrigin.js ***! + \*************************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); module.exports = ( utils.isStandardBrowserEnv() ? @@ -1453,16 +1453,16 @@ module.exports = ( /***/ }), -/***/ "./node_modules/axios/lib/helpers/normalizeHeaderName.js": -/*!***************************************************************!*\ - !*** ./node_modules/axios/lib/helpers/normalizeHeaderName.js ***! - \***************************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/normalizeHeaderName.js": +/*!*****************************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/normalizeHeaderName.js ***! + \*****************************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); module.exports = function normalizeHeaderName(headers, normalizedName) { utils.forEach(headers, function processHeader(value, name) { @@ -1476,16 +1476,16 @@ module.exports = function normalizeHeaderName(headers, normalizedName) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/parseHeaders.js": -/*!********************************************************!*\ - !*** ./node_modules/axios/lib/helpers/parseHeaders.js ***! - \********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/parseHeaders.js": +/*!**********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/parseHeaders.js ***! + \**********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); // Headers whose duplicates are ignored by node // c.f. https://nodejs.org/api/http.html#http_message_headers @@ -1540,10 +1540,10 @@ module.exports = function parseHeaders(headers) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/spread.js": -/*!**************************************************!*\ - !*** ./node_modules/axios/lib/helpers/spread.js ***! - \**************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/spread.js": +/*!****************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/spread.js ***! + \****************************************************************/ /***/ ((module) => { "use strict"; @@ -1578,16 +1578,16 @@ module.exports = function spread(callback) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/validator.js": -/*!*****************************************************!*\ - !*** ./node_modules/axios/lib/helpers/validator.js ***! - \*****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/validator.js": +/*!*******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/validator.js ***! + \*******************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var pkg = __webpack_require__(/*! ./../../package.json */ "./node_modules/axios/package.json"); +var pkg = __webpack_require__(/*! ./../../package.json */ "./node_modules/_axios@0.21.4@axios/package.json"); var validators = {}; @@ -1694,16 +1694,16 @@ module.exports = { /***/ }), -/***/ "./node_modules/axios/lib/utils.js": -/*!*****************************************!*\ - !*** ./node_modules/axios/lib/utils.js ***! - \*****************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/utils.js": +/*!*******************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/utils.js ***! + \*******************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var bind = __webpack_require__(/*! ./helpers/bind */ "./node_modules/axios/lib/helpers/bind.js"); +var bind = __webpack_require__(/*! ./helpers/bind */ "./node_modules/_axios@0.21.4@axios/lib/helpers/bind.js"); // utils is a library of generic helper functions non-specific to axios @@ -2407,7 +2407,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ }); function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } -window.axios = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); +window.axios = __webpack_require__(/*! axios */ "./node_modules/_axios@0.21.4@axios/index.js"); var token = document.querySelector('meta[name="csrf-token"]').content; var base = document.querySelector('base').href; var instance = axios.create({ @@ -2616,10 +2616,10 @@ __webpack_require__.r(__webpack_exports__); /***/ }), -/***/ "./node_modules/process/browser.js": -/*!*****************************************!*\ - !*** ./node_modules/process/browser.js ***! - \*****************************************/ +/***/ "./node_modules/_process@0.11.10@process/browser.js": +/*!**********************************************************!*\ + !*** ./node_modules/_process@0.11.10@process/browser.js ***! + \**********************************************************/ /***/ ((module) => { // shim for using process in browser @@ -2810,14 +2810,14 @@ process.umask = function() { return 0; }; /***/ }), -/***/ "./node_modules/axios/package.json": -/*!*****************************************!*\ - !*** ./node_modules/axios/package.json ***! - \*****************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/package.json": +/*!*******************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/package.json ***! + \*******************************************************/ /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"Promise based HTTP client for the browser and node.js","main":"index.js","scripts":{"test":"grunt test","start":"node ./sandbox/server.js","build":"NODE_ENV=production grunt build","preversion":"npm test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json","postversion":"git push && git push --tags","examples":"node ./examples/server.js","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","fix":"eslint --fix lib/**/*.js"},"repository":{"type":"git","url":"https://github.com/axios/axios.git"},"keywords":["xhr","http","ajax","promise","node"],"author":"Matt Zabriskie","license":"MIT","bugs":{"url":"https://github.com/axios/axios/issues"},"homepage":"https://axios-http.com","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"jsdelivr":"dist/axios.min.js","unpkg":"dist/axios.min.js","typings":"./index.d.ts","dependencies":{"follow-redirects":"^1.14.0"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}]}'); +module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"Promise based HTTP client for the browser and node.js","main":"index.js","scripts":{"test":"grunt test","start":"node ./sandbox/server.js","build":"NODE_ENV=production grunt build","preversion":"npm test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json","postversion":"git push && git push --tags","examples":"node ./examples/server.js","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","fix":"eslint --fix lib/**/*.js"},"repository":{"type":"git","url":"https://github.com/axios/axios.git"},"keywords":["xhr","http","ajax","promise","node"],"author":"Matt Zabriskie","license":"MIT","bugs":{"url":"https://github.com/axios/axios/issues"},"homepage":"https://axios-http.com","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"jsdelivr":"dist/axios.min.js","unpkg":"dist/axios.min.js","typings":"./index.d.ts","dependencies":{"follow-redirects":"^1.14.0"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}],"__npminstall_done":true,"_from":"axios@0.21.4","_resolved":"https://registry.npmmirror.com/axios/-/axios-0.21.4.tgz"}'); /***/ }) diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js index 814ce2f5..f7e59dd6 100644 --- a/public/build/beike/shop/default/js/app.js +++ b/public/build/beike/shop/default/js/app.js @@ -1,33 +1,33 @@ /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ "./node_modules/axios/index.js": -/*!*************************************!*\ - !*** ./node_modules/axios/index.js ***! - \*************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/index.js": +/*!***************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/index.js ***! + \***************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { -module.exports = __webpack_require__(/*! ./lib/axios */ "./node_modules/axios/lib/axios.js"); +module.exports = __webpack_require__(/*! ./lib/axios */ "./node_modules/_axios@0.21.4@axios/lib/axios.js"); /***/ }), -/***/ "./node_modules/axios/lib/adapters/xhr.js": -/*!************************************************!*\ - !*** ./node_modules/axios/lib/adapters/xhr.js ***! - \************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/adapters/xhr.js": +/*!**************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/adapters/xhr.js ***! + \**************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); -var settle = __webpack_require__(/*! ./../core/settle */ "./node_modules/axios/lib/core/settle.js"); -var cookies = __webpack_require__(/*! ./../helpers/cookies */ "./node_modules/axios/lib/helpers/cookies.js"); -var buildURL = __webpack_require__(/*! ./../helpers/buildURL */ "./node_modules/axios/lib/helpers/buildURL.js"); -var buildFullPath = __webpack_require__(/*! ../core/buildFullPath */ "./node_modules/axios/lib/core/buildFullPath.js"); -var parseHeaders = __webpack_require__(/*! ./../helpers/parseHeaders */ "./node_modules/axios/lib/helpers/parseHeaders.js"); -var isURLSameOrigin = __webpack_require__(/*! ./../helpers/isURLSameOrigin */ "./node_modules/axios/lib/helpers/isURLSameOrigin.js"); -var createError = __webpack_require__(/*! ../core/createError */ "./node_modules/axios/lib/core/createError.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var settle = __webpack_require__(/*! ./../core/settle */ "./node_modules/_axios@0.21.4@axios/lib/core/settle.js"); +var cookies = __webpack_require__(/*! ./../helpers/cookies */ "./node_modules/_axios@0.21.4@axios/lib/helpers/cookies.js"); +var buildURL = __webpack_require__(/*! ./../helpers/buildURL */ "./node_modules/_axios@0.21.4@axios/lib/helpers/buildURL.js"); +var buildFullPath = __webpack_require__(/*! ../core/buildFullPath */ "./node_modules/_axios@0.21.4@axios/lib/core/buildFullPath.js"); +var parseHeaders = __webpack_require__(/*! ./../helpers/parseHeaders */ "./node_modules/_axios@0.21.4@axios/lib/helpers/parseHeaders.js"); +var isURLSameOrigin = __webpack_require__(/*! ./../helpers/isURLSameOrigin */ "./node_modules/_axios@0.21.4@axios/lib/helpers/isURLSameOrigin.js"); +var createError = __webpack_require__(/*! ../core/createError */ "./node_modules/_axios@0.21.4@axios/lib/core/createError.js"); module.exports = function xhrAdapter(config) { return new Promise(function dispatchXhrRequest(resolve, reject) { @@ -211,20 +211,20 @@ module.exports = function xhrAdapter(config) { /***/ }), -/***/ "./node_modules/axios/lib/axios.js": -/*!*****************************************!*\ - !*** ./node_modules/axios/lib/axios.js ***! - \*****************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/axios.js": +/*!*******************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/axios.js ***! + \*******************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./utils */ "./node_modules/axios/lib/utils.js"); -var bind = __webpack_require__(/*! ./helpers/bind */ "./node_modules/axios/lib/helpers/bind.js"); -var Axios = __webpack_require__(/*! ./core/Axios */ "./node_modules/axios/lib/core/Axios.js"); -var mergeConfig = __webpack_require__(/*! ./core/mergeConfig */ "./node_modules/axios/lib/core/mergeConfig.js"); -var defaults = __webpack_require__(/*! ./defaults */ "./node_modules/axios/lib/defaults.js"); +var utils = __webpack_require__(/*! ./utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var bind = __webpack_require__(/*! ./helpers/bind */ "./node_modules/_axios@0.21.4@axios/lib/helpers/bind.js"); +var Axios = __webpack_require__(/*! ./core/Axios */ "./node_modules/_axios@0.21.4@axios/lib/core/Axios.js"); +var mergeConfig = __webpack_require__(/*! ./core/mergeConfig */ "./node_modules/_axios@0.21.4@axios/lib/core/mergeConfig.js"); +var defaults = __webpack_require__(/*! ./defaults */ "./node_modules/_axios@0.21.4@axios/lib/defaults.js"); /** * Create an instance of Axios @@ -257,18 +257,18 @@ axios.create = function create(instanceConfig) { }; // Expose Cancel & CancelToken -axios.Cancel = __webpack_require__(/*! ./cancel/Cancel */ "./node_modules/axios/lib/cancel/Cancel.js"); -axios.CancelToken = __webpack_require__(/*! ./cancel/CancelToken */ "./node_modules/axios/lib/cancel/CancelToken.js"); -axios.isCancel = __webpack_require__(/*! ./cancel/isCancel */ "./node_modules/axios/lib/cancel/isCancel.js"); +axios.Cancel = __webpack_require__(/*! ./cancel/Cancel */ "./node_modules/_axios@0.21.4@axios/lib/cancel/Cancel.js"); +axios.CancelToken = __webpack_require__(/*! ./cancel/CancelToken */ "./node_modules/_axios@0.21.4@axios/lib/cancel/CancelToken.js"); +axios.isCancel = __webpack_require__(/*! ./cancel/isCancel */ "./node_modules/_axios@0.21.4@axios/lib/cancel/isCancel.js"); // Expose all/spread axios.all = function all(promises) { return Promise.all(promises); }; -axios.spread = __webpack_require__(/*! ./helpers/spread */ "./node_modules/axios/lib/helpers/spread.js"); +axios.spread = __webpack_require__(/*! ./helpers/spread */ "./node_modules/_axios@0.21.4@axios/lib/helpers/spread.js"); // Expose isAxiosError -axios.isAxiosError = __webpack_require__(/*! ./helpers/isAxiosError */ "./node_modules/axios/lib/helpers/isAxiosError.js"); +axios.isAxiosError = __webpack_require__(/*! ./helpers/isAxiosError */ "./node_modules/_axios@0.21.4@axios/lib/helpers/isAxiosError.js"); module.exports = axios; @@ -278,10 +278,10 @@ module.exports["default"] = axios; /***/ }), -/***/ "./node_modules/axios/lib/cancel/Cancel.js": -/*!*************************************************!*\ - !*** ./node_modules/axios/lib/cancel/Cancel.js ***! - \*************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/cancel/Cancel.js": +/*!***************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/cancel/Cancel.js ***! + \***************************************************************/ /***/ ((module) => { "use strict"; @@ -308,16 +308,16 @@ module.exports = Cancel; /***/ }), -/***/ "./node_modules/axios/lib/cancel/CancelToken.js": -/*!******************************************************!*\ - !*** ./node_modules/axios/lib/cancel/CancelToken.js ***! - \******************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/cancel/CancelToken.js": +/*!********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/cancel/CancelToken.js ***! + \********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var Cancel = __webpack_require__(/*! ./Cancel */ "./node_modules/axios/lib/cancel/Cancel.js"); +var Cancel = __webpack_require__(/*! ./Cancel */ "./node_modules/_axios@0.21.4@axios/lib/cancel/Cancel.js"); /** * A `CancelToken` is an object that can be used to request cancellation of an operation. @@ -376,10 +376,10 @@ module.exports = CancelToken; /***/ }), -/***/ "./node_modules/axios/lib/cancel/isCancel.js": -/*!***************************************************!*\ - !*** ./node_modules/axios/lib/cancel/isCancel.js ***! - \***************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/cancel/isCancel.js": +/*!*****************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/cancel/isCancel.js ***! + \*****************************************************************/ /***/ ((module) => { "use strict"; @@ -392,21 +392,21 @@ module.exports = function isCancel(value) { /***/ }), -/***/ "./node_modules/axios/lib/core/Axios.js": -/*!**********************************************!*\ - !*** ./node_modules/axios/lib/core/Axios.js ***! - \**********************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/Axios.js": +/*!************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/Axios.js ***! + \************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); -var buildURL = __webpack_require__(/*! ../helpers/buildURL */ "./node_modules/axios/lib/helpers/buildURL.js"); -var InterceptorManager = __webpack_require__(/*! ./InterceptorManager */ "./node_modules/axios/lib/core/InterceptorManager.js"); -var dispatchRequest = __webpack_require__(/*! ./dispatchRequest */ "./node_modules/axios/lib/core/dispatchRequest.js"); -var mergeConfig = __webpack_require__(/*! ./mergeConfig */ "./node_modules/axios/lib/core/mergeConfig.js"); -var validator = __webpack_require__(/*! ../helpers/validator */ "./node_modules/axios/lib/helpers/validator.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var buildURL = __webpack_require__(/*! ../helpers/buildURL */ "./node_modules/_axios@0.21.4@axios/lib/helpers/buildURL.js"); +var InterceptorManager = __webpack_require__(/*! ./InterceptorManager */ "./node_modules/_axios@0.21.4@axios/lib/core/InterceptorManager.js"); +var dispatchRequest = __webpack_require__(/*! ./dispatchRequest */ "./node_modules/_axios@0.21.4@axios/lib/core/dispatchRequest.js"); +var mergeConfig = __webpack_require__(/*! ./mergeConfig */ "./node_modules/_axios@0.21.4@axios/lib/core/mergeConfig.js"); +var validator = __webpack_require__(/*! ../helpers/validator */ "./node_modules/_axios@0.21.4@axios/lib/helpers/validator.js"); var validators = validator.validators; /** @@ -551,16 +551,16 @@ module.exports = Axios; /***/ }), -/***/ "./node_modules/axios/lib/core/InterceptorManager.js": -/*!***********************************************************!*\ - !*** ./node_modules/axios/lib/core/InterceptorManager.js ***! - \***********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/InterceptorManager.js": +/*!*************************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/InterceptorManager.js ***! + \*************************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); function InterceptorManager() { this.handlers = []; @@ -616,17 +616,17 @@ module.exports = InterceptorManager; /***/ }), -/***/ "./node_modules/axios/lib/core/buildFullPath.js": -/*!******************************************************!*\ - !*** ./node_modules/axios/lib/core/buildFullPath.js ***! - \******************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/buildFullPath.js": +/*!********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/buildFullPath.js ***! + \********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var isAbsoluteURL = __webpack_require__(/*! ../helpers/isAbsoluteURL */ "./node_modules/axios/lib/helpers/isAbsoluteURL.js"); -var combineURLs = __webpack_require__(/*! ../helpers/combineURLs */ "./node_modules/axios/lib/helpers/combineURLs.js"); +var isAbsoluteURL = __webpack_require__(/*! ../helpers/isAbsoluteURL */ "./node_modules/_axios@0.21.4@axios/lib/helpers/isAbsoluteURL.js"); +var combineURLs = __webpack_require__(/*! ../helpers/combineURLs */ "./node_modules/_axios@0.21.4@axios/lib/helpers/combineURLs.js"); /** * Creates a new URL by combining the baseURL with the requestedURL, @@ -647,16 +647,16 @@ module.exports = function buildFullPath(baseURL, requestedURL) { /***/ }), -/***/ "./node_modules/axios/lib/core/createError.js": -/*!****************************************************!*\ - !*** ./node_modules/axios/lib/core/createError.js ***! - \****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/createError.js": +/*!******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/createError.js ***! + \******************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var enhanceError = __webpack_require__(/*! ./enhanceError */ "./node_modules/axios/lib/core/enhanceError.js"); +var enhanceError = __webpack_require__(/*! ./enhanceError */ "./node_modules/_axios@0.21.4@axios/lib/core/enhanceError.js"); /** * Create an Error with the specified message, config, error code, request and response. @@ -676,19 +676,19 @@ module.exports = function createError(message, config, code, request, response) /***/ }), -/***/ "./node_modules/axios/lib/core/dispatchRequest.js": -/*!********************************************************!*\ - !*** ./node_modules/axios/lib/core/dispatchRequest.js ***! - \********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/dispatchRequest.js": +/*!**********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/dispatchRequest.js ***! + \**********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); -var transformData = __webpack_require__(/*! ./transformData */ "./node_modules/axios/lib/core/transformData.js"); -var isCancel = __webpack_require__(/*! ../cancel/isCancel */ "./node_modules/axios/lib/cancel/isCancel.js"); -var defaults = __webpack_require__(/*! ../defaults */ "./node_modules/axios/lib/defaults.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var transformData = __webpack_require__(/*! ./transformData */ "./node_modules/_axios@0.21.4@axios/lib/core/transformData.js"); +var isCancel = __webpack_require__(/*! ../cancel/isCancel */ "./node_modules/_axios@0.21.4@axios/lib/cancel/isCancel.js"); +var defaults = __webpack_require__(/*! ../defaults */ "./node_modules/_axios@0.21.4@axios/lib/defaults.js"); /** * Throws a `Cancel` if cancellation has been requested. @@ -769,10 +769,10 @@ module.exports = function dispatchRequest(config) { /***/ }), -/***/ "./node_modules/axios/lib/core/enhanceError.js": -/*!*****************************************************!*\ - !*** ./node_modules/axios/lib/core/enhanceError.js ***! - \*****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/enhanceError.js": +/*!*******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/enhanceError.js ***! + \*******************************************************************/ /***/ ((module) => { "use strict"; @@ -822,16 +822,16 @@ module.exports = function enhanceError(error, config, code, request, response) { /***/ }), -/***/ "./node_modules/axios/lib/core/mergeConfig.js": -/*!****************************************************!*\ - !*** ./node_modules/axios/lib/core/mergeConfig.js ***! - \****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/mergeConfig.js": +/*!******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/mergeConfig.js ***! + \******************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); /** * Config-specific merge-function which creates a new config-object @@ -920,16 +920,16 @@ module.exports = function mergeConfig(config1, config2) { /***/ }), -/***/ "./node_modules/axios/lib/core/settle.js": -/*!***********************************************!*\ - !*** ./node_modules/axios/lib/core/settle.js ***! - \***********************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/settle.js": +/*!*************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/settle.js ***! + \*************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var createError = __webpack_require__(/*! ./createError */ "./node_modules/axios/lib/core/createError.js"); +var createError = __webpack_require__(/*! ./createError */ "./node_modules/_axios@0.21.4@axios/lib/core/createError.js"); /** * Resolve or reject a Promise based on response status. @@ -956,17 +956,17 @@ module.exports = function settle(resolve, reject, response) { /***/ }), -/***/ "./node_modules/axios/lib/core/transformData.js": -/*!******************************************************!*\ - !*** ./node_modules/axios/lib/core/transformData.js ***! - \******************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/core/transformData.js": +/*!********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/core/transformData.js ***! + \********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); -var defaults = __webpack_require__(/*! ./../defaults */ "./node_modules/axios/lib/defaults.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var defaults = __webpack_require__(/*! ./../defaults */ "./node_modules/_axios@0.21.4@axios/lib/defaults.js"); /** * Transform the data for a request or a response @@ -989,19 +989,19 @@ module.exports = function transformData(data, headers, fns) { /***/ }), -/***/ "./node_modules/axios/lib/defaults.js": -/*!********************************************!*\ - !*** ./node_modules/axios/lib/defaults.js ***! - \********************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/defaults.js": +/*!**********************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/defaults.js ***! + \**********************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -/* provided dependency */ var process = __webpack_require__(/*! process/browser.js */ "./node_modules/process/browser.js"); +/* provided dependency */ var process = __webpack_require__(/*! process/browser.js */ "./node_modules/_process@0.11.10@process/browser.js"); -var utils = __webpack_require__(/*! ./utils */ "./node_modules/axios/lib/utils.js"); -var normalizeHeaderName = __webpack_require__(/*! ./helpers/normalizeHeaderName */ "./node_modules/axios/lib/helpers/normalizeHeaderName.js"); -var enhanceError = __webpack_require__(/*! ./core/enhanceError */ "./node_modules/axios/lib/core/enhanceError.js"); +var utils = __webpack_require__(/*! ./utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); +var normalizeHeaderName = __webpack_require__(/*! ./helpers/normalizeHeaderName */ "./node_modules/_axios@0.21.4@axios/lib/helpers/normalizeHeaderName.js"); +var enhanceError = __webpack_require__(/*! ./core/enhanceError */ "./node_modules/_axios@0.21.4@axios/lib/core/enhanceError.js"); var DEFAULT_CONTENT_TYPE = { 'Content-Type': 'application/x-www-form-urlencoded' @@ -1017,10 +1017,10 @@ function getDefaultAdapter() { var adapter; if (typeof XMLHttpRequest !== 'undefined') { // For browsers use XHR adapter - adapter = __webpack_require__(/*! ./adapters/xhr */ "./node_modules/axios/lib/adapters/xhr.js"); + adapter = __webpack_require__(/*! ./adapters/xhr */ "./node_modules/_axios@0.21.4@axios/lib/adapters/xhr.js"); } else if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') { // For node use HTTP adapter - adapter = __webpack_require__(/*! ./adapters/http */ "./node_modules/axios/lib/adapters/xhr.js"); + adapter = __webpack_require__(/*! ./adapters/http */ "./node_modules/_axios@0.21.4@axios/lib/adapters/xhr.js"); } return adapter; } @@ -1135,10 +1135,10 @@ module.exports = defaults; /***/ }), -/***/ "./node_modules/axios/lib/helpers/bind.js": -/*!************************************************!*\ - !*** ./node_modules/axios/lib/helpers/bind.js ***! - \************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/bind.js": +/*!**************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/bind.js ***! + \**************************************************************/ /***/ ((module) => { "use strict"; @@ -1157,16 +1157,16 @@ module.exports = function bind(fn, thisArg) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/buildURL.js": -/*!****************************************************!*\ - !*** ./node_modules/axios/lib/helpers/buildURL.js ***! - \****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/buildURL.js": +/*!******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/buildURL.js ***! + \******************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); function encode(val) { return encodeURIComponent(val). @@ -1238,10 +1238,10 @@ module.exports = function buildURL(url, params, paramsSerializer) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/combineURLs.js": -/*!*******************************************************!*\ - !*** ./node_modules/axios/lib/helpers/combineURLs.js ***! - \*******************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/combineURLs.js": +/*!*********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/combineURLs.js ***! + \*********************************************************************/ /***/ ((module) => { "use strict"; @@ -1263,16 +1263,16 @@ module.exports = function combineURLs(baseURL, relativeURL) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/cookies.js": -/*!***************************************************!*\ - !*** ./node_modules/axios/lib/helpers/cookies.js ***! - \***************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/cookies.js": +/*!*****************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/cookies.js ***! + \*****************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); module.exports = ( utils.isStandardBrowserEnv() ? @@ -1327,10 +1327,10 @@ module.exports = ( /***/ }), -/***/ "./node_modules/axios/lib/helpers/isAbsoluteURL.js": -/*!*********************************************************!*\ - !*** ./node_modules/axios/lib/helpers/isAbsoluteURL.js ***! - \*********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/isAbsoluteURL.js": +/*!***********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/isAbsoluteURL.js ***! + \***********************************************************************/ /***/ ((module) => { "use strict"; @@ -1352,10 +1352,10 @@ module.exports = function isAbsoluteURL(url) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/isAxiosError.js": -/*!********************************************************!*\ - !*** ./node_modules/axios/lib/helpers/isAxiosError.js ***! - \********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/isAxiosError.js": +/*!**********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/isAxiosError.js ***! + \**********************************************************************/ /***/ ((module) => { "use strict"; @@ -1374,16 +1374,16 @@ module.exports = function isAxiosError(payload) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/isURLSameOrigin.js": -/*!***********************************************************!*\ - !*** ./node_modules/axios/lib/helpers/isURLSameOrigin.js ***! - \***********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/isURLSameOrigin.js": +/*!*************************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/isURLSameOrigin.js ***! + \*************************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); module.exports = ( utils.isStandardBrowserEnv() ? @@ -1453,16 +1453,16 @@ module.exports = ( /***/ }), -/***/ "./node_modules/axios/lib/helpers/normalizeHeaderName.js": -/*!***************************************************************!*\ - !*** ./node_modules/axios/lib/helpers/normalizeHeaderName.js ***! - \***************************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/normalizeHeaderName.js": +/*!*****************************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/normalizeHeaderName.js ***! + \*****************************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); module.exports = function normalizeHeaderName(headers, normalizedName) { utils.forEach(headers, function processHeader(value, name) { @@ -1476,16 +1476,16 @@ module.exports = function normalizeHeaderName(headers, normalizedName) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/parseHeaders.js": -/*!********************************************************!*\ - !*** ./node_modules/axios/lib/helpers/parseHeaders.js ***! - \********************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/parseHeaders.js": +/*!**********************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/parseHeaders.js ***! + \**********************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js"); +var utils = __webpack_require__(/*! ./../utils */ "./node_modules/_axios@0.21.4@axios/lib/utils.js"); // Headers whose duplicates are ignored by node // c.f. https://nodejs.org/api/http.html#http_message_headers @@ -1540,10 +1540,10 @@ module.exports = function parseHeaders(headers) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/spread.js": -/*!**************************************************!*\ - !*** ./node_modules/axios/lib/helpers/spread.js ***! - \**************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/spread.js": +/*!****************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/spread.js ***! + \****************************************************************/ /***/ ((module) => { "use strict"; @@ -1578,16 +1578,16 @@ module.exports = function spread(callback) { /***/ }), -/***/ "./node_modules/axios/lib/helpers/validator.js": -/*!*****************************************************!*\ - !*** ./node_modules/axios/lib/helpers/validator.js ***! - \*****************************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/helpers/validator.js": +/*!*******************************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/helpers/validator.js ***! + \*******************************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var pkg = __webpack_require__(/*! ./../../package.json */ "./node_modules/axios/package.json"); +var pkg = __webpack_require__(/*! ./../../package.json */ "./node_modules/_axios@0.21.4@axios/package.json"); var validators = {}; @@ -1694,16 +1694,16 @@ module.exports = { /***/ }), -/***/ "./node_modules/axios/lib/utils.js": -/*!*****************************************!*\ - !*** ./node_modules/axios/lib/utils.js ***! - \*****************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/lib/utils.js": +/*!*******************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/lib/utils.js ***! + \*******************************************************/ /***/ ((module, __unused_webpack_exports, __webpack_require__) => { "use strict"; -var bind = __webpack_require__(/*! ./helpers/bind */ "./node_modules/axios/lib/helpers/bind.js"); +var bind = __webpack_require__(/*! ./helpers/bind */ "./node_modules/_axios@0.21.4@axios/lib/helpers/bind.js"); // utils is a library of generic helper functions non-specific to axios @@ -2289,7 +2289,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export */ }); function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } -window.axios = __webpack_require__(/*! axios */ "./node_modules/axios/index.js"); +window.axios = __webpack_require__(/*! axios */ "./node_modules/_axios@0.21.4@axios/index.js"); var token = document.querySelector('meta[name="csrf-token"]').content; var base = document.querySelector('base').href; var instance = axios.create({ @@ -2420,10 +2420,10 @@ axios.defaults.baseURL = base; /***/ }), -/***/ "./node_modules/process/browser.js": -/*!*****************************************!*\ - !*** ./node_modules/process/browser.js ***! - \*****************************************/ +/***/ "./node_modules/_process@0.11.10@process/browser.js": +/*!**********************************************************!*\ + !*** ./node_modules/_process@0.11.10@process/browser.js ***! + \**********************************************************/ /***/ ((module) => { // shim for using process in browser @@ -2614,14 +2614,14 @@ process.umask = function() { return 0; }; /***/ }), -/***/ "./node_modules/axios/package.json": -/*!*****************************************!*\ - !*** ./node_modules/axios/package.json ***! - \*****************************************/ +/***/ "./node_modules/_axios@0.21.4@axios/package.json": +/*!*******************************************************!*\ + !*** ./node_modules/_axios@0.21.4@axios/package.json ***! + \*******************************************************/ /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"Promise based HTTP client for the browser and node.js","main":"index.js","scripts":{"test":"grunt test","start":"node ./sandbox/server.js","build":"NODE_ENV=production grunt build","preversion":"npm test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json","postversion":"git push && git push --tags","examples":"node ./examples/server.js","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","fix":"eslint --fix lib/**/*.js"},"repository":{"type":"git","url":"https://github.com/axios/axios.git"},"keywords":["xhr","http","ajax","promise","node"],"author":"Matt Zabriskie","license":"MIT","bugs":{"url":"https://github.com/axios/axios/issues"},"homepage":"https://axios-http.com","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"jsdelivr":"dist/axios.min.js","unpkg":"dist/axios.min.js","typings":"./index.d.ts","dependencies":{"follow-redirects":"^1.14.0"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}]}'); +module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"Promise based HTTP client for the browser and node.js","main":"index.js","scripts":{"test":"grunt test","start":"node ./sandbox/server.js","build":"NODE_ENV=production grunt build","preversion":"npm test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json","postversion":"git push && git push --tags","examples":"node ./examples/server.js","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","fix":"eslint --fix lib/**/*.js"},"repository":{"type":"git","url":"https://github.com/axios/axios.git"},"keywords":["xhr","http","ajax","promise","node"],"author":"Matt Zabriskie","license":"MIT","bugs":{"url":"https://github.com/axios/axios/issues"},"homepage":"https://axios-http.com","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"jsdelivr":"dist/axios.min.js","unpkg":"dist/axios.min.js","typings":"./index.d.ts","dependencies":{"follow-redirects":"^1.14.0"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}],"__npminstall_done":true,"_from":"axios@0.21.4","_resolved":"https://registry.npmmirror.com/axios/-/axios-0.21.4.tgz"}'); /***/ }) diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index c6e7e5ee..57b9ba07 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -164,17 +164,7 @@ } .page-title-box { - // position: fixed; - // top: 60px; - // left: 190px; - z-index: 9; - right: 0; - // height: 58px; - padding: 1.4rem 0 0; - // background-color: #fff; - // border-bottom: 1px solid #f1f1f1; - display: flex; - align-items: center; + height: 64px; .page-title { font-size: 1rem; diff --git a/resources/beike/admin/views/layouts/master.blade.php b/resources/beike/admin/views/layouts/master.blade.php index 4407b021..6a8a2ba7 100644 --- a/resources/beike/admin/views/layouts/master.blade.php +++ b/resources/beike/admin/views/layouts/master.blade.php @@ -30,9 +30,12 @@
-
@yield('title')
-
- @yield('content') +
+
@yield('title')
+ @yield('page-title-right') +
+
+ @yield('content')
diff --git a/resources/beike/admin/views/pages/design/builder/menu.blade.php b/resources/beike/admin/views/pages/design/builder/menu.blade.php index 0984fd34..584fd87d 100644 --- a/resources/beike/admin/views/pages/design/builder/menu.blade.php +++ b/resources/beike/admin/views/pages/design/builder/menu.blade.php @@ -8,6 +8,10 @@ @endpush +@section('page-title-right') + +@endsection + @section('content')
@@ -125,12 +129,9 @@
-
- -
- +

类型

{ + app.saveButtonClicked() + }) @endpush diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 5b755b0c..6f97d2ec 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -10,13 +10,12 @@ */ return [ - // action + 'error_required' => 'Please fill out the :name', + 'unauthenticated' => 'Please login first', 'success' => 'Success', 'created_success' => 'Created Successfully!', 'deleted_success' => 'Deleted Successfully!', 'restored_success' => 'Restore Successfully!', 'updated_success' => 'Updated Successfully!', - 'created_success' => 'Created Successfully!', 'get_success' => 'Get Successfully!', - 'error_required' => 'Please fill out the :name', ]; diff --git a/resources/lang/zh_cn/admin/language.php b/resources/lang/zh_cn/admin/language.php index 0e8e2fb6..e8ebe7de 100644 --- a/resources/lang/zh_cn/admin/language.php +++ b/resources/lang/zh_cn/admin/language.php @@ -10,9 +10,9 @@ */ return [ - 'languages_index' => '品牌列表', - 'languages_create' => '创建品牌', - 'languages_show' => '品牌详情', - 'languages_update' => '更新品牌', - 'languages_delete' => '删除品牌' + 'languages_index' => '语言列表', + 'languages_create' => '创建语言', + 'languages_show' => '语言详情', + 'languages_update' => '更新语言', + 'languages_delete' => '删除语言' ]; diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index ca540de8..9eda8f14 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -10,6 +10,13 @@ */ return [ 'error_required' => '请填写 :name', + 'unauthenticated' => '请先登录', + 'success' => '成功', + 'created_success' => '创建成功!', + 'deleted_success' => '删除成功!', + 'restored_success' => '恢复成功!', + 'updated_success' => '更新成功!', + 'get_success' => '获取成功!', ]; diff --git a/themes/default/account/order_success.blade.php b/themes/default/account/order_success.blade.php index 39f0b47e..944803c5 100644 --- a/themes/default/account/order_success.blade.php +++ b/themes/default/account/order_success.blade.php @@ -34,14 +34,14 @@ -
温馨提示：温馨提示温馨提示温馨提示温馨提示温馨提示温馨提示温馨提示
+
温馨提示：您的订单已生成成功，请尽快完成支付哦～
您还可以：继续采购
如果您在订单过程中有任何问题，可以随时联系我们客服人员：
-
Emaill: ceshi@opencart.cn
-
服务热线: +86 1878017xxxx
+
Emaill: {{ system_setting('base.email', '') }}
+
服务热线: {{ system_setting('base.telephone', '') }}
diff --git a/themes/default/cart/mini.blade.php b/themes/default/cart/mini.blade.php index 0ed755cd..d6a4e7b3 100644 --- a/themes/default/cart/mini.blade.php +++ b/themes/default/cart/mini.blade.php @@ -3,28 +3,50 @@
-
- @foreach ($carts as $cart) -
-
-
-
{{ $cart['name'] }}
-
-
{{ $cart['price_format'] }} x {{ $cart['quantity'] }}
- 删除 + @if ($carts) +
+ @foreach ($carts as $cart) +
+
+
+
{{ $cart['name'] }}
+
+
{{ $cart['price_format'] }} x {{ $cart['quantity'] }} +
+ + 删除 +
+
+
+ @endforeach +
+ @else +
+
+
+ +
+
+
您的购物车是空的
+

您可以去看看有哪些想买的

+
+
+ 去逛逛
- @endforeach -
+ @endif
-
-
- 小计（{{ $quantity }}） - {{ $amount_format }} + +@if ($carts) +
+
+ 小计（{{ $quantity }}） + {{ $amount_format }} +
+
+ 去结账 + 查看购物车 +
-
- 去结账 - 查看购物车 -
-
\ No newline at end of file +@endif