chenbo
|
fa242a8492
|
Merge branch 'master' into master-yajin-feature
# Conflicts:
# app/common/logic/CompanyLogic.php
# public/admin/index.html
|
2023-10-18 10:02:11 +08:00 |
|
chenbo
|
9c2aa1b1ca
|
add:押金充值对公账户临时方案
|
2023-10-17 15:34:20 +08:00 |
|
chenbo
|
eb5607bfe4
|
add:押金充值对公账户临时方案
|
2023-10-17 14:14:45 +08:00 |
|
chenbo
|
22ed2105fb
|
add:押金充值线上转账对公账户临时方案
|
2023-10-13 18:16:37 +08:00 |
|
unknown
|
6bd04e5c2a
|
车辆购买done
|
2023-10-13 16:51:49 +08:00 |
|
unknown
|
ae7499bd05
|
修复上传合同bug
|
2023-10-13 10:12:16 +08:00 |
|
unknown
|
55e943166e
|
三轮车购买镇街公司空余车辆
|
2023-10-12 16:31:15 +08:00 |
|
unknown
|
40bd9ca6d0
|
三轮车上传合同逻辑修改
|
2023-10-12 14:39:11 +08:00 |
|
unknown
|
27fca62641
|
buy cars part3
|
2023-10-12 13:56:06 +08:00 |
|
unknown
|
258b6ecaa4
|
三轮车购买part1
|
2023-10-11 16:39:36 +08:00 |
|
unknown
|
17568531f4
|
三轮车上传合同逻辑修改
|
2023-10-11 15:53:16 +08:00 |
|
chenbo
|
5eb6d22c08
|
update：后台添加用户接口，用户角色下拉列表接口，公司下拉列表接口
|
2023-10-10 16:33:46 +08:00 |
|
chenbo
|
d0202a70bf
|
update：可以作为甲方签约的公司类型列表
|
2023-10-10 11:34:28 +08:00 |
|
chenbo
|
7941ca4371
|
update：创建公司，地区限制为同一类型公司不可重复选择
|
2023-10-10 10:49:21 +08:00 |
|
chenbo
|
dc130190d3
|
update
|
2023-10-08 10:03:45 +08:00 |
|
|
|
8208a1974e
|
更新
|
2023-09-27 16:12:20 +08:00 |
|
chenbo
|
4e296b792d
|
修改代码中关于镇农科公司的描述
|
2023-09-25 19:11:50 +08:00 |
|
chenbo
|
814bc8f60d
|
余额列表-公司用户列表接口
|
2023-09-25 11:26:21 +08:00 |
|
chenbo
|
7b40b7d5f5
|
fix
|
2023-09-23 18:21:39 +08:00 |
|
chenbo
|
e924e9f65a
|
投诉反馈
|
2023-09-23 15:18:33 +08:00 |
|
chenbo
|
92591b4b51
|
投诉反馈
|
2023-09-23 15:12:45 +08:00 |
|
chenbo
|
598bc8ec41
|
商户申请-直接打包商城传递的参数，避免每次新增参数都需要改代码
|
2023-09-22 18:32:12 +08:00 |
|
chenbo
|
1301f3a59f
|
镇管理公司负责人负责商户审批
|
2023-09-21 14:19:59 +08:00 |
|
chenbo
|
4855bb5959
|
第一次成功创建任务模板，初始化公司的提现截止时间
|
2023-09-20 10:01:50 +08:00 |
|
chenbo
|
055152f6c9
|
第一次成功创建任务模板，初始化公司的提现截止时间
|
2023-09-19 18:37:58 +08:00 |
|
chenbo
|
6ba04b1b2c
|
审批
|
2023-09-19 11:34:04 +08:00 |
|
chenbo
|
e4499b9ec1
|
完善提现功能：商城商户入驻和开通交易审批流
|
2023-09-19 10:18:50 +08:00 |
|
chenbo
|
c27393331d
|
完善提现功能：商城商户入驻和开通交易审批流
|
2023-09-19 10:03:56 +08:00 |
|
chenbo
|
6883c63dc1
|
完善提现功能：商城商户入驻审批流
|
2023-09-19 09:05:45 +08:00 |
|
chenbo
|
929aaa086f
|
其他任务审批，拒绝后当天仍可提交
|
2023-09-16 14:43:54 +08:00 |
|
chenbo
|
9b8f288ee1
|
审批接口
|
2023-09-15 19:04:45 +08:00 |
|
chenbo
|
fd7838ce28
|
debug
|
2023-09-15 18:01:25 +08:00 |
|
chenbo
|
4339f45cb5
|
Merge branch 'master-fix-0915' into dev
# Conflicts:
# public/admin/index.html
|
2023-09-15 17:53:46 +08:00 |
|
chenbo
|
aa47142942
|
add:商城商户入驻认证，通滩镇商户要查询一下是否已通过企业认证，通过的情况下直接生成合同
|
2023-09-15 17:45:46 +08:00 |
|
chenbo
|
41a9a27292
|
Merge branch 'master' into master-fix-0915
# Conflicts:
# app/adminapi/controller/CompanyController.php
# public/admin/index.html
|
2023-09-15 17:12:29 +08:00 |
|
chenbo
|
ee0ab0e013
|
add:其他任务提交创建审批，待审批列表
|
2023-09-15 17:00:52 +08:00 |
|
chenbo
|
ba90382f2b
|
add:address和qualification（资质）
|
2023-09-15 15:22:27 +08:00 |
|
chenbo
|
f8a0a098f3
|
add:记录商户入驻日志
|
2023-09-15 14:55:41 +08:00 |
|
chenbo
|
eed7b0f4eb
|
Merge branch 'master-fix-0915' into dev
|
2023-09-15 14:26:37 +08:00 |
|
chenbo
|
460e1b9fff
|
update:公司认证表格
|
2023-09-15 14:21:51 +08:00 |
|
chenbo
|
2e44d5bb02
|
Merge branch 'master-fix-0915' into dev
|
2023-09-15 13:53:33 +08:00 |
|
chenbo
|
43ae02fea1
|
update:商户合同添加备忘
|
2023-09-15 13:53:01 +08:00 |
|
|
|
9866432e21
|
更新
|
2023-09-15 13:37:21 +08:00 |
|
chenbo
|
7d8041b340
|
update:商户详细地址
|
2023-09-14 17:51:23 +08:00 |
|
chenbo
|
907ae29aa0
|
update:商户资质同步
|
2023-09-14 11:12:23 +08:00 |
|
chenbo
|
194f619a69
|
add:商户认证反馈
|
2023-09-13 21:50:19 +08:00 |
|
chenbo
|
a2e35c34c9
|
add:商户认证反馈
|
2023-09-13 21:48:21 +08:00 |
|
chenbo
|
57b3271cf4
|
add:商户认证反馈
|
2023-09-13 20:44:08 +08:00 |
|
chenbo
|
a156b5fed1
|
update:商户合同详情
|
2023-09-13 18:52:52 +08:00 |
|
chenbo
|
fe31a235a7
|
update:商户合同详情
|
2023-09-13 18:45:34 +08:00 |
|
