From 7db99991276cef2ca36bf89044e42e5345bfbf67 Mon Sep 17 00:00:00 2001 From: tangping Date: Sat, 20 May 2023 22:31:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 266 ++++++++----------------- src/app.config.js | 1 + src/app.scss | 11 + src/pages/order-detail/index.config.js | 3 + src/pages/order-detail/index.jsx | 138 +++++++++++++ src/pages/order-detail/index.scss | 219 ++++++++++++++++++++ src/pages/order/index.jsx | 72 ++++--- src/pages/order/index.scss | 7 + 9 files changed, 503 insertions(+), 216 deletions(-) create mode 100644 src/pages/order-detail/index.config.js create mode 100644 src/pages/order-detail/index.jsx create mode 100644 src/pages/order-detail/index.scss diff --git a/package.json b/package.json index e914f52..cd55bb4 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.7", - "@nutui/nutui-react-taro": "^1.4.7", + "@nutui/nutui-react-taro": "^1.5.5", "@tarojs/components": "3.6.5", "@tarojs/helper": "3.6.5", "@tarojs/plugin-framework-react": "3.6.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 634da67..d2284de 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,8 +5,8 @@ dependencies: specifier: ^7.7.7 version: 7.7.7 '@nutui/nutui-react-taro': - specifier: ^1.4.7 - version: 1.4.7(react-dom@18.0.0)(react@18.0.0) + specifier: ^1.5.5 + version: 1.5.5(react-dom@18.0.0)(react@18.0.0) '@tarojs/components': specifier: 3.6.5 version: 3.6.5(@types/react@18.0.0)(react@18.0.0) @@ -64,9 +64,6 @@ dependencies: react-refresh: specifier: ^0.11.0 version: 0.11.0 - tailwindcss: - specifier: ^3.3.2 - version: 3.3.2(ts-node@10.9.1) devDependencies: '@babel/core': @@ -153,11 +150,6 @@ devDependencies: packages: - /@alloc/quick-lru@5.2.0: - resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==} - engines: {node: '>=10'} - dev: false - /@ampproject/remapping@2.2.1: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} @@ -2488,6 +2480,7 @@ packages: engines: {node: '>=12'} dependencies: '@jridgewell/trace-mapping': 0.3.9 + dev: true /@devexpress/error-stack-parser@2.0.6: resolution: {integrity: sha512-fneVypElGUH6Be39mlRZeAu00pccTlf4oVuzf9xPJD1cdEqI8NyAiQua/EW7lZdrbMUbgyXcJmfKPefhYius3A==} @@ -2558,6 +2551,7 @@ packages: /@jridgewell/resolve-uri@3.1.1: resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} + dev: true /@jridgewell/set-array@1.1.2: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} @@ -2586,6 +2580,7 @@ packages: dependencies: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 + dev: true /@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1: resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==} @@ -2599,10 +2594,12 @@ packages: dependencies: '@nodelib/fs.stat': 2.0.5 run-parallel: 1.2.0 + dev: true /@nodelib/fs.stat@2.0.5: resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} engines: {node: '>= 8'} + dev: true /@nodelib/fs.walk@1.2.8: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} @@ -2610,17 +2607,17 @@ packages: dependencies: '@nodelib/fs.scandir': 2.1.5 fastq: 1.15.0 + dev: true - /@nutui/nutui-react-taro@1.4.7(react-dom@18.0.0)(react@18.0.0): - resolution: {integrity: sha512-z9sEu0XGlgD6HrLLYaPez4IwpbqENZqaZ9gfdfsruGWsRiJsRM2zkuaFU84sf8eSFHOy130vIgaRivMOioOfqA==} - engines: {node: ^14.18.0 || >=15.0.0} + /@nutui/nutui-react-taro@1.5.5(react-dom@18.0.0)(react@18.0.0): + resolution: {integrity: sha512-++VSrgTs5H726YupgmuRw6b5G8+YPLdSvU96bBR+vSSKUeuhZaJKeuaiHnAPfs0uKgEmtWdKWMlf5qonPxV4Tw==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: '@babel/runtime': 7.21.5 '@bem-react/classname': 1.6.0 - '@react-spring/web': 9.7.2(react-dom@18.0.0)(react@18.0.0) - '@use-gesture/react': 10.2.26(react@18.0.0) + '@react-spring/web': 9.6.1(react-dom@18.0.0)(react@18.0.0) + '@use-gesture/react': 10.2.20(react@18.0.0) async-validator: 4.2.5 classnames: 2.3.2 lodash.kebabcase: 4.1.1 @@ -2675,56 +2672,56 @@ packages: source-map: 0.7.4 webpack: 5.78.0(@swc/core@1.3.42) - /@react-spring/animated@9.7.2(react@18.0.0): - resolution: {integrity: sha512-ipvleJ99ipqlnHkz5qhSsgf/ny5aW0ZG8Q+/2Oj9cI7LCc7COdnrSO6V/v8MAX3JOoQNzfz6dye2s5Pt5jGaIA==} + /@react-spring/animated@9.6.1(react@18.0.0): + resolution: {integrity: sha512-ls/rJBrAqiAYozjLo5EPPLLOb1LM0lNVQcXODTC1SMtS6DbuBCPaKco5svFUQFMP2dso3O+qcC4k9FsKc0KxMQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - '@react-spring/shared': 9.7.2(react@18.0.0) - '@react-spring/types': 9.7.2 + '@react-spring/shared': 9.6.1(react@18.0.0) + '@react-spring/types': 9.6.1 react: 18.0.0 dev: false - /@react-spring/core@9.7.2(react@18.0.0): - resolution: {integrity: sha512-fF512edZT/gKVCA90ZRxfw1DmELeVwiL4OC2J6bMUlNr707C0h4QRoec6DjzG27uLX2MvS1CEatf9KRjwZR9/w==} + /@react-spring/core@9.6.1(react@18.0.0): + resolution: {integrity: sha512-3HAAinAyCPessyQNNXe5W0OHzRfa8Yo5P748paPcmMowZ/4sMfaZ2ZB6e5x5khQI8NusOHj8nquoutd6FRY5WQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - '@react-spring/animated': 9.7.2(react@18.0.0) - '@react-spring/rafz': 9.7.2 - '@react-spring/shared': 9.7.2(react@18.0.0) - '@react-spring/types': 9.7.2 + '@react-spring/animated': 9.6.1(react@18.0.0) + '@react-spring/rafz': 9.6.1 + '@react-spring/shared': 9.6.1(react@18.0.0) + '@react-spring/types': 9.6.1 react: 18.0.0 dev: false - /@react-spring/rafz@9.7.2: - resolution: {integrity: sha512-kDWMYDQto3+flkrX3vy6DU/l9pxQ4TVW91DglQEc11iDc7shF4+WVDRJvOVLX+xoMP7zyag1dMvlIgvQ+dvA/A==} + /@react-spring/rafz@9.6.1: + resolution: {integrity: sha512-v6qbgNRpztJFFfSE3e2W1Uz+g8KnIBs6SmzCzcVVF61GdGfGOuBrbjIcp+nUz301awVmREKi4eMQb2Ab2gGgyQ==} dev: false - /@react-spring/shared@9.7.2(react@18.0.0): - resolution: {integrity: sha512-6U9qkno+9DxlH5nSltnPs+kU6tYKf0bPLURX2te13aGel8YqgcpFYp5Av8DcN2x3sukinAsmzHUS/FRsdZMMBA==} + /@react-spring/shared@9.6.1(react@18.0.0): + resolution: {integrity: sha512-PBFBXabxFEuF8enNLkVqMC9h5uLRBo6GQhRMQT/nRTnemVENimgRd+0ZT4yFnAQ0AxWNiJfX3qux+bW2LbG6Bw==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - '@react-spring/rafz': 9.7.2 - '@react-spring/types': 9.7.2 + '@react-spring/rafz': 9.6.1 + '@react-spring/types': 9.6.1 react: 18.0.0 dev: false - /@react-spring/types@9.7.2: - resolution: {integrity: sha512-GEflx2Ex/TKVMHq5g5MxQDNNPNhqg+4Db9m7+vGTm8ttZiyga7YQUF24shgRNebKIjahqCuei16SZga8h1pe4g==} + /@react-spring/types@9.6.1: + resolution: {integrity: sha512-POu8Mk0hIU3lRXB3bGIGe4VHIwwDsQyoD1F394OK7STTiX9w4dG3cTLljjYswkQN+hDSHRrj4O36kuVa7KPU8Q==} dev: false - /@react-spring/web@9.7.2(react-dom@18.0.0)(react@18.0.0): - resolution: {integrity: sha512-7qNc7/5KShu2D05x7o2Ols2nUE7mCKfKLaY2Ix70xPMfTle1sZisoQMBFgV9w/fSLZlHZHV9P0uWJqEXQnbV4Q==} + /@react-spring/web@9.6.1(react-dom@18.0.0)(react@18.0.0): + resolution: {integrity: sha512-X2zR6q2Z+FjsWfGAmAXlQaoUHbPmfuCaXpuM6TcwXPpLE1ZD4A1eys/wpXboFQmDkjnrlTmKvpVna1MjWpZ5Hw==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - '@react-spring/animated': 9.7.2(react@18.0.0) - '@react-spring/core': 9.7.2(react@18.0.0) - '@react-spring/shared': 9.7.2(react@18.0.0) - '@react-spring/types': 9.7.2 + '@react-spring/animated': 9.6.1(react@18.0.0) + '@react-spring/core': 9.6.1(react@18.0.0) + '@react-spring/shared': 9.6.1(react@18.0.0) + '@react-spring/types': 9.6.1 react: 18.0.0 react-dom: 18.0.0(react@18.0.0) dev: false @@ -3538,15 +3535,19 @@ packages: /@tsconfig/node10@1.0.9: resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} + dev: true /@tsconfig/node12@1.0.11: resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==} + dev: true /@tsconfig/node14@1.0.3: resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==} + dev: true /@tsconfig/node16@1.0.4: resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} + dev: true /@types/archy@0.0.31: resolution: {integrity: sha512-v+dxizsFVyXgD3EpFuqT9YjdEjbJmPxNf1QIX9ohZOhxh1ZF2yhqv3vYaeum9lg3VghhxS5S0a6yldN9J9lPEQ==} @@ -3959,16 +3960,16 @@ packages: eslint-visitor-keys: 3.4.1 dev: true - /@use-gesture/core@10.2.26: - resolution: {integrity: sha512-NyFpQ3iID9iFBROXyyvU1D0NK+t+dP+WAVByhCvqHUenpxLD2NlRLVRpoK3XGGwksr6mU3PvZ2Nm4q0q+gLJPA==} + /@use-gesture/core@10.2.20: + resolution: {integrity: sha512-4lFhHc8so4yIHkBEs641DnEsBxPyhJ5GEjB4PURFDH4p/FcZriH6w99knZgI63zN/MBFfylMyb8+PDuj6RIXKQ==} dev: false - /@use-gesture/react@10.2.26(react@18.0.0): - resolution: {integrity: sha512-0QhaE5mhaQbFlip4MX7n1nwCX8gax6Da1LsP2fZ/BU6xW9zyEmV6NX7DPelDxq1rr2NiBJh30vx9RIp80YeA/A==} + /@use-gesture/react@10.2.20(react@18.0.0): + resolution: {integrity: sha512-KnJq9ZSqprWA6uNhWTUHZqTCh+rfa0j8ehTzqeBhktUPrmTj7yVOBvEQ/vSFU/7d72cGgWSsJ0f5T6GQCHXnvg==} peerDependencies: react: '>= 16.8.0' dependencies: - '@use-gesture/core': 10.2.26 + '@use-gesture/core': 10.2.20 react: 18.0.0 dev: false @@ -4288,6 +4289,7 @@ packages: /any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} + dev: true /anymatch@3.1.3: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} @@ -4309,10 +4311,7 @@ packages: /arg@4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} - - /arg@5.0.2: - resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} - dev: false + dev: true /argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -4635,6 +4634,7 @@ packages: /balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + dev: true /balanced-match@2.0.0: resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==} @@ -4734,6 +4734,7 @@ packages: dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 + dev: true /brace-expansion@2.0.1: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} @@ -4866,11 +4867,6 @@ packages: tslib: 2.5.0 dev: true - /camelcase-css@2.0.1: - resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} - engines: {node: '>= 6'} - dev: false - /camelcase-keys@6.2.2: resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==} engines: {node: '>=8'} @@ -5135,6 +5131,7 @@ packages: /commander@4.1.1: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} + dev: true /commander@7.2.0: resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==} @@ -5176,6 +5173,7 @@ packages: /concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + dev: true /config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} @@ -5300,6 +5298,7 @@ packages: /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} + dev: true /cross-spawn@7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} @@ -5440,6 +5439,7 @@ packages: resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} engines: {node: '>=4'} hasBin: true + dev: true /cssnano-preset-default@5.2.14(postcss@8.4.18): resolution: {integrity: sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==} @@ -5821,13 +5821,10 @@ packages: - supports-color dev: true - /didyoumean@1.2.2: - resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - dev: false - /diff@4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} + dev: true /dingtalk-jsapi@2.15.4: resolution: {integrity: sha512-pPETqUhLJYKNZIewnS9hU1/QqcdRbP2Q9sHySimko0C2nm/n9NoakVLtcKwdqgORq1dkPIP/jqv7RnESxhA2bA==} @@ -5841,10 +5838,6 @@ packages: path-type: 4.0.0 dev: true - /dlv@1.1.3: - resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} - dev: false - /dns-equal@1.0.0: resolution: {integrity: sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==} dev: true @@ -6724,6 +6717,7 @@ packages: glob-parent: 5.1.2 merge2: 1.4.1 micromatch: 4.0.5 + dev: true /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -6741,6 +6735,7 @@ packages: resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} dependencies: reusify: 1.0.4 + dev: true /faye-websocket@0.11.4: resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} @@ -6993,6 +6988,7 @@ packages: /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} + dev: true /fsevents@2.3.2: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} @@ -7118,21 +7114,11 @@ packages: engines: {node: '>=10.13.0'} dependencies: is-glob: 4.0.3 + dev: true /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} - /glob@7.1.6: - resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: false - /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} dependencies: @@ -7641,6 +7627,7 @@ packages: dependencies: once: 1.4.0 wrappy: 1.0.2 + dev: true /inherits@2.0.3: resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} @@ -7648,6 +7635,7 @@ packages: /inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} + dev: true /ini@1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} @@ -8073,6 +8061,7 @@ packages: /jiti@1.18.2: resolution: {integrity: sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==} hasBin: true + dev: true /joi@17.9.2: resolution: {integrity: sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==} @@ -8424,9 +8413,11 @@ packages: /lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} + dev: true /lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + dev: true /load-json-file@2.0.0: resolution: {integrity: sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==} @@ -8619,6 +8610,7 @@ packages: /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} + dev: true /map-obj@1.0.1: resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==} @@ -8729,6 +8721,7 @@ packages: /merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} + dev: true /methods@1.1.2: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} @@ -8851,6 +8844,7 @@ packages: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: brace-expansion: 1.1.11 + dev: true /minimatch@5.1.6: resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} @@ -8964,6 +8958,7 @@ packages: any-promise: 1.3.0 object-assign: 4.1.1 thenify-all: 1.6.0 + dev: true /nanoid@3.3.6: resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} @@ -9152,11 +9147,6 @@ packages: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} - /object-hash@3.0.0: - resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} - engines: {node: '>= 6'} - dev: false - /object-inspect@1.12.3: resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} dev: true @@ -9204,6 +9194,7 @@ packages: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} dependencies: wrappy: 1.0.2 + dev: true /onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} @@ -9463,6 +9454,7 @@ packages: /path-is-absolute@1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} + dev: true /path-key@3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} @@ -9511,6 +9503,7 @@ packages: /pify@2.3.0: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} engines: {node: '>=0.10.0'} + dev: true /pify@3.0.0: resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==} @@ -9664,46 +9657,6 @@ packages: resolve: 1.22.2 dev: true - /postcss-import@15.1.0(postcss@8.4.23): - resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==} - engines: {node: '>=14.0.0'} - peerDependencies: - postcss: ^8.0.0 - dependencies: - postcss: 8.4.23 - postcss-value-parser: 4.2.0 - read-cache: 1.0.0 - resolve: 1.22.2 - dev: false - - /postcss-js@4.0.1(postcss@8.4.23): - resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} - engines: {node: ^12 || ^14 || >= 16} - peerDependencies: - postcss: ^8.4.21 - dependencies: - camelcase-css: 2.0.1 - postcss: 8.4.23 - dev: false - - /postcss-load-config@4.0.1(postcss@8.4.23)(ts-node@10.9.1): - resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} - engines: {node: '>= 14'} - peerDependencies: - postcss: '>=8.0.9' - ts-node: '>=9.0.0' - peerDependenciesMeta: - postcss: - optional: true - ts-node: - optional: true - dependencies: - lilconfig: 2.1.0 - postcss: 8.4.23 - ts-node: 10.9.1(@swc/core@1.3.42)(@types/node@18.15.11)(typescript@4.1.2) - yaml: 2.2.2 - dev: false - /postcss-loader@7.3.0(postcss@8.4.18)(webpack@5.78.0): resolution: {integrity: sha512-qLAFjvR2BFNz1H930P7mj1iuWJFjGey/nVhimfOAAQ1ZyPpcClAxP8+A55Sl8mBvM+K2a9Pjgdj10KpANWrNfw==} engines: {node: '>= 14.15.0'} @@ -9832,16 +9785,6 @@ packages: postcss: 8.4.23 dev: true - /postcss-nested@6.0.1(postcss@8.4.23): - resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==} - engines: {node: '>=12.0'} - peerDependencies: - postcss: ^8.2.14 - dependencies: - postcss: 8.4.23 - postcss-selector-parser: 6.0.12 - dev: false - /postcss-normalize-charset@5.1.0(postcss@8.4.18): resolution: {integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==} engines: {node: ^10 || ^12 || >=14.0} @@ -10000,6 +9943,7 @@ packages: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 + dev: true /postcss-svgo@5.1.0(postcss@8.4.18): resolution: {integrity: sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==} @@ -10065,6 +10009,7 @@ packages: nanoid: 3.3.6 picocolors: 1.0.0 source-map-js: 1.0.2 + dev: true /preferred-pm@3.0.3: resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==} @@ -10204,6 +10149,7 @@ packages: /queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} + dev: true /quick-lru@4.0.1: resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==} @@ -10308,6 +10254,7 @@ packages: resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==} dependencies: pify: 2.3.0 + dev: true /read-pkg-up@2.0.0: resolution: {integrity: sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==} @@ -10572,6 +10519,7 @@ packages: /reusify@1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} + dev: true /rimraf@2.7.1: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} @@ -10600,6 +10548,7 @@ packages: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: queue-microtask: 1.2.3 + dev: true /rxjs@6.6.7: resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==} @@ -11320,20 +11269,6 @@ packages: - supports-color dev: true - /sucrase@3.32.0: - resolution: {integrity: sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==} - engines: {node: '>=8'} - hasBin: true - dependencies: - '@jridgewell/gen-mapping': 0.3.3 - commander: 4.1.1 - glob: 7.1.6 - lines-and-columns: 1.2.4 - mz: 2.7.0 - pirates: 4.0.5 - ts-interface-checker: 0.1.13 - dev: false - /supports-color@5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} @@ -11404,38 +11339,6 @@ packages: strip-ansi: 6.0.1 dev: true - /tailwindcss@3.3.2(ts-node@10.9.1): - resolution: {integrity: sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==} - engines: {node: '>=14.0.0'} - hasBin: true - dependencies: - '@alloc/quick-lru': 5.2.0 - arg: 5.0.2 - chokidar: 3.5.3 - didyoumean: 1.2.2 - dlv: 1.1.3 - fast-glob: 3.2.12 - glob-parent: 6.0.2 - is-glob: 4.0.3 - jiti: 1.18.2 - lilconfig: 2.1.0 - micromatch: 4.0.5 - normalize-path: 3.0.0 - object-hash: 3.0.0 - picocolors: 1.0.0 - postcss: 8.4.23 - postcss-import: 15.1.0(postcss@8.4.23) - postcss-js: 4.0.1(postcss@8.4.23) - postcss-load-config: 4.0.1(postcss@8.4.23)(ts-node@10.9.1) - postcss-nested: 6.0.1(postcss@8.4.23) - postcss-selector-parser: 6.0.12 - postcss-value-parser: 4.2.0 - resolve: 1.22.2 - sucrase: 3.32.0 - transitivePeerDependencies: - - ts-node - dev: false - /tapable@1.1.3: resolution: {integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==} engines: {node: '>=6'} @@ -11516,11 +11419,13 @@ packages: engines: {node: '>=0.8'} dependencies: thenify: 3.3.1 + dev: true /thenify@3.3.1: resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} dependencies: any-promise: 1.3.0 + dev: true /throat@6.0.2: resolution: {integrity: sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==} @@ -11607,10 +11512,6 @@ packages: escape-string-regexp: 1.0.5 dev: true - /ts-interface-checker@0.1.13: - resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - dev: false - /ts-node@10.9.1(@swc/core@1.3.42)(@types/node@18.15.11)(typescript@4.1.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true @@ -11641,6 +11542,7 @@ packages: typescript: 4.1.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: true /tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} @@ -11734,6 +11636,7 @@ packages: resolution: {integrity: sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==} engines: {node: '>=4.2.0'} hasBin: true + dev: true /uglify-js@3.17.4: resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} @@ -11885,6 +11788,7 @@ packages: /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + dev: true /utila@0.4.0: resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==} @@ -11908,6 +11812,7 @@ packages: /v8-compile-cache-lib@3.0.1: resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} + dev: true /v8-compile-cache@2.3.0: resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==} @@ -12256,6 +12161,7 @@ packages: /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + dev: true /write-file-atomic@3.0.3: resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==} @@ -12342,11 +12248,6 @@ packages: engines: {node: '>= 6'} dev: true - /yaml@2.2.2: - resolution: {integrity: sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==} - engines: {node: '>= 14'} - dev: false - /yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} @@ -12374,6 +12275,7 @@ packages: /yn@3.1.1: resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} engines: {node: '>=6'} + dev: true /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} diff --git a/src/app.config.js b/src/app.config.js index 62c02ee..e60d1dc 100644 --- a/src/app.config.js +++ b/src/app.config.js @@ -24,6 +24,7 @@ export default defineAppConfig({ 'pages/conversion/index', 'pages/scope/index', 'pages/order/index', + 'pages/order-detail/index', ], window: { backgroundTextStyle: 'light', diff --git a/src/app.scss b/src/app.scss index 3aa2b23..a564f4d 100644 --- a/src/app.scss +++ b/src/app.scss @@ -108,6 +108,11 @@ margin-top: 22px; } +.mt25 { + margin-top: 25px; +} + + .mt-58 { margin-top: 58px; } @@ -183,6 +188,12 @@ align-items: center; } +.flex-end { + display: flex; + justify-content: flex-end; + align-items: center; +} + .flex-around { display: flex; justify-content: space-around; diff --git a/src/pages/order-detail/index.config.js b/src/pages/order-detail/index.config.js new file mode 100644 index 0000000..e580ccd --- /dev/null +++ b/src/pages/order-detail/index.config.js @@ -0,0 +1,3 @@ +export default definePageConfig({ + navigationBarTitleText: '订单详情' +}) diff --git a/src/pages/order-detail/index.jsx b/src/pages/order-detail/index.jsx new file mode 100644 index 0000000..54886cf --- /dev/null +++ b/src/pages/order-detail/index.jsx @@ -0,0 +1,138 @@ +import React from 'react' +import { Image, Swiper, SwiperItem, Text, View } from '@tarojs/components' +import './index.scss' + +import { useEffect } from 'react'; +import { useState } from 'react'; +import backNav from '@/images/backNav.png' +import next from '@/images/next.png' +import Taro from '@tarojs/taro'; +import { useRouter } from '@tarojs/taro'; +import { Button } from '@nutui/nutui-react-taro'; + + + +function Index() { + + const param = useRouter().params + const [id] = useState(param.id) + + const [swiperProgress, setSwiperProgress] = useState(1) + + + useEffect(() => { + + + }, [id]) + + + // 跳转 + const navDetailFn = (id) => { + Taro.navigateTo({ + url: `/pages/pay-success/index?id=${id}` + }) + } + + // 返回页面 + const backFn = () => { + Taro.getCurrentPages().length > 0 && Taro.navigateBack() + } + + // 选择地址 + const goAddr = (id) => { + Taro.navigateTo({ + url: '/pages/address/index?id=' + id + }) + } + + return ( + + + + 订单详情 + + + + 等待发货 + + 请耐心等待 + + + + + + 李四 18080093730 + 四川省 成都市 天府二街 + {/* 选择地址 */} + + + + + + 商品信息 + + + + 商品名称 + + ¥199 + x1 + + + + + + 总价： + ¥199 + + + + + 订单信息 + + 商品合计 + ¥199.00 + + + 运费 + ¥199.00 + + + 优惠券 + ¥199.00 + + + 购物金折扣 + ¥199.00 + + + + + + 订单编号 + + 32842942342 + { + Taro.setClipboardData({ + data: '32842942342' + }) + }}>复制 + + + + 提交时间 + 2017-05-01 16:00 + + + 支付方式 + 在线支付 + + + + 再次购买 + + + ) +} + +export default Index diff --git a/src/pages/order-detail/index.scss b/src/pages/order-detail/index.scss new file mode 100644 index 0000000..568e5eb --- /dev/null +++ b/src/pages/order-detail/index.scss @@ -0,0 +1,219 @@ +.order-detail-container { + font-family: Source Han Sans CN-Bold, Source Han Sans CN; + font-size: 14px; + background: #FBFBFD; + min-height: 100vh; + height: auto; + padding-bottom: 40px; +} + +.nav-icon { + background: #FFFFFF; + box-shadow: 0px 16px 50px 0px rgba(49, 79, 124, 0.08); + border-radius: 16px 16px 16px 16px; +} + +.order-detail-detail-title { + width: 100vw; + height: 60px; + font-size: 18px; + font-weight: bold; + color: #1F2933; + line-height: 60px; + text-align: center; + display: flex; + align-items: center; + justify-content: center; +} + +.order-detail-body { + padding: 0 20px; + height: auto; + box-sizing: border-box; + width: 334px; + background: #FFFFFF; + box-shadow: 4px 7px 9px 0px rgba(56, 63, 68, 0.06); + border-radius: 10px 10px 10px 10px; + margin: 20px auto; + padding-bottom: 22px; +} + +.order-detail-address { + margin-top: 10px; +} + +.address-title { + height: 20px; + font-size: 18px; + font-weight: bold; + color: #000000; + line-height: 20px; +} + +.order-detail-address-area { + height: 74px; + display: flex; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + border-bottom: 1px solid rgba(0, 0, 0, 0.05); + +} + +.address-item { + width: 290px; + display: flex; + flex-flow: column wrap; +} + +.address-item-name { + font-size: 16px; + line-height: 20px; + font-weight: bold; +} + +.address-info { + font-size: 12px; + font-weight: 400; + color: rgba(0, 0, 0, 0.5); + margin-top: 4px; +} + + +.order-detail-goods { + width: 100%; + height: auto; + display: flex; + flex-direction: column; +} + +.order-detail-goods-title { + height: 20px; + font-size: 16px; + color: #000000; + line-height: 20px; +} + +.order-detail-goods-info { + height: 92px; + opacity: 1; + margin-top: 6px; + display: flex; + justify-content: flex-start; + box-sizing: border-box; + align-items: center; +} + +.order-detail-goods-img { + width: 84px; + height: 73px; + background: rgba(62, 66, 41, 0.1); + border-radius: 15px 15px 15px 15px; + opacity: 1; + border: none; +} + +.order-detail-goods-content { + display: flex; + flex-direction: column; + margin-left: 14px; + width: 200px; +} + +.order-detail-goods-content-title { + font-size: 14px; + font-weight: 400; + color: rgba(0, 0, 0, 0.5); + line-height: 16px; +} + +.order-detail-goods-content-price { + + display: flex; + justify-content: space-between; + align-items: center; + font-weight: 400; + color: rgba(0, 0, 0, 0.5); + font-size: 14px; + margin-top: 6px; +} + +.order-detail-goods-content-price-1 { + font-weight: 500; + color: #000000; + line-height: 19px; + font-size: 16px; +} + +.order-detail-price-container { + margin-top: 20px; + font-weight: bold; + color: rgba(0, 0, 0, 0.5); + line-height: 16px; + font-size: 14px; + display: flex; + justify-content: space-between; + align-items: center; +} + +.order-detail-price-p { + font-size: 16px; + font-weight: 500; + color: #F67952; + line-height: 19px; +} + + +.order-detail-state { + width: 332px; + height: 78px; + background: #F67952; + box-shadow: -2px 8px 46px 0px rgba(37, 45, 50, 0.05); + opacity: 1; + margin: 0 auto; + margin-top: 23px; + border-radius: 16px; + color: #fff; + box-sizing: border-box; + padding: 0 20px; + font-weight: 400; +} + + +.order-detail-title { + font-size: 16px; + color: #000000; +} + +.order-detail-item { + color: #5E6272; + font-size: 14px; + font-weight: 400; + margin-top: 12px; +} + +.order-detail-item-right { + color: #9EA1AA; +} + +.order-detail-copy { + width: 56px; + height: 27px; + background: rgba(246, 121, 82, 0.15); + border-radius: 8px 8px 8px 8px; + opacity: 1; + font-weight: 400; + color: #F67952; + margin-left: 10px; +} + +.order-detail-algin-btn { + width: 145px; + height: 55px; + background: #FEEBE5; + border-radius: 123px 123px 123px 123px; + opacity: 1; + margin-top: 16px; + color: #F67952; + margin-right: 20px; +} \ No newline at end of file diff --git a/src/pages/order/index.jsx b/src/pages/order/index.jsx index 3f5c66f..09f118b 100644 --- a/src/pages/order/index.jsx +++ b/src/pages/order/index.jsx @@ -16,6 +16,7 @@ const Login = () => { const [tabKey, setTabKey] = useState('0') const [page, setPage] = useState(1) + const [list, setList] = useState([]) // 返回页面 const backFn = () => { @@ -40,43 +41,48 @@ const Login = () => { setTabKey('3')}>已完成 - { - setPage(p => p + 1) - x() - }} - > - - - 订单号：1947034434 - 等待付款 - - - - - - 商品名称 - ¥199.00 + { + list.length > 0 && { + setPage(p => p + 1) + x() + }} + > + + + 订单号：1947034434 + 等待付款 + + + + + + 商品名称 + ¥199.00 + + X1 - X1 - - - - 已付金额: - ¥19999.00 + + + 已付金额: + ¥19999.00 + + + - - - - + + } + { + !list.length && + } diff --git a/src/pages/order/index.scss b/src/pages/order/index.scss index 8a9eb36..d13f710 100644 --- a/src/pages/order/index.scss +++ b/src/pages/order/index.scss @@ -109,4 +109,11 @@ .order-btn-delete { border: 1px solid rgba(0, 0, 0, 0.5); color: #5E6272; +} + +.order-empty { + width: 200px; + height: 200px; + margin-left: calc((375px - 200px)/2); + margin-top: 100px; } \ No newline at end of file