diff --git a/app/.eslintrc.js b/app/.eslintrc.js index b92883ae..86f5ee0e 100644 --- a/app/.eslintrc.js +++ b/app/.eslintrc.js @@ -3,6 +3,7 @@ require('@rushstack/eslint-patch/modern-module-resolution') module.exports = { root: true, + ignorePatterns: ['src/uni_modules/'], extends: [ 'plugin:vue/vue3-essential', 'eslint:recommended', diff --git a/app/src/pages.json b/app/src/pages.json index f3e6d8c2..2eba1b2d 100644 --- a/app/src/pages.json +++ b/app/src/pages.json @@ -17,6 +17,12 @@ "style": { "navigationBarTitleText": "个人中心" } + }, + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "登录" + } } ], "globalStyle": { diff --git a/app/src/static/logo.png b/app/src/static/logo.png deleted file mode 100644 index b5771e20..00000000 Binary files a/app/src/static/logo.png and /dev/null differ diff --git a/app/src/uni.scss b/app/src/uni.scss index 43fc3d67..f6366e67 100644 --- a/app/src/uni.scss +++ b/app/src/uni.scss @@ -1,77 +1,34 @@ -/** - * 这里是uni-app内置的常用样式变量 - * - * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量 - * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App - * - */ - -/** - * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能 - * - * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件 - */ - -/* 颜色变量 */ - -/* 行为相关颜色 */ -$uni-color-primary: #007aff; -$uni-color-success: #4cd964; -$uni-color-warning: #f0ad4e; -$uni-color-error: #dd524d; - -/* 文字基本颜色 */ -$uni-text-color: #333; //基本色 -$uni-text-color-inverse: #fff; //反色 -$uni-text-color-grey: #999; //辅助灰色,如加载更多的提示信息 -$uni-text-color-placeholder: #808080; -$uni-text-color-disable: #c0c0c0; - -/* 背景颜色 */ -$uni-bg-color: #ffffff; -$uni-bg-color-grey: #f8f8f8; -$uni-bg-color-hover: #f1f1f1; //点击状态颜色 -$uni-bg-color-mask: rgba(0, 0, 0, 0.4); //遮罩颜色 - -/* 边框颜色 */ -$uni-border-color: #c8c7cc; - -/* 尺寸变量 */ - -/* 文字尺寸 */ -$uni-font-size-sm: 24rpx; -$uni-font-size-base: 28rpx; -$uni-font-size-lg: 32rpx; - -/* 图片尺寸 */ -$uni-img-size-sm: 40rpx; -$uni-img-size-base: 52rpx; -$uni-img-size-lg: 80rpx; - -/* Border Radius */ -$uni-border-radius-sm: 4rpx; -$uni-border-radius-base: 6rpx; -$uni-border-radius-lg: 12rpx; -$uni-border-radius-circle: 50%; - -/* 水平间距 */ -$uni-spacing-row-sm: 10px; -$uni-spacing-row-base: 20rpx; -$uni-spacing-row-lg: 30rpx; - -/* 垂直间距 */ -$uni-spacing-col-sm: 8rpx; -$uni-spacing-col-base: 16rpx; -$uni-spacing-col-lg: 24rpx; - -/* 透明度 */ -$uni-opacity-disabled: 0.3; // 组件禁用态的透明度 - -/* 文章场景相关 */ -$uni-color-title: #2c405a; // 文章标题颜色 -$uni-font-size-title: 40rpx; -$uni-color-subtitle: #555555; // 二级标题颜色 -$uni-font-size-subtitle: 36rpx; -$uni-color-paragraph: #3f536e; // 文章段落颜色 -$uni-font-size-paragraph: 30rpx; @import 'uview-plus/theme.scss'; + +$u-main-color: #333333; +$u-content-color: #666666; +$u-tips-color: #999999; +$u-light-color: #c0c4cc; +$u-border-color: #e5e5e5; +$u-bg-color: #f3f4f6; +$u-disabled-color: #c8c9cc; + +$u-primary: #4173ff; +$u-primary-dark: #398ade; +$u-primary-disabled: #9acafc; +$u-primary-light: #ecf5ff; + +$u-warning: #f9ae3d; +$u-warning-dark: #f1a532; +$u-warning-disabled: #f9d39b; +$u-warning-light: #fdf6ec; + +$u-success: #5ac725; +$u-success-dark: #53c21d; +$u-success-disabled: #a9e08f; +$u-success-light: #f5fff0; + +$u-error: #f56c6c; +$u-error-dark: #e45656; +$u-error-disabled: #f7b2b2; +$u-error-light: #fef0f0; + +$u-info: #909399; +$u-info-dark: #767a82; +$u-info-disabled: #c4c6c9; +$u-info-light: #f4f4f5; diff --git a/app/tailwind.config.js b/app/tailwind.config.js index d9f153f0..b2c83a51 100644 --- a/app/tailwind.config.js +++ b/app/tailwind.config.js @@ -1,8 +1,11 @@ /** @type {import('tailwindcss').Config} */ module.exports = { - content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'], + content: ['./index.html', './src/**/*.{html,js,ts,jsx,tsx,vue}'], theme: { extend: {} }, - plugins: [] + plugins: [], + corePlugins: { + preflight: false + } } diff --git a/app/vite.config.ts b/app/vite.config.ts index 1766f143..1167f992 100644 --- a/app/vite.config.ts +++ b/app/vite.config.ts @@ -1,13 +1,33 @@ import { defineConfig } from 'vite' import uni from '@dcloudio/vite-plugin-uni' -import postcssPlugins from './vite/postcss' -import { wtwp } from './vite/wtwp' +import tailwindcss from 'tailwindcss' +import autoprefixer from 'autoprefixer' +import postcssRemToResponsivePixel from 'postcss-rem-to-responsive-pixel' +import postcssWeappTailwindcssRename from 'weapp-tailwindcss-webpack-plugin/postcss' +import vwt from 'weapp-tailwindcss-webpack-plugin/vite' + +const isH5 = process.env.UNI_PLATFORM === 'h5' +const isApp = process.env.UNI_PLATFORM === 'app' +const weappTailwindcssDisabled = isH5 || isApp + +const postcssPlugin = [autoprefixer(), tailwindcss()] +if (!weappTailwindcssDisabled) { + postcssPlugin.push( + postcssRemToResponsivePixel({ + rootValue: 32, + propList: ['*'], + transformUnit: 'rpx' + }) + ) + postcssPlugin.push(postcssWeappTailwindcssRename()) +} + // https://vitejs.dev/config/ export default defineConfig({ - plugins: [uni(), wtwp()], + plugins: [uni(), weappTailwindcssDisabled ? undefined : vwt()], css: { postcss: { - plugins: postcssPlugins + plugins: postcssPlugin } } }) diff --git a/app/vite/postcss.ts b/app/vite/postcss.ts deleted file mode 100644 index 5a6b6d6f..00000000 --- a/app/vite/postcss.ts +++ /dev/null @@ -1,17 +0,0 @@ -import tailwindcss from 'tailwindcss' -import autoprefixer from 'autoprefixer' -import postcssRemToResponsivePixel from 'postcss-rem-to-responsive-pixel' -import postcssWeappTailwindcssRename from 'weapp-tailwindcss-webpack-plugin/postcss' -import { Plugin } from 'postcss' -const postcssPlugin = [ - autoprefixer(), - tailwindcss(), - postcssRemToResponsivePixel({ - rootValue: 32, - propList: ['*'], - transformUnit: 'rpx' - }), - postcssWeappTailwindcssRename() -] - -export default postcssPlugin as Plugin[] diff --git a/app/vite/wtwp.ts b/app/vite/wtwp.ts deleted file mode 100644 index df8c04c4..00000000 --- a/app/vite/wtwp.ts +++ /dev/null @@ -1,8 +0,0 @@ -const isH5 = process.env.UNI_PLATFORM === 'h5' -const isApp = process.env.UNI_PLATFORM === 'app' -const weappTailwindcssDisabled = isH5 || isApp -import vwt from 'weapp-tailwindcss-webpack-plugin/vite' - -export function wtwp() { - return weappTailwindcssDisabled ? undefined : vwt() -}