ecshop/ECShopX_mobile-frontend
1
0
Fork 0
mirror of https://gitee.com/ShopeX/ECShopX_mobile-frontend synced 2026-08-15 01:46:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
125 Commits 1 Branch 45 Tags
71b7c2247e2cfaef8891aba9df9cdb9a2fe54f93
Commit Graph

125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chenhui0212
71b7c2247e 支付方式改组件 2019-03-15 11:19:03 +08:00
chenhui0212
ae3d768241 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-14 20:01:39 +08:00
chenhui0212
ea7093a2f6 图标补充 2019-03-14 20:01:34 +08:00
bentz
d32fd205b4 no message 2019-03-14 19:15:22 +08:00
bentz
bb95870096 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  积分抽奖
  qrcode 积分详情修改价格
 2019-03-14 19:01:16 +08:00
bentz
9e9cb741ea no message 2019-03-14 19:01:13 +08:00
chenhui0212
9751956236 积分抽奖 2019-03-14 19:00:00 +08:00
chenhui0212
1e273cb267 qrcode 积分详情修改价格 2019-03-14 18:31:25 +08:00
chenhui0212
1a94197085 qrcode 积分详情修改价格 2019-03-14 18:30:26 +08:00
bentz
948eb61a24 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  二维码,清除无用的log

# Conflicts:
#	src/pages/index/index.js
 2019-03-14 16:35:49 +08:00
bentz
efe6010adf 积分购买，req 2019-03-14 16:35:32 +08:00
chenhui0212
1576f9f7cc 二维码,清除无用的log 2019-03-14 11:28:52 +08:00
chenhui0212
958ab0c2d8 二维码,清除无用的log 2019-03-14 11:28:10 +08:00
bentz
dfae2ec0aa no message 2019-03-14 11:07:17 +08:00
bentz
f11c3cdd05 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  二维码
 2019-03-13 19:17:11 +08:00
bentz
9b258756d8 fix: tab bar当前高亮 2019-03-13 19:17:09 +08:00
chenhui0212
1c17368c27 二维码 2019-03-13 18:56:37 +08:00
chenhui0212
6a5df0d4b3 二维码 2019-03-13 18:56:01 +08:00
bentz
f8725ff3ea 请求错误拦截 2019-03-13 18:14:14 +08:00
bentz
b578bcd6a3 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-13 17:49:12 +08:00
bentz
a7213ea18a 订单列表 / 详情 2019-03-13 17:48:53 +08:00
chenhui0212
7f37800d6e 图形补充页面路径，添加积分抽奖页面 2019-03-13 16:47:38 +08:00
chenhui0212
76bc9aef23 图形，短信验证码；余额换积分；报错信息提示 2019-03-13 15:46:13 +08:00
bentz
14d1bdc67c Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  推荐订单，会员列表
 2019-03-13 10:03:35 +08:00
chenhui0212
cdcb08808f 推荐订单，会员列表 2019-03-12 21:13:49 +08:00
bentz
59dcfa0972 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
  地址
  44
  333

# Conflicts:
#	dist/project.config.json
#	src/pages/index/index.js
 2019-03-12 19:54:20 +08:00
bentz
07ab4ea45f no message 2019-03-12 19:53:40 +08:00
chenhui0212
866ddc362c Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-12 18:01:03 +08:00
chenhui0212
9be6b5450d 地址 2019-03-12 18:00:56 +08:00
bentz
c07c97577d 购物车，bug 2019-03-12 17:52:26 +08:00
chenhui0212
32fa5513a8 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-12 16:27:14 +08:00
chenhui0212
c78f01d035 44 2019-03-12 16:27:09 +08:00
bentz
e34aa17c19 ignore dist/ 2019-03-12 16:26:31 +08:00
bentz
f926ebb7c9 no message 2019-03-12 16:25:25 +08:00
bentz
49093257ec no message 2019-03-12 16:24:24 +08:00
chenhui0212
9f45c3772a 333 2019-03-12 16:10:50 +08:00
chenhui0212
96cb29e3f2 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-12 15:16:06 +08:00
bentz
825d2b00fa no message 2019-03-12 15:13:25 +08:00
chenhui0212
934441f122 Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin 2019-03-12 15:10:20 +08:00
bentz
5698ee9274 no message 2019-03-12 15:04:18 +08:00
bentz
42cb6b24ea no message 2019-03-12 14:59:31 +08:00
bentz
9701b13d58 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-12 14:55:14 +08:00
bentz
63ee3314b1 no message 2019-03-12 14:54:58 +08:00
chenhui0212
4c5e9c22b8 推荐首页，表单环境判断 2019-03-12 14:28:03 +08:00
chenhui0212
58197ace94 推荐首页，表单环境判断 2019-03-12 14:27:30 +08:00
bentz
4c0fb73e6f 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-12 14:26:20 +08:00
bentz
6a4abcd2a0 h5 compile 2019-03-12 14:24:50 +08:00
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