diff --git a/src/App.vue b/src/App.vue index 384de0a..da83888 100644 --- a/src/App.vue +++ b/src/App.vue @@ -35,7 +35,7 @@ .ox-dark-mask{ position: fixed; left: 0; - top: 0; + top: var(--window-top); right: 0; bottom: 0; background-color: rgba(0, 0, 0, .5); diff --git a/src/pages.json b/src/pages.json index 76f409c..fd34209 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,6 +1,30 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { + "path": "pages/order_list/order_list", + "style": { + "navigationBarTitleText": "订单列表" + } + }, + { + "path": "pages/write_off/confirm/confirm", + "style": { + "navigationBarTitleText": "确认订单信息" + } + }, + { + "path": "pages/write_off/list/list", + "style": { + "navigationBarTitleText": "扫码核销" + } + }, + { + "path": "pages/employee/review_list/review_list", + "style": { + "navigationBarTitleText": "员工管理" + } + }, + { "path": "pages/employee/perfect_info/perfect_info", "style": { "navigationBarTitleText": "员工信息" diff --git a/src/pages/employee/authority_filter/authority_filter.vue b/src/pages/employee/authority_filter/authority_filter.vue index 9e1935d..ee6617c 100644 --- a/src/pages/employee/authority_filter/authority_filter.vue +++ b/src/pages/employee/authority_filter/authority_filter.vue @@ -30,7 +30,7 @@ export default { } \ No newline at end of file diff --git a/src/pages/employee/review_list/review_list.vue b/src/pages/employee/review_list/review_list.vue new file mode 100644 index 0000000..e923279 --- /dev/null +++ b/src/pages/employee/review_list/review_list.vue @@ -0,0 +1,126 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 442d7a2..dedc917 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -117,7 +117,7 @@ \ No newline at end of file diff --git a/src/pages/store_list/store_list.vue b/src/pages/store_list/store_list.vue index c1dc403..8d389f3 100644 --- a/src/pages/store_list/store_list.vue +++ b/src/pages/store_list/store_list.vue @@ -23,7 +23,7 @@ export default { \ No newline at end of file diff --git a/src/pages/write_off/list/list.vue b/src/pages/write_off/list/list.vue new file mode 100644 index 0000000..0cc6ac8 --- /dev/null +++ b/src/pages/write_off/list/list.vue @@ -0,0 +1,158 @@ + + + + + \ No newline at end of file diff --git a/src/static/images/icon/filter.png b/src/static/images/icon/filter.png new file mode 100644 index 0000000..dd0c198 Binary files /dev/null and b/src/static/images/icon/filter.png differ diff --git a/src/static/images/icon/scan_code_btn.png b/src/static/images/icon/scan_code_btn.png new file mode 100644 index 0000000..5dfbb52 Binary files /dev/null and b/src/static/images/icon/scan_code_btn.png differ diff --git a/src/static/images/icon/search.png b/src/static/images/icon/search.png new file mode 100644 index 0000000..d0bfda7 Binary files /dev/null and b/src/static/images/icon/search.png differ diff --git a/src/static/images/icon/success_tip.png b/src/static/images/icon/success_tip.png new file mode 100644 index 0000000..b11a50b Binary files /dev/null and b/src/static/images/icon/success_tip.png differ diff --git a/src/static/images/icon/write_off_fail.png b/src/static/images/icon/write_off_fail.png new file mode 100644 index 0000000..47ee4fa Binary files /dev/null and b/src/static/images/icon/write_off_fail.png differ diff --git a/style/public.scss b/src/style/public.scss similarity index 100% rename from style/public.scss rename to src/style/public.scss