From 0687ea1f81e6c3e6070a1795c12d231423ac3552 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Thu, 9 Apr 2020 17:57:26 +0800 Subject: [PATCH] no message --- colorui/main.wxss | 2 +- components/col/index.js | 58 +++++++++++ components/col/index.json | 3 + components/col/index.wxml | 3 + components/col/index.wxss | 161 ++++++++++++++++++++++++++++++ components/row/index.js | 53 ++++++++++ components/row/index.json | 3 + components/row/index.wxml | 3 + components/row/index.wxss | 8 ++ pages/mall/order-info/index.wxml | 2 +- pages/mall/search-list/index.wxml | 4 +- pages/mall/shops/index.wxml | 2 +- 12 files changed, 297 insertions(+), 5 deletions(-) create mode 100644 components/col/index.js create mode 100644 components/col/index.json create mode 100644 components/col/index.wxml create mode 100644 components/col/index.wxss create mode 100644 components/row/index.js create mode 100644 components/row/index.json create mode 100644 components/row/index.wxml create mode 100644 components/row/index.wxss diff --git a/colorui/main.wxss b/colorui/main.wxss index 23a81b4..41e9385 100644 --- a/colorui/main.wxss +++ b/colorui/main.wxss @@ -744,7 +744,7 @@ button.icon.lg { flex: 1; display: flex; align-items: center; - margin: 0 30rpx; + margin: 0 24rpx; } .cu-bar .search-form+.action { diff --git a/components/col/index.js b/components/col/index.js new file mode 100644 index 0000000..9c1f50a --- /dev/null +++ b/components/col/index.js @@ -0,0 +1,58 @@ +import baseComponent from '../helpers/baseComponent' +import classNames from '../helpers/classNames' + +baseComponent({ + relations: { + '../row/index': { + type: 'parent', + }, + }, + properties: { + prefixCls: { + type: String, + value: 'wux-col', + }, + span: { + value: 0, + type: Number, + }, + offset: { + value: 0, + type: Number, + }, + pull: { + value: 0, + type: Number, + }, + push: { + value: 0, + type: Number, + }, + }, + data: { + colStyle: '', + }, + computed: { + classes: ['prefixCls, span, offset, pull, push', function(prefixCls, span, offset, pull, push) { + const wrap = classNames(prefixCls, { + [`${prefixCls}--span-${span}`]: span, + [`${prefixCls}--offset-${offset}`]: offset, + [`${prefixCls}--pull-${pull}`]: pull, + [`${prefixCls}--push-${push}`]: push, + }) + + return { + wrap, + } + }], + }, + methods: { + updateStyle(colStyle) { + if (this.data.colStyle !== colStyle) { + this.setData({ + colStyle, + }) + } + }, + }, +}) diff --git a/components/col/index.json b/components/col/index.json new file mode 100644 index 0000000..fba482a --- /dev/null +++ b/components/col/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/components/col/index.wxml b/components/col/index.wxml new file mode 100644 index 0000000..b145837 --- /dev/null +++ b/components/col/index.wxml @@ -0,0 +1,3 @@ + + + diff --git a/components/col/index.wxss b/components/col/index.wxss new file mode 100644 index 0000000..c70d3dd --- /dev/null +++ b/components/col/index.wxss @@ -0,0 +1,161 @@ +.wux-col { + position: relative; + min-height: 2rpx; + box-sizing: border-box +} +.wux-col--span-12 { + float: left; + width: 100% +} +.wux-col--pull-12 { + right: 100% +} +.wux-col--push-12 { + left: 100% +} +.wux-col--offset-12 { + margin-left: 100% +} +.wux-col--span-11 { + float: left; + width: 91.66666667% +} +.wux-col--pull-11 { + right: 91.66666667% +} +.wux-col--push-11 { + left: 91.66666667% +} +.wux-col--offset-11 { + margin-left: 91.66666667% +} +.wux-col--span-10 { + float: left; + width: 83.33333333% +} +.wux-col--pull-10 { + right: 83.33333333% +} +.wux-col--push-10 { + left: 83.33333333% +} +.wux-col--offset-10 { + margin-left: 83.33333333% +} +.wux-col--span-9 { + float: left; + width: 75% +} +.wux-col--pull-9 { + right: 75% +} +.wux-col--push-9 { + left: 75% +} +.wux-col--offset-9 { + margin-left: 75% +} +.wux-col--span-8 { + float: left; + width: 66.66666667% +} +.wux-col--pull-8 { + right: 66.66666667% +} +.wux-col--push-8 { + left: 66.66666667% +} +.wux-col--offset-8 { + margin-left: 66.66666667% +} +.wux-col--span-7 { + float: left; + width: 58.33333333% +} +.wux-col--pull-7 { + right: 58.33333333% +} +.wux-col--push-7 { + left: 58.33333333% +} +.wux-col--offset-7 { + margin-left: 58.33333333% +} +.wux-col--span-6 { + float: left; + width: 50% +} +.wux-col--pull-6 { + right: 50% +} +.wux-col--push-6 { + left: 50% +} +.wux-col--offset-6 { + margin-left: 50% +} +.wux-col--span-5 { + float: left; + width: 41.66666667% +} +.wux-col--pull-5 { + right: 41.66666667% +} +.wux-col--push-5 { + left: 41.66666667% +} +.wux-col--offset-5 { + margin-left: 41.66666667% +} +.wux-col--span-4 { + float: left; + width: 33.33333333% +} +.wux-col--pull-4 { + right: 33.33333333% +} +.wux-col--push-4 { + left: 33.33333333% +} +.wux-col--offset-4 { + margin-left: 33.33333333% +} +.wux-col--span-3 { + float: left; + width: 25% +} +.wux-col--pull-3 { + right: 25% +} +.wux-col--push-3 { + left: 25% +} +.wux-col--offset-3 { + margin-left: 25% +} +.wux-col--span-2 { + float: left; + width: 16.66666667% +} +.wux-col--pull-2 { + right: 16.66666667% +} +.wux-col--push-2 { + left: 16.66666667% +} +.wux-col--offset-2 { + margin-left: 16.66666667% +} +.wux-col--span-1 { + float: left; + width: 8.33333333% +} +.wux-col--pull-1 { + right: 8.33333333% +} +.wux-col--push-1 { + left: 8.33333333% +} +.wux-col--offset-1 { + margin-left: 8.33333333% +} \ No newline at end of file diff --git a/components/row/index.js b/components/row/index.js new file mode 100644 index 0000000..8a8d6bb --- /dev/null +++ b/components/row/index.js @@ -0,0 +1,53 @@ +import baseComponent from '../helpers/baseComponent' +import classNames from '../helpers/classNames' + +baseComponent({ + relations: { + '../col/index': { + type: 'child', + observer() { + this.updateStyle() + }, + }, + }, + properties: { + prefixCls: { + type: String, + value: 'wux-row', + }, + gutter: { + value: 0, + type: Number, + observer: 'updateStyle', + }, + }, + data: { + rowStyle: '', + }, + computed: { + classes: ['prefixCls', function(prefixCls) { + const wrap = classNames(prefixCls) + + return { + wrap, + } + }], + }, + methods: { + updateStyle(gutter = this.data.gutter) { + const elements = this.getRelationNodes('../col/index') + const rowStyle = gutter > 0 ? `margin-left: ${gutter / -2}px; margin-right: ${gutter / -2}px` : '' + const colStyle = gutter > 0 ? `padding-left: ${gutter / 2}px; padding-right: ${gutter / 2}px` : '' + + if (elements.length > 0) { + elements.forEach((element) => { + element.updateStyle(colStyle) + }) + } + + this.setData({ + rowStyle, + }) + }, + }, +}) diff --git a/components/row/index.json b/components/row/index.json new file mode 100644 index 0000000..fba482a --- /dev/null +++ b/components/row/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/components/row/index.wxml b/components/row/index.wxml new file mode 100644 index 0000000..8bea796 --- /dev/null +++ b/components/row/index.wxml @@ -0,0 +1,3 @@ + + + diff --git a/components/row/index.wxss b/components/row/index.wxss new file mode 100644 index 0000000..4558033 --- /dev/null +++ b/components/row/index.wxss @@ -0,0 +1,8 @@ +.wux-row:after, +.wux-row:before { + display: table; + content: " " +} +.wux-row:after { + clear: both +} \ No newline at end of file diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml index 3855cab..9e6b5ef 100644 --- a/pages/mall/order-info/index.wxml +++ b/pages/mall/order-info/index.wxml @@ -13,7 +13,7 @@ ￥{{orderInfo.price}} - 库存：{{orderInfo.stockNumbe + orderInfo.unit}} + 库存：{{orderInfo.stockNumber}}{{orderInfo.unit}} {{orderInfo.viewNum}} 浏览 diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml index 47848cd..62350af 100644 --- a/pages/mall/search-list/index.wxml +++ b/pages/mall/search-list/index.wxml @@ -41,12 +41,12 @@ {{item.name}} - 已拼{{item.soldNum}}件 + 已拼{{item.soldNum}}{{item.unit}} {{item.summary}} ￥{{item.price}} - 库存:{{item.stockNumber}}件 + 库存:{{item.stockNumber}}{{item.unit}} diff --git a/pages/mall/shops/index.wxml b/pages/mall/shops/index.wxml index e423987..50cc7f2 100644 --- a/pages/mall/shops/index.wxml +++ b/pages/mall/shops/index.wxml @@ -64,7 +64,7 @@ {{item.name}} - 已拼{{item.soldNum}}件 + 已拼{{item.soldNum}}{{item.unit}} {{item.summary}}