diff --git a/apis/trade.js b/apis/trade.js index a5e2e40..5c7bdc5 100644 --- a/apis/trade.js +++ b/apis/trade.js @@ -19,5 +19,34 @@ export function gettradingHallList(data) { }, { hideLoading: true } ) +} +// 我的报价 +export function getMyreplyList(data) { + return http.get( + { + url: '/base-paper-trading/get/my-reply-list', + data + }, + { hideLoading: true } + ) +} +// 提交报价 +export function updataEnquiryReply(data) { + return http.post({ + url: '/base-paper-trading/update/enquiry-reply', + data + }) +} +// 获取报价详情 +export function enquiryReplyDetail(data) { + return http.get( + { + url: '/base-paper-trading/get/enquiry-reply-detail/'+data, + }, + { hideLoading: true } + ) } + + + diff --git a/pages.json b/pages.json index fcc4884..0e96a30 100644 --- a/pages.json +++ b/pages.json @@ -130,7 +130,8 @@ { "path": "pages/my-offer/index", "style": { - "navigationBarTitleText": "我的报价", + "navigationBarTitleText": "我的报价", + "navigationStyle": "custom", "enablePullDownRefresh": false } }, @@ -142,7 +143,37 @@ "enablePullDownRefresh": false } } - ], + ,{ + "path" : "pages/quotation-details/index", + "style" : + { + "navigationBarTitleText": "报价详情", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/switching-mall/index", + "style" : + { + "navigationBarTitleText": "切换商城", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/add-paper/index", + "style" : + { + "navigationBarTitleText": "添加纸品", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue new file mode 100644 index 0000000..04c96eb --- /dev/null +++ b/pages/add-paper/index.vue @@ -0,0 +1,121 @@ +s + + + + diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index 8159c24..1b2924e 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -292,7 +292,7 @@ export default { flex-direction: row; justify-content: space-between; height: 88rpx; - line-height: 88rpx; + line-height: 88rpx; border-bottom: 2rpx solid #dddddd; padding: 0rpx 32rpx; diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 158c90c..2cfbdc2 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -1,254 +1,276 @@ - - - - - diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue index 34ae1cb..f908179 100644 --- a/pages/my-offer/index.vue +++ b/pages/my-offer/index.vue @@ -1,224 +1,242 @@ - - - - - diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue new file mode 100644 index 0000000..db34eb0 --- /dev/null +++ b/pages/quotation-details/index.vue @@ -0,0 +1,577 @@ + + + + + diff --git a/pages/submit-quotation/index.vue b/pages/submit-quotation/index.vue index ef23b07..dfaa92c 100644 --- a/pages/submit-quotation/index.vue +++ b/pages/submit-quotation/index.vue @@ -1,667 +1,721 @@ - - - - - diff --git a/pages/switching-mall/index.vue b/pages/switching-mall/index.vue new file mode 100644 index 0000000..832acac --- /dev/null +++ b/pages/switching-mall/index.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/pages/trade/index.vue b/pages/trade/index.vue index f0288c8..bbdf05c 100644 --- a/pages/trade/index.vue +++ b/pages/trade/index.vue @@ -28,7 +28,7 @@ import notLogged from '@/components/not-logged/not-logged.vue' import scrollList from '@/components/scroll-list/scroll-list.vue' import quotationList from './quotationList.vue' import orderList from './orderList.vue' -import { getEnterpriseList, gettradingHallList } from '@/apis/trade' +import { gettradingHallList } from '@/apis/trade' export default { components: { notLogged, scrollList, quotationList, orderList }, data() { diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue index 4ce60ac..d1d539a 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -1,233 +1,238 @@ - - - - - + + + + + diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index 2a91293..5ee410f 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -1,289 +1,283 @@ - - - - - diff --git a/static/imgs/trade/camera.png b/static/imgs/trade/camera.png new file mode 100644 index 0000000..6093839 Binary files /dev/null and b/static/imgs/trade/camera.png differ diff --git a/uni_modules/uni-data-checkbox/changelog.md b/uni_modules/uni-data-checkbox/changelog.md new file mode 100644 index 0000000..52574c8 --- /dev/null +++ b/uni_modules/uni-data-checkbox/changelog.md @@ -0,0 +1,39 @@ +## 1.0.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-data-checkbox](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox) +## 0.2.5（2021-08-23） +- 修复 在uni-forms中 modelValue 中不存在当前字段，当前字段必填写也不参与校验的问题 +## 0.2.4（2021-08-17） +- 修复 单选 list 模式下 ，icon 为 left 时，选中图标不显示的问题 +## 0.2.3（2021-08-11） +- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题 +## 0.2.2（2021-07-30） +- 优化 在uni-forms组件，与label不对齐的问题 +## 0.2.1（2021-07-27） +- 修复 单选默认值为0不能选中的Bug +## 0.2.0（2021-07-13） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 0.1.11（2021-07-06） +- 优化 删除无用日志 +## 0.1.10（2021-07-05） +- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题 +## 0.1.9（2021-07-05） +- 修复 nvue 黑框样式问题 +## 0.1.8（2021-06-28） +- 修复 selectedTextColor 属性不生效的Bug +## 0.1.7（2021-06-02） +- 新增 map 属性，可以方便映射text/value属性 +## 0.1.6（2021-05-26） +- 修复 不关联服务空间的情况下组件报错的Bug +## 0.1.5（2021-05-12） +- 新增 组件示例地址 +## 0.1.4（2021-04-09） +- 修复 nvue 下无法选中的问题 +## 0.1.3（2021-03-22） +- 新增 disabled属性 +## 0.1.2（2021-02-24） +- 优化 默认颜色显示 +## 0.1.1（2021-02-24） +- 新增 支持nvue +## 0.1.0（2021-02-18） +- “暂无数据”显示居中 diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue new file mode 100644 index 0000000..c31637c --- /dev/null +++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue @@ -0,0 +1,817 @@ + + + + + diff --git a/uni_modules/uni-data-checkbox/package.json b/uni_modules/uni-data-checkbox/package.json new file mode 100644 index 0000000..52e0b2d --- /dev/null +++ b/uni_modules/uni-data-checkbox/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-data-checkbox", + "displayName": "uni-data-checkbox 数据选择器", + "version": "1.0.0", + "description": "通过数据驱动的单选框和复选框", + "keywords": [ + "uni-ui", + "checkbox", + "单选", + "多选", + "单选多选" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "^3.1.1" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-load-more","uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-data-checkbox/readme.md b/uni_modules/uni-data-checkbox/readme.md new file mode 100644 index 0000000..6eb253d --- /dev/null +++ b/uni_modules/uni-data-checkbox/readme.md @@ -0,0 +1,18 @@ + + +## DataCheckbox 数据驱动的单选复选框 +> **组件名：uni-data-checkbox** +> 代码块： `uDataCheckbox` + + +本组件是基于uni-app基础组件checkbox的封装。本组件要解决问题包括： + +1. 数据绑定型组件：给本组件绑定一个data，会自动渲染一组候选内容。再以往，开发者需要编写不少代码实现类似功能 +2. 自动的表单校验：组件绑定了data，且符合[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)组件的表单校验规范，搭配使用会自动实现表单校验 +3. 本组件合并了单选多选 +4. 本组件有若干风格选择，如普通的单选多选框、并列button风格、tag风格。开发者可以快速选择需要的风格。但作为一个封装组件，样式代码虽然不用自己写了，却会牺牲一定的样式自定义性 + +在uniCloud开发中，`DB Schema`中配置了enum枚举等类型后，在web控制台的[自动生成表单](https://uniapp.dcloud.io/uniCloud/schema?id=autocode)功能中，会自动生成``uni-data-checkbox``组件并绑定好data + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file diff --git a/uni_modules/uni-fab/changelog.md b/uni_modules/uni-fab/changelog.md new file mode 100644 index 0000000..24e26b1 --- /dev/null +++ b/uni_modules/uni-fab/changelog.md @@ -0,0 +1,17 @@ +## 1.2.2（2021-12-29） +- 更新 组件依赖 +## 1.2.1（2021-11-19） +- 修复 阴影颜色不正确的bug +## 1.2.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-fab](https://uniapp.dcloud.io/component/uniui/uni-fab) +## 1.1.1（2021-11-09） +- 新增 提供组件设计资源，组件样式调整 +## 1.1.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.7（2021-05-12） +- 新增 组件示例地址 +## 1.0.6（2021-02-05） +- 调整为uni_modules目录规范 +- 优化 按钮背景色调整 +- 优化 兼容pc端 diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue new file mode 100644 index 0000000..6143a05 --- /dev/null +++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue @@ -0,0 +1,475 @@ + + + + + diff --git a/uni_modules/uni-fab/package.json b/uni_modules/uni-fab/package.json new file mode 100644 index 0000000..0f27daa --- /dev/null +++ b/uni_modules/uni-fab/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-fab", + "displayName": "uni-fab 悬浮按钮", + "version": "1.2.2", + "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。", + "keywords": [ + "uni-ui", + "uniui", + "按钮", + "悬浮按钮", + "fab" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss","uni-icons"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-fab/readme.md b/uni_modules/uni-fab/readme.md new file mode 100644 index 0000000..9a444e8 --- /dev/null +++ b/uni_modules/uni-fab/readme.md @@ -0,0 +1,9 @@ +## Fab 悬浮按钮 +> **组件名：uni-fab** +> 代码块： `uFab` + + +点击可展开一个图形按钮菜单 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fab) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue index a022173..a9f271d 100644 --- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue +++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue @@ -4,55 +4,55 @@ - - - - - + }, + methods: { + _onClick() { + this.$emit('click') + } + } + } + + diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md index 4eacc0f..2aa6192 100644 --- a/uni_modules/uni-load-more/changelog.md +++ b/uni_modules/uni-load-more/changelog.md @@ -1,13 +1,13 @@ ## 1.3.0（2021-11-19） - 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) - 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more) -## 1.2.1（2021-08-24） -- 新增 支持国际化 -## 1.2.0（2021-07-30） -- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) -## 1.1.8（2021-05-12） -- 新增 组件示例地址 -## 1.1.7（2021-03-30） -- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug -## 1.1.6（2021-02-05） -- 调整为uni_modules目录规范 +## 1.2.1（2021-08-24） +- 新增 支持国际化 +## 1.2.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.1.8（2021-05-12） +- 新增 组件示例地址 +## 1.1.7（2021-03-30） +- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug +## 1.1.6（2021-02-05） +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json index a4f14a5..6f45b0e 100644 --- a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json +++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json @@ -1,4 +1,4 @@ -{ +{ "uni-load-more.contentdown": "Pull up to show more", "uni-load-more.contentrefresh": "loading...", "uni-load-more.contentnomore": "No more data" diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js index de7509c..fa8f0f3 100644 --- a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js +++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js @@ -1,8 +1,8 @@ -import en from './en.json' -import zhHans from './zh-Hans.json' -import zhHant from './zh-Hant.json' -export default { - en, - 'zh-Hans': zhHans, - 'zh-Hant': zhHant +import en from './en.json' +import zhHans from './zh-Hans.json' +import zhHant from './zh-Hant.json' +export default { + en, + 'zh-Hans': zhHans, + 'zh-Hant': zhHant } diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json index f15d510..3a14ca0 100644 --- a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json +++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json @@ -1,4 +1,4 @@ -{ +{ "uni-load-more.contentdown": "上拉显示更多", "uni-load-more.contentrefresh": "正在加载...", "uni-load-more.contentnomore": "没有更多数据了" diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json index a255c6d..ee99b06 100644 --- a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json +++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json @@ -1,4 +1,4 @@ -{ +{ "uni-load-more.contentdown": "上拉顯示更多", "uni-load-more.contentrefresh": "正在加載...", "uni-load-more.contentnomore": "沒有更多數據了" diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue index 5134ae2..5625933 100644 --- a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue +++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue @@ -1,396 +1,396 @@ - - - - - diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json index ee80055..7ae370b 100644 --- a/uni_modules/uni-load-more/package.json +++ b/uni_modules/uni-load-more/package.json @@ -1,86 +1,86 @@ -{ - "id": "uni-load-more", - "displayName": "uni-load-more 加载更多", - "version": "1.3.0", - "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。", - "keywords": [ - "uni-ui", - "uniui", - "加载更多", - "load-more" -], - "repository": "https://github.com/dcloudio/uni-ui", - "engines": { - "HBuilderX": "" - }, - "directories": { - "example": "../../temps/example_temps" - }, - "dcloudext": { - "category": [ - "前端组件", - "通用组件" - ], - "sale": { - "regular": { - "price": "0.00" - }, - "sourcecode": { - "price": "0.00" - } - }, - "contact": { - "qq": "" - }, - "declaration": { - "ads": "无", - "data": "无", - "permissions": "无" - }, - "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" - }, - "uni_modules": { - "dependencies": ["uni-scss"], - "encrypt": [], - "platforms": { - "cloud": { - "tcb": "y", - "aliyun": "y" - }, - "client": { - "App": { - "app-vue": "y", - "app-nvue": "y" - }, - "H5-mobile": { - "Safari": "y", - "Android Browser": "y", - "微信浏览器(Android)": "y", - "QQ浏览器(Android)": "y" - }, - "H5-pc": { - "Chrome": "y", - "IE": "y", - "Edge": "y", - "Firefox": "y", - "Safari": "y" - }, - "小程序": { - "微信": "y", - "阿里": "y", - "百度": "y", - "字节跳动": "y", - "QQ": "y" - }, - "快应用": { - "华为": "u", - "联盟": "u" - }, - "Vue": { - "vue2": "y", - "vue3": "y" - } - } - } - } +{ + "id": "uni-load-more", + "displayName": "uni-load-more 加载更多", + "version": "1.3.0", + "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。", + "keywords": [ + "uni-ui", + "uniui", + "加载更多", + "load-more" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } } \ No newline at end of file diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md index 0c5fc86..7e3d755 100644 --- a/uni_modules/uni-scss/changelog.md +++ b/uni_modules/uni-scss/changelog.md @@ -1,6 +1,6 @@ ## 1.0.2（2021-11-22） - 修复 / 符号在 vue 不同版本兼容问题引起的报错问题 -## 1.0.1（2021-11-22） -- 修复 vue3中scss语法兼容问题 -## 1.0.0（2021-11-18） -- init +## 1.0.1（2021-11-22） +- 修复 vue3中scss语法兼容问题 +## 1.0.0（2021-11-18） +- init diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss index 1744a5f..5d43f7f 100644 --- a/uni_modules/uni-scss/index.scss +++ b/uni_modules/uni-scss/index.scss @@ -1 +1 @@ -@import './styles/index.scss'; +@import './styles/index.scss'; diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json index d24aac8..ee71935 100644 --- a/uni_modules/uni-scss/package.json +++ b/uni_modules/uni-scss/package.json @@ -1,82 +1,82 @@ -{ - "id": "uni-scss", - "displayName": "uni-scss 辅助样式", - "version": "1.0.2", - "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。", - "keywords": [ - "uni-scss", - "uni-ui", - "辅助样式" -], - "repository": "https://github.com/dcloudio/uni-ui", - "engines": { - "HBuilderX": "^3.1.0" - }, - "dcloudext": { - "category": [ - "uni-app前端模板", - "前端页面模板" - ], - "sale": { - "regular": { - "price": "0.00" - }, - "sourcecode": { - "price": "0.00" - } - }, - "contact": { - "qq": "" - }, - "declaration": { - "ads": "无", - "data": "无", - "permissions": "无" - }, - "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" - }, - "uni_modules": { - "dependencies": [], - "encrypt": [], - "platforms": { - "cloud": { - "tcb": "y", - "aliyun": "y" - }, - "client": { - "App": { - "app-vue": "y", - "app-nvue": "u" - }, - "H5-mobile": { - "Safari": "y", - "Android Browser": "y", - "微信浏览器(Android)": "y", - "QQ浏览器(Android)": "y" - }, - "H5-pc": { - "Chrome": "y", - "IE": "y", - "Edge": "y", - "Firefox": "y", - "Safari": "y" - }, - "小程序": { - "微信": "y", - "阿里": "y", - "百度": "y", - "字节跳动": "y", - "QQ": "y" - }, - "快应用": { - "华为": "n", - "联盟": "n" - }, - "Vue": { - "vue2": "y", - "vue3": "y" - } - } - } - } -} +{ + "id": "uni-scss", + "displayName": "uni-scss 辅助样式", + "version": "1.0.2", + "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。", + "keywords": [ + "uni-scss", + "uni-ui", + "辅助样式" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "^3.1.0" + }, + "dcloudext": { + "category": [ + "uni-app前端模板", + "前端页面模板" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "n", + "联盟": "n" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss index ffac4fe..2106dd1 100644 --- a/uni_modules/uni-scss/styles/index.scss +++ b/uni_modules/uni-scss/styles/index.scss @@ -1,7 +1,7 @@ -@import './setting/_variables.scss'; -@import './setting/_border.scss'; -@import './setting/_color.scss'; -@import './setting/_space.scss'; -@import './setting/_radius.scss'; -@import './setting/_text.scss'; -@import './setting/_styles.scss'; +@import './setting/_variables.scss'; +@import './setting/_border.scss'; +@import './setting/_color.scss'; +@import './setting/_space.scss'; +@import './setting/_radius.scss'; +@import './setting/_text.scss'; +@import './setting/_styles.scss'; diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss index 12a11c3..781df64 100644 --- a/uni_modules/uni-scss/styles/setting/_border.scss +++ b/uni_modules/uni-scss/styles/setting/_border.scss @@ -1,3 +1,3 @@ -.uni-border { - border: 1px $uni-border-1 solid; +.uni-border { + border: 1px $uni-border-1 solid; } \ No newline at end of file diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss index 1ededd9..595f5ed 100644 --- a/uni_modules/uni-scss/styles/setting/_color.scss +++ b/uni_modules/uni-scss/styles/setting/_color.scss @@ -1,66 +1,66 @@ - -// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐 -// @mixin get-styles($k,$c) { -// @if $k == size or $k == weight{ -// font-#{$k}:#{$c} -// }@else{ -// #{$k}:#{$c} -// } -// } -$uni-ui-color:( - // 主色 - primary: $uni-primary, - primary-disable: $uni-primary-disable, - primary-light: $uni-primary-light, - // 辅助色 - success: $uni-success, - success-disable: $uni-success-disable, - success-light: $uni-success-light, - warning: $uni-warning, - warning-disable: $uni-warning-disable, - warning-light: $uni-warning-light, - error: $uni-error, - error-disable: $uni-error-disable, - error-light: $uni-error-light, - info: $uni-info, - info-disable: $uni-info-disable, - info-light: $uni-info-light, - // 中性色 - main-color: $uni-main-color, - base-color: $uni-base-color, - secondary-color: $uni-secondary-color, - extra-color: $uni-extra-color, - // 背景色 - bg-color: $uni-bg-color, - // 边框颜色 - border-1: $uni-border-1, - border-2: $uni-border-2, - border-3: $uni-border-3, - border-4: $uni-border-4, - // 黑色 - black:$uni-black, - // 白色 - white:$uni-white, - // 透明 - transparent:$uni-transparent -) !default; -@each $key, $child in $uni-ui-color { - .uni-#{"" + $key} { - color: $child; - } - .uni-#{"" + $key}-bg { - background-color: $child; - } -} -.uni-shadow-sm { - box-shadow: $uni-shadow-sm; -} -.uni-shadow-base { - box-shadow: $uni-shadow-base; -} -.uni-shadow-lg { - box-shadow: $uni-shadow-lg; -} -.uni-mask { - background-color:$uni-mask; -} + +// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐 +// @mixin get-styles($k,$c) { +// @if $k == size or $k == weight{ +// font-#{$k}:#{$c} +// }@else{ +// #{$k}:#{$c} +// } +// } +$uni-ui-color:( + // 主色 + primary: $uni-primary, + primary-disable: $uni-primary-disable, + primary-light: $uni-primary-light, + // 辅助色 + success: $uni-success, + success-disable: $uni-success-disable, + success-light: $uni-success-light, + warning: $uni-warning, + warning-disable: $uni-warning-disable, + warning-light: $uni-warning-light, + error: $uni-error, + error-disable: $uni-error-disable, + error-light: $uni-error-light, + info: $uni-info, + info-disable: $uni-info-disable, + info-light: $uni-info-light, + // 中性色 + main-color: $uni-main-color, + base-color: $uni-base-color, + secondary-color: $uni-secondary-color, + extra-color: $uni-extra-color, + // 背景色 + bg-color: $uni-bg-color, + // 边框颜色 + border-1: $uni-border-1, + border-2: $uni-border-2, + border-3: $uni-border-3, + border-4: $uni-border-4, + // 黑色 + black:$uni-black, + // 白色 + white:$uni-white, + // 透明 + transparent:$uni-transparent +) !default; +@each $key, $child in $uni-ui-color { + .uni-#{"" + $key} { + color: $child; + } + .uni-#{"" + $key}-bg { + background-color: $child; + } +} +.uni-shadow-sm { + box-shadow: $uni-shadow-sm; +} +.uni-shadow-base { + box-shadow: $uni-shadow-base; +} +.uni-shadow-lg { + box-shadow: $uni-shadow-lg; +} +.uni-mask { + background-color:$uni-mask; +} diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss index 9a0428b..8672a69 100644 --- a/uni_modules/uni-scss/styles/setting/_radius.scss +++ b/uni_modules/uni-scss/styles/setting/_radius.scss @@ -1,55 +1,55 @@ -@mixin radius($r,$d:null ,$important: false){ - $radius-value:map-get($uni-radius, $r) if($important, !important, null); - // Key exists within the $uni-radius variable - @if (map-has-key($uni-radius, $r) and $d){ - @if $d == t { - border-top-left-radius:$radius-value; - border-top-right-radius:$radius-value; - }@else if $d == r { - border-top-right-radius:$radius-value; - border-bottom-right-radius:$radius-value; - }@else if $d == b { - border-bottom-left-radius:$radius-value; - border-bottom-right-radius:$radius-value; - }@else if $d == l { - border-top-left-radius:$radius-value; - border-bottom-left-radius:$radius-value; - }@else if $d == tl { - border-top-left-radius:$radius-value; - }@else if $d == tr { - border-top-right-radius:$radius-value; - }@else if $d == br { - border-bottom-right-radius:$radius-value; - }@else if $d == bl { - border-bottom-left-radius:$radius-value; - } - }@else{ - border-radius:$radius-value; - } -} - -@each $key, $child in $uni-radius { - @if($key){ - .uni-radius-#{"" + $key} { - @include radius($key) - } - }@else{ - .uni-radius { - @include radius($key) - } - } -} - -@each $direction in t, r, b, l,tl, tr, br, bl { - @each $key, $child in $uni-radius { - @if($key){ - .uni-radius-#{"" + $direction}-#{"" + $key} { - @include radius($key,$direction,false) - } - }@else{ - .uni-radius-#{$direction} { - @include radius($key,$direction,false) - } - } - } -} +@mixin radius($r,$d:null ,$important: false){ + $radius-value:map-get($uni-radius, $r) if($important, !important, null); + // Key exists within the $uni-radius variable + @if (map-has-key($uni-radius, $r) and $d){ + @if $d == t { + border-top-left-radius:$radius-value; + border-top-right-radius:$radius-value; + }@else if $d == r { + border-top-right-radius:$radius-value; + border-bottom-right-radius:$radius-value; + }@else if $d == b { + border-bottom-left-radius:$radius-value; + border-bottom-right-radius:$radius-value; + }@else if $d == l { + border-top-left-radius:$radius-value; + border-bottom-left-radius:$radius-value; + }@else if $d == tl { + border-top-left-radius:$radius-value; + }@else if $d == tr { + border-top-right-radius:$radius-value; + }@else if $d == br { + border-bottom-right-radius:$radius-value; + }@else if $d == bl { + border-bottom-left-radius:$radius-value; + } + }@else{ + border-radius:$radius-value; + } +} + +@each $key, $child in $uni-radius { + @if($key){ + .uni-radius-#{"" + $key} { + @include radius($key) + } + }@else{ + .uni-radius { + @include radius($key) + } + } +} + +@each $direction in t, r, b, l,tl, tr, br, bl { + @each $key, $child in $uni-radius { + @if($key){ + .uni-radius-#{"" + $direction}-#{"" + $key} { + @include radius($key,$direction,false) + } + }@else{ + .uni-radius-#{$direction} { + @include radius($key,$direction,false) + } + } + } +} diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss index 3c89528..9c3b17b 100644 --- a/uni_modules/uni-scss/styles/setting/_space.scss +++ b/uni_modules/uni-scss/styles/setting/_space.scss @@ -1,56 +1,56 @@ - -@mixin fn($space,$direction,$size,$n) { - @if $n { - #{$space}-#{$direction}: #{$size*$uni-space-root}px - } @else { - #{$space}-#{$direction}: #{-$size*$uni-space-root}px - } -} -@mixin get-styles($direction,$i,$space,$n){ - @if $direction == t { - @include fn($space, top,$i,$n); - } - @if $direction == r { - @include fn($space, right,$i,$n); - } - @if $direction == b { - @include fn($space, bottom,$i,$n); - } - @if $direction == l { - @include fn($space, left,$i,$n); - } - @if $direction == x { - @include fn($space, left,$i,$n); - @include fn($space, right,$i,$n); - } - @if $direction == y { - @include fn($space, top,$i,$n); - @include fn($space, bottom,$i,$n); - } - @if $direction == a { - @if $n { - #{$space}:#{$i*$uni-space-root}px; - } @else { - #{$space}:#{-$i*$uni-space-root}px; - } - } -} - -@each $orientation in m,p { - $space: margin; - @if $orientation == m { - $space: margin; - } @else { - $space: padding; - } - @for $i from 0 through 16 { - @each $direction in t, r, b, l, x, y, a { - .uni-#{$orientation}#{$direction}-#{$i} { - @include get-styles($direction,$i,$space,true); - } - .uni-#{$orientation}#{$direction}-n#{$i} { - @include get-styles($direction,$i,$space,false); - } - } - } + +@mixin fn($space,$direction,$size,$n) { + @if $n { + #{$space}-#{$direction}: #{$size*$uni-space-root}px + } @else { + #{$space}-#{$direction}: #{-$size*$uni-space-root}px + } +} +@mixin get-styles($direction,$i,$space,$n){ + @if $direction == t { + @include fn($space, top,$i,$n); + } + @if $direction == r { + @include fn($space, right,$i,$n); + } + @if $direction == b { + @include fn($space, bottom,$i,$n); + } + @if $direction == l { + @include fn($space, left,$i,$n); + } + @if $direction == x { + @include fn($space, left,$i,$n); + @include fn($space, right,$i,$n); + } + @if $direction == y { + @include fn($space, top,$i,$n); + @include fn($space, bottom,$i,$n); + } + @if $direction == a { + @if $n { + #{$space}:#{$i*$uni-space-root}px; + } @else { + #{$space}:#{-$i*$uni-space-root}px; + } + } +} + +@each $orientation in m,p { + $space: margin; + @if $orientation == m { + $space: margin; + } @else { + $space: padding; + } + @for $i from 0 through 16 { + @each $direction in t, r, b, l, x, y, a { + .uni-#{$orientation}#{$direction}-#{$i} { + @include get-styles($direction,$i,$space,true); + } + .uni-#{$orientation}#{$direction}-n#{$i} { + @include get-styles($direction,$i,$space,false); + } + } + } } \ No newline at end of file diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss index 689afec..6f882c8 100644 --- a/uni_modules/uni-scss/styles/setting/_styles.scss +++ b/uni_modules/uni-scss/styles/setting/_styles.scss @@ -1,167 +1,167 @@ -/* #ifndef APP-NVUE */ - -$-color-white:#fff; -$-color-black:#000; -@mixin base-style($color) { - color: #fff; - background-color: $color; - border-color: mix($-color-black, $color, 8%); - &:not([hover-class]):active { - background: mix($-color-black, $color, 10%); - border-color: mix($-color-black, $color, 20%); - color: $-color-white; - outline: none; - } -} -@mixin is-color($color) { - @include base-style($color); - &[loading] { - @include base-style($color); - &::before { - margin-right:5px; - } - } - &[disabled] { - &, - &[loading], - &:not([hover-class]):active { - color: $-color-white; - border-color: mix(darken($color,10%), $-color-white); - background-color: mix($color, $-color-white); - } - } - -} -@mixin base-plain-style($color) { - color:$color; - background-color: mix($-color-white, $color, 90%); - border-color: mix($-color-white, $color, 70%); - &:not([hover-class]):active { - background: mix($-color-white, $color, 80%); - color: $color; - outline: none; - border-color: mix($-color-white, $color, 50%); - } -} -@mixin is-plain($color){ - &[plain] { - @include base-plain-style($color); - &[loading] { - @include base-plain-style($color); - &::before { - margin-right:5px; - } - } - &[disabled] { - &, - &:active { - color: mix($-color-white, $color, 40%); - background-color: mix($-color-white, $color, 90%); - border-color: mix($-color-white, $color, 80%); - } - } - } -} - - -.uni-btn { - margin: 5px; - color: #393939; - border:1px solid #ccc; - font-size: 16px; - font-weight: 200; - background-color: #F9F9F9; - // TODO 暂时处理边框隐藏一边的问题 - overflow: visible; - &::after{ - border: none; - } - - &:not([type]),&[type=default] { - color: #999; - &[loading] { - background: none; - &::before { - margin-right:5px; - } - } - - - - &[disabled]{ - color: mix($-color-white, #999, 60%); - &, - &[loading], - &:active { - color: mix($-color-white, #999, 60%); - background-color: mix($-color-white,$-color-black , 98%); - border-color: mix($-color-white, #999, 85%); - } - } - - &[plain] { - color: #999; - background: none; - border-color: $uni-border-1; - &:not([hover-class]):active { - background: none; - color: mix($-color-white, $-color-black, 80%); - border-color: mix($-color-white, $-color-black, 90%); - outline: none; - } - &[disabled]{ - &, - &[loading], - &:active { - background: none; - color: mix($-color-white, #999, 60%); - border-color: mix($-color-white, #999, 85%); - } - } - } - } - - &:not([hover-class]):active { - color: mix($-color-white, $-color-black, 50%); - } - - &[size=mini] { - font-size: 16px; - font-weight: 200; - border-radius: 8px; - } - - - - &.uni-btn-small { - font-size: 14px; - } - &.uni-btn-mini { - font-size: 12px; - } - - &.uni-btn-radius { - border-radius: 999px; - } - &[type=primary] { - @include is-color($uni-primary); - @include is-plain($uni-primary) - } - &[type=success] { - @include is-color($uni-success); - @include is-plain($uni-success) - } - &[type=error] { - @include is-color($uni-error); - @include is-plain($uni-error) - } - &[type=warning] { - @include is-color($uni-warning); - @include is-plain($uni-warning) - } - &[type=info] { - @include is-color($uni-info); - @include is-plain($uni-info) - } -} -/* #endif */ +/* #ifndef APP-NVUE */ + +$-color-white:#fff; +$-color-black:#000; +@mixin base-style($color) { + color: #fff; + background-color: $color; + border-color: mix($-color-black, $color, 8%); + &:not([hover-class]):active { + background: mix($-color-black, $color, 10%); + border-color: mix($-color-black, $color, 20%); + color: $-color-white; + outline: none; + } +} +@mixin is-color($color) { + @include base-style($color); + &[loading] { + @include base-style($color); + &::before { + margin-right:5px; + } + } + &[disabled] { + &, + &[loading], + &:not([hover-class]):active { + color: $-color-white; + border-color: mix(darken($color,10%), $-color-white); + background-color: mix($color, $-color-white); + } + } + +} +@mixin base-plain-style($color) { + color:$color; + background-color: mix($-color-white, $color, 90%); + border-color: mix($-color-white, $color, 70%); + &:not([hover-class]):active { + background: mix($-color-white, $color, 80%); + color: $color; + outline: none; + border-color: mix($-color-white, $color, 50%); + } +} +@mixin is-plain($color){ + &[plain] { + @include base-plain-style($color); + &[loading] { + @include base-plain-style($color); + &::before { + margin-right:5px; + } + } + &[disabled] { + &, + &:active { + color: mix($-color-white, $color, 40%); + background-color: mix($-color-white, $color, 90%); + border-color: mix($-color-white, $color, 80%); + } + } + } +} + + +.uni-btn { + margin: 5px; + color: #393939; + border:1px solid #ccc; + font-size: 16px; + font-weight: 200; + background-color: #F9F9F9; + // TODO 暂时处理边框隐藏一边的问题 + overflow: visible; + &::after{ + border: none; + } + + &:not([type]),&[type=default] { + color: #999; + &[loading] { + background: none; + &::before { + margin-right:5px; + } + } + + + + &[disabled]{ + color: mix($-color-white, #999, 60%); + &, + &[loading], + &:active { + color: mix($-color-white, #999, 60%); + background-color: mix($-color-white,$-color-black , 98%); + border-color: mix($-color-white, #999, 85%); + } + } + + &[plain] { + color: #999; + background: none; + border-color: $uni-border-1; + &:not([hover-class]):active { + background: none; + color: mix($-color-white, $-color-black, 80%); + border-color: mix($-color-white, $-color-black, 90%); + outline: none; + } + &[disabled]{ + &, + &[loading], + &:active { + background: none; + color: mix($-color-white, #999, 60%); + border-color: mix($-color-white, #999, 85%); + } + } + } + } + + &:not([hover-class]):active { + color: mix($-color-white, $-color-black, 50%); + } + + &[size=mini] { + font-size: 16px; + font-weight: 200; + border-radius: 8px; + } + + + + &.uni-btn-small { + font-size: 14px; + } + &.uni-btn-mini { + font-size: 12px; + } + + &.uni-btn-radius { + border-radius: 999px; + } + &[type=primary] { + @include is-color($uni-primary); + @include is-plain($uni-primary) + } + &[type=success] { + @include is-color($uni-success); + @include is-plain($uni-success) + } + &[type=error] { + @include is-color($uni-error); + @include is-plain($uni-error) + } + &[type=warning] { + @include is-color($uni-warning); + @include is-plain($uni-warning) + } + &[type=info] { + @include is-color($uni-info); + @include is-plain($uni-info) + } +} +/* #endif */ diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss index a34d08f..0a89590 100644 --- a/uni_modules/uni-scss/styles/setting/_text.scss +++ b/uni_modules/uni-scss/styles/setting/_text.scss @@ -1,24 +1,24 @@ -@mixin get-styles($k,$c) { - @if $k == size or $k == weight{ - font-#{$k}:#{$c} - }@else{ - #{$k}:#{$c} - } -} - -@each $key, $child in $uni-headings { - /* #ifndef APP-NVUE */ - .uni-#{$key} { - @each $k, $c in $child { - @include get-styles($k,$c) - } - } - /* #endif */ - /* #ifdef APP-NVUE */ - .container .uni-#{$key} { - @each $k, $c in $child { - @include get-styles($k,$c) - } - } - /* #endif */ -} +@mixin get-styles($k,$c) { + @if $k == size or $k == weight{ + font-#{$k}:#{$c} + }@else{ + #{$k}:#{$c} + } +} + +@each $key, $child in $uni-headings { + /* #ifndef APP-NVUE */ + .uni-#{$key} { + @each $k, $c in $child { + @include get-styles($k,$c) + } + } + /* #endif */ + /* #ifdef APP-NVUE */ + .container .uni-#{$key} { + @each $k, $c in $child { + @include get-styles($k,$c) + } + } + /* #endif */ +} diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss index 557d3d7..651e9be 100644 --- a/uni_modules/uni-scss/styles/setting/_variables.scss +++ b/uni_modules/uni-scss/styles/setting/_variables.scss @@ -1,146 +1,146 @@ -// @use "sass:math"; -@import '../tools/functions.scss'; -// 间距基础倍数 -$uni-space-root: 2 !default; -// 边框半径默认值 -$uni-radius-root:5px !default; -$uni-radius: () !default; +// @use "sass:math"; +@import '../tools/functions.scss'; +// 间距基础倍数 +$uni-space-root: 2 !default; +// 边框半径默认值 +$uni-radius-root:5px !default; +$uni-radius: () !default; // 边框半径断点 -$uni-radius: map-deep-merge( - ( +$uni-radius: map-deep-merge( + ( 0: 0, - // TODO 当前版本暂时不支持 sm 属性 - // 'sm': math.div($uni-radius-root, 2), - null: $uni-radius-root, - 'lg': $uni-radius-root * 2, - 'xl': $uni-radius-root * 6, - 'pill': 9999px, - 'circle': 50% - ), - $uni-radius + // TODO 当前版本暂时不支持 sm 属性 + // 'sm': math.div($uni-radius-root, 2), + null: $uni-radius-root, + 'lg': $uni-radius-root * 2, + 'xl': $uni-radius-root * 6, + 'pill': 9999px, + 'circle': 50% + ), + $uni-radius ); -// 字体家族 -$body-font-family: 'Roboto', sans-serif !default; -// 文本 -$heading-font-family: $body-font-family !default; -$uni-headings: () !default; -$letterSpacing: -0.01562em; -$uni-headings: map-deep-merge( - ( - 'h1': ( - size: 32px, - weight: 300, - line-height: 50px, - // letter-spacing:-0.01562em - ), - 'h2': ( - size: 28px, - weight: 300, - line-height: 40px, - // letter-spacing: -0.00833em - ), - 'h3': ( - size: 24px, - weight: 400, - line-height: 32px, - // letter-spacing: normal - ), - 'h4': ( - size: 20px, - weight: 400, - line-height: 30px, - // letter-spacing: 0.00735em - ), - 'h5': ( - size: 16px, - weight: 400, - line-height: 24px, - // letter-spacing: normal - ), - 'h6': ( - size: 14px, - weight: 500, - line-height: 18px, - // letter-spacing: 0.0125em - ), - 'subtitle': ( - size: 12px, - weight: 400, - line-height: 20px, - // letter-spacing: 0.00937em - ), - 'body': ( - font-size: 14px, - font-weight: 400, - line-height: 22px, - // letter-spacing: 0.03125em - ), - 'caption': ( - 'size': 12px, - 'weight': 400, - 'line-height': 20px, - // 'letter-spacing': 0.03333em, - // 'text-transform': false - ) - ), - $uni-headings -); - - - -// 主色 -$uni-primary: #2979ff !default; -$uni-primary-disable:lighten($uni-primary,20%) !default; -$uni-primary-light: lighten($uni-primary,25%) !default; - -// 辅助色 -// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。 -$uni-success: #18bc37 !default; -$uni-success-disable:lighten($uni-success,20%) !default; -$uni-success-light: lighten($uni-success,25%) !default; - -$uni-warning: #f3a73f !default; -$uni-warning-disable:lighten($uni-warning,20%) !default; -$uni-warning-light: lighten($uni-warning,25%) !default; - -$uni-error: #e43d33 !default; -$uni-error-disable:lighten($uni-error,20%) !default; -$uni-error-light: lighten($uni-error,25%) !default; - -$uni-info: #8f939c !default; -$uni-info-disable:lighten($uni-info,20%) !default; -$uni-info-light: lighten($uni-info,25%) !default; - -// 中性色 -// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。 -$uni-main-color: #3a3a3a !default; // 主要文字 -$uni-base-color: #6a6a6a !default; // 常规文字 -$uni-secondary-color: #909399 !default; // 次要文字 -$uni-extra-color: #c7c7c7 !default; // 辅助说明 - -// 边框颜色 -$uni-border-1: #F0F0F0 !default; -$uni-border-2: #EDEDED !default; -$uni-border-3: #DCDCDC !default; -$uni-border-4: #B9B9B9 !default; - -// 常规色 -$uni-black: #000000 !default; -$uni-white: #ffffff !default; -$uni-transparent: rgba($color: #000000, $alpha: 0) !default; - -// 背景色 -$uni-bg-color: #f7f7f7 !default; - -/* 水平间距 */ -$uni-spacing-sm: 8px !default; -$uni-spacing-base: 15px !default; -$uni-spacing-lg: 30px !default; - -// 阴影 -$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default; -$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default; -$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default; - -// 蒙版 -$uni-mask: rgba($color: #000000, $alpha: 0.4) !default; +// 字体家族 +$body-font-family: 'Roboto', sans-serif !default; +// 文本 +$heading-font-family: $body-font-family !default; +$uni-headings: () !default; +$letterSpacing: -0.01562em; +$uni-headings: map-deep-merge( + ( + 'h1': ( + size: 32px, + weight: 300, + line-height: 50px, + // letter-spacing:-0.01562em + ), + 'h2': ( + size: 28px, + weight: 300, + line-height: 40px, + // letter-spacing: -0.00833em + ), + 'h3': ( + size: 24px, + weight: 400, + line-height: 32px, + // letter-spacing: normal + ), + 'h4': ( + size: 20px, + weight: 400, + line-height: 30px, + // letter-spacing: 0.00735em + ), + 'h5': ( + size: 16px, + weight: 400, + line-height: 24px, + // letter-spacing: normal + ), + 'h6': ( + size: 14px, + weight: 500, + line-height: 18px, + // letter-spacing: 0.0125em + ), + 'subtitle': ( + size: 12px, + weight: 400, + line-height: 20px, + // letter-spacing: 0.00937em + ), + 'body': ( + font-size: 14px, + font-weight: 400, + line-height: 22px, + // letter-spacing: 0.03125em + ), + 'caption': ( + 'size': 12px, + 'weight': 400, + 'line-height': 20px, + // 'letter-spacing': 0.03333em, + // 'text-transform': false + ) + ), + $uni-headings +); + + + +// 主色 +$uni-primary: #2979ff !default; +$uni-primary-disable:lighten($uni-primary,20%) !default; +$uni-primary-light: lighten($uni-primary,25%) !default; + +// 辅助色 +// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。 +$uni-success: #18bc37 !default; +$uni-success-disable:lighten($uni-success,20%) !default; +$uni-success-light: lighten($uni-success,25%) !default; + +$uni-warning: #f3a73f !default; +$uni-warning-disable:lighten($uni-warning,20%) !default; +$uni-warning-light: lighten($uni-warning,25%) !default; + +$uni-error: #e43d33 !default; +$uni-error-disable:lighten($uni-error,20%) !default; +$uni-error-light: lighten($uni-error,25%) !default; + +$uni-info: #8f939c !default; +$uni-info-disable:lighten($uni-info,20%) !default; +$uni-info-light: lighten($uni-info,25%) !default; + +// 中性色 +// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。 +$uni-main-color: #3a3a3a !default; // 主要文字 +$uni-base-color: #6a6a6a !default; // 常规文字 +$uni-secondary-color: #909399 !default; // 次要文字 +$uni-extra-color: #c7c7c7 !default; // 辅助说明 + +// 边框颜色 +$uni-border-1: #F0F0F0 !default; +$uni-border-2: #EDEDED !default; +$uni-border-3: #DCDCDC !default; +$uni-border-4: #B9B9B9 !default; + +// 常规色 +$uni-black: #000000 !default; +$uni-white: #ffffff !default; +$uni-transparent: rgba($color: #000000, $alpha: 0) !default; + +// 背景色 +$uni-bg-color: #f7f7f7 !default; + +/* 水平间距 */ +$uni-spacing-sm: 8px !default; +$uni-spacing-base: 15px !default; +$uni-spacing-lg: 30px !default; + +// 阴影 +$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default; +$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default; +$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default; + +// 蒙版 +$uni-mask: rgba($color: #000000, $alpha: 0.4) !default; diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss index ac6f63e..a71beeb 100644 --- a/uni_modules/uni-scss/styles/tools/functions.scss +++ b/uni_modules/uni-scss/styles/tools/functions.scss @@ -1,19 +1,19 @@ -// 合并 map -@function map-deep-merge($parent-map, $child-map){ - $result: $parent-map; - @each $key, $child in $child-map { - $parent-has-key: map-has-key($result, $key); - $parent-value: map-get($result, $key); - $parent-type: type-of($parent-value); - $child-type: type-of($child); - $parent-is-map: $parent-type == map; - $child-is-map: $child-type == map; - - @if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){ - $result: map-merge($result, ( $key: $child )); - }@else { - $result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) )); - } - } - @return $result; -}; +// 合并 map +@function map-deep-merge($parent-map, $child-map){ + $result: $parent-map; + @each $key, $child in $child-map { + $parent-has-key: map-has-key($result, $key); + $parent-value: map-get($result, $key); + $parent-type: type-of($parent-value); + $child-type: type-of($child); + $parent-is-map: $parent-type == map; + $child-is-map: $child-type == map; + + @if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){ + $result: map-merge($result, ( $key: $child )); + }@else { + $result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) )); + } + } + @return $result; +}; diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss index 80ee62f..20cdf5e 100644 --- a/uni_modules/uni-scss/theme.scss +++ b/uni_modules/uni-scss/theme.scss @@ -1,31 +1,31 @@ -// 间距基础倍数 -$uni-space-root: 2; -// 边框半径默认值 -$uni-radius-root:5px; -// 主色 -$uni-primary: #2979ff; -// 辅助色 -$uni-success: #4cd964; -// 警告色 -$uni-warning: #f0ad4e; -// 错误色 -$uni-error: #dd524d; -// 描述色 -$uni-info: #909399; -// 中性色 -$uni-main-color: #303133; -$uni-base-color: #606266; -$uni-secondary-color: #909399; -$uni-extra-color: #C0C4CC; -// 背景色 -$uni-bg-color: #f5f5f5; -// 边框颜色 -$uni-border-1: #DCDFE6; -$uni-border-2: #E4E7ED; -$uni-border-3: #EBEEF5; -$uni-border-4: #F2F6FC; - -// 常规色 -$uni-black: #000000; -$uni-white: #ffffff; -$uni-transparent: rgba($color: #000000, $alpha: 0); +// 间距基础倍数 +$uni-space-root: 2; +// 边框半径默认值 +$uni-radius-root:5px; +// 主色 +$uni-primary: #2979ff; +// 辅助色 +$uni-success: #4cd964; +// 警告色 +$uni-warning: #f0ad4e; +// 错误色 +$uni-error: #dd524d; +// 描述色 +$uni-info: #909399; +// 中性色 +$uni-main-color: #303133; +$uni-base-color: #606266; +$uni-secondary-color: #909399; +$uni-extra-color: #C0C4CC; +// 背景色 +$uni-bg-color: #f5f5f5; +// 边框颜色 +$uni-border-1: #DCDFE6; +$uni-border-2: #E4E7ED; +$uni-border-3: #EBEEF5; +$uni-border-4: #F2F6FC; + +// 常规色 +$uni-black: #000000; +$uni-white: #ffffff; +$uni-transparent: rgba($color: #000000, $alpha: 0); diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss index 1c062d4..49a89b6 100644 --- a/uni_modules/uni-scss/variables.scss +++ b/uni_modules/uni-scss/variables.scss @@ -1,62 +1,62 @@ -@import './styles/setting/_variables.scss'; -// 间距基础倍数 -$uni-space-root: 2; -// 边框半径默认值 -$uni-radius-root:5px; - -// 主色 -$uni-primary: #2979ff; -$uni-primary-disable:mix(#fff,$uni-primary,50%); -$uni-primary-light: mix(#fff,$uni-primary,80%); - -// 辅助色 -// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。 -$uni-success: #18bc37; -$uni-success-disable:mix(#fff,$uni-success,50%); -$uni-success-light: mix(#fff,$uni-success,80%); - -$uni-warning: #f3a73f; -$uni-warning-disable:mix(#fff,$uni-warning,50%); -$uni-warning-light: mix(#fff,$uni-warning,80%); - -$uni-error: #e43d33; -$uni-error-disable:mix(#fff,$uni-error,50%); -$uni-error-light: mix(#fff,$uni-error,80%); - -$uni-info: #8f939c; -$uni-info-disable:mix(#fff,$uni-info,50%); -$uni-info-light: mix(#fff,$uni-info,80%); - -// 中性色 -// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。 -$uni-main-color: #3a3a3a; // 主要文字 -$uni-base-color: #6a6a6a; // 常规文字 -$uni-secondary-color: #909399; // 次要文字 -$uni-extra-color: #c7c7c7; // 辅助说明 - -// 边框颜色 -$uni-border-1: #F0F0F0; -$uni-border-2: #EDEDED; -$uni-border-3: #DCDCDC; -$uni-border-4: #B9B9B9; - -// 常规色 -$uni-black: #000000; -$uni-white: #ffffff; -$uni-transparent: rgba($color: #000000, $alpha: 0); - -// 背景色 -$uni-bg-color: #f7f7f7; - -/* 水平间距 */ -$uni-spacing-sm: 8px; -$uni-spacing-base: 15px; -$uni-spacing-lg: 30px; - -// 阴影 -$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5); -$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2); -$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5); - -// 蒙版 -$uni-mask: rgba($color: #000000, $alpha: 0.4); +@import './styles/setting/_variables.scss'; +// 间距基础倍数 +$uni-space-root: 2; +// 边框半径默认值 +$uni-radius-root:5px; + +// 主色 +$uni-primary: #2979ff; +$uni-primary-disable:mix(#fff,$uni-primary,50%); +$uni-primary-light: mix(#fff,$uni-primary,80%); + +// 辅助色 +// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。 +$uni-success: #18bc37; +$uni-success-disable:mix(#fff,$uni-success,50%); +$uni-success-light: mix(#fff,$uni-success,80%); + +$uni-warning: #f3a73f; +$uni-warning-disable:mix(#fff,$uni-warning,50%); +$uni-warning-light: mix(#fff,$uni-warning,80%); + +$uni-error: #e43d33; +$uni-error-disable:mix(#fff,$uni-error,50%); +$uni-error-light: mix(#fff,$uni-error,80%); + +$uni-info: #8f939c; +$uni-info-disable:mix(#fff,$uni-info,50%); +$uni-info-light: mix(#fff,$uni-info,80%); + +// 中性色 +// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。 +$uni-main-color: #3a3a3a; // 主要文字 +$uni-base-color: #6a6a6a; // 常规文字 +$uni-secondary-color: #909399; // 次要文字 +$uni-extra-color: #c7c7c7; // 辅助说明 + +// 边框颜色 +$uni-border-1: #F0F0F0; +$uni-border-2: #EDEDED; +$uni-border-3: #DCDCDC; +$uni-border-4: #B9B9B9; + +// 常规色 +$uni-black: #000000; +$uni-white: #ffffff; +$uni-transparent: rgba($color: #000000, $alpha: 0); + +// 背景色 +$uni-bg-color: #f7f7f7; + +/* 水平间距 */ +$uni-spacing-sm: 8px; +$uni-spacing-base: 15px; +$uni-spacing-lg: 30px; + +// 阴影 +$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5); +$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2); +$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5); + +// 蒙版 +$uni-mask: rgba($color: #000000, $alpha: 0.4);