mabo
|
edcaa2421b
|
no message
|
2021-06-28 17:12:18 +08:00 |
|
mabo
|
20e4662961
|
管理端店铺经纬度改为店铺定位
|
2021-06-28 17:07:48 +08:00 |
|
mabo
|
2f6380da22
|
bug修改
|
2021-06-28 15:47:42 +08:00 |
|
mabo
|
b748f467aa
|
修改api地址
|
2021-06-28 11:26:30 +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
|
e14ecef05a
|
no message
|
2021-06-28 11:24:06 +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 |
|
pikachu
|
f0914960a4
|
update buyer/src/components/header/Header.vue.
|
2021-06-26 03:23:26 +00:00 |
|
pikachu
|
3c83cc9f50
|
合并分支
|
2021-06-26 11:15:23 +08:00 |
lemon橪
|
e1000d324e
|
合并分支
|
2021-06-25 19:15:45 +08:00 |
|
lemon橪
|
3cb3fd81e7
|
修改一些看到的bug以及功能上的问题
|
2021-06-25 19:15:27 +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
|
9ef1761c63
|
虚拟商品不展示重量
|
2021-06-24 17:45:00 +08:00 |
|
mabo
|
39fd76ebdc
|
规格项修改
|
2021-06-24 15:56:20 +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
|
eb5816ff80
|
Merge branch 'dev-ryan'
# Conflicts:
# buyer/src/plugins/request.js
|
2021-06-23 10:48:54 +08:00 |
|
mabo
|
a1fd5be5c4
|
修改立即购买按钮一直加载bug
|
2021-06-23 10:45:05 +08:00 |
|
lemon橪
|
b566a2fd4f
|
合并分支
|
2021-06-22 18:11:41 +08:00 |
|
Chopper
|
8e239a5bbf
|
token 解析问题处理
|
2021-06-22 17:36:07 +08:00 |
|
lemon橪
|
2b85a5aba1
|
合并冲突
|
2021-06-21 14:32:07 +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 |
|
pikachu
|
0b64122c41
|
合并
|
2021-06-19 14:51:45 +08:00 |
|
lemon橪
|
d9368b7514
|
商品分类修改绑定规格八阿哥
|
2021-06-18 17:11:18 +08:00 |
|
Chopper
|
c4cc078680
|
分类信息缓存更新时间设定
|
2021-06-18 17:06:25 +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橪
|
0106bc7b75
|
合并master
|
2021-06-17 11:59:27 +08:00 |
|
lemon橪
|
d72ce4109d
|
解决buyer端商品详情没有发送token
|
2021-06-17 11:58:56 +08:00 |
|
lemon橪
|
c158874c31
|
合并master
|
2021-06-17 11:45:53 +08:00 |
|
Chopper
|
7711e5ca7b
|
用户名展示修改为用户昵称
|
2021-06-16 17:55:05 +08:00 |
|
lemon橪
|
0837f5d9d9
|
优化一些功能
|
2021-06-11 19:01:05 +08:00 |
|
lemon橪
|
c9ea7ba898
|
优化部分样式问题，新增部分功能，解决发现的bug，暂未完全测试通过。
|
2021-06-10 18:31:54 +08:00 |
|
mabo
|
4ef8287802
|
添加注释
|
2021-06-03 18:02:26 +08:00 |