feat：更改count-selector组件icon

张寸起 · 7insummer · commit 8df72fffaf25 · 2019-08-14T21:12:01.000+08:00
diff --git a/dist/count-selector/index.js b/dist/count-selector/index.js
@@ -23,7 +23,9 @@ Component({
       type: Number,
       value: 1
     },
-    disabled: Boolean
+    disabled: Boolean,
+    iconSize: String,
+    iconColor: String
   },
 
   /**
@@ -63,7 +65,7 @@ Component({
       }, 50);
     },
 
-    changeCount(){
+    changeCount() {
       this.blurCount(this.properties.count);
     },
 
@@ -79,7 +81,7 @@ Component({
         });
         else if (value < this.properties.min) this.setData({
           count: this.properties.min
-        },() => {
+        }, () => {
           this.triggerEvent('linout', { type: 'overflow_min', way: 'input' }, {
             bubbles: true,
             composed: true
diff --git a/dist/count-selector/index.wxml b/dist/count-selector/index.wxml
@@ -2,7 +2,7 @@
   <view class="symbol {{count<=min|| disabled?'disabled  l-disabled-class':'abled l-symbol-class'}}" 
         catchtap="{{count<=min|| disabled?'doNothing':'reduceTap'}}"
         data-type="overflow_min">
-    <text>-</text>
+    <view class="l-icon l-icon-reduce" style="font-size:{{iconSize}};color:{{iconColor}}"></view>
   </view>
   <input  wx:if="{{focus}}"
           class="l-count-class count" 
@@ -15,6 +15,6 @@
   <view class="l-symbol-class symbol {{count>=max|| disabled?'disabled l-disabled-class':'abled l-symbol-class'}}" 
         catchtap="{{count>=max|| disabled?'doNothing':'addTap'}}"
         data-type="overflow_max">
-       <text>+</text>
+       <view class="l-icon l-icon-add" style="font-size:{{iconSize}};color:{{iconColor}}"></view>
   </view>
 </view>
diff --git a/dist/count-selector/index.wxss b/dist/count-selector/index.wxss
@@ -1 +1 @@
-.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.container-count{display:flex;flex-direction:row;width:170rpx;height:56rpx}.symbol{height:100%;width:56rpx;display:flex;align-items:center;justify-content:center}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:100%;flex:1;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;text-align:center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}@font-face{font-family:iconfont;src:url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALEAAsAAAAABqwAAAJ3AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgqBFIEWATYCJAMMCwgABCAFhG0HNxvdBcgekiSBqhRCJKIogADMEYRr5GySu0dQoBAloETFRVKmqpWoK1wVG1th2Ij732n7N5fsqTh2xyneKfa2N3/anZKGvYXFohGGrUFIEA6JogD/fZ7L6U2gA7nGtyynNW3s8fyoF2AcUEBjbYqsRALxFtlF3ImLOE6g3ZheoYOxmRVIKtC4QLww9QYkCxFFMfKtQt2wtIjXKq3pZfrEq+j78d9qJEmqDE09fTTahoFf6deHfNxwgxOiBHl1hYx5oBC3GjMXIsLgItpN0e7yWhHSXPEmkcq31Dv94yWihmo7wbQcS/yiMoJf9yskkEFdzE0Diwo7eF2IkexeNr35cvtSjmQ/fjt5zeTy++93z1I4x8LHT3u9VVdH6SHr0r8+OjOTtCopyONe0uFsIlZDiaMZyTdAmzFfZzrm0+EOQPOcP/IeANGP4rNA8KN0+V8rbPwlMwX83P7UK0Wa5wJwS+sZvMEfUwMbiq9F1lxcFVWFvmwE4ErICtOvARTo9zPeMgROEVoL2hG+FqMeslbjZGHnUemwjlqrbbSbM766wwAuIkobZl1ICL0ekXT7jqzXF1nYb1SG/aLWGxG0O4uBLTtMhpne59gQ2CbNHWK2mEeJXaTj+iXUN5wGz2sjfg15YMaJJqvl/Dh6yOeYEWzqFSEooZy5ZEw6DR2HEZ8zC1tCNoTwq4pCm94kt5gLafs41CCgNqJpB2FqYTyUtxbSlc8vQboNjgbeIejJr0FcwOyc0MhUADlu8kCCe3klsElXIQgUQXGMixiTBiGHgyH85kEW1CLIjBEpX5WCm1GoSV7f4n7fNmiH9syRIkeR77bbiWdmwzMaDAAA') format('woff2')}.l-icon-add:before{content:"\e602"}.l-icon-reduce:before{content:"\e69c"}.l-icon{font-family:iconfont;font-size:28rpx;color:#596c8e;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.l-icon::before{display:inline-flex}
diff --git a/dist/tag/index.js b/dist/tag/index.js
@@ -1,9 +1,9 @@
 Component({
   externalClasses: ['l-class', 'l-select-class', 'l-image-class'],
   properties: {
-    // 标签名称
-    name: Object,
-    cell: String,
+    // 标签标识
+    name: String,
+    cell: Object,
     // 标签颜色
     type:{
       type: String,
diff --git a/dist/water-flow/index.wxss b/dist/water-flow/index.wxss
@@ -1 +1 @@
-.water-flow-container{display:flex;width:100%;box-sizing:border-box}.water-column{flex:1}
+.water-flow-container{display:flex;width:100%;box-sizing:border-box;background:0 0}.water-column{flex:1}
diff --git a/examples/dist/count-selector/index.js b/examples/dist/count-selector/index.js
@@ -23,7 +23,9 @@ Component({
       type: Number,
       value: 1
     },
-    disabled: Boolean
+    disabled: Boolean,
+    iconSize: String,
+    iconColor: String
   },
 
   /**
@@ -63,7 +65,7 @@ Component({
       }, 50);
     },
 
-    changeCount(){
+    changeCount() {
       this.blurCount(this.properties.count);
     },
 
@@ -79,7 +81,7 @@ Component({
         });
         else if (value < this.properties.min) this.setData({
           count: this.properties.min
-        },() => {
+        }, () => {
           this.triggerEvent('linout', { type: 'overflow_min', way: 'input' }, {
             bubbles: true,
             composed: true
diff --git a/examples/dist/count-selector/index.wxml b/examples/dist/count-selector/index.wxml
@@ -2,7 +2,7 @@
   <view class="symbol {{count<=min|| disabled?'disabled  l-disabled-class':'abled l-symbol-class'}}" 
         catchtap="{{count<=min|| disabled?'doNothing':'reduceTap'}}"
         data-type="overflow_min">
-    <text>-</text>
+    <view class="l-icon l-icon-reduce" style="font-size:{{iconSize}};color:{{iconColor}}"></view>
   </view>
   <input  wx:if="{{focus}}"
           class="l-count-class count" 
@@ -15,6 +15,6 @@
   <view class="l-symbol-class symbol {{count>=max|| disabled?'disabled l-disabled-class':'abled l-symbol-class'}}" 
         catchtap="{{count>=max|| disabled?'doNothing':'addTap'}}"
         data-type="overflow_max">
-       <text>+</text>
+       <view class="l-icon l-icon-add" style="font-size:{{iconSize}};color:{{iconColor}}"></view>
   </view>
 </view>
diff --git a/examples/dist/count-selector/index.wxss b/examples/dist/count-selector/index.wxss
@@ -1 +1 @@
-.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.container-count{display:flex;flex-direction:row;width:170rpx;height:56rpx}.symbol{height:100%;width:56rpx;display:flex;align-items:center;justify-content:center}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:100%;flex:1;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;text-align:center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}@font-face{font-family:iconfont;src:url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALEAAsAAAAABqwAAAJ3AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgqBFIEWATYCJAMMCwgABCAFhG0HNxvdBcgekiSBqhRCJKIogADMEYRr5GySu0dQoBAloETFRVKmqpWoK1wVG1th2Ij732n7N5fsqTh2xyneKfa2N3/anZKGvYXFohGGrUFIEA6JogD/fZ7L6U2gA7nGtyynNW3s8fyoF2AcUEBjbYqsRALxFtlF3ImLOE6g3ZheoYOxmRVIKtC4QLww9QYkCxFFMfKtQt2wtIjXKq3pZfrEq+j78d9qJEmqDE09fTTahoFf6deHfNxwgxOiBHl1hYx5oBC3GjMXIsLgItpN0e7yWhHSXPEmkcq31Dv94yWihmo7wbQcS/yiMoJf9yskkEFdzE0Diwo7eF2IkexeNr35cvtSjmQ/fjt5zeTy++93z1I4x8LHT3u9VVdH6SHr0r8+OjOTtCopyONe0uFsIlZDiaMZyTdAmzFfZzrm0+EOQPOcP/IeANGP4rNA8KN0+V8rbPwlMwX83P7UK0Wa5wJwS+sZvMEfUwMbiq9F1lxcFVWFvmwE4ErICtOvARTo9zPeMgROEVoL2hG+FqMeslbjZGHnUemwjlqrbbSbM766wwAuIkobZl1ICL0ekXT7jqzXF1nYb1SG/aLWGxG0O4uBLTtMhpne59gQ2CbNHWK2mEeJXaTj+iXUN5wGz2sjfg15YMaJJqvl/Dh6yOeYEWzqFSEooZy5ZEw6DR2HEZ8zC1tCNoTwq4pCm94kt5gLafs41CCgNqJpB2FqYTyUtxbSlc8vQboNjgbeIejJr0FcwOyc0MhUADlu8kCCe3klsElXIQgUQXGMixiTBiGHgyH85kEW1CLIjBEpX5WCm1GoSV7f4n7fNmiH9syRIkeR77bbiWdmwzMaDAAA') format('woff2')}.l-icon-add:before{content:"\e602"}.l-icon-reduce:before{content:"\e69c"}.l-icon{font-family:iconfont;font-size:28rpx;color:#596c8e;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.l-icon::before{display:inline-flex}
diff --git a/examples/dist/tag/index.js b/examples/dist/tag/index.js
@@ -1,9 +1,9 @@
 Component({
   externalClasses: ['l-class', 'l-select-class', 'l-image-class'],
   properties: {
-    // 标签名称
-    name: Object,
-    cell: String,
+    // 标签标识
+    name: String,
+    cell: Object,
     // 标签颜色
     type:{
       type: String,
diff --git a/examples/dist/water-flow/index.wxss b/examples/dist/water-flow/index.wxss
@@ -1 +1 @@
-.water-flow-container{display:flex;width:100%;box-sizing:border-box}.water-column{flex:1}
+.water-flow-container{display:flex;width:100%;box-sizing:border-box;background:0 0}.water-column{flex:1}
diff --git a/src/count-selector/index.js b/src/count-selector/index.js
@@ -23,7 +23,9 @@ Component({
       type: Number,
       value: 1
     },
-    disabled: Boolean
+    disabled: Boolean,
+    iconSize: String,
+    iconColor: String
   },
 
   /**
@@ -63,7 +65,7 @@ Component({
       }, 50);
     },
 
-    changeCount(){
+    changeCount() {
       this.blurCount(this.properties.count);
     },
 
@@ -79,7 +81,7 @@ Component({
         });
         else if (value < this.properties.min) this.setData({
           count: this.properties.min
-        },() => {
+        }, () => {
           this.triggerEvent('linout', { type: 'overflow_min', way: 'input' }, {
             bubbles: true,
             composed: true
diff --git a/src/count-selector/index.less b/src/count-selector/index.less
@@ -1,39 +1,64 @@
 .container-count {
-  display: flex;
+  display       : flex;
   flex-direction: row;
+  width         : 170rpx;
+  height        : 56rpx;
 }
 
 .symbol {
-  height: 56rpx;
-  width: 56rpx;
-  display: inline-block;
-  vertical-align: middle;
-  text-align: center;
-  line-height: 56rpx;
-  font-size: 42rpx;
+  height         : 100%;
+  width          : 56rpx;
+  display        : flex;
+  align-items    : center;
+  justify-content: center;
 }
 
 .disabled {
   background-color: #f3f3f3;
-  color: #c4c9d2;
+  color           : #c4c9d2;
 }
 
 .abled {
   background-color: #ecf1f8;
-  color: #596c8e;
+  color           : #596c8e;
 }
 
 .count {
-  height: 56rpx;
-  width: 64rpx;
-  min-height: 56rpx;
-  line-height: 56rpx;
-  font-size: 24rpx;
-  color: #596c8e;
-  background: #f6f7f9;
-  margin: 0 4rpx;
-  text-align: center;
-  overflow: hidden;
+  height       : 100%;
+  flex         : 1;
+  min-height   : 56rpx;
+  line-height  : 56rpx;
+  font-size    : 24rpx;
+  color        : #596c8e;
+  background   : #f6f7f9;
+  text-align   : center;
+  overflow     : hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
+  white-space  : nowrap;
 }
+
+@font-face {
+  font-family: "iconfont";
+  src        : url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALEAAsAAAAABqwAAAJ3AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgqBFIEWATYCJAMMCwgABCAFhG0HNxvdBcgekiSBqhRCJKIogADMEYRr5GySu0dQoBAloETFRVKmqpWoK1wVG1th2Ij732n7N5fsqTh2xyneKfa2N3/anZKGvYXFohGGrUFIEA6JogD/fZ7L6U2gA7nGtyynNW3s8fyoF2AcUEBjbYqsRALxFtlF3ImLOE6g3ZheoYOxmRVIKtC4QLww9QYkCxFFMfKtQt2wtIjXKq3pZfrEq+j78d9qJEmqDE09fTTahoFf6deHfNxwgxOiBHl1hYx5oBC3GjMXIsLgItpN0e7yWhHSXPEmkcq31Dv94yWihmo7wbQcS/yiMoJf9yskkEFdzE0Diwo7eF2IkexeNr35cvtSjmQ/fjt5zeTy++93z1I4x8LHT3u9VVdH6SHr0r8+OjOTtCopyONe0uFsIlZDiaMZyTdAmzFfZzrm0+EOQPOcP/IeANGP4rNA8KN0+V8rbPwlMwX83P7UK0Wa5wJwS+sZvMEfUwMbiq9F1lxcFVWFvmwE4ErICtOvARTo9zPeMgROEVoL2hG+FqMeslbjZGHnUemwjlqrbbSbM766wwAuIkobZl1ICL0ekXT7jqzXF1nYb1SG/aLWGxG0O4uBLTtMhpne59gQ2CbNHWK2mEeJXaTj+iXUN5wGz2sjfg15YMaJJqvl/Dh6yOeYEWzqFSEooZy5ZEw6DR2HEZ8zC1tCNoTwq4pCm94kt5gLafs41CCgNqJpB2FqYTyUtxbSlc8vQboNjgbeIejJr0FcwOyc0MhUADlu8kCCe3klsElXIQgUQXGMixiTBiGHgyH85kEW1CLIjBEpX5WCm1GoSV7f4n7fNmiH9syRIkeR77bbiWdmwzMaDAAA') format('woff2')
+}
+
+.l-icon-add:before {
+  content: "\e602";
+}
+
+.l-icon-reduce:before {
+  content: "\e69c";
+}
+
+.l-icon {
+  font-family            : "iconfont";
+  font-size              : 28rpx;
+  color                  : #596C8E;
+  font-style             : normal;
+  -webkit-font-smoothing : antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.l-icon::before {
+  display: inline-flex;
+}
diff --git a/src/count-selector/index.wxml b/src/count-selector/index.wxml
@@ -2,7 +2,7 @@
   <view class="symbol {{count<=min|| disabled?'disabled  l-disabled-class':'abled l-symbol-class'}}" 
         catchtap="{{count<=min|| disabled?'doNothing':'reduceTap'}}"
         data-type="overflow_min">
-    <text>-</text>
+    <view class="l-icon l-icon-reduce" style="font-size:{{iconSize}};color:{{iconColor}}"></view>
   </view>
   <input  wx:if="{{focus}}"
           class="l-count-class count" 
@@ -15,6 +15,6 @@
   <view class="l-symbol-class symbol {{count>=max|| disabled?'disabled l-disabled-class':'abled l-symbol-class'}}" 
         catchtap="{{count>=max|| disabled?'doNothing':'addTap'}}"
         data-type="overflow_max">
-       <text>+</text>
+       <view class="l-icon l-icon-add" style="font-size:{{iconSize}};color:{{iconColor}}"></view>
   </view>
 </view>
diff --git a/src/tag/index.js b/src/tag/index.js
@@ -1,9 +1,9 @@
 Component({
   externalClasses: ['l-class', 'l-select-class', 'l-image-class'],
   properties: {
-    // 标签名称
-    name: Object,
-    cell: String,
+    // 标签标识
+    name: String,
+    cell: Object,
     // 标签颜色
     type:{
       type: String,
diff --git a/src/water-flow/index.less b/src/water-flow/index.less
@@ -1 +1 @@
-.water-flow-container{display:flex;width:100%;box-sizing:border-box}.water-column{flex:1}
+.water-flow-container{display:flex;width:100%;box-sizing:border-box;background: transparent}.water-column{flex:1}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-.container-count{display:flex;flex-direction:row}.symbol{height:56rpx;width:56rpx;display:inline-block;vertical-align:middle;text-align:center;line-height:56rpx;font-size:42rpx}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:56rpx;width:64rpx;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;margin:0 4rpx;text-align:center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}`
	`1`	+.container-count{display:flex;flex-direction:row;width:170rpx;height:56rpx}.symbol{height:100%;width:56rpx;display:flex;align-items:center;justify-content:center}.disabled{background-color:#f3f3f3;color:#c4c9d2}.abled{background-color:#ecf1f8;color:#596c8e}.count{height:100%;flex:1;min-height:56rpx;line-height:56rpx;font-size:24rpx;color:#596c8e;background:#f6f7f9;text-align:center;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}@font-face{font-family:iconfont;src:url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALEAAsAAAAABqwAAAJ3AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgqBFIEWATYCJAMMCwgABCAFhG0HNxvdBcgekiSBqhRCJKIogADMEYRr5GySu0dQoBAloETFRVKmqpWoK1wVG1th2Ij732n7N5fsqTh2xyneKfa2N3/anZKGvYXFohGGrUFIEA6JogD/fZ7L6U2gA7nGtyynNW3s8fyoF2AcUEBjbYqsRALxFtlF3ImLOE6g3ZheoYOxmRVIKtC4QLww9QYkCxFFMfKtQt2wtIjXKq3pZfrEq+j78d9qJEmqDE09fTTahoFf6deHfNxwgxOiBHl1hYx5oBC3GjMXIsLgItpN0e7yWhHSXPEmkcq31Dv94yWihmo7wbQcS/yiMoJf9yskkEFdzE0Diwo7eF2IkexeNr35cvtSjmQ/fjt5zeTy++93z1I4x8LHT3u9VVdH6SHr0r8+OjOTtCopyONe0uFsIlZDiaMZyTdAmzFfZzrm0+EOQPOcP/IeANGP4rNA8KN0+V8rbPwlMwX83P7UK0Wa5wJwS+sZvMEfUwMbiq9F1lxcFVWFvmwE4ErICtOvARTo9zPeMgROEVoL2hG+FqMeslbjZGHnUemwjlqrbbSbM766wwAuIkobZl1ICL0ekXT7jqzXF1nYb1SG/aLWGxG0O4uBLTtMhpne59gQ2CbNHWK2mEeJXaTj+iXUN5wGz2sjfg15YMaJJqvl/Dh6yOeYEWzqFSEooZy5ZEw6DR2HEZ8zC1tCNoTwq4pCm94kt5gLafs41CCgNqJpB2FqYTyUtxbSlc8vQboNjgbeIejJr0FcwOyc0MhUADlu8kCCe3klsElXIQgUQXGMixiTBiGHgyH85kEW1CLIjBEpX5WCm1GoSV7f4n7fNmiH9syRIkeR77bbiWdmwzMaDAAA') format('woff2')}.l-icon-add:before{content:"\e602"}.l-icon-reduce:before{content:"\e69c"}.l-icon{font-family:iconfont;font-size:28rpx;color:#596c8e;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.l-icon::before{display:inline-flex}
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-.water-flow-container{display:flex;width:100%;box-sizing:border-box}.water-column{flex:1}`
	`1`	`+.water-flow-container{display:flex;width:100%;box-sizing:border-box;background:0 0}.water-column{flex:1}`