diff --git a/.env.development b/.env.development index 860f98d..74b592d 100644 --- a/.env.development +++ b/.env.development @@ -3,4 +3,4 @@ VUE_APP_BASE_URL=https://test.tall.wiki VUE_APP_API_URL=https://test.tall.wiki/gateway VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws VUE_APP_PROJECT_PATH=https://test.tall.wiki/tall-project -VUE_APP_VERSION=v3.0.1 +VUE_APP_VERSION=v3.1.0 diff --git a/.env.production b/.env.production index b94da2d..52ba090 100644 --- a/.env.production +++ b/.env.production @@ -3,4 +3,4 @@ VUE_APP_BASE_URL=https://www.tall.wiki VUE_APP_API_URL=https://www.tall.wiki/gateway VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws VUE_APP_PROJECT_PATH=https://www.tall.wiki/tall-project -VUE_APP_VERSION=v3.0.1 +VUE_APP_VERSION=v3.1.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8737380..e251210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-08-30) +# 0.1.0 (2021-08-31) ### 🌟 新功能 范围|描述|commitId @@ -207,6 +207,7 @@ 范围|描述|commitId --|--|-- - | api 封装 | 8dcb8a2 + - | dart-sass替换node-sass;删除多余的uni平台包 | 519f28b - | env host修改 | a79a4a5 - | merge globals | b0957cc - | merge wrr | 5ccc7a5 diff --git a/package.json b/package.json index df86f28..b4201bf 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "dayjs": "^1.10.6", "flyio": "^0.6.2", "lodash": "^4.17.21", - "node-sass": "npm:dart-sass@^1.25.0", "regenerator-runtime": "^0.12.1", "uview-ui": "^1.8.4", "vue": "^2.6.11", @@ -81,6 +80,7 @@ "prettier": "^2.2.1", "puppeteer": "^10.2.0", "right-pad": "^1.0.1", + "sass": "^1.38.2", "sass-loader": "^8.0.2", "vue-cli-plugin-commitlint": "~1.0.12", "vue-template-compiler": "^2.6.11" diff --git a/src/common/styles/tailwind.scss b/src/common/styles/tailwind.scss index b380f92..5121b4f 100644 --- a/src/common/styles/tailwind.scss +++ b/src/common/styles/tailwind.scss @@ -433,22 +433,6 @@ margin: 1px; } -.m-0\.5 { - margin: 0.125rem; -} - -.m-1\.5 { - margin: 0.375rem; -} - -.m-2\.5 { - margin: 0.625rem; -} - -.m-3\.5 { - margin: 0.875rem; -} - .-m-0 { margin: 0px; } @@ -573,22 +557,6 @@ margin: -1px; } -.-m-0\.5 { - margin: -0.125rem; -} - -.-m-1\.5 { - margin: -0.375rem; -} - -.-m-2\.5 { - margin: -0.625rem; -} - -.-m-3\.5 { - margin: -0.875rem; -} - .mx-0 { margin-left: 0px; margin-right: 0px; @@ -749,26 +717,6 @@ margin-right: 1px; } -.mx-0\.5 { - margin-left: 0.125rem; - margin-right: 0.125rem; -} - -.mx-1\.5 { - margin-left: 0.375rem; - margin-right: 0.375rem; -} - -.mx-2\.5 { - margin-left: 0.625rem; - margin-right: 0.625rem; -} - -.mx-3\.5 { - margin-left: 0.875rem; - margin-right: 0.875rem; -} - .-mx-0 { margin-left: 0px; margin-right: 0px; @@ -924,26 +872,6 @@ margin-right: -1px; } -.-mx-0\.5 { - margin-left: -0.125rem; - margin-right: -0.125rem; -} - -.-mx-1\.5 { - margin-left: -0.375rem; - margin-right: -0.375rem; -} - -.-mx-2\.5 { - margin-left: -0.625rem; - margin-right: -0.625rem; -} - -.-mx-3\.5 { - margin-left: -0.875rem; - margin-right: -0.875rem; -} - .my-0 { margin-top: 0px; margin-bottom: 0px; @@ -1104,26 +1032,6 @@ margin-bottom: 1px; } -.my-0\.5 { - margin-top: 0.125rem; - margin-bottom: 0.125rem; -} - -.my-1\.5 { - margin-top: 0.375rem; - margin-bottom: 0.375rem; -} - -.my-2\.5 { - margin-top: 0.625rem; - margin-bottom: 0.625rem; -} - -.my-3\.5 { - margin-top: 0.875rem; - margin-bottom: 0.875rem; -} - .-my-0 { margin-top: 0px; margin-bottom: 0px; @@ -1279,26 +1187,6 @@ margin-bottom: -1px; } -.-my-0\.5 { - margin-top: -0.125rem; - margin-bottom: -0.125rem; -} - -.-my-1\.5 { - margin-top: -0.375rem; - margin-bottom: -0.375rem; -} - -.-my-2\.5 { - margin-top: -0.625rem; - margin-bottom: -0.625rem; -} - -.-my-3\.5 { - margin-top: -0.875rem; - margin-bottom: -0.875rem; -} - .mt-0 { margin-top: 0px; } @@ -1427,22 +1315,6 @@ margin-top: 1px; } -.mt-0\.5 { - margin-top: 0.125rem; -} - -.mt-1\.5 { - margin-top: 0.375rem; -} - -.mt-2\.5 { - margin-top: 0.625rem; -} - -.mt-3\.5 { - margin-top: 0.875rem; -} - .-mt-0 { margin-top: 0px; } @@ -1567,22 +1439,6 @@ margin-top: -1px; } -.-mt-0\.5 { - margin-top: -0.125rem; -} - -.-mt-1\.5 { - margin-top: -0.375rem; -} - -.-mt-2\.5 { - margin-top: -0.625rem; -} - -.-mt-3\.5 { - margin-top: -0.875rem; -} - .mr-0 { margin-right: 0px; } @@ -1711,22 +1567,6 @@ margin-right: 1px; } -.mr-0\.5 { - margin-right: 0.125rem; -} - -.mr-1\.5 { - margin-right: 0.375rem; -} - -.mr-2\.5 { - margin-right: 0.625rem; -} - -.mr-3\.5 { - margin-right: 0.875rem; -} - .-mr-0 { margin-right: 0px; } @@ -1851,22 +1691,6 @@ margin-right: -1px; } -.-mr-0\.5 { - margin-right: -0.125rem; -} - -.-mr-1\.5 { - margin-right: -0.375rem; -} - -.-mr-2\.5 { - margin-right: -0.625rem; -} - -.-mr-3\.5 { - margin-right: -0.875rem; -} - .mb-0 { margin-bottom: 0px; } @@ -1995,22 +1819,6 @@ margin-bottom: 1px; } -.mb-0\.5 { - margin-bottom: 0.125rem; -} - -.mb-1\.5 { - margin-bottom: 0.375rem; -} - -.mb-2\.5 { - margin-bottom: 0.625rem; -} - -.mb-3\.5 { - margin-bottom: 0.875rem; -} - .-mb-0 { margin-bottom: 0px; } @@ -2135,22 +1943,6 @@ margin-bottom: -1px; } -.-mb-0\.5 { - margin-bottom: -0.125rem; -} - -.-mb-1\.5 { - margin-bottom: -0.375rem; -} - -.-mb-2\.5 { - margin-bottom: -0.625rem; -} - -.-mb-3\.5 { - margin-bottom: -0.875rem; -} - .ml-0 { margin-left: 0px; } @@ -2279,22 +2071,6 @@ margin-left: 1px; } -.ml-0\.5 { - margin-left: 0.125rem; -} - -.ml-1\.5 { - margin-left: 0.375rem; -} - -.ml-2\.5 { - margin-left: 0.625rem; -} - -.ml-3\.5 { - margin-left: 0.875rem; -} - .-ml-0 { margin-left: 0px; } @@ -2419,22 +2195,6 @@ margin-left: -1px; } -.-ml-0\.5 { - margin-left: -0.125rem; -} - -.-ml-1\.5 { - margin-left: -0.375rem; -} - -.-ml-2\.5 { - margin-left: -0.625rem; -} - -.-ml-3\.5 { - margin-left: -0.875rem; -} - .box-border { box-sizing: border-box; } @@ -3085,22 +2845,6 @@ padding: 1px; } -.p-0\.5 { - padding: 0.125rem; -} - -.p-1\.5 { - padding: 0.375rem; -} - -.p-2\.5 { - padding: 0.625rem; -} - -.p-3\.5 { - padding: 0.875rem; -} - .px-0 { padding-left: 0px; padding-right: 0px; @@ -3256,26 +3000,6 @@ padding-right: 1px; } -.px-0\.5 { - padding-left: 0.125rem; - padding-right: 0.125rem; -} - -.px-1\.5 { - padding-left: 0.375rem; - padding-right: 0.375rem; -} - -.px-2\.5 { - padding-left: 0.625rem; - padding-right: 0.625rem; -} - -.px-3\.5 { - padding-left: 0.875rem; - padding-right: 0.875rem; -} - .py-0 { padding-top: 0px; padding-bottom: 0px; @@ -3431,26 +3155,6 @@ padding-bottom: 1px; } -.py-0\.5 { - padding-top: 0.125rem; - padding-bottom: 0.125rem; -} - -.py-1\.5 { - padding-top: 0.375rem; - padding-bottom: 0.375rem; -} - -.py-2\.5 { - padding-top: 0.625rem; - padding-bottom: 0.625rem; -} - -.py-3\.5 { - padding-top: 0.875rem; - padding-bottom: 0.875rem; -} - .pt-0 { padding-top: 0px; } @@ -3575,22 +3279,6 @@ padding-top: 1px; } -.pt-0\.5 { - padding-top: 0.125rem; -} - -.pt-1\.5 { - padding-top: 0.375rem; -} - -.pt-2\.5 { - padding-top: 0.625rem; -} - -.pt-3\.5 { - padding-top: 0.875rem; -} - .pr-0 { padding-right: 0px; } @@ -3715,22 +3403,6 @@ padding-right: 1px; } -.pr-0\.5 { - padding-right: 0.125rem; -} - -.pr-1\.5 { - padding-right: 0.375rem; -} - -.pr-2\.5 { - padding-right: 0.625rem; -} - -.pr-3\.5 { - padding-right: 0.875rem; -} - .pb-0 { padding-bottom: 0px; } @@ -3855,22 +3527,6 @@ padding-bottom: 1px; } -.pb-0\.5 { - padding-bottom: 0.125rem; -} - -.pb-1\.5 { - padding-bottom: 0.375rem; -} - -.pb-2\.5 { - padding-bottom: 0.625rem; -} - -.pb-3\.5 { - padding-bottom: 0.875rem; -} - .pl-0 { padding-left: 0px; } @@ -3995,22 +3651,6 @@ padding-left: 1px; } -.pl-0\.5 { - padding-left: 0.125rem; -} - -.pl-1\.5 { - padding-left: 0.375rem; -} - -.pl-2\.5 { - padding-left: 0.625rem; -} - -.pl-3\.5 { - padding-left: 0.875rem; -} - .text-left { text-align: left; } @@ -4676,6 +4316,21 @@ .w-12 { width: 3rem; } +.w-full { + width: 100%; +} + +.w-screen { + width: 100vw; +} + +.w-min { + width: min-content; +} + +.w-max { + width: max-content; +} .h-12 { height: 3rem; @@ -4688,6 +4343,10 @@ --tw-bg-opacity: 1; background-color: rgba(219, 234, 254, var(--tw-bg-opacity)); } +.bg-blue-500 { + --tw-bg-opacity: 1; + background-color: rgba(59, 130, 246, var(--tw-bg-opacity)); +} .text-green-400 { --tw-text-opacity: 1; color: rgba(52, 211, 153, var(--tw-text-opacity)); diff --git a/src/components/PrettyExchange/PrettyExchange.vue b/src/components/PrettyExchange/PrettyExchange.vue index c31be6c..64c9d7d 100644 --- a/src/components/PrettyExchange/PrettyExchange.vue +++ b/src/components/PrettyExchange/PrettyExchange.vue @@ -1,15 +1,16 @@