From-wh
|
39a04c2739
|
Merge branch 'v5.2.0dev' into v5.1.0-el
# Conflicts:
# template/admin/src/pages/marketing/storeCouponIssue/index.vue
# template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
# template/admin/src/pages/order/orderList/handle/orderDetails.vue
# template/admin/src/pages/product/productAdd/index.vue
# template/admin/src/pages/product/productList/index.vue
# template/admin/src/pages/system/backendRouting/index.vue
# template/admin/src/pages/user/list/handle/userDetails.vue
# template/admin/src/pages/user/list/index.vue
|
2023-07-15 14:54:06 +08:00 |
|
From-wh
|
a2dfd2f806
|
improve: 替换
|
2023-07-15 14:36:39 +08:00 |
|
evoxwht
|
be082294b2
|
优化分销配置显示
|
2023-07-15 10:40:09 +08:00 |
|
evoxwht
|
f3d254c858
|
更新readme
|
2023-07-15 09:44:41 +08:00 |
|
evoxwht
|
c61f90ba76
|
更新readme
|
2023-07-15 09:41:25 +08:00 |
|
evoxwht
|
bcb2c9226e
|
更新readme
|
2023-07-14 17:51:36 +08:00 |
|
evoxwht
|
89e178da4a
|
更新readme
|
2023-07-14 17:48:38 +08:00 |
|
evoxwht
|
bce1b79b35
|
更新readme
|
2023-07-14 17:46:33 +08:00 |
|
evoxwht
|
f8ef76fd64
|
更新开源文档
|
2023-07-14 17:45:08 +08:00 |
|
evoxwht
|
b2002b437f
|
修复PC模板底部的备案号和公安备案点击没反应，无法跳转。
|
2023-07-14 10:05:06 +08:00 |
|
evoxwht
|
5b33bbcb00
|
更新安装sql
|
2023-07-13 14:03:35 +08:00 |
|
evoxwht
|
66d96b2c4f
|
腾讯云云存储问题修复
|
2023-07-13 14:03:24 +08:00 |
|
evoxwht
|
fdf6d95503
|
更新版本号
|
2023-07-13 09:58:34 +08:00 |
|
evoxwht
|
240bdf8414
|
更新版本号
|
2023-07-13 09:54:49 +08:00 |
|
From-wh
|
f8b8b7b015
|
improve: 后台组件替换
|
2023-07-12 18:27:01 +08:00 |
|
evoxwht
|
4b7249bec0
|
处理小程序授权并绑定手机号之后，App授权还需要绑定手机号。
|
2023-07-11 16:10:42 +08:00 |
|
From-wh
|
a157e8f1f4
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-07-11 16:04:16 +08:00 |
|
From-wh
|
dd36be8d34
|
improve: 图片选择弹窗
|
2023-07-11 16:04:08 +08:00 |
|
evoxwht
|
5a91e71842
|
用户注销过，再次进行推荐不送推广佣金
|
2023-07-10 18:18:52 +08:00 |
|
evoxwht
|
f6c512e3aa
|
更新升级程序
|
2023-07-10 18:12:38 +08:00 |
|
evoxwht
|
1f39074f5c
|
更新升级程序
|
2023-07-10 11:12:09 +08:00 |
|
evoxwht
|
eb06be1a40
|
更新升级程序
|
2023-07-10 10:57:24 +08:00 |
|
evoxwht
|
d89c1aecdd
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-07-07 15:40:53 +08:00 |
|
evoxwht
|
efbdff321e
|
更新安装sql
|
2023-07-07 15:40:49 +08:00 |
|
evoxwht
|
7c4209d69c
|
对外接口优化
|
2023-07-07 15:40:40 +08:00 |
|
evoxwht
|
ac91d37bb3
|
更新升级程序
|
2023-07-07 15:40:18 +08:00 |
|
From-wh
|
f99091e237
|
improve: 报错信息展示
|
2023-07-07 14:42:33 +08:00 |
|
From-wh
|
9aa2c1e3f1
|
improve: 接口管理判断
|
2023-07-07 14:24:48 +08:00 |
|
From-wh
|
8ae7c23dfe
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-07-07 11:23:14 +08:00 |
|
From-wh
|
6a541b2ba4
|
improve: 订单商品信息展示/商品筛选分类选择
|
2023-07-07 11:23:05 +08:00 |
|
evoxwht
|
b66c12e348
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-07-07 11:05:25 +08:00 |
|
evoxwht
|
eb3ffc21c5
|
更新安装sql
|
2023-07-07 11:05:19 +08:00 |
|
evoxwht
|
fc950ce4a1
|
积分订单增加后台删除
|
2023-07-07 11:05:10 +08:00 |
|
evoxwht
|
3e9fb17cdc
|
优化积分订单数据
|
2023-07-07 11:04:56 +08:00 |
|
From-wh
|
f06dcb0d07
|
improve: 抽屉关闭方式
|
2023-07-07 10:35:17 +08:00 |
|
From-wh
|
f1bd2cb7ed
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-07-07 10:29:12 +08:00 |
|
From-wh
|
e00166ca3e
|
improve: 购买数量填写限制
|
2023-07-07 10:29:04 +08:00 |
|
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 |
|