github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-11-04 00:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,669 Commits 19 Branches 21 Tags
Commit Graph

3669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
evoxwht
02716e0227 小程序订单管理的缓存问题处理 2023-07-06 18:12:03 +08:00
evoxwht
5dc72970ee 秒杀无法下单问题修复 2023-07-06 18:11:52 +08:00
evoxwht
f0389d7348 优惠券总数问题修复 2023-07-06 18:11:00 +08:00
evoxwht
e77ab14af1 增加打印sql方法 2023-07-06 18:09:24 +08:00
From-wh
04cf5d4df4 style: form表单文字 2023-07-06 14:45:31 +08:00
From-wh
1f664c8ffa Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-07-05 16:01:27 +08:00
From-wh
cd0152241e improve: gitee问题处理 2023-07-05 16:01:17 +08:00
evoxwht
6d8a7dd6e1 增加抽奖判断必须有一个未中奖 2023-07-04 18:09:32 +08:00
evoxwht
7e913a1df3 修改在小程序上面授权的时候展示微信登录，改为授权登录 2023-07-04 18:09:14 +08:00
evoxwht
afbc6fba0e 更新扫码上传时候的报错 2023-07-04 18:08:44 +08:00
From-wh
e4bd6e4870 style: 优惠券搜索文字 2023-07-04 18:03:25 +08:00
From-wh
3bee77da19 improve: 图片移动判断 2023-07-04 16:16:10 +08:00
From-wh
0bc05d6f19 Merge branch 'v5.1.0dev' into v5.1.0-el 
# Conflicts:
#	template/admin/src/components/linkaddress/index.vue
#	template/admin/src/components/uploadPictures/index.vue
#	template/admin/src/pages/finance/financialRecords/recharge/index.vue
#	template/admin/src/pages/kefu/pc/components/delivery.vue
#	template/admin/src/pages/kefu/pc/index.vue
#	template/admin/src/pages/marketing/point_statistic/index.vue
#	template/admin/src/pages/marketing/storeCouponIssue/create.vue
#	template/admin/src/pages/marketing/storeCouponIssue/index.vue
#	template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue
#	template/admin/src/pages/notify/smsConfig/components/register.vue
#	template/admin/src/pages/notify/smsConfig/index.vue
#	template/admin/src/pages/order/invoice/index.vue
#	template/admin/src/pages/order/orderList/components/tableFrom.vue
#	template/admin/src/pages/order/orderList/components/tableList.vue
#	template/admin/src/pages/order/orderList/handle/orderDetails.vue
#	template/admin/src/pages/order/orderList/handle/orderSend.vue
#	template/admin/src/pages/product/productAdd/index.vue
#	template/admin/src/pages/product/productAdd/taoBao.vue
#	template/admin/src/pages/product/productList/taoBao.vue
#	template/admin/src/pages/setting/devise/list.vue
#	template/admin/src/pages/setting/freight/index.vue
#	template/admin/src/pages/setting/storage/index.vue
#	template/admin/src/pages/setting/user/index.vue
#	template/admin/src/pages/system/systemMenus/components/menusFrom.vue
#	template/admin/src/pages/system/systemMenus/index.vue
#	template/admin/src/pages/user/grade/card/index.vue
#	template/admin/src/styles/style.css
#	template/uni-app/pages/index/diy/components/pictureCube.vue
 2023-07-04 16:15:51 +08:00
From-wh
f9417ba5ec improve: 后台组件替换 2023-07-04 09:46:41 +08:00
From-wh
2dfb163a59 style: 配送方式样式 2023-07-03 18:06:59 +08:00
From-wh
70af5b77c9 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-07-03 17:49:05 +08:00
From-wh
b7fd9a11b1 improve: 领取节流 2023-07-03 17:49:02 +08:00
吴昊天
bb867f7517
!64 fix: 修正同步路由函数中删除不存在路由时索引不存在错误 
Merge pull request !64 from phantom/N/A
 2023-07-03 08:11:18 +00:00
evoxwht
e92d41c9bc 优惠券提示问题修复 2023-07-03 16:06:30 +08:00
evoxwht
0ef2a5d1af 优化领取后多少天内有效最大值 2023-07-03 16:06:21 +08:00
evoxwht
44f4c3ba3b 优化付费会员计算 2023-07-03 14:39:02 +08:00
phantom
1197d9dc23
fix: 修正同步路由函数中删除不存在路由时索引不存在错误 
Signed-off-by: phantom <563789445@qq.com>
 2023-07-03 04:44:15 +00:00
From-wh
af17a94b43 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-07-03 11:51:45 +08:00
From-wh
b371885024 improve: 领取优惠券列表/判断 2023-07-03 11:51:42 +08:00
From-wh
2c5520bead improve: 后台列表字号 2023-07-03 11:51:26 +08:00
evoxwht
67bfb5a911 规格图片下载 2023-07-03 11:36:23 +08:00
evoxwht
f0e2518685 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-07-03 11:15:19 +08:00
evoxwht
51cf0c9e6a 优惠券使用时间和领取时间判断。 2023-07-03 11:15:16 +08:00
From-wh
4516d066e9 improve: 上传弹窗 2023-07-01 10:40:34 +08:00
evoxwht
0a9733ffb5 style：修改一号通样式 2023-07-01 10:17:38 +08:00
From-wh
8c7b2d71f0 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-30 16:59:25 +08:00
From-wh
ac50a71b97 improve: 分类选中 2023-06-30 16:59:21 +08:00
evoxwht
439b756fa3 1 2023-06-30 16:36:54 +08:00
From-wh
ff67c6f55d Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-30 15:08:54 +08:00
From-wh
2fba04180d improve: 上传图片 2023-06-30 15:08:51 +08:00
evoxwht
7996a25649 修改一号通页面链接 2023-06-30 14:29:21 +08:00
From-wh
4c2ae607e8 fix: 发货type 2023-06-30 14:28:13 +08:00
From-wh
0022d078e5 improve: 分类展示 2023-06-30 14:20:35 +08:00
From-wh
7e3c8a9678 improve: 上传组件initData 2023-06-30 14:10:43 +08:00
From-wh
3c873061cb improve: 商品管理详情商品跳转 2023-06-30 10:09:27 +08:00
evoxwht
1d822637c9 更新一号通请求接口 2023-06-29 17:04:00 +08:00
evoxwht
37aef7f10d Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-29 15:52:39 +08:00
evoxwht
a2745353d3 更新 2023-06-29 15:52:35 +08:00
From-wh
e475b34f3e improve: 调整列表 2023-06-29 15:51:30 +08:00
From-wh
d327ff9c47 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-29 15:34:30 +08:00
From-wh
87c6534d75 improve: 列表title展示及分类图片加载 2023-06-29 15:34:24 +08:00
evoxwht
775b7ba532 Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-29 14:49:54 +08:00
evoxwht
cea8f4ef15 更新版本号 2023-06-29 14:49:50 +08:00
From-wh
f2f24e00cc Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev 2023-06-29 12:15:41 +08:00
From-wh
1d52f4e11e improve: 优惠券样式 2023-06-29 12:15:37 +08:00