From ca887983dd92a004853421de28f244193118b124 Mon Sep 17 00:00:00 2001 From: Xulinchuan <2026734208@qq.com> Date: Tue, 20 May 2025 13:05:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=95=86=E4=BA=A4=E6=98=93=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 + main/.eslintrc.cjs | 7 +- sub-operation-service/.env.development | 2 +- .../src/apis/agricultural.js | 19 + .../src/assets/images/userCenter/menu1-1.png | Bin 0 -> 600 bytes .../src/assets/images/userCenter/menu1.png | Bin 0 -> 1093 bytes .../src/assets/images/userCenter/menu2-1.png | Bin 0 -> 669 bytes .../src/assets/images/userCenter/menu2.png | Bin 0 -> 804 bytes .../src/assets/images/userCenter/menu3-1.png | Bin 0 -> 964 bytes .../src/assets/images/userCenter/menu3.png | Bin 0 -> 772 bytes .../src/components/costomImg.vue | 9 +- .../src/components/page-layout/index.vue | 16 +- .../src/components/page-menu/index-bak.vue | 38 +- .../src/components/page-menu/index.vue | 10 +- .../src/components/page-pagination/index.vue | 4 +- .../src/layouts/component/Header/index.vue | 44 +-- .../src/layouts/component/Main/index.vue | 8 +- .../src/layouts/component/UserMenu/index.vue | 14 +- sub-operation-service/src/layouts/index.vue | 9 +- .../src/layouts/userCentre.vue | 4 +- sub-operation-service/src/router/index.js | 52 +++ .../views/ecommerce/agriculturalDetail.vue | 99 +++-- .../ecommerce/components/backDivider.vue | 16 +- .../src/views/ecommerce/components/common.vue | 12 +- .../views/ecommerce/components/evaluate.vue | 68 ++-- .../views/ecommerce/components/filtertop.vue | 33 +- .../views/ecommerce/components/goodsItem.vue | 22 +- .../views/ecommerce/components/landItem.vue | 32 +- .../views/ecommerce/components/leftMenu.vue | 4 +- .../ecommerce/components/purchaserPopup.vue | 2 +- .../ecommerce/components/signProcess.vue | 18 +- .../views/ecommerce/components/typetop.vue | 8 +- .../src/views/ecommerce/index.vue | 110 ++++-- .../src/views/ecommerce/land.vue | 29 +- .../src/views/ecommerce/landDetail.vue | 77 ++-- .../src/views/ecommerce/purchaser.vue | 134 ++++--- .../src/views/ecommerce/purchaserDetail.vue | 82 ++-- .../src/views/ecommerce/sourceCodeDetail.vue | 91 ++--- .../src/views/ecommerce/supplier.vue | 123 +++--- .../src/views/farmingService/index.vue | 6 +- .../src/views/smartFarm/components/common.vue | 12 +- .../views/smartFarm/components/leftMenu.vue | 16 +- .../views/userCenter/components/common.vue | 55 +++ .../views/userCenter/components/ischeck.vue | 11 +- .../views/userCenter/components/leftMenu.vue | 128 ++++++ .../userCenter/components/userHeader.vue | 27 +- .../src/views/userCenter/orderSuccess.vue | 204 +++++----- .../src/views/userCenter/paySuccess.vue | 62 +-- .../src/views/userCenter/shoppingCart.vue | 281 ++++++++----- .../src/views/userCenter/sureOrder.vue | 374 ++++++++++-------- .../src/views/userCenter/userLands.vue | 21 +- .../src/views/userCenter/userOrders.vue | 177 +++++---- .../warehouseLogistics/warehouse/index.vue | 47 +-- sub-operation-service/vite.config.js | 2 + 54 files changed, 1508 insertions(+), 1115 deletions(-) create mode 100644 sub-operation-service/src/apis/agricultural.js create mode 100644 sub-operation-service/src/assets/images/userCenter/menu1-1.png create mode 100644 sub-operation-service/src/assets/images/userCenter/menu1.png create mode 100644 sub-operation-service/src/assets/images/userCenter/menu2-1.png create mode 100644 sub-operation-service/src/assets/images/userCenter/menu2.png create mode 100644 sub-operation-service/src/assets/images/userCenter/menu3-1.png create mode 100644 sub-operation-service/src/assets/images/userCenter/menu3.png create mode 100644 sub-operation-service/src/views/userCenter/components/common.vue create mode 100644 sub-operation-service/src/views/userCenter/components/leftMenu.vue diff --git a/.gitignore b/.gitignore index dd873ba..afc13f6 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,7 @@ dist-ssr *.njsproj *.sln *.sw? +sub-operation-service/package-lock.json +main/package-lock.json +sub-operation-service/vite.config.js +main/.eslintrc.cjs diff --git a/main/.eslintrc.cjs b/main/.eslintrc.cjs index 388fc20..e1ca881 100644 --- a/main/.eslintrc.cjs +++ b/main/.eslintrc.cjs @@ -39,7 +39,12 @@ module.exports = { }, // 这里时配置规则的,自己看情况配置 rules: { - 'prettier/prettier': 'error', + 'prettier/prettier': [ + 'error', + { + endOfLine: 'auto', // 允许自动检测换行符 + }, + ], 'no-debugger': 'off', 'no-unused-vars': 'off', 'vue/multi-word-component-names': 'off', diff --git a/sub-operation-service/.env.development b/sub-operation-service/.env.development index ea21177..ac85243 100644 --- a/sub-operation-service/.env.development +++ b/sub-operation-service/.env.development @@ -3,7 +3,7 @@ VITE_PORT = 9526 VITE_APP_MIAN = 'daimp-front-main' VITE_APP_MIAN_URL = 'http://localhost:9000' VITE_APP_NAME = 'sub-operation-service' -VITE_APP_BASE_API = '/platform' +VITE_APP_BASE_API = '/apis' VITE_APP_BASE_URL = 'http://192.168.18.99:88' VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300' diff --git a/sub-operation-service/src/apis/agricultural.js b/sub-operation-service/src/apis/agricultural.js new file mode 100644 index 0000000..ff83237 --- /dev/null +++ b/sub-operation-service/src/apis/agricultural.js @@ -0,0 +1,19 @@ +import request from '@/utils/axios'; + +//农资 + +//获取农资分类查询数据 +export function transaction(params = {}) { + return request('goods/business/category/transactionType?type=1', { + method: 'GET', + params, + }); +} + +//获取农资列表数据 +export function agriculturalList(params) { + return request('goods/business/category/transactionGoodInfo', { + method: 'GET', + params, + }); +} \ No newline at end of file diff --git a/sub-operation-service/src/assets/images/userCenter/menu1-1.png b/sub-operation-service/src/assets/images/userCenter/menu1-1.png new file mode 100644 index 0000000000000000000000000000000000000000..7c0e779a4df14763cc548d046f34b7c61229b403 GIT binary patch literal 600 zcmV-e0;m0nP)$L+b#+*|i~KJ|3YdCq;#_kDhRzxR83`uqD2;3#@AigUP*Srw>; zEm(~eSdVMiTZQpZ0PMpK?7}Vd;W!pn0T9OC;c{xf!8$C*DSR!-?gTDkGR{D@V^O?J z=b>!9#z3vf$TUVOFdkZk6U_jj2NeN?Hsk?3tq@=~4`8%HfZ;rVI2^w#0vO5zc#oeI z0gU7UOqA&VSO9zb+FuK?f&#_|9{k1GI(l^$;eP(?6$*vbu6t2zGr1KaAvLZ3hE~Uw=!hHDNhXYFUfyndp_Y~D&yVvl*rDcvQaNo5x}F&%nqg*bzMaO zchfAEU>mM>DOLZKCN-z#oUmCpQmWofMSMAiGcjf>FKB2#?sPdnsHLoXPDNWFdBOlz zri{6#3jnbNFWLo=QuNJOldf!+IyAT#hp`NUxS8#22jC=*r23w;3WFU0oX5^o-<>W# zw;P@Foq^EyruL=|jEA;n>M`Ms+0J$V?l-lcbOPx&|4BqaR9Hvtm|bWbRTRhn=T1zGmI{W7ACT}f@nq2 z2T?)ALTz?uXJfUk6lr`8VztnK2475R&CJ?jed(K2Om?=3wxA`6#C&wK*`0fIQd82T z*_qkdg+BDcvJ7+1|NQQ`bM8Gegd2R&4bF#~fKgXyMFwM*`MMC;%?yQrVVC7+=k?S8 zh&XDnYW!CKs#f|q5p^sPD>LH_Cz0%}CO}l56@aaS-S);tGBTlDz;3QXvA;>lOT0os`_0DjqDKDq@1mmEELcQ`=H z`~Zag(Zl;IFz}b7C+`Ub7_&3a3UI%_d~^#2jyrntnNWbOr_D#WjI#h5q9gbz@JBg4 zwKo)?dTQT#a?4(2-R>tJ^*)n$$%*eh5(*H8A+)E(MF7`48&P4F`!hpA;t6M4^5<}X z094zw2+(T{wN#G@mrFuXe}C%3KSKj*R^~8>->NGhaKVXpwJdK+d^c(jO10B(66o`K z0s`Eh(^ES`9d(PwS~k5MOeg9I$V7Xbc-O~O0jh(U7z7Vd9nWMbc}IS0YM?5>%|GmG zc9rtbe;rM8ow8U~Ahq9gW3(zj_4~tX&@}lA0a`r(nJ|pYV-Gt!dc3yonh~f-JP*w_ zPXTzc)_@G2WWvsTJY`=`J20SXn@0$EF$CZo7_$t_5YaT4XF-_uevF0xDROZ^lKeKW z8_sIFfdMt!%mDDt$r%QJ2VfG!{{UiwT=_SIG7jc3UPI&Md3U0rFi~inY394uLuSX$ zF@D{`Fbo-Df(xdB0aYv2Nu(SDFg`UuweeENr?X*$Rbw9<&^9&@#2?l4$t98pA{B|}ylJqzr9rq~0rXf6`$Gny zCl^n?6B*DGXzMc?=kCNt(Rj;RF1w*t;CcX3%2MgJb-9b}?-ptTxZ%v9rdx~CZxd)U zvpe7<(tTl;{DG67+(An5JtA?h>&jyz+fpYh`G?Lx%r*}S;Qd8W34T7Wr@ZP8G-6iz zs33abf8((on1Pqj>3P%3|3YT^`P>JI)00000 LNkvXXu0mjfc2@A? literal 0 HcmV?d00001 diff --git a/sub-operation-service/src/assets/images/userCenter/menu2-1.png b/sub-operation-service/src/assets/images/userCenter/menu2-1.png new file mode 100644 index 0000000000000000000000000000000000000000..03e88b5933cbe8f19416dec941387b26309e8e1c GIT binary patch literal 669 zcmV;O0%HA%P)}KN|(MHo~Vc`Q&u(1-c(M2rMq_7ZTDMkzZ6T~9gS&3SxAXwPAu~I}t ztt@;Nk_f>E7!|pSN}^fi$TzTD?wz@FbH#uk47 z>OcaF0c~KW0KXSIfiJ+Xi1r!S5hAX4{oe(wmv^s$8^C*DGq4zV3tW?DeHmOc8aoKA z2DSiqfR(^*V6DbJ18%uN3xUI$ZMSzVeIHT3U2vt^vL8{umEyHkJOuQc=i7l(^5!Wp z0lWjoHMpkVHNcQ2nTMsaGq`+u37iL30PBE_z^GP$Bbt$QHf4|wMaJ8;!3-`7;d6aI zYM%G&!?-+8<2G;_*aIvFIv&q$l|BO374I}2122?Y&3YGEBZqJbI0jslxNoZ&$A=sz z99*(?>K>!4Syzf$)r2wlf5k&FUj%H^`97Ot(<7cIz?&+?hk=t4&&zTrepzQmQk8fw zFs=VS&pX;?QDF>;p9LQ3{P%g@(BA%3rT91CZVX`z=5@9YsEV=k|3?IGL#sBXI-r#J z0pLW0Xd1_LU6&HKo9;faBygc*@g}Mbyhc7;1s>?I$=hmK=vC2?yW~a04X+|ZqcE?t zeJgNKcCp!R_UC{{WySZY(kzRqxrpBcRw>(K6E4yCT!h5$sVxW;j%ipfeGeHGt>J=1 zW$@3-DEG36Il<-vw`*!Oy&h0ap7j8%5`B6$8Ky1flj_)>zM|($^DhWnMYKUWhCjOI z@r9D_v9j%q>AHB^Qta2P>=KFDRz+bU{;IO<5|I1`NJ_7ccigsW00000NkvXXu0mjf DDHk$> literal 0 HcmV?d00001 diff --git a/sub-operation-service/src/assets/images/userCenter/menu2.png b/sub-operation-service/src/assets/images/userCenter/menu2.png new file mode 100644 index 0000000000000000000000000000000000000000..cf2e9a21e39a3fc21dc846fadbf036f9a9166916 GIT binary patch literal 804 zcmV+<1Ka$GP)O1Z>^D{fFCCERl1qvS%0lu`&O6gNa_ z744OzMQaUqmc@+GlmDC3X=cuO_so<8v*k|b4td%!-R&j-Rj&j1RV=q*sz_4PnEFburY zO62N{XI4)X>^k78AZ)x@z)WBi_yBx~LreyC0vmy%u3ZF<0N(^=It!ePz{T}bu*ZN^ zz%>271UR5;cJB+|6mY}9Ly_+Sb_3HRgBE2$E#lXb{QRTI>P`}PR8xTk8q;1~z&wp} z-ymiKn*?wZI1dZ~{aUiTd~Dh(Ybp)gVVVLg)8|pWKLxhQ-HU-8z*1l>@G{ioMOk|e zxEzaUqkRbU$bzmWs}R*Q;JLn!C|l523xVxGr_FB=K_udb>ZFu?KMlMAR>;z3X=f`m z0Ner|*ZF-|DU9X~!kEt+rL4hSP_zdrR^hv>uct6FM$H9gT2&(!v{Y#}p0?{hgj1TB zSfjiTn-s2`V&)F;q}33%e;gDD*HmP!}A<)u#Ew8V}O?GThYuAww6LEE@PF#x=vN1sv)S|8Qm^`i^D?~-PUs7L@ z*tABJQ$NxaAPvMtjzBx^^`v@|1YxJG zy@JT1Ob}KXuc*!U4a}SZJF%)JL0G4KRIPe`44akJkxyA6(5dRZ$K>AnXWBdSooiSs z3IA_}s(RrXC6{(C;0kS<`maKrO_9;nP=WJNt=twJXv--NIlijs7}=xytWPP03c5?c z9&Jp$o~h_7=lVV!zz0Je*-j`0SL>OAdnC{f09y?^*Pa1x+eMe6=8ogQ17MC^(GCbR i&KhBRNb=_~67UPx&en~_@R9Hvtm|3V!VHAd+W0o;87LuV%MHC_8f(()A${21?h#O?c5Ty(^h6}S& zG7I6(oFX^Kl!Ro=7@2+VY5k|&fA+Wc{-@J9I_vJ7{q42h{jTZ#{vyh`6_s;*R07O3 zLzN5`n!#$oU|=lJ2B_i*_zKtr+_LB0fdxP_&-q`#BjC96e-ZfY`;e#<*8;XXN0Wf6 z37EJH4776!+AqO7KY?AqJm7oS`6z&Mfz43d>2HC@z>g3o?cIko2krtr?75ii47@a^ z(qB_1+8M)tf!RhzDfd2ra_|gjX@SQ84*@w#x1GRr4?wXq!^31-;HXQp%Hf4$vUOOh zeE_=vx6QF?N%iHkYyryO{DALnftV$+d;muPr|i@);B0{a4gt=Y?~%ai^f*3%vw*F3 zxGQj{Kma=e_szHJa9dJFv_}0Ul?UIf$CNU!7-yo)0_*PZvlt3ZO)!_gMM^U zfXm%TSrM^0!T|5KaieE@fT=Mb7JU52&D)hO-m0Vk#fr8%hGvDb^0Xnt}6_&wYWq+ixNx zA->{cAA!C$4NBe%OYvkt!7?=s^Ykvx)W;MjBJ^>Q02c$AZEt{afEpmm)Ok7=re=-+ zng~(W7|^*UHZ#}70o-Ep=YcWuH6}nVVnMF!n9%KD>vc{XKrQUyz%>({VG=9oBUgYb zGu3<_;0z$45}9Jvk{ac(t+2Q{$`zpeD^{vZw1K<;^);UW4cd)v@Ggu)XFD_-!5VZe zy(w*|-CsW_jMKYVh5Fjwj1#J<0Qq20u{M}P2?sT3v84m-3EZ$}qFj-!W=bp<_K2od<>SA`#CWdNI zm#6nW2K9dpX$@ot4-U1V*($*=3sN)d1I4YKyvSYrRWeZ~74y`T(E0yL4<=~dvN=*= m6?NIrlOReZg9%8AJn|2Ah0`gQpuw{M0000CC6<5 literal 0 HcmV?d00001 diff --git a/sub-operation-service/src/assets/images/userCenter/menu3.png b/sub-operation-service/src/assets/images/userCenter/menu3.png new file mode 100644 index 0000000000000000000000000000000000000000..45d173a52a5848e6d8e2fd4052ab47f13134f351 GIT binary patch literal 772 zcmV+f1N;1mP)Qpa($>D0p-M z(SsLJL0r*87)8ZhQCtI(5Th9>s2*y1-g`Y6Gx3L^`%QOM{axK%Rh^o3tpg7kU>UFu zXa>^$1jQ%dFz`^n=K;HbNip+(1J8krzzyJ!9n5%>tAXRdMqosYLW>!|QvE&#EG|K2 zJJ1QV1ATEswgH=f6z~Oj0sM+k)(T7p#v2{uwEd_n_aUC0sU8zMk95&RL}cP_C6NWz z0?&Y4gwj*MmY5Y^0k+1Bi3iW?HtqvXxGl2#KO1P&{z>3z42gfiOW?H1H>%CN7aUql z|M3tLu*jNza}<##(|=n*BCn!sS|V;+1g|ShWWcv+59<_df9j1$!kEBVYd~IZKVWj?_GY8tWYk=he`5Mn=0g(s5Dh*_#1Bx8(0{z;*56lIs^cTW_+AJb+ z5V&pK6~I^Ex|y;AIHy6b6nxN7UqnR0?bQ;ML_yBhrE-NW5eY5}6Ox>dAHZdkFJwDb z19c_JOGLc`Jh4RP0JjFA#NiCES^J%uEC+*bV37nlxB3NTkZ^MDaLzA7zD{-IJu*$( z&%k;;h)L+sc`5y2S~;-$1M(AeUW2pk6Zx)JswbeRJ1~|_7#Gy)8OsxKTjLU*c%nC; zWGK*MyxtN; { } .viewer-btn-warp { position: absolute; + top: 50%; + left: 0; display: none; width: 100%; text-align: center; - top: 50%; - left: 0; transform: translateY(-50%); } .viewer-btn { - background: $color-balck-mask; display: inline-block; padding: 4px 8px; + font-size: 14px; border-radius: 16px; color: $color-fff; - font-size: 14px; + background: $color-balck-mask; cursor: pointer; } } - .c-custom-img-warp:hover { .viewer-btn-warp { display: inline-block !important; diff --git a/sub-operation-service/src/components/page-layout/index.vue b/sub-operation-service/src/components/page-layout/index.vue index 13ebba5..cf5ec2e 100644 --- a/sub-operation-service/src/components/page-layout/index.vue +++ b/sub-operation-service/src/components/page-layout/index.vue @@ -19,30 +19,28 @@ const props = defineProps({ diff --git a/sub-operation-service/src/components/page-menu/index-bak.vue b/sub-operation-service/src/components/page-menu/index-bak.vue index 211e932..4e67376 100644 --- a/sub-operation-service/src/components/page-menu/index-bak.vue +++ b/sub-operation-service/src/components/page-menu/index-bak.vue @@ -49,17 +49,15 @@ const todo = (row, toggle) => { .page-menu { width: 100%; height: 100%; - &-item { - width: 100%; - @include flex-column(); padding: 16px; + width: 100%; cursor: pointer; - + @include flex-column; .menu { - @include flex-row(); - align-items: center; + @include flex-row; + align-items: center; .item-img, .item-title { vertical-align: middle; @@ -70,48 +68,42 @@ const todo = (row, toggle) => { height: 32px; } .item-title { - flex: 1; + padding-left: 8px; font-size: 20px; font-weight: 400; - padding-left: 8px; - @include ellipsis(); + flex: 1; + @include ellipsis; } .el-icon { color: $color-primary; } - &.active { color: $color-primary; } } - .sub-menu { - padding: 10px 0; display: block; - + padding: 10px 0; &.toggle { display: none; } - li { - padding: 16px; - @include flex-row(); align-items: center; - + padding: 16px; + @include flex-row; &::before { - @include icon-space(); + @include icon-space; + + margin-right: 22px; width: 5px; height: 5px; border-radius: 3px; - background-color: #000; - margin-right: 22px; + background-color: #000000; } - .sub-title { font-size: 16px; - @include ellipsis(); + @include ellipsis; } - &.active { &::before { background-color: $color-primary; diff --git a/sub-operation-service/src/components/page-menu/index.vue b/sub-operation-service/src/components/page-menu/index.vue index c5dfd6e..3870c26 100644 --- a/sub-operation-service/src/components/page-menu/index.vue +++ b/sub-operation-service/src/components/page-menu/index.vue @@ -57,20 +57,20 @@ const active = computed(() => { :deep(.el-sub-menu__title) { font-size: 20px; font-weight: 400; - &:hover { - background-color: #fff; color: $color-primary; + background-color: #ffffff; } } :deep(.el-menu-item) { - @include flex-row(); + @include flex-row; + align-items: center; padding: 0 16px !important; } :deep(.el-sub-menu .el-menu-item) { - font-size: 16px; padding-left: 50px !important; + font-size: 16px; &:hover { .icon-dot { background-color: $color-primary; @@ -81,7 +81,7 @@ const active = computed(() => { font-size: 20px; } :deep(.el-menu-item.is-active) { - background-color: #fff; + background-color: #ffffff; } &:not(.el-menu--collapse) { height: 100%; diff --git a/sub-operation-service/src/components/page-pagination/index.vue b/sub-operation-service/src/components/page-pagination/index.vue index 6a5a058..3a9de61 100644 --- a/sub-operation-service/src/components/page-pagination/index.vue +++ b/sub-operation-service/src/components/page-pagination/index.vue @@ -31,9 +31,9 @@ const emit = defineEmits(['current-change', 'size-change']); diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue index 65a8baf..6d84170 100644 --- a/sub-operation-service/src/layouts/component/Header/index.vue +++ b/sub-operation-service/src/layouts/component/Header/index.vue @@ -115,11 +115,12 @@ const toHome = () => { }; const toUserCenter = () => { + console.info('toUserCenter', router); router.push('/sub-operation-service/userCenter'); }; const toCart = () => { - router.push('/sub-operation-service/userCenter-shoppingCart'); + router.push('/sub-operation-service/userCenter'); }; @@ -139,12 +140,12 @@ const toCart = () => { font-size: 20px; } .el-menu-item:hover { - background: none !important; color: $color-main; + background: none !important; } .el-menu-item:active { - background: none !important; color: $color-main; + background: none !important; } } } @@ -154,16 +155,16 @@ const toCart = () => { // height: 100%; // box-sizing: border-box; &-header { - width: 1200px; - height: 206px; overflow: hidden; margin: auto; + width: 1200px; + height: 206px; &-top { display: flex; - height: 44px; justify-content: space-between; align-items: center; padding: 0 32px; + height: 44px; &-left { line-height: 36px; .welcome-msg { @@ -171,15 +172,15 @@ const toCart = () => { color: $color-5a; } .left-link { - color: $color-main; + display: inline-block; margin: 0 10px; font-size: 12px; + color: $color-main; cursor: pointer; - display: inline-block; .iconfont { - color: $color-main; display: inline-block; margin-right: 2px; + color: $color-main; } .iconfont, span { @@ -189,16 +190,15 @@ const toCart = () => { } &-right { span { - color: $color-000; margin-left: 25px; - line-height: 36px; font-size: 12px; text-align: center; + color: $color-000; + line-height: 36px; cursor: pointer; &:nth-child(1) { margin-left: 0; } - &.block-icon { .iconfont { display: inline-block; @@ -210,10 +210,11 @@ const toCart = () => { } } span { - margin-left: 6px; display: inline-block; + margin-left: 6px; vertical-align: middle; } + color: $color-main; } } @@ -236,27 +237,26 @@ const toCart = () => { white-space: nowrap; } .search-warp { - width: 100%; - padding-left: 36px; position: relative; + padding-left: 36px; + width: 100%; .el-input { - flex-grow: 1; + width: 100%; height: 50px; font-size: 18px; - width: 100%; + flex-grow: 1; :deep(.el-input__wrapper) { padding-right: 100px; } } - .el-button { position: absolute; - right: 8px; top: 50%; - transform: translateY(-50%); - font-size: 18px; + right: 8px; padding: 0 24px; height: 42px; + font-size: 18px; + transform: translateY(-50%); } } } @@ -270,8 +270,8 @@ const toCart = () => { } &-right { margin-top: -10px; - width: 240px; padding-left: 20px; + width: 240px; p { text-align: center; } diff --git a/sub-operation-service/src/layouts/component/Main/index.vue b/sub-operation-service/src/layouts/component/Main/index.vue index de3bddf..09c10b8 100644 --- a/sub-operation-service/src/layouts/component/Main/index.vue +++ b/sub-operation-service/src/layouts/component/Main/index.vue @@ -35,14 +35,14 @@ const isReload = computed(() => SettingStore.isReload); display: flex; width: 100%; height: 100%; - @include scrollable(); - box-sizing: border-box; + @include scrollable; + box-sizing: border-box; &-inner { - width: 100%; padding: 10px; - box-sizing: border-box; + width: 100%; background-color: #f5f5f5; + box-sizing: border-box; } } diff --git a/sub-operation-service/src/layouts/component/UserMenu/index.vue b/sub-operation-service/src/layouts/component/UserMenu/index.vue index 99de0fa..947043f 100644 --- a/sub-operation-service/src/layouts/component/UserMenu/index.vue +++ b/sub-operation-service/src/layouts/component/UserMenu/index.vue @@ -69,22 +69,21 @@ const toHome = () => { div { box-sizing: border-box; } - .layout-user-centre-warp { - width: 320px; - text-align: center; display: inline-block; - height: 100vh; padding: 16px; + width: 320px; + height: 100vh; + text-align: center; .layout-user-centre { - height: calc(100% - 0px); - background: $color-fff; overflow: auto; + height: calc(100% - 0px); border-radius: 16px; + background: $color-fff; } .layout-user-centre-top { - width: 100%; padding: 8px; + width: 100%; .logo-warp { height: 74px; } @@ -95,7 +94,6 @@ div { .el-menu-item { font-size: 20px; font-weight: 400; - .iconfont { display: inline-block; vertical-align: middle; diff --git a/sub-operation-service/src/layouts/index.vue b/sub-operation-service/src/layouts/index.vue index 230e96e..dd707f2 100644 --- a/sub-operation-service/src/layouts/index.vue +++ b/sub-operation-service/src/layouts/index.vue @@ -12,17 +12,16 @@ import Main from './component/Main'; diff --git a/sub-operation-service/src/layouts/userCentre.vue b/sub-operation-service/src/layouts/userCentre.vue index 774e60d..8d29f79 100644 --- a/sub-operation-service/src/layouts/userCentre.vue +++ b/sub-operation-service/src/layouts/userCentre.vue @@ -15,13 +15,13 @@ const SettingStore = useSettingStore(); diff --git a/sub-operation-service/src/views/smartFarm/components/common.vue b/sub-operation-service/src/views/smartFarm/components/common.vue index 85d3899..6d16ef4 100644 --- a/sub-operation-service/src/views/smartFarm/components/common.vue +++ b/sub-operation-service/src/views/smartFarm/components/common.vue @@ -28,25 +28,25 @@ const props = defineProps({ height: calc(100vh - 230px); text-align: center; .ecommerce-common-content { - width: $width-main; - margin: auto; - height: 100%; display: inline-flex; justify-content: space-between; + margin: auto; + width: $width-main; + height: 100%; .left-menu, .common-content { + overflow-y: auto; + padding: 8px; height: calc(100% - 16px); border-radius: 8px; - padding: 8px; - overflow-y: auto; } .left-menu { width: 240px; background: $color-fff; } .common-content { - width: calc(100% - 240px); margin-left: 16px; + width: calc(100% - 240px); } } } diff --git a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue index d04774e..d9d9446 100644 --- a/sub-operation-service/src/views/smartFarm/components/leftMenu.vue +++ b/sub-operation-service/src/views/smartFarm/components/leftMenu.vue @@ -24,7 +24,7 @@
-
    +
    • {{ item.title }} @@ -126,20 +126,20 @@ const openList = (index) => { .isOpen { position: absolute; right: -24px; - height: 20px; width: 20px; + height: 20px; } .active { color: $color-main; } .smartFarm-left-menu-warp { + padding: 0 30px; width: 100%; height: 100%; - padding: 0 30px; .left-menu { .left-menu-item { - width: 100%; padding: 16px 0; + width: 100%; cursor: pointer; &.active { color: $color-main; @@ -154,20 +154,20 @@ const openList = (index) => { height: 32px; } .item-title { + padding-left: 8px; font-size: 18px; font-weight: 400; - padding-left: 8px; } .item-children { - text-align: center; - font-size: 16px; margin-top: 8px; + font-size: 16px; + text-align: center; transition: transform 0.3s ease; .dot { display: inline-block; - height: 4px; margin-right: 15px; width: 4px; + height: 4px; border-radius: 90px; background-color: black; vertical-align: middle; diff --git a/sub-operation-service/src/views/userCenter/components/common.vue b/sub-operation-service/src/views/userCenter/components/common.vue new file mode 100644 index 0000000..2fedef8 --- /dev/null +++ b/sub-operation-service/src/views/userCenter/components/common.vue @@ -0,0 +1,55 @@ + + + diff --git a/sub-operation-service/src/views/userCenter/components/ischeck.vue b/sub-operation-service/src/views/userCenter/components/ischeck.vue index 8fd93d2..8446af9 100644 --- a/sub-operation-service/src/views/userCenter/components/ischeck.vue +++ b/sub-operation-service/src/views/userCenter/components/ischeck.vue @@ -41,12 +41,12 @@ const doCheck = () => { diff --git a/sub-operation-service/src/views/userCenter/components/userHeader.vue b/sub-operation-service/src/views/userCenter/components/userHeader.vue index 7bbc6b6..10e5642 100644 --- a/sub-operation-service/src/views/userCenter/components/userHeader.vue +++ b/sub-operation-service/src/views/userCenter/components/userHeader.vue @@ -5,7 +5,14 @@
-
+ + + +
+ + + +
@@ -52,53 +59,53 @@ const toLink = (item) => {