From db2ebdb8da0916d93fb8511ce50102b7a2a4e26e Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Thu, 21 Jul 2022 18:42:02 +0800 Subject: [PATCH] wip --- .../Http/Controllers/ProductController.php | 2 + .../Http/Controllers/ProductController.php | 2 +- public/build/beike/admin/css/app.css | 137 +++++++ public/build/beike/admin/css/bootstrap.css | 14 +- public/build/beike/admin/js/app.js | 23 ++ public/catalog/placeholder.png | Bin 3106 -> 7834 bytes resources/beike/admin/css/_global.scss | 14 + resources/beike/admin/css/_page-product.scss | 167 +++++++++ resources/beike/admin/css/app.scss | 1 + .../beike/admin/css/bootstrap/bootstrap.scss | 1 + resources/beike/admin/js/app.js | 25 ++ .../admin/views/layouts/master.blade.php | 2 +- .../views/pages/categories/form-vue.blade.php | 4 - .../views/pages/products/form/form.blade.php | 352 +++++++++++++----- .../views/pages/products/index.blade.php | 3 - themes/default/product.blade.php | 1 + 16 files changed, 639 insertions(+), 109 deletions(-) create mode 100644 resources/beike/admin/css/_page-product.scss diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php index a34e287f..b855f5ef 100644 --- a/beike/Admin/Http/Controllers/ProductController.php +++ b/beike/Admin/Http/Controllers/ProductController.php @@ -6,6 +6,7 @@ use Beike\Admin\Http\Resources\ProductResource; use Beike\Admin\Repositories\CategoryRepo; use Beike\Models\Product; use Beike\Admin\Services\ProductService; +use Beike\Repositories\LanguageRepo; use Beike\Repositories\ProductRepo; use Illuminate\Http\Request; @@ -73,6 +74,7 @@ class ProductController extends Controller 'product' => $product, 'descriptions' => $descriptions ?? [], 'category_ids' => $categoryIds ?? [], + 'languages' => LanguageRepo::all(), 'source' => [ 'categories' => CategoryRepo::flatten(locale()), ], diff --git a/beike/Shop/Http/Controllers/ProductController.php b/beike/Shop/Http/Controllers/ProductController.php index d04a7d42..d4452bf5 100644 --- a/beike/Shop/Http/Controllers/ProductController.php +++ b/beike/Shop/Http/Controllers/ProductController.php @@ -16,7 +16,7 @@ class ProductController extends Controller $data = [ 'product' => (new ProductDetail($product))->jsonSerialize(), ]; -dd($data); + return view('product', $data); } } diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index 7799b29c..7bf5aef8 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -34,6 +34,17 @@ body { font-size: 12px; } +.file-manager-box .layui-layer-title { + background-color: #293042; + color: #fff; + border-color: #404e72; +} +.file-manager-box .layui-layer-ico { + background: url("/image/close.png") no-repeat; + background-size: cover; + background-position: center center; +} + .main-content { display: flex; transition: margin-left 0.25s ease-in-out, left 0.25s ease-in-out, margin-right 0.25s ease-in-out, right 0.25s ease-in-out; @@ -537,3 +548,129 @@ body.page-login .btn:not(.btn-link):hover { transform: scale(1.02); color: #fff; } + +body.page-product-form .variants-producr-img { + width: 50px; + height: 50px; + border-radius: 2px; + border: 1px solid #eee; + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; +} +body.page-product-form .variant-value-img { + width: 30px; + height: 30px; + border-radius: 2px; + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; +} +body.page-product-form .selectable-variants div[id^=selectable-variant-] { + border: 1px solid #eee; + border-radius: 4px; + margin-bottom: 10px; +} +body.page-product-form .selectable-variants .title { + margin-bottom: 12px; + display: flex; + align-items: center; + padding: 4px 10px; + background: #f5f5f5; + justify-content: space-between; +} +body.page-product-form .selectable-variants .title:hover .btn-link { + display: block; +} +body.page-product-form .selectable-variants .title > div { + display: flex; + align-items: center; +} +body.page-product-form .selectable-variants .title b { + border-right: 1px solid #f4f4f4; + padding-right: 10px; +} +body.page-product-form .selectable-variants .title .btn-link { + padding: 3px 12px; + display: none; +} +body.page-product-form .selectable-variants .variants-wrap { + padding: 0 10px; + display: flex; + flex-wrap: wrap; +} +body.page-product-form .selectable-variants .variants-wrap > div { + border: 1px solid #eee; + margin-right: 10px; + display: flex; + position: relative; + margin-bottom: 10px; + padding: 4px 6px; + cursor: pointer; + border-radius: 2px; + align-items: center; +} +body.page-product-form .selectable-variants .variants-wrap > div:active { + background-color: #f5f5f5; +} +body.page-product-form .selectable-variants .variants-wrap > div .value-img { + line-height: 1; + margin-right: 3px; +} +body.page-product-form .selectable-variants .variants-wrap > div .value-img a { + width: 26px; + display: flex; + height: 26px; + margin-right: 5px; +} +body.page-product-form .selectable-variants .variants-wrap > div:hover { + border-color: #fd560f; +} +body.page-product-form .selectable-variants .variants-wrap > div:hover .btn-remove { + display: block; +} +body.page-product-form .selectable-variants .variants-wrap > div .btn-remove { + position: absolute; + top: -9px; + right: -7px; + cursor: pointer; + font-size: 17px; + display: none; + background: #fff; + line-height: 1; +} +body.page-product-form .selectable-variants .variants-wrap > div .btn-remove:hover { + color: #d80000; +} +body.page-product-form .selectable-variants .variants-wrap > div .tools { + background: #fd560f; + top: -24px; + right: -31px; + display: none; + overflow: hidden; +} +body.page-product-form .selectable-variants .variants-wrap > div .tools .btn-link { + min-width: 27px; + text-align: center; + float: left; + padding: 0; + border: none; + display: inline-block; + color: #fff; + height: 30px; +} +body.page-product-form .selectable-variants .variants-wrap > div .tools .btn-link:hover { + background: #be3a02; +} +body.page-product-form .selectable-variants .variants-wrap > div .tools .btn-link.rank { + cursor: move; +} +body.page-product-form .selectable-variants .variants-wrap > div .name { + text-align: center; + min-width: 40px; +} +body.page-product-form .selectable-variants .variants-wrap > div .name + .btn-link { + padding-left: 5px; +} diff --git a/public/build/beike/admin/css/bootstrap.css b/public/build/beike/admin/css/bootstrap.css index 79aefd9b..37da4b4d 100644 --- a/public/build/beike/admin/css/bootstrap.css +++ b/public/build/beike/admin/css/bootstrap.css @@ -12301,7 +12301,7 @@ textarea.form-control-lg { align-items: center; justify-content: space-between; padding: 1rem 1rem; - border-bottom: 1px solid #dee2e6; + border-bottom: 1px solid #f3f3f3; border-top-left-radius: calc(0.3rem - 1px); border-top-right-radius: calc(0.3rem - 1px); } @@ -12328,7 +12328,7 @@ textarea.form-control-lg { align-items: center; justify-content: flex-end; padding: 0.75rem; - border-top: 1px solid #dee2e6; + border-top: 1px solid #f3f3f3; border-bottom-right-radius: calc(0.3rem - 1px); border-bottom-left-radius: calc(0.3rem - 1px); } @@ -13586,7 +13586,7 @@ textarea.form-control-lg { } .border { - border: 1px solid #dee2e6 !important; + border: 1px solid #f3f3f3 !important; } .border-0 { @@ -13594,7 +13594,7 @@ textarea.form-control-lg { } .border-top { - border-top: 1px solid #dee2e6 !important; + border-top: 1px solid #f3f3f3 !important; } .border-top-0 { @@ -13602,7 +13602,7 @@ textarea.form-control-lg { } .border-end { - border-right: 1px solid #dee2e6 !important; + border-right: 1px solid #f3f3f3 !important; } .border-end-0 { @@ -13610,7 +13610,7 @@ textarea.form-control-lg { } .border-bottom { - border-bottom: 1px solid #dee2e6 !important; + border-bottom: 1px solid #f3f3f3 !important; } .border-bottom-0 { @@ -13618,7 +13618,7 @@ textarea.form-control-lg { } .border-start { - border-left: 1px solid #dee2e6 !important; + border-left: 1px solid #f3f3f3 !important; } .border-start-0 { diff --git a/public/build/beike/admin/js/app.js b/public/build/beike/admin/js/app.js index fadd5431..4b41e279 100644 --- a/public/build/beike/admin/js/app.js +++ b/public/build/beike/admin/js/app.js @@ -2065,6 +2065,29 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _js_http__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../js/http */ "./resources/js/http.js"); window.$http = _js_http__WEBPACK_IMPORTED_MODULE_0__["default"]; +var base = document.querySelector('base').href; +$(document).on('click', '.open-file-manager', function (event) { + var $this = $(this); + layer.open({ + type: 2, + title: '图片管理器', + shadeClose: false, + skin: 'file-manager-box', + scrollbar: false, + shade: 0.4, + area: ['1060px', '680px'], + content: "".concat(base, "/file_manager"), + success: function success(layerInstance, index) { + var iframeWindow = window[layerInstance.find("iframe")[0]["name"]]; + + iframeWindow.callback = function (images) { + $this.find('img').prop('src', images[0].url); + $this.next('input').val(images[0].path); + $this.next('input')[0].dispatchEvent(new Event('input')); + }; + } + }); +}); $(document).ready(function ($) { $.ajaxSetup({ headers: { diff --git a/public/catalog/placeholder.png b/public/catalog/placeholder.png index 302403b4d5a99854d21b7d4636285ed2a4f9f9c1..2234f3cebd5eabf4076a172f4b525b3c19746fe4 100644 GIT binary patch literal 7834 zcmeHM`B#$Z+egQ0TFjcpnOw_e)J7|(OiN6yv1|&%6*c!V)5I+iQCx7cAmZ}U_x&s0_w>Va&V4@Td9LTauj_NI_d{p!W%XU! zy8r-y`jtN~x&i>IUSFT@w=0qM+xg=Ffc}ju7caQS7teEdKb>}9Z4X2zrgmoU_K|Pd zWq6zH+_`58T=g_cVH(ssZ98O|c+1X-#dN)OF4reUMr`M&RaRDt_W}U_uAg^N1>D-H zlzv0?C&2mq)NO!$Mu94T``@5%n)t?vZ?5ovJ}7+1{PD~5s;pxxIbJ5>GI<*d-5MHE z6Rio$M||drqS~#J6!VR4W+;VperktZQxbXD3T3y!chWe7T3<9O!Hg*cMDkvgVr;S^ zBS^ZY`Z7tV|7LP)Q^wa&Odr}>9efPUL9I_8ax>eS(mc6quk~8ocP_G+Uy0d?!O7TVuT%=a5FbwUs4ZU>eV#tTS+SkDP z?lWiyryCms9Ng}XFPUJojk{l8T_pGd}g>97$_iE@b zr&c#ya=O7=*P3VxU?p0N*$W(YMuM)b9|o$wdXzu~JGmLZ@qXTU!RhqeBaDOcUz55v zUhg1fQaP`LwpEkb-?eV~LDR-dqfYk{gn zDz^gAuX`DVmB`8tX{~g4vYuL5cX2U4jN?*Q06@hle11R)ece<=m;%4oP@2+YLs|Up z&poE@e=6PuY%XndI5|0ONhVG6H$MH`vAQ`~vN0FpX~rxpI;H*GZgVk{u?bFY(6C!y zP;B|pntzrx#e{3{gk;o)a7%-+DQBQk?pDS5ZlPrch{vfPn&dAQ5XPONl8BodpUqGSk{Dy&f0O1jUb2EKPC2t8C%CMx zPG@cjw}_8c$D%s0d+(sj9^Dk~in`yjygtsgtcSOpfQBp~+_;r05uf28| z;uw&$*dxQlguVGk`*Bpe+-P)PM#~ySlM{YDYB7~(9~58Px1fPq?OvX=DduyFlgVsk z`(815(ByF>8GJc8k1!bEn$n$30%qv&DT20+^`&<`ZFxK<bUDgXz8QRRBN#Qkv)`_lH?-PS8Ui}@~Nq9}@{hi~bQKoVonKzkm|B7*V#m`6G zgGSUnElxN7s@pm%fyYmdxnS72Q-akt!kHj^q|@X^=dU z&8!IH#(i!?R;*b=%*fOcs=D&T@bp!}k*obSRuIjLjV^YUCix`O>A|A9e?4^0$I)r! zmuKANaGj#U9ZRzVMI%sYbbIeU{!dflV(sldYa4<+8X36h>6_Rsfzwp6ROX5())wmv0Kd%3>F^dcXBlogw#8Pce%s~sGPXX$)7 z)n%oid5Vzk8Kw`S>C@QcLqnu{rgA2Ow-XnM9+IU7P zoF>?vFkrn5Y9`Vgf|4-?#X%qsYDC=_lDFQ*Or+cb`wc`1=zg4Tc{AMUyu}Epk2e~; zmR+tANtAnFW#SaFby15EI*4(-#reMQ)Z2{=lHQSniYaC`Z~6wQ?n#@^b&pFBGL}1C z{>KHx7g9#!>>fSYtb1owUz9Wo^Z64t_2k%>SS0y}wwoXi@o~RrwP*>XgU#1Wx)aq{ zSK@vqiwy;`FNEAvze1-|#=dzr=qg`A`hot?3N3xduO0k}Tyg7oX_d z6A{MgzSV~CFK25CA$B%aZ&5TptVuA*z`P1S= z$-vCd_(znnX;*_6$V<1i$2eERA0O8S+Jw?_5)j)ahtw~kZLnmH#NAYydw*b>%{*C> zGE&YsIw$pVw?brgNPbKmK92&ctH)Vh_CxB8gpj71IJlRbCEp)z<=RqT_@Ga;IZ#ii z2*L0~GU1;0+5^(Aa+7iT)f(7sUf2`)Zcrwoq6@6CKO?4a5Q~D)MzNXM@iYDYbWfhb zxtj<%!TsI6L@Z(0MYY{_;C;x;g(2<7lm{KGr#e)I#H&?;O3KC(DYIJt;R4+?Mr;or zX>|j6z({|`Kd~Rch=!)kSdL4t=)OXylZ8xwTkqpQ-0c9%8iAOweSYQrG*xZzL z1gw0Vx-Y^E4aJC_F&v}Vb4iWeeMK#$FiA}QxMy|Zgb-Fe<#JYbSz`n%aNi3xO}B?F zNv-PrW+3~^aS=@(N}`zWQI<6!+6H3yF8E$bNOm z>fywkCaR7ASk(45U*3v+NuD553yCC45d_OL_o#G>3Yl1*jzAq{;HEGvZLphnC9I-0-KB4aP^H67Iyj+%#rpNbnYFK z6LiPHIFw9vxoZ0`FphHDWGxHqk-KX4=0HBf!X1e2Go%<@NH!A zZE=h>>|#U8v8zV{=NFS$ly+8`x1boa(b?PX`cOO)zJP~9ul-`@6XJ_30Zwp)XW%fz z`b7PSZO=rn@7<4dI!!LAk3~0(=J5@&w9H~cbOUWb0z^=K20FZ7^dScl=T?#oXSL~7 zFY(Uuo}UA%O)ATM;IZ(Z!hClbvFAAFSlrxML+n%+llLciW=5)v)ThV3u=7seHD+pM zC!KiTRACa5h1`n$BpDr%>B;_(}T^%gEM92huJ%g z@I@^K*Zmt;b=ftI9Gr4@w@v$@GJie#>3i6|xx#G4OswcEdC=N@Oyd}Zt;}C`__aa< z;X+DI$UKQf>Dk`ExU%;e9A}#~*CpupDNdNAuM;nRxGwQJ=5MCVSm6}2VG!`bG*vbZ z&3y9{f{LB!v;YzTPV*~C>Y6WeZJ9`Xp@KDUF@95}XH-Uw)kEC7;`*|>L3<7Lb`RC26KpG?$@s`wRH#lP^H1xAlw+xTqq;GZCviBGAL$Z)Lq_^uoG#V(frO z-69s5HnJR8KC5GBT!1kAZsfQvje<0#o*;fN?mupV=HRkmTt0cRPQ%;=T%U8Z5`?;T zo%!CA>%wj=(bB9HSa1z8+HhnZ^J>Q$-v6;l<{F29j&$@c`AtmEVvp_=;r%PY&Y+d` zJ=mfLAfmPP87n;1nLW{%CEQml>ZhQifTmd7n54q|R}W&R?b??z>B&fC?Os&QBO`A* z^!RioSgJv~nVh-1WS%fPtcjrOaGj}3*|mosp+{K6-8oEVmHpkC@lZL=STcWw%9V^2xBqSGzOn}!F)XTJXvQKDJ5^9Jqa;lOE z&t*o=&-62k>+XYth6+AT=zSvLh{G`?hg+6`81++)`DYb{bhb8)9r=I*yv#ZpDL?!L zs=hKA=JUY)ATg$ply)1<2Es#Muumkfx9S^FC;yIY@*X=Ii?hm&|FxHtei%1gU|!d= zSH${=QkJfa?PZbqe)Yy9Apc?cRc(!saVros&!&6+tB#SB?1`V$c!Js&wypECwx=n9u(s`33{pJbu0aKuodsCC#G zKAY4pDDE&}5>xZ_bE_UoyBaD5l5+Ih zuLRJWY3|O!N|LJkT5u~Lb{f~W*@0>vh&FGdWoH_(Y}U=)(#xIA2SCP6?7UXDQqLxV z`xA4CKJdbGk+-$I6YJ?og`Dt%(wxV&J4GoM%@NbsiNEMc%{Ikkx-DphlehQ!fNe;0 z+7ALG$FY^f0MrKD)E5$LJ^Tw3t8m9Gl=qgVklprsZnLy5ru0Zg8sclC5Uarr zo-rCcV#_B|%{=&xz;fCAjCOZ8V@T<$ScbL2mK#IXX*E%3!C{`k6Y?4+fdS4G4ke_q z$}HV*n$^Imuwzw$CH-B^2cY_Or?eXd`>Pz}t0!KWVAjUCkqdO}w3ps6=a({+x*QK}Nm~x<08g{6Q1xv)%hyH;)FHZIycAl!}JC}fo_2e2# z_c@M~Vv!HoS5CJds7Ej#Zd9G%PgrG4H}_z@R|v5tpGZcBqb$S~EeQIYZ?@9VySy54 zElcALwPt+Z0B9fTU4s7#x5L2(M$e9h#|JY$%#DCr!Kx$Je7r8sN zKc&ys_-ub;$hIOsO@;5c-J+nSfg3|(9X>bAy6jyU712L{AX>-p|K8TApsUR+r(CQA zsxN*h3GLOVdt%d|JGv|;AJCl_Dbh~wA7&i1d`)jbxKe&)$q9W+k{BNH1w{l zc(&jz0f%AOD#8a5r7aMeHa4dgggzpKL(IZ$e7#hf1@#s-5-yH^x2#ZGy{f}4`1AEN zS)Kna!4E1exqHm8iOxBW*Fvu`G^-q1kYOXbWB7mT;zTjl>fs@Oy&l@tWtoz#j4yfUZ zR%umB5A8SmdooaG^LHRI^0N3mLh?RrJxr66oAY|H4zB;(;`k)K*J98aq1{Qsy=#b_ zxF&kqFCwcn%#w|`!7QM?*h7C;Unl~Xp( z)~2f-ux6z>a?du~?JB!d(U8BYR7aldO0+okz4`Jr)rHy`3e`08a;NIY8{C^<1 zbKHe2pp92U=<}~1PBGPFbeOOD{-Mv0R6b6{S{|g_%Q93u2G9qGY!Q)fY+{wyALoj{ zj-wv`7tXjmQ%ljn;c)G4eE@(JvK9b%t$aQ8ca`0M!;YP*fbS1{gT86v8z;WG!vBk) fz>hw=zT>E)+DvG~{S4)uGvLZ4@Wq-x0`L6~JJnBN literal 3106 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL985qF{<{lj11ZMhAa^H*b?0PW0y!?J5uRzj zz6@GGHU|S^dnN-5NC^;20Wkvu^8!W&W+2T75?jColVzN+fEmFCDU>$MKf}Pl-Q(%v z7*fIb_6j2>g8>io!Q6jO!yIPzw6AU|(A;TUEW^me!o{>+Ajpl0g`B2JdJ>8qG4Jg~MpsJ6g+()~BN_htW3D@N0tVD21~A@!g;I2-H6J MboFyt=akR{0Q4e@5dZ)H diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index 4f3bdfa7..b1fbadc0 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -27,6 +27,20 @@ body { font-size: 12px; } +.file-manager-box { + .layui-layer-title { + background-color: #293042; + color: #fff; + border-color: #404e72; + } + + .layui-layer-ico { + background: url('/image/close.png') no-repeat; + background-size: cover; + background-position: center center; + } +} + .main-content { display: flex; // flex-direction: column; diff --git a/resources/beike/admin/css/_page-product.scss b/resources/beike/admin/css/_page-product.scss new file mode 100644 index 00000000..1980cb05 --- /dev/null +++ b/resources/beike/admin/css/_page-product.scss @@ -0,0 +1,167 @@ +@charset "UTF-8"; + +body.page-product-form { + .variants-producr-img { + width: 50px; + height: 50px; + border-radius: 2px; + border: 1px solid #eee; + cursor: pointer; + display: flex; + align-items: center; // flex-start | center + justify-content: center; // flex-end | center | space-between + } + + .variant-value-img { + width: 30px; + height: 30px; + border-radius: 2px; + cursor: pointer; + display: flex; + align-items: center; // flex-start | center + justify-content: center; // flex-end | center | space-between + } + + .selectable-variants { + div[id^="selectable-variant-"] { + border: 1px solid #eee; + // padding: 10px; + border-radius: 4px; + margin-bottom: 10px; + } + + .title { + margin-bottom: 12px; + display: flex; + align-items: center; + padding: 4px 10px; + background: #f5f5f5; + justify-content: space-between; + &:hover { + .btn-link { + display: block; + } + } + + > div { + display: flex; + align-items: center; + } + + b { + border-right: 1px solid #f4f4f4; + padding-right: 10px; + } + + .btn-link { + padding: 3px 12px; + display: none; + } + } + + .variants-wrap { + // overflow: hidden; + padding: 0 10px; + // display: flex; + display: flex; + flex-wrap: wrap; + + > div { + border: 1px solid #eee; + // padding: 3px 8px; + margin-right: 10px; + // float: left; + display: flex; + position: relative; + margin-bottom: 10px; + padding: 4px 6px; + cursor: pointer; + border-radius: 2px; + align-items: center; + &:active { + background-color: #f5f5f5; + } + + .value-img { + line-height: 1; + // padding: 2px; + margin-right: 3px; + + a { + width: 26px; + display: flex; + height: 26px; + margin-right: 5px; + } + } + + &:hover { + border-color: $primary; + + .tools { + // display: block; + } + .btn-remove { + display: block; + } + } + + .btn-remove { + position: absolute; + top: -9px; + right: -7px; + cursor: pointer; + font-size: 17px; + display: none; + background: #fff; + line-height: 1; + &:hover { + color: #d80000; + } + } + + .tools { + // position: absolute; + background: $primary; + top: -24px; + right: -31px; + display: none; + overflow: hidden; + // z-index: -1; + // opacity: 0; + + .btn-link { + min-width: 27px; + text-align: center; + float: left; + padding: 0; + border: none; + display: inline-block; + // display: none; + color: #fff; + height: 30px; + &:hover { + background: darken($primary, 15%); + } + + &.rank { + cursor: move; + } + } + } + + .name { + // border-right: 1px solid #eee; + text-align: center; + // padding: 0 5px 0 0; + min-width: 40px; + + & +.btn-link { + padding-left: 5px; + // margin-right: 10px; + } + } + } + } + } +} \ No newline at end of file diff --git a/resources/beike/admin/css/app.scss b/resources/beike/admin/css/app.scss index 34f8b747..7470fed1 100644 --- a/resources/beike/admin/css/app.scss +++ b/resources/beike/admin/css/app.scss @@ -21,3 +21,4 @@ $primary: #fd560f; @import 'form'; @import 'element-ui'; @import 'login'; +@import 'page-product'; diff --git a/resources/beike/admin/css/bootstrap/bootstrap.scss b/resources/beike/admin/css/bootstrap/bootstrap.scss index fb3f605c..2fb83e66 100644 --- a/resources/beike/admin/css/bootstrap/bootstrap.scss +++ b/resources/beike/admin/css/bootstrap/bootstrap.scss @@ -21,6 +21,7 @@ $form-floating-padding-y: .8rem; $form-floating-height: 50px; $btn-focus-width: 0; $table-border-color: #e9ecef; +$border-color: #f3f3f3; @import './bootstrap-icons'; @import 'node_modules/bootstrap-5.1.3/scss/bootstrap'; diff --git a/resources/beike/admin/js/app.js b/resources/beike/admin/js/app.js index 53374b4c..4396bf00 100644 --- a/resources/beike/admin/js/app.js +++ b/resources/beike/admin/js/app.js @@ -1,5 +1,30 @@ import http from "../../../js/http"; window.$http = http; +const base = document.querySelector('base').href; + +$(document).on('click', '.open-file-manager', function(event) { + const $this = $(this); + + layer.open({ + type: 2, + title: '图片管理器', + shadeClose: false, + skin: 'file-manager-box', + scrollbar: false, + shade: 0.4, + area: ['1060px', '680px'], + content: `${base}/file_manager`, + success: function(layerInstance, index) { + var iframeWindow = window[layerInstance.find("iframe")[0]["name"]]; + iframeWindow.callback = function(images) { + $this.find('img').prop('src', images[0].url); + $this.next('input').val(images[0].path) + $this.next('input')[0].dispatchEvent(new Event('input')); + } + } + }); +}); + $(document).ready(function ($) { $.ajaxSetup({ diff --git a/resources/beike/admin/views/layouts/master.blade.php b/resources/beike/admin/views/layouts/master.blade.php index c017ab3d..e364e03b 100644 --- a/resources/beike/admin/views/layouts/master.blade.php +++ b/resources/beike/admin/views/layouts/master.blade.php @@ -13,7 +13,7 @@ --}} {{-- --}} - + diff --git a/resources/beike/admin/views/pages/categories/form-vue.blade.php b/resources/beike/admin/views/pages/categories/form-vue.blade.php index 4dea984b..dc54c821 100644 --- a/resources/beike/admin/views/pages/categories/form-vue.blade.php +++ b/resources/beike/admin/views/pages/categories/form-vue.blade.php @@ -2,10 +2,6 @@ @section('title', '分类管理') -@push('header') - -@endpush - @section('content')
diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php index f2f6b499..a5e99fa9 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -1,13 +1,17 @@ @extends('admin::layouts.master') +@section('body-class', 'page-product-form') + @push('header') - + + @endpush @section('content')
+ {{--
基础信息
--}}
-

product

+
基础信息
@csrf @@ -37,118 +41,218 @@
-

skus

- 单规格 - 多规格 -
-
-
-
- +
商品库存
-
- -
- -
+
+
+ +
+
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
- @{{ variant.name || 'No name' }} - imagemodelskupriceorgin pricecost pricequantity
- - - - - -
-
-
- - - - - - - - - - +
+
+ +
+
+
+
+
+
+ @{{ variant.name[current_language_code] }} + 编辑 + 移除 +
+
+ 添加规格图片 + Add value +
+
+ +
+ {{--
--}} + {{-- --}} + {{-- --}} + {{-- --}} + {{--
--}} + +
+
+ +
+
+ + +
+
+ @{{ value.name[current_language_code] }} +
+
+ +
+
请添加 Value
+
+
+ + Add variant +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ @{{ variant.name[current_language_code] || 'No name' }} + imagemodelskupriceorgin pricecost pricequantity
+
+
+ +
+
+ + + + + 		+ +
+
+
+ +
+
+ + + + + + + + + + +
+
+
+ + + + + + + + + + + 保存 + 取消 + + +
@endsection + @push('footer') @endpush @@ -11,8 +10,6 @@
- -
diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index 24e7b9af..5fb1a029 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -232,6 +232,7 @@ this.source.variables.forEach((variable, index) => { variable.values.forEach((value, value_index) => { const selectedVariantsIndex = this.selectedVariantsIndex.slice(0); + selectedVariantsIndex[index] = value_index; const selectedSku = skus.find(sku => sku.toString() == selectedVariantsIndex.toString()); if (selectedSku) {