55 Commits

Author SHA1 Message Date
lemon橪
0cbcb4d37a 修改商家端商品发布样式问题,修改楼层装修pc端出现的问题,修改品牌中出现的bug 2021-06-17 11:40:27 +08:00
Chopper
b7a2a681c2 商家端商品列表展示宽度优化 2021-06-09 09:32:25 +08:00
Chopper
99f4634ef7 物流模版展示问题处理 2021-06-08 14:45:04 +08:00
Chopper
b543ff8278 宽度调整 2021-06-08 11:33:06 +08:00
mabo
43b4c041e4 发布商品可以删除模板 2021-06-03 17:37:36 +08:00
Chopper
011bcae11a 店铺对账状态默认值问题处理 2021-06-03 16:42:13 +08:00
Chopper
d86b5c609b 消息提示中,跳转核对商家账单页面错误问题处理 2021-06-02 17:43:31 +08:00
Chopper
3b113e2039 付款笔数字段读取错误处理 2021-06-02 10:33:47 +08:00
Chopper
5f5e24638b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui 2021-06-01 08:53:37 +08:00
Chopper
b9aa8336f9 订单展示来源问题 2021-06-01 08:53:33 +08:00
mabo
0df88e08e4 table不随屏幕改变尺寸问题 2021-05-27 16:37:00 +08:00
mabo
087ffe230d 商品选择器组件修改,菜单栏调整 2021-05-27 10:32:05 +08:00
mabo
f5786e46c3 运费模板配置 2021-05-26 10:30:08 +08:00
mabo
ff85c3f68f 运费模板修改 2021-05-25 18:58:55 +08:00
mabo
c9c6b1d690 Merge branch 'dev-ryan' into ma 2021-05-25 18:37:55 +08:00
mabo
978db4e624 配送模板修改 2021-05-25 18:37:29 +08:00
lemon橪
020ddf0588 合并master 2021-05-25 14:27:45 +08:00
lemon橪
e5dbd18bf3 小程序直播部分,暂未写完 2021-05-25 14:27:18 +08:00
mabo
7e668cc6d5 管理端,商品回显修改 2021-05-25 14:26:48 +08:00
mabo
882e222c5a 商品选择器回显 2021-05-24 18:14:06 +08:00
mabo
44c88468d4 Merge branch 'ma'
# Conflicts:
#	manager/src/config/index.js
2021-05-21 17:47:48 +08:00
mabo
05d35c3974 一些bug修改 2021-05-21 17:46:29 +08:00
lemon橪
9e9abe9e1e Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-05-21 16:56:51 +08:00
lemon橪
41093b2032 修改一些bug完善,新增app更新新功能 2021-05-21 16:45:47 +08:00
mabo
ae730cacf3 Merge branch 'dev-ryan' into ma 2021-05-21 10:47:12 +08:00
mabo
f31ac92bb9 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
# Conflicts:
#	seller/src/config/index.js
2021-05-21 10:25:55 +08:00
mabo
b1b587a50c bug修改 2021-05-21 10:24:56 +08:00
pikachu
3c0555c815 参数为空校验 2021-05-20 19:14:38 +08:00
pikachu
f625a7e056 参数为空校验 2021-05-20 19:09:21 +08:00
lemon橪
38dc952a07 合并master 2021-05-20 11:11:56 +08:00
lemon橪
92aa9fccaf 修改一些可见的bug,优化运费模板中地址选择问题 2021-05-20 11:09:51 +08:00
pikachu
63c559c8be 折叠面板展示问题 2021-05-20 09:57:57 +08:00
pikachu
697e4820a4 去掉商品参数的一些信息 2021-05-20 08:29:32 +08:00
pikachu
8971996731 chushihua 2021-05-19 19:28:44 +08:00
mabo
7c8d071c97 bug修改 2021-05-19 18:22:17 +08:00
mabo
cca4245316 发布商品,运费模板设置 2021-05-19 14:45:04 +08:00
mabo
030adb7ae6 修改bug,商家端添加商品,选择运费模板 2021-05-19 14:10:05 +08:00
mabo
6d0e7b3825 修改bug,更改字体图标 2021-05-18 18:03:00 +08:00
mabo
c3ed622031 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
# Conflicts:
#	seller/src/config/index.js
2021-05-17 18:13:56 +08:00
mabo
70686e45d2 修改浏览器页签名称,发布商品页面bug 2021-05-17 18:13:30 +08:00
Chopper
c63e44793c radio全局样式调整 2021-05-17 18:07:19 +08:00
Chopper
3d1391e305 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui 2021-05-17 17:42:56 +08:00
mabo
da5cc8335f 修改管理端bug 2021-05-17 17:38:04 +08:00
mabo
eeb2e94d52 所有页面res.code替换为res.success 2021-05-17 16:04:36 +08:00
Chopper
a3953b9ab5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
# Conflicts:
#	manager/vue.config.js
#	seller/vue.config.js
2021-05-17 15:41:08 +08:00
Chopper
dc0cb5a76c 修改部分端口号,修改局域网ip 2021-05-17 15:40:02 +08:00
mabo
a4f2fc1381 店铺入驻bug修改 2021-05-17 15:38:31 +08:00
mabo
9df8a753d4 bug修改 2021-05-17 10:34:54 +08:00
Chopper
cd86e1de22 调整页面布局 2021-05-17 08:58:35 +08:00
mabo
fd4af5690e Merge branch 'dev-ryan' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into dev-ryan 2021-05-14 17:51:10 +08:00