From 6cd6ad5f751bbd1e13bb2e5c916a9ed3058f241c Mon Sep 17 00:00:00 2001 From: 13218645326 Date: Wed, 6 Dec 2023 09:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 4 + src/router/index.ts | 10 + src/style/scss/common.module.scss | 5 - src/style/scss/index.scss | 4 + src/style/scss/nprogress.scss | 85 ++++++++ src/style/scss/vantReset.scss | 4 - src/style/scss/variable.scss | 2 +- .../orderManagement/orderCom/orderConfirm.vue | 135 +++++++++++++ .../orderManagement/orderCom/orderDetails.vue | 191 ++++++++++++------ .../orderManagement/orderCom/orderTable.vue | 190 +++++++++++++++++ .../orderCom/timeLineHorizontal.vue | 107 ++++++++++ vite.config.ts | 3 +- 12 files changed, 666 insertions(+), 74 deletions(-) create mode 100644 src/style/scss/index.scss create mode 100644 src/style/scss/nprogress.scss delete mode 100644 src/style/scss/vantReset.scss create mode 100644 src/views/user/orderManagement/orderCom/orderConfirm.vue create mode 100644 src/views/user/orderManagement/orderCom/orderTable.vue create mode 100644 src/views/user/orderManagement/orderCom/timeLineHorizontal.vue diff --git a/components.d.ts b/components.d.ts index 3d56965..010ba40 100644 --- a/components.d.ts +++ b/components.d.ts @@ -13,6 +13,7 @@ declare module 'vue' { ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElDialog: typeof import('element-plus/es')['ElDialog'] + ElDivider: typeof import('element-plus/es')['ElDivider'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] @@ -28,8 +29,11 @@ declare module 'vue' { ElSelect: typeof import('element-plus/es')['ElSelect'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElTimeline: typeof import('element-plus/es')['ElTimeline'] + ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElUpload: typeof import('element-plus/es')['ElUpload'] EquipCard: typeof import('./src/components/equipCard.vue')['default'] + EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default'] FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default'] FormComponent: typeof import('./src/components/FormComponent/index.vue')['default'] Navmenu: typeof import('./src/components/Navmenu/index.vue')['default'] diff --git a/src/router/index.ts b/src/router/index.ts index a9a9c48..986da4c 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -198,6 +198,16 @@ const routes: Array = [ keepAlive: true, AuthFlag: false }, + }, + { + path: 'orderConfirm', + name: 'orderConfirm', + component: () => import('views/user/orderManagement/orderCom/orderConfirm.vue'), + meta: { + title: '订单确认', + keepAlive: true, + AuthFlag: false + }, } ] }, diff --git a/src/style/scss/common.module.scss b/src/style/scss/common.module.scss index d573d85..e69de29 100644 --- a/src/style/scss/common.module.scss +++ b/src/style/scss/common.module.scss @@ -1,5 +0,0 @@ -.button { - border-radius: 3px; - background-color: green; - color: white; -} diff --git a/src/style/scss/index.scss b/src/style/scss/index.scss new file mode 100644 index 0000000..44470ec --- /dev/null +++ b/src/style/scss/index.scss @@ -0,0 +1,4 @@ +@import './variable.scss'; +@import './mixin.scss'; +@import './common.module.scss'; +@import './nprogress.scss'; diff --git a/src/style/scss/nprogress.scss b/src/style/scss/nprogress.scss new file mode 100644 index 0000000..bc7b3b8 --- /dev/null +++ b/src/style/scss/nprogress.scss @@ -0,0 +1,85 @@ +/* Make clicks pass-through */ +#nprogress { + pointer-events: none; + } + + #nprogress .bar { + background: $main-color; + + position: fixed; + z-index: 1031; + top: 0; + left: 0; + + width: 100%; + height: 2px; + } + + /* Fancy blur effect */ + #nprogress .peg { + display: block; + position: absolute; + right: 0px; + width: 100px; + height: 100%; + box-shadow: 0 0 10px $main-color, 0 0 5px $main-color; + opacity: 1.0; + + -webkit-transform: rotate(3deg) translate(0px, -4px); + -ms-transform: rotate(3deg) translate(0px, -4px); + transform: rotate(3deg) translate(0px, -4px); + } + + /* Remove these to get rid of the spinner */ + #nprogress .spinner { + display: block; + position: fixed; + z-index: 1031; + top: 15px; + right: 15px; + } + + #nprogress .spinner-icon { + width: 18px; + height: 18px; + box-sizing: border-box; + + border: solid 2px transparent; + border-top-color: $main-color; + border-left-color: $main-color; + border-radius: 50%; + + -webkit-animation: nprogress-spinner 400ms linear infinite; + animation: nprogress-spinner 400ms linear infinite; + } + + .nprogress-custom-parent { + overflow: hidden; + position: relative; + } + + .nprogress-custom-parent #nprogress .spinner, + .nprogress-custom-parent #nprogress .bar { + position: absolute; + } + + @-webkit-keyframes nprogress-spinner { + 0% { + -webkit-transform: rotate(0deg); + } + + 100% { + -webkit-transform: rotate(360deg); + } + } + + @keyframes nprogress-spinner { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } + } + \ No newline at end of file diff --git a/src/style/scss/vantReset.scss b/src/style/scss/vantReset.scss deleted file mode 100644 index effa2c4..0000000 --- a/src/style/scss/vantReset.scss +++ /dev/null @@ -1,4 +0,0 @@ -.van-button--primary { - background-color: $main-color; - border: $main-color; -} diff --git a/src/style/scss/variable.scss b/src/style/scss/variable.scss index a6360f5..20303ca 100644 --- a/src/style/scss/variable.scss +++ b/src/style/scss/variable.scss @@ -1,2 +1,2 @@ -$main-color: #f00; +$main-color: #2282fe; $second-color: #666; diff --git a/src/views/user/orderManagement/orderCom/orderConfirm.vue b/src/views/user/orderManagement/orderCom/orderConfirm.vue new file mode 100644 index 0000000..9e95091 --- /dev/null +++ b/src/views/user/orderManagement/orderCom/orderConfirm.vue @@ -0,0 +1,135 @@ + + + + + + + diff --git a/src/views/user/orderManagement/orderCom/orderDetails.vue b/src/views/user/orderManagement/orderCom/orderDetails.vue index e7ed2c2..6fea3fb 100644 --- a/src/views/user/orderManagement/orderCom/orderDetails.vue +++ b/src/views/user/orderManagement/orderCom/orderDetails.vue @@ -1,75 +1,142 @@ - + diff --git a/src/views/user/orderManagement/orderCom/orderTable.vue b/src/views/user/orderManagement/orderCom/orderTable.vue new file mode 100644 index 0000000..dc01452 --- /dev/null +++ b/src/views/user/orderManagement/orderCom/orderTable.vue @@ -0,0 +1,190 @@ + + + diff --git a/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue b/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue new file mode 100644 index 0000000..c58c1ef --- /dev/null +++ b/src/views/user/orderManagement/orderCom/timeLineHorizontal.vue @@ -0,0 +1,107 @@ + + + \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts index e42bff1..5b7b6aa 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -68,8 +68,7 @@ export default ({ mode }: any) => { preprocessorOptions: { scss: { // 两种方式都可以 - additionalData: '' - // "@import '@/style/scss/index.scss';" + additionalData: "@import '@/style/scss/index.scss';" } }