zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
707 Commits
1 Branch
0 Tags
18 MiB
Commit Graph

324 Commits (9d7a06e867dd8001cde07ac06f2ca54cc1e059eb)

Author SHA1 Message Date
mabo 07f41f5cb6 pc商品列表样式修改，商家注释添加，订单统计，退订单按钮样式 2021-07-16 17:57:24 +08:00
mabo 133febe7a7 代码注释添加 2021-07-15 10:19:56 +08:00
mabo 0499a9c237 批量上传、添加注释 2021-07-14 18:00:59 +08:00
mabo 0fd4645514 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 
# Conflicts:
#	seller/src/config/index.js
 2021-07-13 18:16:10 +08:00
mabo 0e277a8e6d 前端首页下拉样式，头部样式，seller端批量上传 2021-07-13 18:15:32 +08:00
lemon橪 ca8d518fae 修改物流请求 2021-07-12 18:37:42 +08:00
mabo 4c0aec2f42 文章分类，订单列表，商品分类，收款记录等页面bug修改 2021-07-09 17:58:31 +08:00
mabo 7331fcbb17 Merge branch 'ma' 2021-07-09 15:21:28 +08:00
mabo f5faad982c 发布商品代码拆分完成，管理端订单设置修改 2021-07-09 15:04:02 +08:00
mabo 48c0dcb69b bug修改 2021-07-08 14:36:05 +08:00
mabo 0504592f7d 拆分代码 2021-07-08 09:24:42 +08:00
mabo 9ff4197ec4 no message 2021-07-07 17:45:38 +08:00
mabo c835616ad2 Merge branch 'master' into ma 
# Conflicts:
#	buyer/src/components/goodsDetail/ShowGoodsDetail.vue
#	buyer/src/config/index.js
#	seller/src/views/goods/goods-seller/goodsOperation.vue
 2021-07-07 16:14:23 +08:00
mabo e5449213c2 no message 2021-07-07 16:12:55 +08:00
mabo 872a5d1982 左侧菜单选中设置 2021-07-07 16:03:48 +08:00
mabo 1246810c01 bug修改 2021-07-07 15:34:38 +08:00
mabo fc393ecd64 部分bug修改 2021-07-05 17:53:23 +08:00
mabo 9b9295ea94 拆分发布商品代码 2021-07-05 16:08:12 +08:00
mabo c403fce786 no message 2021-07-02 18:04:17 +08:00
mabo 31349634f6 Merge branch 'master' into ma 
# Conflicts:
#	seller/src/views/goods/goods-seller/goodsOperation.vue
 2021-07-02 17:38:14 +08:00
mabo cc1afed902 分销提现，滑块验证bug修改 2021-07-02 16:45:52 +08:00
mabo 3a76ba2c1f 发布文章图片不回显，发布商品不选类型可以点下一步 2021-07-02 14:26:01 +08:00
mabo da330b80c8 Merge branch 'master' into ma 2021-07-02 10:33:34 +08:00
mabo 1028b8189e 导出待发货订单 2021-07-02 10:32:15 +08:00
mabo 6988ad8bf0 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-07-02 09:50:28 +08:00
mabo e318fe5be0 pc首页margin问题 2021-07-02 09:50:25 +08:00
lemon橪 4166a1ca58 合并master 2021-07-02 09:38:07 +08:00
lemon橪 35ea8adf7d 解决配送地址选择不回显bug 2021-07-02 09:37:46 +08:00
mabo be2280907e 导出待发货订单 2021-07-02 09:10:53 +08:00
mabo 6100f1e39a 商品参数修改 2021-07-01 17:00:52 +08:00
mabo 5368f3c323 发布商品，选择模板后跳到商品编辑页面 2021-07-01 16:32:41 +08:00
mabo be1a05e566 Revert "no message" 
This reverts commit 0a02195ca6.
 2021-07-01 16:04:06 +08:00
mabo 0a02195ca6 no message 2021-07-01 16:03:59 +08:00
mabo 6887b6c624 issues上bug修改 2021-07-01 16:02:12 +08:00
mabo 14feac43fe Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-06-30 15:51:18 +08:00
mabo c9e58f3586 修改bug 2021-06-30 15:51:14 +08:00
Chopper e8809bbeb8 镜像脚本更新 2021-06-30 14:54:24 +08:00
mabo e493f26442 拆分发布商品代码 2021-06-29 17:53:50 +08:00
mabo f973cadd80 Merge branch 'master' into ma 2021-06-29 15:29:59 +08:00
mabo 5143f2b83f 添加滑块验证注释 2021-06-29 15:24:16 +08:00
mabo b728e340a0 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-06-29 14:58:10 +08:00
mabo 18bfa0edef 滑块验证优化 2021-06-29 14:58:07 +08:00
lemon橪 f87306f6de 合并master 2021-06-29 12:00:05 +08:00
lemon橪 7a080124c6 新增会员提现功能 2021-06-29 11:59:45 +08:00
mabo 9fbc61f742 拆分商品发布代码 2021-06-29 11:50:37 +08:00
mabo 346c753670 代码格式调整 2021-06-29 10:44:25 +08:00
mabo a8aa73760f Merge branch 'ma' 2021-06-29 09:28:36 +08:00
mabo ebaa75ed15 管理端上架问题，批量设置物流模板 2021-06-29 09:28:21 +08:00
mabo 5ea61a160e Merge branch 'ma' 2021-06-28 18:54:09 +08:00
mabo 25176c36fb 发布商品，商品图片拖拽改变位置 2021-06-28 18:53:57 +08:00
lemon橪 78dc8a5e0b 合并Master 2021-06-28 18:17:19 +08:00
lemon橪 3e54f24ddd merge master 2021-06-28 18:16:41 +08:00
mabo 1e6e7c123c 修改添加商品拖拽改变位置 2021-06-28 18:14:00 +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 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
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 1b2f6e221e 充值功能 2021-06-25 18:47:16 +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 532cbc943d 发布商品回显问题 2021-06-24 18:36:08 +08:00
Chopper d645f4ea6b 商品参数问题处理，参数回显 2021-06-24 17:46:45 +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 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
lemon橪 75ca4de9e1 合并master 2021-06-24 10:35:51 +08:00
lemon橪 4133badc46 修改后台小程序直播查看问题，新增只有自营店可以赠送积分 2021-06-24 10:32:51 +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 4d7b4eb2b4 发布商品修改 2021-06-23 18:19:43 +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
lifenlong 6bc0591418 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-06-23 17:40:44 +08:00
lifenlong 6d94b6fbdc 秒杀活动，状态展示 2021-06-23 17:40:34 +08:00
mabo 752d967a50 修改规格接口 2021-06-23 16:58:15 +08:00
mabo 5d78241b8e Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2021-06-23 16:49:39 +08:00
mabo f2f2984c3e bug修改 2021-06-23 16:49:35 +08:00
lifenlong c326431407 商品列表，状态展示优化 2021-06-23 11:46:38 +08:00
lifenlong d5c96f66ce 优化店铺后台状态展示 2021-06-23 11:34:56 +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
lemon橪 bce709a57a 解决运营后台出现的bug 2021-06-22 18:11:23 +08:00
Chopper 3b922839a1 商品列表问题展示搜索字段，展示商品类型 2021-06-22 14:59:20 +08:00
lemon橪 9586eedb56 合并master 2021-06-21 18:12:17 +08:00
lemon橪 d89b984344 修改直播间时间没有判断bug,店铺后台，批量发货没有跳转bug,直播后台添加小程序直播，前台显示小程序直播 2021-06-21 18:11:46 +08:00
Chopper 4a6fd431bc 特殊情况下会报错问题处理 2021-06-21 16:03:23 +08:00
Chopper 597af1a210 保存json excel问题 2021-06-21 14:35:33 +08:00
lemon橪 c3be931218 提交批量发货没有跳转的Bug 2021-06-21 14:15:52 +08:00
pikachu 85bfb48c0c 第三部完成不能手动点击 2021-06-20 10:32:35 +08:00
pikachu 861c7f905a 订单区分商品订单和虚拟订单 2021-06-19 16:25:17 +08:00
pikachu be42bfcf40 虚拟订单和商品订单区分开 2021-06-19 16:10:55 +08:00
lemon橪 c158874c31 合并master 2021-06-17 11:45:53 +08:00
lemon橪 0cbcb4d37a 修改商家端商品发布样式问题，修改楼层装修pc端出现的问题，修改品牌中出现的bug 2021-06-17 11:40:27 +08:00
lemon橪 ab53a1ecc2 推荐直播间，修改部分代码，新增劵活动一些部分 2021-06-16 18:21:11 +08:00
lemon橪 f73bdce1a1 合并分支ma 2021-06-16 09:08:44 +08:00
Chopper 7de01626b8 商家端优惠券活动联动 2021-06-15 18:09:57 +08:00
lemon橪 a59ae41108 后台商家端批量发货下载以及上传excel 2021-06-13 17:56:16 +08:00
lemon橪 0837f5d9d9 优化一些功能 2021-06-11 19:01:05 +08:00
lemon橪 e71ae35b17 合并master 2021-06-11 09:52:05 +08:00
lemon橪 c9ea7ba898 优化部分样式问题，新增部分功能，解决发现的bug，暂未完全测试通过。 2021-06-10 18:31:54 +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
lemon橪 8b3d19625f 合并master 2021-06-07 11:50:44 +08:00
lemon橪 70f0bafd21 合并ma 2021-06-04 17:36:30 +08:00
lemon橪 40bf9781b1 修改一些发现的问题，新增秒杀活动设置，优惠券动态时间 以及 精准发圈用户和小程序直播页面 2021-06-04 17:35:59 +08:00
mabo 43b4c041e4 发布商品可以删除模板 2021-06-03 17:37:36 +08:00
mabo f97282ad44 添加注释 2021-06-03 17:32:38 +08:00
Chopper 011bcae11a 店铺对账状态默认值问题处理 2021-06-03 16:42:13 +08:00
mabo 7f5d2b41d5 Merge branch 'dev-ryan' into ma 2021-06-03 16:17:40 +08:00
mabo 33ec809e73 管理、商家添加登录图片验证 2021-06-03 14:35:19 +08:00
lemon橪 3eee6b35e8 合并ma分支解决冲突 2021-06-03 11:51:39 +08:00
lemon橪 d55d53528e c 2021-06-03 11:47:34 +08:00
mabo 65cb7787a6 Merge branch 'master' into ma 2021-06-03 09:16:29 +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 6780654aae im对接，修改bug 2021-05-28 17:25:07 +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
lemon橪 66ac29de48 优化管理平台移动端楼层装修样式以及默认属性 2021-05-14 17:48:41 +08:00
mabo f2c2734b15 商家端保存商品列表筛选条件 2021-05-14 17:28:01 +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