Commit Graph

276 Commits

Author SHA1 Message Date
DESKTOP-GMUNQ1B\k 555571fb6b 添加统计页面 2024-03-08 11:09:34 +08:00
weipengfei 6bd808e693 更新 2024-03-07 16:49:34 +08:00
weipengfei 160b4a1ce5 修复bug 2024-03-07 16:46:49 +08:00
weipengfei 423e9b8344 调整功能 2024-03-07 15:48:08 +08:00
weipengfei 350104072f 市供应链新增供货采购 2024-03-07 15:31:09 +08:00
DESKTOP-GMUNQ1B\k 84de1246dd 1 2024-03-06 17:37:28 +08:00
DESKTOP-GMUNQ1B\k 4b0c36de96 跳转提现页面 2024-03-06 15:08:21 +08:00
weipengfei bbdea6153c Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet 2024-03-06 13:39:58 +08:00
weipengfei ca3f5a1114 更新 2024-03-06 13:39:54 +08:00
DESKTOP-GMUNQ1B\k 674e5bcb66 1 2024-03-06 13:37:30 +08:00
DESKTOP-GMUNQ1B\k 6609db102c 1 2024-03-06 10:33:55 +08:00
DESKTOP-GMUNQ1B\k 0553b46afe 提现金额不一致修改 2024-03-06 10:27:55 +08:00
weipengfei 668eacbe7d 更新 2024-03-05 17:46:58 +08:00
weipengfei a960151c3f 更新 2024-03-05 17:42:44 +08:00
weipengfei cd95a0bcfd 更新 2024-03-04 11:05:04 +08:00
weipengfei 1906683333 更新 2024-03-01 18:05:17 +08:00
weipengfei 96662a1c90 Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet 2024-03-01 17:06:55 +08:00
weipengfei 0dd1e510c2 更新 2024-03-01 17:06:50 +08:00
DESKTOP-GMUNQ1B\k 2647831d12 界面调整 2024-03-01 10:16:23 +08:00
weipengfei c9e220cd96 更新 2024-02-29 21:41:58 +08:00
weipengfei c6bbbe7b1b 修复bug 2024-02-29 20:41:00 +08:00
weipengfei 7ad3fe39c5 Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet 2024-02-29 20:36:33 +08:00
weipengfei 0f2e15d0aa 新增补贴进度 2024-02-29 20:36:05 +08:00
DESKTOP-GMUNQ1B\k 435626d00a 面对面扫码 2024-02-29 20:35:06 +08:00
DESKTOP-GMUNQ1B\k 15cceb57e2 面对面收款 2024-02-29 14:13:50 +08:00
weipengfei ea230c3316 更新 2024-02-29 14:08:42 +08:00
weipengfei 202ee3cb6e 更新 2024-02-28 17:43:38 +08:00
weipengfei ea8b5cdaae 更新 2024-02-27 14:08:54 +08:00
weipengfei 8aa1c65cf0 更新 2024-02-27 10:31:08 +08:00
weipengfei fd0a26cf25 更新 2024-02-26 17:57:07 +08:00
weipengfei 4904f810c4 更新 2024-02-20 15:12:52 +08:00
weipengfei c85dc6501d 更新 2024-02-05 17:50:08 +08:00
weipengfei 71defb6b5e 更新 2024-02-03 17:20:59 +08:00
weipengfei 02c54ad684 更新 2024-02-02 13:48:45 +08:00
weipengfei e8a78e457d 更新 2024-01-26 11:20:18 +08:00
weipengfei 2d88fe3e6a 更新 2024-01-18 18:45:06 +08:00
weipengfei d3e8fe6c96 更新 2024-01-18 17:43:09 +08:00
weipengfei 3fee32805d 更新 2024-01-18 10:38:28 +08:00
weipengfei ef08827f7d 更新 2024-01-17 18:40:06 +08:00
weipengfei c6846202c1 更新 2024-01-17 10:43:33 +08:00
weipengfei ffc8b8faf4 更新 2024-01-15 10:00:23 +08:00
weipengfei 7ef3039428 更新 2024-01-13 18:49:52 +08:00
weipengfei 1cd68d24e0 更新 2024-01-12 18:40:04 +08:00
weipengfei 04b40ebb48 更新 2024-01-09 16:33:29 +08:00
weipengfei fcc6a0faa9 更新 2024-01-06 17:54:10 +08:00
weipengfei c41e3faacd 更新 2024-01-05 19:02:17 +08:00
weipengfei a98ecdd0f1 更新 2024-01-04 19:08:32 +08:00
weipengfei f979e39b0f 更新字段说明 2024-01-04 10:18:01 +08:00
weipengfei bc64287b37 更新 2024-01-03 17:23:24 +08:00
weipengfei 656d094a5f 更新 2024-01-02 18:02:07 +08:00
weipengfei c78bcb4e30 更新 2023-12-29 19:23:04 +08:00
weipengfei 3e9170ef6b 更新 2023-12-29 18:18:31 +08:00
weipengfei cb6bf8de21 更新 2023-12-29 18:13:12 +08:00
weipengfei bb58661166 更新 2023-12-28 18:59:31 +08:00
weipengfei 96891aa235 更新 2023-12-27 18:40:40 +08:00
weipengfei f5330fad92 更新 2023-12-27 15:39:36 +08:00
weipengfei 9b6905e733 优化 2023-12-26 17:58:47 +08:00
weipengfei a0f498b907 更新 2023-12-26 17:42:41 +08:00
weipengfei ae098df597 更新 2023-12-25 19:12:10 +08:00
weipengfei 1203d133cf 更新 2023-12-25 19:07:39 +08:00
weipengfei aaf4114eda 更新 2023-12-25 14:51:32 +08:00
weipengfei a391cc6f8a 更新了供货采购 2023-12-25 11:56:07 +08:00
weipengfei 9630c164d9 更新 2023-12-23 18:31:17 +08:00
weipengfei 2a69565134 更新 2023-12-22 18:18:12 +08:00
weipengfei 0ef83a8e79 更新商品编辑时价格有概率无法回显的bug 2023-12-19 15:51:42 +08:00
weipengfei 47fcd00bd2 更新 2023-12-18 17:55:45 +08:00
wpf 699974b918 更新 2023-12-17 14:16:17 +08:00
weipengfei 1b50cae07b 更新 2023-12-17 13:29:54 +08:00
weipengfei b97398d075 提交 2023-12-15 19:52:52 +08:00
weipengfei cdc3efb281 更新 2023-12-15 19:35:38 +08:00
weipengfei e66db9a9ec 大更新 2023-12-15 19:19:16 +08:00
weipengfei 7415eb9f60 更新 2023-12-14 12:03:38 +08:00
weipengfei 4a3f59d2a8 更新 2023-12-13 16:13:45 +08:00
weipengfei 55433c05ab 修复bug 2023-12-12 18:12:11 +08:00
weipengfei b150e9ef02 优化供货采购页面 2023-12-12 11:02:54 +08:00
weipengfei bc8b182f89 更新供货采购 2023-12-12 10:36:58 +08:00
weipengfei e6bc9233f4 修复bug 2023-12-11 18:19:04 +08:00
weipengfei e59f83a0e9 更新了供货采购 2023-12-11 10:48:34 +08:00
weipengfei e888430b3e 更新供货采购功能 2023-12-04 15:47:55 +08:00
weipengfei dd5dbea43e 隐藏在售管理 2023-12-02 18:07:43 +08:00
weipengfei e53e4cf2c5 Merge branch 'main' into prod 2023-12-02 18:07:05 +08:00
weipengfei 33874d9f77 更新首页菜单 2023-12-02 18:06:32 +08:00
weipengfei b707f4bf97 Merge branch 'main' into prod 2023-12-01 16:26:14 +08:00
weipengfei 5801f69380 更新 2023-12-01 16:25:50 +08:00
weipengfei 44e16b77e8 优化代码健壮性 2023-12-01 16:25:23 +08:00
weipengfei 089e105e67 Merge branch 'main' into prod
# Conflicts:
#	config/app.js
2023-12-01 16:21:06 +08:00
weipengfei 1176e928bf 更新了商品管理批发价 2023-12-01 11:42:20 +08:00
weipengfei 6751909431 开放供货采购进货管理 2023-11-30 18:39:44 +08:00
weipengfei 6c54f05221 Merge branch 'main' into prod 2023-11-29 18:42:37 +08:00
weipengfei 2c7734dd4b 更新了结算订单 2023-11-29 11:44:00 +08:00
weipengfei fcc75803ef 更新订单管理结算金额 2023-11-29 09:03:29 +08:00
weipengfei 7ffeadfa4d 日常修复bug 2023-11-24 17:59:01 +08:00
weipengfei 29e8beb1ae 修改多规格商品订单图片展示的是商品大图的bug 2023-11-24 17:49:50 +08:00
weipengfei 796d72727e 更新了商品分类 2023-11-24 16:56:39 +08:00
weipengfei 580ea81154 修复bug 2023-11-23 18:44:49 +08:00
weipengfei e3e2cf0613 更新优化 2023-11-23 16:17:14 +08:00
weipengfei 088beed4e9 更新了添加模板, 保存模板的功能 2023-11-22 18:59:13 +08:00
weipengfei 9408cb41f0 新增商品加入店铺时设置详细信息 2023-11-22 18:16:45 +08:00
weipengfei 22acdfa746 新增选择规格模板 2023-11-22 17:08:05 +08:00
weipengfei c6a082d1d7 无商户信息时直接关闭应用 2023-11-22 16:10:58 +08:00
weipengfei 1d1f6498e9 兼容中台系统 2023-11-22 15:48:06 +08:00
weipengfei fec01de9c0 更新多规格商品的添加/编辑 2023-11-22 15:47:48 +08:00
weipengfei 91ada60e6f 更新多规格添加 2023-11-21 19:13:43 +08:00
weipengfei 4a153ea84c 更新多规格添加 2023-11-20 18:38:50 +08:00
weipengfei 3de4a0d47d 更新 2023-11-20 14:55:00 +08:00
weipengfei d8c0bbe9cf 更新 2023-11-20 14:53:54 +08:00
weipengfei 3d93e06173 重写添加商品页面(进行中) 2023-11-18 19:04:13 +08:00
weipengfei fe899f95f1 修复bug 2023-11-18 19:03:42 +08:00
weipengfei d58a4f3705 调整修改库存逻辑 2023-11-18 19:03:22 +08:00
weipengfei aa019a2159 更新 2023-11-17 19:19:24 +08:00
weipengfei 9d50e20fc2 更新功能 2023-11-16 19:10:49 +08:00
weipengfei 753c4ed835 新增定位页面 2023-11-16 19:10:30 +08:00
weipengfei a5f98d1746 重写商品添加页面(未完成) 2023-11-15 18:21:56 +08:00
weipengfei b2a4948203 修复bug 2023-11-15 18:21:15 +08:00
weipengfei 698c297d77 更新功能 2023-11-14 18:37:34 +08:00
weipengfei 871030f037 更新功能 2023-11-10 18:02:50 +08:00
weipengfei 577c7c9d54 更新 2023-11-09 19:10:18 +08:00
weipengfei 84636211c3 更新 2023-11-09 18:59:35 +08:00
weipengfei 7e85b90fc7 合并 2023-11-09 18:22:09 +08:00
weipengfei 754697ec48 更新功能, 修复bug 2023-11-09 17:58:21 +08:00
weipengfei 572e5a88a7 修复退款审核bug, 优化审核页面 2023-11-07 18:44:46 +08:00
weipengfei e19e2aa1e8 优化 2023-11-07 17:46:36 +08:00
weipengfei 6ed514ce03 更新了提现记录样式 2023-11-07 17:45:09 +08:00
weipengfei 946ced7f59 扫码入库新增可修改原有图片 2023-11-07 16:54:23 +08:00
weipengfei 0c25b1c6e4 修复bug 2023-11-06 17:55:17 +08:00
weipengfei 0ce3ee41f7 Merge branch 'main' into prod 2023-11-06 10:02:08 +08:00
weipengfei 80f38fde38 更新 2023-11-06 09:12:56 +08:00
shengchanzhe e5f1430eee 更新静态资源 2023-11-05 15:14:44 +08:00
weipengfei 187c2fc159 更新首页布局 2023-11-04 18:25:31 +08:00
weipengfei 98dfd452f7 上线前隐藏部分功能 2023-11-04 18:23:09 +08:00
weipengfei 233a0748a2 Merge branch 'main' into prod 2023-11-04 17:47:13 +08:00
weipengfei 1ff83b0351 优化商品添加页面 2023-11-04 17:40:53 +08:00
weipengfei 4f180abff3 新增商品位置移动 2023-11-04 17:26:47 +08:00
weipengfei 36b31d2852 更新扫码入库功能,修复bug 2023-11-04 16:55:55 +08:00
weipengfei e53c0fffcc 更新了扫码入库功能,新增上传商品图片,修改产品名称 2023-11-04 14:33:54 +08:00
weipengfei f8e9a9de53 正式上线前隐藏部分功能 2023-11-04 10:25:43 +08:00
weipengfei 35fa04c9d5 新增批发,代发补货页面 2023-11-04 09:32:32 +08:00
weipengfei 9364edef73 修复bug 2023-11-04 09:31:50 +08:00
weipengfei 40c8b5725e 更新代码 2023-11-01 20:01:52 +08:00
weipengfei b63f6f4336 修复bug 2023-10-31 11:24:20 +08:00
weipengfei f4f5a471e6 修复bug 2023-10-30 18:49:25 +08:00
weipengfei 2043fd0071 更新修复bug 2023-10-30 15:08:11 +08:00
weipengfei 22e9d26dfc 修复bug 2023-10-28 18:32:05 +08:00
weipengfei 43b68351f5 新增先货后款单独样式, 调整付款逻辑 2023-10-28 16:47:14 +08:00
weipengfei f196e68dae 修复供货采购页面跳转出错的bug 2023-10-28 11:53:31 +08:00
weipengfei 666ec55e9a 修复bug 2023-10-28 11:17:38 +08:00
weipengfei 94094ad137 更新委托销售功能 2023-10-27 20:31:36 +08:00
weipengfei fb50530bb3 修复供应链无法导入委托商品的bug 2023-10-27 18:43:50 +08:00
weipengfei 366793e9cc 修复商品详情页面bug 2023-10-27 17:57:05 +08:00
weipengfei 3e95d174f7 商品编号修改为商品条码 2023-10-27 17:52:28 +08:00