diff --git a/src/components/order/reservation/reservation.vue b/src/components/order/reservation/reservation.vue index ab659dc..48db55b 100644 --- a/src/components/order/reservation/reservation.vue +++ b/src/components/order/reservation/reservation.vue @@ -70,10 +70,13 @@ export default { border-bottom: 2upx solid #D8D8D8; @include centerFlex(space-between); >view{ + flex-grow: 1; font-size: 28upx; color: #1a1a1a; + @include textHide(1); } >text{ + margin-left: 20upx; flex-shrink: 0; font-size: 28upx; color: #9C9C9F; diff --git a/src/pages.json b/src/pages.json index 975a166..14964b4 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,9 +1,27 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { - "path": "pages/order_search/order_search", + "path": "pages/turnover/turnover", "style": { - "navigationBarTitleText": "搜索" + "navigationBarTitleText": "营业额" + } + }, + { + "path": "pages/collection/detail/detail", + "style": { + "navigationBarTitleText": "收款明细" + } + }, + { + "path": "pages/collection/record/record", + "style": { + "navigationBarTitleText": "收款记录" + } + }, + { + "path": "pages/order_send/order_send", + "style": { + "navigationBarTitleText": "发货" } }, { @@ -13,6 +31,12 @@ } }, { + "path": "pages/order_search/order_search", + "style": { + "navigationBarTitleText": "搜索" + } + }, + { "path": "pages/write_off/confirm/confirm", "style": { "navigationBarTitleText": "确认订单信息" diff --git a/src/pages/collection/detail/detail.vue b/src/pages/collection/detail/detail.vue new file mode 100644 index 0000000..f1949a5 --- /dev/null +++ b/src/pages/collection/detail/detail.vue @@ -0,0 +1,182 @@ + + + + + \ No newline at end of file diff --git a/src/pages/collection/record/record.vue b/src/pages/collection/record/record.vue new file mode 100644 index 0000000..853ff7d --- /dev/null +++ b/src/pages/collection/record/record.vue @@ -0,0 +1,165 @@ + + + + + \ No newline at end of file diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index fd70799..4e2d1c9 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -81,14 +81,12 @@ diff --git a/src/pages/order_send/order_send.vue b/src/pages/order_send/order_send.vue new file mode 100644 index 0000000..50b39dd --- /dev/null +++ b/src/pages/order_send/order_send.vue @@ -0,0 +1,108 @@ + + + + + \ No newline at end of file diff --git a/src/pages/turnover/turnover.vue b/src/pages/turnover/turnover.vue new file mode 100644 index 0000000..f07632f --- /dev/null +++ b/src/pages/turnover/turnover.vue @@ -0,0 +1,253 @@ + + + + + \ No newline at end of file diff --git a/src/utils/components.js b/src/utils/components.js new file mode 100644 index 0000000..f76b296 --- /dev/null +++ b/src/utils/components.js @@ -0,0 +1,12 @@ + +import reservation from '../components/order/reservation/reservation'; +import membership from '../components/order/membership/membership'; +import integral from '../components/order/integral/integral'; + +export const order = { + reservation, + membership, + integral +} + +export default { order }; \ No newline at end of file