From 34b9efb8a48198d1846fce96bf306edd96f2831e Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 24 Jun 2024 18:06:11 +0800 Subject: [PATCH 01/15] tid1553 add style --- src/components/order_list/timing/site.vue | 0 src/pages.json | 6 + .../order/components/order_list/filter_modal.vue | 55 +++++++++ .../order/components/order_list/header.vue | 83 ++++++++++++++ .../order/components/order_list/period_modal.vue | 123 +++++++++++++++++++++ .../order/components/order_list/stadium_select.vue | 100 +++++++++++++++++ src/subpackage/order/js/api.js | 3 + .../order/pages/order_list/order_list.vue | 47 ++++++++ .../order/pages/order_manage/order_manage.vue | 6 +- src/subpackage/order/static/images/filter.png | Bin 0 -> 127 bytes .../order/static/images/order_manage/order_22.png | Bin 0 -> 920 bytes .../order/static/images/order_manage/order_23.png | Bin 0 -> 1269 bytes .../order/static/images/order_manage/order_6.png | Bin 1269 -> 0 bytes src/subpackage/order/static/images/search.png | Bin 0 -> 386 bytes 14 files changed, 421 insertions(+), 2 deletions(-) create mode 100644 src/components/order_list/timing/site.vue create mode 100644 src/subpackage/order/components/order_list/filter_modal.vue create mode 100644 src/subpackage/order/components/order_list/header.vue create mode 100644 src/subpackage/order/components/order_list/period_modal.vue create mode 100644 src/subpackage/order/components/order_list/stadium_select.vue create mode 100644 src/subpackage/order/pages/order_list/order_list.vue create mode 100644 src/subpackage/order/static/images/filter.png create mode 100644 src/subpackage/order/static/images/order_manage/order_22.png create mode 100644 src/subpackage/order/static/images/order_manage/order_23.png delete mode 100644 src/subpackage/order/static/images/order_manage/order_6.png create mode 100644 src/subpackage/order/static/images/search.png diff --git a/src/components/order_list/timing/site.vue b/src/components/order_list/timing/site.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages.json b/src/pages.json index 60bd538..4e3ef45 100644 --- a/src/pages.json +++ b/src/pages.json @@ -486,6 +486,12 @@ "root": "subpackage/order", "pages": [ { + "path": "pages/order_list/order_list", + "style" : { + "navigationBarTitleText": "订单" + } + }, + { "path": "pages/stored_value_card/detail/detail", "style" : { "navigationBarTitleText": "储值卡订单详情" diff --git a/src/subpackage/order/components/order_list/filter_modal.vue b/src/subpackage/order/components/order_list/filter_modal.vue new file mode 100644 index 0000000..b11a8b7 --- /dev/null +++ b/src/subpackage/order/components/order_list/filter_modal.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/components/order_list/header.vue b/src/subpackage/order/components/order_list/header.vue new file mode 100644 index 0000000..4d7f21a --- /dev/null +++ b/src/subpackage/order/components/order_list/header.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/components/order_list/period_modal.vue b/src/subpackage/order/components/order_list/period_modal.vue new file mode 100644 index 0000000..6741fd5 --- /dev/null +++ b/src/subpackage/order/components/order_list/period_modal.vue @@ -0,0 +1,123 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/components/order_list/stadium_select.vue b/src/subpackage/order/components/order_list/stadium_select.vue new file mode 100644 index 0000000..4c7aa61 --- /dev/null +++ b/src/subpackage/order/components/order_list/stadium_select.vue @@ -0,0 +1,100 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js index ac8af38..8d54b35 100644 --- a/src/subpackage/order/js/api.js +++ b/src/subpackage/order/js/api.js @@ -35,6 +35,9 @@ export const ORDER_API = { rentballEndBilling:`${ORIGIN}/admin/stadium/rentball/order/end`, // 结束订单-后台 // 20220727 rentBallOrderDetails:`${ORIGIN}/admin/stadium/hardware/order/rentBallOrderDetails`, // 硬件管理-订单详情_copy + + // 20240624 tid1553 计时订单拆分 + stadiumList: `${ORIGIN}/admin/stadium/list`, // 店铺列表 } export default ORDER_API; \ No newline at end of file diff --git a/src/subpackage/order/pages/order_list/order_list.vue b/src/subpackage/order/pages/order_list/order_list.vue new file mode 100644 index 0000000..4c85d1f --- /dev/null +++ b/src/subpackage/order/pages/order_list/order_list.vue @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/pages/order_manage/order_manage.vue b/src/subpackage/order/pages/order_manage/order_manage.vue index c20769c..1c32702 100644 --- a/src/subpackage/order/pages/order_manage/order_manage.vue +++ b/src/subpackage/order/pages/order_manage/order_manage.vue @@ -38,7 +38,7 @@ export default { util.routeTo(getTabRoutePath() + `?order_type=${ele.orderType}`,'nT'); }, isFinish(key){ - let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12, 18, 19]; + let _endKeyArr = [ 1, 2, 3, 4, 5, 7, 9, 10, 14, 16, 15, 13, 6, 8, 11, 12, 18, 19, 22]; return _endKeyArr.includes(key); } } @@ -57,7 +57,7 @@ function getTabList(){ tabArr: [ { id: 1, name: '订场订单', key: 1, iconName: 'order_14', orderType: 3 }, { id: 2, name: '次卡订单', key: 2, iconName: 'order_2', orderType: 3 }, - { id: 3, name: '计时订单', key: 3, iconName: 'order_6', orderType: 1 }, + // { id: 3, name: '计时订单', key: 3, iconName: 'order_6', orderType: 1 }, { id: 4, name: '储值卡订单', key: 4, iconName: 'order_1', orderType: 21 }, { id: 10, name: '年月卡订单', key: 19, iconName: 'order_19', orderType: 20 }, { id: 5, name: '课程订单', key: 5, iconName: 'order_8', orderType: 12 }, @@ -66,6 +66,8 @@ function getTabList(){ { id: 8, name: '商城订单', key: 8, iconName: 'order_4', orderType: 2 }, { id: 9, name: '积分兑换订单', key: 9, iconName: 'order_5', orderType: 5 }, { id: 9, name: '零售订单', key: 18, iconName: 'order_18', orderType: 19 }, + { id: 11, name: '散客计时订单', key: 22, iconName: 'order_22', orderType: 22 }, + { id: 12, name: '场地计时订单', key: 23, iconName: 'order_23', orderType: 23 }, ] } diff --git a/src/subpackage/order/static/images/filter.png b/src/subpackage/order/static/images/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..dd0c198b23bffeaa21eab5a697d373bbff630422 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NX3?x5J2>1u2cmjMvT!HlT>C>l8n+7BegAP0b z@|jD5{DK)CdCs(3(*oqmd%8G=NL)@{z%=8(JkLJHnO_B-#fzvpF_sy;V!Oo1kk%C? UU-w716sVNJ)78&qol`;+06TvrLI3~& literal 0 HcmV?d00001 diff --git a/src/subpackage/order/static/images/order_manage/order_22.png b/src/subpackage/order/static/images/order_manage/order_22.png new file mode 100644 index 0000000000000000000000000000000000000000..813b82e8bee326f93b8fc9fbcb6b687058629a43 GIT binary patch literal 920 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2H<0X`wFKzhcE8Jjk30+KUl&IFP` zFbfPIY@i^JH*MN9xGY2jPR^M#2grtya4itUK#dTQ*|TQ@8T01Nn?8LyTq8scP~6`r zWGB!a+9g4L!3;lGo>_c)=wy86=pJRxt8Z@=+v+Fz2&eJR4bi-?esOnmtoTZ)?KN_f za;N_HYW>E*z%;|t#WBR=_}i&B%N85(I2=qcb3X9qg1{zI@4x^5n@^f^Mw2zFTyB~E z-sfA68{WAwP3P#Zr_XnOOD^C2d~2#Kw|)Q3@)-L^Tm>$h`!`*=x$o+;bu6W)%nVAq zL(WR@+^uSue)(OUq>RLkNRdT%XP>mRh;ix>`hS*l_9F@I3D%nz^nQ4?a_$lR*5KoA zMJz>@GdmL>&&z&fB>hCWx9Nc(E2HBF-zO5nK6x`MRp**iwjKyo+r(eg(rm<<+P_#V zB~RtMLb|}*&C3~fH}0+~_Sqh*rLx<-Ys2ndCLZRnm9A#`ZWr%a`YT#%_WtC}j$OL( z?~^q9)YBqXi{BnddNZ$T_p{qY7s7jt#0_3ofBN$Dzecih=6zQIyP{;t;!t1X_cLa? zdwvhPa=tSv;LFpS3-sdTJ?(7L`CJ_eww2_w}^*X}A2J)~*up``@C&rTHbo zzdt87*WI;ZXMnKFJIzI_uU~)awRv|}XZ2l8-umd`mwfq|r89f(1%Ex}qLtt;S{He* z(lPYCn&P*blTF?3uT&F+lm*pV_udm>Yn55kuS7b#vfml6+!z;E2%Y9@+|m3*n)b35)>9z&WHZKzXx@wMfiEa3TChDr5)>$U<=(x?vUsL; z@jCgZ7tP9AO&6Cn&ZxL3;<2D`;vN0d%RUOfo?ic$-`sD;q-86&6a$ksgQu&X%Q~lo FCIEkOx^Vyi literal 0 HcmV?d00001 diff --git a/src/subpackage/order/static/images/order_manage/order_23.png b/src/subpackage/order/static/images/order_manage/order_23.png new file mode 100644 index 0000000000000000000000000000000000000000..1d9bce40a2df24a06e25045cb04cb4df5b2c87ad GIT binary patch literal 1269 zcmVrPE!E*>KGArDx!wcA)G_tIlODi ztW-)|*|n6G(2QpQ00ccrL_t(&-t3pzj;k;bMAP0Eun9||{{J7nx{9%_0K;bHVMIyu z5+**Wc6DPvZr!?d>(;FjVyl0DOpMVLu}eHxQj-;FSzW+=1Fj0*#mP(p!m1D?D-G7T z#WCu?1O6^G0>FRPwAAd%a3$nQxXQQF$X#it!UM!S1VKOqB;sN60dl$M2&RwU5c?7Q z3w~K%>g#y{Vfsc{4P-Z!K@C$=w?Zo^5!jQ|n_ z-_MY6Q~I^^@m#m6>6|c>8sWM|we{!ovM(vFA&)L;`A`X(6_Zg>4ZJ1!Hh|`*!|kVpElIv7iko{PfAOv)Qa8NK&Oq}REGw3-H0jDRCC7mAebMe? zLwa}QcVEcoYHE@s(V7aB%gAVlxvtxg%lbWz= zdRU{T#>ao%o8fMQFbsrOutY()kWNML{x7;pgt?n2ADtt#^nO=86=LUn=Uy*tsdmJk_!^qe**oSI&h= zQ;@#nVwmE52aZ5iFvyUxZ?9-oAa>k4o&K(^R2fH9p`kI8riy|O# z{q5L2g^a}`aWQUuX>VClnP>61w8?OR6>5PK|d87y!8f}X*Go<|slV}#+Mjln~ke@tcYn974W!!ww( z6~SOD!f(DX*nDBTiNSW0%V1-$!REIV8Eh%Ci3(s7)oU9w*f#bXuixt-Rfz f6jqS;|1!P+OsUI9t@n@$00000NkvXXu0mjfc^Gtq literal 0 HcmV?d00001 diff --git a/src/subpackage/order/static/images/order_manage/order_6.png b/src/subpackage/order/static/images/order_manage/order_6.png deleted file mode 100644 index 1d9bce40a2df24a06e25045cb04cb4df5b2c87ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1269 zcmVrPE!E*>KGArDx!wcA)G_tIlODi ztW-)|*|n6G(2QpQ00ccrL_t(&-t3pzj;k;bMAP0Eun9||{{J7nx{9%_0K;bHVMIyu z5+**Wc6DPvZr!?d>(;FjVyl0DOpMVLu}eHxQj-;FSzW+=1Fj0*#mP(p!m1D?D-G7T z#WCu?1O6^G0>FRPwAAd%a3$nQxXQQF$X#it!UM!S1VKOqB;sN60dl$M2&RwU5c?7Q z3w~K%>g#y{Vfsc{4P-Z!K@C$=w?Zo^5!jQ|n_ z-_MY6Q~I^^@m#m6>6|c>8sWM|we{!ovM(vFA&)L;`A`X(6_Zg>4ZJ1!Hh|`*!|kVpElIv7iko{PfAOv)Qa8NK&Oq}REGw3-H0jDRCC7mAebMe? zLwa}QcVEcoYHE@s(V7aB%gAVlxvtxg%lbWz= zdRU{T#>ao%o8fMQFbsrOutY()kWNML{x7;pgt?n2ADtt#^nO=86=LUn=Uy*tsdmJk_!^qe**oSI&h= zQ;@#nVwmE52aZ5iFvyUxZ?9-oAa>k4o&K(^R2fH9p`kI8riy|O# z{q5L2g^a}`aWQUuX>VClnP>61w8?OR6>5PK|d87y!8f}X*Go<|slV}#+Mjln~ke@tcYn974W!!ww( z6~SOD!f(DX*nDBTiNSW0%V1-$!REIV8Eh%Ci3(s7)oU9w*f#bXuixt-Rfz f6jqS;|1!P+OsUI9t@n@$00000NkvXXu0mjfc^Gtq diff --git a/src/subpackage/order/static/images/search.png b/src/subpackage/order/static/images/search.png new file mode 100644 index 0000000000000000000000000000000000000000..d0bfda716d1f9011ac5572979cc45634a4380eec GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK;{cx!S0Fug>eT7er_Y!%14vGr zHVw#t03aI(;8HVZ&IF1Bxj$-J9s;!qlmz(&GjKecep1psqC+`(W64TgvquY#E&$5C z^K@|xu{eD-#8c?70?+1~irzo}XIpE?USjAyxzUPM=ZWgJm;VpMNl)Eubn7#(?yEnn zvh^!l?1(@4KV>p|00h!8dEc z#EVPyE-dD|&~rBUsO`k7R|TiHcd~gLEzH6^^uZpNcYo1T0S%)36%If~tQVo$hd)?&|P%O!7Iy(qkgQLI_aXzSUD Rj6k0=c)I$ztaD0e0svHpulWD~ literal 0 HcmV?d00001 From 55a0b7510b73751d415a3350fd6a12b73972a9f4 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 25 Jun 2024 17:14:03 +0800 Subject: [PATCH 02/15] add timekeeping order style --- src/components/order_list/timing/site.vue | 0 src/pages.json | 6 ++ src/subpackage/order/components/kv_line.vue | 27 ++++++ .../order/components/order_list/filter_modal.vue | 18 +++- .../order/components/order_list/header.vue | 17 +++- .../order/components/order_list/period_modal.vue | 14 ++- src/subpackage/order/js/api.js | 1 + .../order/pages/order_list/order_list.vue | 18 ++-- .../order/pages/order_manage/order_manage.vue | 2 +- .../pages/timekeeping/modules/person_list_item.vue | 105 +++++++++++++++++++++ .../order/pages/timekeeping/order_list.vue | 88 +++++++++++++++++ 11 files changed, 283 insertions(+), 13 deletions(-) delete mode 100644 src/components/order_list/timing/site.vue create mode 100644 src/subpackage/order/components/kv_line.vue create mode 100644 src/subpackage/order/pages/timekeeping/modules/person_list_item.vue create mode 100644 src/subpackage/order/pages/timekeeping/order_list.vue diff --git a/src/components/order_list/timing/site.vue b/src/components/order_list/timing/site.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages.json b/src/pages.json index 4e3ef45..32d8d2f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -492,6 +492,12 @@ } }, { + "path": "pages/timekeeping/order_list", + "style" : { + "navigationBarTitleText": "计时订单" + } + }, + { "path": "pages/stored_value_card/detail/detail", "style" : { "navigationBarTitleText": "储值卡订单详情" diff --git a/src/subpackage/order/components/kv_line.vue b/src/subpackage/order/components/kv_line.vue new file mode 100644 index 0000000..19b6a81 --- /dev/null +++ b/src/subpackage/order/components/kv_line.vue @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/order/components/order_list/filter_modal.vue b/src/subpackage/order/components/order_list/filter_modal.vue index b11a8b7..7a85c34 100644 --- a/src/subpackage/order/components/order_list/filter_modal.vue +++ b/src/subpackage/order/components/order_list/filter_modal.vue @@ -1,6 +1,6 @@ @@ -51,20 +65,25 @@ import headerTemp from "../modules/order_detail/header_temp.vue"; import infoTemp from "../modules/order_detail/info_temp.vue"; import kvLine from "../../../components/kv_line.vue"; import kvsLine from "../../../components/kvs_line.vue"; +import endBillingModal from "../modules/order_detail/end_billing_modal.vue"; +import bottomFixed from "../modules/order_detail/bottom_fixed.vue"; +// import bottomFixed from "../modules/order_detail/bf_button.vue"; export default { components: { 'header-temp': headerTemp, 'info-temp': infoTemp, 'kv-line': kvLine, - 'kvs-line': kvsLine + 'kvs-line': kvsLine, + 'end-billing-modal': endBillingModal, + 'bottom-fixed': bottomFixed } } \ No newline at end of file From 4cd64b0f27f4a51f48c95a6cb04cef9d093a0afe Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 23 Jul 2024 18:28:15 +0800 Subject: [PATCH 06/15] add tid1553 logic --- src/pages.json | 12 ++ .../order/components/order_list/filter_modal.vue | 29 +++- .../order/components/order_list/header.vue | 10 +- .../order/components/order_list/period_modal.vue | 27 ++-- .../modules/order_detail/bottom_fixed.vue | 19 ++- .../modules/order_detail/fixed_button.vue | 23 +++ .../timekeeping/modules/order_list/item_temp.vue | 21 ++- .../timekeeping/modules/order_list/person.vue | 31 ++-- .../pages/timekeeping/order_detail/deposit.vue | 120 ++++++++++++++ .../pages/timekeeping/order_detail/person.vue | 30 +--- .../order/pages/timekeeping/order_detail/site.vue | 150 +++++++++++++++++ .../order/pages/timekeeping/order_list.vue | 178 ++++++++++++++++++--- 12 files changed, 569 insertions(+), 81 deletions(-) create mode 100644 src/subpackage/order/pages/timekeeping/modules/order_detail/fixed_button.vue create mode 100644 src/subpackage/order/pages/timekeeping/order_detail/deposit.vue create mode 100644 src/subpackage/order/pages/timekeeping/order_detail/site.vue diff --git a/src/pages.json b/src/pages.json index 7805fb2..96e3cfc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -498,6 +498,18 @@ } }, { + "path": "pages/timekeeping/order_detail/site", + "style" : { + "navigationBarTitleText": "场地计时订单详情" + } + }, + { + "path": "pages/timekeeping/order_detail/deposit", + "style" : { + "navigationBarTitleText": "场地计时订单详情" + } + }, + { "path": "pages/stored_value_card/detail/detail", "style" : { "navigationBarTitleText": "储值卡订单详情" diff --git a/src/subpackage/order/components/order_list/filter_modal.vue b/src/subpackage/order/components/order_list/filter_modal.vue index 7a85c34..0f3671e 100644 --- a/src/subpackage/order/components/order_list/filter_modal.vue +++ b/src/subpackage/order/components/order_list/filter_modal.vue @@ -1,9 +1,15 @@