From 691770268feab36c0cab49d7816e5a991e774ceb Mon Sep 17 00:00:00 2001 From: xiaoguang Date: Tue, 10 May 2022 15:52:51 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=B7=A6=E4=BE=A7=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/img/account/home/bkg-user-info.png | Bin 0 -> 9819 bytes assets/img/account/home/icon-order1.png | Bin 0 -> 2063 bytes assets/img/account/home/icon-order2.png | Bin 0 -> 1941 bytes assets/img/account/home/icon-order3.png | Bin 0 -> 2056 bytes assets/img/account/home/icon-order4.png | Bin 0 -> 3242 bytes assets/img/account/home/icon-order5.png | Bin 0 -> 3370 bytes constants/index.js | 15 ++- layouts/module/header/index.vue | 4 +- pages/account/index/home/index.vue | 115 +++++++++++++++++++++- 9 files changed, 125 insertions(+), 9 deletions(-) create mode 100644 assets/img/account/home/bkg-user-info.png create mode 100644 assets/img/account/home/icon-order1.png create mode 100644 assets/img/account/home/icon-order2.png create mode 100644 assets/img/account/home/icon-order3.png create mode 100644 assets/img/account/home/icon-order4.png create mode 100644 assets/img/account/home/icon-order5.png diff --git a/assets/img/account/home/bkg-user-info.png b/assets/img/account/home/bkg-user-info.png new file mode 100644 index 0000000000000000000000000000000000000000..0fd4705bc76fc4ae27872a03bd10368d0a765f73 GIT binary patch literal 9819 zcmeHt`9D-`_&?K(#-LGh*Zt24ieFc@oOjDd*yFKx}zY zAsq^;sn^)iSZ+KaHL`Zt!SK^=zcHmVSttt&+pNhf=dHTJqW8lq{`KqA8yf~cF5*uz zhOMK_nTL&TgBy(UWe5FV`=rW#@+|LwmbU##08;EpOu;Zngd&t z`-!IHwYk%DH-CLEk9e{q0ZLd9GY|nRuw3y+mH%TaTLwi7&k3lqP*2*rys+CTs3Yus z6*D*IMbwD((uno4<_Vt0_$Ipo%=+$F2Z!O%>CIm6wGpqNXVt4~aYv+D4462mig}lv zq2H`|lwtFM58%mmZ>lQKXI~PPtL$AI?jPjL8r)hFwJ_ZBp1&Xn?i_k14znRbk2KNG zwzLXY>>(Gp(_V)RYc&wo?5Q^rK8%Wk;Bw<K5T&S{H_v5&R2I;ptuKq}mMu;X_5a!NBH@!^iCeh(1!n_n0M1!UTBK zB;RY7ig(??3GTtZuY^!xX?7BhFF!*<6Mo2Toj>WmJWubbtRdlG zSB}KMbDP=hfC@GD3qnKg~D1^h#}$a}_7bz~P^S2b=AgayzGLXl!@m6e)vNxbOVCbVn>+~*8?NA=OP4VwNTCLL1H4Fq*Ii(=hMVPlV6T{uNwkl5fNIo^5+Z@(EeV9+;o$!NDOS3;tq zD^$q)A(zi9QP}}sw!AaUga|f6E1DVg>)z$>%Te>FFW)bDj?z`TjN>;I4Z_e3iVEl%TorCsMB zZmnALyXoRvYj_cm;xJWDi)a3Q_#o}QajTFf*~obZNzzLj z1~Y6mqFEg|KGd6u#xk9CSLN;jRJJ08;ObQ!QQW-NaWm^b$(OZ-iqUVPhRh(dItgm@ z5icmJEE3g=<7S!kJl*C%h?1I$4^znETaC*!Ob?>y=xcFIjRA5|2RxfT#7lCzUXwUx zG zFCFNH(8Q4XVmAjrZM+x$wdsBc(#sC3`#?x1qR+yR`T?`ni49I(bL`k3yLABxfoMpS z<*v@?lQu7-Y1b=V5w4fqwI*OpPj4#nxgW9-Kp1Kp4>9zFt1h!26pd?TQ!|eTR=qY7 zO6dI%+7aZ;0NSH3Qd>@d-6L;re^rZfT9 z+N>0cwo4d}*1{)betS7@_Df{EpM7zvbV4mFWvFp; AI1B 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 bFgM~Kk8+fnBoF!a00000NkvXXu0mjfTsEdC literal 0 HcmV?d00001 diff --git a/assets/img/account/home/icon-order3.png b/assets/img/account/home/icon-order3.png new file mode 100644 index 0000000000000000000000000000000000000000..4863dd84a13fcf79e21ed8adbcffaf4f3a3801eb GIT binary patch literal 2056 zcmb7_Yar7N1I7PtGd8`7r`&RnZ7$ifR94ERB__3nMrh@6Yc9EFmfV>T2@@KTVP(t^ ziRKy)v)qPM9zrrwgiw0C-`_9qhjV^k&iQaYo#cylRx;8`(f|O+Sf4wC-=*(=1qSVU zy60uyE<}RyRu%xOU*$6ZNVZv@F}DwQTY6+3pkgc^J-Ny#$bjv$(r!DL%!{D-Z$rGJ z%#ZoqZ!rET%8=|o&%ZcEH`i>`x=+7lIv!+cp;@r^x)w`Oxp}zaX#T@GF9C{_W>igBTrWtobfvYpXab*RGsTB0*IwRsaO@z+~CE(_=<$T%v`38 zjA)6Plzy(J*z~@nn8qXWrScXUI?HKL&mX1yQ=1L`=mM=aO} zR`Y2gtMNTKa)mEP;TK4DNsnk? ze2GRtc4iu~iA+zgk^@iHi%WWHg&m$_bXmG##P;kBe5J24{=Bu~69m-Pe|~a1f^00m z@m2vPa8CE)C`$bLU3E#87j~N(Ax7FdGJ=8ALoH)ysGpd#mohzE! zOu6P5!7QQ1pDTb)Oh% z@0fe`LB(hW<-y6MP}3ySzd6WU^`_qem}5ZGWRL#l^I=>>vS11v&d)M25MO_N!f6Gm zjuX}5gqPQtii2;CW|>IDl?Ye%p`3~0X)iksWVGCi(g_D8T#ouE#>=@A84@ZklD#jy z-G{lcjnvU{O;C=4?d~epjiQwITOHp&5M1i3yO|T6B%gWY+T%WN!%*!?qDjL}6BDqF+S7sJH-AH$3%a3%aZ<>3I#e{2h%DUi@l} zlRt4v=IR0Y?5jgHIhe0CwP|7x@QHUeFzn3@OCWGWqx7dc4>vV<^+y3^0%jz{;Y#8d zhJwhrR$@HWL-Me|r}rIQzY^N;9#$P)=9WWQ;8TBeqVrZ^*e{z&s+%`FkX^Tz=E1M3 znAIcQSK+g#Sv?WRzKIw8!HBOReG6O^~S`oHXVNT zpNj4+eX9j?4cMLt&um?XHepLxS{VlSy*EeEpl_TO4-vHmvpI|Yl-teob$I4ra7cn+ z#4&J8l%I_+l>}E_w$;Mw^+0k-hKQ#fA14rpv+>z6k5y-{;HX}u8?7WGu>Bqqe92F>FduDiGf-T6q|UT9oK&G*(rZe???8ZM)~ebc9@rB$pGVW4x(}OJ4?0SG(iZZ2K;g1|C3T$kpWN8~QbnjhA-G>r9;seQi=s(!8F(sb3HOs>;&M#w@HMwBD=zMHMP z&6>4!#n37*3kA5G(=a25!SKCEq2*Mu#Uj|8a+gIOtGG3a=Q_3Cg|@~xc?;d5>>J|= zWo%ZBMp2zq%1nTSf`bb?C-^h;g$k%Qp8dueHJR1$U^&tvVhe6R)e^d%G?k zN%3o3{4GLw WH(epbh8yo*J7A5mJHxUd#{LVA>eny; literal 0 HcmV?d00001 diff --git a/assets/img/account/home/icon-order4.png b/assets/img/account/home/icon-order4.png new file mode 100644 index 0000000000000000000000000000000000000000..4d12a077d3c965017c2ff5af83a37dfe3582ced7 GIT binary patch literal 3242 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 literal 0 HcmV?d00001 diff --git a/assets/img/account/home/icon-order5.png b/assets/img/account/home/icon-order5.png new file mode 100644 index 0000000000000000000000000000000000000000..c9d9c43751571a93520a25fda2c317bf13ac5c1d GIT binary patch literal 3370 zcmV+_4b}3AP)Px>Y%Zx6{sI3RuNHf+=8A!1A8~W6T%2 z-R>Rrdi{20z74=WX1;}pZU(Ryz>NTATu-(Dd;(ydnJ*L3hX5`T(FbuHzgMf(E?8?n z&cD~$v`~o^W{mj?5#7hkcLBH)z}K=F{%5tk58z!QdWV_cwATJBKE=#O9jhyP+*!1@PDCf#?e>dVRHm(?aKIXk#=QWZE1F1XCnU6- z5EKBH6Lf=hOzEHr7F~0)vgESo-^3Db`uMv^_S$DsmlmE)US65fph?3fSR_k`V_nkj~{x90bQvs$Fg_q(up4%;KP&=W$ za>5?#^}3jN5-ESEXbc9-S&Dz-8$hjAo3Hvg%Qr^f@9vy--dB!@zOS`h2La}MFvP^s zGYAgtOO-VkzR3;!U8xZfi^M*Sk4PwBUUSLyyl;&HQ@Nk14%BMEoGaSDecnxR9N$_M zMQ-S7Nn2hN#`SvrpPu){8|%wH7rGF@jsp-cr;(4CNZRdoly+dd`MqYd88NfZG;_jQ zn^-0Uu>W|RJU8Mv-gmvSLf^;cSflL!Nlrf>S!=(PxF~!L$?qC{Au}KDbUI>X&h6QX zj_haNHfe~r(?u{vvnO6XlUsusSF9l*K0Tvqg&AZ1>hX2YeRXX{i*sOHLy-ws*+W~0 zDO#S0??(ux%2jsGT6@o^dcA*r=@>tNYLq~;(!iY@w9n9mth z0=k7_7xuW7CWmuv5W_kX9ljxYRh(r?^B7}9WGDIZ549uu0Q-k00Q{u2R$Q42eYPn+ zunbNd@Iar+MM#V>;@TmmN!da&Bk z5E2(PBj?+s=jK7(;z+<0R^<(AZK9ba4G5v{IPHgsJFSQWN=@++3#W2=#hXm zo6YYr^Gl;9uuNtYjt=d;f|+IJpb(*n6B3`>I25j1Ir zs39k1CnO4{c+pyWt9B0)1?5N9q}i&x-g3Z@tGN1X%%6m_5lV!ubN7un9PzK zq^)bf*;HQ*;R1nMMY_rtxL3lex{ZLuN-{AOi3x;s}SUJLtjx8qHjdtdwgyL@yER8q>Fjlycq=lMzK;Krh zxRU61NH{rzt*C6`ZwQ_D2B(h|(C1c}FJyMz*~fAVTXkoyYh9ZOZv)$k+S0~@^+0pM zd}0MjVz}dl%t~V#wpc`**r(B>2M8Q(2SLzw+**{kMqRVNYRhQIMkYb&Zk742eaL;4 zX(y(P<&>){n`<8&VAG3L#`qExrWC0?(~DIki{A9=q7FF`dixdyX+mD#YmpmkQ7nZfrZ}{k$%? z?DbKhu9Bh`<2atr`@$8)yiKHtV}+uTPxREv{R&wby}}yZo22V@KU0`bw&$pjOPbw& zrp;%$Y^^;!k8Rvj9mny(-NGIn8x$*oHfTb1KpwUIjwKTN zD^+;0_7}fctJMxxJrRLBXZ_Jf-TMYUb{?9{0CUVSG+AlOT3gC1@_Yo-7$f&Yg?I~R za<62jfH}~Dl9oCVdAKTf-8)6DIv~&iU(TeZeS2EyN)y@?b-Ue@W!>9c>cl50Bp`5S zLNZxdnb7(qu@ShZ^{NsjXe*B6vtTT$ULW;-Jqiw)+^5=S-Q{6S7D^JEUIM#QTe1!UFbc4vk(?DnSzT)=v0)Ml^m zOhiZ0CMETeom^K~p9;$Wcv+b*GpWyOL?oH-R#sP6#an9ZXJKLCZe~8f%#uk^dzKp7 zuBe*;Jf0>QsdgZR0MAaPB-7K zYf>O)(B4&5Ocb!by-i%`o&fNeCr4S<;}5CtBLJ@ec*&PVFQn4YvZVlQKvask<{|A} zP@w}(QC?W-YkAT1(EgMTu-*V%8mtGI`Tn8_iVz7RdV`r?AC(p=bfU8=Us}NW2PjE< zi0D3Mz6-#eo@^Cq=H`6>?-J2F%>3rCBsFO&&EuU)05&*qxssyW?cPzZ*KcR$+r%El z%(oEH&5m{62w=v&w*}x6an@w!%S7~{xZn}d2XP#~SF6<|f6T{uOl}@^RuZs0CZZ~J zP64Y5Qm&smZs91OZ4;0Cg#}HOAga7~l07*qoM6N<$g5#lB AD*ylh literal 0 HcmV?d00001 diff --git a/constants/index.js b/constants/index.js index 549e11f..dd230f8 100644 --- a/constants/index.js +++ b/constants/index.js @@ -1,8 +1,15 @@ /** * 全局常量，请避免使用魔法数字 */ -const TOKEN_KEY = 'msbPcToken'; -export { - TOKEN_KEY -} \ No newline at end of file +// 用户凭证名 +const TOKEN_KEY = "msbPcToken"; + +// 订单状态 +const ORDER_STATUS = { + WAIT_PAY: 1, // 待付款 + WAIT_SEND: 3, //待发货 + WAIT_RECEIVE: 4, // 待收货 +}; + +export { TOKEN_KEY, ORDER_STATUS }; diff --git a/layouts/module/header/index.vue b/layouts/module/header/index.vue index 2d1ec76..96a6069 100644 --- a/layouts/module/header/index.vue +++ b/layouts/module/header/index.vue @@ -268,7 +268,7 @@ export default { height: 50px; z-index: 10; background: #ffffff; - box-shadow: 0px 4px 10px 1px rgba(0, 0, 0, 0.10000000149011612); + box-shadow: 0px 4px 10px 1px rgba(0, 0, 0, 0.1); .sticky-bar-header__wrap { @include layout-box; height: 100%; @@ -446,7 +446,7 @@ export default { .tab-category-menu__right { width: 510px; padding: 30px 26px; - box-shadow: 7px 0px 10px 1px rgba(0, 0, 0, 0.10000000149011612); + box-shadow: 7px 0px 10px 1px rgba(0, 0, 0, 0.1); border: 1px solid #eeeeee; background: #ffffff; .menu-right__item:hover { diff --git a/pages/account/index/home/index.vue b/pages/account/index/home/index.vue index 8876370..3d75d28 100644 --- a/pages/account/index/home/index.vue +++ b/pages/account/index/home/index.vue @@ -7,14 +7,123 @@ --> - + From 936db76a1f3876b084703f232d03e0ae09147020 Mon Sep 17 00:00:00 2001 From: xiaoguang Date: Tue, 10 May 2022 19:42:44 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=A6=96=E9=A1=B5=EF=BC=8Celement-u?= =?UTF-8?q?i=E6=9B=B4=E6=94=B9=E4=B8=BB=E9=A2=98=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/img/account/home/logisitcs-empty.png | Bin 0 -> 40199 bytes assets/img/common/icon-warning.png | Bin 0 -> 671 bytes assets/scss/element-variables.scss | 7 + components/UiConfirm.vue | 83 +++++++++ pages/account/index/home/index.vue | 9 +- .../index/home/module/LogisitcsInfo.vue | 173 +++++++++++++++++- plugins/api/order.js | 10 +- plugins/element-ui.js | 1 + 8 files changed, 272 insertions(+), 11 deletions(-) create mode 100644 assets/img/account/home/logisitcs-empty.png create mode 100644 assets/img/common/icon-warning.png create mode 100644 assets/scss/element-variables.scss create mode 100644 components/UiConfirm.vue diff --git a/assets/img/account/home/logisitcs-empty.png b/assets/img/account/home/logisitcs-empty.png new file mode 100644 index 0000000000000000000000000000000000000000..01c8ba7d4e2d99996bd5339096375ad45e338a3c GIT binary patch literal 40199 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 + +
+ + {{ title }} +
+
+ 取消 + 确认 +
+ + + + diff --git a/pages/account/index/home/index.vue b/pages/account/index/home/index.vue index 3d75d28..dd9a5c9 100644 --- a/pages/account/index/home/index.vue +++ b/pages/account/index/home/index.vue @@ -30,15 +30,21 @@ - + \ No newline at end of file +.home-logisitcs { + width: 620px; + border: 1px solid #dddddd; + .home-logisitcs-label { + height: 42px; + line-height: 42px; + padding: 0 22px; + border-bottom: 1px solid #dddddd; + background: #f8f8f8; + font-size: 14px; + color: #333333; + } + .home-logisitcs-empty { + height: 310px; + img { + width: 228px; + height: 144px; + } + } + .home-logisitcs-content { + max-height: 620px; + overflow: auto; + padding: 30px; + &::-webkit-scrollbar { + width: 4px; + background-color: none; + } + &::-webkit-scrollbar-track { + background-color: none; + } + &::-webkit-scrollbar-thumb { + background: #dddddd; + border-radius: 10px; + } + .home-logisitcs-content__item { + margin-bottom: 30px; + &:last-child { + margin-bottom: 0; + } + .logisitcs-content-item__info { + img { + width: 60px; + height: 60px; + margin-right: 18px; + border-radius: 2px; + } + .content-item-info__wrap { + .item-info-wrap__title { + width: 309px; + font-size: 14px; + color: #666666; + margin-bottom: 8px; + } + .item-info-wrap__orderNo { + display: inline-block; + color: #999999; + font-size: 12px; + } + .item-info-wrap__orderNo--light { + color: #ff875b; + margin-left: 30px; + cursor: pointer; + } + } + } + } + } +} + diff --git a/plugins/api/order.js b/plugins/api/order.js index 1401d7e..493d51d 100644 --- a/plugins/api/order.js +++ b/plugins/api/order.js @@ -56,13 +56,21 @@ export const ApiGetOrderProductDetail = ({orderProductId}) => export const ApiGetOrderPaySatus = ({orderId}) => ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/payResult/${orderId}`)); - + /** * 获取物流信息 * @param {*} orderId */ export const ApiGetOrderLogistics = ({orderId}) => ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/logistics/${orderId}`)); + + /** + * 获取物流列表 + * @param {*} params + */ +export const ApiGetOrderLogisticsList = (params) => + ToAsyncAwait(axiosTk.get('http://yapi.smart-xwork.cn/mock/148902/logisitcs/list'), { params }); + /** * 确认收货 * @param {*} orderId diff --git a/plugins/element-ui.js b/plugins/element-ui.js index ff3dbc9..e94e5cd 100644 --- a/plugins/element-ui.js +++ b/plugins/element-ui.js @@ -1,5 +1,6 @@ import Vue from 'vue' import Element from 'element-ui' import locale from 'element-ui/lib/locale/lang/zh-CN' +import '@/assets/scss/element-variables.scss' Vue.use(Element, { locale }) From 6aa3e4992ecde6cdfc775ff76832205b53063f17 Mon Sep 17 00:00:00 2001 From: xiaoguang Date: Tue, 10 May 2022 20:00:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E5=A4=B4=E9=83=A8=E5=BA=95=E9=83=A8=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/default.vue | 22 +++++++++++----------- layouts/module/header/HeaderInfoBar.vue | 4 ++-- layouts/module/header/index.vue | 12 ++++++++++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/layouts/default.vue b/layouts/default.vue index 2d08f98..26e8b66 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -9,8 +9,9 @@
@@ -21,8 +22,7 @@ import BsLogin from "@/components/BsLogin.vue"; import Header from "./module/header/index.vue"; import Footer from "./module/footer/index.vue"; -const CATEGROY_OPEN_PAGES = ["/"]; // 默认展开热门分类tab的页面 -const CATEGROY_HIDE_PAGES = ["/account"]; // 不展示热门分类tab的页面 +const CATEGROY_HIDE_PAGES = [/\/account/]; // 隐藏热门分类tab的页面 export default { name: "Layout", @@ -42,13 +42,13 @@ export default { this.$store.commit("setLoginVisible", val); }, }, - categroyOption() { - // 当前页面路径 - const currentPath = this.$route.path; - return { - open: CATEGROY_OPEN_PAGES.includes(currentPath), - show: !CATEGROY_HIDE_PAGES.includes(currentPath), - }; + isHomePage() { + return this.$route.path === "/"; + }, + showCategroyTab() { + return !CATEGROY_HIDE_PAGES.some((reg) => { + return reg.test(this.$route.path); + }); }, }, mounted() { diff --git a/layouts/module/header/HeaderInfoBar.vue b/layouts/module/header/HeaderInfoBar.vue index a97ff74..0a7fc93 100644 --- a/layouts/module/header/HeaderInfoBar.vue +++ b/layouts/module/header/HeaderInfoBar.vue @@ -116,7 +116,7 @@ export default { handleCommandClick(event) { switch (event) { case MENU_VALUE.PERSONAL: - this.$router.push("/account/userInfo"); + this.$router.push("/account/home"); break; case MENU_VALUE.ADDRESS: this.$router.push("/account/address"); @@ -136,7 +136,7 @@ export default { }, }; - From d5917b2c8602771645961affdd8ba46983b96b6c Mon Sep 17 00:00:00 2001 From: xiaoguang Date: Tue, 10 May 2022 22:03:00 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/index.js | 9 +- pages/account/index/home/index.vue | 47 +++++ .../index/home/module/LogisitcsInfo.vue | 9 +- pages/account/index/userInfo.vue | 194 +++++++++++++++++- plugins/api/order.js | 5 + 5 files changed, 252 insertions(+), 12 deletions(-) diff --git a/constants/index.js b/constants/index.js index dd230f8..b86de01 100644 --- a/constants/index.js +++ b/constants/index.js @@ -12,4 +12,11 @@ const ORDER_STATUS = { WAIT_RECEIVE: 4, // 待收货 }; -export { TOKEN_KEY, ORDER_STATUS }; +// 性别 +const SEX_TYPE = { + MALE: 1, // 男 + FEMALE: 2, // 女 + UNKNOW: 3, // 未知 +}; + +export { TOKEN_KEY, ORDER_STATUS, SEX_TYPE }; diff --git a/pages/account/index/home/index.vue b/pages/account/index/home/index.vue index dd9a5c9..75236aa 100644 --- a/pages/account/index/home/index.vue +++ b/pages/account/index/home/index.vue @@ -27,6 +27,9 @@ > {{ item.label }} +
@@ -39,6 +42,10 @@ \ No newline at end of file +.account-user-info { + width: 1000px; + border: 1px solid #dddddd; + font-size: 14px; + color: #333333; + .account-user-info__label { + height: 42px; + line-height: 42px; + padding-left: 24px; + border-bottom: 1px solid #dddddd; + background: #f8f8f8; + } + .account-user-info__content { + padding: 44px 69px; + background: #ffffff; + /deep/.el-form { + .el-form-item__label { + margin-right: 40px; + color: #333333; + } + .user-info-content__avatar { + margin-top: -13px; + .el-image { + width: 70px; + height: 70px; + margin-right: 30px; + border-radius: 50%; + } + .el-button { + width: 89px; + height: 30px; + border-radius: 15px 15px 15px 15px; + border: 1px solid #eeeeee; + } + } + .user-info-content__nickname { + height: 35px; + width: 210px; + .el-input__inner { + border: 1px solid #eeeeee; + } + } + .ui-button { + width: 136px; + height: 36px; + } + } + } +} + diff --git a/plugins/api/order.js b/plugins/api/order.js index 493d51d..ade221d 100644 --- a/plugins/api/order.js +++ b/plugins/api/order.js @@ -150,6 +150,11 @@ export const ApiGetLogisticsCompanylist = (params) => */ export const ApiPutLogisticsInfo = (data) => ToAsyncAwait(axiosTk.put(`${BASE_URL}/app/refundOrder/completeRefund`, data)); +/** + * 退款订单统计 + */ + export const ApiGetRefundStatistisc= (data) => + ToAsyncAwait(axiosTk.put(`${BASE_URL}/app/refundOrder/statistics`, data)); From bc58bb9f45bfa3390561467c6c04347864d57e18 Mon Sep 17 00:00:00 2001 From: xiaoguang Date: Wed, 11 May 2022 10:10:53 +0800 Subject: [PATCH 05/10] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=B5=84=E6=96=99=E7=BB=84=E4=BB=B6=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/UiConfirm.vue | 6 +++--- pages/account/index/userInfo.vue | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/UiConfirm.vue b/components/UiConfirm.vue index c6369dc..db3f225 100644 --- a/components/UiConfirm.vue +++ b/components/UiConfirm.vue @@ -12,7 +12,7 @@
取消 - 确认
@@ -43,8 +43,8 @@ export default { }, }, methods: { - onEnsure() { - this.$emit("ensure"); + onConfirm() { + this.$emit("confirm"); this.visible = false; }, }, diff --git a/pages/account/index/userInfo.vue b/pages/account/index/userInfo.vue index f011134..184c3b8 100644 --- a/pages/account/index/userInfo.vue +++ b/pages/account/index/userInfo.vue @@ -28,8 +28,8 @@ :action="ossUploadUrl" :data="uploadData" :show-file-list="false" - :on-success="handleAvatarSuccess" - :before-upload="handleBeforeLoad" + :on-success="handleUploadSuccess" + :before-upload="handleBeforeUpload" > 修改头像 @@ -90,7 +90,7 @@ export default { }, created() { this.initData(); - this.getOssUrl(); + this.getOssConfig(); }, methods: { initData() { @@ -103,7 +103,7 @@ export default { }); } }, - async getOssUrl() { + async getOssConfig() { const { result } = await ApiPostGetOssConfig({ configId: "account-avatar/", serviceName: "uc", @@ -122,14 +122,14 @@ export default { }, // 获取文件名 - handleBeforeLoad(file) { + handleBeforeUpload(file) { this.fileName = file.name; Object.assign(this.uploadData, { key: `${this.ossDirName}${"${filename}"}`, name: file.name, }); }, - handleAvatarSuccess() { + handleUploadSuccess() { this.form.avatar = `${this.ossUploadUrl}/${this.ossDirName}${this.fileName}`; }, onSubmit() { From 867e6dd6531138dba31bb7b55a95bedf78fe61c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= Date: Wed, 11 May 2022 10:54:58 +0800 Subject: [PATCH 06/10] =?UTF-8?q?feat:=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/BsAddress.vue | 66 ++++++++++++++++++++------ pages/account/index/address.vue | 83 +++++++++++++++++++++++++++++---- pages/goods/detail/_id.vue | 3 +- 3 files changed, 126 insertions(+), 26 deletions(-) diff --git a/components/BsAddress.vue b/components/BsAddress.vue index fc59b8c..1732652 100644 --- a/components/BsAddress.vue +++ b/components/BsAddress.vue @@ -1,6 +1,6 @@ + diff --git a/pages/index/module/Seckill.vue b/pages/index/module/Seckill.vue index 3c85476..f96e05e 100644 --- a/pages/index/module/Seckill.vue +++ b/pages/index/module/Seckill.vue @@ -7,18 +7,218 @@ --> \ No newline at end of file +.home-sckill { + height: 260px; + .home-sckill-bar { + width: 190px; + height: 100%; + padding: 45px 0 28px 0; + text-align: center; + color: #ffffff; + background-size: 100% 100%; + .home-sckill-title { + display: block; + font-size: 28px; + margin-bottom: 90px; + } + .home-sckill-wrap { + margin-bottom: 10px; + .home-sckill-wrap__tip { + font-size: 0; + strong { + font-size: 18px; + } + span { + font-size: 14px; + } + } + .home-sckill-wrap__countdown { + margin-top: 10px; + .sckill-wrap-countdown__time { + width: 30px; + height: 30px; + line-height: 30px; + text-align: center; + color: #ffffff; + font-size: 18px; + font-weight: bold; + background: #2f3430; + } + .sckill-wrap-countdown--mark { + display: block; + font-size: 20px; + margin: 0 8px; + } + } + } + } + .home-sckill-carousel { + /deep/.el-carousel { + width: 1010px; + .el-carousel__container { + padding: 0 10px; + background: #ffffff; + .el-carousel__arrow { + i { + font-size: 14px; + font-weight: bold; + } + &--left { + left: -11px; + } + &--right { + right: -11px; + } + } + } + .carousel-goods { + height: 100%; + .carousel-goods-box { + .carousel-goods-box--line { + height: 160px; + width: 1px; + background: #eeeeee; + } + .carousel-goods-box__item { + width: 198px; + padding: 20px 24px; + .goods-box-item__cover { + width: 150px; + height: 150px; + object-fit: productMainPicture; + margin-bottom: 14px; + } + .goods-box-item__wrap { + font-size: 14px; + color: #333333; + text-align: center; + .box-item-wrap__title { + @include ellipsis; + margin-bottom: 8px; + } + .box-item-wrap__price { + color: #ff512b; + text-align: center; + } + } + } + } + } + } + } +} + From fc829b4d491164db913e2c9240b4af1d39a3c23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= Date: Wed, 11 May 2022 16:27:34 +0800 Subject: [PATCH 09/10] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/BsAddress.vue | 35 ++++++++++++++++++++++++++++++--- pages/account/index/address.vue | 34 +++++++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/components/BsAddress.vue b/components/BsAddress.vue index 1732652..6704e87 100644 --- a/components/BsAddress.vue +++ b/components/BsAddress.vue @@ -57,7 +57,14 @@
所在区域 - +
详细地址 @@ -160,9 +167,20 @@ export default { addressUser: "", addressPhone: "", defaultAddress: true, - selectData: {}, + selectData: { + area: { + value: "", + }, + city: { + value: "", + }, + province: { + value: "", + }, + }, addressList: [{}], curAddressListItem: 0, + editIndex: 0, }; }, created() { @@ -187,6 +205,16 @@ export default { }, setAddressData(i) { let vm = this; + vm.editIndex = i; + let editItem = vm.addressList[i]; + console.log(editItem); + vm.$set(vm.selectData.area, "value", editItem.area); + vm.$set(vm.selectData.city, "value", editItem.city); + vm.$set(vm.selectData.province, "value", editItem.province); + vm.$set(vm, "detailAddress", editItem.detailAddress); + vm.$set(vm, "defaultAddress", editItem.isDefault); + vm.$set(vm, "addressUser", editItem.name); + vm.$set(vm, "addressPhone", editItem.phone); }, onSwtich() { this.dialogVisible = true; @@ -230,7 +258,8 @@ export default { }; let res; if (vm.isEdit) { - res = await ApiPutAddress(params); + let editParams = Object.assign(vm.addressList[vm.editIndex], params); + res = await ApiPutAddress(editParams); } else { res = await ApiPostAddress(params); } diff --git a/pages/account/index/address.vue b/pages/account/index/address.vue index 06feed9..ada90e8 100644 --- a/pages/account/index/address.vue +++ b/pages/account/index/address.vue @@ -10,7 +10,7 @@
收货地址