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 |
|
evoxwht
|
19b71fa7c9
|
【程序目录】更新v5.2.1版本
|
2023-11-10 10:00:09 +08:00 |
|
evoxwht
|
51ba561823
|
【程序目录】更新v5.2.1版本
|
2023-11-09 15:57:17 +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
|
9ea5d9d11a
|
【程序目录】更新5.2
|
2023-09-19 14:56:53 +08:00 |
|
evoxwht
|
3baeb2c744
|
更新开源
|
2023-07-17 14:10:10 +08:00 |
|
evoxwht
|
1e7c471c39
|
增加商品起购数量
|
2023-07-17 11:48:15 +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
|
7c4209d69c
|
对外接口优化
|
2023-07-07 15:40:40 +08:00 |
|
evoxwht
|
ac91d37bb3
|
更新升级程序
|
2023-07-07 15:40:18 +08:00 |
|
evoxwht
|
afbc6fba0e
|
更新扫码上传时候的报错
|
2023-07-04 18:08:44 +08:00 |
|
evoxwht
|
ebd33098f0
|
优化物流公司
|
2023-06-28 17:46:35 +08:00 |
|
evoxwht
|
73da9941cc
|
扫码上传二维码优化
|
2023-06-28 17:43:46 +08:00 |
|
evoxwht
|
80762325cc
|
扫码上传二维码优化
|
2023-06-28 17:43:02 +08:00 |
|
evoxwht
|
a4ac1b426a
|
增加附件图片搜索
|
2023-06-28 14:34:13 +08:00 |
|
evoxwht
|
0239ec3e25
|
附件分类优化
|
2023-06-28 10:21:52 +08:00 |
|
evoxwht
|
c2920579e5
|
扫码上传带上分类pid
|
2023-06-28 10:12:25 +08:00 |
|
evoxwht
|
10dfe84822
|
扫码上传带上分类pid
|
2023-06-28 10:10:29 +08:00 |
|
evoxwht
|
03f26e9257
|
优化图片分类
|
2023-06-28 09:57:14 +08:00 |
|
liaofei
|
0774aeb563
|
增加删除扫码接口
|
2023-06-26 09:24:30 +08:00 |
|
liaofei
|
ed53a01bb3
|
修改前台路由加载
|
2023-06-25 14:56:35 +08:00 |
|
liaofei
|
047e6ee4b3
|
调整修改管理员密码为非必填；
|
2023-06-25 14:54:24 +08:00 |
|
liaofei
|
3aed087cf3
|
修改优惠卷
|
2023-06-25 09:53:41 +08:00 |
|
liaofei
|
b64f3c43c9
|
调整获取金额
|
2023-06-19 10:02:31 +08:00 |
|
liaofei
|
2839c115f9
|
修改寄件
|
2023-06-16 17:26:00 +08:00 |
|
liaofei
|
fb4622cd53
|
增加接口
|
2023-06-16 15:36:46 +08:00 |
|
evoxwht
|
ddd8569eec
|
处理非拆单发货
|
2023-06-14 10:35:10 +08:00 |
|
evoxwht
|
6c27d69207
|
更新商家寄件功能
|
2023-06-14 10:20:54 +08:00 |
|
evoxwht
|
7c6d0c0af4
|
优化网络图片上传
|
2023-06-13 18:37:42 +08:00 |
|
evoxwht
|
c48dc8ec7e
|
网络图片后台上传
|
2023-06-13 18:22:04 +08:00 |
|
evoxwht
|
a04e5c2f9c
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-06-13 17:45:53 +08:00 |
|
evoxwht
|
c73fa859b8
|
扫码上传优化
|
2023-06-13 17:45:45 +08:00 |
|
liaofei
|
bd0665f9cb
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-06-13 17:44:58 +08:00 |
|
liaofei
|
7b732dabdb
|
调整云存储上传
|
2023-06-13 17:44:53 +08:00 |
|
evoxwht
|
34b7ad1b92
|
获取扫码上传的图片数据
获取扫码上传页面链接以及参数
|
2023-06-13 17:27:02 +08:00 |
|
evoxwht
|
0fd959d9b5
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-06-13 16:52:47 +08:00 |
|
evoxwht
|
fbe9a80577
|
更新扫码上传图片
|
2023-06-13 16:52:39 +08:00 |
|
liaofei
|
63527e0fa0
|
修改
|
2023-06-13 16:21:47 +08:00 |
|
liaofei
|
92eb6f3f07
|
修改京东云上传
|
2023-06-13 15:43:18 +08:00 |
|
liaofei
|
21e83a76dc
|
增加商家寄件回调
|
2023-06-12 09:59:52 +08:00 |
|
liaofei
|
edb3797171
|
Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev
|
2023-06-09 12:28:09 +08:00 |
|
liaofei
|
0c17eebc59
|
调整使用终止函数打印报错问题
|
2023-06-09 12:27:43 +08:00 |
|
Gosowong
|
0d57902b66
|
fix: 添加cdn域名
|
2023-06-08 15:03:56 +08:00 |
|
Gosowong
|
285b3ca92b
|
fix: 修改华为创建桶文件上传
|
2023-06-08 14:04:18 +08:00 |
|
evoxwht
|
dc32f5a4e3
|
订单详情展示开票信息
|
2023-06-07 18:14:14 +08:00 |
|
evoxwht
|
99ca749ee0
|
虚拟评论选择规格
|
2023-06-07 10:50:09 +08:00 |
|