2882 Commits

Author SHA1 Message Date
273815b728 购物卡不计入采购金额,修改增收补贴 2024-03-05 17:37:23 +08:00
814bf3921e 修改商户邀请列表 2024-03-05 16:58:52 +08:00
0d2b770566 修改商户邀请列表 2024-03-05 16:58:05 +08:00
ef4f3cedc6 修改增收补贴金额的错误 2024-03-05 16:49:10 +08:00
79d21421c0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-05 16:36:06 +08:00
bdf7890cdc 修改增收补贴金额的错误 2024-03-05 16:36:02 +08:00
mkm
67d41adeb4 Merge pull request '更新后台' (#166) from dev into master
Reviewed-on: #166
2024-03-04 19:01:16 +08:00
mkm
cb1286c0f8 更新后台 2024-03-04 19:01:04 +08:00
mkm
43a87aac81 Merge pull request 'dev' (#165) from dev into master
Reviewed-on: #165
2024-03-04 17:54:24 +08:00
6999d00e07 处理订单自动发货的错误 2024-03-04 17:28:48 +08:00
8b6f0d7c04 修改商户手续费 2024-03-04 15:52:46 +08:00
2c9d375469 修改商户入驻申请 2024-03-04 15:25:59 +08:00
65a156fbff 修改商户入驻申请 2024-03-04 14:31:35 +08:00
3d08875baa 修改订单流水的错误 2024-03-04 13:42:36 +08:00
7fe6b26974 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-04 11:34:57 +08:00
8dd5c1c00c 修改财务账单下载 2024-03-04 11:34:52 +08:00
mkm
72609d5c3f Merge pull request 'dev' (#164) from dev into master
Reviewed-on: #164
2024-03-04 10:49:25 +08:00
mkm
4a40586041 更新h5 2024-03-04 10:49:02 +08:00
b6d3f684c3 修改增收补贴 的错误 2024-03-04 10:42:33 +08:00
c5d18019d7 修改商户账单的错误 2024-03-02 18:11:00 +08:00
6a971d33f1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-02 18:02:24 +08:00
3f48a6e43a 处理线下支付的错误 2024-03-02 18:02:19 +08:00
mkm
94f4ef202d 更新 2024-03-02 17:33:01 +08:00
f2e1795eb3 修改商品列表的错误 2024-03-02 17:16:01 +08:00
904b454954 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-02 16:49:54 +08:00
fbc0a5f841 修改订单财务流水的错误 2024-03-02 16:49:50 +08:00
52c6e4ca5d 修改订单财务流水的错误 2024-03-02 16:48:43 +08:00
mkm
ec3b4d0591 更新 2024-03-02 16:38:08 +08:00
weipengfei
f0a1bb274a 更新h5 2024-03-02 16:07:57 +08:00
weipengfei
a9f936f7ed 更新h5 2024-03-02 15:59:07 +08:00
weipengfei
911e3645d9 h5更新 2024-03-02 15:54:24 +08:00
weipengfei
07cdf4ab74 更新h5 2024-03-02 15:50:24 +08:00
c01be333bf 更新h5页面 2024-03-02 15:40:50 +08:00
5e31108d99 修改商户销售金额和采购金额的错误 2024-03-02 15:32:54 +08:00
c19e0c4dad Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-02 15:29:51 +08:00
109a1b1dd2 调整线下扫码支付 2024-03-02 15:29:47 +08:00
mkm
afeda3992e 修复登录错误 2024-03-02 15:18:24 +08:00
014cd84106 更新h5页面,修改订单金额的错误 2024-03-02 15:14:32 +08:00
d98dde0556 更新h5页面 2024-03-02 14:47:30 +08:00
b1cd1fc2d4 更新h5页面 2024-03-02 14:25:42 +08:00
818f2fd428 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-02 14:13:39 +08:00
3356f40744 修改用户订单列表查询,添加订单资金流水 2024-03-02 14:13:34 +08:00
mkm
8e925b5857 更新h5 2024-03-02 12:06:12 +08:00
mkm
35298a3d7d 更新 2024-03-02 11:54:34 +08:00
mkm
1a3efb9aa2 更新 2024-03-02 11:43:58 +08:00
mkm
93e648406c 更新 2024-03-02 11:28:35 +08:00
mkm
5cde288bc4 更新 2024-03-02 11:28:23 +08:00
mkm
6465a6611e 更新h5 2024-03-02 10:50:06 +08:00
mkm
17febc6476 更新h5 2024-03-02 10:26:41 +08:00
40cc91a7ac 修改商户入驻申请 2024-03-02 10:13:36 +08:00