|
|
ff42372d2a
|
Merge pull request 'dev' (#163) from dev into master
Reviewed-on: #163
|
2024-03-01 16:31:51 +08:00 |
|
|
|
c7b13854a1
|
更新h5
|
2024-03-01 16:26:59 +08:00 |
|
|
|
93714149ca
|
更新
|
2024-03-01 16:20:06 +08:00 |
|
|
|
47b912667b
|
更新h5
|
2024-03-01 16:03:46 +08:00 |
|
|
|
1353cc1b50
|
Merge pull request 'dev' (#162) from dev into master
Reviewed-on: #162
|
2024-03-01 15:45:53 +08:00 |
|
|
|
10cdfefcc6
|
调整商品标签值输入
|
2024-03-01 15:45:02 +08:00 |
|
|
|
d0325962eb
|
调整商品标签值输入
|
2024-03-01 15:39:21 +08:00 |
|
|
|
d8172c31ab
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev
|
2024-03-01 15:36:52 +08:00 |
|
|
|
cdfca47d9e
|
商品标签添加字段
|
2024-03-01 15:36:41 +08:00 |
|
|
|
a22628bec3
|
更新
|
2024-03-01 15:35:54 +08:00 |
|
|
|
4ea908e0b2
|
Merge pull request 'dev' (#161) from dev into master
Reviewed-on: #161
|
2024-03-01 15:06:55 +08:00 |
|
|
|
738cca59bc
|
更新
|
2024-03-01 15:06:05 +08:00 |
|
|
|
37bd5326b6
|
修改商户列表数据返回
|
2024-03-01 14:42:23 +08:00 |
|
|
|
9d8f98853a
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev
|
2024-03-01 14:26:17 +08:00 |
|
|
|
5e364b201c
|
修改邀请码生成
|
2024-03-01 14:26:08 +08:00 |
|
|
|
9b90e23a11
|
Merge pull request '更新' (#160) from dev into master
Reviewed-on: #160
|
2024-03-01 13:56:39 +08:00 |
|
|
|
16666243b5
|
更新
|
2024-03-01 13:55:34 +08:00 |
|
|
|
fae9e71d3c
|
Merge pull request 'dev' (#159) from dev into master
Reviewed-on: #159
|
2024-03-01 13:51:49 +08:00 |
|
|
|
65c49ea80a
|
更新
|
2024-03-01 13:48:59 +08:00 |
|
|
|
d39bedf170
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev
|
2024-03-01 11:49:24 +08:00 |
|
|
|
87d120e32c
|
修改商户交易申请
|
2024-03-01 11:49:13 +08:00 |
|
|
|
09c6b5e132
|
Merge pull request 'dev' (#158) from dev into master
Reviewed-on: #158
|
2024-03-01 10:55:06 +08:00 |
|
|
|
76ccbab8ed
|
更新h5
|
2024-03-01 10:46:40 +08:00 |
|
|
|
f43e64f40f
|
更新http
|
2024-03-01 10:39:37 +08:00 |
|
|
|
e4deab46b4
|
更新登录时商户判断
|
2024-03-01 10:34:55 +08:00 |
|
|
|
b1fecb683c
|
Merge pull request '更新pc页面 和异常日志' (#157) from dev into master
Reviewed-on: #157
|
2024-03-01 10:17:32 +08:00 |
|
|
|
878a7eae34
|
更新pc页面 和异常日志
|
2024-03-01 10:16:13 +08:00 |
|
|
|
e1da9050b3
|
Merge pull request '修改判断新用户' (#156) from dev into master
Reviewed-on: #156
|
2024-03-01 10:00:56 +08:00 |
|
|
|
360745360e
|
修改判断新用户
|
2024-03-01 10:00:16 +08:00 |
|
|
|
bbde3743db
|
Merge pull request 'dev' (#155) from dev into master
Reviewed-on: #155
|
2024-02-29 22:21:11 +08:00 |
|
|
|
53856b1c4a
|
线下扫码支付同步采购金额和销售金额
|
2024-02-29 21:53:16 +08:00 |
|
|
|
58a03e755e
|
调整线下扫码支付
|
2024-02-29 21:09:37 +08:00 |
|
|
|
735db0e46d
|
调整种养殖户入驻
|
2024-02-29 20:21:40 +08:00 |
|
|
|
1ddb5b2f02
|
调整补贴使用限制
|
2024-02-29 19:59:42 +08:00 |
|
|
|
39d46328df
|
添加补贴记录
|
2024-02-29 18:48:27 +08:00 |
|
|
|
d595e04b2f
|
添加补贴记录查询
|
2024-02-29 18:41:13 +08:00 |
|
|
|
ba6c337fe2
|
补贴仅限官方店铺使用
|
2024-02-29 17:52:40 +08:00 |
|
|
|
fe1614ef0f
|
调整生成商户线下收款码
|
2024-02-29 17:31:52 +08:00 |
|
|
|
bf09ec7935
|
添加生成商户线下收款码
|
2024-02-29 17:26:31 +08:00 |
|
|
|
eb20948bcb
|
添加线下扫码支付
|
2024-02-29 17:01:17 +08:00 |
|
|
|
6c4ce77c83
|
调整商户补贴进度查询
|
2024-02-29 15:21:06 +08:00 |
|
|
|
da72fe2d5b
|
调整购物卡使用限制
|
2024-02-29 14:03:13 +08:00 |
|
|
|
9de3c1bde1
|
调整购物卡使用限制
|
2024-02-29 14:00:45 +08:00 |
|
|
|
4e7d87c9cf
|
更新
|
2024-02-29 12:00:26 +08:00 |
|
|
|
e2b23b9012
|
Merge branch 'offline_pay' into dev
# Conflicts:
# crmeb/listens/OrderDeliveryListen.php
|
2024-02-29 11:58:47 +08:00 |
|
|
|
65690c80dc
|
修改平台购物卡发放的错误
|
2024-02-29 11:57:19 +08:00 |
|
|
|
ffb34f0017
|
Revert "商户平台支持购买普通店铺商品"
This reverts commit 4290a872bea072d72806f9c687314858efaa5b73.
|
2024-02-29 11:51:27 +08:00 |
|
|
|
4290a872be
|
商户平台支持购买普通店铺商品
|
2024-02-29 10:41:31 +08:00 |
|
|
|
40b0ef425a
|
修改供应链订单列表的错误
|
2024-02-29 09:55:54 +08:00 |
|
|
|
0c1f7ac16a
|
Merge branch 'offline_pay' into dev
|
2024-02-29 09:51:26 +08:00 |
|
