abu/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
326 Commits 1 Branch 0 Tags
Commit Graph

196 Commits

Author SHA1 Message Date
Chopper
35af0f2744 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui 
# Conflicts:
#	manager/src/views/promotion/coupon/coupon.vue
#	seller/src/views/promotion/coupon/coupon.vue
 2021-05-24 15:45:46 +08:00
Chopper
5d393cbb06 调整页面细节 2021-05-24 15:44:50 +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
lemon橪
38dc952a07 合并master 2021-05-20 11:11:56 +08:00
lemon橪
92aa9fccaf 修改一些可见的bug，优化运费模板中地址选择问题 2021-05-20 11:09:51 +08:00
pikachu
b190a443be 修改参数中是否必填和索引选中问题 2021-05-20 09:45:59 +08:00
pikachu
5e52e7f157 修改参数展示 2021-05-20 09:23:20 +08:00
Chopper
530fd30cc2 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui 2021-05-20 09:17:51 +08:00
pikachu
d927eaadf7 去掉参数参数类型 2021-05-20 08:30:40 +08:00
Chopper
9ce380e5da 店铺详情查看，如果还未设置结算周期无法展示问题处理 2021-05-19 20:22:28 +08:00
mabo
7c8d071c97 bug修改 2021-05-19 18:22:17 +08:00
mabo
030adb7ae6 修改bug，商家端添加商品，选择运费模板 2021-05-19 14:10:05 +08:00
lemon橪
e359e674cf 合并master 2021-05-19 09:51:27 +08:00
mabo
95d0d4032f Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-05-18 18:03:05 +08:00
mabo
6d0e7b3825 修改bug，更改字体图标 2021-05-18 18:03:00 +08:00
lemon橪
3efefc4c02 解决发送短信的问题 2021-05-18 18:02:25 +08:00
Chopper
76697f6a92 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui 2021-05-18 14:18:24 +08:00
Chopper
d32ea4f1ce 增加商品索引初始化功能 2021-05-18 14:18:08 +08:00
lemon橪
9dfc3a1eba Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into dev-ryan 2021-05-18 14:02:50 +08:00
lemon橪
239ce64e9c 短信签名图片上传样式优化 2021-05-18 09:28:16 +08:00
lemon橪
9a7422b107 修改管理端上传地址错误 2021-05-17 18:18:24 +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
c457f6abc9 属性复用问题处理 2021-05-17 18:08:32 +08:00
Chopper
c63e44793c radio全局样式调整 2021-05-17 18:07:19 +08:00
Chopper
a0eaff276b 店铺自营状态问题处理 2021-05-17 17:43:45 +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
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
lemon橪
66ac29de48 优化管理平台移动端楼层装修样式以及默认属性 2021-05-14 17:48:41 +08:00
mabo
f2c2734b15 商家端保存商品列表筛选条件 2021-05-14 17:28:01 +08:00
mabo
b6b45926f9 添加注释 2021-05-14 12:01:24 +08:00
mabo
a2752a731d 添加注释，删除无用代码 2021-05-13 18:09:36 +08:00
Chopper
5cb4af0498 配置镜像环境 2021-05-13 15:49:20 +08:00
Chopper
ec3e958037 commit message 2021-05-13 10:56:04 +08:00