From 25cbf7f8efb8c6f2654507241c0300652ab2eedf Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Mon, 4 Jul 2022 16:58:38 +0800 Subject: [PATCH] wip --- .../Controllers/Account/LoginController.php | 6 +- .../Account/RegisterController.php | 3 +- beike/Shop/Http/Requests/LoginRequest.php | 8 +- beike/Shop/Http/Requests/RegisterRequest.php | 8 +- public/build/beike/shop/default/css/app.css | 4 + public/build/beike/shop/default/js/app.js | 6 + public/vendor/axios/0.27.2/axios.min.js | 3 + resources/beike/shop/default/css/app.scss | 3 +- .../beike/shop/default/css/element-ui.scss | 5 + resources/beike/shop/default/js/app.js | 6 + themes/default/account/login.blade.php | 189 +++++++++++------- themes/default/layout/master.blade.php | 1 + 12 files changed, 154 insertions(+), 88 deletions(-) create mode 100644 public/vendor/axios/0.27.2/axios.min.js create mode 100644 resources/beike/shop/default/css/element-ui.scss diff --git a/beike/Shop/Http/Controllers/Account/LoginController.php b/beike/Shop/Http/Controllers/Account/LoginController.php index e99b5989..72d12428 100644 --- a/beike/Shop/Http/Controllers/Account/LoginController.php +++ b/beike/Shop/Http/Controllers/Account/LoginController.php @@ -29,12 +29,10 @@ class LoginController extends Controller public function store(LoginRequest $request) { - $credentials = $request->only('login'); - - if (!auth(Customer::AUTH_GUARD)->attempt($credentials['login'])) { + if (!auth(Customer::AUTH_GUARD)->attempt($request->only('email', 'password'))) { throw new \Exception("账号密码错误！"); } - json_success("登录成功!"); + return json_success("登录成功!"); } } diff --git a/beike/Shop/Http/Controllers/Account/RegisterController.php b/beike/Shop/Http/Controllers/Account/RegisterController.php index 316bdd29..d2952fd2 100644 --- a/beike/Shop/Http/Controllers/Account/RegisterController.php +++ b/beike/Shop/Http/Controllers/Account/RegisterController.php @@ -28,8 +28,7 @@ class RegisterController extends Controller public function store(RegisterRequest $request) { - $data = $request->only('register.email', 'register.password'); - AccountService::register($data['register']); + AccountService::register($request->only('email', 'password')); return json_success("注册成功，您现在可以使用您的账号登录网站!"); } diff --git a/beike/Shop/Http/Requests/LoginRequest.php b/beike/Shop/Http/Requests/LoginRequest.php index c587fedd..16790318 100644 --- a/beike/Shop/Http/Requests/LoginRequest.php +++ b/beike/Shop/Http/Requests/LoginRequest.php @@ -24,16 +24,16 @@ class LoginRequest extends FormRequest public function rules() { return [ - 'login.email' => 'required|email:rfc,dns', - 'login.password' => 'required', + 'email' => 'required|email:rfc,dns', + 'password' => 'required', ]; } public function attributes() { return [ - 'login.email' => '邮箱地址', - 'login.password' => '密码' + 'email' => '邮箱地址', + 'password' => '密码' ]; } } diff --git a/beike/Shop/Http/Requests/RegisterRequest.php b/beike/Shop/Http/Requests/RegisterRequest.php index 209fa6ea..9dd29f2a 100644 --- a/beike/Shop/Http/Requests/RegisterRequest.php +++ b/beike/Shop/Http/Requests/RegisterRequest.php @@ -24,16 +24,16 @@ class RegisterRequest extends FormRequest public function rules() { return [ - 'register.email' => 'required|email:rfc,dns|unique:customers,email', - 'register.password' => 'required|confirmed', + 'email' => 'required|email:rfc,dns|unique:customers,email', + 'password' => 'required|confirmed', ]; } public function attributes() { return [ - 'register.email' => '邮箱地址', - 'register.password' => '密码' + 'email' => '邮箱地址', + 'password' => '密码' ]; } } diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 3d45a07b..de77b9e7 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -655,3 +655,7 @@ body.page-checkout .radio-line-wrap .radio-line-item .right .title { font-weight: bold; margin-bottom: 10px; } + +.el-input__inner { + border-radius: 0 !important; +} diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js index b18e9339..367f430d 100644 --- a/public/build/beike/shop/default/js/app.js +++ b/public/build/beike/shop/default/js/app.js @@ -3,6 +3,12 @@ var __webpack_exports__ = {}; /*!************************************************!*\ !*** ./resources/beike/shop/default/js/app.js ***! \************************************************/ +var instance = axios.create({ + headers: { + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') + } // baseURL: 'https://api.example.com' + +}); $(document).ready(function ($) { $.ajaxSetup({ headers: { diff --git a/public/vendor/axios/0.27.2/axios.min.js b/public/vendor/axios/0.27.2/axios.min.js new file mode 100644 index 00000000..e8e4fc16 --- /dev/null +++ b/public/vendor/axios/0.27.2/axios.min.js @@ -0,0 +1,3 @@ +/* axios v0.27.2 | (c) 2022 by Matt Zabriskie */ +!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.axios=t():e.axios=t()}(this,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=13)}([function(e,t,n){"use strict";var r,o=n(4),i=Object.prototype.toString,s=(r=Object.create(null),function(e){var t=i.call(e);return r[t]||(r[t]=t.slice(8,-1).toLowerCase())});function a(e){return e=e.toLowerCase(),function(t){return s(t)===e}}function u(e){return Array.isArray(e)}function c(e){return void 0===e}var f=a("ArrayBuffer");function l(e){return null!==e&&"object"==typeof e}function p(e){if("object"!==s(e))return!1;var t=Object.getPrototypeOf(e);return null===t||t===Object.prototype}var d=a("Date"),h=a("File"),m=a("Blob"),v=a("FileList");function y(e){return"[object Function]"===i.call(e)}var g=a("URLSearchParams");function E(e,t){if(null!=e)if("object"!=typeof e&&(e=[e]),u(e))for(var n=0,r=e.length;n0;)s[i=r[o]]||(t[i]=e[i],s[i]=!0);e=Object.getPrototypeOf(e)}while(e&&(!n||n(e,t))&&e!==Object.prototype);return t},kindOf:s,kindOfTest:a,endsWith:function(e,t,n){e=String(e),(void 0===n||n>e.length)&&(n=e.length),n-=t.length;var r=e.indexOf(t,n);return-1!==r&&r===n},toArray:function(e){if(!e)return null;var t=e.length;if(c(t))return null;for(var n=new Array(t);t-- >0;)n[t]=e[t];return n},isTypedArray:O,isFileList:v}},function(e,t,n){"use strict";var r=n(0);function o(e,t,n,r,o){Error.call(this),this.message=e,this.name="AxiosError",t&&(this.code=t),n&&(this.config=n),r&&(this.request=r),o&&(this.response=o)}r.inherits(o,Error,{toJSON:function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:this.config,code:this.code,status:this.response&&this.response.status?this.response.status:null}}});var i=o.prototype,s={};["ERR_BAD_OPTION_VALUE","ERR_BAD_OPTION","ECONNABORTED","ETIMEDOUT","ERR_NETWORK","ERR_FR_TOO_MANY_REDIRECTS","ERR_DEPRECATED","ERR_BAD_RESPONSE","ERR_BAD_REQUEST","ERR_CANCELED"].forEach((function(e){s[e]={value:e}})),Object.defineProperties(o,s),Object.defineProperty(i,"isAxiosError",{value:!0}),o.from=function(e,t,n,s,a,u){var c=Object.create(i);return r.toFlatObject(e,c,(function(e){return e!==Error.prototype})),o.call(c,e.message,t,n,s,a),c.name=e.name,u&&Object.assign(c,u),c},e.exports=o},function(e,t,n){"use strict";var r=n(1);function o(e){r.call(this,null==e?"canceled":e,r.ERR_CANCELED),this.name="CanceledError"}n(0).inherits(o,r,{__CANCEL__:!0}),e.exports=o},function(e,t,n){"use strict";var r=n(0),o=n(19),i=n(1),s=n(6),a=n(7),u={"Content-Type":"application/x-www-form-urlencoded"};function c(e,t){!r.isUndefined(e)&&r.isUndefined(e["Content-Type"])&&(e["Content-Type"]=t)}var f,l={transitional:s,adapter:(("undefined"!=typeof XMLHttpRequest||"undefined"!=typeof process&&"[object process]"===Object.prototype.toString.call(process))&&(f=n(8)),f),transformRequest:[function(e,t){if(o(t,"Accept"),o(t,"Content-Type"),r.isFormData(e)||r.isArrayBuffer(e)||r.isBuffer(e)||r.isStream(e)||r.isFile(e)||r.isBlob(e))return e;if(r.isArrayBufferView(e))return e.buffer;if(r.isURLSearchParams(e))return c(t,"application/x-www-form-urlencoded;charset=utf-8"),e.toString();var n,i=r.isObject(e),s=t&&t["Content-Type"];if((n=r.isFileList(e))||i&&"multipart/form-data"===s){var u=this.env&&this.env.FormData;return a(n?{"files[]":e}:e,u&&new u)}return i||"application/json"===s?(c(t,"application/json"),function(e,t,n){if(r.isString(e))try{return(t||JSON.parse)(e),r.trim(e)}catch(e){if("SyntaxError"!==e.name)throw e}return(n||JSON.stringify)(e)}(e)):e}],transformResponse:[function(e){var t=this.transitional||l.transitional,n=t&&t.silentJSONParsing,o=t&&t.forcedJSONParsing,s=!n&&"json"===this.responseType;if(s||o&&r.isString(e)&&e.length)try{return JSON.parse(e)}catch(e){if(s){if("SyntaxError"===e.name)throw i.from(e,i.ERR_BAD_RESPONSE,this,null,this.response);throw e}}return e}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,maxBodyLength:-1,env:{FormData:n(27)},validateStatus:function(e){return e>=200&&e<300},headers:{common:{Accept:"application/json, text/plain, */*"}}};r.forEach(["delete","get","head"],(function(e){l.headers[e]={}})),r.forEach(["post","put","patch"],(function(e){l.headers[e]=r.merge(u)})),e.exports=l},function(e,t,n){"use strict";e.exports=function(e,t){return function(){for(var n=new Array(arguments.length),r=0;r=0)return;s[t]="set-cookie"===t?(s[t]?s[t]:[]).concat([n]):s[t]?s[t]+", "+n:n}})),s):s}},function(e,t,n){"use strict";var r=n(0);e.exports=r.isStandardBrowserEnv()?function(){var e,t=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a");function o(e){var r=e;return t&&(n.setAttribute("href",r),r=n.href),n.setAttribute("href",r),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:"/"===n.pathname.charAt(0)?n.pathname:"/"+n.pathname}}return e=o(window.location.href),function(t){var n=r.isString(t)?o(t):t;return n.protocol===e.protocol&&n.host===e.host}}():function(){return!0}},function(e,t,n){"use strict";e.exports=function(e){var t=/^([-+\w]{1,25})(:?\/\/|:)/.exec(e);return t&&t[1]||""}},function(e,t){e.exports=null},function(e,t,n){"use strict";var r=n(12).version,o=n(1),i={};["object","boolean","number","function","string","symbol"].forEach((function(e,t){i[e]=function(n){return typeof n===e||"a"+(t<1?"n ":" ")+e}}));var s={};i.transitional=function(e,t,n){function i(e,t){return"[Axios v"+r+"] Transitional option '"+e+"'"+t+(n?". "+n:"")}return function(n,r,a){if(!1===e)throw new o(i(r," has been removed"+(t?" in "+t:"")),o.ERR_DEPRECATED);return t&&!s[r]&&(s[r]=!0,console.warn(i(r," has been deprecated since v"+t+" and will be removed in the near future"))),!e||e(n,r,a)}},e.exports={assertOptions:function(e,t,n){if("object"!=typeof e)throw new o("options must be an object",o.ERR_BAD_OPTION_VALUE);for(var r=Object.keys(e),i=r.length;i-- >0;){var s=r[i],a=t[s];if(a){var u=e[s],c=void 0===u||a(u,s,e);if(!0!==c)throw new o("option "+s+" must be "+c,o.ERR_BAD_OPTION_VALUE)}else if(!0!==n)throw new o("Unknown option "+s,o.ERR_BAD_OPTION)}},validators:i}},function(e,t,n){"use strict";var r=n(2);function o(e){if("function"!=typeof e)throw new TypeError("executor must be a function.");var t;this.promise=new Promise((function(e){t=e}));var n=this;this.promise.then((function(e){if(n._listeners){var t,r=n._listeners.length;for(t=0;t + + +@endpush + + @section('content') -
+
@endsection + +@push('add-scripts') + +@endpush \ No newline at end of file diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php index de9c708f..7ec58659 100644 --- a/themes/default/layout/master.blade.php +++ b/themes/default/layout/master.blade.php @@ -9,6 +9,7 @@ +