1038 Commits

Author SHA1 Message Date
吴昊天
3b28ee6bcf Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB 2024-09-14 15:06:58 +08:00
吴昊天
8a20c9810e 【模版目录】优化后台提示跳转 2024-09-14 15:06:24 +08:00
刘轶
407599a2c9
当微信小程序没有申请该API时,提示错误
Signed-off-by: 刘轶 <dalian_liuyi@aliyun.com>
2024-08-21 11:58:48 +00:00
吴昊天
d0ce7c66a0 【模版目录】更新模版文件 2024-07-15 14:37:28 +08:00
吴昊天
9e1a8c3671 【程序目录】更新开源5.4版本 2024-06-27 12:13:53 +08:00
evoxwht
a8d87b841d 【模版目录】更新v5.3.0 2024-03-26 17:02:20 +08:00
evoxwht
2512145b01 【模版目录】更新v5.3.0 2024-03-26 15:40:19 +08:00
sugar1569
086816ec78 【前端源文件】添加容器运行,还需要测试 2024-03-12 21:04:24 +08:00
等风来,随风去
6e0dfde4cb
!74 fix:小程序个人中心广告位无法跳转其他小程序
Merge pull request !74 from xiaoxinzhu/master
2023-12-11 01:51:51 +00:00
evoxwht
0217bcbf40 【模版目录】更新开源v5.2.2版本 2023-12-05 16:35:46 +08:00
sugar1569
f7a8915815 【模版源码】优化打包时警告 2023-11-17 09:15:52 +08:00
sugar1569
fbd04fcc47 【模版源码】优化多行下拉多选文本框提示文字 2023-11-17 09:13:02 +08:00
xiaoxinzhu
8cc4a91b1f fix: 拼写错误
fix: 小程序个人中心广告位无法跳转其他小程序
2023-11-15 15:42:28 +08:00
evoxwht
27c1c23657 【程序目录】更新v5.2.1版本 2023-11-09 16:48:38 +08:00
evoxwht
2d1eb45987 【程序目录】更新v5.2.1版本 2023-11-09 16:48:19 +08:00
evoxwht
aadb1ef482 【模版目录】更新v5.2.1版本 2023-11-09 15:57:26 +08:00
evoxwht
1915f70cc9 【模版目录】更新v5.2.1版本 2023-11-07 19:09:51 +08:00
evoxwht
14547d9865 【模版目录】更新5.2 2023-09-19 15:06:58 +08:00
evoxwht
3baeb2c744 更新开源 2023-07-17 14:10:10 +08:00
evoxwht
1e7c471c39 增加商品起购数量 2023-07-17 11:48:15 +08:00
evoxwht
fcc7e1e92c 处理合并冲突 2023-07-17 09:44:03 +08:00
evoxwht
cdde070e08 增加提现手续费 2023-07-15 15:50:15 +08:00
evoxwht
831d4df3d8 更新默认文件 2023-07-15 15:07:03 +08:00
From-wh
e5e882e4f7 imporve: 组件替换 2023-07-15 15:00:18 +08:00
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
fdf6d95503 更新版本号 2023-07-13 09:58:34 +08:00
From-wh
f8b8b7b015 improve: 后台组件替换 2023-07-12 18:27:01 +08:00
From-wh
dd36be8d34 improve: 图片选择弹窗 2023-07-11 16:04:08 +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
fc950ce4a1 积分订单增加后台删除 2023-07-07 11:05:10 +08:00
From-wh
f06dcb0d07 improve: 抽屉关闭方式 2023-07-07 10:35:17 +08:00
From-wh
e00166ca3e improve: 购买数量填写限制 2023-07-07 10:29:04 +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
7e913a1df3 修改在小程序上面授权的时候展示微信登录,改为授权登录 2023-07-04 18:09:14 +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
evoxwht
0ef2a5d1af 优化领取后多少天内有效最大值 2023-07-03 16:06:21 +08:00
From-wh
b371885024 improve: 领取优惠券列表/判断 2023-07-03 11:51:42 +08:00