215 Commits

Author SHA1 Message Date
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
From-wh
8e50bffe0b style: 华为手机文字展示 2023-03-29 15:59:06 +08:00
From-wh
82b88e7d6c improve: 分类切换更新缓存 2023-03-29 12:16:14 +08:00
From-wh
d35a07311b improve: 移动端优化 2023-03-28 18:11:17 +08:00
From-wh
9be3c34872 improve: 样式及方法优化 2023-03-28 14:13:07 +08:00
From-wh
6061c44c0e improve: 样式及积分下单数量 2023-03-27 19:40:15 +08:00
From-wh
7c6136e6aa Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-27 16:38:06 +08:00
From-wh
402fa12d1d improve: 优化 2023-03-27 16:37:57 +08:00
evoxwht
49d341b75b 积分订单用户详情 2023-03-27 16:03:33 +08:00
From-wh
dfdb8ef2e9 improve: 优化及问题修复 2023-03-27 14:07:44 +08:00
From-wh
23d35933e7 improve: vip图标及跳转 2023-03-27 09:07:59 +08:00
From-wh
f8d78c47aa improve: 视频尺寸 2023-03-24 16:52:42 +08:00
From-wh
673c9f7d57 improve: 样式及体验优化 2023-03-24 16:20:53 +08:00
From-wh
2411b07ead fix: 参数 2023-03-24 15:00:31 +08:00
From-wh
cef6c368ed improve: 优化 2023-03-24 14:55:39 +08:00
From-wh
0e9454932f improve: 接口条件/页面title 2023-03-24 11:03:04 +08:00
From-wh
8524c640d5 style: 划线价 2023-03-24 10:09:02 +08:00
From-wh
7ba85c0eef improve: uni问题处理 2023-03-23 18:22:29 +08:00
From-wh
c963500a95 improve: 移动端问题处理 2023-03-23 14:02:53 +08:00
From-wh
f8447c4868 Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev 2023-03-22 17:46:13 +08:00
From-wh
a296d76eda improve: 个人中心手机号获取优化 2023-03-22 17:46:04 +08:00
From-wh
2593180cb7 fix: 代付分享订单信息展示问题 2023-03-22 17:45:46 +08:00
From-wh
523a336b5c style: 展示 2023-03-22 17:45:17 +08:00