hainan

a7544e01c5 去掉TODO 李可松 2021-09-05 12:08:25 +0800
f49d60057a 增加组合产品库存和状态判断李可松 2021-09-05 12:05:32 +0800
5baf26b642 人气列表销量排序李可松 2021-09-05 11:07:51 +0800
a5b024d915 模糊搜索和快速搜索李可松 2021-09-05 11:03:03 +0800
fc0d73e55f 增加下单判断where和return 李可松 2021-09-05 10:52:06 +0800
4d0c9cc03e return $this->error 李可松 2021-09-05 10:49:24 +0800
e6a8848bf5 作者字段和排序字段判断，文章列表增加大图切换switch 李可松 2021-09-05 10:49:04 +0800
70fea770c6 创建订单增加agent_cloud_pid和agent_cloud_price字段的保存，并优化库存判断李可松 2021-09-04 00:34:40 +0800
72c611d8f7 增加组团版旅行社订单列表李可松 2021-09-03 19:12:05 +0800
a51deabab8 组团云产品发布的相关修改李可松 2021-09-03 18:16:54 +0800
df5c426a91 增加pay_type_text 李可松 2021-09-03 17:41:19 +0800
2479f3fcfa Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-03 17:35:18 +0800
d9bdf77196 订单详情增加联系人和电话字段李可松 2021-09-03 17:35:11 +0800
ddee0666c3 Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-03 16:58:56 +0800
a202810fed 优化 lemon 2021-09-03 16:58:47 +0800
cdf3726c05 修改logo旁标题李可松 2021-09-03 16:58:47 +0800
d921425b63 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-03 16:54:56 +0800
3d4c6c47d2 处理定金/订金的超时逻辑李可松 2021-09-03 16:54:47 +0800
684ea5dcae Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-03 16:34:34 +0800
7585ec7614 财务统计 lemon 2021-09-03 16:34:26 +0800
00add4ec0c 增加线下未付款处理李可松 2021-09-03 15:18:28 +0800
c85115bcac Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-03 14:53:23 +0800
f4440e771c 线下付款提交订单后返回订单id 李可松 2021-09-03 14:53:16 +0800
398e7c5e22 项目初始化说明李可松 2021-09-03 14:46:09 +0800
ccf7e66677 Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-03 14:00:39 +0800
6dc7286067 短信 lemon 2021-09-03 14:00:28 +0800
ac91d7bfa2 去掉用户核销设置李可松 2021-09-03 12:39:46 +0800
53f44c08e2 入驻新用户role_id权限值为2 李可松 2021-09-03 10:55:53 +0800
6540d6caa8 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-03 10:53:59 +0800
3180ee2c06 图片加域名李可松 2021-09-03 10:53:51 +0800
1714d3d1b1 自动上架 lemon 2021-09-03 10:24:45 +0800
f7f1635311 权限 lemon 2021-09-03 10:01:57 +0800
0f08affa22 Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-03 09:46:45 +0800
f26dd3fda8 状态 lemon 2021-09-03 09:46:37 +0800
10ecbe33e9 超时订单定时任务增加已付定金状态李可松 2021-09-03 09:39:55 +0800
fb25dff6d1 订单编辑修改李可松 2021-09-03 00:23:29 +0800
d043fea252 订单产品信息修改李可松 2021-09-02 23:19:45 +0800
c8f2ef284f 处理定金支付订单超时李可松 2021-09-02 22:27:29 +0800
ff853aef5b Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-02 19:16:48 +0800
ee7db2a5f0 组团版旅行社添加产品李可松 2021-09-02 19:16:36 +0800
6c99394a56 入驻比例 lemon 2021-09-02 19:10:00 +0800
c25d489dff 总后台 lemon 2021-09-02 19:05:33 +0800
4427c33bd8 Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-02 18:28:37 +0800
67fcb3136f 供应商 lemon 2021-09-02 18:28:28 +0800
4a33c2fc0c `order_product_items`增加num和price字段李可松 2021-09-02 15:53:38 +0800
5398ea2db7 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-02 15:33:04 +0800
224b323f58 组合产品需要总后台审核李可松 2021-09-02 15:32:56 +0800
f1302bccd0 首页 lemon 2021-09-02 15:04:03 +0800
d129e72c50 增加组合产品需要审核，修改AgentProductItem的处理逻辑李可松 2021-09-02 13:03:46 +0800
2bcb08f7a5 Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-02 11:25:24 +0800
4a5eed0d7b 新增用户 lemon 2021-09-02 11:25:14 +0800
ec23afc667 分成比例李可松 2021-09-02 11:15:43 +0800
8452a8f77f 'rate' => '分成比例', 李可松 2021-09-02 11:02:44 +0800
9bd4e12992 修改器修改李可松 2021-09-02 10:19:05 +0800
e359d81c53 订单统计 lemon 2021-09-02 10:07:01 +0800
cd9f6d2121 修改同步逻辑李可松 2021-09-02 10:06:38 +0800
9fc517f27d 供应商修改产品同步关键字段到代理商产品李可松 2021-09-01 18:43:34 +0800
24ee0442fc 修改库存不足时提示数量李可松 2021-09-01 18:42:15 +0800
49f3d741a5 修改错误提示为error 李可松 2021-09-01 17:27:31 +0800
338ee9a7e6 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-01 17:20:15 +0800
692ec0c3cb 修复订单超时计算的BUG 李可松 2021-09-01 17:20:09 +0800
28dc4fe74d Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-01 16:54:17 +0800
27f86655ce 111 lemon 2021-09-01 16:54:00 +0800
e88c1fbc80 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-01 16:41:07 +0800
af9886f6ac 1、列表增加直接修改库存；2、上下架按钮增加和修改库存增加供应商库存和产品状态的判断；李可松 2021-09-01 16:41:00 +0800
ef574892aa Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-01 16:30:45 +0800
6e156601b4 处理item lemon 2021-09-01 16:30:34 +0800
ae89fca32c Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-01 16:23:54 +0800
89babdfa72 核销修改李可松 2021-09-01 16:23:45 +0800
0853ec956c Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-01 16:14:20 +0800
275a47b5fd 模型 lemon 2021-09-01 16:14:11 +0800
27e18a3a1d Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-01 16:12:29 +0800
0a789218a3 修改生成二维码参数李可松 2021-09-01 16:12:22 +0800
c49e64fb57 异常 lemon 2021-09-01 15:38:54 +0800
1aac8bb9ff Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-01 15:16:54 +0800
a3fe9a1d5f 自动上架触犯时机 lemon 2021-09-01 15:16:44 +0800
e1bbc46ca4 项目初始化记录李可松 2021-09-01 15:08:52 +0800
ab563365e6 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-09-01 15:07:14 +0800
2d6694c4f8 订单超时检测回库存定时器李可松 2021-09-01 15:07:05 +0800
2f3ca61b54 查看订单时直接生成核销码李可松 2021-09-01 15:02:00 +0800
3d130a6bc3 Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-09-01 14:18:05 +0800
899549976d 自动上架优化 lemon 2021-09-01 14:16:44 +0800
2221760c84 增加订单超时字段和库存判断增加乐观锁李可松 2021-09-01 11:54:37 +0800
c6e3bf9049 订单默认1440分钟改为60 李可松 2021-09-01 10:59:19 +0800
df86e91e2c 不允许查看非自己的数据优化李可松 2021-09-01 10:38:45 +0800
f6960144b4 排序李可松 2021-09-01 09:41:37 +0800
29425379f4 测试专用李可松 2021-09-01 09:37:36 +0800
2b846e6a52 增加OrderProductItem 李可松 2021-09-01 00:38:51 +0800
90c7c5db62 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-08-31 22:58:31 +0800
f16dd2ad42 修改订单超时时间相关逻辑李可松 2021-08-31 18:40:20 +0800
6dc0ba4938 设置“已线下付款”之后生成核销码李可松 2021-08-31 18:20:11 +0800
439e81a493 增加模型关联李可松 2021-08-31 18:17:02 +0800
1ba46d8be4 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-08-31 16:32:01 +0800
fbf08ffc78 增加分账参数profit_sharing 李可松 2021-08-31 16:31:54 +0800
21e87e80fc 核销 lemon 2021-08-31 16:23:47 +0800
4d95a8cbb0 隐藏 lemon 2021-08-31 15:39:53 +0800
97eebfbf9e Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop lemon 2021-08-31 15:04:19 +0800
7cee7c3ecc 手机号绑定 lemon 2021-08-31 15:04:12 +0800
f9c6d8a4e1 增加OFFLINE_PAID订单状态李可松 2021-08-31 14:31:36 +0800
6f60b02817 Merge remote-tracking branch 'origin/develop' into develop 李可松 2021-08-31 14:25:47 +0800

Commit Graph Select branches Hide Pull Requests dev develop master Mono Color

Commit Graph

Select branches

Hide Pull Requests

dev

develop

master