55 Commits

Author SHA1 Message Date
mabo
6887b6c624 issues上bug修改 2021-07-01 16:02:12 +08:00
mabo
f7167912e7 商品sku只展示一个问题 2021-06-30 17:41:24 +08:00
mabo
c9e58f3586 修改bug 2021-06-30 15:51:14 +08:00
mabo
18bfa0edef 滑块验证优化 2021-06-29 14:58:07 +08:00
pikachu
338994fb45 对接会员消息 2021-06-29 08:30:39 +08:00
pikachu
995b0d65fb 对接会员消息 2021-06-29 08:25:02 +08:00
mabo
20e4662961 管理端店铺经纬度改为店铺定位 2021-06-28 17:07:48 +08:00
mabo
2f6380da22 bug修改 2021-06-28 15:47:42 +08:00
mabo
10fc7d4dd0 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
# Conflicts:
#	manager/src/config/index.js
#	seller/src/config/index.js
2021-06-28 11:25:30 +08:00
mabo
c3bd727694 店铺入驻bug修改 2021-06-28 11:23:22 +08:00
Chopper
510cf963a2 对没有支付方式的充值进行一下过滤 2021-06-28 10:15:57 +08:00
Chopper
081d251594 充值方式字段描述 2021-06-28 10:07:46 +08:00
pikachu
f436d17735 修改资金管理接口 2021-06-26 16:49:44 +08:00
mabo
c71da0b437 Merge branch 'ma' 2021-06-25 18:47:48 +08:00
mabo
1b2f6e221e 充值功能 2021-06-25 18:47:16 +08:00
mabo
974cc504d9 Merge branch 'ma' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into ma 2021-06-25 18:31:58 +08:00
mabo
31c585bcaf 添加余额支付 2021-06-25 18:31:55 +08:00
Chopper
0adbde45b9 充值功能支付跳转 2021-06-25 18:30:30 +08:00
mabo
4160ebe004 虚拟商品售后,商品详情参数 2021-06-25 17:36:00 +08:00
Chopper
b48acb9691 Merge branch 'ma' of gitee.com:beijing_hongye_huicheng/lilishop-ui into ma 2021-06-25 17:31:27 +08:00
Chopper
75d4fda92d 增加pc余额支付功能。增加倒计时 2021-06-25 17:31:12 +08:00
mabo
b3863568d6 虚拟商品下单 2021-06-25 16:24:38 +08:00
mabo
73246e1dc6 PC端bug修改 2021-06-25 15:28:31 +08:00
mabo
f8f205d0e8 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-06-23 18:19:47 +08:00
mabo
31295d7cb2 我的订单,去掉用户名展示 2021-06-23 18:18:38 +08:00
lemon橪
b7dd7f1c3b 合并master上面的冲突 2021-06-23 18:13:11 +08:00
lemon橪
2391f71d9a 修改部分页面ui以及bug 2021-06-23 18:08:22 +08:00
mabo
f2f2984c3e bug修改 2021-06-23 16:49:35 +08:00
mabo
a1fd5be5c4 修改立即购买按钮一直加载bug 2021-06-23 10:45:05 +08:00
lemon橪
35094a7ac2 合并冲突 2021-06-21 14:30:06 +08:00
Chopper
d57b33cb4e Merge branch 'dev-ryan'
# Conflicts:
#	buyer/src/components/header/Header.vue
#	buyer/src/components/invoiceModal/index.vue
#	manager/src/config/index.js
2021-06-21 14:26:47 +08:00
lemon橪
d9368b7514 商品分类修改绑定规格八阿哥 2021-06-18 17:11:18 +08:00
lemon橪
336643419e 解决商品分类不同步数据问题,解决pc端添加发票问题 2021-06-18 14:52:40 +08:00
lemon橪
99ae898139 解决pc端个人中心跳转问题 2021-06-17 15:24:34 +08:00
lemon橪
c158874c31 合并master 2021-06-17 11:45:53 +08:00
Chopper
7711e5ca7b 用户名展示修改为用户昵称 2021-06-16 17:55:05 +08:00
mabo
4ef8287802 添加注释 2021-06-03 18:02:26 +08:00
mabo
f97282ad44 添加注释 2021-06-03 17:32:38 +08:00
mabo
e1c14af914 添加买家端注释 2021-06-03 16:17:11 +08:00
mabo
411f36150b 积分商城,站内信 2021-05-31 18:03:48 +08:00
mabo
78bd4021a6 api修改 2021-05-28 18:05:38 +08:00
mabo
6780654aae im对接,修改bug 2021-05-28 17:25:07 +08:00
mabo
882e222c5a 商品选择器回显 2021-05-24 18:14:06 +08:00
mabo
05d35c3974 一些bug修改 2021-05-21 17:46:29 +08:00
mabo
b1b587a50c bug修改 2021-05-21 10:24:56 +08:00
mabo
7c8d071c97 bug修改 2021-05-19 18:22:17 +08:00
mabo
030adb7ae6 修改bug,商家端添加商品,选择运费模板 2021-05-19 14:10:05 +08:00
mabo
6d0e7b3825 修改bug,更改字体图标 2021-05-18 18:03:00 +08:00
Chopper
c63e44793c radio全局样式调整 2021-05-17 18:07:19 +08:00
mabo
eeb2e94d52 所有页面res.code替换为res.success 2021-05-17 16:04:36 +08:00