Commit Graph

132 Commits

Author SHA1 Message Date
luofei fdd60d7eb1 Merge branch 'dev' into pre-release
# Conflicts:
#	manifest.json
#	pages/admin/orderList/index.vue
#	pages/chat/customer_list/index.vue
#	pages/index/index.vue
#	pages/product/list/index.vue
2024-05-16 14:22:02 +08:00
1154079537 a96332fa2d 订单刷新 文字益处隐藏 店铺详情 提现 2024-05-16 14:12:36 +08:00
zmj 31cce22ba3 回收站恢复 2024-05-16 11:57:36 +08:00
luofei c4e545d92d Merge branch 'pre-release' of https://gitea.lihaink.cn/mkm/shop-applet into pre-release 2024-05-16 11:44:47 +08:00
luofei 5d3981c27e 添加恢复商品 2024-05-16 11:44:45 +08:00
zmj 1d63aad673 商品扫码入库添加条形码 2024-05-16 11:34:36 +08:00
zmj 39a49b1b43 add 2024-05-15 18:36:33 +08:00
zmj c5a5557da8 商品为空时出现两个两个暂无商品 2024-05-15 14:28:45 +08:00
luofei a6c5f9581a Merge branch 'feature-releaseGoods' into pre-release
# Conflicts:
#	config/app.js
#	manifest.json
#	pages.json
#	pages/chat/customer_list/index.vue
#	pages/index/index.vue
#	pages/product/addGood/addGood.vue
#	pages/product/basicSet.vue
#	pages/product/list/index.vue
#	pages/users/gather_list/index.vue
#	pages/withdrawal/index.vue
#	pages/withdrawal/progress.vue
#	uni_modules/h-datetime-picker/components/h-datetime-picker/h-datetime-picker.vue
#	utils/util.js
2024-05-14 17:59:48 +08:00
luofei 515b0ace72 init 2024-05-14 17:25:13 +08:00
luofei 94b7c1aaaf reset 2024-05-14 17:13:29 +08:00
zmj 765f13eea4 add 2024-05-08 19:18:54 +08:00
zmj 0c6e085b65 add 2024-05-07 22:29:30 +08:00
zmj c3c658671b add 2024-05-07 17:32:45 +08:00
zmj c104b03819 add 2024-05-06 18:19:27 +08:00
zmj f84d98efd6 app图片加载不出来 2024-05-06 10:07:36 +08:00
zmj eaff04f995 发布商品bu修复 2024-05-03 15:03:12 +08:00
zmj fd5181b55c add 2024-04-30 18:57:01 +08:00
zmj 9c08d45e09 add 2024-04-30 09:33:57 +08:00
zmj 448733a1c8 add 2024-04-29 23:05:49 +08:00
zmj 0aed25b996 商品管理bug修复 2024-04-28 23:01:15 +08:00
zmj 2792269537 引导页面bug修复 2024-04-28 18:08:14 +08:00
zmj ec548c021c add 2024-04-28 08:48:30 +08:00
zmj b50c8c6b10 商品发布 2024-04-27 10:55:52 +08:00
DESKTOP-GMUNQ1B\k 1e7a8f76d1 订单暂存修改 2024-04-26 11:14:07 +08:00
zmj 7e98709d06 add 2024-04-25 18:09:35 +08:00
zmj 1a01e1ae65 商品详情修改 2024-04-25 08:40:17 +08:00
zmj 6dff85d544 商品发布 2024-04-24 18:11:06 +08:00
DESKTOP-GMUNQ1B\k 18a02eaacb 1 2024-04-24 09:37:17 +08:00
zmj 5b7783d015 更新商品甘丽 2024-04-24 08:47:26 +08:00
zmj 773efe87ca 商品管理页面修改 2024-04-23 18:01:32 +08:00
zmj 9802fda53a 发布商品 2024-04-23 08:45:17 +08:00
zmj 12acca43be 商品发布 2024-04-22 18:05:44 +08:00
zmj 8c05ceb8fb 视频上传 2024-04-22 08:38:39 +08:00
zmj b22db99e63 商品发布接口对接 2024-04-20 18:02:16 +08:00
zmj b52f4fca4c add 2024-04-20 14:59:16 +08:00
zmj 9cb77a57e4 add 2024-04-20 14:51:26 +08:00
zmj 56921854dd add 2024-04-20 08:40:27 +08:00
zmj 336c7078bb add 2024-04-19 18:08:04 +08:00
zmj 794beec9df add 2024-04-18 23:59:06 +08:00
zmj 63a0a9194e add 2024-04-18 18:02:57 +08:00
zmj 006041fca6 add 2024-04-17 18:02:49 +08:00
zmj b8e1824d21 add 2024-04-17 11:29:01 +08:00
weipengfei cd8513ec02 调整拍照上传功能 2024-04-15 17:48:03 +08:00
DESKTOP-GMUNQ1B\k 1f13c5daf4 1 2024-04-10 17:05:24 +08:00
DESKTOP-GMUNQ1B\k 64b7a52d22 1 2024-04-09 18:04:54 +08:00
SK-20231103YIXF\Administrator 7ce2829aa5 2 2024-04-08 16:42:44 +08:00
DESKTOP-GMUNQ1B\k 068b3a12df 1 2024-04-03 17:41:28 +08:00
DESKTOP-GMUNQ1B\k 4e9e9862db 1 2024-04-02 14:46:49 +08:00
weipengfei 5bf33c61c0 新增商品送货方式 2024-04-02 14:43:54 +08:00