lemon橪
|
78dc8a5e0b
|
合并Master
|
2021-06-28 18:17:19 +08:00 |
|
lemon橪
|
3e54f24ddd
|
merge master
|
2021-06-28 18:16:41 +08:00 |
mabo
|
cb14b13c19
|
管理端，添加店铺，选择会员失败问题
|
2021-06-28 18:14:53 +08:00 |
|
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 |
|
lemon橪
|
37b873ecce
|
修改当首页空数据显示问题
|
2021-06-28 15:12:50 +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 |
chopper711
|
cfe9b07fe8
|
!3 会员消息合并，充值页面参数基本校验合并
Merge pull request !3 from chopper711/qiuqiu
|
2021-06-28 01:49:06 +00:00 |
pikachu
|
f436d17735
|
修改资金管理接口
|
2021-06-26 16:49:44 +08:00 |
|
pikachu
|
d7434f3e4a
|
Merge branch 'qiuqiu' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into qiuqiu
|
2021-06-26 11:23:45 +08:00 |
|
pikachu
|
f0914960a4
|
update buyer/src/components/header/Header.vue.
|
2021-06-26 03:23:26 +00:00 |
|
pikachu
|
c6e8545a03
|
Merge branch 'dev-ryan' into qiuqiu
|
2021-06-26 11:19:40 +08:00 |
|
pikachu
|
7d5e1811ab
|
Merge branch 'master' into dev-ryan
|
2021-06-26 11:19:15 +08: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
|
c673ab2b5e
|
no message
|
2021-06-25 19:05:47 +08:00 |
|
mabo
|
b61f5e47df
|
添加分类id
|
2021-06-25 19:03:47 +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
|
7112f4cd49
|
Merge branch 'ma'
|
2021-06-25 16:24:52 +08:00 |
|
mabo
|
b3863568d6
|
虚拟商品下单
|
2021-06-25 16:24:38 +08:00 |
|
mabo
|
830cc3e83c
|
Merge branch 'master' into ma
|
2021-06-25 16:03:21 +08:00 |
|
mabo
|
be611871bc
|
修改发布商品格式
|
2021-06-25 16:03:10 +08:00 |
|
mabo
|
73246e1dc6
|
PC端bug修改
|
2021-06-25 15:28:31 +08:00 |
|
mabo
|
0a11a25ccd
|
发布商品小修改
|
2021-06-25 11:37:54 +08:00 |
|
mabo
|
bb51771898
|
发布商品页面bug修改
|
2021-06-25 11:29:48 +08:00 |
|
mabo
|
712e3cd2f2
|
Merge branch 'ma' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into ma
|
2021-06-24 18:36:12 +08:00 |
|
mabo
|
532cbc943d
|
发布商品回显问题
|
2021-06-24 18:36:08 +08:00 |
|
Chopper
|
854a04d7f4
|
商品参数分组名称展示
|
2021-06-24 18:23:29 +08:00 |
|
Chopper
|
d645f4ea6b
|
商品参数问题处理，参数回显
|
2021-06-24 17:46:45 +08:00 |
|
mabo
|
9ef1761c63
|
虚拟商品不展示重量
|
2021-06-24 17:45:00 +08:00 |
|
Chopper
|
3cb1edee83
|
参数相关问题处理
|
2021-06-24 17:44:43 +08:00 |
|
mabo
|
e0a7bb86a6
|
模板
|
2021-06-24 17:13:26 +08:00 |
|
mabo
|
84f3eaea10
|
商品模板修改
|
2021-06-24 16:41:04 +08:00 |
|
mabo
|
7b2054206a
|
Merge branch 'master' into ma
|
2021-06-24 15:56:48 +08:00 |
|
mabo
|
dbd3bb6124
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
|
2021-06-24 15:56:33 +08:00 |
|
mabo
|
39fd76ebdc
|
规格项修改
|
2021-06-24 15:56:20 +08:00 |