1327 Commits

Author SHA1 Message Date
wny
33b0f7cbca fix: sku message key (#142)
* fix: sku message key

* fix: 改用goods_id当key

* fix: 漏改一处
2017-09-24 13:12:17 +08:00
niunai
f91f198492 fix: 漏改一处 2017-09-24 12:58:38 +08:00
niunai
2f6e31488d fix: 改用goods_id当key 2017-09-24 12:56:08 +08:00
niunai
38f5ef88f5 fix: sku message key 2017-09-24 11:41:10 +08:00
陈嘉涵
ff04931163 Merge remote-tracking branch 'main/dev' into dev 2017-09-22 20:15:39 +08:00
陈嘉涵
4fd23129f9 Merge branch 'feature/address-edit-component' into dev 2017-09-22 20:15:28 +08:00
陈嘉涵
7beb2e32fd add v0.9.7 changelog 2017-09-22 20:05:27 +08:00
neverland
e43fa114ba Merge pull request #140 from chenjiahan/dev
update changelog.md
2017-09-22 06:54:37 -05:00
陈嘉涵
0fe6160fcd Merge remote-tracking branch 'main/dev' into dev 2017-09-22 19:45:06 +08:00
陈嘉涵
c532b29662 saperate changelog generater from build.sh 2017-09-22 19:44:48 +08:00
陈嘉涵
4108f0314f update changelog.md 2017-09-22 19:30:14 +08:00
陈嘉涵
d2ce5bf606 add Address edit component 2017-09-22 15:07:03 +08:00
neverland
5fcdf200c6 Merge pull request #138 from chenjiahan/dev
add AddressList component
2017-09-22 02:02:01 -05:00
陈嘉涵
72b013a440 Field: support $attrs & $listeners 2017-09-22 14:54:05 +08:00
陈嘉涵
910739905c Merge remote-tracking branch 'main/dev' into dev 2017-09-21 16:26:52 +08:00
陈嘉涵
522655fdd8 add AddressList component 2017-09-21 16:26:40 +08:00
陈嘉涵
309744286e Cell: add extra slot 2017-09-21 16:26:10 +08:00
陈嘉涵
d9610015c7 [release] 0.9.7 v0.9.7 2017-09-21 09:59:08 +08:00
陈嘉涵
9248289532 [build] 0.9.7 2017-09-21 09:59:07 +08:00
neverland
6cc3c55253 Merge pull request #137 from chenjiahan/dev
Checkbox: support different shape
2017-09-20 07:32:55 -05:00
陈嘉涵
62b48ee99f fix: checkbox icon dependencies 2017-09-20 20:19:47 +08:00
陈嘉涵
9a4c72d910 Merge remote-tracking branch 'main/dev' into dev 2017-09-20 20:10:59 +08:00
陈嘉涵
9d31eca15f Checkbox: support different shape 2017-09-20 20:10:47 +08:00
陈嘉涵
318eba456c [release] 0.9.6 v0.9.6 2017-09-20 15:52:03 +08:00
陈嘉涵
5affe8f5c0 [build] 0.9.6 2017-09-20 15:52:03 +08:00
neverland
0cc9034162 Merge pull request #136 from chenjiahan/dev
fix: reset.css compile error
2017-09-20 02:49:49 -05:00
陈嘉涵
d763910f78 fix: reset.css compile error 2017-09-20 15:47:50 +08:00
neverland
d678ac8ebf Merge pull request #135 from w91/dev
移除大部分Lodash函数,更新文档
2017-09-19 09:00:26 -05:00
niunai
a574ee29f1 Merge branch 'feature/update_sku_doc' into dev 2017-09-19 18:17:45 +08:00
niunai
6dbc9b6da9 Merge remote-tracking branch 'upstream/dev' into dev 2017-09-19 18:17:32 +08:00
niunai
3ba8b84d08 fix: update test & move constants 2017-09-19 18:16:42 +08:00
niunai
485452cc97 fix: 去除大部分lodash依赖 2017-09-16 21:46:39 +08:00
Yao
5963eedb1a 修复:图片预览 滑动关闭bug (#134)
* fix: 关闭image preview
2017-09-15 21:13:52 +08:00
Yao
8556772d8a icon 增加会员余额图标 (#133)
* update icons

* remove music icon
2017-09-15 17:22:57 +08:00
陈嘉涵
076ecad28a [release] 0.9.4 v0.9.4 2017-09-15 11:37:28 +08:00
陈嘉涵
a75c94f235 [build] 0.9.4 2017-09-15 11:37:27 +08:00
neverland
d82fc9331c Merge pull request #132 from chenjiahan/dev
Button: fix active color when disabled
2017-09-14 22:34:26 -05:00
陈嘉涵
aef14bf466 Merge remote-tracking branch 'main/dev' into dev 2017-09-15 11:33:23 +08:00
陈嘉涵
9e1ba8f1fe Button: fix active color when disabled 2017-09-15 10:06:50 +08:00
neverland
2d765e6937 Merge pull request #131 from chenjiahan/dev
Button: fix disabled color wrong when has bottomAction prop
2017-09-14 07:31:00 -05:00
陈嘉涵
f50301c2aa Coupon: fix test case fail 2017-09-14 20:18:57 +08:00
陈嘉涵
2d744a0ca1 Merge remote-tracking branch 'main/dev' into dev 2017-09-14 20:06:12 +08:00
陈嘉涵
63acb5b799 Button: fix disabled color wrong when has bottomAction prop 2017-09-14 20:05:53 +08:00
张敏
6caf8fedf2 新增:增加一个已完成的icon (#129) 2017-09-14 10:32:30 +08:00
陈嘉涵
3be326f7ea [release] 0.9.3 v0.9.3 2017-09-13 15:34:39 +08:00
陈嘉涵
c86c49612f [build] 0.9.3 2017-09-13 15:34:38 +08:00
neverland
d548e28dfb Merge pull request #128 from chenjiahan/dev
Fix: component style should not depend on reset.css
2017-09-13 02:14:20 -05:00
陈嘉涵
e8db94e58f Doc: add github link 2017-09-13 14:57:56 +08:00
陈嘉涵
c40c82e448 Merge remote-tracking branch 'main/dev' into dev 2017-09-13 13:36:24 +08:00
陈嘉涵
d85025ebf7 fix: component style should not depend on reset.css 2017-09-13 13:35:37 +08:00