ecshop/ECShopX_mobile-frontend
1
0
Fork 0
mirror of https://gitee.com/ShopeX/ECShopX_mobile-frontend synced 2026-08-14 09:25:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,928 Commits 1 Branch 44 Tags
22d06e6d20e2d0107c54df84daf898c2c3ee88a0
Commit Graph

6928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chenhui0212
0416125df3 搜索取消按钮固定 2019-02-28 21:01:25 +08:00
chenhui0212
acd7b6b52a 搜索取消按钮固定 2019-02-28 20:59:19 +08:00
bentz
b30fa4d386 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  搜索
  积分列表，充值列表

# Conflicts:
#	src/components/index.js
#	src/pages/category/index.js
 2019-02-28 20:58:35 +08:00
bentz
5536aa8c95 列表展现方式 2019-02-28 20:55:54 +08:00
chenhui0212
6972b6e6fd 搜索 2019-02-28 20:16:26 +08:00
chenhui0212
6b58cd43b4 积分列表，充值列表 2019-02-28 19:16:13 +08:00
chenhui0212
c72d5ae1db 积分列表，充值列表 2019-02-28 19:10:28 +08:00
bentz
8ec061f579 清理文件包 2019-02-28 18:32:00 +08:00
bentz
97837d67e2 清理 && 列表对接api 2019-02-28 18:03:05 +08:00
bentz
5f20629f50 Merge branch 'pinjinjin' 
* pinjinjin:
  列表增加filter
  积分列表
  积分
  修改 倒计时onstart，支持回调
  no message
  timer test
  注册
  会员中心
  搜索组件
  订单完善
  订单列表/详情
 2019-02-28 16:15:33 +08:00
bentz
aeb9e414c4 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  积分列表
  积分

# Conflicts:
#	src/pages/index/index.js
 2019-02-28 16:15:22 +08:00
bentz
0362cc4c9d 列表增加filter 2019-02-28 16:15:04 +08:00
chenhui0212
f9c18297ca 积分列表 2019-02-28 16:06:52 +08:00
chenhui0212
5edb2dc649 积分 2019-02-28 11:48:17 +08:00
chenhui0212
94f319eaeb 积分 2019-02-28 11:43:33 +08:00
bentz
bb1e3667cc 修改 倒计时onstart，支持回调 2019-02-28 11:39:53 +08:00
bentz
8eada47b02 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  timer test
  注册

# Conflicts:
#	src/pages/index/index.js
 2019-02-27 22:26:15 +08:00
bentz
29042e0aea no message 2019-02-27 20:15:42 +08:00
chenhui0212
99dcbd92e0 timer test 2019-02-27 20:15:04 +08:00
chenhui0212
e52b5fee40 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-02-27 17:19:05 +08:00
chenhui0212
b254300c69 注册 2019-02-27 17:17:44 +08:00
bentz
14912d98d0 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  搜索组件

# Conflicts:
#	src/style/taro-ui-mod.scss
 2019-02-27 15:56:45 +08:00
bentz
413453ea49 会员中心 2019-02-27 15:55:55 +08:00
chenhui0212
b9b7006eb2 搜索组件 2019-02-27 14:49:23 +08:00
chenhui0212
ce31506141 搜索组件 2019-02-27 14:32:11 +08:00
bentz
9c5ee427c5 订单完善 2019-02-27 11:29:06 +08:00
bentz
fafb608c06 订单列表/详情 2019-02-26 21:15:46 +08:00
bentz
6d26096eaa init 2019-02-26 14:42:37 +08:00