bentz
|
5b59b1b847
|
推广开启
|
2019-03-25 09:09:32 +08:00 |
|
bentz
|
44037f1198
|
no message
|
2019-03-22 21:01:37 +08:00 |
|
bentz
|
08ac0e90c6
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
地址bug修复
|
2019-03-22 20:56:37 +08:00 |
|
bentz
|
9d405c78fa
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
地址bug修复
地址bug修复
支付成功路径调整
# Conflicts:
# src/pages/member/index.js
|
2019-03-22 20:56:34 +08:00 |
|
chenhui0212
|
4abea7a7a4
|
地址bug修复
|
2019-03-22 20:52:07 +08:00 |
|
bentz
|
57bf1d1fde
|
no message
|
2019-03-22 20:50:08 +08:00 |
|
chenhui0212
|
e6d9d0631f
|
地址bug修复
|
2019-03-22 20:45:57 +08:00 |
|
chenhui0212
|
b96b75aead
|
地址bug修复
|
2019-03-22 20:44:45 +08:00 |
|
chenhui0212
|
3f19802830
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
|
2019-03-22 20:25:16 +08:00 |
|
chenhui0212
|
2e8c99c56a
|
支付成功路径调整
|
2019-03-22 20:25:08 +08:00 |
|
bentz
|
3598871d3e
|
compile
|
2019-03-22 19:40:49 +08:00 |
|
bentz
|
1966c1f2b3
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
个人中心充值
个人中心充值
# Conflicts:
# h5_dist/js/3.0f7f05b4.js
# h5_dist/js/app.js
# h5_dist/js/home_index.55cffa9f.js
# h5_dist/js/item_espier-detail.fda24251.js
# h5_dist/js/item_point-detail.39fc7f31.js
# h5_dist/js/member_point-draw-detail.a1f10cd0.js
# h5_dist/js/trade_refund.ea1b28c6.js
|
2019-03-22 18:46:59 +08:00 |
|
bentz
|
a560ec0a0d
|
no message
|
2019-03-22 18:44:06 +08:00 |
|
chenhui0212
|
ce275f70bd
|
个人中心充值
|
2019-03-22 18:44:05 +08:00 |
|
chenhui0212
|
0ab7ea09bb
|
个人中心充值
|
2019-03-22 18:32:34 +08:00 |
|
bentz
|
3bafc4882f
|
no message
|
2019-03-22 16:06:16 +08:00 |
|
bentz
|
8645b1d667
|
no message
|
2019-03-22 15:54:25 +08:00 |
|
bentz
|
8ac1c45002
|
compile
|
2019-03-22 14:56:37 +08:00 |
|
bentz
|
e925180213
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
头像
积分抽奖
积分抽奖
收银台loading
收银台loading
|
2019-03-22 14:53:48 +08:00 |
|
bentz
|
1d3143b351
|
fix购物车bug
|
2019-03-22 14:53:45 +08:00 |
|
chenhui0212
|
63b14a56fc
|
头像
|
2019-03-22 14:53:10 +08:00 |
|
chenhui0212
|
23df137739
|
积分抽奖
|
2019-03-22 14:35:51 +08:00 |
|
chenhui0212
|
587fc73428
|
积分抽奖
|
2019-03-22 13:56:10 +08:00 |
|
chenhui0212
|
17fc678f04
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
|
2019-03-22 13:50:37 +08:00 |
|
chenhui0212
|
7e6aa23801
|
收银台loading
|
2019-03-22 13:50:27 +08:00 |
|
bentz
|
cef911d8e9
|
no message
|
2019-03-22 13:48:42 +08:00 |
|
chenhui0212
|
cdfe5e90d7
|
收银台loading
|
2019-03-22 13:46:12 +08:00 |
|
bentz
|
0dd339b672
|
no message
|
2019-03-22 13:34:38 +08:00 |
|
bentz
|
ccb1d70895
|
no message
|
2019-03-22 13:22:18 +08:00 |
|
bentz
|
e5d27d6a5f
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
金额转换
注册以及地址修改
|
2019-03-22 13:19:26 +08:00 |
|
bentz
|
2de258a288
|
checkout && autologin
|
2019-03-22 13:19:23 +08:00 |
|
chenhui0212
|
548dbd7dba
|
金额转换
|
2019-03-22 11:35:51 +08:00 |
|
chenhui0212
|
b3004da2be
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
|
2019-03-22 11:19:12 +08:00 |
|
chenhui0212
|
a592b84fe8
|
注册以及地址修改
|
2019-03-22 11:19:00 +08:00 |
|
bentz
|
b7020ad63b
|
no message
|
2019-03-22 11:14:50 +08:00 |
|
bentz
|
9a271666cb
|
no message
|
2019-03-22 11:08:08 +08:00 |
|
bentz
|
c8bc3014b7
|
no message
|
2019-03-22 10:43:05 +08:00 |
|
bentz
|
f3945efd07
|
release
|
2019-03-21 21:50:22 +08:00 |
|
bentz
|
5e3190d864
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
* 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao:
pay修改
build h5
# Conflicts:
# h5_dist/chunk/cashier_cashier-result.js
# h5_dist/chunk/cashier_index.js
# h5_dist/chunk/home_index.js
# h5_dist/chunk/home_landing.js
# h5_dist/chunk/item_espier-detail.js
# h5_dist/chunk/item_point-detail.js
# h5_dist/chunk/member_address.js
# h5_dist/chunk/member_money-to-point.js
# h5_dist/chunk/member_pay.js
# h5_dist/chunk/member_point-draw-detail.js
# h5_dist/chunk/trade_detail.js
# h5_dist/chunk/trade_refund.js
# h5_dist/css/0.62f2457e.css
# h5_dist/css/0.9c817a03.css
# h5_dist/css/0.css
# h5_dist/css/11.62f2457e.css
# h5_dist/css/11.9c817a03.css
# h5_dist/css/12.62f2457e.css
# h5_dist/css/12.9c817a03.css
# h5_dist/css/13.62f2457e.css
# h5_dist/css/13.9c817a03.css
# h5_dist/css/14.62f2457e.css
# h5_dist/css/14.9c817a03.css
# h5_dist/css/15.62f2457e.css
# h5_dist/css/15.9c817a03.css
# h5_dist/css/16.62f2457e.css
# h5_dist/css/16.9c817a03.css
# h5_dist/css/17.62f2457e.css
# h5_dist/css/17.9c817a03.css
# h5_dist/css/18.62f2457e.css
# h5_dist/css/18.9c817a03.css
# h5_dist/css/19.62f2457e.css
# h5_dist/css/19.9c817a03.css
# h5_dist/css/20.62f2457e.css
# h5_dist/css/20.9c817a03.css
# h5_dist/css/21.62f2457e.css
# h5_dist/css/21.9c817a03.css
# h5_dist/css/22.62f2457e.css
# h5_dist/css/22.9c817a03.css
# h5_dist/css/23.62f2457e.css
# h5_dist/css/23.9c817a03.css
# h5_dist/css/24.62f2457e.css
# h5_dist/css/24.9c817a03.css
# h5_dist/css/25.62f2457e.css
# h5_dist/css/25.9c817a03.css
# h5_dist/css/26.62f2457e.css
# h5_dist/css/26.9c817a03.css
# h5_dist/css/27.62f2457e.css
# h5_dist/css/27.9c817a03.css
# h5_dist/css/28.62f2457e.css
# h5_dist/css/28.9c817a03.css
# h5_dist/css/29.62f2457e.css
# h5_dist/css/29.9c817a03.css
# h5_dist/css/30.62f2457e.css
# h5_dist/css/30.9c817a03.css
# h5_dist/css/31.62f2457e.css
# h5_dist/css/31.9c817a03.css
# h5_dist/css/32.62f2457e.css
# h5_dist/css/32.9c817a03.css
# h5_dist/css/33.62f2457e.css
# h5_dist/css/33.9c817a03.css
# h5_dist/css/34.62f2457e.css
# h5_dist/css/34.9c817a03.css
# h5_dist/css/35.62f2457e.css
# h5_dist/css/35.9c817a03.css
# h5_dist/css/36.62f2457e.css
# h5_dist/css/36.9c817a03.css
# h5_dist/css/37.62f2457e.css
# h5_dist/css/37.9c817a03.css
# h5_dist/css/38.62f2457e.css
# h5_dist/css/38.9c817a03.css
# h5_dist/css/39.62f2457e.css
# h5_dist/css/39.9c817a03.css
# h5_dist/css/40.62f2457e.css
# h5_dist/css/40.9c817a03.css
# h5_dist/css/41.62f2457e.css
# h5_dist/css/41.9c817a03.css
# h5_dist/css/42.62f2457e.css
# h5_dist/css/42.9c817a03.css
# h5_dist/css/43.62f2457e.css
# h5_dist/css/43.9c817a03.css
# h5_dist/css/5.62f2457e.css
# h5_dist/css/5.9c817a03.css
# h5_dist/css/6.62f2457e.css
# h5_dist/css/6.9c817a03.css
# h5_dist/css/7.62f2457e.css
# h5_dist/css/7.9c817a03.css
# h5_dist/css/8.62f2457e.css
# h5_dist/css/8.9c817a03.css
# h5_dist/css/9.62f2457e.css
# h5_dist/css/9.9c817a03.css
# h5_dist/css/app.62f2457e.css
# h5_dist/css/app.9c817a03.css
# h5_dist/css/app.css
# h5_dist/css/article_index.css
# h5_dist/css/auth_forgotpwd.css
# h5_dist/css/auth_login.css
# h5_dist/css/auth_reg.css
# h5_dist/css/cart_coupon-picker.css
# h5_dist/css/cart_espier-checkout.css
# h5_dist/css/cart_espier-index.css
# h5_dist/css/cashier_cashier-result.css
# h5_dist/css/cashier_index.css
# h5_dist/css/category_index.css
# h5_dist/css/home_index.css
# h5_dist/css/home_landing.css
# h5_dist/css/item_espier-detail.css
# h5_dist/css/item_list.css
# h5_dist/css/item_point-detail.css
# h5_dist/css/item_point-list.css
# h5_dist/css/member_address.css
# h5_dist/css/member_coupon.css
# h5_dist/css/member_favorite.css
# h5_dist/css/member_index.css
# h5_dist/css/member_money-to-point.css
# h5_dist/css/member_pay.css
# h5_dist/css/member_point-draw-detail.css
# h5_dist/css/member_point-draw-order.css
# h5_dist/css/member_point-draw.css
# h5_dist/css/member_point.css
# h5_dist/css/member_recharge.css
# h5_dist/css/member_recommend-member.css
# h5_dist/css/member_recommend-order.css
# h5_dist/css/member_recommend.css
# h5_dist/css/member_setting.css
# h5_dist/css/trade_after-sale.css
# h5_dist/css/trade_cancel.css
# h5_dist/css/trade_detail.css
# h5_dist/css/trade_list.css
# h5_dist/css/trade_refund-detail.css
# h5_dist/css/trade_refund-sendback.css
# h5_dist/css/trade_refund.css
# h5_dist/index.html
# h5_dist/js/4.53e92c4b.js
# h5_dist/js/article_index.75b60f6a.js
# h5_dist/js/auth_forgotpwd.a99388d5.js
# h5_dist/js/auth_login.8cc26087.js
# h5_dist/js/auth_reg.b4ea1b3a.js
# h5_dist/js/cart_coupon-picker.e647dd00.js
# h5_dist/js/cart_espier-checkout.0cce36f1.js
# h5_dist/js/cart_espier-checkout.9ad16325.js
# h5_dist/js/cart_espier-index.cd286d05.js
# h5_dist/js/cashier_cashier-result.0eb9e71a.js
# h5_dist/js/cashier_cashier-result.71060a5f.js
# h5_dist/js/cashier_index.136e14c3.js
# h5_dist/js/cashier_index.2be3744e.js
# h5_dist/js/category_index.5092d9a4.js
# h5_dist/js/home_index.63ecf5df.js
# h5_dist/js/home_index.c2e827fd.js
# h5_dist/js/home_landing.210182dc.js
# h5_dist/js/home_landing.ff22fc81.js
# h5_dist/js/item_espier-detail.97b24e27.js
# h5_dist/js/item_espier-detail.a413764b.js
# h5_dist/js/item_list.aaff5df7.js
# h5_dist/js/item_point-detail.547981ac.js
# h5_dist/js/item_point-detail.eeb52c0b.js
# h5_dist/js/item_point-list.718fd721.js
# h5_dist/js/member_address.e6a0acc5.js
# h5_dist/js/member_coupon.a659aa69.js
# h5_dist/js/member_favorite.fc123197.js
# h5_dist/js/member_index.36552224.js
# h5_dist/js/member_index.a6e3d344.js
# h5_dist/js/member_money-to-point.5a07953f.js
# h5_dist/js/member_pay.f2a49bc2.js
# h5_dist/js/member_point-draw-detail.6792cbc9.js
# h5_dist/js/member_point-draw-detail.983ab644.js
# h5_dist/js/member_point-draw-order.857c43a0.js
# h5_dist/js/member_point-draw.f545ad59.js
# h5_dist/js/member_point.6bd1acd5.js
# h5_dist/js/member_recharge.8d8f5a64.js
# h5_dist/js/member_recommend-member.bd097a6a.js
# h5_dist/js/member_recommend-order.8aab8664.js
# h5_dist/js/member_recommend.f9168d3e.js
# h5_dist/js/member_setting.0882aed7.js
# h5_dist/js/member_setting.0e00a3ee.js
# h5_dist/js/trade_after-sale.9ace72f6.js
# h5_dist/js/trade_after-sale.d0fd85fa.js
# h5_dist/js/trade_cancel.f9fc98ba.js
# h5_dist/js/trade_detail.834309ac.js
# h5_dist/js/trade_list.0dff1bd9.js
# h5_dist/js/trade_refund-detail.d2994176.js
# h5_dist/js/trade_refund-sendback.1510be69.js
# h5_dist/js/trade_refund.9158e1d5.js
# h5_dist/js/trade_refund.9cb45f3a.js
|
2019-03-21 20:29:30 +08:00 |
|
bentz
|
0be793b08c
|
no message
|
2019-03-21 20:26:47 +08:00 |
|
chenhui0212
|
84d865c9a4
|
Merge branch 'pinjinjin' of git.ishopex.cn:onex/espier-taro-fenxiao into pinjinjin
|
2019-03-21 20:21:41 +08:00 |
|
chenhui0212
|
fb5c6a575b
|
pay修改
|
2019-03-21 20:21:28 +08:00 |
|
bryantyan
|
8cb6caab12
|
build h5
|
2019-03-21 19:15:47 +08:00 |
|
bentz
|
e4c1036a95
|
no message
|
2019-03-21 18:33:40 +08:00 |
|
bentz
|
0798fa9ef3
|
no message
|
2019-03-21 18:30:59 +08:00 |
|
bentz
|
5180449030
|
fix 订单链接
|
2019-03-21 18:02:06 +08:00 |
|
bentz
|
840ab2e616
|
autologin bug fix
|
2019-03-21 18:00:02 +08:00 |
|
chenhui0212
|
9362851a9d
|
修改部分内容
|
2019-03-21 17:31:52 +08:00 |
|
chenhui0212
|
05ee1a2f82
|
修改部分内容
|
2019-03-21 17:29:07 +08:00 |
|
bentz
|
9b119e9cd5
|
h5 compile
|
2019-03-21 17:23:54 +08:00 |
|