FeiLiao
|
c4d144c5ff
|
Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB
|
2024-01-12 18:48:57 +08:00 |
|
FeiLiao
|
cca42c6e5c
|
修复SQL注入
|
2024-01-12 18:48:53 +08:00 |
|
evoxwht
|
cb092b9fab
|
【系统文档】更新
|
2023-12-28 17:18:25 +08:00 |
|
evoxwht
|
d9c5663edc
|
【程序目录】充值，抽奖，优惠券优化
|
2023-12-23 11:14:16 +08:00 |
|
evoxwht
|
d754080dad
|
【程序目录】客服模版消息优化
|
2023-12-23 11:13:45 +08:00 |
|
evoxwht
|
9e5d67f77e
|
【程序目录】缓存优化
|
2023-12-23 11:13:12 +08:00 |
|
evoxwht
|
20352cc696
|
【程序目录】更新开源v5.2.2版本
|
2023-12-18 12:20:58 +08:00 |
|
evoxwht
|
3d0a0e26a4
|
【程序目录】更新下载小程序代码
|
2023-12-18 12:08:07 +08:00 |
|
FeiLiao
|
3ba352e705
|
修改保存卡密库存问题
|
2023-12-14 14:20:27 +08:00 |
|
等风来，随风去
|
2636d48128
|
update crmeb/app/Request.php.
修改采集时，提交的信息会被截断
Signed-off-by: 等风来，随风去 <136327134@qq.com>
|
2023-12-13 08:55:01 +00:00 |
|
等风来，随风去
|
6e0dfde4cb
|
!74 fix:小程序个人中心广告位无法跳转其他小程序
Merge pull request !74 from xiaoxinzhu/master
|
2023-12-11 01:51:51 +00:00 |
|
等风来，随风去
|
a53e9b0e86
|
!70 fix open_basedir restriction
Merge pull request !70 from cncquan/master
|
2023-12-11 01:48:57 +00:00 |
|
evoxwht
|
0217bcbf40
|
【模版目录】更新开源v5.2.2版本
|
2023-12-05 16:35:46 +08:00 |
|
evoxwht
|
e89a3b96bb
|
【程序目录】更新开源v5.2.2版本
|
2023-12-05 16:34:36 +08:00 |
|
evoxwht
|
2fe78fdecc
|
【程序目录】更新5.2.1
|
2023-12-04 12:04:17 +08:00 |
|
evoxwht
|
a29f60f19c
|
【程序目录】更新5.2.1
|
2023-12-04 11:03:11 +08:00 |
|
evoxwht
|
ccc527cf9f
|
优化dockerfile文件
|
2023-11-23 16:00:16 +08:00 |
|
sugar1569
|
2055d020d3
|
【程序目录】添加demo示例路由文件
* commit 'f3234cbb6ad8161c8c15c6224ac96fe7f1761393': (36 commits)
【程序目录】优化安装提示文字
【程序目录】更新v5.2.1版本
【程序目录】更新v5.2.1版本
【程序目录】更新v5.2.1版本
【模版目录】更新v5.2.1版本
【程序目录】更新v5.2.1版本
【模版目录】更新v5.2.1版本
【程序目录】更新v5.2.1版本
【程序目录】优化用户读取
【程序文档】更新
【程序目录】更新优化
【程序目录】优化图片下载
【程序目录】更新5.2 readme
修改docker容器内无法连接外网的问题
【程序目录】更新5.2
【程序目录】更新5.2
【程序目录】更新5.2
【程序目录】更新5.2
update README.md.
【程序文档】更新5.2
...
# Conflicts:
# .gitignore
# README.md
# crmeb/app/adminapi/controller/UpgradeController.php
# crmeb/app/adminapi/controller/v1/order/StoreOrder.php
# crmeb/app/adminapi/controller/v1/setting/SystemConfig.php
# crmeb/app/services/activity/combination/StoreCombinationServices.php
# crmeb/app/services/agent/AgentLevelServices.php
# crmeb/app/services/product/product/CopyTaobaoServices.php
# crmeb/app/services/user/UserRechargeServices.php
# crmeb/app/services/user/UserSignServices.php
# crmeb/crmeb/services/FileService.php
# crmeb/crmeb/services/SystemConfigService.php
# crmeb/crmeb/utils/DownloadImage.php
# crmeb/public/admin/system_static/css/chunk-vendors.d4d844e5.css
# crmeb/public/install/crmeb.sql
# template/admin/package-lock.json
# template/admin/package.json
# template/admin/src/App.vue
# template/admin/src/api/order.js
# template/admin/src/components/cards/cards.vue
# template/admin/src/components/customerInfo/index.vue
# template/admin/src/components/freightTemplate/city.vue
# template/admin/src/components/from/from.vue
# template/admin/src/components/linkaddress/index.vue
# template/admin/src/components/mobileConfigRightDiy/c_set_up.vue
# template/admin/src/components/mobileConfigRightDiy/c_tab.vue
# template/admin/src/components/uploadImg/index.vue
# template/admin/src/components/uploadPictures/index.vue
# template/admin/src/components/wangEditor/index.vue
# template/admin/src/layout/navBars/breadcrumb/search.vue
# template/admin/src/layout/navBars/breadcrumb/setings.vue
# template/admin/src/layout/navMenu/vertical.vue
# template/admin/src/main.js
# template/admin/src/pages/account/login/index.vue
# template/admin/src/pages/app/wechat/menus/index.vue
# template/admin/src/pages/cms/addArticle/index.vue
# template/admin/src/pages/cms/articleCategory/index.vue
# template/admin/src/pages/finance/billingRecords/index.vue
# template/admin/src/pages/finance/commission/handle/commissionDetails.vue
# template/admin/src/pages/finance/commission/index.vue
# template/admin/src/pages/index/components/baseInfo.vue
# template/admin/src/pages/index/components/gridMenu.vue
# template/admin/src/pages/index/components/visitChart.vue
# template/admin/src/pages/kefu/appChat/feedback.vue
# template/admin/src/pages/kefu/pc/components/baseHeader.vue
# template/admin/src/pages/kefu/pc/index.vue
# template/admin/src/pages/marketing/live/index.vue
# template/admin/src/pages/marketing/lottery/create.vue
# template/admin/src/pages/marketing/recharge/index.vue
# template/admin/src/pages/marketing/sign/index.vue
# template/admin/src/pages/marketing/sign/rewards.vue
# template/admin/src/pages/marketing/storeBargain/create.vue
# template/admin/src/pages/marketing/storeCombination/create.vue
# template/admin/src/pages/marketing/storeCouponIssue/create.vue
# template/admin/src/pages/marketing/storeCouponIssue/index.vue
# template/admin/src/pages/marketing/storeSeckill/create.vue
# template/admin/src/pages/notify/smsConfig/tableList.vue
# template/admin/src/pages/order/invoice/index.vue
# template/admin/src/pages/order/offline/index.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/order/orderList/index.vue
# template/admin/src/pages/order/orderList/orderListDetails.vue
# template/admin/src/pages/product/productAdd/index.vue
# template/admin/src/pages/product/productAttr/addAttr.vue
# template/admin/src/pages/product/productList/index.vue
# template/admin/src/pages/setting/agreement/index.vue
# template/admin/src/pages/setting/devise/diyIndex.vue
# template/admin/src/pages/setting/devise/list.vue
# template/admin/src/pages/setting/devise/users.vue
# template/admin/src/pages/setting/multiLanguage/langList.vue
# template/admin/src/pages/setting/notification/index.vue
# template/admin/src/pages/setting/setSystem/index.vue
# template/admin/src/pages/setting/storage/index.vue
# template/admin/src/pages/setting/storeList/index.vue
# template/admin/src/pages/setting/systemRole/index.vue
# template/admin/src/pages/setting/themeStyle/index.vue
# template/admin/src/pages/statistic/product/components/goodsDetail.vue
# template/admin/src/pages/statistic/product/components/productRanking.vue
# template/admin/src/pages/statistic/transaction/components/toDay.vue
# template/admin/src/pages/statistic/transaction/components/transaction.vue
# template/admin/src/pages/system/backendRouting/index.vue
# template/admin/src/pages/system/clear/index.vue
# template/admin/src/pages/system/codeGeneration/components/TableForm.vue
# template/admin/src/pages/system/crontab/index.vue
# template/admin/src/pages/system/file/index.vue
# template/admin/src/pages/system/group/pc.vue
# template/admin/src/pages/system/group/visualization.vue
# template/admin/src/pages/system/maintain/systemDatabackup/index.vue
# template/admin/src/pages/user/grade/card/index.vue
# template/admin/src/pages/user/grade/right/index.vue
# template/admin/src/pages/user/list/handle/userDetails.vue
# template/admin/src/pages/user/list/index.vue
# template/admin/src/styles/index.less
# template/admin/src/styles/style.css
# template/admin/src/styles/style.less
# template/admin/src/styles/style.scss
# template/admin/src/theme/app.scss
# template/admin/src/theme/element.scss
# template/admin/src/theme/variables.scss
# template/uni-app/components/cartList/index.vue
# template/uni-app/components/catGoodList/index.vue
# template/uni-app/components/privacyAgreementPopup/index.vue
# template/uni-app/components/productWindow/index.vue
# template/uni-app/libs/login.js
# template/uni-app/libs/wechat.js
# template/uni-app/pages.json
# template/uni-app/pages/annex/settled/index.vue
# template/uni-app/pages/goods_cate/goods_cate2.vue
# template/uni-app/pages/goods_cate/goods_cate3.vue
# template/uni-app/pages/users/binding_phone/index.vue
# template/uni-app/pages/users/components/verify/verifyPoint/verifyPoint.vue
# template/uni-app/pages/users/user_phone/index.vue
|
2023-11-22 14:53:36 +08:00 |
|
sugar1569
|
073e9c9c65
|
【程序目录】添加代码注释
|
2023-11-21 16:16:30 +08:00 |
|
sugar1569
|
c885ebfac3
|
【程序目录】优化获取文件目录代码
|
2023-11-17 10:47:01 +08:00 |
|
sugar1569
|
b03f923b95
|
【程序目录】增加排除文件，避免前端和缓存文件写入数据看
|
2023-11-17 10:46:23 +08:00 |
|
sugar1569
|
f7a8915815
|
【模版源码】优化打包时警告
|
2023-11-17 09:15:52 +08:00 |
|
sugar1569
|
fbd04fcc47
|
【模版源码】优化多行下拉多选文本框提示文字
|
2023-11-17 09:13:02 +08:00 |
|
sugar1569
|
d3cf96fc80
|
【程序目录】修改多行文本设置高度不起作用
|
2023-11-17 09:12:08 +08:00 |
|
xiaoxinzhu
|
8cc4a91b1f
|
fix: 拼写错误
fix: 小程序个人中心广告位无法跳转其他小程序
|
2023-11-15 15:42:28 +08:00 |
|
sugar1569
|
f3234cbb6a
|
【程序目录】优化安装提示文字
|
2023-11-11 10:28:17 +08:00 |
|
evoxwht
|
19b71fa7c9
|
【程序目录】更新v5.2.1版本
|
2023-11-10 10:00:09 +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
|
51ba561823
|
【程序目录】更新v5.2.1版本
|
2023-11-09 15:57:17 +08:00 |
|
evoxwht
|
1915f70cc9
|
【模版目录】更新v5.2.1版本
|
2023-11-07 19:09:51 +08:00 |
|
evoxwht
|
98abf89b2a
|
【程序目录】更新v5.2.1版本
|
2023-11-07 19:09:23 +08:00 |
|
evoxwht
|
59b8281011
|
【程序目录】优化用户读取
|
2023-11-06 10:50:53 +08:00 |
|
evoxwht
|
27533a9d95
|
Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB
|
2023-10-31 09:34:46 +08:00 |
|
evoxwht
|
907d158804
|
【程序文档】更新
|
2023-10-31 09:34:42 +08:00 |
|
Q
|
cf45010336
|
Merge branch 'master' of gitee.com:ZhongBangKeJi/CRMEB
|
2023-10-21 11:48:21 +08:00 |
|
等风来，随风去
|
b0f73ead17
|
!67 后台更换域名没有替换完整
Merge pull request !67 from xiaoxinzhu/master
|
2023-10-21 01:22:14 +00:00 |
|
CQ
|
5a33b07c8d
|
fix open_basedir restriction
|
2023-10-19 23:22:48 +08:00 |
|
evoxwht
|
b23b6f9acf
|
【程序目录】更新优化
|
2023-10-12 16:02:05 +08:00 |
|
evoxwht
|
bac210a9ed
|
【程序目录】优化图片下载
|
2023-10-09 15:23:14 +08:00 |
|
evoxwht
|
931bee5af4
|
【程序目录】更新5.2 readme
|
2023-10-08 11:59:27 +08:00 |
|
liaofei
|
55a3c90cc0
|
修改docker容器内无法连接外网的问题
|
2023-09-26 10:19:38 +08:00 |
|
evoxwht
|
f90d1ad963
|
【程序目录】更新5.2
|
2023-09-25 16:30:49 +08:00 |
|
evoxwht
|
a4df4e4f12
|
【程序目录】更新5.2
|
2023-09-22 15:59:18 +08:00 |
|
evoxwht
|
702e0f11e6
|
【程序目录】更新5.2
|
2023-09-21 17:22:46 +08:00 |
|
evoxwht
|
a361647ac9
|
Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB
|
2023-09-21 16:41:33 +08:00 |
|
evoxwht
|
347827015a
|
【程序目录】更新5.2
|
2023-09-21 16:41:30 +08:00 |
|
聆听
|
9d78e41769
|
update README.md.
Signed-off-by: 聆听 <sugar1569@vip.qq.com>
|
2023-09-20 10:36:35 +00:00 |
|
evoxwht
|
8df4a4c29d
|
【程序文档】更新5.2
|
2023-09-20 09:36:05 +08:00 |
|