diff --git a/.eslintignore b/.eslintignore index 4857a27..a3f24f7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -9,3 +9,4 @@ postcss.config.js .eslint.js vue.config.js src/common/styles/index.css +src/pages.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 99ea622..5094e71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ -# 0.1.0 (2021-06-22) +# [0.1.0](https://gitee.com/mongos/uni-cli-template/compare/v1.0.1...v0.1.0) (2021-06-22) +## [1.0.1](https://gitee.com/mongos/uni-cli-template/compare/c0f1deb...v1.0.1) (2021-06-22) ### 🔨 代码重构 范围|描述|commitId @@ -6,6 +7,12 @@ template | eslint prettier sass uview tailwindcss | [9c966a1](https://gitee.com/mongos/uni-cli-template/commits/9c966a1) +### chore +范围|描述|commitId +--|--|-- + 信息配置 | 配置eslint等配置 | [7421443](https://gitee.com/mongos/uni-cli-template/commits/7421443) + + 范围|描述|commitId --|--|-- - | init | [c0f1deb](https://gitee.com/mongos/uni-cli-template/commits/c0f1deb) diff --git a/src/App.vue b/src/App.vue index 13ec4a9..80d7dc9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,6 @@ export default { }; - diff --git a/src/main.js b/src/main.js index 253e42a..811e9a3 100644 --- a/src/main.js +++ b/src/main.js @@ -1,9 +1,11 @@ import Vue from 'vue'; import App from './App'; -import './common/styles/index.css'; import './registerServiceWorker'; +import uView from 'uview-ui'; +import './common/styles/index.css'; Vue.config.productionTip = false; +Vue.use(uView); App.mpType = 'app'; diff --git a/src/pages.json b/src/pages.json index bf32f65..857b1de 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,16 +1,25 @@ { - "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "uni-app" - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - } -} + "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "uni-app" + } + }, + { + "path": "pages/plugin-test/plugin-test", + "style": { + "navigationBarTitleText": "iframe-测试" + } + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + } +} diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 07794cf..797dd8b 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,8 +1,7 @@ diff --git a/src/pages/plugin-test/plugin-test.vue b/src/pages/plugin-test/plugin-test.vue new file mode 100644 index 0000000..ea76ac5 --- /dev/null +++ b/src/pages/plugin-test/plugin-test.vue @@ -0,0 +1,7 @@ + + + diff --git a/src/uni.scss b/src/uni.scss index 845142d..1d8e557 100644 --- a/src/uni.scss +++ b/src/uni.scss @@ -11,6 +11,7 @@ * * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件 */ +@import 'uview-ui/theme.scss'; /* 颜色变量 */ @@ -21,32 +22,32 @@ $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: #333; //基本色 +$uni-text-color-inverse: #fff; //反色 +$uni-text-color-grey: #999; //辅助灰色,如加载更多的提示信息 $uni-text-color-placeholder: #808080; -$uni-text-color-disable:#c0c0c0; +$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-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-border-color: #c8c7cc; /* 尺寸变量 */ /* 文字尺寸 */ -$uni-font-size-sm:24rpx; -$uni-font-size-base:28rpx; -$uni-font-size-lg:32rpx; +$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; +$uni-img-size-sm: 40rpx; +$uni-img-size-base: 52rpx; +$uni-img-size-lg: 80rpx; /* Border Radius */ $uni-border-radius-sm: 4rpx; @@ -68,9 +69,9 @@ $uni-spacing-col-lg: 24rpx; $uni-opacity-disabled: 0.3; // 组件禁用态的透明度 /* 文章场景相关 */ -$uni-color-title: #2C405A; // 文章标题颜色 -$uni-font-size-title:40rpx; +$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; \ No newline at end of file +$uni-font-size-subtitle: 36rpx; +$uni-color-paragraph: #3f536e; // 文章段落颜色 +$uni-font-size-paragraph: 30rpx; diff --git a/src/utils/request.js b/src/utils/request.js index d4492af..be72968 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,4 +1,5 @@ const install = (Vue, vm) => { + console.log(); Vue.prototype.$u.http.setConfig({ baseUrl: '', showLoading: true, // 是否显示请求中的loading diff --git a/vue.config.js b/vue.config.js index 1d79d43..9b2c747 100644 --- a/vue.config.js +++ b/vue.config.js @@ -5,7 +5,7 @@ module.exports = { lintOnSave: process.env.NODE_ENV !== 'production', productionSourceMap: false, devServer: { - open: true, + // open: true, overlay: { warnings: true, errors: true }, // proxy: {} },