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

6928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chenhui0212
e0a3bb4cc4 推荐重写 2019-03-11 21:23:27 +08:00
chenhui0212
656f7b1d66 积分提交 2019-03-11 18:41:27 +08:00
chenhui0212
5037e47c16 积分商城 2019-03-11 18:30:52 +08:00
chenhui0212
7fc2b62e7f 积分商城 2019-03-11 18:28:26 +08:00
bentz
2b7d7b4dec 购物车下单 2019-03-11 18:27:06 +08:00
bentz
d52c963eef Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  积分列表，总额，收银台

# Conflicts:
#	package.json
 2019-03-11 17:39:51 +08:00
bentz
8b5a052bfd persist weapp cart 2019-03-11 17:37:54 +08:00
chenhui0212
36e81c55c8 积分列表，总额，收银台 2019-03-11 17:37:00 +08:00
bentz
dc02be8e3c 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-03-08 21:45:22 +08:00
bentz
115483054a 本地购物车 2019-03-08 21:43:49 +08:00
chenhui0212
da8748f6b4 地址列表 2019-03-08 21:13:50 +08:00
chenhui0212
5db0101edb Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-08 15:22:14 +08:00
chenhui0212
aebe15042e 地址修改 2019-03-08 15:22:01 +08:00
bentz
6e4bdff9be 交易 2019-03-08 15:14:32 +08:00
bentz
3c848f2796 选择优惠券 2019-03-07 22:21:16 +08:00
bentz
ca648fb736 no message 2019-03-07 20:26:35 +08:00
bentz
8d87bc0337 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  地址列表，新增，删除
 2019-03-07 20:24:57 +08:00
bentz
de1bfba92d 结算 2019-03-07 20:24:54 +08:00
chenhui0212
9a024cadec 地址列表，新增，删除 2019-03-07 18:26:17 +08:00
chenhui0212
5a2c69230d 地址列表，新增，删除 2019-03-07 18:25:28 +08:00
bentz
d65cb1e576 no message 2019-03-07 17:22:14 +08:00
bentz
e2acb25574 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  登录跳转
 2019-03-07 17:21:20 +08:00
bentz
4c41dc80ab api修改 2019-03-07 17:21:17 +08:00
chenhui0212
4dff5901c8 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-07 15:48:46 +08:00
chenhui0212
14900a72e8 登录跳转 2019-03-07 15:48:41 +08:00
bentz
d3184cb399 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  积列表，详情
 2019-03-07 15:47:52 +08:00
bentz
3d15398430 no message 2019-03-07 15:47:49 +08:00
chenhui0212
cfe13b2d6d Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-07 15:36:23 +08:00
chenhui0212
a1d494c536 积列表，详情 2019-03-07 15:36:09 +08:00
bentz
bd55e7f354 详情 / auth 2019-03-07 15:30:11 +08:00
bentz
027fe8a5f8 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  优惠券,登录跳转，h5注册
  优惠券

# Conflicts:
#	src/api/item.js
#	src/app.js
#	src/pages/index/index.js
 2019-03-07 09:49:43 +08:00
bentz
b07b762f72 html-content 2019-03-07 09:48:13 +08:00
chenhui0212
995c7883c8 优惠券,登录跳转，h5注册 2019-03-06 18:46:42 +08:00
chenhui0212
650a31579d 优惠券 2019-03-06 11:01:31 +08:00
bentz
1c04961e98 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  推广二维码
 2019-03-04 19:23:17 +08:00
bentz
4e9ac7fbab 文章图文 2019-03-04 19:23:14 +08:00
chenhui0212
da25949901 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-04 18:49:53 +08:00
chenhui0212
cb6de3046c 推广二维码 2019-03-04 18:49:48 +08:00
bentz
17a554d982 tabbar修改 2019-03-04 16:53:43 +08:00
bentz
7d11f7e2f7 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  推荐
 2019-03-04 16:20:37 +08:00
bentz
ab7168d65e no message 2019-03-04 16:19:46 +08:00
chenhui0212
1124916fac Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-04 10:24:46 +08:00
chenhui0212
15da40e812 推荐 2019-03-04 10:24:33 +08:00
bentz
2c32016857 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  收银台，h5部分修改

# Conflicts:
#	src/pages/index/index.js
 2019-03-04 09:12:46 +08:00
bentz
71d8758915 no message 2019-03-04 09:11:11 +08:00
chenhui0212
704e5da6e3 收银台，h5部分修改 2019-03-01 18:40:54 +08:00
chenhui0212
ed846b66f6 收银台，h5部分修改 2019-03-01 18:39:35 +08:00
bentz
6e563b6e12 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-03-01 16:55:11 +08:00
bentz
9f418990df 首页渲染 2019-03-01 16:54:49 +08:00
chenhui0212
955846ed8a 充值页 2019-03-01 13:52:42 +08:00