1727 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
From-wh	b7be6716a5	improve: 商品编辑批量设置判断	2023-02-20 11:39:15 +08:00
From-wh	901c4bdd52	fix: 抽奖优惠券标签展示	2023-02-20 11:38:46 +08:00
From-wh	74d6bbf069	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 17:44:10 +08:00
From-wh	f2d8547f50	style: 下单页备注样式	2023-02-18 17:44:01 +08:00
From-wh	f25d936c4d	improve: 支付宝支付	2023-02-18 17:43:35 +08:00
From-wh	e3b08cbd71	style: 提示信息	2023-02-18 17:43:05 +08:00
liaofei	38a4e47334	修复购买SVIP吊起支付问题	2023-02-18 17:30:29 +08:00
liaofei	83393b3e1b	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 17:09:37 +08:00
liaofei	2542ab3615	修改支付	2023-02-18 17:09:32 +08:00
From-wh	f09a5f21de	improve: 用户信息展示优化	2023-02-18 16:45:56 +08:00
From-wh	6b4ee7829c	improve: 订单创建	2023-02-18 16:45:36 +08:00
From-wh	030ea55206	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 16:30:10 +08:00
From-wh	c3d6c24d17	improve: 失效优惠券跳转	2023-02-18 16:29:59 +08:00
From-wh	e60f17553d	style: 秒杀列表文字	2023-02-18 16:29:34 +08:00
From-wh	2c07999a9a	style: 分享文字	2023-02-18 16:29:07 +08:00
From-wh	f39dc96313	improve: 规格排序优化	2023-02-18 16:28:54 +08:00
From-wh	44f420f885	feat: 新增暂不支付	2023-02-18 16:28:10 +08:00
吴昊天	b1c869cf4b	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 14:12:14 +08:00
吴昊天	c0dddf3007	更新页面文字错误，下拉框显示问题	2023-02-18 14:12:10 +08:00
吴昊天	aff05dc85c	批量修改商品时候选择运费设置不修改特殊类型商品	2023-02-18 14:11:43 +08:00
吴昊天	2e0326b5d9	收货重复记录订单状态修复	2023-02-18 14:10:54 +08:00
吴昊天	3a12ad7b61	商品退优惠券增加订单状态	2023-02-18 14:10:22 +08:00
吴昊天	a1e95884c8	系统自带图片增加域名	2023-02-18 14:09:59 +08:00
吴昊天	a05ccb6124	积分订单状态倒叙排列	2023-02-18 14:09:23 +08:00
From-wh	19921c23fe	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 12:07:15 +08:00
From-wh	c7525cd397	style: 活动文字样式	2023-02-18 12:07:03 +08:00
From-wh	5f34c22d08	improve: 分类diy类型传值	2023-02-18 12:06:48 +08:00
From-wh	d36f2a24f3	improve: 积分订单更多操作	2023-02-18 12:06:21 +08:00
liaofei	f11272548a	更新SQL	2023-02-18 11:55:25 +08:00
liaofei	c7d89d9024	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev ... # Conflicts: # crmeb/app/services/order/StoreOrderServices.php	2023-02-18 11:46:07 +08:00
liaofei	db085a8556	调整支付，修复前台管理页面展示金额错误	2023-02-18 11:44:54 +08:00
From-wh	6d5d2e9378	fix: 后台分类切换	2023-02-18 11:36:29 +08:00
From-wh	399d1e4c78	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 11:06:49 +08:00
From-wh	6d41caa5e0	fix: app邀请码展示	2023-02-18 11:06:42 +08:00
From-wh	920fda2161	improve: 样式及数据优化	2023-02-18 11:03:48 +08:00
From-wh	77b24ac7d8	improve: 信息展示	2023-02-18 11:03:10 +08:00
吴昊天	54862edb3c	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 10:48:35 +08:00
吴昊天	f0ff4a3e7f	处理pc显示订单总数	2023-02-18 10:48:31 +08:00
吴昊天	f14a7a2eeb	修改文字	2023-02-18 10:48:16 +08:00
liaofei	be7b958dac	修改配置	2023-02-18 10:32:12 +08:00
liaofei	87315a26f5	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 10:02:32 +08:00
liaofei	621a71caed	调整PC下单支付不配置微信公众号appid使用pc登录的appid	2023-02-18 10:02:14 +08:00
From-wh	143f636bb6	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 10:00:36 +08:00
From-wh	fc5b2a8416	improve: 控制台报错处理	2023-02-18 09:58:28 +08:00
From-wh	c3f5a39cb2	improve: 优化展示	2023-02-18 09:57:58 +08:00
liaofei	3b83992edb	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-18 09:55:51 +08:00
liaofei	53a5b64edd	修复拼团详情展示拼团退款订单问题	2023-02-18 09:55:38 +08:00
吴昊天	fd8cabe9a8	Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev	2023-02-17 18:47:18 +08:00
吴昊天	c0173e02ea	优化定时任务	2023-02-17 18:47:14 +08:00
liaofei	20102bcbee	修复推广订单页面加载问题	2023-02-17 17:52:15 +08:00