彭桃
|
6d60092cd5
|
Merge branch 'master' of http://git.excellentkk.cn/mkm/nk-lihaink-cn
|
2023-03-14 09:19:31 +08:00 |
|
彭桃
|
20f8fa2bdb
|
新增几个管理
|
2023-03-13 17:57:40 +08:00 |
|
liuxiaoquan
|
45468a70a1
|
商户入驻审核
|
2023-03-13 11:28:29 +08:00 |
|
liuxiaoquan
|
3bd30462d7
|
删除无用文件
|
2023-03-13 10:05:57 +08:00 |
|
liuxiaoquan
|
8b208ab745
|
商品筛选与列表状态切换
|
2023-03-11 18:12:45 +08:00 |
|
liuxiaoquan
|
9aeb4c4dad
|
商品筛选
|
2023-03-10 18:22:40 +08:00 |
|
liuxiaoquan
|
c4935e1f1c
|
商品管理列表
|
2023-03-10 16:18:11 +08:00 |
|
monanxiao
|
a1d3f7b7e0
|
Merge branch 'master' of git.excellentkk.cn:mkm/nk-lihaink-cn
|
2023-03-08 10:35:25 +08:00 |
|
monanxiao
|
da33dffa5a
|
JWT_UID 去除，更换为$this->rquest->uid
|
2023-03-08 10:26:24 +08:00 |
|
liuxiaoquan
|
fbfc1785ab
|
商户入驻与保证金bug修复
|
2023-03-07 18:37:32 +08:00 |
|
liuxiaoquan
|
c2c20eedf7
|
保证金功能与页面完善
|
2023-03-06 18:22:20 +08:00 |
|
liuxiaoquan
|
5f0f32e5e9
|
保证金功能与页面完善
|
2023-03-06 18:14:45 +08:00 |
|
monanxiao
|
f311e89370
|
完善商品分类、品牌分类、品牌管理、保障服务、商品标签等后台集成
|
2023-03-06 17:31:12 +08:00 |
|
monanxiao
|
8c9f245111
|
Merge branch 'master' of git.excellentkk.cn:mkm/nk-lihaink-cn
|
2023-03-06 09:39:21 +08:00 |
|
liuxiaoquan
|
5e4491d0b5
|
店铺类型,说明
|
2023-03-04 17:50:17 +08:00 |
|
monanxiao
|
6245f83ccb
|
Merge branch 'monanxiao'
|
2023-03-04 17:40:00 +08:00 |
|
monanxiao
|
709c7f4ab7
|
完成商品数据列表、商品分类、商品评论后台集成。
|
2023-03-04 17:33:04 +08:00 |
|
monanxiao
|
9b81c17b39
|
新建商品、商户类型、商户分类、商品分类、评论模型；新建商品、商品分类、评论控制器；新建商品、商品分类、评论视图；
|
2023-03-04 11:41:12 +08:00 |
|
liuxiaoquan
|
5bdf8b9975
|
转移商户model到common公共model
|
2023-03-04 02:31:56 +08:00 |
|
liuxiaoquan
|
d379e9b9db
|
店铺类文件结构调整
|
2023-03-04 02:14:44 +08:00 |
|
liuxiaoquan
|
842e365f8b
|
商户菜单修改，移动商户model到commom
|
2023-03-03 23:33:31 +08:00 |
|
liuxiaoquan
|
b74ab2b198
|
更新本地旧代码
|
2023-03-03 19:33:24 +08:00 |
|
liuxiaoquan
|
89e73b8c49
|
商户管理的路由设置，商户菜单管理
|
2023-03-03 19:01:17 +08:00 |
|
liuxiaoquan
|
a6689b146e
|
店铺管理路由设置与商户菜单功能
|
2023-03-03 19:00:46 +08:00 |
|
monanxiao
|
85d6b9407a
|
完成供应链团队建设
|
2023-03-03 18:03:28 +08:00 |
|
liuxiaoquan
|
440d98ddb4
|
更新本地master
|
2023-03-02 20:21:51 +08:00 |
|
liuxiaoquan
|
16131e5668
|
api地区联动模型添加
|
2023-03-02 18:29:59 +08:00 |
|
monanxiao
|
09048ec2e5
|
完成供应链平台后台功能添加，编辑
|
2023-03-02 17:59:15 +08:00 |
|
monanxiao
|
a6fd1e14f8
|
增加后台模块框架，未完善
|
2023-03-02 13:37:31 +08:00 |
|
liuxiaoquan
|
6d3daa13eb
|
新增文娱旅游、教育培训、民生公益、房屋装修后台功能与api文件
|
2023-03-01 19:48:20 +08:00 |
|
monanxiao
|
49080c9b0b
|
完成供应链模块初始框架
|
2023-03-01 17:53:18 +08:00 |
|
monanxiao
|
0f6bc586d2
|
增加财务相关模块
|
2023-03-01 16:27:44 +08:00 |
|
彭桃
|
b9b72a967a
|
1
|
2023-03-01 15:13:10 +08:00 |
|
liuxiaoquan
|
7f2ff527ab
|
没什么改动
|
2023-03-01 11:36:26 +08:00 |
|
liuxiaoquan
|
4ffecc59da
|
更改公益活动url格式
|
2023-03-01 11:31:20 +08:00 |
|
liuxiaoquan
|
b7b2353591
|
修改表名
|
2023-03-01 11:16:52 +08:00 |
|
liuxiaoquan
|
46c9611d48
|
纠正查询表名
|
2023-03-01 11:16:52 +08:00 |
|
liuxiaoquan
|
97de6285d1
|
修改url大小写问题
|
2023-02-28 17:33:29 +08:00 |
|
liuxiaoquan
|
03a880d3a0
|
修改url大小写问题
|
2023-02-28 16:48:31 +08:00 |
|
liuxiaoquan
|
a21bd3bddf
|
修改url大小写问题
|
2023-02-28 16:40:57 +08:00 |
|
liuxiaoquan
|
02e8f5dbc8
|
Merge branch 'master' of git.excellentkk.cn:mkm/nk-lihaink-cn into lxq
Conflicts:
app/admin/controller/Index.php
app/admin/controller/nk/Article.php
app/admin/model/StoreProduct.php
app/admin/view/nk/slideinfo/add.html
app/admin/view/nk/slideinfo/edit.html
app/admin/view/store_product/add.html
app/admin/view/store_product/datalist.html
app/admin/view/store_product/edit.html
app/admin/view/store_product/read.html
app/api/controller/Article.php
app/api/controller/Slide.php
public/.htaccess
|
2023-02-28 15:58:53 +08:00 |
|
liuxiaoquan
|
f8c71c69d1
|
1.0
|
2023-02-28 15:44:15 +08:00 |
|
|
|
1e005a15c4
|
接口修改16
|
2023-02-28 13:57:54 +08:00 |
|
彭桃
|
8eb1087997
|
1
|
2023-02-28 10:44:09 +08:00 |
|
|
|
0e97bf08fb
|
接口修改14
|
2023-02-27 17:44:51 +08:00 |
|
|
|
6cd7393cd8
|
接口修改14
|
2023-02-27 17:43:22 +08:00 |
|
|
|
6d3ac63622
|
接口修改14
|
2023-02-27 17:42:22 +08:00 |
|
|
|
5be1a4b2c1
|
Merge remote-tracking branch 'bb/master'
|
2023-02-27 17:14:32 +08:00 |
|
|
|
02bdb10200
|
接口修改14
|
2023-02-27 17:14:21 +08:00 |
|
彭桃
|
5928111877
|
接口后台
|
2023-02-27 16:47:42 +08:00 |
|
