86 Commits

Author SHA1 Message Date
吴昊天
9e1a8c3671 【程序目录】更新开源5.4版本 2024-06-27 12:13:53 +08:00
evoxwht
c05e878f33 【程序目录】更新v5.3.0 2024-03-26 15:48:00 +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
evoxwht
98abf89b2a 【程序目录】更新v5.2.1版本 2023-11-07 19:09:23 +08:00
evoxwht
9ea5d9d11a 【程序目录】更新5.2 2023-09-19 14:56:53 +08:00
liaofei
0774aeb563 增加删除扫码接口 2023-06-26 09:24:30 +08:00
liaofei
3aed087cf3 修改优惠卷 2023-06-25 09:53:41 +08:00
liaofei
fb4622cd53 增加接口 2023-06-16 15:36:46 +08:00
evoxwht
c48dc8ec7e 网络图片后台上传 2023-06-13 18:22:04 +08:00
evoxwht
c73fa859b8 扫码上传优化 2023-06-13 17:45:45 +08:00
evoxwht
34b7ad1b92 获取扫码上传的图片数据
获取扫码上传页面链接以及参数
2023-06-13 17:27:02 +08:00
evoxwht
fbe9a80577 更新扫码上传图片 2023-06-13 16:52:39 +08:00
liaofei
81a73688b5 修改路由 2023-05-22 09:40:36 +08:00
liaofei
01afb0f6e7 新增商家寄件问题 2023-05-15 18:20:12 +08:00
evoxwht
31598ecdd6 清除缓存问题优化,卡密商品库存处理 2023-05-09 11:24:18 +08:00
evoxwht
ed3f9a35d9 更新版本号,优化获取电子面单模版接口 2023-05-05 14:13:15 +08:00
evoxwht
1612dcaaa2 更新路由 2023-04-25 20:08:39 +08:00
liaofei
d2da36973e 修改路由 2023-04-25 16:32:38 +08:00
evoxwht
c8fe5ea149 更新路由 2023-04-25 11:57:00 +08:00
evoxwht
6bafe0dd0e 更新路由 2023-04-25 11:41:06 +08:00
evoxwht
6fe81abf3d 更新路由 2023-04-25 11:26:46 +08:00
evoxwht
9198850c70 更新路由 2023-04-25 11:08:12 +08:00
evoxwht
7ae042ffb0 更新路由 2023-04-25 09:54:53 +08:00
liaofei
950b4a3ed0 修改生成 2023-04-24 15:21:02 +08:00
liaofei
a6f258a264 修改路由分类 2023-04-21 16:03:41 +08:00
liaofei
e9162d657c 增加接口 2023-04-20 18:03:43 +08:00
liaofei
ea30000dd3 增加权限分类 2023-04-20 10:48:05 +08:00
liaofei
b9a17258cc 调整路由 2023-04-17 15:56:04 +08:00
liaofei
e7eee37ecc 修改路由 2023-04-17 11:44:00 +08:00
liaofei
5cf2bb7868 修改下载路由 2023-04-17 10:56:53 +08:00
liaofei
65ddd7a360 修复删除问题 2023-04-15 14:14:09 +08:00
liaofei
3ad1b8f046 增加下载文件接口 2023-04-15 12:06:45 +08:00
liaofei
3fc5695579 增加后台接口打包 2023-04-14 17:23:20 +08:00
liaofei
1ee97a89f4 调整crud模板 2023-04-14 12:32:04 +08:00
liaofei
da9bacdc9f 增加查看crud接口 2023-04-12 16:59:17 +08:00
evoxwht
f5fa1b7134 更新数据表或者表字段备注 2023-04-11 18:25:45 +08:00
liaofei
1fb61f9eb6 增加接口 2023-04-11 16:47:58 +08:00
liaofei
36127a088b crud接口处理 2023-04-11 16:19:18 +08:00
liaofei
f135b9c35b 修改接口 2023-04-11 11:35:56 +08:00
liaofei
df644390b7 完善资源路由名称 2023-04-11 11:30:27 +08:00
liaofei
4797a01f2f 完善资源路由名称 2023-04-11 11:15:25 +08:00
liaofei
aa532e3f4a 完善资源路由名称 2023-04-11 10:08:44 +08:00
liaofei
a89d90e81e 增加批量保存 2023-04-11 09:27:28 +08:00
evoxwht
15e214ff3a 获取城市数据完整列表 2023-04-10 10:55:36 +08:00
liaofei
6ef7a5dfa8 Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-10 10:33:21 +08:00
liaofei
925bd29681 修改路由 2023-04-10 10:33:03 +08:00
evoxwht
4de56866dc Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev 2023-04-10 10:27:05 +08:00
evoxwht
7d03e8dca7 文件管理备注 2023-04-10 10:27:00 +08:00
liaofei
c47a3a1960 修改路由 2023-04-10 10:25:25 +08:00
liaofei
53a95dbc0c 修改路由 2023-04-10 10:09:32 +08:00