From 949e09327ce97a998fc565f6ccc22978f3f79d82 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 12 Sep 2024 18:23:09 +0800 Subject: [PATCH] add shower order style --- src/components/filter/stadium_select.vue | 5 +- src/components/kvs_line.vue | 36 +++++ src/pages.json | 12 ++ src/subpackage/order/components/kv_line.vue | 32 ---- src/subpackage/order/components/kvs_line.vue | 36 ----- .../timekeeping/modules/order_list/deposit.vue | 5 +- .../timekeeping/modules/order_list/person.vue | 5 +- .../pages/timekeeping/modules/order_list/site.vue | 5 +- .../pages/timekeeping/order_detail/deposit.vue | 16 +- .../pages/timekeeping/order_detail/person.vue | 12 +- .../order/pages/timekeeping/order_detail/site.vue | 12 +- src/subpackage/shower/pages/card/manage.vue | 6 +- src/subpackage/shower/pages/order/detail.vue | 140 +++++++++++++++++ src/subpackage/shower/pages/order/list.vue | 170 +++++++++++++++++++++ src/subpackage/shower/static/images/locate.png | Bin 0 -> 714 bytes 15 files changed, 392 insertions(+), 100 deletions(-) create mode 100644 src/components/kvs_line.vue delete mode 100644 src/subpackage/order/components/kv_line.vue delete mode 100644 src/subpackage/order/components/kvs_line.vue create mode 100644 src/subpackage/shower/pages/order/detail.vue create mode 100644 src/subpackage/shower/pages/order/list.vue create mode 100644 src/subpackage/shower/static/images/locate.png diff --git a/src/components/filter/stadium_select.vue b/src/components/filter/stadium_select.vue index 8bd3de2..fc9132a 100644 --- a/src/components/filter/stadium_select.vue +++ b/src/components/filter/stadium_select.vue @@ -3,7 +3,7 @@ 当前门店 - + @@ -38,8 +38,7 @@ export default { async initStadiums({ brand_id, stadium_id }){ if(!brand_id) return; let _ls = await this.getStadiumList(brand_id); - console.log('initStadiums:', _ls); - let _curStadium = _ls.find(e=>e.id === stadium_id); + let _curStadium = _ls.find(e=>+e.id === +stadium_id); if(_curStadium)this.curStadium = _curStadium; }, // 获取品牌店铺列表 diff --git a/src/components/kvs_line.vue b/src/components/kvs_line.vue new file mode 100644 index 0000000..25de1f6 --- /dev/null +++ b/src/components/kvs_line.vue @@ -0,0 +1,36 @@ + + + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 548efef..6b6ba06 100644 --- a/src/pages.json +++ b/src/pages.json @@ -934,6 +934,18 @@ "style" : { "navigationBarTitleText": "水阀使用详情" } + }, + { + "path": "pages/order/list", + "style" : { + "navigationBarTitleText": "浴室订单列表" + } + }, + { + "path": "pages/order/detail", + "style" : { + "navigationBarTitleText": "浴室订单详情" + } } ] } diff --git a/src/subpackage/order/components/kv_line.vue b/src/subpackage/order/components/kv_line.vue deleted file mode 100644 index 7739be3..0000000 --- a/src/subpackage/order/components/kv_line.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/subpackage/order/components/kvs_line.vue b/src/subpackage/order/components/kvs_line.vue deleted file mode 100644 index 25de1f6..0000000 --- a/src/subpackage/order/components/kvs_line.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue index e41c60c..0de99eb 100644 --- a/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue +++ b/src/subpackage/order/pages/timekeeping/modules/order_list/deposit.vue @@ -22,7 +22,7 @@ + + \ No newline at end of file diff --git a/src/subpackage/shower/pages/order/list.vue b/src/subpackage/shower/pages/order/list.vue new file mode 100644 index 0000000..ff52db4 --- /dev/null +++ b/src/subpackage/shower/pages/order/list.vue @@ -0,0 +1,170 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/shower/static/images/locate.png b/src/subpackage/shower/static/images/locate.png new file mode 100644 index 0000000000000000000000000000000000000000..de596fdec465396ba41cc8e6db3df6cd8828148f GIT binary patch literal 714 zcmV;*0yX`KP)Px%gh@m}RCwCWlwC+uVI0Pv|2a!b%Q=-)h=}Y1F(gD2EHW@}?Mm;8Y?Sk>i@@q4 zWwGeSpfA~W6qTYNyh{V`g31u7NGz`kyosTy$GKr+y7T^<>oq)cOS|)TZVtTs-sj={ zA|%0S$+4zp0JQic;EZ4cgal}5e41*-0YpUvcuF0>NW-s9#HZ<@YTOlt5EKv#fMVke zC^X48mDlTK3rsM1u2VCz@lEYsnNW3rvXo+@fs4?OM{sRSlogE|)B&B^)1F*d!e4s# ztX$;Vuqho&_pXHyLowx5QxoQuThm^tN$kNaH#)E&T6a~M6J;JgibAx`xSawU7*OY0 z={~+>m)C{j5~(t(eNXRCqycqCq>ra?%zrYjs?#EBA;_~Nw}lVFuS`HU7j z#EF+?aR)2Ht(`&wJZJbZmdVvJZxSWXX_yZ4LoFY1^z5StD8SJ2izN54KQlbY75Hp% zT>i8!?F4zbnBMKEu?K-fiKzE;6OW?AaIYOSK+7i&AIAuqrIzgJ&~kW?%lU)Fab+CP zN`x0Bc)#;py?@g;$6c&+a~X|MjZkQaOEC&Z<5yr)5%BEA5K1vg;G)$D8s>m4iLzoD wz+-