From-wh
|
a2dfd2f806
|
improve: 替换
|
2023-07-15 14:36:39 +08:00 |
|
From-wh
|
f8b8b7b015
|
improve: 后台组件替换
|
2023-07-12 18:27:01 +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 |
|
From-wh
|
01aadebc80
|
improve: 文字调整
|
2023-06-29 12:13:54 +08:00 |
|
From-wh
|
68d3d84fe5
|
improve: 订单编辑消息弹窗
|
2023-06-29 11:56:37 +08:00 |
|
evoxwht
|
05a9416c70
|
订单修改问题优化
|
2023-06-29 11:20:43 +08:00 |
|
From-wh
|
927cd01ff5
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-06-29 11:02:51 +08:00 |
|
From-wh
|
f01231080d
|
improve: 列表展示
|
2023-06-29 11:02:47 +08:00 |
|
From-wh
|
1ada172f3e
|
improve: 列表筛选
|
2023-06-29 11:02:32 +08:00 |
|
From-wh
|
5939f2d86d
|
fix: 问题修复及优化
|
2023-06-29 11:02:17 +08:00 |
|
evoxwht
|
737f1d93e9
|
更新安装sql
|
2023-06-29 10:04:57 +08:00 |
|
evoxwht
|
3ab4ee9287
|
配置列表排序处理
|
2023-06-29 09:22:40 +08:00 |
|
From-wh
|
bbc60bcfd3
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-06-28 18:43:58 +08:00 |
|