2492 Commits

Author SHA1 Message Date
mkm
a5ec83b8f6 商品导入 2023-05-19 21:12:34 +08:00
mkm
d76b3fa9d6 Merge pull request 'dev' (#8) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/8
2023-05-19 18:40:03 +08:00
3e1d4ace81 Merge branch 'dev' of http://git.excellentkk.cn/mkm/shop-php into dev 2023-05-19 18:23:07 +08:00
63bee8d493 添加绑定小程序账号 2023-05-19 18:22:32 +08:00
mkm
a54235695b 导入商品的详情 2023-05-19 17:29:35 +08:00
b3a4245781 处理云仓商品查询的错误 2023-05-19 14:45:49 +08:00
mkm
6bcf53cf25 Merge pull request 'dev' (#7) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/7
2023-05-19 12:50:16 +08:00
c83ccd331b 商户列表添加街道查询 2023-05-19 09:43:32 +08:00
e455df9617 Merge branch 'dev' of http://git.excellentkk.cn/mkm/shop-php into dev 2023-05-19 09:41:43 +08:00
beb9d7eb77 商户列表添加街道查询 2023-05-19 09:41:36 +08:00
mkm
7c9e089b70 更新 2023-05-18 23:09:03 +08:00
mkm
b0c7b6bd2f Merge pull request 'dev' (#6) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/6
2023-05-18 16:49:32 +08:00
mkm
64ec4950ae Merge remote-tracking branch 'shop/dev' into dev 2023-05-18 16:48:22 +08:00
mkm
72a258ce5b 带上category_id
修改spec_type==0 更新bar_code
2023-05-18 16:48:06 +08:00
mkm
a2974e477d Merge pull request 'dev' (#5) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/5
2023-05-18 14:26:49 +08:00
c17fbca1b3 Merge branch 'dev' of http://git.excellentkk.cn/mkm/shop-php into dev 2023-05-18 14:24:40 +08:00
4116d48afb 修改商品创建的错误 2023-05-18 14:22:10 +08:00
mkm
1391cf16af 随机数 2023-05-17 16:11:36 +08:00
mkm
e9acd6ccd9 显示云商品 2023-05-17 15:55:19 +08:00
mkm
ecaad9b075 显示云商品 2023-05-17 15:19:36 +08:00
mkm
a685984380 显示云商品 2023-05-17 15:19:22 +08:00
mkm
df54963b96 Merge remote-tracking branch 'shop/dev' into dev 2023-05-17 10:35:25 +08:00
mkm
12ab4de6df 后台商品同步 2023-05-17 10:35:04 +08:00
root
4f537ef24f 商户入驻申请通过后自动开启店铺 2023-05-17 09:49:05 +08:00
root
387636b8fc 处理商户后台资质展示的错误 2023-05-16 18:03:02 +08:00
root
8d9080f76b 修改购物车数量统计的错误 2023-05-16 15:01:07 +08:00
root
47f1ea3c32 修改商户资质校验的错误 2023-05-16 11:31:28 +08:00
b3e05077fc 商品显示状态更新添加事务 2023-05-15 14:39:36 +08:00
d9bdc105ab 商品显示状态更新添加事务 2023-05-15 14:30:37 +08:00
mkm
0f94b7e7bf 修复购物车显示错误 2023-05-13 17:00:46 +08:00
mkm
fd8324866f 修复统计订单错误 2023-05-13 14:49:09 +08:00
mkm
b155e394b4 修复错误 2023-05-12 17:10:56 +08:00
mkm
811d472acb 修复错误 2023-05-12 14:03:40 +08:00
mkm
63546eca45 修复错误 2023-05-11 16:00:59 +08:00
mkm
219a8ca39e 提交前端 2023-05-11 15:22:28 +08:00
mkm
09c407bacd 修复错误 2023-05-11 10:29:05 +08:00
mkm
a377c02a43 修复错误 2023-05-11 10:14:18 +08:00
mkm
cc57379223 更新 2023-05-10 18:09:55 +08:00
mkm
f181fd1dac 1 2023-05-10 15:16:51 +08:00
mkm
edcfe97ca1 更新 2023-05-10 15:08:52 +08:00
mkm
b809ece5a9 1 2023-05-10 13:39:12 +08:00
mkm
5ac079df5c init 2023-05-10 13:38:51 +08:00