liuxiaoquan
|
0d2527ff69
|
修复入驻申核结果提示问题
|
2023-03-16 11:15:55 +08:00 |
|
彭桃
|
4432c47dd0
|
1
|
2023-03-16 10:50:58 +08:00 |
|
liuxiaoquan
|
3e2a2915e4
|
退回保证金bug修复中
|
2023-03-16 01:18:12 +08:00 |
|
liuxiaoquan
|
568534719e
|
保证金列表调优
|
2023-03-15 19:12:02 +08:00 |
|
monanxiao
|
d301d2eb9f
|
解决冲突文件
|
2023-03-15 18:07:41 +08:00 |
|
monanxiao
|
b6bc7746a2
|
Revert "Revert "废弃文件，不需要合并""
This reverts commit 489ee32f99820be2313db1227a4efd8de7cc8f57.
|
2023-03-15 17:10:31 +08:00 |
|
monanxiao
|
3ac2567f06
|
合并
|
2023-03-15 17:06:21 +08:00 |
|
monanxiao
|
489ee32f99
|
Revert "废弃文件，不需要合并"
This reverts commit cd0ebf8e5bda88fd9f27058610bebd051054b3d5.
|
2023-03-15 17:03:31 +08:00 |
|
liuxiaoquan
|
9408a92034
|
店铺类型编辑页js优化
|
2023-03-15 16:56:07 +08:00 |
|
彭桃
|
b0ae2c7087
|
完善后台相关管理
|
2023-03-15 16:26:36 +08:00 |
|
liuxiaoquan
|
1595573f52
|
类型说明功能调整
|
2023-03-15 12:39:41 +08:00 |
|
liuxiaoquan
|
67d225cb9e
|
店铺类型页所有bug修复
|
2023-03-15 10:39:38 +08:00 |
|
monanxiao
|
cd0ebf8e5b
|
废弃文件，不需要合并
|
2023-03-15 09:49:43 +08:00 |
|
liuxiaoquan
|
5ca21a7e11
|
:合并分支：店铺类型代码逻辑调整优化
|
2023-03-15 08:52:45 +08:00 |
|
liuxiaoquan
|
4ffcbef5e0
|
商户菜单方法名更改
|
2023-03-15 01:15:47 +08:00 |
|
liuxiaoquan
|
1a5ad63673
|
店铺类型页面js调整
|
2023-03-15 00:54:54 +08:00 |
|
liuxiaoquan
|
9c65f61271
|
修复js一处bug
|
2023-03-14 22:33:33 +08:00 |
|
liuxiaoquan
|
39fb219ba7
|
合并分支：店铺类型权限调整
|
2023-03-14 19:50:24 +08:00 |
|
liuxiaoquan
|
5904775296
|
店铺类型权限功能调整
|
2023-03-14 19:50:14 +08:00 |
|
liuxiaoquan
|
bd6768fa4b
|
店铺类型权限修改
|
2023-03-14 19:48:08 +08:00 |
|
liuxiaoquan
|
af167816e9
|
更新本地master
|
2023-03-14 16:25:34 +08:00 |
|
liuxiaoquan
|
cb3b630315
|
：合并分支：添加审核客服功能
|
2023-03-14 16:24:33 +08:00 |
|
liuxiaoquan
|
d04a104460
|
添加入驻审核开推送客服号
|
2023-03-14 16:24:04 +08:00 |
|
彭桃
|
af6d415265
|
1
|
2023-03-14 15:12:12 +08:00 |
|
|
|
e1c8bc4b45
|
Merge remote-tracking branch 'bb/master'
|
2023-03-14 14:51:32 +08:00 |
|
|
|
31a36d55f4
|
修改jwt 定义
|
2023-03-14 14:50:53 +08:00 |
|
彭桃
|
d9c51368bc
|
1
|
2023-03-14 14:47:41 +08:00 |
|
liuxiaoquan
|
d0eca41525
|
:合并lxq:商户入驻申请js动态效果修复
|
2023-03-14 12:32:53 +08:00 |
|
liuxiaoquan
|
4ff308f2b5
|
商户入驻申请页面js效果修复
|
2023-03-14 12:32:21 +08:00 |
|
liuxiaoquan
|
cccc73d87c
|
合并分支：入驻申请删除功能优化
|
2023-03-14 11:58:22 +08:00 |
|
liuxiaoquan
|
22bcf9a4ed
|
申请入驻删除功能优化
|
2023-03-14 11:57:42 +08:00 |
|
liuxiaoquan
|
71498e3845
|
入驻申请备注功能优化完成
|
2023-03-14 10:01:02 +08:00 |
|
liuxiaoquan
|
9cb5a052b9
|
合并到master分支:入驻申请页面bug修复完成
|
2023-03-14 09:44:24 +08:00 |
|
liuxiaoquan
|
2eb9e64ef3
|
入驻申请页面js筛选功能完成
|
2023-03-14 09:42:24 +08:00 |
|
彭桃
|
40fcd50f22
|
地图
|
2023-03-14 09:38:53 +08:00 |
|
彭桃
|
6d60092cd5
|
Merge branch 'master' of http://git.excellentkk.cn/mkm/nk-lihaink-cn
|
2023-03-14 09:19:31 +08:00 |
|
liuxiaoquan
|
343c12a035
|
入驻申请页面js筛选功能优化
|
2023-03-14 02:00:17 +08:00 |
|
liuxiaoquan
|
bc5ec1eee7
|
入驻申请页面js筛选功能优化
|
2023-03-14 01:58:33 +08:00 |
|
liuxiaoquan
|
50d6fdef3b
|
商户入驻申请时间选择条件优化
|
2023-03-13 18:55:46 +08:00 |
|
彭桃
|
20f8fa2bdb
|
新增几个管理
|
2023-03-13 17:57:40 +08:00 |
|
liuxiaoquan
|
3b564ffc12
|
Merge branch 'master' of git.excellentkk.cn:mkm/nk-lihaink-cn
|
2023-03-13 17:32:52 +08:00 |
|
liuxiaoquan
|
f716bf8d09
|
商户入驻申请审核功能完成
|
2023-03-13 17:31:53 +08:00 |
|
彭桃
|
6fc491eb1c
|
Merge branch 'master' of http://git.excellentkk.cn/mkm/nk-lihaink-cn
# Conflicts:
# public/.htaccess
# public/nginx.htaccess
|
2023-03-13 17:06:21 +08:00 |
|
彭桃
|
ab6648dde8
|
1
|
2023-03-13 17:05:47 +08:00 |
|
liuxiaoquan
|
3a94f7da5e
|
合并分支'lxq': 入驻审核修复bug v1
|
2023-03-13 14:27:13 +08:00 |
|
liuxiaoquan
|
09c655dc21
|
商户入驻审核bug修复v1
|
2023-03-13 14:26:53 +08:00 |
|
liuxiaoquan
|
45468a70a1
|
商户入驻审核
|
2023-03-13 11:28:29 +08:00 |
|
liuxiaoquan
|
3947713abe
|
合并分支 'lxq'
Conflicts:
app/admin/model/EbStoreProduct.php
|
2023-03-13 10:08:31 +08:00 |
|
liuxiaoquan
|
3bd30462d7
|
删除无用文件
|
2023-03-13 10:05:57 +08:00 |
|
liuxiaoquan
|
4b45813ca2
|
店铺保证金筛选条件页面优化
|
2023-03-13 10:03:23 +08:00 |
|
