github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-11-03 08:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,758 Commits 19 Branches 21 Tags
Commit Graph

237 Commits

Author SHA1 Message Date
evoxwht
475c8003a0 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-23 17:36:32 +08:00
evoxwht
838d9a5883 积分商品物流显示规格 2023-04-23 17:33:42 +08:00
From-wh
56a982ec25 improve: 聊天样式 2023-04-23 16:37:59 +08:00
From-wh
cbdeee0c2d improve: 商品视频链接处理; 2023-04-23 16:37:44 +08:00
From-wh
dc1c231697 improve: 快递查询页面数据 2023-04-23 10:27:44 +08:00
From-wh
f78daf877d improve: iframe模式判断 2023-04-21 11:53:43 +08:00
evoxwht
bc450db52e 积分商品显示积分样式问题修复 2023-04-20 14:03:20 +08:00
From-wh
f2526ffc69 improve: 优化; 2023-04-19 18:30:22 +08:00
From-wh
40e4273e92 improve: 微信支付字段修改 2023-04-19 09:43:00 +08:00
From-wh
e307c82085 improve: 收藏跳转 2023-04-18 14:49:00 +08:00
From-wh
63f35528bb fix: 总价显示 2023-04-17 12:02:14 +08:00
evoxwht
e0c250db08 Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-15 11:06:44 +08:00
evoxwht
86d1a791f1 修复分销等级页面下方推荐商品图片刷新问题 2023-04-15 11:06:25 +08:00
evoxwht
ed4091c0dc 修复从我的等级里面点击购买商品，底部菜单无法正常选中的问题。 2023-04-14 11:55:26 +08:00
From-wh
01783a2af0 improve: 分类菜单更新 2023-04-14 11:31:07 +08:00
From-wh
06b28d6b6a improve: 充值支付判断; 2023-04-13 16:29:20 +08:00
evoxwht
dd1faf00b3 diy网络问题重新加载页面 2023-04-12 18:32:17 +08:00
evoxwht
92fdd2df8e 优化pc端打开h5页面 2023-04-11 16:57:00 +08:00
evoxwht
9e6ec8c5a0 更新默认数据 2023-04-11 11:17:07 +08:00
evoxwht
eb2bbfe0b4 更新默认数据 2023-04-11 11:11:51 +08:00
From-wh
63ecfbdd92 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-10 18:41:23 +08:00
From-wh
b13734503b improve; 支付配置 2023-04-10 18:41:08 +08:00
evoxwht
467bf0c6d2 移动端首页显示划线价错误问题修复 2023-04-10 10:27:37 +08:00
evoxwht
4a4a522218 Merge branch 'v4.7.0dev' into v5.0.0dev 
# Conflicts:
#	crmeb/route/route.php
 2023-04-06 17:58:03 +08:00
evoxwht
3f5a76dcd5 更新admin路径 2023-04-06 14:30:36 +08:00
From-wh
05542168c9 improve: 分类判断 2023-04-03 16:45:35 +08:00
From-wh
fa18b54944 improve: 客服订单判断 2023-04-03 16:42:30 +08:00
evoxwht
8ce38ec3ac Merge branch 'v4.7.0dev' into v5.0.0dev 2023-04-03 09:28:13 +08:00
From-wh
ea06e5bef0 improve: 分类跳转底部菜单刷新 2023-04-01 18:39:34 +08:00
evoxwht
8a58a1ab85 Merge branch 'v4.7.0dev' into v5.0.0dev 2023-03-31 19:11:05 +08:00
evoxwht
8456a5f935 查看物流页面金额显示问题修复 2023-03-31 17:08:24 +08:00
evoxwht
9d6f9dd6a4 Merge branch 'v4.7.0dev' into v5.0.0dev 
# Conflicts:
#	template/uni-app/pages/goods/order_confirm/index.vue
 2023-03-31 16:13:09 +08:00
From-wh
4ee92f8403 improve: 保底值 2023-03-31 15:56:38 +08:00
From-wh
5aa8fcdf8c improve: 保底值 2023-03-31 15:20:42 +08:00
From-wh
50f9d3c47b Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-31 10:24:20 +08:00
From-wh
e4663fc9a4 style: 已售展示 2023-03-31 10:24:10 +08:00
evoxwht
d69a58899d Merge branch 'v4.7.0dev' into v5.0.0dev 2023-03-31 08:55:26 +08:00
evoxwht
4ea776ba30 发票详情优化金额 2023-03-30 20:52:26 +08:00
evoxwht
6aad9a21b6 中奖记录页面填写收货信息之后刷新页面 2023-03-30 20:51:58 +08:00
evoxwht
db296826c6 核销查看订单页面优化 2023-03-30 20:50:58 +08:00
evoxwht
9717ddeb14 优化移动端订单发货 2023-03-30 20:50:38 +08:00
evoxwht
45ed8cdd87 砍价商品返回按钮在小程序上不显示 2023-03-30 20:50:22 +08:00
evoxwht
08e41ae0a8 评价商品显示金额问题处理 2023-03-30 17:46:50 +08:00
evoxwht
5585c699a8 Merge branch 'v4.7.0dev' into v5.0.0dev 2023-03-29 20:10:28 +08:00
From-wh
341added5f Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 17:26:32 +08:00
From-wh
7451a0118b fix: 拼团选购 2023-03-29 17:25:27 +08:00
evoxwht
8d1e4fb677 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-29 17:24:21 +08:00
evoxwht
397ec0c48f 优化代码 2023-03-29 17:24:17 +08:00
From-wh
91b0c98929 Merge branch 'v4.7.0dev' into v5.0.0dev 
# Conflicts:
#	crmeb/app/api/controller/v1/order/StoreOrderController.php
#	crmeb/app/listener/notice/NoticeListener.php
#	template/admin/src/styles/style.css
#	template/admin/src/utils/modalForm.js
#	template/uni-app/pages/goods/order_confirm/index.vue
#	template/uni-app/pages/users/user_info/index.vue
 2023-03-29 16:05:29 +08:00
From-wh
bb6e74b2aa improve: title样式 2023-03-29 16:00:18 +08:00