diff --git a/frontend/.editorconfig b/backend-adminend/.editorconfig similarity index 100% rename from frontend/.editorconfig rename to backend-adminend/.editorconfig diff --git a/frontend/.env.development b/backend-adminend/.env.development similarity index 80% rename from frontend/.env.development rename to backend-adminend/.env.development index e7a6fcd..36b3163 100644 --- a/frontend/.env.development +++ b/backend-adminend/.env.development @@ -3,11 +3,15 @@ ENV = 'development' # base api # VUE_APP_BASE_API = '/dev-api' - VUE_APP_BASE_API = 'http://127.0.0.1:30032' +# VUE_APP_BASE_API = 'http://127.0.0.1:30032' # VUE_APP_BASE_API = 'https://jfadmin.suzhouyuqi.com' # VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com' # VUE_APP_BASE_API = 'http://jfadmin.wenjinhui.com' # VUE_APP_BASE_API = 'http://jfadmin-bsy.bosenyuan.com' +# shjjy153 项目 +# VUE_APP_BASE_API = 'http://jjy-jfadmin.fwxgpt.com' +# shccd159 项目 +VUE_APP_BASE_API = 'http://ccd-jfadmin.fwxgpt.com' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, diff --git a/frontend/.env.production b/backend-adminend/.env.production similarity index 52% rename from frontend/.env.production rename to backend-adminend/.env.production index 75ffd22..9d9e38a 100644 --- a/frontend/.env.production +++ b/backend-adminend/.env.production @@ -5,9 +5,18 @@ ENV = 'production' # VUE_APP_BASE_API = '/prod-api' # VUE_APP_BASE_API = 'http://127.0.0.1:8080' # VUE_APP_BASE_API = 'https://jf.suzhouyuqi.com' -# VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com' -# VUE_APP_BASE_API = 'http://jfadmin.wenjinhui.com' +# miao33 项目 +<<<<<<<< HEAD:backend-adminend/.env.production +# VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com' + +# shjjy153 项目 +# VUE_APP_BASE_API = 'http://jjy-jfadmin.fwxgpt.com' + +# shccd159 项目 +VUE_APP_BASE_API = 'http://ccd-jfadmin.fwxgpt.com' +======== +VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com' # VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com' # VUE_APP_BASE_API = 'http://jfadmin-bsy.bosenyuan.com' -# miao33 项目 -VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com' + +>>>>>>>> origin/main:frontend/.env.production diff --git a/frontend/.env.staging b/backend-adminend/.env.staging similarity index 100% rename from frontend/.env.staging rename to backend-adminend/.env.staging diff --git a/frontend/.eslintignore b/backend-adminend/.eslintignore similarity index 100% rename from frontend/.eslintignore rename to backend-adminend/.eslintignore diff --git a/frontend/.eslintrc.js b/backend-adminend/.eslintrc.js similarity index 100% rename from frontend/.eslintrc.js rename to backend-adminend/.eslintrc.js diff --git a/frontend/.gitignore b/backend-adminend/.gitignore similarity index 100% rename from frontend/.gitignore rename to backend-adminend/.gitignore diff --git a/frontend/.prettierignore b/backend-adminend/.prettierignore similarity index 100% rename from frontend/.prettierignore rename to backend-adminend/.prettierignore diff --git a/frontend/.prettierrc.js b/backend-adminend/.prettierrc.js similarity index 100% rename from frontend/.prettierrc.js rename to backend-adminend/.prettierrc.js diff --git a/frontend/.travis.yml b/backend-adminend/.travis.yml similarity index 100% rename from frontend/.travis.yml rename to backend-adminend/.travis.yml diff --git a/frontend/DEPLOY.md b/backend-adminend/DEPLOY.md similarity index 67% rename from frontend/DEPLOY.md rename to backend-adminend/DEPLOY.md index 26e07c7..95ec6d0 100644 --- a/frontend/DEPLOY.md +++ b/backend-adminend/DEPLOY.md @@ -14,6 +14,8 @@ ## 二、前端打包 +**打包前请确认**:`frontend/.env.production` 中 **`VUE_APP_BASE_API`** 为本项目接口地址(例如本项目为 `http://jfadmin.xiashengjun.com`)。使用 backend 的部署脚本(`deploy-admin-miao33.sh` / `deploy-admin-by80.sh`)时,会在打包前自动检查该值与 `deploy.conf` 中当前环境的 `VUE_APP_BASE_API_EXPECTED` 是否一致,不一致将拒绝打包并提示修改。 + 在 **frontend 目录** 下执行: ```bash @@ -34,10 +36,15 @@ npm run build:prod 前端与后端一起发布时,使用 **backend 的一键部署脚本**,会自动完成:前端打包 → 后端打包 → 远程备份 → 上传 jar 与 `dist` → 重启服务。 -在项目 **backend 目录** 下执行: +在项目 **backend 目录** 下执行(按环境二选一): ```bash cd backend + +# miao33 环境(profile=miao33,默认 8.152.170.46 / jfadmin.xiashengjun.com) +./shell/deploy-admin-miao33.sh + +# by80 环境(profile=miao80,默认 123.56.214.80 / jfadmin.bosenyuan.com) ./shell/deploy-admin-by80.sh ``` @@ -47,7 +54,7 @@ cd backend 2. **在 frontend 目录执行 `npm run build:prod`**,生成 `dist` 3. 远程备份原有 jar 与后台静态 4. 上传 jar 到 `REMOTE_DIR_JAR`,上传 **dist 到 REMOTE_DIR_ADMIN** -5. 远程重启 admin 服务(Spring Profile miao80) +5. 远程重启 admin 服务(对应 Spring Profile) 即:**前端无需单独操作,一次执行即可完成前端打包 + 自动部署发布**。 SSH 配置、deploy.conf、故障排查见:**[backend/DEPLOY.md](../backend/DEPLOY.md)**。 @@ -56,11 +63,11 @@ SSH 配置、deploy.conf、故障排查见:**[backend/DEPLOY.md](../backend/DE ## 四、部署配置(前端相关) -配置在 **backend/deploy.conf**,by80 段示例: +配置在 **backend/deploy.conf**,按环境分段(miao33、by80、miao50): -| 配置项 | 说明 | 示例 | -|--------|------|------| -| **REMOTE_DIR_ADMIN** | 前端 dist 发布目录(admin 后台站点根目录) | `/www/wwwroot/jfadmin.bosenyuan.com` | +| 配置项 | 说明 | miao33 示例 | by80 示例 | +|--------|------|-------------|-----------| +| **REMOTE_DIR_ADMIN** | 前端 dist 发布目录(admin 后台站点根目录) | `/www/wwwroot/jfadmin.xiashengjun.com` | `/www/wwwroot/jfadmin.bosenyuan.com` | 脚本通过 **tar 管道** 将 `frontend/dist` 内容上传到该目录,不依赖远程安装 rsync。 diff --git a/frontend/README.md b/backend-adminend/README.md similarity index 100% rename from frontend/README.md rename to backend-adminend/README.md diff --git a/frontend/babel.config.js b/backend-adminend/babel.config.js similarity index 100% rename from frontend/babel.config.js rename to backend-adminend/babel.config.js diff --git a/frontend/build/index.js b/backend-adminend/build/index.js similarity index 100% rename from frontend/build/index.js rename to backend-adminend/build/index.js diff --git a/frontend/deploy.conf b/backend-adminend/deploy.conf similarity index 64% rename from frontend/deploy.conf rename to backend-adminend/deploy.conf index 76bf113..ca885c9 100644 --- a/frontend/deploy.conf +++ b/backend-adminend/deploy.conf @@ -14,6 +14,23 @@ ADMIN_LOCAL_PORT=30032 ADMIN_JAR_NAME=miao-admin-2.2.jar +miao33: + spring: + profiles: + active: miao33 +SERVER_HOST=8.152.170.46 +SERVER_USER=root +SERVER_PORT=22 +REMOTE_DIR_JAR=/www/wwwroot/crmeb +REMOTE_DIR_ADMIN=/www/wwwroot/jfadmin.xiashengjun.com +FRONT_LOCAL_PORT=30031 +FRONT_JAR_NAME=miao-front-2.2.jar +ADMIN_LOCAL_PORT=30032 +ADMIN_JAR_NAME=miao-admin-2.2.jar + + + + miao50: spring: profiles: diff --git a/frontend/docs/miao1admin.suzhouyuqi.com.har b/backend-adminend/docs/miao1admin.suzhouyuqi.com.har similarity index 100% rename from frontend/docs/miao1admin.suzhouyuqi.com.har rename to backend-adminend/docs/miao1admin.suzhouyuqi.com.har diff --git a/frontend/docs/商品寄卖服务模块-开发说明.md b/backend-adminend/docs/商品寄卖服务模块-开发说明.md similarity index 100% rename from frontend/docs/商品寄卖服务模块-开发说明.md rename to backend-adminend/docs/商品寄卖服务模块-开发说明.md diff --git a/frontend/docs/商品寄卖服务模块-文件清单.md b/backend-adminend/docs/商品寄卖服务模块-文件清单.md similarity index 100% rename from frontend/docs/商品寄卖服务模块-文件清单.md rename to backend-adminend/docs/商品寄卖服务模块-文件清单.md diff --git a/frontend/docs/商品寄卖服务模块-路由配置说明.md b/backend-adminend/docs/商品寄卖服务模块-路由配置说明.md similarity index 100% rename from frontend/docs/商品寄卖服务模块-路由配置说明.md rename to backend-adminend/docs/商品寄卖服务模块-路由配置说明.md diff --git a/frontend/docs/商品寄卖服务系统管理后台API接口PRD-完整版.md b/backend-adminend/docs/商品寄卖服务系统管理后台API接口PRD-完整版.md similarity index 100% rename from frontend/docs/商品寄卖服务系统管理后台API接口PRD-完整版.md rename to backend-adminend/docs/商品寄卖服务系统管理后台API接口PRD-完整版.md diff --git a/frontend/docs/数据库设计说明.md b/backend-adminend/docs/数据库设计说明.md similarity index 100% rename from frontend/docs/数据库设计说明.md rename to backend-adminend/docs/数据库设计说明.md diff --git a/frontend/docs/项目启动说明.md b/backend-adminend/docs/项目启动说明.md similarity index 100% rename from frontend/docs/项目启动说明.md rename to backend-adminend/docs/项目启动说明.md diff --git a/frontend/jest.config.js b/backend-adminend/jest.config.js similarity index 100% rename from frontend/jest.config.js rename to backend-adminend/jest.config.js diff --git a/frontend/jsconfig.json b/backend-adminend/jsconfig.json similarity index 100% rename from frontend/jsconfig.json rename to backend-adminend/jsconfig.json diff --git a/frontend/package.json b/backend-adminend/package.json similarity index 100% rename from frontend/package.json rename to backend-adminend/package.json diff --git a/frontend/plop-templates/component/index.hbs b/backend-adminend/plop-templates/component/index.hbs similarity index 100% rename from frontend/plop-templates/component/index.hbs rename to backend-adminend/plop-templates/component/index.hbs diff --git a/frontend/plop-templates/component/prompt.js b/backend-adminend/plop-templates/component/prompt.js similarity index 100% rename from frontend/plop-templates/component/prompt.js rename to backend-adminend/plop-templates/component/prompt.js diff --git a/frontend/plop-templates/store/index.hbs b/backend-adminend/plop-templates/store/index.hbs similarity index 100% rename from frontend/plop-templates/store/index.hbs rename to backend-adminend/plop-templates/store/index.hbs diff --git a/frontend/plop-templates/store/prompt.js b/backend-adminend/plop-templates/store/prompt.js similarity index 100% rename from frontend/plop-templates/store/prompt.js rename to backend-adminend/plop-templates/store/prompt.js diff --git a/frontend/plop-templates/utils.js b/backend-adminend/plop-templates/utils.js similarity index 100% rename from frontend/plop-templates/utils.js rename to backend-adminend/plop-templates/utils.js diff --git a/frontend/plop-templates/view/index.hbs b/backend-adminend/plop-templates/view/index.hbs similarity index 100% rename from frontend/plop-templates/view/index.hbs rename to backend-adminend/plop-templates/view/index.hbs diff --git a/frontend/plop-templates/view/prompt.js b/backend-adminend/plop-templates/view/prompt.js similarity index 100% rename from frontend/plop-templates/view/prompt.js rename to backend-adminend/plop-templates/view/prompt.js diff --git a/frontend/plopfile.js b/backend-adminend/plopfile.js similarity index 100% rename from frontend/plopfile.js rename to backend-adminend/plopfile.js diff --git a/frontend/postcss.config.js b/backend-adminend/postcss.config.js similarity index 100% rename from frontend/postcss.config.js rename to backend-adminend/postcss.config.js diff --git a/frontend/public/favicon.ico b/backend-adminend/public/favicon.ico similarity index 100% rename from frontend/public/favicon.ico rename to backend-adminend/public/favicon.ico diff --git a/frontend/public/index.html b/backend-adminend/public/index.html similarity index 100% rename from frontend/public/index.html rename to backend-adminend/public/index.html diff --git a/frontend/public/preview.html b/backend-adminend/public/preview.html similarity index 100% rename from frontend/public/preview.html rename to backend-adminend/public/preview.html diff --git a/frontend/public/static/tinymce4.7.5/langs/zh_CN.js b/backend-adminend/public/static/tinymce4.7.5/langs/zh_CN.js similarity index 100% rename from frontend/public/static/tinymce4.7.5/langs/zh_CN.js rename to backend-adminend/public/static/tinymce4.7.5/langs/zh_CN.js diff --git a/frontend/public/static/tinymce4.7.5/plugins/codesample/css/prism.css b/backend-adminend/public/static/tinymce4.7.5/plugins/codesample/css/prism.css similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/codesample/css/prism.css rename to backend-adminend/public/static/tinymce4.7.5/plugins/codesample/css/prism.css diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif b/backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif rename to backend-adminend/public/static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif diff --git a/frontend/public/static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css b/backend-adminend/public/static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css similarity index 100% rename from frontend/public/static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css rename to backend-adminend/public/static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/content.inline.min.css b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/content.inline.min.css similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/content.inline.min.css rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/content.inline.min.css diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/content.min.css b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/content.min.css similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/content.min.css rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/content.min.css diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/img/anchor.gif b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/img/anchor.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/img/anchor.gif rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/img/anchor.gif diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/img/loader.gif b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/img/loader.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/img/loader.gif rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/img/loader.gif diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/img/object.gif b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/img/object.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/img/object.gif rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/img/object.gif diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/img/trans.gif b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/img/trans.gif similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/img/trans.gif rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/img/trans.gif diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/skin.min.css b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/skin.min.css similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/skin.min.css rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/skin.min.css diff --git a/frontend/public/static/tinymce4.7.5/skins/lightgray/skin.min.css.map b/backend-adminend/public/static/tinymce4.7.5/skins/lightgray/skin.min.css.map similarity index 100% rename from frontend/public/static/tinymce4.7.5/skins/lightgray/skin.min.css.map rename to backend-adminend/public/static/tinymce4.7.5/skins/lightgray/skin.min.css.map diff --git a/frontend/public/static/tinymce4.7.5/tinymce.min.js b/backend-adminend/public/static/tinymce4.7.5/tinymce.min.js similarity index 100% rename from frontend/public/static/tinymce4.7.5/tinymce.min.js rename to backend-adminend/public/static/tinymce4.7.5/tinymce.min.js diff --git a/frontend/src/App.vue b/backend-adminend/src/App.vue similarity index 100% rename from frontend/src/App.vue rename to backend-adminend/src/App.vue diff --git a/frontend/src/api/agreement.js b/backend-adminend/src/api/agreement.js similarity index 100% rename from frontend/src/api/agreement.js rename to backend-adminend/src/api/agreement.js diff --git a/frontend/src/api/article.js b/backend-adminend/src/api/article.js similarity index 100% rename from frontend/src/api/article.js rename to backend-adminend/src/api/article.js diff --git a/frontend/src/api/authInformation.js b/backend-adminend/src/api/authInformation.js similarity index 100% rename from frontend/src/api/authInformation.js rename to backend-adminend/src/api/authInformation.js diff --git a/frontend/src/api/categoryApi.js b/backend-adminend/src/api/categoryApi.js similarity index 100% rename from frontend/src/api/categoryApi.js rename to backend-adminend/src/api/categoryApi.js diff --git a/frontend/src/api/configApi.js b/backend-adminend/src/api/configApi.js similarity index 100% rename from frontend/src/api/configApi.js rename to backend-adminend/src/api/configApi.js diff --git a/frontend/src/api/configTabApi.js b/backend-adminend/src/api/configTabApi.js similarity index 100% rename from frontend/src/api/configTabApi.js rename to backend-adminend/src/api/configTabApi.js diff --git a/frontend/src/api/consignment.js b/backend-adminend/src/api/consignment.js similarity index 100% rename from frontend/src/api/consignment.js rename to backend-adminend/src/api/consignment.js diff --git a/frontend/src/api/dashboard.js b/backend-adminend/src/api/dashboard.js similarity index 100% rename from frontend/src/api/dashboard.js rename to backend-adminend/src/api/dashboard.js diff --git a/frontend/src/api/devise.js b/backend-adminend/src/api/devise.js similarity index 100% rename from frontend/src/api/devise.js rename to backend-adminend/src/api/devise.js diff --git a/frontend/src/api/distribution.js b/backend-adminend/src/api/distribution.js similarity index 100% rename from frontend/src/api/distribution.js rename to backend-adminend/src/api/distribution.js diff --git a/frontend/src/api/financial.js b/backend-adminend/src/api/financial.js similarity index 100% rename from frontend/src/api/financial.js rename to backend-adminend/src/api/financial.js diff --git a/frontend/src/api/logistics.js b/backend-adminend/src/api/logistics.js similarity index 100% rename from frontend/src/api/logistics.js rename to backend-adminend/src/api/logistics.js diff --git a/frontend/src/api/marketing.js b/backend-adminend/src/api/marketing.js similarity index 100% rename from frontend/src/api/marketing.js rename to backend-adminend/src/api/marketing.js diff --git a/frontend/src/api/order.js b/backend-adminend/src/api/order.js similarity index 100% rename from frontend/src/api/order.js rename to backend-adminend/src/api/order.js diff --git a/frontend/src/api/pagediy.js b/backend-adminend/src/api/pagediy.js similarity index 100% rename from frontend/src/api/pagediy.js rename to backend-adminend/src/api/pagediy.js diff --git a/frontend/src/api/req.js b/backend-adminend/src/api/req.js similarity index 100% rename from frontend/src/api/req.js rename to backend-adminend/src/api/req.js diff --git a/frontend/src/api/role.js b/backend-adminend/src/api/role.js similarity index 100% rename from frontend/src/api/role.js rename to backend-adminend/src/api/role.js diff --git a/frontend/src/api/roleApi.js b/backend-adminend/src/api/roleApi.js similarity index 100% rename from frontend/src/api/roleApi.js rename to backend-adminend/src/api/roleApi.js diff --git a/frontend/src/api/schedule.js b/backend-adminend/src/api/schedule.js similarity index 100% rename from frontend/src/api/schedule.js rename to backend-adminend/src/api/schedule.js diff --git a/frontend/src/api/sms.js b/backend-adminend/src/api/sms.js similarity index 100% rename from frontend/src/api/sms.js rename to backend-adminend/src/api/sms.js diff --git a/frontend/src/api/statistic.js b/backend-adminend/src/api/statistic.js similarity index 100% rename from frontend/src/api/statistic.js rename to backend-adminend/src/api/statistic.js diff --git a/frontend/src/api/store.js b/backend-adminend/src/api/store.js similarity index 100% rename from frontend/src/api/store.js rename to backend-adminend/src/api/store.js diff --git a/frontend/src/api/storePoint.js b/backend-adminend/src/api/storePoint.js similarity index 100% rename from frontend/src/api/storePoint.js rename to backend-adminend/src/api/storePoint.js diff --git a/frontend/src/api/system.js b/backend-adminend/src/api/system.js similarity index 100% rename from frontend/src/api/system.js rename to backend-adminend/src/api/system.js diff --git a/frontend/src/api/systemConfig.js b/backend-adminend/src/api/systemConfig.js similarity index 100% rename from frontend/src/api/systemConfig.js rename to backend-adminend/src/api/systemConfig.js diff --git a/frontend/src/api/systemFormConfig.js b/backend-adminend/src/api/systemFormConfig.js similarity index 100% rename from frontend/src/api/systemFormConfig.js rename to backend-adminend/src/api/systemFormConfig.js diff --git a/frontend/src/api/systemGroup.js b/backend-adminend/src/api/systemGroup.js similarity index 100% rename from frontend/src/api/systemGroup.js rename to backend-adminend/src/api/systemGroup.js diff --git a/frontend/src/api/systemGroupData.js b/backend-adminend/src/api/systemGroupData.js similarity index 100% rename from frontend/src/api/systemGroupData.js rename to backend-adminend/src/api/systemGroupData.js diff --git a/frontend/src/api/systemSetting.js b/backend-adminend/src/api/systemSetting.js similarity index 100% rename from frontend/src/api/systemSetting.js rename to backend-adminend/src/api/systemSetting.js diff --git a/frontend/src/api/systemadmin.js b/backend-adminend/src/api/systemadmin.js similarity index 100% rename from frontend/src/api/systemadmin.js rename to backend-adminend/src/api/systemadmin.js diff --git a/frontend/src/api/user.js b/backend-adminend/src/api/user.js similarity index 100% rename from frontend/src/api/user.js rename to backend-adminend/src/api/user.js diff --git a/frontend/src/api/wxApi.js b/backend-adminend/src/api/wxApi.js similarity index 100% rename from frontend/src/api/wxApi.js rename to backend-adminend/src/api/wxApi.js diff --git a/frontend/src/assets/401_images/401.gif b/backend-adminend/src/assets/401_images/401.gif similarity index 100% rename from frontend/src/assets/401_images/401.gif rename to backend-adminend/src/assets/401_images/401.gif diff --git a/frontend/src/assets/404_images/404.png b/backend-adminend/src/assets/404_images/404.png similarity index 100% rename from frontend/src/assets/404_images/404.png rename to backend-adminend/src/assets/404_images/404.png diff --git a/frontend/src/assets/404_images/404_cloud.png b/backend-adminend/src/assets/404_images/404_cloud.png similarity index 100% rename from frontend/src/assets/404_images/404_cloud.png rename to backend-adminend/src/assets/404_images/404_cloud.png diff --git a/frontend/src/assets/custom-theme/fonts/element-icons.ttf b/backend-adminend/src/assets/custom-theme/fonts/element-icons.ttf similarity index 100% rename from frontend/src/assets/custom-theme/fonts/element-icons.ttf rename to backend-adminend/src/assets/custom-theme/fonts/element-icons.ttf diff --git a/frontend/src/assets/custom-theme/fonts/element-icons.woff b/backend-adminend/src/assets/custom-theme/fonts/element-icons.woff similarity index 100% rename from frontend/src/assets/custom-theme/fonts/element-icons.woff rename to backend-adminend/src/assets/custom-theme/fonts/element-icons.woff diff --git a/frontend/src/assets/custom-theme/index.css b/backend-adminend/src/assets/custom-theme/index.css similarity index 100% rename from frontend/src/assets/custom-theme/index.css rename to backend-adminend/src/assets/custom-theme/index.css diff --git a/frontend/src/assets/fonts/D-DIN-PRO-400-Regular.otf b/backend-adminend/src/assets/fonts/D-DIN-PRO-400-Regular.otf similarity index 100% rename from frontend/src/assets/fonts/D-DIN-PRO-400-Regular.otf rename to backend-adminend/src/assets/fonts/D-DIN-PRO-400-Regular.otf diff --git a/frontend/src/assets/fonts/D-DIN-PRO-600-SemiBold.otf b/backend-adminend/src/assets/fonts/D-DIN-PRO-600-SemiBold.otf similarity index 100% rename from frontend/src/assets/fonts/D-DIN-PRO-600-SemiBold.otf rename to backend-adminend/src/assets/fonts/D-DIN-PRO-600-SemiBold.otf diff --git a/frontend/src/assets/fonts/font.css b/backend-adminend/src/assets/fonts/font.css similarity index 100% rename from frontend/src/assets/fonts/font.css rename to backend-adminend/src/assets/fonts/font.css diff --git a/frontend/src/assets/iconfont/iconfont-weapp-icon.css b/backend-adminend/src/assets/iconfont/iconfont-weapp-icon.css similarity index 100% rename from frontend/src/assets/iconfont/iconfont-weapp-icon.css rename to backend-adminend/src/assets/iconfont/iconfont-weapp-icon.css diff --git a/frontend/src/assets/iconfont/iconfont.css b/backend-adminend/src/assets/iconfont/iconfont.css similarity index 100% rename from frontend/src/assets/iconfont/iconfont.css rename to backend-adminend/src/assets/iconfont/iconfont.css diff --git a/frontend/src/assets/iconfont/iconfont.eot b/backend-adminend/src/assets/iconfont/iconfont.eot similarity index 100% rename from frontend/src/assets/iconfont/iconfont.eot rename to backend-adminend/src/assets/iconfont/iconfont.eot diff --git a/frontend/src/assets/iconfont/iconfont.js b/backend-adminend/src/assets/iconfont/iconfont.js similarity index 100% rename from frontend/src/assets/iconfont/iconfont.js rename to backend-adminend/src/assets/iconfont/iconfont.js diff --git a/frontend/src/assets/iconfont/iconfont.json b/backend-adminend/src/assets/iconfont/iconfont.json similarity index 100% rename from frontend/src/assets/iconfont/iconfont.json rename to backend-adminend/src/assets/iconfont/iconfont.json diff --git a/frontend/src/assets/iconfont/iconfont.svg b/backend-adminend/src/assets/iconfont/iconfont.svg similarity index 100% rename from frontend/src/assets/iconfont/iconfont.svg rename to backend-adminend/src/assets/iconfont/iconfont.svg diff --git a/frontend/src/assets/iconfont/iconfont.ttf b/backend-adminend/src/assets/iconfont/iconfont.ttf similarity index 100% rename from frontend/src/assets/iconfont/iconfont.ttf rename to backend-adminend/src/assets/iconfont/iconfont.ttf diff --git a/frontend/src/assets/iconfont/iconfont.woff b/backend-adminend/src/assets/iconfont/iconfont.woff similarity index 100% rename from frontend/src/assets/iconfont/iconfont.woff rename to backend-adminend/src/assets/iconfont/iconfont.woff diff --git a/frontend/src/assets/iconfont/iconfont.woff2 b/backend-adminend/src/assets/iconfont/iconfont.woff2 similarity index 100% rename from frontend/src/assets/iconfont/iconfont.woff2 rename to backend-adminend/src/assets/iconfont/iconfont.woff2 diff --git a/frontend/src/assets/imgs/app.png b/backend-adminend/src/assets/imgs/app.png similarity index 100% rename from frontend/src/assets/imgs/app.png rename to backend-adminend/src/assets/imgs/app.png diff --git a/frontend/src/assets/imgs/bg.jpg b/backend-adminend/src/assets/imgs/bg.jpg similarity index 100% rename from frontend/src/assets/imgs/bg.jpg rename to backend-adminend/src/assets/imgs/bg.jpg diff --git a/frontend/src/assets/imgs/capsule.png b/backend-adminend/src/assets/imgs/capsule.png similarity index 100% rename from frontend/src/assets/imgs/capsule.png rename to backend-adminend/src/assets/imgs/capsule.png diff --git a/frontend/src/assets/imgs/couponBg.png b/backend-adminend/src/assets/imgs/couponBg.png similarity index 100% rename from frontend/src/assets/imgs/couponBg.png rename to backend-adminend/src/assets/imgs/couponBg.png diff --git a/frontend/src/assets/imgs/couponBg2.png b/backend-adminend/src/assets/imgs/couponBg2.png similarity index 100% rename from frontend/src/assets/imgs/couponBg2.png rename to backend-adminend/src/assets/imgs/couponBg2.png diff --git a/frontend/src/assets/imgs/dark.svg b/backend-adminend/src/assets/imgs/dark.svg similarity index 100% rename from frontend/src/assets/imgs/dark.svg rename to backend-adminend/src/assets/imgs/dark.svg diff --git a/frontend/src/assets/imgs/default.jpg b/backend-adminend/src/assets/imgs/default.jpg similarity index 100% rename from frontend/src/assets/imgs/default.jpg rename to backend-adminend/src/assets/imgs/default.jpg diff --git a/frontend/src/assets/imgs/default_avatar.png b/backend-adminend/src/assets/imgs/default_avatar.png similarity index 100% rename from frontend/src/assets/imgs/default_avatar.png rename to backend-adminend/src/assets/imgs/default_avatar.png diff --git a/frontend/src/assets/imgs/electric.png b/backend-adminend/src/assets/imgs/electric.png similarity index 100% rename from frontend/src/assets/imgs/electric.png rename to backend-adminend/src/assets/imgs/electric.png diff --git a/frontend/src/assets/imgs/expressi.jpg b/backend-adminend/src/assets/imgs/expressi.jpg similarity index 100% rename from frontend/src/assets/imgs/expressi.jpg rename to backend-adminend/src/assets/imgs/expressi.jpg diff --git a/frontend/src/assets/imgs/fahuo.png b/backend-adminend/src/assets/imgs/fahuo.png similarity index 100% rename from frontend/src/assets/imgs/fahuo.png rename to backend-adminend/src/assets/imgs/fahuo.png diff --git a/frontend/src/assets/imgs/foot-001.png b/backend-adminend/src/assets/imgs/foot-001.png similarity index 100% rename from frontend/src/assets/imgs/foot-001.png rename to backend-adminend/src/assets/imgs/foot-001.png diff --git a/frontend/src/assets/imgs/foot-0010.png b/backend-adminend/src/assets/imgs/foot-0010.png similarity index 100% rename from frontend/src/assets/imgs/foot-0010.png rename to backend-adminend/src/assets/imgs/foot-0010.png diff --git a/frontend/src/assets/imgs/foot-002.png b/backend-adminend/src/assets/imgs/foot-002.png similarity index 100% rename from frontend/src/assets/imgs/foot-002.png rename to backend-adminend/src/assets/imgs/foot-002.png diff --git a/frontend/src/assets/imgs/foot-003.png b/backend-adminend/src/assets/imgs/foot-003.png similarity index 100% rename from frontend/src/assets/imgs/foot-003.png rename to backend-adminend/src/assets/imgs/foot-003.png diff --git a/frontend/src/assets/imgs/foot-004.png b/backend-adminend/src/assets/imgs/foot-004.png similarity index 100% rename from frontend/src/assets/imgs/foot-004.png rename to backend-adminend/src/assets/imgs/foot-004.png diff --git a/frontend/src/assets/imgs/foot-005.png b/backend-adminend/src/assets/imgs/foot-005.png similarity index 100% rename from frontend/src/assets/imgs/foot-005.png rename to backend-adminend/src/assets/imgs/foot-005.png diff --git a/frontend/src/assets/imgs/foot-006.png b/backend-adminend/src/assets/imgs/foot-006.png similarity index 100% rename from frontend/src/assets/imgs/foot-006.png rename to backend-adminend/src/assets/imgs/foot-006.png diff --git a/frontend/src/assets/imgs/foot-007.png b/backend-adminend/src/assets/imgs/foot-007.png similarity index 100% rename from frontend/src/assets/imgs/foot-007.png rename to backend-adminend/src/assets/imgs/foot-007.png diff --git a/frontend/src/assets/imgs/foot-008.png b/backend-adminend/src/assets/imgs/foot-008.png similarity index 100% rename from frontend/src/assets/imgs/foot-008.png rename to backend-adminend/src/assets/imgs/foot-008.png diff --git a/frontend/src/assets/imgs/foot-009.png b/backend-adminend/src/assets/imgs/foot-009.png similarity index 100% rename from frontend/src/assets/imgs/foot-009.png rename to backend-adminend/src/assets/imgs/foot-009.png diff --git a/frontend/src/assets/imgs/fukuan.png b/backend-adminend/src/assets/imgs/fukuan.png similarity index 100% rename from frontend/src/assets/imgs/fukuan.png rename to backend-adminend/src/assets/imgs/fukuan.png diff --git a/frontend/src/assets/imgs/haowu.png b/backend-adminend/src/assets/imgs/haowu.png similarity index 100% rename from frontend/src/assets/imgs/haowu.png rename to backend-adminend/src/assets/imgs/haowu.png diff --git a/frontend/src/assets/imgs/head.gif b/backend-adminend/src/assets/imgs/head.gif similarity index 100% rename from frontend/src/assets/imgs/head.gif rename to backend-adminend/src/assets/imgs/head.gif diff --git a/frontend/src/assets/imgs/huo.png b/backend-adminend/src/assets/imgs/huo.png similarity index 100% rename from frontend/src/assets/imgs/huo.png rename to backend-adminend/src/assets/imgs/huo.png diff --git a/frontend/src/assets/imgs/index_logo.png b/backend-adminend/src/assets/imgs/index_logo.png similarity index 100% rename from frontend/src/assets/imgs/index_logo.png rename to backend-adminend/src/assets/imgs/index_logo.png diff --git a/frontend/src/assets/imgs/intergral-icon.png b/backend-adminend/src/assets/imgs/intergral-icon.png similarity index 100% rename from frontend/src/assets/imgs/intergral-icon.png rename to backend-adminend/src/assets/imgs/intergral-icon.png diff --git a/frontend/src/assets/imgs/kefuImg.jpg b/backend-adminend/src/assets/imgs/kefuImg.jpg similarity index 100% rename from frontend/src/assets/imgs/kefuImg.jpg rename to backend-adminend/src/assets/imgs/kefuImg.jpg diff --git a/frontend/src/assets/imgs/light.svg b/backend-adminend/src/assets/imgs/light.svg similarity index 100% rename from frontend/src/assets/imgs/light.svg rename to backend-adminend/src/assets/imgs/light.svg diff --git a/frontend/src/assets/imgs/line.jpg b/backend-adminend/src/assets/imgs/line.jpg similarity index 100% rename from frontend/src/assets/imgs/line.jpg rename to backend-adminend/src/assets/imgs/line.jpg diff --git a/frontend/src/assets/imgs/live-logo.gif b/backend-adminend/src/assets/imgs/live-logo.gif similarity index 100% rename from frontend/src/assets/imgs/live-logo.gif rename to backend-adminend/src/assets/imgs/live-logo.gif diff --git a/frontend/src/assets/imgs/mobilefoot.png b/backend-adminend/src/assets/imgs/mobilefoot.png similarity index 100% rename from frontend/src/assets/imgs/mobilefoot.png rename to backend-adminend/src/assets/imgs/mobilefoot.png diff --git a/frontend/src/assets/imgs/mobilehead.png b/backend-adminend/src/assets/imgs/mobilehead.png similarity index 100% rename from frontend/src/assets/imgs/mobilehead.png rename to backend-adminend/src/assets/imgs/mobilehead.png diff --git a/frontend/src/assets/imgs/moren.jpg b/backend-adminend/src/assets/imgs/moren.jpg similarity index 100% rename from frontend/src/assets/imgs/moren.jpg rename to backend-adminend/src/assets/imgs/moren.jpg diff --git a/frontend/src/assets/imgs/moren.png b/backend-adminend/src/assets/imgs/moren.png similarity index 100% rename from frontend/src/assets/imgs/moren.png rename to backend-adminend/src/assets/imgs/moren.png diff --git a/frontend/src/assets/imgs/newVip02.png b/backend-adminend/src/assets/imgs/newVip02.png similarity index 100% rename from frontend/src/assets/imgs/newVip02.png rename to backend-adminend/src/assets/imgs/newVip02.png diff --git a/frontend/src/assets/imgs/new_header.png b/backend-adminend/src/assets/imgs/new_header.png similarity index 100% rename from frontend/src/assets/imgs/new_header.png rename to backend-adminend/src/assets/imgs/new_header.png diff --git a/frontend/src/assets/imgs/new_header1.png b/backend-adminend/src/assets/imgs/new_header1.png similarity index 100% rename from frontend/src/assets/imgs/new_header1.png rename to backend-adminend/src/assets/imgs/new_header1.png diff --git a/frontend/src/assets/imgs/no.png b/backend-adminend/src/assets/imgs/no.png similarity index 100% rename from frontend/src/assets/imgs/no.png rename to backend-adminend/src/assets/imgs/no.png diff --git a/frontend/src/assets/imgs/noImg.png b/backend-adminend/src/assets/imgs/noImg.png similarity index 100% rename from frontend/src/assets/imgs/noImg.png rename to backend-adminend/src/assets/imgs/noImg.png diff --git a/frontend/src/assets/imgs/orderIndex.png b/backend-adminend/src/assets/imgs/orderIndex.png similarity index 100% rename from frontend/src/assets/imgs/orderIndex.png rename to backend-adminend/src/assets/imgs/orderIndex.png diff --git a/frontend/src/assets/imgs/pc.png b/backend-adminend/src/assets/imgs/pc.png similarity index 100% rename from frontend/src/assets/imgs/pc.png rename to backend-adminend/src/assets/imgs/pc.png diff --git a/frontend/src/assets/imgs/pc1.jpg b/backend-adminend/src/assets/imgs/pc1.jpg similarity index 100% rename from frontend/src/assets/imgs/pc1.jpg rename to backend-adminend/src/assets/imgs/pc1.jpg diff --git a/frontend/src/assets/imgs/phoneBox.png b/backend-adminend/src/assets/imgs/phoneBox.png similarity index 100% rename from frontend/src/assets/imgs/phoneBox.png rename to backend-adminend/src/assets/imgs/phoneBox.png diff --git a/frontend/src/assets/imgs/pingjia.png b/backend-adminend/src/assets/imgs/pingjia.png similarity index 100% rename from frontend/src/assets/imgs/pingjia.png rename to backend-adminend/src/assets/imgs/pingjia.png diff --git a/frontend/src/assets/imgs/pinkHead.png b/backend-adminend/src/assets/imgs/pinkHead.png similarity index 100% rename from frontend/src/assets/imgs/pinkHead.png rename to backend-adminend/src/assets/imgs/pinkHead.png diff --git a/frontend/src/assets/imgs/pricetitle.jpg b/backend-adminend/src/assets/imgs/pricetitle.jpg similarity index 100% rename from frontend/src/assets/imgs/pricetitle.jpg rename to backend-adminend/src/assets/imgs/pricetitle.jpg diff --git a/frontend/src/assets/imgs/qipaokuang.png b/backend-adminend/src/assets/imgs/qipaokuang.png similarity index 100% rename from frontend/src/assets/imgs/qipaokuang.png rename to backend-adminend/src/assets/imgs/qipaokuang.png diff --git a/frontend/src/assets/imgs/ren1.png b/backend-adminend/src/assets/imgs/ren1.png similarity index 100% rename from frontend/src/assets/imgs/ren1.png rename to backend-adminend/src/assets/imgs/ren1.png diff --git a/frontend/src/assets/imgs/rightBottom.png b/backend-adminend/src/assets/imgs/rightBottom.png similarity index 100% rename from frontend/src/assets/imgs/rightBottom.png rename to backend-adminend/src/assets/imgs/rightBottom.png diff --git a/frontend/src/assets/imgs/routine.png b/backend-adminend/src/assets/imgs/routine.png similarity index 100% rename from frontend/src/assets/imgs/routine.png rename to backend-adminend/src/assets/imgs/routine.png diff --git a/frontend/src/assets/imgs/scan.gif b/backend-adminend/src/assets/imgs/scan.gif similarity index 100% rename from frontend/src/assets/imgs/scan.gif rename to backend-adminend/src/assets/imgs/scan.gif diff --git a/frontend/src/assets/imgs/shan.png b/backend-adminend/src/assets/imgs/shan.png similarity index 100% rename from frontend/src/assets/imgs/shan.png rename to backend-adminend/src/assets/imgs/shan.png diff --git a/frontend/src/assets/imgs/shengxian.png b/backend-adminend/src/assets/imgs/shengxian.png similarity index 100% rename from frontend/src/assets/imgs/shengxian.png rename to backend-adminend/src/assets/imgs/shengxian.png diff --git a/frontend/src/assets/imgs/shouhuo.png b/backend-adminend/src/assets/imgs/shouhuo.png similarity index 100% rename from frontend/src/assets/imgs/shouhuo.png rename to backend-adminend/src/assets/imgs/shouhuo.png diff --git a/frontend/src/assets/imgs/tabBar/cart.png b/backend-adminend/src/assets/imgs/tabBar/cart.png similarity index 100% rename from frontend/src/assets/imgs/tabBar/cart.png rename to backend-adminend/src/assets/imgs/tabBar/cart.png diff --git a/frontend/src/assets/imgs/tabBar/cartd.png b/backend-adminend/src/assets/imgs/tabBar/cartd.png similarity index 100% rename from frontend/src/assets/imgs/tabBar/cartd.png rename to backend-adminend/src/assets/imgs/tabBar/cartd.png diff --git a/frontend/src/assets/imgs/tabBar/cate.png b/backend-adminend/src/assets/imgs/tabBar/cate.png similarity index 100% rename from frontend/src/assets/imgs/tabBar/cate.png rename to backend-adminend/src/assets/imgs/tabBar/cate.png diff --git a/frontend/src/assets/imgs/tabBar/cated.png b/backend-adminend/src/assets/imgs/tabBar/cated.png similarity index 100% rename from frontend/src/assets/imgs/tabBar/cated.png rename to backend-adminend/src/assets/imgs/tabBar/cated.png diff --git a/frontend/src/assets/imgs/tabBar/index.png b/backend-adminend/src/assets/imgs/tabBar/index.png similarity index 100% rename from frontend/src/assets/imgs/tabBar/index.png rename to backend-adminend/src/assets/imgs/tabBar/index.png diff --git a/frontend/src/assets/imgs/tabBar/indexd.png b/backend-adminend/src/assets/imgs/tabBar/indexd.png similarity index 100% rename from frontend/src/assets/imgs/tabBar/indexd.png rename to backend-adminend/src/assets/imgs/tabBar/indexd.png diff --git a/frontend/src/assets/imgs/tabBar/user.png b/backend-adminend/src/assets/imgs/tabBar/user.png similarity index 100% rename from frontend/src/assets/imgs/tabBar/user.png rename to backend-adminend/src/assets/imgs/tabBar/user.png diff --git a/frontend/src/assets/imgs/tabBar/userd.png b/backend-adminend/src/assets/imgs/tabBar/userd.png similarity index 100% rename from frontend/src/assets/imgs/tabBar/userd.png rename to backend-adminend/src/assets/imgs/tabBar/userd.png diff --git a/frontend/src/assets/imgs/tuikuan.png b/backend-adminend/src/assets/imgs/tuikuan.png similarity index 100% rename from frontend/src/assets/imgs/tuikuan.png rename to backend-adminend/src/assets/imgs/tuikuan.png diff --git a/frontend/src/assets/imgs/user_bg.png b/backend-adminend/src/assets/imgs/user_bg.png similarity index 100% rename from frontend/src/assets/imgs/user_bg.png rename to backend-adminend/src/assets/imgs/user_bg.png diff --git a/frontend/src/assets/imgs/wechat_h5.png b/backend-adminend/src/assets/imgs/wechat_h5.png similarity index 100% rename from frontend/src/assets/imgs/wechat_h5.png rename to backend-adminend/src/assets/imgs/wechat_h5.png diff --git a/frontend/src/assets/imgs/weixin.png b/backend-adminend/src/assets/imgs/weixin.png similarity index 100% rename from frontend/src/assets/imgs/weixin.png rename to backend-adminend/src/assets/imgs/weixin.png diff --git a/frontend/src/assets/imgs/writeOffBg.jpg b/backend-adminend/src/assets/imgs/writeOffBg.jpg similarity index 100% rename from frontend/src/assets/imgs/writeOffBg.jpg rename to backend-adminend/src/assets/imgs/writeOffBg.jpg diff --git a/frontend/src/assets/imgs/wutu.png b/backend-adminend/src/assets/imgs/wutu.png similarity index 100% rename from frontend/src/assets/imgs/wutu.png rename to backend-adminend/src/assets/imgs/wutu.png diff --git a/frontend/src/assets/imgs/wxtu.png b/backend-adminend/src/assets/imgs/wxtu.png similarity index 100% rename from frontend/src/assets/imgs/wxtu.png rename to backend-adminend/src/assets/imgs/wxtu.png diff --git a/frontend/src/assets/imgs/youxuan.png b/backend-adminend/src/assets/imgs/youxuan.png similarity index 100% rename from frontend/src/assets/imgs/youxuan.png rename to backend-adminend/src/assets/imgs/youxuan.png diff --git a/frontend/src/assets/js/canvas-nest.min.js b/backend-adminend/src/assets/js/canvas-nest.min.js similarity index 100% rename from frontend/src/assets/js/canvas-nest.min.js rename to backend-adminend/src/assets/js/canvas-nest.min.js diff --git a/frontend/src/assets/js/media_750.js b/backend-adminend/src/assets/js/media_750.js similarity index 100% rename from frontend/src/assets/js/media_750.js rename to backend-adminend/src/assets/js/media_750.js diff --git a/frontend/src/assets/theme/goodsList1.png b/backend-adminend/src/assets/theme/goodsList1.png similarity index 100% rename from frontend/src/assets/theme/goodsList1.png rename to backend-adminend/src/assets/theme/goodsList1.png diff --git a/frontend/src/assets/theme/goodsList2.png b/backend-adminend/src/assets/theme/goodsList2.png similarity index 100% rename from frontend/src/assets/theme/goodsList2.png rename to backend-adminend/src/assets/theme/goodsList2.png diff --git a/frontend/src/assets/theme/goodsList3.png b/backend-adminend/src/assets/theme/goodsList3.png similarity index 100% rename from frontend/src/assets/theme/goodsList3.png rename to backend-adminend/src/assets/theme/goodsList3.png diff --git a/frontend/src/assets/theme/theme1.jpg b/backend-adminend/src/assets/theme/theme1.jpg similarity index 100% rename from frontend/src/assets/theme/theme1.jpg rename to backend-adminend/src/assets/theme/theme1.jpg diff --git a/frontend/src/assets/theme/theme2.jpg b/backend-adminend/src/assets/theme/theme2.jpg similarity index 100% rename from frontend/src/assets/theme/theme2.jpg rename to backend-adminend/src/assets/theme/theme2.jpg diff --git a/frontend/src/assets/theme/theme3.jpg b/backend-adminend/src/assets/theme/theme3.jpg similarity index 100% rename from frontend/src/assets/theme/theme3.jpg rename to backend-adminend/src/assets/theme/theme3.jpg diff --git a/frontend/src/assets/theme/theme4.png b/backend-adminend/src/assets/theme/theme4.png similarity index 100% rename from frontend/src/assets/theme/theme4.png rename to backend-adminend/src/assets/theme/theme4.png diff --git a/frontend/src/assets/theme/theme5.jpg b/backend-adminend/src/assets/theme/theme5.jpg similarity index 100% rename from frontend/src/assets/theme/theme5.jpg rename to backend-adminend/src/assets/theme/theme5.jpg diff --git a/frontend/src/components/Breadcrumb/index.vue b/backend-adminend/src/components/Breadcrumb/index.vue similarity index 100% rename from frontend/src/components/Breadcrumb/index.vue rename to backend-adminend/src/components/Breadcrumb/index.vue diff --git a/frontend/src/components/Category/edit.vue b/backend-adminend/src/components/Category/edit.vue similarity index 100% rename from frontend/src/components/Category/edit.vue rename to backend-adminend/src/components/Category/edit.vue diff --git a/frontend/src/components/Category/info.vue b/backend-adminend/src/components/Category/info.vue similarity index 100% rename from frontend/src/components/Category/info.vue rename to backend-adminend/src/components/Category/info.vue diff --git a/frontend/src/components/Category/list.vue b/backend-adminend/src/components/Category/list.vue similarity index 100% rename from frontend/src/components/Category/list.vue rename to backend-adminend/src/components/Category/list.vue diff --git a/frontend/src/components/ErrorLog/index.vue b/backend-adminend/src/components/ErrorLog/index.vue similarity index 100% rename from frontend/src/components/ErrorLog/index.vue rename to backend-adminend/src/components/ErrorLog/index.vue diff --git a/frontend/src/components/FormGenerator/components/SvgIcon/index.vue b/backend-adminend/src/components/FormGenerator/components/SvgIcon/index.vue similarity index 100% rename from frontend/src/components/FormGenerator/components/SvgIcon/index.vue rename to backend-adminend/src/components/FormGenerator/components/SvgIcon/index.vue diff --git a/frontend/src/components/FormGenerator/components/generator/config.js b/backend-adminend/src/components/FormGenerator/components/generator/config.js similarity index 100% rename from frontend/src/components/FormGenerator/components/generator/config.js rename to backend-adminend/src/components/FormGenerator/components/generator/config.js diff --git a/frontend/src/components/FormGenerator/components/generator/css.js b/backend-adminend/src/components/FormGenerator/components/generator/css.js similarity index 100% rename from frontend/src/components/FormGenerator/components/generator/css.js rename to backend-adminend/src/components/FormGenerator/components/generator/css.js diff --git a/frontend/src/components/FormGenerator/components/generator/drawingDefalut.js b/backend-adminend/src/components/FormGenerator/components/generator/drawingDefalut.js similarity index 100% rename from frontend/src/components/FormGenerator/components/generator/drawingDefalut.js rename to backend-adminend/src/components/FormGenerator/components/generator/drawingDefalut.js diff --git a/frontend/src/components/FormGenerator/components/generator/html.js b/backend-adminend/src/components/FormGenerator/components/generator/html.js similarity index 100% rename from frontend/src/components/FormGenerator/components/generator/html.js rename to backend-adminend/src/components/FormGenerator/components/generator/html.js diff --git a/frontend/src/components/FormGenerator/components/generator/js.js b/backend-adminend/src/components/FormGenerator/components/generator/js.js similarity index 100% rename from frontend/src/components/FormGenerator/components/generator/js.js rename to backend-adminend/src/components/FormGenerator/components/generator/js.js diff --git a/frontend/src/components/FormGenerator/components/generator/ruleTrigger.js b/backend-adminend/src/components/FormGenerator/components/generator/ruleTrigger.js similarity index 100% rename from frontend/src/components/FormGenerator/components/generator/ruleTrigger.js rename to backend-adminend/src/components/FormGenerator/components/generator/ruleTrigger.js diff --git a/frontend/src/components/FormGenerator/components/parser/Parser.vue b/backend-adminend/src/components/FormGenerator/components/parser/Parser.vue similarity index 100% rename from frontend/src/components/FormGenerator/components/parser/Parser.vue rename to backend-adminend/src/components/FormGenerator/components/parser/Parser.vue diff --git a/frontend/src/components/FormGenerator/components/parser/README.md b/backend-adminend/src/components/FormGenerator/components/parser/README.md similarity index 100% rename from frontend/src/components/FormGenerator/components/parser/README.md rename to backend-adminend/src/components/FormGenerator/components/parser/README.md diff --git a/frontend/src/components/FormGenerator/components/parser/ZBParser.vue b/backend-adminend/src/components/FormGenerator/components/parser/ZBParser.vue similarity index 100% rename from frontend/src/components/FormGenerator/components/parser/ZBParser.vue rename to backend-adminend/src/components/FormGenerator/components/parser/ZBParser.vue diff --git a/frontend/src/components/FormGenerator/components/parser/example/Index.vue b/backend-adminend/src/components/FormGenerator/components/parser/example/Index.vue similarity index 100% rename from frontend/src/components/FormGenerator/components/parser/example/Index.vue rename to backend-adminend/src/components/FormGenerator/components/parser/example/Index.vue diff --git a/frontend/src/components/FormGenerator/components/parser/index.js b/backend-adminend/src/components/FormGenerator/components/parser/index.js similarity index 100% rename from frontend/src/components/FormGenerator/components/parser/index.js rename to backend-adminend/src/components/FormGenerator/components/parser/index.js diff --git a/frontend/src/components/FormGenerator/components/parser/package.json b/backend-adminend/src/components/FormGenerator/components/parser/package.json similarity index 100% rename from frontend/src/components/FormGenerator/components/parser/package.json rename to backend-adminend/src/components/FormGenerator/components/parser/package.json diff --git a/frontend/src/components/FormGenerator/components/render/package.json b/backend-adminend/src/components/FormGenerator/components/render/package.json similarity index 100% rename from frontend/src/components/FormGenerator/components/render/package.json rename to backend-adminend/src/components/FormGenerator/components/render/package.json diff --git a/frontend/src/components/FormGenerator/components/render/render.js b/backend-adminend/src/components/FormGenerator/components/render/render.js similarity index 100% rename from frontend/src/components/FormGenerator/components/render/render.js rename to backend-adminend/src/components/FormGenerator/components/render/render.js diff --git a/frontend/src/components/FormGenerator/components/render/slots/el-button.js b/backend-adminend/src/components/FormGenerator/components/render/slots/el-button.js similarity index 100% rename from frontend/src/components/FormGenerator/components/render/slots/el-button.js rename to backend-adminend/src/components/FormGenerator/components/render/slots/el-button.js diff --git a/frontend/src/components/FormGenerator/components/render/slots/el-checkbox-group.js b/backend-adminend/src/components/FormGenerator/components/render/slots/el-checkbox-group.js similarity index 100% rename from frontend/src/components/FormGenerator/components/render/slots/el-checkbox-group.js rename to backend-adminend/src/components/FormGenerator/components/render/slots/el-checkbox-group.js diff --git a/frontend/src/components/FormGenerator/components/render/slots/el-input.js b/backend-adminend/src/components/FormGenerator/components/render/slots/el-input.js similarity index 100% rename from frontend/src/components/FormGenerator/components/render/slots/el-input.js rename to backend-adminend/src/components/FormGenerator/components/render/slots/el-input.js diff --git a/frontend/src/components/FormGenerator/components/render/slots/el-radio-group.js b/backend-adminend/src/components/FormGenerator/components/render/slots/el-radio-group.js similarity index 100% rename from frontend/src/components/FormGenerator/components/render/slots/el-radio-group.js rename to backend-adminend/src/components/FormGenerator/components/render/slots/el-radio-group.js diff --git a/frontend/src/components/FormGenerator/components/render/slots/el-select.js b/backend-adminend/src/components/FormGenerator/components/render/slots/el-select.js similarity index 100% rename from frontend/src/components/FormGenerator/components/render/slots/el-select.js rename to backend-adminend/src/components/FormGenerator/components/render/slots/el-select.js diff --git a/frontend/src/components/FormGenerator/components/render/slots/el-upload.js b/backend-adminend/src/components/FormGenerator/components/render/slots/el-upload.js similarity index 100% rename from frontend/src/components/FormGenerator/components/render/slots/el-upload.js rename to backend-adminend/src/components/FormGenerator/components/render/slots/el-upload.js diff --git a/frontend/src/components/FormGenerator/components/tinymce/config.js b/backend-adminend/src/components/FormGenerator/components/tinymce/config.js similarity index 100% rename from frontend/src/components/FormGenerator/components/tinymce/config.js rename to backend-adminend/src/components/FormGenerator/components/tinymce/config.js diff --git a/frontend/src/components/FormGenerator/components/tinymce/index.js b/backend-adminend/src/components/FormGenerator/components/tinymce/index.js similarity index 100% rename from frontend/src/components/FormGenerator/components/tinymce/index.js rename to backend-adminend/src/components/FormGenerator/components/tinymce/index.js diff --git a/frontend/src/components/FormGenerator/components/tinymce/index.vue b/backend-adminend/src/components/FormGenerator/components/tinymce/index.vue similarity index 100% rename from frontend/src/components/FormGenerator/components/tinymce/index.vue rename to backend-adminend/src/components/FormGenerator/components/tinymce/index.vue diff --git a/frontend/src/components/FormGenerator/components/tinymce/zh_CN.js b/backend-adminend/src/components/FormGenerator/components/tinymce/zh_CN.js similarity index 100% rename from frontend/src/components/FormGenerator/components/tinymce/zh_CN.js rename to backend-adminend/src/components/FormGenerator/components/tinymce/zh_CN.js diff --git a/frontend/src/components/FormGenerator/index/CodeTypeDialog.vue b/backend-adminend/src/components/FormGenerator/index/CodeTypeDialog.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/CodeTypeDialog.vue rename to backend-adminend/src/components/FormGenerator/index/CodeTypeDialog.vue diff --git a/frontend/src/components/FormGenerator/index/DraggableItem.vue b/backend-adminend/src/components/FormGenerator/index/DraggableItem.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/DraggableItem.vue rename to backend-adminend/src/components/FormGenerator/index/DraggableItem.vue diff --git a/frontend/src/components/FormGenerator/index/FormDrawer.vue b/backend-adminend/src/components/FormGenerator/index/FormDrawer.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/FormDrawer.vue rename to backend-adminend/src/components/FormGenerator/index/FormDrawer.vue diff --git a/frontend/src/components/FormGenerator/index/Home.vue b/backend-adminend/src/components/FormGenerator/index/Home.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/Home.vue rename to backend-adminend/src/components/FormGenerator/index/Home.vue diff --git a/frontend/src/components/FormGenerator/index/IconsDialog.vue b/backend-adminend/src/components/FormGenerator/index/IconsDialog.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/IconsDialog.vue rename to backend-adminend/src/components/FormGenerator/index/IconsDialog.vue diff --git a/frontend/src/components/FormGenerator/index/JsonDrawer.vue b/backend-adminend/src/components/FormGenerator/index/JsonDrawer.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/JsonDrawer.vue rename to backend-adminend/src/components/FormGenerator/index/JsonDrawer.vue diff --git a/frontend/src/components/FormGenerator/index/ResourceDialog.vue b/backend-adminend/src/components/FormGenerator/index/ResourceDialog.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/ResourceDialog.vue rename to backend-adminend/src/components/FormGenerator/index/ResourceDialog.vue diff --git a/frontend/src/components/FormGenerator/index/RightPanel.vue b/backend-adminend/src/components/FormGenerator/index/RightPanel.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/RightPanel.vue rename to backend-adminend/src/components/FormGenerator/index/RightPanel.vue diff --git a/frontend/src/components/FormGenerator/index/TreeNodeDialog.vue b/backend-adminend/src/components/FormGenerator/index/TreeNodeDialog.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/TreeNodeDialog.vue rename to backend-adminend/src/components/FormGenerator/index/TreeNodeDialog.vue diff --git a/frontend/src/components/FormGenerator/index/index.vue b/backend-adminend/src/components/FormGenerator/index/index.vue similarity index 100% rename from frontend/src/components/FormGenerator/index/index.vue rename to backend-adminend/src/components/FormGenerator/index/index.vue diff --git a/frontend/src/components/FormGenerator/preview/main.js b/backend-adminend/src/components/FormGenerator/preview/main.js similarity index 100% rename from frontend/src/components/FormGenerator/preview/main.js rename to backend-adminend/src/components/FormGenerator/preview/main.js diff --git a/frontend/src/components/FormGenerator/styles/home.scss b/backend-adminend/src/components/FormGenerator/styles/home.scss similarity index 100% rename from frontend/src/components/FormGenerator/styles/home.scss rename to backend-adminend/src/components/FormGenerator/styles/home.scss diff --git a/frontend/src/components/FormGenerator/styles/index.scss b/backend-adminend/src/components/FormGenerator/styles/index.scss similarity index 100% rename from frontend/src/components/FormGenerator/styles/index.scss rename to backend-adminend/src/components/FormGenerator/styles/index.scss diff --git a/frontend/src/components/FormGenerator/styles/mixin.scss b/backend-adminend/src/components/FormGenerator/styles/mixin.scss similarity index 100% rename from frontend/src/components/FormGenerator/styles/mixin.scss rename to backend-adminend/src/components/FormGenerator/styles/mixin.scss diff --git a/frontend/src/components/FormGenerator/utils/db.js b/backend-adminend/src/components/FormGenerator/utils/db.js similarity index 100% rename from frontend/src/components/FormGenerator/utils/db.js rename to backend-adminend/src/components/FormGenerator/utils/db.js diff --git a/frontend/src/components/FormGenerator/utils/icon.json b/backend-adminend/src/components/FormGenerator/utils/icon.json similarity index 100% rename from frontend/src/components/FormGenerator/utils/icon.json rename to backend-adminend/src/components/FormGenerator/utils/icon.json diff --git a/frontend/src/components/FormGenerator/utils/index.js b/backend-adminend/src/components/FormGenerator/utils/index.js similarity index 100% rename from frontend/src/components/FormGenerator/utils/index.js rename to backend-adminend/src/components/FormGenerator/utils/index.js diff --git a/frontend/src/components/FormGenerator/utils/loadBeautifier.js b/backend-adminend/src/components/FormGenerator/utils/loadBeautifier.js similarity index 100% rename from frontend/src/components/FormGenerator/utils/loadBeautifier.js rename to backend-adminend/src/components/FormGenerator/utils/loadBeautifier.js diff --git a/frontend/src/components/FormGenerator/utils/loadMonaco.js b/backend-adminend/src/components/FormGenerator/utils/loadMonaco.js similarity index 100% rename from frontend/src/components/FormGenerator/utils/loadMonaco.js rename to backend-adminend/src/components/FormGenerator/utils/loadMonaco.js diff --git a/frontend/src/components/FormGenerator/utils/loadScript.js b/backend-adminend/src/components/FormGenerator/utils/loadScript.js similarity index 100% rename from frontend/src/components/FormGenerator/utils/loadScript.js rename to backend-adminend/src/components/FormGenerator/utils/loadScript.js diff --git a/frontend/src/components/FormGenerator/utils/loadTinymce.js b/backend-adminend/src/components/FormGenerator/utils/loadTinymce.js similarity index 100% rename from frontend/src/components/FormGenerator/utils/loadTinymce.js rename to backend-adminend/src/components/FormGenerator/utils/loadTinymce.js diff --git a/frontend/src/components/Hamburger/index.vue b/backend-adminend/src/components/Hamburger/index.vue similarity index 100% rename from frontend/src/components/Hamburger/index.vue rename to backend-adminend/src/components/Hamburger/index.vue diff --git a/frontend/src/components/HeaderSearch/index.vue b/backend-adminend/src/components/HeaderSearch/index.vue similarity index 100% rename from frontend/src/components/HeaderSearch/index.vue rename to backend-adminend/src/components/HeaderSearch/index.vue diff --git a/frontend/src/components/PanThumb/index.vue b/backend-adminend/src/components/PanThumb/index.vue similarity index 100% rename from frontend/src/components/PanThumb/index.vue rename to backend-adminend/src/components/PanThumb/index.vue diff --git a/frontend/src/components/ParentView/index.vue b/backend-adminend/src/components/ParentView/index.vue similarity index 100% rename from frontend/src/components/ParentView/index.vue rename to backend-adminend/src/components/ParentView/index.vue diff --git a/frontend/src/components/RightPanel/index.vue b/backend-adminend/src/components/RightPanel/index.vue similarity index 100% rename from frontend/src/components/RightPanel/index.vue rename to backend-adminend/src/components/RightPanel/index.vue diff --git a/frontend/src/components/Screenfull/index.vue b/backend-adminend/src/components/Screenfull/index.vue similarity index 100% rename from frontend/src/components/Screenfull/index.vue rename to backend-adminend/src/components/Screenfull/index.vue diff --git a/frontend/src/components/Share/DropdownMenu.vue b/backend-adminend/src/components/Share/DropdownMenu.vue similarity index 100% rename from frontend/src/components/Share/DropdownMenu.vue rename to backend-adminend/src/components/Share/DropdownMenu.vue diff --git a/frontend/src/components/Sticky/index.vue b/backend-adminend/src/components/Sticky/index.vue similarity index 100% rename from frontend/src/components/Sticky/index.vue rename to backend-adminend/src/components/Sticky/index.vue diff --git a/frontend/src/components/SvgIcon/index.vue b/backend-adminend/src/components/SvgIcon/index.vue similarity index 100% rename from frontend/src/components/SvgIcon/index.vue rename to backend-adminend/src/components/SvgIcon/index.vue diff --git a/frontend/src/components/ThemePicker/index.vue b/backend-adminend/src/components/ThemePicker/index.vue similarity index 100% rename from frontend/src/components/ThemePicker/index.vue rename to backend-adminend/src/components/ThemePicker/index.vue diff --git a/frontend/src/components/TimeSelect/index.vue b/backend-adminend/src/components/TimeSelect/index.vue similarity index 100% rename from frontend/src/components/TimeSelect/index.vue rename to backend-adminend/src/components/TimeSelect/index.vue diff --git a/frontend/src/components/Tinymce/dynamicLoadScript.js b/backend-adminend/src/components/Tinymce/dynamicLoadScript.js similarity index 100% rename from frontend/src/components/Tinymce/dynamicLoadScript.js rename to backend-adminend/src/components/Tinymce/dynamicLoadScript.js diff --git a/frontend/src/components/Tinymce/index.vue b/backend-adminend/src/components/Tinymce/index.vue similarity index 100% rename from frontend/src/components/Tinymce/index.vue rename to backend-adminend/src/components/Tinymce/index.vue diff --git a/frontend/src/components/Tinymce/plugins.js b/backend-adminend/src/components/Tinymce/plugins.js similarity index 100% rename from frontend/src/components/Tinymce/plugins.js rename to backend-adminend/src/components/Tinymce/plugins.js diff --git a/frontend/src/components/Tinymce/toolbar.js b/backend-adminend/src/components/Tinymce/toolbar.js similarity index 100% rename from frontend/src/components/Tinymce/toolbar.js rename to backend-adminend/src/components/Tinymce/toolbar.js diff --git a/frontend/src/components/TopNav/index.vue b/backend-adminend/src/components/TopNav/index.vue similarity index 100% rename from frontend/src/components/TopNav/index.vue rename to backend-adminend/src/components/TopNav/index.vue diff --git a/frontend/src/components/Upload/uploadFile.vue b/backend-adminend/src/components/Upload/uploadFile.vue similarity index 100% rename from frontend/src/components/Upload/uploadFile.vue rename to backend-adminend/src/components/Upload/uploadFile.vue diff --git a/frontend/src/components/UploadExcel/index.vue b/backend-adminend/src/components/UploadExcel/index.vue similarity index 100% rename from frontend/src/components/UploadExcel/index.vue rename to backend-adminend/src/components/UploadExcel/index.vue diff --git a/frontend/src/components/articleList/articleFrom/index.js b/backend-adminend/src/components/articleList/articleFrom/index.js similarity index 100% rename from frontend/src/components/articleList/articleFrom/index.js rename to backend-adminend/src/components/articleList/articleFrom/index.js diff --git a/frontend/src/components/articleList/articleFrom/index.vue b/backend-adminend/src/components/articleList/articleFrom/index.vue similarity index 100% rename from frontend/src/components/articleList/articleFrom/index.vue rename to backend-adminend/src/components/articleList/articleFrom/index.vue diff --git a/frontend/src/components/articleList/index.vue b/backend-adminend/src/components/articleList/index.vue similarity index 100% rename from frontend/src/components/articleList/index.vue rename to backend-adminend/src/components/articleList/index.vue diff --git a/frontend/src/components/attrFrom/index.vue b/backend-adminend/src/components/attrFrom/index.vue similarity index 100% rename from frontend/src/components/attrFrom/index.vue rename to backend-adminend/src/components/attrFrom/index.vue diff --git a/frontend/src/components/cards/index.vue b/backend-adminend/src/components/cards/index.vue similarity index 100% rename from frontend/src/components/cards/index.vue rename to backend-adminend/src/components/cards/index.vue diff --git a/frontend/src/components/couponList/couponFrom/index.js b/backend-adminend/src/components/couponList/couponFrom/index.js similarity index 100% rename from frontend/src/components/couponList/couponFrom/index.js rename to backend-adminend/src/components/couponList/couponFrom/index.js diff --git a/frontend/src/components/couponList/couponFrom/index.vue b/backend-adminend/src/components/couponList/couponFrom/index.vue similarity index 100% rename from frontend/src/components/couponList/couponFrom/index.vue rename to backend-adminend/src/components/couponList/couponFrom/index.vue diff --git a/frontend/src/components/couponList/index.vue b/backend-adminend/src/components/couponList/index.vue similarity index 100% rename from frontend/src/components/couponList/index.vue rename to backend-adminend/src/components/couponList/index.vue diff --git a/frontend/src/components/customerInfo/index.vue b/backend-adminend/src/components/customerInfo/index.vue similarity index 100% rename from frontend/src/components/customerInfo/index.vue rename to backend-adminend/src/components/customerInfo/index.vue diff --git a/frontend/src/components/echarts/index.vue b/backend-adminend/src/components/echarts/index.vue similarity index 100% rename from frontend/src/components/echarts/index.vue rename to backend-adminend/src/components/echarts/index.vue diff --git a/frontend/src/components/echartsNew/index.vue b/backend-adminend/src/components/echartsNew/index.vue similarity index 100% rename from frontend/src/components/echartsNew/index.vue rename to backend-adminend/src/components/echartsNew/index.vue diff --git a/frontend/src/components/goodList/goodListFrom/index.js b/backend-adminend/src/components/goodList/goodListFrom/index.js similarity index 100% rename from frontend/src/components/goodList/goodListFrom/index.js rename to backend-adminend/src/components/goodList/goodListFrom/index.js diff --git a/frontend/src/components/goodList/goodListFrom/index.vue b/backend-adminend/src/components/goodList/goodListFrom/index.vue similarity index 100% rename from frontend/src/components/goodList/goodListFrom/index.vue rename to backend-adminend/src/components/goodList/goodListFrom/index.vue diff --git a/frontend/src/components/goodList/index.vue b/backend-adminend/src/components/goodList/index.vue similarity index 100% rename from frontend/src/components/goodList/index.vue rename to backend-adminend/src/components/goodList/index.vue diff --git a/frontend/src/components/hotpotModal/AreaBox.vue b/backend-adminend/src/components/hotpotModal/AreaBox.vue similarity index 100% rename from frontend/src/components/hotpotModal/AreaBox.vue rename to backend-adminend/src/components/hotpotModal/AreaBox.vue diff --git a/frontend/src/components/hotpotModal/index.vue b/backend-adminend/src/components/hotpotModal/index.vue similarity index 100% rename from frontend/src/components/hotpotModal/index.vue rename to backend-adminend/src/components/hotpotModal/index.vue diff --git a/frontend/src/components/iconFrom/element-icons.js b/backend-adminend/src/components/iconFrom/element-icons.js similarity index 100% rename from frontend/src/components/iconFrom/element-icons.js rename to backend-adminend/src/components/iconFrom/element-icons.js diff --git a/frontend/src/components/iconFrom/index.vue b/backend-adminend/src/components/iconFrom/index.vue similarity index 100% rename from frontend/src/components/iconFrom/index.vue rename to backend-adminend/src/components/iconFrom/index.vue diff --git a/frontend/src/components/linkaddress/index.vue b/backend-adminend/src/components/linkaddress/index.vue similarity index 100% rename from frontend/src/components/linkaddress/index.vue rename to backend-adminend/src/components/linkaddress/index.vue diff --git a/frontend/src/components/linkaddress/linkData.json b/backend-adminend/src/components/linkaddress/linkData.json similarity index 100% rename from frontend/src/components/linkaddress/linkData.json rename to backend-adminend/src/components/linkaddress/linkData.json diff --git a/frontend/src/components/linkaddress/list.json b/backend-adminend/src/components/linkaddress/list.json similarity index 100% rename from frontend/src/components/linkaddress/list.json rename to backend-adminend/src/components/linkaddress/list.json diff --git a/frontend/src/components/linkaddress/marketing.json b/backend-adminend/src/components/linkaddress/marketing.json similarity index 100% rename from frontend/src/components/linkaddress/marketing.json rename to backend-adminend/src/components/linkaddress/marketing.json diff --git a/frontend/src/components/pagesHeader/index.vue b/backend-adminend/src/components/pagesHeader/index.vue similarity index 100% rename from frontend/src/components/pagesHeader/index.vue rename to backend-adminend/src/components/pagesHeader/index.vue diff --git a/frontend/src/components/uploadPicture/forGenrator/index.vue b/backend-adminend/src/components/uploadPicture/forGenrator/index.vue similarity index 100% rename from frontend/src/components/uploadPicture/forGenrator/index.vue rename to backend-adminend/src/components/uploadPicture/forGenrator/index.vue diff --git a/frontend/src/components/uploadPicture/index.vue b/backend-adminend/src/components/uploadPicture/index.vue similarity index 100% rename from frontend/src/components/uploadPicture/index.vue rename to backend-adminend/src/components/uploadPicture/index.vue diff --git a/frontend/src/components/uploadPicture/internal.js b/backend-adminend/src/components/uploadPicture/internal.js similarity index 100% rename from frontend/src/components/uploadPicture/internal.js rename to backend-adminend/src/components/uploadPicture/internal.js diff --git a/frontend/src/components/uploadPicture/uploadFrom/index.js b/backend-adminend/src/components/uploadPicture/uploadFrom/index.js similarity index 100% rename from frontend/src/components/uploadPicture/uploadFrom/index.js rename to backend-adminend/src/components/uploadPicture/uploadFrom/index.js diff --git a/frontend/src/components/uploadPicture/uploadFrom/index.vue b/backend-adminend/src/components/uploadPicture/uploadFrom/index.vue similarity index 100% rename from frontend/src/components/uploadPicture/uploadFrom/index.vue rename to backend-adminend/src/components/uploadPicture/uploadFrom/index.vue diff --git a/frontend/src/components/userList/index.vue b/backend-adminend/src/components/userList/index.vue similarity index 100% rename from frontend/src/components/userList/index.vue rename to backend-adminend/src/components/userList/index.vue diff --git a/frontend/src/components/verifition/Verify.vue b/backend-adminend/src/components/verifition/Verify.vue similarity index 100% rename from frontend/src/components/verifition/Verify.vue rename to backend-adminend/src/components/verifition/Verify.vue diff --git a/frontend/src/components/verifition/Verify/VerifyPoints.vue b/backend-adminend/src/components/verifition/Verify/VerifyPoints.vue similarity index 100% rename from frontend/src/components/verifition/Verify/VerifyPoints.vue rename to backend-adminend/src/components/verifition/Verify/VerifyPoints.vue diff --git a/frontend/src/components/verifition/Verify/VerifySlide.vue b/backend-adminend/src/components/verifition/Verify/VerifySlide.vue similarity index 100% rename from frontend/src/components/verifition/Verify/VerifySlide.vue rename to backend-adminend/src/components/verifition/Verify/VerifySlide.vue diff --git a/frontend/src/components/verifition/api/index.js b/backend-adminend/src/components/verifition/api/index.js similarity index 86% rename from frontend/src/components/verifition/api/index.js rename to backend-adminend/src/components/verifition/api/index.js index 80b7a70..0fa3992 100644 --- a/frontend/src/components/verifition/api/index.js +++ b/backend-adminend/src/components/verifition/api/index.js @@ -2,7 +2,7 @@ * 此处可直接引用自己项目封装好的 axios 配合后端联调 */ -import request from './../utils/axios'; // 组件内部封装的axios +import request from '../utils/axios'; // 组件内部封装的axios // import request from "@/api/axios.js" //调用项目封装的axios // 获取验证图片 以及token diff --git a/frontend/src/components/verifition/utils/ase.js b/backend-adminend/src/components/verifition/utils/ase.js similarity index 100% rename from frontend/src/components/verifition/utils/ase.js rename to backend-adminend/src/components/verifition/utils/ase.js diff --git a/frontend/src/components/verifition/utils/axios.js b/backend-adminend/src/components/verifition/utils/axios.js similarity index 100% rename from frontend/src/components/verifition/utils/axios.js rename to backend-adminend/src/components/verifition/utils/axios.js diff --git a/frontend/src/components/verifition/utils/util.js b/backend-adminend/src/components/verifition/utils/util.js similarity index 100% rename from frontend/src/components/verifition/utils/util.js rename to backend-adminend/src/components/verifition/utils/util.js diff --git a/frontend/src/directive/copy/copy.js b/backend-adminend/src/directive/copy/copy.js similarity index 100% rename from frontend/src/directive/copy/copy.js rename to backend-adminend/src/directive/copy/copy.js diff --git a/frontend/src/directive/dialog/drag.js b/backend-adminend/src/directive/dialog/drag.js similarity index 100% rename from frontend/src/directive/dialog/drag.js rename to backend-adminend/src/directive/dialog/drag.js diff --git a/frontend/src/directive/dialog/dragHeight.js b/backend-adminend/src/directive/dialog/dragHeight.js similarity index 100% rename from frontend/src/directive/dialog/dragHeight.js rename to backend-adminend/src/directive/dialog/dragHeight.js diff --git a/frontend/src/directive/dialog/dragWidth.js b/backend-adminend/src/directive/dialog/dragWidth.js similarity index 100% rename from frontend/src/directive/dialog/dragWidth.js rename to backend-adminend/src/directive/dialog/dragWidth.js diff --git a/frontend/src/directive/index.js b/backend-adminend/src/directive/index.js similarity index 100% rename from frontend/src/directive/index.js rename to backend-adminend/src/directive/index.js diff --git a/frontend/src/directive/permission/hasPermi.js b/backend-adminend/src/directive/permission/hasPermi.js similarity index 100% rename from frontend/src/directive/permission/hasPermi.js rename to backend-adminend/src/directive/permission/hasPermi.js diff --git a/frontend/src/directive/permission/hasRole.js b/backend-adminend/src/directive/permission/hasRole.js similarity index 100% rename from frontend/src/directive/permission/hasRole.js rename to backend-adminend/src/directive/permission/hasRole.js diff --git a/frontend/src/filters/commFilter.js b/backend-adminend/src/filters/commFilter.js similarity index 100% rename from frontend/src/filters/commFilter.js rename to backend-adminend/src/filters/commFilter.js diff --git a/frontend/src/filters/index.js b/backend-adminend/src/filters/index.js similarity index 94% rename from frontend/src/filters/index.js rename to backend-adminend/src/filters/index.js index d95dc61..e7b1867 100644 --- a/frontend/src/filters/index.js +++ b/backend-adminend/src/filters/index.js @@ -11,10 +11,10 @@ // import parseTime, formatTime and set to filter export { parseTime, formatTime } from '@/utils'; -export * from '../filters/commFilter'; -export * from '../filters/user'; -export * from '../filters/order'; -export * from '../filters/wx'; +export * from './commFilter'; +export * from './user'; +export * from './order'; +export * from './wx'; /** * Show plural label if time is plural number diff --git a/frontend/src/filters/order.js b/backend-adminend/src/filters/order.js similarity index 100% rename from frontend/src/filters/order.js rename to backend-adminend/src/filters/order.js diff --git a/frontend/src/filters/user.js b/backend-adminend/src/filters/user.js similarity index 100% rename from frontend/src/filters/user.js rename to backend-adminend/src/filters/user.js diff --git a/frontend/src/filters/wx.js b/backend-adminend/src/filters/wx.js similarity index 100% rename from frontend/src/filters/wx.js rename to backend-adminend/src/filters/wx.js diff --git a/frontend/src/icons/index.js b/backend-adminend/src/icons/index.js similarity index 100% rename from frontend/src/icons/index.js rename to backend-adminend/src/icons/index.js diff --git a/frontend/src/icons/svg/404.svg b/backend-adminend/src/icons/svg/404.svg similarity index 100% rename from frontend/src/icons/svg/404.svg rename to backend-adminend/src/icons/svg/404.svg diff --git a/frontend/src/icons/svg/bug.svg b/backend-adminend/src/icons/svg/bug.svg similarity index 100% rename from frontend/src/icons/svg/bug.svg rename to backend-adminend/src/icons/svg/bug.svg diff --git a/frontend/src/icons/svg/chart.svg b/backend-adminend/src/icons/svg/chart.svg similarity index 100% rename from frontend/src/icons/svg/chart.svg rename to backend-adminend/src/icons/svg/chart.svg diff --git a/frontend/src/icons/svg/clipboard.svg b/backend-adminend/src/icons/svg/clipboard.svg similarity index 100% rename from frontend/src/icons/svg/clipboard.svg rename to backend-adminend/src/icons/svg/clipboard.svg diff --git a/frontend/src/icons/svg/component.svg b/backend-adminend/src/icons/svg/component.svg similarity index 100% rename from frontend/src/icons/svg/component.svg rename to backend-adminend/src/icons/svg/component.svg diff --git a/frontend/src/icons/svg/dashboard.svg b/backend-adminend/src/icons/svg/dashboard.svg similarity index 100% rename from frontend/src/icons/svg/dashboard.svg rename to backend-adminend/src/icons/svg/dashboard.svg diff --git a/frontend/src/icons/svg/documentation.svg b/backend-adminend/src/icons/svg/documentation.svg similarity index 100% rename from frontend/src/icons/svg/documentation.svg rename to backend-adminend/src/icons/svg/documentation.svg diff --git a/frontend/src/icons/svg/drag.svg b/backend-adminend/src/icons/svg/drag.svg similarity index 100% rename from frontend/src/icons/svg/drag.svg rename to backend-adminend/src/icons/svg/drag.svg diff --git a/frontend/src/icons/svg/edit.svg b/backend-adminend/src/icons/svg/edit.svg similarity index 100% rename from frontend/src/icons/svg/edit.svg rename to backend-adminend/src/icons/svg/edit.svg diff --git a/frontend/src/icons/svg/education.svg b/backend-adminend/src/icons/svg/education.svg similarity index 100% rename from frontend/src/icons/svg/education.svg rename to backend-adminend/src/icons/svg/education.svg diff --git a/frontend/src/icons/svg/email.svg b/backend-adminend/src/icons/svg/email.svg similarity index 100% rename from frontend/src/icons/svg/email.svg rename to backend-adminend/src/icons/svg/email.svg diff --git a/frontend/src/icons/svg/example.svg b/backend-adminend/src/icons/svg/example.svg similarity index 100% rename from frontend/src/icons/svg/example.svg rename to backend-adminend/src/icons/svg/example.svg diff --git a/frontend/src/icons/svg/excel.svg b/backend-adminend/src/icons/svg/excel.svg similarity index 100% rename from frontend/src/icons/svg/excel.svg rename to backend-adminend/src/icons/svg/excel.svg diff --git a/frontend/src/icons/svg/exit-fullscreen.svg b/backend-adminend/src/icons/svg/exit-fullscreen.svg similarity index 100% rename from frontend/src/icons/svg/exit-fullscreen.svg rename to backend-adminend/src/icons/svg/exit-fullscreen.svg diff --git a/frontend/src/icons/svg/eye-open.svg b/backend-adminend/src/icons/svg/eye-open.svg similarity index 100% rename from frontend/src/icons/svg/eye-open.svg rename to backend-adminend/src/icons/svg/eye-open.svg diff --git a/frontend/src/icons/svg/eye.svg b/backend-adminend/src/icons/svg/eye.svg similarity index 100% rename from frontend/src/icons/svg/eye.svg rename to backend-adminend/src/icons/svg/eye.svg diff --git a/frontend/src/icons/svg/form.svg b/backend-adminend/src/icons/svg/form.svg similarity index 100% rename from frontend/src/icons/svg/form.svg rename to backend-adminend/src/icons/svg/form.svg diff --git a/frontend/src/icons/svg/fullscreen.svg b/backend-adminend/src/icons/svg/fullscreen.svg similarity index 100% rename from frontend/src/icons/svg/fullscreen.svg rename to backend-adminend/src/icons/svg/fullscreen.svg diff --git a/frontend/src/icons/svg/guide.svg b/backend-adminend/src/icons/svg/guide.svg similarity index 100% rename from frontend/src/icons/svg/guide.svg rename to backend-adminend/src/icons/svg/guide.svg diff --git a/frontend/src/icons/svg/icon.svg b/backend-adminend/src/icons/svg/icon.svg similarity index 100% rename from frontend/src/icons/svg/icon.svg rename to backend-adminend/src/icons/svg/icon.svg diff --git a/frontend/src/icons/svg/international.svg b/backend-adminend/src/icons/svg/international.svg similarity index 100% rename from frontend/src/icons/svg/international.svg rename to backend-adminend/src/icons/svg/international.svg diff --git a/frontend/src/icons/svg/language.svg b/backend-adminend/src/icons/svg/language.svg similarity index 100% rename from frontend/src/icons/svg/language.svg rename to backend-adminend/src/icons/svg/language.svg diff --git a/frontend/src/icons/svg/link.svg b/backend-adminend/src/icons/svg/link.svg similarity index 100% rename from frontend/src/icons/svg/link.svg rename to backend-adminend/src/icons/svg/link.svg diff --git a/frontend/src/icons/svg/list.svg b/backend-adminend/src/icons/svg/list.svg similarity index 100% rename from frontend/src/icons/svg/list.svg rename to backend-adminend/src/icons/svg/list.svg diff --git a/frontend/src/icons/svg/lock.svg b/backend-adminend/src/icons/svg/lock.svg similarity index 100% rename from frontend/src/icons/svg/lock.svg rename to backend-adminend/src/icons/svg/lock.svg diff --git a/frontend/src/icons/svg/message.svg b/backend-adminend/src/icons/svg/message.svg similarity index 100% rename from frontend/src/icons/svg/message.svg rename to backend-adminend/src/icons/svg/message.svg diff --git a/frontend/src/icons/svg/money.svg b/backend-adminend/src/icons/svg/money.svg similarity index 100% rename from frontend/src/icons/svg/money.svg rename to backend-adminend/src/icons/svg/money.svg diff --git a/frontend/src/icons/svg/nested.svg b/backend-adminend/src/icons/svg/nested.svg similarity index 100% rename from frontend/src/icons/svg/nested.svg rename to backend-adminend/src/icons/svg/nested.svg diff --git a/frontend/src/icons/svg/password.svg b/backend-adminend/src/icons/svg/password.svg similarity index 100% rename from frontend/src/icons/svg/password.svg rename to backend-adminend/src/icons/svg/password.svg diff --git a/frontend/src/icons/svg/pdf.svg b/backend-adminend/src/icons/svg/pdf.svg similarity index 100% rename from frontend/src/icons/svg/pdf.svg rename to backend-adminend/src/icons/svg/pdf.svg diff --git a/frontend/src/icons/svg/people.svg b/backend-adminend/src/icons/svg/people.svg similarity index 100% rename from frontend/src/icons/svg/people.svg rename to backend-adminend/src/icons/svg/people.svg diff --git a/frontend/src/icons/svg/peoples.svg b/backend-adminend/src/icons/svg/peoples.svg similarity index 100% rename from frontend/src/icons/svg/peoples.svg rename to backend-adminend/src/icons/svg/peoples.svg diff --git a/frontend/src/icons/svg/qq.svg b/backend-adminend/src/icons/svg/qq.svg similarity index 100% rename from frontend/src/icons/svg/qq.svg rename to backend-adminend/src/icons/svg/qq.svg diff --git a/frontend/src/icons/svg/search.svg b/backend-adminend/src/icons/svg/search.svg similarity index 100% rename from frontend/src/icons/svg/search.svg rename to backend-adminend/src/icons/svg/search.svg diff --git a/frontend/src/icons/svg/shopping.svg b/backend-adminend/src/icons/svg/shopping.svg similarity index 100% rename from frontend/src/icons/svg/shopping.svg rename to backend-adminend/src/icons/svg/shopping.svg diff --git a/frontend/src/icons/svg/size.svg b/backend-adminend/src/icons/svg/size.svg similarity index 100% rename from frontend/src/icons/svg/size.svg rename to backend-adminend/src/icons/svg/size.svg diff --git a/frontend/src/icons/svg/skill.svg b/backend-adminend/src/icons/svg/skill.svg similarity index 100% rename from frontend/src/icons/svg/skill.svg rename to backend-adminend/src/icons/svg/skill.svg diff --git a/frontend/src/icons/svg/star.svg b/backend-adminend/src/icons/svg/star.svg similarity index 100% rename from frontend/src/icons/svg/star.svg rename to backend-adminend/src/icons/svg/star.svg diff --git a/frontend/src/icons/svg/tab.svg b/backend-adminend/src/icons/svg/tab.svg similarity index 100% rename from frontend/src/icons/svg/tab.svg rename to backend-adminend/src/icons/svg/tab.svg diff --git a/frontend/src/icons/svg/table.svg b/backend-adminend/src/icons/svg/table.svg similarity index 100% rename from frontend/src/icons/svg/table.svg rename to backend-adminend/src/icons/svg/table.svg diff --git a/frontend/src/icons/svg/theme.svg b/backend-adminend/src/icons/svg/theme.svg similarity index 100% rename from frontend/src/icons/svg/theme.svg rename to backend-adminend/src/icons/svg/theme.svg diff --git a/frontend/src/icons/svg/tree-table.svg b/backend-adminend/src/icons/svg/tree-table.svg similarity index 100% rename from frontend/src/icons/svg/tree-table.svg rename to backend-adminend/src/icons/svg/tree-table.svg diff --git a/frontend/src/icons/svg/tree.svg b/backend-adminend/src/icons/svg/tree.svg similarity index 100% rename from frontend/src/icons/svg/tree.svg rename to backend-adminend/src/icons/svg/tree.svg diff --git a/frontend/src/icons/svg/user.svg b/backend-adminend/src/icons/svg/user.svg similarity index 100% rename from frontend/src/icons/svg/user.svg rename to backend-adminend/src/icons/svg/user.svg diff --git a/frontend/src/icons/svg/wechat.svg b/backend-adminend/src/icons/svg/wechat.svg similarity index 100% rename from frontend/src/icons/svg/wechat.svg rename to backend-adminend/src/icons/svg/wechat.svg diff --git a/frontend/src/icons/svg/zip.svg b/backend-adminend/src/icons/svg/zip.svg similarity index 100% rename from frontend/src/icons/svg/zip.svg rename to backend-adminend/src/icons/svg/zip.svg diff --git a/frontend/src/icons/svgo.yml b/backend-adminend/src/icons/svgo.yml similarity index 100% rename from frontend/src/icons/svgo.yml rename to backend-adminend/src/icons/svgo.yml diff --git a/frontend/src/layout/components/AppMain.vue b/backend-adminend/src/layout/components/AppMain.vue similarity index 100% rename from frontend/src/layout/components/AppMain.vue rename to backend-adminend/src/layout/components/AppMain.vue diff --git a/frontend/src/layout/components/Navbar.vue b/backend-adminend/src/layout/components/Navbar.vue similarity index 100% rename from frontend/src/layout/components/Navbar.vue rename to backend-adminend/src/layout/components/Navbar.vue diff --git a/frontend/src/layout/components/Settings/index.vue b/backend-adminend/src/layout/components/Settings/index.vue similarity index 100% rename from frontend/src/layout/components/Settings/index.vue rename to backend-adminend/src/layout/components/Settings/index.vue diff --git a/frontend/src/layout/components/Sidebar/FixiOSBug.js b/backend-adminend/src/layout/components/Sidebar/FixiOSBug.js similarity index 100% rename from frontend/src/layout/components/Sidebar/FixiOSBug.js rename to backend-adminend/src/layout/components/Sidebar/FixiOSBug.js diff --git a/frontend/src/layout/components/Sidebar/Item.vue b/backend-adminend/src/layout/components/Sidebar/Item.vue similarity index 100% rename from frontend/src/layout/components/Sidebar/Item.vue rename to backend-adminend/src/layout/components/Sidebar/Item.vue diff --git a/frontend/src/layout/components/Sidebar/Link.vue b/backend-adminend/src/layout/components/Sidebar/Link.vue similarity index 100% rename from frontend/src/layout/components/Sidebar/Link.vue rename to backend-adminend/src/layout/components/Sidebar/Link.vue diff --git a/frontend/src/layout/components/Sidebar/Logo.vue b/backend-adminend/src/layout/components/Sidebar/Logo.vue similarity index 100% rename from frontend/src/layout/components/Sidebar/Logo.vue rename to backend-adminend/src/layout/components/Sidebar/Logo.vue diff --git a/frontend/src/layout/components/Sidebar/SidebarItem.vue b/backend-adminend/src/layout/components/Sidebar/SidebarItem.vue similarity index 100% rename from frontend/src/layout/components/Sidebar/SidebarItem.vue rename to backend-adminend/src/layout/components/Sidebar/SidebarItem.vue diff --git a/frontend/src/layout/components/Sidebar/index.vue b/backend-adminend/src/layout/components/Sidebar/index.vue similarity index 100% rename from frontend/src/layout/components/Sidebar/index.vue rename to backend-adminend/src/layout/components/Sidebar/index.vue diff --git a/frontend/src/layout/components/TagsView/ScrollPane.vue b/backend-adminend/src/layout/components/TagsView/ScrollPane.vue similarity index 100% rename from frontend/src/layout/components/TagsView/ScrollPane.vue rename to backend-adminend/src/layout/components/TagsView/ScrollPane.vue diff --git a/frontend/src/layout/components/TagsView/index.vue b/backend-adminend/src/layout/components/TagsView/index.vue similarity index 100% rename from frontend/src/layout/components/TagsView/index.vue rename to backend-adminend/src/layout/components/TagsView/index.vue diff --git a/frontend/src/layout/components/copyright/index.vue b/backend-adminend/src/layout/components/copyright/index.vue similarity index 100% rename from frontend/src/layout/components/copyright/index.vue rename to backend-adminend/src/layout/components/copyright/index.vue diff --git a/frontend/src/layout/components/index.js b/backend-adminend/src/layout/components/index.js similarity index 100% rename from frontend/src/layout/components/index.js rename to backend-adminend/src/layout/components/index.js diff --git a/frontend/src/layout/index.vue b/backend-adminend/src/layout/index.vue similarity index 100% rename from frontend/src/layout/index.vue rename to backend-adminend/src/layout/index.vue diff --git a/frontend/src/layout/mixin/ResizeHandler.js b/backend-adminend/src/layout/mixin/ResizeHandler.js similarity index 100% rename from frontend/src/layout/mixin/ResizeHandler.js rename to backend-adminend/src/layout/mixin/ResizeHandler.js diff --git a/frontend/src/libs/debounce.js b/backend-adminend/src/libs/debounce.js similarity index 100% rename from frontend/src/libs/debounce.js rename to backend-adminend/src/libs/debounce.js diff --git a/frontend/src/libs/dialog.js b/backend-adminend/src/libs/dialog.js similarity index 100% rename from frontend/src/libs/dialog.js rename to backend-adminend/src/libs/dialog.js diff --git a/frontend/src/libs/loading.js b/backend-adminend/src/libs/loading.js similarity index 100% rename from frontend/src/libs/loading.js rename to backend-adminend/src/libs/loading.js diff --git a/frontend/src/libs/modal-attr.js b/backend-adminend/src/libs/modal-attr.js similarity index 100% rename from frontend/src/libs/modal-attr.js rename to backend-adminend/src/libs/modal-attr.js diff --git a/frontend/src/libs/modal-coupon.js b/backend-adminend/src/libs/modal-coupon.js similarity index 100% rename from frontend/src/libs/modal-coupon.js rename to backend-adminend/src/libs/modal-coupon.js diff --git a/frontend/src/libs/modal-icon.js b/backend-adminend/src/libs/modal-icon.js similarity index 100% rename from frontend/src/libs/modal-icon.js rename to backend-adminend/src/libs/modal-icon.js diff --git a/frontend/src/libs/modal-sure.js b/backend-adminend/src/libs/modal-sure.js similarity index 100% rename from frontend/src/libs/modal-sure.js rename to backend-adminend/src/libs/modal-sure.js diff --git a/frontend/src/libs/public.js b/backend-adminend/src/libs/public.js similarity index 100% rename from frontend/src/libs/public.js rename to backend-adminend/src/libs/public.js diff --git a/frontend/src/libs/timeOptions.js b/backend-adminend/src/libs/timeOptions.js similarity index 100% rename from frontend/src/libs/timeOptions.js rename to backend-adminend/src/libs/timeOptions.js diff --git a/frontend/src/libs/wechat.js b/backend-adminend/src/libs/wechat.js similarity index 100% rename from frontend/src/libs/wechat.js rename to backend-adminend/src/libs/wechat.js diff --git a/frontend/src/main.js b/backend-adminend/src/main.js similarity index 100% rename from frontend/src/main.js rename to backend-adminend/src/main.js diff --git a/frontend/src/permission.js b/backend-adminend/src/permission.js similarity index 100% rename from frontend/src/permission.js rename to backend-adminend/src/permission.js diff --git a/frontend/src/plugins/auth.js b/backend-adminend/src/plugins/auth.js similarity index 100% rename from frontend/src/plugins/auth.js rename to backend-adminend/src/plugins/auth.js diff --git a/frontend/src/plugins/cache.js b/backend-adminend/src/plugins/cache.js similarity index 100% rename from frontend/src/plugins/cache.js rename to backend-adminend/src/plugins/cache.js diff --git a/frontend/src/plugins/download.js b/backend-adminend/src/plugins/download.js similarity index 100% rename from frontend/src/plugins/download.js rename to backend-adminend/src/plugins/download.js diff --git a/frontend/src/plugins/index.js b/backend-adminend/src/plugins/index.js similarity index 100% rename from frontend/src/plugins/index.js rename to backend-adminend/src/plugins/index.js diff --git a/frontend/src/plugins/modal.js b/backend-adminend/src/plugins/modal.js similarity index 100% rename from frontend/src/plugins/modal.js rename to backend-adminend/src/plugins/modal.js diff --git a/frontend/src/router/index.js b/backend-adminend/src/router/index.js similarity index 100% rename from frontend/src/router/index.js rename to backend-adminend/src/router/index.js diff --git a/frontend/src/router/modules/appSetting.js b/backend-adminend/src/router/modules/appSetting.js similarity index 100% rename from frontend/src/router/modules/appSetting.js rename to backend-adminend/src/router/modules/appSetting.js diff --git a/frontend/src/router/modules/consignment.js b/backend-adminend/src/router/modules/consignment.js similarity index 100% rename from frontend/src/router/modules/consignment.js rename to backend-adminend/src/router/modules/consignment.js diff --git a/frontend/src/router/modules/content.js b/backend-adminend/src/router/modules/content.js similarity index 100% rename from frontend/src/router/modules/content.js rename to backend-adminend/src/router/modules/content.js diff --git a/frontend/src/router/modules/design.js b/backend-adminend/src/router/modules/design.js similarity index 100% rename from frontend/src/router/modules/design.js rename to backend-adminend/src/router/modules/design.js diff --git a/frontend/src/router/modules/distribution.js b/backend-adminend/src/router/modules/distribution.js similarity index 100% rename from frontend/src/router/modules/distribution.js rename to backend-adminend/src/router/modules/distribution.js diff --git a/frontend/src/router/modules/financial.js b/backend-adminend/src/router/modules/financial.js similarity index 100% rename from frontend/src/router/modules/financial.js rename to backend-adminend/src/router/modules/financial.js diff --git a/frontend/src/router/modules/maintain.js b/backend-adminend/src/router/modules/maintain.js similarity index 100% rename from frontend/src/router/modules/maintain.js rename to backend-adminend/src/router/modules/maintain.js diff --git a/frontend/src/router/modules/marketing.js b/backend-adminend/src/router/modules/marketing.js similarity index 100% rename from frontend/src/router/modules/marketing.js rename to backend-adminend/src/router/modules/marketing.js diff --git a/frontend/src/router/modules/mobile.js b/backend-adminend/src/router/modules/mobile.js similarity index 100% rename from frontend/src/router/modules/mobile.js rename to backend-adminend/src/router/modules/mobile.js diff --git a/frontend/src/router/modules/operation.js b/backend-adminend/src/router/modules/operation.js similarity index 100% rename from frontend/src/router/modules/operation.js rename to backend-adminend/src/router/modules/operation.js diff --git a/frontend/src/router/modules/order.js b/backend-adminend/src/router/modules/order.js similarity index 100% rename from frontend/src/router/modules/order.js rename to backend-adminend/src/router/modules/order.js diff --git a/frontend/src/router/modules/statistic.js b/backend-adminend/src/router/modules/statistic.js similarity index 100% rename from frontend/src/router/modules/statistic.js rename to backend-adminend/src/router/modules/statistic.js diff --git a/frontend/src/router/modules/store.js b/backend-adminend/src/router/modules/store.js similarity index 100% rename from frontend/src/router/modules/store.js rename to backend-adminend/src/router/modules/store.js diff --git a/frontend/src/router/modules/user.js b/backend-adminend/src/router/modules/user.js similarity index 100% rename from frontend/src/router/modules/user.js rename to backend-adminend/src/router/modules/user.js diff --git a/frontend/src/settings.js b/backend-adminend/src/settings.js similarity index 100% rename from frontend/src/settings.js rename to backend-adminend/src/settings.js diff --git a/frontend/src/store/getters.js b/backend-adminend/src/store/getters.js similarity index 100% rename from frontend/src/store/getters.js rename to backend-adminend/src/store/getters.js diff --git a/frontend/src/store/index.js b/backend-adminend/src/store/index.js similarity index 100% rename from frontend/src/store/index.js rename to backend-adminend/src/store/index.js diff --git a/frontend/src/store/modules/app.js b/backend-adminend/src/store/modules/app.js similarity index 100% rename from frontend/src/store/modules/app.js rename to backend-adminend/src/store/modules/app.js diff --git a/frontend/src/store/modules/errorLog.js b/backend-adminend/src/store/modules/errorLog.js similarity index 100% rename from frontend/src/store/modules/errorLog.js rename to backend-adminend/src/store/modules/errorLog.js diff --git a/frontend/src/store/modules/mobildConfig.js b/backend-adminend/src/store/modules/mobildConfig.js similarity index 100% rename from frontend/src/store/modules/mobildConfig.js rename to backend-adminend/src/store/modules/mobildConfig.js diff --git a/frontend/src/store/modules/permission.js b/backend-adminend/src/store/modules/permission.js similarity index 100% rename from frontend/src/store/modules/permission.js rename to backend-adminend/src/store/modules/permission.js diff --git a/frontend/src/store/modules/product.js b/backend-adminend/src/store/modules/product.js similarity index 100% rename from frontend/src/store/modules/product.js rename to backend-adminend/src/store/modules/product.js diff --git a/frontend/src/store/modules/settings.js b/backend-adminend/src/store/modules/settings.js similarity index 100% rename from frontend/src/store/modules/settings.js rename to backend-adminend/src/store/modules/settings.js diff --git a/frontend/src/store/modules/tagsView.js b/backend-adminend/src/store/modules/tagsView.js similarity index 100% rename from frontend/src/store/modules/tagsView.js rename to backend-adminend/src/store/modules/tagsView.js diff --git a/frontend/src/store/modules/user.js b/backend-adminend/src/store/modules/user.js similarity index 100% rename from frontend/src/store/modules/user.js rename to backend-adminend/src/store/modules/user.js diff --git a/frontend/src/styles/btn.scss b/backend-adminend/src/styles/btn.scss similarity index 100% rename from frontend/src/styles/btn.scss rename to backend-adminend/src/styles/btn.scss diff --git a/frontend/src/styles/element-ui.scss b/backend-adminend/src/styles/element-ui.scss similarity index 100% rename from frontend/src/styles/element-ui.scss rename to backend-adminend/src/styles/element-ui.scss diff --git a/frontend/src/styles/element-variables.scss b/backend-adminend/src/styles/element-variables.scss similarity index 100% rename from frontend/src/styles/element-variables.scss rename to backend-adminend/src/styles/element-variables.scss diff --git a/frontend/src/styles/index.scss b/backend-adminend/src/styles/index.scss similarity index 100% rename from frontend/src/styles/index.scss rename to backend-adminend/src/styles/index.scss diff --git a/frontend/src/styles/mixin.scss b/backend-adminend/src/styles/mixin.scss similarity index 100% rename from frontend/src/styles/mixin.scss rename to backend-adminend/src/styles/mixin.scss diff --git a/frontend/src/styles/reset.css b/backend-adminend/src/styles/reset.css similarity index 100% rename from frontend/src/styles/reset.css rename to backend-adminend/src/styles/reset.css diff --git a/frontend/src/styles/sidebar.scss b/backend-adminend/src/styles/sidebar.scss similarity index 100% rename from frontend/src/styles/sidebar.scss rename to backend-adminend/src/styles/sidebar.scss diff --git a/frontend/src/styles/styles.scss b/backend-adminend/src/styles/styles.scss similarity index 100% rename from frontend/src/styles/styles.scss rename to backend-adminend/src/styles/styles.scss diff --git a/frontend/src/styles/transition.scss b/backend-adminend/src/styles/transition.scss similarity index 100% rename from frontend/src/styles/transition.scss rename to backend-adminend/src/styles/transition.scss diff --git a/frontend/src/styles/variables.scss b/backend-adminend/src/styles/variables.scss similarity index 100% rename from frontend/src/styles/variables.scss rename to backend-adminend/src/styles/variables.scss diff --git a/frontend/src/theme/style.scss b/backend-adminend/src/theme/style.scss similarity index 100% rename from frontend/src/theme/style.scss rename to backend-adminend/src/theme/style.scss diff --git a/frontend/src/utils/ZBKJIutil.js b/backend-adminend/src/utils/ZBKJIutil.js similarity index 100% rename from frontend/src/utils/ZBKJIutil.js rename to backend-adminend/src/utils/ZBKJIutil.js diff --git a/frontend/src/utils/auth.js b/backend-adminend/src/utils/auth.js similarity index 100% rename from frontend/src/utils/auth.js rename to backend-adminend/src/utils/auth.js diff --git a/frontend/src/utils/clipboard.js b/backend-adminend/src/utils/clipboard.js similarity index 100% rename from frontend/src/utils/clipboard.js rename to backend-adminend/src/utils/clipboard.js diff --git a/frontend/src/utils/constants.js b/backend-adminend/src/utils/constants.js similarity index 100% rename from frontend/src/utils/constants.js rename to backend-adminend/src/utils/constants.js diff --git a/frontend/src/utils/error-log.js b/backend-adminend/src/utils/error-log.js similarity index 100% rename from frontend/src/utils/error-log.js rename to backend-adminend/src/utils/error-log.js diff --git a/frontend/src/utils/get-page-title.js b/backend-adminend/src/utils/get-page-title.js similarity index 100% rename from frontend/src/utils/get-page-title.js rename to backend-adminend/src/utils/get-page-title.js diff --git a/frontend/src/utils/index.js b/backend-adminend/src/utils/index.js similarity index 100% rename from frontend/src/utils/index.js rename to backend-adminend/src/utils/index.js diff --git a/frontend/src/utils/newToExcel.js b/backend-adminend/src/utils/newToExcel.js similarity index 100% rename from frontend/src/utils/newToExcel.js rename to backend-adminend/src/utils/newToExcel.js diff --git a/frontend/src/utils/open-window.js b/backend-adminend/src/utils/open-window.js similarity index 100% rename from frontend/src/utils/open-window.js rename to backend-adminend/src/utils/open-window.js diff --git a/frontend/src/utils/parsing.js b/backend-adminend/src/utils/parsing.js similarity index 100% rename from frontend/src/utils/parsing.js rename to backend-adminend/src/utils/parsing.js diff --git a/frontend/src/utils/permission.js b/backend-adminend/src/utils/permission.js similarity index 100% rename from frontend/src/utils/permission.js rename to backend-adminend/src/utils/permission.js diff --git a/frontend/src/utils/request.js b/backend-adminend/src/utils/request.js similarity index 100% rename from frontend/src/utils/request.js rename to backend-adminend/src/utils/request.js diff --git a/frontend/src/utils/scroll-to.js b/backend-adminend/src/utils/scroll-to.js similarity index 100% rename from frontend/src/utils/scroll-to.js rename to backend-adminend/src/utils/scroll-to.js diff --git a/frontend/src/utils/settingMer.js b/backend-adminend/src/utils/settingMer.js similarity index 100% rename from frontend/src/utils/settingMer.js rename to backend-adminend/src/utils/settingMer.js diff --git a/frontend/src/utils/utils.js b/backend-adminend/src/utils/utils.js similarity index 100% rename from frontend/src/utils/utils.js rename to backend-adminend/src/utils/utils.js diff --git a/frontend/src/utils/validate.js b/backend-adminend/src/utils/validate.js similarity index 100% rename from frontend/src/utils/validate.js rename to backend-adminend/src/utils/validate.js diff --git a/frontend/src/vendor/Blob.js b/backend-adminend/src/vendor/Blob.js similarity index 100% rename from frontend/src/vendor/Blob.js rename to backend-adminend/src/vendor/Blob.js diff --git a/frontend/src/vendor/Export1Excel.js b/backend-adminend/src/vendor/Export1Excel.js similarity index 100% rename from frontend/src/vendor/Export1Excel.js rename to backend-adminend/src/vendor/Export1Excel.js diff --git a/frontend/src/vendor/Export2Excel.js b/backend-adminend/src/vendor/Export2Excel.js similarity index 100% rename from frontend/src/vendor/Export2Excel.js rename to backend-adminend/src/vendor/Export2Excel.js diff --git a/frontend/src/vendor/Export2Zip.js b/backend-adminend/src/vendor/Export2Zip.js similarity index 100% rename from frontend/src/vendor/Export2Zip.js rename to backend-adminend/src/vendor/Export2Zip.js diff --git a/frontend/src/views/appSetting/index.vue b/backend-adminend/src/views/appSetting/index.vue similarity index 100% rename from frontend/src/views/appSetting/index.vue rename to backend-adminend/src/views/appSetting/index.vue diff --git a/frontend/src/views/appSetting/routine/deliveryManagement/index.vue b/backend-adminend/src/views/appSetting/routine/deliveryManagement/index.vue similarity index 100% rename from frontend/src/views/appSetting/routine/deliveryManagement/index.vue rename to backend-adminend/src/views/appSetting/routine/deliveryManagement/index.vue diff --git a/frontend/src/views/appSetting/routine/download/index.vue b/backend-adminend/src/views/appSetting/routine/download/index.vue similarity index 100% rename from frontend/src/views/appSetting/routine/download/index.vue rename to backend-adminend/src/views/appSetting/routine/download/index.vue diff --git a/frontend/src/views/appSetting/routine/index.vue b/backend-adminend/src/views/appSetting/routine/index.vue similarity index 100% rename from frontend/src/views/appSetting/routine/index.vue rename to backend-adminend/src/views/appSetting/routine/index.vue diff --git a/frontend/src/views/appSetting/wxAccount/index.vue b/backend-adminend/src/views/appSetting/wxAccount/index.vue similarity index 100% rename from frontend/src/views/appSetting/wxAccount/index.vue rename to backend-adminend/src/views/appSetting/wxAccount/index.vue diff --git a/frontend/src/views/appSetting/wxAccount/reply/follow/index.vue b/backend-adminend/src/views/appSetting/wxAccount/reply/follow/index.vue similarity index 100% rename from frontend/src/views/appSetting/wxAccount/reply/follow/index.vue rename to backend-adminend/src/views/appSetting/wxAccount/reply/follow/index.vue diff --git a/frontend/src/views/appSetting/wxAccount/reply/index.vue b/backend-adminend/src/views/appSetting/wxAccount/reply/index.vue similarity index 100% rename from frontend/src/views/appSetting/wxAccount/reply/index.vue rename to backend-adminend/src/views/appSetting/wxAccount/reply/index.vue diff --git a/frontend/src/views/appSetting/wxAccount/reply/keyword/index.vue b/backend-adminend/src/views/appSetting/wxAccount/reply/keyword/index.vue similarity index 100% rename from frontend/src/views/appSetting/wxAccount/reply/keyword/index.vue rename to backend-adminend/src/views/appSetting/wxAccount/reply/keyword/index.vue diff --git a/frontend/src/views/appSetting/wxAccount/wxMenus.vue b/backend-adminend/src/views/appSetting/wxAccount/wxMenus.vue similarity index 100% rename from frontend/src/views/appSetting/wxAccount/wxMenus.vue rename to backend-adminend/src/views/appSetting/wxAccount/wxMenus.vue diff --git a/frontend/src/views/appSetting/wxAccount/wxTemplate/index.vue b/backend-adminend/src/views/appSetting/wxAccount/wxTemplate/index.vue similarity index 100% rename from frontend/src/views/appSetting/wxAccount/wxTemplate/index.vue rename to backend-adminend/src/views/appSetting/wxAccount/wxTemplate/index.vue diff --git a/frontend/src/views/consignment/financial-log/index.vue b/backend-adminend/src/views/consignment/financial-log/index.vue similarity index 100% rename from frontend/src/views/consignment/financial-log/index.vue rename to backend-adminend/src/views/consignment/financial-log/index.vue diff --git a/frontend/src/views/consignment/merchandise/detail.vue b/backend-adminend/src/views/consignment/merchandise/detail.vue similarity index 100% rename from frontend/src/views/consignment/merchandise/detail.vue rename to backend-adminend/src/views/consignment/merchandise/detail.vue diff --git a/frontend/src/views/consignment/merchandise/index.vue b/backend-adminend/src/views/consignment/merchandise/index.vue similarity index 100% rename from frontend/src/views/consignment/merchandise/index.vue rename to backend-adminend/src/views/consignment/merchandise/index.vue diff --git a/frontend/src/views/consignment/withdraw/detail.vue b/backend-adminend/src/views/consignment/withdraw/detail.vue similarity index 100% rename from frontend/src/views/consignment/withdraw/detail.vue rename to backend-adminend/src/views/consignment/withdraw/detail.vue diff --git a/frontend/src/views/consignment/withdraw/index.vue b/backend-adminend/src/views/consignment/withdraw/index.vue similarity index 100% rename from frontend/src/views/consignment/withdraw/index.vue rename to backend-adminend/src/views/consignment/withdraw/index.vue diff --git a/frontend/src/views/content/article/edit.vue b/backend-adminend/src/views/content/article/edit.vue similarity index 100% rename from frontend/src/views/content/article/edit.vue rename to backend-adminend/src/views/content/article/edit.vue diff --git a/frontend/src/views/content/article/list.vue b/backend-adminend/src/views/content/article/list.vue similarity index 100% rename from frontend/src/views/content/article/list.vue rename to backend-adminend/src/views/content/article/list.vue diff --git a/frontend/src/views/content/articleclass/list.vue b/backend-adminend/src/views/content/articleclass/list.vue similarity index 100% rename from frontend/src/views/content/articleclass/list.vue rename to backend-adminend/src/views/content/articleclass/list.vue diff --git a/frontend/src/views/dashboard/components/baseInfo.vue b/backend-adminend/src/views/dashboard/components/baseInfo.vue similarity index 100% rename from frontend/src/views/dashboard/components/baseInfo.vue rename to backend-adminend/src/views/dashboard/components/baseInfo.vue diff --git a/frontend/src/views/dashboard/components/gridMenu.vue b/backend-adminend/src/views/dashboard/components/gridMenu.vue similarity index 100% rename from frontend/src/views/dashboard/components/gridMenu.vue rename to backend-adminend/src/views/dashboard/components/gridMenu.vue diff --git a/frontend/src/views/dashboard/components/userChart.vue b/backend-adminend/src/views/dashboard/components/userChart.vue similarity index 100% rename from frontend/src/views/dashboard/components/userChart.vue rename to backend-adminend/src/views/dashboard/components/userChart.vue diff --git a/frontend/src/views/dashboard/components/userOverview.vue b/backend-adminend/src/views/dashboard/components/userOverview.vue similarity index 100% rename from frontend/src/views/dashboard/components/userOverview.vue rename to backend-adminend/src/views/dashboard/components/userOverview.vue diff --git a/frontend/src/views/dashboard/components/visitChart.vue b/backend-adminend/src/views/dashboard/components/visitChart.vue similarity index 100% rename from frontend/src/views/dashboard/components/visitChart.vue rename to backend-adminend/src/views/dashboard/components/visitChart.vue diff --git a/frontend/src/views/dashboard/index.vue b/backend-adminend/src/views/dashboard/index.vue similarity index 100% rename from frontend/src/views/dashboard/index.vue rename to backend-adminend/src/views/dashboard/index.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_auxiliary_box.vue b/backend-adminend/src/views/design/components/mobileConfig/c_auxiliary_box.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_auxiliary_box.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_auxiliary_box.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_auxiliary_line.vue b/backend-adminend/src/views/design/components/mobileConfig/c_auxiliary_line.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_auxiliary_line.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_auxiliary_line.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_banner.vue b/backend-adminend/src/views/design/components/mobileConfig/c_banner.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_banner.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_banner.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_article.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_article.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_article.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_article.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_bargain.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_bargain.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_bargain.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_bargain.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_comb.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_comb.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_comb.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_comb.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_coupon.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_coupon.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_coupon.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_coupon.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_footer.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_footer.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_footer.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_footer.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_goods_list.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_goods_list.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_goods_list.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_goods_list.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_group.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_group.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_group.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_group.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_menu.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_menu.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_menu.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_menu.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_merchant.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_merchant.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_merchant.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_merchant.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_seckill.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_seckill.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_seckill.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_seckill.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_tab.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_tab.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_tab.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_tab.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_title.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_title.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_title.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_title.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_home_video.vue b/backend-adminend/src/views/design/components/mobileConfig/c_home_video.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_home_video.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_home_video.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_hotspot.vue b/backend-adminend/src/views/design/components/mobileConfig/c_hotspot.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_hotspot.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_hotspot.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_nav_bar.vue b/backend-adminend/src/views/design/components/mobileConfig/c_nav_bar.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_nav_bar.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_nav_bar.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_news_roll.vue b/backend-adminend/src/views/design/components/mobileConfig/c_news_roll.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_news_roll.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_news_roll.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_picture_cube.vue b/backend-adminend/src/views/design/components/mobileConfig/c_picture_cube.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_picture_cube.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_picture_cube.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_search_box.vue b/backend-adminend/src/views/design/components/mobileConfig/c_search_box.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_search_box.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_search_box.vue diff --git a/frontend/src/views/design/components/mobileConfig/c_ueditor_box.vue b/backend-adminend/src/views/design/components/mobileConfig/c_ueditor_box.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/c_ueditor_box.vue rename to backend-adminend/src/views/design/components/mobileConfig/c_ueditor_box.vue diff --git a/frontend/src/views/design/components/mobileConfig/index.js b/backend-adminend/src/views/design/components/mobileConfig/index.js similarity index 100% rename from frontend/src/views/design/components/mobileConfig/index.js rename to backend-adminend/src/views/design/components/mobileConfig/index.js diff --git a/frontend/src/views/design/components/mobileConfig/pageTitle.vue b/backend-adminend/src/views/design/components/mobileConfig/pageTitle.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfig/pageTitle.vue rename to backend-adminend/src/views/design/components/mobileConfig/pageTitle.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_bg_color.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_bg_color.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_bg_color.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_bg_color.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_cascader.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_cascader.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_cascader.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_cascader.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_checkbox_group.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_checkbox_group.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_checkbox_group.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_checkbox_group.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_checked_tab.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_checked_tab.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_checked_tab.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_checked_tab.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_checkout_hot.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_checkout_hot.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_checkout_hot.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_checkout_hot.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_classify.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_classify.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_classify.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_classify.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_divider.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_divider.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_divider.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_divider.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_foot.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_foot.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_foot.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_foot.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_goods.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_goods.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_goods.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_goods.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_hot_menu.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_hot_menu.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_hot_menu.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_hot_menu.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_hot_word.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_hot_word.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_hot_word.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_hot_word.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_input_item.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_input_item.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_input_item.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_input_item.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_input_number.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_input_number.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_input_number.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_input_number.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_is_show.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_is_show.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_is_show.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_is_show.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_menu_list.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_menu_list.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_menu_list.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_menu_list.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_merchantName.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_merchantName.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_merchantName.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_merchantName.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_page_ueditor.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_page_ueditor.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_page_ueditor.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_page_ueditor.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_pictrue.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_pictrue.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_pictrue.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_pictrue.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_product.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_product.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_product.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_product.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_radio.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_radio.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_radio.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_radio.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_select.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_select.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_select.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_select.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_set_up.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_set_up.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_set_up.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_set_up.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_slider.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_slider.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_slider.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_slider.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_tab.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_tab.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_tab.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_tab.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_tab_input.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_tab_input.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_tab_input.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_tab_input.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_tab_radio.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_tab_radio.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_tab_radio.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_tab_radio.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_title.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_title.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_title.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_title.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_txt_tab.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_txt_tab.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_txt_tab.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_txt_tab.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_upload_img.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_upload_img.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_upload_img.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_upload_img.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/c_upload_video.vue b/backend-adminend/src/views/design/components/mobileConfigRight/c_upload_video.vue similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/c_upload_video.vue rename to backend-adminend/src/views/design/components/mobileConfigRight/c_upload_video.vue diff --git a/frontend/src/views/design/components/mobileConfigRight/index.js b/backend-adminend/src/views/design/components/mobileConfigRight/index.js similarity index 100% rename from frontend/src/views/design/components/mobileConfigRight/index.js rename to backend-adminend/src/views/design/components/mobileConfigRight/index.js diff --git a/frontend/src/views/design/components/mobilePage/banner.vue b/backend-adminend/src/views/design/components/mobilePage/banner.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/banner.vue rename to backend-adminend/src/views/design/components/mobilePage/banner.vue diff --git a/frontend/src/views/design/components/mobilePage/home_article.vue b/backend-adminend/src/views/design/components/mobilePage/home_article.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_article.vue rename to backend-adminend/src/views/design/components/mobilePage/home_article.vue diff --git a/frontend/src/views/design/components/mobilePage/home_bargain.vue b/backend-adminend/src/views/design/components/mobilePage/home_bargain.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_bargain.vue rename to backend-adminend/src/views/design/components/mobilePage/home_bargain.vue diff --git a/frontend/src/views/design/components/mobilePage/home_comb.vue b/backend-adminend/src/views/design/components/mobilePage/home_comb.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_comb.vue rename to backend-adminend/src/views/design/components/mobilePage/home_comb.vue diff --git a/frontend/src/views/design/components/mobilePage/home_coupon.vue b/backend-adminend/src/views/design/components/mobilePage/home_coupon.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_coupon.vue rename to backend-adminend/src/views/design/components/mobilePage/home_coupon.vue diff --git a/frontend/src/views/design/components/mobilePage/home_footer.vue b/backend-adminend/src/views/design/components/mobilePage/home_footer.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_footer.vue rename to backend-adminend/src/views/design/components/mobilePage/home_footer.vue diff --git a/frontend/src/views/design/components/mobilePage/home_goods_list.vue b/backend-adminend/src/views/design/components/mobilePage/home_goods_list.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_goods_list.vue rename to backend-adminend/src/views/design/components/mobilePage/home_goods_list.vue diff --git a/frontend/src/views/design/components/mobilePage/home_group.vue b/backend-adminend/src/views/design/components/mobilePage/home_group.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_group.vue rename to backend-adminend/src/views/design/components/mobilePage/home_group.vue diff --git a/frontend/src/views/design/components/mobilePage/home_hotspot.vue b/backend-adminend/src/views/design/components/mobilePage/home_hotspot.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_hotspot.vue rename to backend-adminend/src/views/design/components/mobilePage/home_hotspot.vue diff --git a/frontend/src/views/design/components/mobilePage/home_menu.vue b/backend-adminend/src/views/design/components/mobilePage/home_menu.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_menu.vue rename to backend-adminend/src/views/design/components/mobilePage/home_menu.vue diff --git a/frontend/src/views/design/components/mobilePage/home_news_roll.vue b/backend-adminend/src/views/design/components/mobilePage/home_news_roll.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_news_roll.vue rename to backend-adminend/src/views/design/components/mobilePage/home_news_roll.vue diff --git a/frontend/src/views/design/components/mobilePage/home_seckill.vue b/backend-adminend/src/views/design/components/mobilePage/home_seckill.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_seckill.vue rename to backend-adminend/src/views/design/components/mobilePage/home_seckill.vue diff --git a/frontend/src/views/design/components/mobilePage/home_tab.vue b/backend-adminend/src/views/design/components/mobilePage/home_tab.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_tab.vue rename to backend-adminend/src/views/design/components/mobilePage/home_tab.vue diff --git a/frontend/src/views/design/components/mobilePage/home_title.vue b/backend-adminend/src/views/design/components/mobilePage/home_title.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_title.vue rename to backend-adminend/src/views/design/components/mobilePage/home_title.vue diff --git a/frontend/src/views/design/components/mobilePage/home_video.vue b/backend-adminend/src/views/design/components/mobilePage/home_video.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/home_video.vue rename to backend-adminend/src/views/design/components/mobilePage/home_video.vue diff --git a/frontend/src/views/design/components/mobilePage/index.js b/backend-adminend/src/views/design/components/mobilePage/index.js similarity index 100% rename from frontend/src/views/design/components/mobilePage/index.js rename to backend-adminend/src/views/design/components/mobilePage/index.js diff --git a/frontend/src/views/design/components/mobilePage/nav_bar.vue b/backend-adminend/src/views/design/components/mobilePage/nav_bar.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/nav_bar.vue rename to backend-adminend/src/views/design/components/mobilePage/nav_bar.vue diff --git a/frontend/src/views/design/components/mobilePage/picture_cube.vue b/backend-adminend/src/views/design/components/mobilePage/picture_cube.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/picture_cube.vue rename to backend-adminend/src/views/design/components/mobilePage/picture_cube.vue diff --git a/frontend/src/views/design/components/mobilePage/search_box.vue b/backend-adminend/src/views/design/components/mobilePage/search_box.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/search_box.vue rename to backend-adminend/src/views/design/components/mobilePage/search_box.vue diff --git a/frontend/src/views/design/components/mobilePage/z_auxiliary_box.vue b/backend-adminend/src/views/design/components/mobilePage/z_auxiliary_box.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/z_auxiliary_box.vue rename to backend-adminend/src/views/design/components/mobilePage/z_auxiliary_box.vue diff --git a/frontend/src/views/design/components/mobilePage/z_auxiliary_line.vue b/backend-adminend/src/views/design/components/mobilePage/z_auxiliary_line.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/z_auxiliary_line.vue rename to backend-adminend/src/views/design/components/mobilePage/z_auxiliary_line.vue diff --git a/frontend/src/views/design/components/mobilePage/z_ueditor.vue b/backend-adminend/src/views/design/components/mobilePage/z_ueditor.vue similarity index 100% rename from frontend/src/views/design/components/mobilePage/z_ueditor.vue rename to backend-adminend/src/views/design/components/mobilePage/z_ueditor.vue diff --git a/frontend/src/views/design/components/pagesFoot/index.vue b/backend-adminend/src/views/design/components/pagesFoot/index.vue similarity index 100% rename from frontend/src/views/design/components/pagesFoot/index.vue rename to backend-adminend/src/views/design/components/pagesFoot/index.vue diff --git a/frontend/src/views/design/components/rightBtn/index.vue b/backend-adminend/src/views/design/components/rightBtn/index.vue similarity index 100% rename from frontend/src/views/design/components/rightBtn/index.vue rename to backend-adminend/src/views/design/components/rightBtn/index.vue diff --git a/frontend/src/views/design/devise/creatDevise.vue b/backend-adminend/src/views/design/devise/creatDevise.vue similarity index 100% rename from frontend/src/views/design/devise/creatDevise.vue rename to backend-adminend/src/views/design/devise/creatDevise.vue diff --git a/frontend/src/views/design/devise/index.vue b/backend-adminend/src/views/design/devise/index.vue similarity index 100% rename from frontend/src/views/design/devise/index.vue rename to backend-adminend/src/views/design/devise/index.vue diff --git a/frontend/src/views/design/images/ariose.png b/backend-adminend/src/views/design/images/ariose.png similarity index 100% rename from frontend/src/views/design/images/ariose.png rename to backend-adminend/src/views/design/images/ariose.png diff --git a/frontend/src/views/design/images/dafu.png b/backend-adminend/src/views/design/images/dafu.png similarity index 100% rename from frontend/src/views/design/images/dafu.png rename to backend-adminend/src/views/design/images/dafu.png diff --git a/frontend/src/views/design/images/dianbj.png b/backend-adminend/src/views/design/images/dianbj.png similarity index 100% rename from frontend/src/views/design/images/dianbj.png rename to backend-adminend/src/views/design/images/dianbj.png diff --git a/frontend/src/views/design/images/shang1.png b/backend-adminend/src/views/design/images/shang1.png similarity index 100% rename from frontend/src/views/design/images/shang1.png rename to backend-adminend/src/views/design/images/shang1.png diff --git a/frontend/src/views/design/images/shangpin1.png b/backend-adminend/src/views/design/images/shangpin1.png similarity index 100% rename from frontend/src/views/design/images/shangpin1.png rename to backend-adminend/src/views/design/images/shangpin1.png diff --git a/frontend/src/views/design/images/shangpin2.png b/backend-adminend/src/views/design/images/shangpin2.png similarity index 100% rename from frontend/src/views/design/images/shangpin2.png rename to backend-adminend/src/views/design/images/shangpin2.png diff --git a/frontend/src/views/design/images/shangpin3.png b/backend-adminend/src/views/design/images/shangpin3.png similarity index 100% rename from frontend/src/views/design/images/shangpin3.png rename to backend-adminend/src/views/design/images/shangpin3.png diff --git a/frontend/src/views/design/images/yang2bj1.png b/backend-adminend/src/views/design/images/yang2bj1.png similarity index 100% rename from frontend/src/views/design/images/yang2bj1.png rename to backend-adminend/src/views/design/images/yang2bj1.png diff --git a/frontend/src/views/design/images/yang2bj2.png b/backend-adminend/src/views/design/images/yang2bj2.png similarity index 100% rename from frontend/src/views/design/images/yang2bj2.png rename to backend-adminend/src/views/design/images/yang2bj2.png diff --git a/frontend/src/views/design/index.vue b/backend-adminend/src/views/design/index.vue similarity index 100% rename from frontend/src/views/design/index.vue rename to backend-adminend/src/views/design/index.vue diff --git a/frontend/src/views/design/styles/index.scss b/backend-adminend/src/views/design/styles/index.scss similarity index 100% rename from frontend/src/views/design/styles/index.scss rename to backend-adminend/src/views/design/styles/index.scss diff --git a/frontend/src/views/design/theme/index.vue b/backend-adminend/src/views/design/theme/index.vue similarity index 100% rename from frontend/src/views/design/theme/index.vue rename to backend-adminend/src/views/design/theme/index.vue diff --git a/frontend/src/views/design/viewDesign/index.vue b/backend-adminend/src/views/design/viewDesign/index.vue similarity index 100% rename from frontend/src/views/design/viewDesign/index.vue rename to backend-adminend/src/views/design/viewDesign/index.vue diff --git a/frontend/src/views/distribution/config/index.vue b/backend-adminend/src/views/distribution/config/index.vue similarity index 100% rename from frontend/src/views/distribution/config/index.vue rename to backend-adminend/src/views/distribution/config/index.vue diff --git a/frontend/src/views/distribution/index.vue b/backend-adminend/src/views/distribution/index.vue similarity index 100% rename from frontend/src/views/distribution/index.vue rename to backend-adminend/src/views/distribution/index.vue diff --git a/frontend/src/views/error-log/components/ErrorTestA.vue b/backend-adminend/src/views/error-log/components/ErrorTestA.vue similarity index 100% rename from frontend/src/views/error-log/components/ErrorTestA.vue rename to backend-adminend/src/views/error-log/components/ErrorTestA.vue diff --git a/frontend/src/views/error-log/components/ErrorTestB.vue b/backend-adminend/src/views/error-log/components/ErrorTestB.vue similarity index 100% rename from frontend/src/views/error-log/components/ErrorTestB.vue rename to backend-adminend/src/views/error-log/components/ErrorTestB.vue diff --git a/frontend/src/views/error-log/index.vue b/backend-adminend/src/views/error-log/index.vue similarity index 100% rename from frontend/src/views/error-log/index.vue rename to backend-adminend/src/views/error-log/index.vue diff --git a/frontend/src/views/error-page/401.vue b/backend-adminend/src/views/error-page/401.vue similarity index 100% rename from frontend/src/views/error-page/401.vue rename to backend-adminend/src/views/error-page/401.vue diff --git a/frontend/src/views/error-page/404.vue b/backend-adminend/src/views/error-page/404.vue similarity index 100% rename from frontend/src/views/error-page/404.vue rename to backend-adminend/src/views/error-page/404.vue diff --git a/frontend/src/views/financial/brokerage/index.vue b/backend-adminend/src/views/financial/brokerage/index.vue similarity index 100% rename from frontend/src/views/financial/brokerage/index.vue rename to backend-adminend/src/views/financial/brokerage/index.vue diff --git a/frontend/src/views/financial/commission/index.vue b/backend-adminend/src/views/financial/commission/index.vue similarity index 100% rename from frontend/src/views/financial/commission/index.vue rename to backend-adminend/src/views/financial/commission/index.vue diff --git a/frontend/src/views/financial/commission/withdrawal/index.vue b/backend-adminend/src/views/financial/commission/withdrawal/index.vue similarity index 100% rename from frontend/src/views/financial/commission/withdrawal/index.vue rename to backend-adminend/src/views/financial/commission/withdrawal/index.vue diff --git a/frontend/src/views/financial/index.vue b/backend-adminend/src/views/financial/index.vue similarity index 100% rename from frontend/src/views/financial/index.vue rename to backend-adminend/src/views/financial/index.vue diff --git a/frontend/src/views/financial/operating/index.vue b/backend-adminend/src/views/financial/operating/index.vue similarity index 100% rename from frontend/src/views/financial/operating/index.vue rename to backend-adminend/src/views/financial/operating/index.vue diff --git a/frontend/src/views/financial/record/charge/index.vue b/backend-adminend/src/views/financial/record/charge/index.vue similarity index 100% rename from frontend/src/views/financial/record/charge/index.vue rename to backend-adminend/src/views/financial/record/charge/index.vue diff --git a/frontend/src/views/financial/record/index.vue b/backend-adminend/src/views/financial/record/index.vue similarity index 100% rename from frontend/src/views/financial/record/index.vue rename to backend-adminend/src/views/financial/record/index.vue diff --git a/frontend/src/views/financial/record/monitor/index.vue b/backend-adminend/src/views/financial/record/monitor/index.vue similarity index 100% rename from frontend/src/views/financial/record/monitor/index.vue rename to backend-adminend/src/views/financial/record/monitor/index.vue diff --git a/frontend/src/views/login/auth-redirect.vue b/backend-adminend/src/views/login/auth-redirect.vue similarity index 100% rename from frontend/src/views/login/auth-redirect.vue rename to backend-adminend/src/views/login/auth-redirect.vue diff --git a/frontend/src/views/login/index.vue b/backend-adminend/src/views/login/index.vue similarity index 100% rename from frontend/src/views/login/index.vue rename to backend-adminend/src/views/login/index.vue diff --git a/frontend/src/views/login/mixins.js b/backend-adminend/src/views/login/mixins.js similarity index 100% rename from frontend/src/views/login/mixins.js rename to backend-adminend/src/views/login/mixins.js diff --git a/frontend/src/views/login/verifition/Verify.vue b/backend-adminend/src/views/login/verifition/Verify.vue similarity index 100% rename from frontend/src/views/login/verifition/Verify.vue rename to backend-adminend/src/views/login/verifition/Verify.vue diff --git a/frontend/src/views/login/verifition/Verify/SilderVerify.vue b/backend-adminend/src/views/login/verifition/Verify/SilderVerify.vue similarity index 100% rename from frontend/src/views/login/verifition/Verify/SilderVerify.vue rename to backend-adminend/src/views/login/verifition/Verify/SilderVerify.vue diff --git a/frontend/src/views/login/verifition/Verify/verifyPoints.vue b/backend-adminend/src/views/login/verifition/Verify/verifyPoints.vue similarity index 100% rename from frontend/src/views/login/verifition/Verify/verifyPoints.vue rename to backend-adminend/src/views/login/verifition/Verify/verifyPoints.vue diff --git a/frontend/src/views/login/verifition/Verify/verifySlider.vue b/backend-adminend/src/views/login/verifition/Verify/verifySlider.vue similarity index 100% rename from frontend/src/views/login/verifition/Verify/verifySlider.vue rename to backend-adminend/src/views/login/verifition/Verify/verifySlider.vue diff --git a/frontend/src/views/login/verifition/utils/ase.js b/backend-adminend/src/views/login/verifition/utils/ase.js similarity index 100% rename from frontend/src/views/login/verifition/utils/ase.js rename to backend-adminend/src/views/login/verifition/utils/ase.js diff --git a/frontend/src/views/login/verifition/utils/fomat.ts b/backend-adminend/src/views/login/verifition/utils/fomat.ts similarity index 100% rename from frontend/src/views/login/verifition/utils/fomat.ts rename to backend-adminend/src/views/login/verifition/utils/fomat.ts diff --git a/frontend/src/views/login/verifition/utils/tips.ts b/backend-adminend/src/views/login/verifition/utils/tips.ts similarity index 100% rename from frontend/src/views/login/verifition/utils/tips.ts rename to backend-adminend/src/views/login/verifition/utils/tips.ts diff --git a/frontend/src/views/login/verifition/utils/util.js b/backend-adminend/src/views/login/verifition/utils/util.js similarity index 100% rename from frontend/src/views/login/verifition/utils/util.js rename to backend-adminend/src/views/login/verifition/utils/util.js diff --git a/frontend/src/views/maintain/authCRMEB/index.vue b/backend-adminend/src/views/maintain/authCRMEB/index.vue similarity index 100% rename from frontend/src/views/maintain/authCRMEB/index.vue rename to backend-adminend/src/views/maintain/authCRMEB/index.vue diff --git a/frontend/src/views/maintain/clearCache/index.vue b/backend-adminend/src/views/maintain/clearCache/index.vue similarity index 100% rename from frontend/src/views/maintain/clearCache/index.vue rename to backend-adminend/src/views/maintain/clearCache/index.vue diff --git a/frontend/src/views/maintain/devconfig/combineDataList.vue b/backend-adminend/src/views/maintain/devconfig/combineDataList.vue similarity index 100% rename from frontend/src/views/maintain/devconfig/combineDataList.vue rename to backend-adminend/src/views/maintain/devconfig/combineDataList.vue diff --git a/frontend/src/views/maintain/devconfig/combineEdit.vue b/backend-adminend/src/views/maintain/devconfig/combineEdit.vue similarity index 100% rename from frontend/src/views/maintain/devconfig/combineEdit.vue rename to backend-adminend/src/views/maintain/devconfig/combineEdit.vue diff --git a/frontend/src/views/maintain/devconfig/combinedData.vue b/backend-adminend/src/views/maintain/devconfig/combinedData.vue similarity index 100% rename from frontend/src/views/maintain/devconfig/combinedData.vue rename to backend-adminend/src/views/maintain/devconfig/combinedData.vue diff --git a/frontend/src/views/maintain/devconfig/combinedDataEdit.vue b/backend-adminend/src/views/maintain/devconfig/combinedDataEdit.vue similarity index 100% rename from frontend/src/views/maintain/devconfig/combinedDataEdit.vue rename to backend-adminend/src/views/maintain/devconfig/combinedDataEdit.vue diff --git a/frontend/src/views/maintain/devconfig/configCategotyEdit.vue b/backend-adminend/src/views/maintain/devconfig/configCategotyEdit.vue similarity index 100% rename from frontend/src/views/maintain/devconfig/configCategotyEdit.vue rename to backend-adminend/src/views/maintain/devconfig/configCategotyEdit.vue diff --git a/frontend/src/views/maintain/devconfig/configCategroy.vue b/backend-adminend/src/views/maintain/devconfig/configCategroy.vue similarity index 100% rename from frontend/src/views/maintain/devconfig/configCategroy.vue rename to backend-adminend/src/views/maintain/devconfig/configCategroy.vue diff --git a/frontend/src/views/maintain/devconfig/configList.vue b/backend-adminend/src/views/maintain/devconfig/configList.vue similarity index 100% rename from frontend/src/views/maintain/devconfig/configList.vue rename to backend-adminend/src/views/maintain/devconfig/configList.vue diff --git a/frontend/src/views/maintain/formConfig/edit.vue b/backend-adminend/src/views/maintain/formConfig/edit.vue similarity index 100% rename from frontend/src/views/maintain/formConfig/edit.vue rename to backend-adminend/src/views/maintain/formConfig/edit.vue diff --git a/frontend/src/views/maintain/formConfig/index.vue b/backend-adminend/src/views/maintain/formConfig/index.vue similarity index 100% rename from frontend/src/views/maintain/formConfig/index.vue rename to backend-adminend/src/views/maintain/formConfig/index.vue diff --git a/frontend/src/views/maintain/index.vue b/backend-adminend/src/views/maintain/index.vue similarity index 100% rename from frontend/src/views/maintain/index.vue rename to backend-adminend/src/views/maintain/index.vue diff --git a/frontend/src/views/maintain/logistics/cityList/index.vue b/backend-adminend/src/views/maintain/logistics/cityList/index.vue similarity index 100% rename from frontend/src/views/maintain/logistics/cityList/index.vue rename to backend-adminend/src/views/maintain/logistics/cityList/index.vue diff --git a/frontend/src/views/maintain/logistics/companyList/index.vue b/backend-adminend/src/views/maintain/logistics/companyList/index.vue similarity index 100% rename from frontend/src/views/maintain/logistics/companyList/index.vue rename to backend-adminend/src/views/maintain/logistics/companyList/index.vue diff --git a/frontend/src/views/maintain/logistics/index.vue b/backend-adminend/src/views/maintain/logistics/index.vue similarity index 100% rename from frontend/src/views/maintain/logistics/index.vue rename to backend-adminend/src/views/maintain/logistics/index.vue diff --git a/frontend/src/views/maintain/picture/index.vue b/backend-adminend/src/views/maintain/picture/index.vue similarity index 100% rename from frontend/src/views/maintain/picture/index.vue rename to backend-adminend/src/views/maintain/picture/index.vue diff --git a/frontend/src/views/maintain/schedule/index.vue b/backend-adminend/src/views/maintain/schedule/index.vue similarity index 100% rename from frontend/src/views/maintain/schedule/index.vue rename to backend-adminend/src/views/maintain/schedule/index.vue diff --git a/frontend/src/views/maintain/schedule/list/creatJob.vue b/backend-adminend/src/views/maintain/schedule/list/creatJob.vue similarity index 100% rename from frontend/src/views/maintain/schedule/list/creatJob.vue rename to backend-adminend/src/views/maintain/schedule/list/creatJob.vue diff --git a/frontend/src/views/maintain/schedule/list/index.vue b/backend-adminend/src/views/maintain/schedule/list/index.vue similarity index 100% rename from frontend/src/views/maintain/schedule/list/index.vue rename to backend-adminend/src/views/maintain/schedule/list/index.vue diff --git a/frontend/src/views/maintain/schedule/logList/index.vue b/backend-adminend/src/views/maintain/schedule/logList/index.vue similarity index 100% rename from frontend/src/views/maintain/schedule/logList/index.vue rename to backend-adminend/src/views/maintain/schedule/logList/index.vue diff --git a/frontend/src/views/maintain/sensitiveList/index.vue b/backend-adminend/src/views/maintain/sensitiveList/index.vue similarity index 100% rename from frontend/src/views/maintain/sensitiveList/index.vue rename to backend-adminend/src/views/maintain/sensitiveList/index.vue diff --git a/frontend/src/views/maintain/user/index.vue b/backend-adminend/src/views/maintain/user/index.vue similarity index 100% rename from frontend/src/views/maintain/user/index.vue rename to backend-adminend/src/views/maintain/user/index.vue diff --git a/frontend/src/views/maintain/user/update.vue b/backend-adminend/src/views/maintain/user/update.vue similarity index 100% rename from frontend/src/views/maintain/user/update.vue rename to backend-adminend/src/views/maintain/user/update.vue diff --git a/frontend/src/views/marketing/atmosphere/atmosphereList/addAtmosphere.vue b/backend-adminend/src/views/marketing/atmosphere/atmosphereList/addAtmosphere.vue similarity index 100% rename from frontend/src/views/marketing/atmosphere/atmosphereList/addAtmosphere.vue rename to backend-adminend/src/views/marketing/atmosphere/atmosphereList/addAtmosphere.vue diff --git a/frontend/src/views/marketing/atmosphere/atmosphereList/list.vue b/backend-adminend/src/views/marketing/atmosphere/atmosphereList/list.vue similarity index 100% rename from frontend/src/views/marketing/atmosphere/atmosphereList/list.vue rename to backend-adminend/src/views/marketing/atmosphere/atmosphereList/list.vue diff --git a/frontend/src/views/marketing/atmosphere/index.vue b/backend-adminend/src/views/marketing/atmosphere/index.vue similarity index 100% rename from frontend/src/views/marketing/atmosphere/index.vue rename to backend-adminend/src/views/marketing/atmosphere/index.vue diff --git a/frontend/src/views/marketing/bargain/bargainGoods/creatBargain.vue b/backend-adminend/src/views/marketing/bargain/bargainGoods/creatBargain.vue similarity index 100% rename from frontend/src/views/marketing/bargain/bargainGoods/creatBargain.vue rename to backend-adminend/src/views/marketing/bargain/bargainGoods/creatBargain.vue diff --git a/frontend/src/views/marketing/bargain/bargainGoods/index.vue b/backend-adminend/src/views/marketing/bargain/bargainGoods/index.vue similarity index 100% rename from frontend/src/views/marketing/bargain/bargainGoods/index.vue rename to backend-adminend/src/views/marketing/bargain/bargainGoods/index.vue diff --git a/frontend/src/views/marketing/bargain/bargainList/index.vue b/backend-adminend/src/views/marketing/bargain/bargainList/index.vue similarity index 100% rename from frontend/src/views/marketing/bargain/bargainList/index.vue rename to backend-adminend/src/views/marketing/bargain/bargainList/index.vue diff --git a/frontend/src/views/marketing/bargain/index.vue b/backend-adminend/src/views/marketing/bargain/index.vue similarity index 100% rename from frontend/src/views/marketing/bargain/index.vue rename to backend-adminend/src/views/marketing/bargain/index.vue diff --git a/frontend/src/views/marketing/border/index.vue b/backend-adminend/src/views/marketing/border/index.vue similarity index 100% rename from frontend/src/views/marketing/border/index.vue rename to backend-adminend/src/views/marketing/border/index.vue diff --git a/frontend/src/views/marketing/coupon.vue b/backend-adminend/src/views/marketing/coupon.vue similarity index 100% rename from frontend/src/views/marketing/coupon.vue rename to backend-adminend/src/views/marketing/coupon.vue diff --git a/frontend/src/views/marketing/coupon/couponTemplate/index.vue b/backend-adminend/src/views/marketing/coupon/couponTemplate/index.vue similarity index 100% rename from frontend/src/views/marketing/coupon/couponTemplate/index.vue rename to backend-adminend/src/views/marketing/coupon/couponTemplate/index.vue diff --git a/frontend/src/views/marketing/coupon/index.vue b/backend-adminend/src/views/marketing/coupon/index.vue similarity index 100% rename from frontend/src/views/marketing/coupon/index.vue rename to backend-adminend/src/views/marketing/coupon/index.vue diff --git a/frontend/src/views/marketing/coupon/list/creatCoupon.vue b/backend-adminend/src/views/marketing/coupon/list/creatCoupon.vue similarity index 100% rename from frontend/src/views/marketing/coupon/list/creatCoupon.vue rename to backend-adminend/src/views/marketing/coupon/list/creatCoupon.vue diff --git a/frontend/src/views/marketing/coupon/list/index.vue b/backend-adminend/src/views/marketing/coupon/list/index.vue similarity index 100% rename from frontend/src/views/marketing/coupon/list/index.vue rename to backend-adminend/src/views/marketing/coupon/list/index.vue diff --git a/frontend/src/views/marketing/coupon/record/index.vue b/backend-adminend/src/views/marketing/coupon/record/index.vue similarity index 100% rename from frontend/src/views/marketing/coupon/record/index.vue rename to backend-adminend/src/views/marketing/coupon/record/index.vue diff --git a/frontend/src/views/marketing/groupBuy/groupGoods/creatGroup.vue b/backend-adminend/src/views/marketing/groupBuy/groupGoods/creatGroup.vue similarity index 100% rename from frontend/src/views/marketing/groupBuy/groupGoods/creatGroup.vue rename to backend-adminend/src/views/marketing/groupBuy/groupGoods/creatGroup.vue diff --git a/frontend/src/views/marketing/groupBuy/groupGoods/index.vue b/backend-adminend/src/views/marketing/groupBuy/groupGoods/index.vue similarity index 100% rename from frontend/src/views/marketing/groupBuy/groupGoods/index.vue rename to backend-adminend/src/views/marketing/groupBuy/groupGoods/index.vue diff --git a/frontend/src/views/marketing/groupBuy/groupList/index.vue b/backend-adminend/src/views/marketing/groupBuy/groupList/index.vue similarity index 100% rename from frontend/src/views/marketing/groupBuy/groupList/index.vue rename to backend-adminend/src/views/marketing/groupBuy/groupList/index.vue diff --git a/frontend/src/views/marketing/groupBuy/index.vue b/backend-adminend/src/views/marketing/groupBuy/index.vue similarity index 100% rename from frontend/src/views/marketing/groupBuy/index.vue rename to backend-adminend/src/views/marketing/groupBuy/index.vue diff --git a/frontend/src/views/marketing/groupBuy/list/list.vue b/backend-adminend/src/views/marketing/groupBuy/list/list.vue similarity index 100% rename from frontend/src/views/marketing/groupBuy/list/list.vue rename to backend-adminend/src/views/marketing/groupBuy/list/list.vue diff --git a/frontend/src/views/marketing/integral/config/index.vue b/backend-adminend/src/views/marketing/integral/config/index.vue similarity index 100% rename from frontend/src/views/marketing/integral/config/index.vue rename to backend-adminend/src/views/marketing/integral/config/index.vue diff --git a/frontend/src/views/marketing/integral/index.vue b/backend-adminend/src/views/marketing/integral/index.vue similarity index 100% rename from frontend/src/views/marketing/integral/index.vue rename to backend-adminend/src/views/marketing/integral/index.vue diff --git a/frontend/src/views/marketing/integral/integralLog/index.vue b/backend-adminend/src/views/marketing/integral/integralLog/index.vue similarity index 100% rename from frontend/src/views/marketing/integral/integralLog/index.vue rename to backend-adminend/src/views/marketing/integral/integralLog/index.vue diff --git a/frontend/src/views/marketing/seckill/index.vue b/backend-adminend/src/views/marketing/seckill/index.vue similarity index 100% rename from frontend/src/views/marketing/seckill/index.vue rename to backend-adminend/src/views/marketing/seckill/index.vue diff --git a/frontend/src/views/marketing/seckill/seckillConfig/index.vue b/backend-adminend/src/views/marketing/seckill/seckillConfig/index.vue similarity index 100% rename from frontend/src/views/marketing/seckill/seckillConfig/index.vue rename to backend-adminend/src/views/marketing/seckill/seckillConfig/index.vue diff --git a/frontend/src/views/marketing/seckill/seckillList/creatSeckill.vue b/backend-adminend/src/views/marketing/seckill/seckillList/creatSeckill.vue similarity index 100% rename from frontend/src/views/marketing/seckill/seckillList/creatSeckill.vue rename to backend-adminend/src/views/marketing/seckill/seckillList/creatSeckill.vue diff --git a/frontend/src/views/marketing/seckill/seckillList/index.vue b/backend-adminend/src/views/marketing/seckill/seckillList/index.vue similarity index 100% rename from frontend/src/views/marketing/seckill/seckillList/index.vue rename to backend-adminend/src/views/marketing/seckill/seckillList/index.vue diff --git a/frontend/src/views/marketing/spike/config/edit.vue b/backend-adminend/src/views/marketing/spike/config/edit.vue similarity index 100% rename from frontend/src/views/marketing/spike/config/edit.vue rename to backend-adminend/src/views/marketing/spike/config/edit.vue diff --git a/frontend/src/views/marketing/spike/config/index.vue b/backend-adminend/src/views/marketing/spike/config/index.vue similarity index 100% rename from frontend/src/views/marketing/spike/config/index.vue rename to backend-adminend/src/views/marketing/spike/config/index.vue diff --git a/frontend/src/views/marketing/spike/googs/index.vue b/backend-adminend/src/views/marketing/spike/googs/index.vue similarity index 100% rename from frontend/src/views/marketing/spike/googs/index.vue rename to backend-adminend/src/views/marketing/spike/googs/index.vue diff --git a/frontend/src/views/marketing/spike/index.vue b/backend-adminend/src/views/marketing/spike/index.vue similarity index 100% rename from frontend/src/views/marketing/spike/index.vue rename to backend-adminend/src/views/marketing/spike/index.vue diff --git a/frontend/src/views/marketing/videoChannel/draftList/creatVideoChannel.vue b/backend-adminend/src/views/marketing/videoChannel/draftList/creatVideoChannel.vue similarity index 100% rename from frontend/src/views/marketing/videoChannel/draftList/creatVideoChannel.vue rename to backend-adminend/src/views/marketing/videoChannel/draftList/creatVideoChannel.vue diff --git a/frontend/src/views/marketing/videoChannel/draftList/index.vue b/backend-adminend/src/views/marketing/videoChannel/draftList/index.vue similarity index 100% rename from frontend/src/views/marketing/videoChannel/draftList/index.vue rename to backend-adminend/src/views/marketing/videoChannel/draftList/index.vue diff --git a/frontend/src/views/marketing/videoChannel/index.vue b/backend-adminend/src/views/marketing/videoChannel/index.vue similarity index 100% rename from frontend/src/views/marketing/videoChannel/index.vue rename to backend-adminend/src/views/marketing/videoChannel/index.vue diff --git a/frontend/src/views/marketing/videoChannel/videoList/creatVideoChannel.vue b/backend-adminend/src/views/marketing/videoChannel/videoList/creatVideoChannel.vue similarity index 100% rename from frontend/src/views/marketing/videoChannel/videoList/creatVideoChannel.vue rename to backend-adminend/src/views/marketing/videoChannel/videoList/creatVideoChannel.vue diff --git a/frontend/src/views/marketing/videoChannel/videoList/index.vue b/backend-adminend/src/views/marketing/videoChannel/videoList/index.vue similarity index 100% rename from frontend/src/views/marketing/videoChannel/videoList/index.vue rename to backend-adminend/src/views/marketing/videoChannel/videoList/index.vue diff --git a/frontend/src/views/mobile/auth-send/index.vue b/backend-adminend/src/views/mobile/auth-send/index.vue similarity index 100% rename from frontend/src/views/mobile/auth-send/index.vue rename to backend-adminend/src/views/mobile/auth-send/index.vue diff --git a/frontend/src/views/mobile/components/Loading.vue b/backend-adminend/src/views/mobile/components/Loading.vue similarity index 100% rename from frontend/src/views/mobile/components/Loading.vue rename to backend-adminend/src/views/mobile/components/Loading.vue diff --git a/frontend/src/views/mobile/components/PriceChange.vue b/backend-adminend/src/views/mobile/components/PriceChange.vue similarity index 100% rename from frontend/src/views/mobile/components/PriceChange.vue rename to backend-adminend/src/views/mobile/components/PriceChange.vue diff --git a/frontend/src/views/mobile/components/WriteOff.vue b/backend-adminend/src/views/mobile/components/WriteOff.vue similarity index 100% rename from frontend/src/views/mobile/components/WriteOff.vue rename to backend-adminend/src/views/mobile/components/WriteOff.vue diff --git a/frontend/src/views/mobile/components/statisticsData.vue b/backend-adminend/src/views/mobile/components/statisticsData.vue similarity index 100% rename from frontend/src/views/mobile/components/statisticsData.vue rename to backend-adminend/src/views/mobile/components/statisticsData.vue diff --git a/frontend/src/views/mobile/orderCancellation/index.vue b/backend-adminend/src/views/mobile/orderCancellation/index.vue similarity index 100% rename from frontend/src/views/mobile/orderCancellation/index.vue rename to backend-adminend/src/views/mobile/orderCancellation/index.vue diff --git a/frontend/src/views/mobile/orderStatistics/Statistics.vue b/backend-adminend/src/views/mobile/orderStatistics/Statistics.vue similarity index 100% rename from frontend/src/views/mobile/orderStatistics/Statistics.vue rename to backend-adminend/src/views/mobile/orderStatistics/Statistics.vue diff --git a/frontend/src/views/mobile/orderStatistics/index.vue b/backend-adminend/src/views/mobile/orderStatistics/index.vue similarity index 100% rename from frontend/src/views/mobile/orderStatistics/index.vue rename to backend-adminend/src/views/mobile/orderStatistics/index.vue diff --git a/frontend/src/views/mobile/orderStatistics/orderDelivery.vue b/backend-adminend/src/views/mobile/orderStatistics/orderDelivery.vue similarity index 100% rename from frontend/src/views/mobile/orderStatistics/orderDelivery.vue rename to backend-adminend/src/views/mobile/orderStatistics/orderDelivery.vue diff --git a/frontend/src/views/mobile/orderStatistics/orderDetail.vue b/backend-adminend/src/views/mobile/orderStatistics/orderDetail.vue similarity index 100% rename from frontend/src/views/mobile/orderStatistics/orderDetail.vue rename to backend-adminend/src/views/mobile/orderStatistics/orderDetail.vue diff --git a/frontend/src/views/mobile/orderStatistics/orderList.vue b/backend-adminend/src/views/mobile/orderStatistics/orderList.vue similarity index 100% rename from frontend/src/views/mobile/orderStatistics/orderList.vue rename to backend-adminend/src/views/mobile/orderStatistics/orderList.vue diff --git a/frontend/src/views/order/index.vue b/backend-adminend/src/views/order/index.vue similarity index 100% rename from frontend/src/views/order/index.vue rename to backend-adminend/src/views/order/index.vue diff --git a/frontend/src/views/order/orderDetail.vue b/backend-adminend/src/views/order/orderDetail.vue similarity index 100% rename from frontend/src/views/order/orderDetail.vue rename to backend-adminend/src/views/order/orderDetail.vue diff --git a/frontend/src/views/order/orderDetailPrint.vue b/backend-adminend/src/views/order/orderDetailPrint.vue similarity index 100% rename from frontend/src/views/order/orderDetailPrint.vue rename to backend-adminend/src/views/order/orderDetailPrint.vue diff --git a/frontend/src/views/order/orderSend.vue b/backend-adminend/src/views/order/orderSend.vue similarity index 100% rename from frontend/src/views/order/orderSend.vue rename to backend-adminend/src/views/order/orderSend.vue diff --git a/frontend/src/views/order/orderVideoSend.vue b/backend-adminend/src/views/order/orderVideoSend.vue similarity index 100% rename from frontend/src/views/order/orderVideoSend.vue rename to backend-adminend/src/views/order/orderVideoSend.vue diff --git a/frontend/src/views/redirect/index.vue b/backend-adminend/src/views/redirect/index.vue similarity index 100% rename from frontend/src/views/redirect/index.vue rename to backend-adminend/src/views/redirect/index.vue diff --git a/frontend/src/views/sms/index.vue b/backend-adminend/src/views/sms/index.vue similarity index 100% rename from frontend/src/views/sms/index.vue rename to backend-adminend/src/views/sms/index.vue diff --git a/frontend/src/views/sms/smsConfig/config.vue b/backend-adminend/src/views/sms/smsConfig/config.vue similarity index 100% rename from frontend/src/views/sms/smsConfig/config.vue rename to backend-adminend/src/views/sms/smsConfig/config.vue diff --git a/frontend/src/views/sms/smsConfig/index.vue b/backend-adminend/src/views/sms/smsConfig/index.vue similarity index 100% rename from frontend/src/views/sms/smsConfig/index.vue rename to backend-adminend/src/views/sms/smsConfig/index.vue diff --git a/frontend/src/views/sms/smsMessage/index.vue b/backend-adminend/src/views/sms/smsMessage/index.vue similarity index 100% rename from frontend/src/views/sms/smsMessage/index.vue rename to backend-adminend/src/views/sms/smsMessage/index.vue diff --git a/frontend/src/views/sms/smsPay/index.vue b/backend-adminend/src/views/sms/smsPay/index.vue similarity index 100% rename from frontend/src/views/sms/smsPay/index.vue rename to backend-adminend/src/views/sms/smsPay/index.vue diff --git a/frontend/src/views/sms/smsTemplate/index.vue b/backend-adminend/src/views/sms/smsTemplate/index.vue similarity index 100% rename from frontend/src/views/sms/smsTemplate/index.vue rename to backend-adminend/src/views/sms/smsTemplate/index.vue diff --git a/frontend/src/views/statistic/product/components/tableData.vue b/backend-adminend/src/views/statistic/product/components/tableData.vue similarity index 100% rename from frontend/src/views/statistic/product/components/tableData.vue rename to backend-adminend/src/views/statistic/product/components/tableData.vue diff --git a/frontend/src/views/statistic/product/components/visualization.vue b/backend-adminend/src/views/statistic/product/components/visualization.vue similarity index 100% rename from frontend/src/views/statistic/product/components/visualization.vue rename to backend-adminend/src/views/statistic/product/components/visualization.vue diff --git a/frontend/src/views/statistic/product/index.vue b/backend-adminend/src/views/statistic/product/index.vue similarity index 100% rename from frontend/src/views/statistic/product/index.vue rename to backend-adminend/src/views/statistic/product/index.vue diff --git a/frontend/src/views/statistic/transaction/components/toDay.vue b/backend-adminend/src/views/statistic/transaction/components/toDay.vue similarity index 100% rename from frontend/src/views/statistic/transaction/components/toDay.vue rename to backend-adminend/src/views/statistic/transaction/components/toDay.vue diff --git a/frontend/src/views/statistic/transaction/components/transaction.vue b/backend-adminend/src/views/statistic/transaction/components/transaction.vue similarity index 100% rename from frontend/src/views/statistic/transaction/components/transaction.vue rename to backend-adminend/src/views/statistic/transaction/components/transaction.vue diff --git a/frontend/src/views/statistic/transaction/index.vue b/backend-adminend/src/views/statistic/transaction/index.vue similarity index 100% rename from frontend/src/views/statistic/transaction/index.vue rename to backend-adminend/src/views/statistic/transaction/index.vue diff --git a/frontend/src/views/statistic/user/components/userInfo.vue b/backend-adminend/src/views/statistic/user/components/userInfo.vue similarity index 100% rename from frontend/src/views/statistic/user/components/userInfo.vue rename to backend-adminend/src/views/statistic/user/components/userInfo.vue diff --git a/frontend/src/views/statistic/user/components/userRegion.vue b/backend-adminend/src/views/statistic/user/components/userRegion.vue similarity index 100% rename from frontend/src/views/statistic/user/components/userRegion.vue rename to backend-adminend/src/views/statistic/user/components/userRegion.vue diff --git a/frontend/src/views/statistic/user/index.vue b/backend-adminend/src/views/statistic/user/index.vue similarity index 100% rename from frontend/src/views/statistic/user/index.vue rename to backend-adminend/src/views/statistic/user/index.vue diff --git a/frontend/src/views/store/creatStore/index.vue b/backend-adminend/src/views/store/creatStore/index.vue similarity index 100% rename from frontend/src/views/store/creatStore/index.vue rename to backend-adminend/src/views/store/creatStore/index.vue diff --git a/frontend/src/views/store/index.vue b/backend-adminend/src/views/store/index.vue similarity index 100% rename from frontend/src/views/store/index.vue rename to backend-adminend/src/views/store/index.vue diff --git a/frontend/src/views/store/sort/index.vue b/backend-adminend/src/views/store/sort/index.vue similarity index 100% rename from frontend/src/views/store/sort/index.vue rename to backend-adminend/src/views/store/sort/index.vue diff --git a/frontend/src/views/store/storeAttr/index.vue b/backend-adminend/src/views/store/storeAttr/index.vue similarity index 100% rename from frontend/src/views/store/storeAttr/index.vue rename to backend-adminend/src/views/store/storeAttr/index.vue diff --git a/frontend/src/views/store/storeComment/creatComment.vue b/backend-adminend/src/views/store/storeComment/creatComment.vue similarity index 100% rename from frontend/src/views/store/storeComment/creatComment.vue rename to backend-adminend/src/views/store/storeComment/creatComment.vue diff --git a/frontend/src/views/store/storeComment/index.vue b/backend-adminend/src/views/store/storeComment/index.vue similarity index 100% rename from frontend/src/views/store/storeComment/index.vue rename to backend-adminend/src/views/store/storeComment/index.vue diff --git a/frontend/src/views/store/taoBao.vue b/backend-adminend/src/views/store/taoBao.vue similarity index 100% rename from frontend/src/views/store/taoBao.vue rename to backend-adminend/src/views/store/taoBao.vue diff --git a/frontend/src/views/systemSetting/administratorAuthority/adminList/edit.vue b/backend-adminend/src/views/systemSetting/administratorAuthority/adminList/edit.vue similarity index 100% rename from frontend/src/views/systemSetting/administratorAuthority/adminList/edit.vue rename to backend-adminend/src/views/systemSetting/administratorAuthority/adminList/edit.vue diff --git a/frontend/src/views/systemSetting/administratorAuthority/adminList/index.vue b/backend-adminend/src/views/systemSetting/administratorAuthority/adminList/index.vue similarity index 100% rename from frontend/src/views/systemSetting/administratorAuthority/adminList/index.vue rename to backend-adminend/src/views/systemSetting/administratorAuthority/adminList/index.vue diff --git a/frontend/src/views/systemSetting/administratorAuthority/identityManager/edit.vue b/backend-adminend/src/views/systemSetting/administratorAuthority/identityManager/edit.vue similarity index 100% rename from frontend/src/views/systemSetting/administratorAuthority/identityManager/edit.vue rename to backend-adminend/src/views/systemSetting/administratorAuthority/identityManager/edit.vue diff --git a/frontend/src/views/systemSetting/administratorAuthority/identityManager/index.vue b/backend-adminend/src/views/systemSetting/administratorAuthority/identityManager/index.vue similarity index 100% rename from frontend/src/views/systemSetting/administratorAuthority/identityManager/index.vue rename to backend-adminend/src/views/systemSetting/administratorAuthority/identityManager/index.vue diff --git a/frontend/src/views/systemSetting/administratorAuthority/index.vue b/backend-adminend/src/views/systemSetting/administratorAuthority/index.vue similarity index 100% rename from frontend/src/views/systemSetting/administratorAuthority/index.vue rename to backend-adminend/src/views/systemSetting/administratorAuthority/index.vue diff --git a/frontend/src/views/systemSetting/administratorAuthority/permissionRules/index.vue b/backend-adminend/src/views/systemSetting/administratorAuthority/permissionRules/index.vue similarity index 100% rename from frontend/src/views/systemSetting/administratorAuthority/permissionRules/index.vue rename to backend-adminend/src/views/systemSetting/administratorAuthority/permissionRules/index.vue diff --git a/frontend/src/views/systemSetting/agreement/index.vue b/backend-adminend/src/views/systemSetting/agreement/index.vue similarity index 100% rename from frontend/src/views/systemSetting/agreement/index.vue rename to backend-adminend/src/views/systemSetting/agreement/index.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue b/backend-adminend/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/freightSet/creatTemplates.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/freightSet/index.vue b/backend-adminend/src/views/systemSetting/deliverGoods/freightSet/index.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/freightSet/index.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/freightSet/index.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/index.vue b/backend-adminend/src/views/systemSetting/deliverGoods/index.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/index.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/index.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/takeGoods/collateOrder/index.vue b/backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/collateOrder/index.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/takeGoods/collateOrder/index.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/collateOrder/index.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/takeGoods/collateUser/addClerk.vue b/backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/collateUser/addClerk.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/takeGoods/collateUser/addClerk.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/collateUser/addClerk.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/takeGoods/collateUser/index.vue b/backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/collateUser/index.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/takeGoods/collateUser/index.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/collateUser/index.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/takeGoods/deliveryAddress/addPoint.vue b/backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/deliveryAddress/addPoint.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/takeGoods/deliveryAddress/addPoint.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/deliveryAddress/addPoint.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/takeGoods/deliveryAddress/index.vue b/backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/deliveryAddress/index.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/takeGoods/deliveryAddress/index.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/deliveryAddress/index.vue diff --git a/frontend/src/views/systemSetting/deliverGoods/takeGoods/index.vue b/backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/index.vue similarity index 100% rename from frontend/src/views/systemSetting/deliverGoods/takeGoods/index.vue rename to backend-adminend/src/views/systemSetting/deliverGoods/takeGoods/index.vue diff --git a/frontend/src/views/systemSetting/guide/index.vue b/backend-adminend/src/views/systemSetting/guide/index.vue similarity index 100% rename from frontend/src/views/systemSetting/guide/index.vue rename to backend-adminend/src/views/systemSetting/guide/index.vue diff --git a/frontend/src/views/systemSetting/logistics/cityList/index.vue b/backend-adminend/src/views/systemSetting/logistics/cityList/index.vue similarity index 100% rename from frontend/src/views/systemSetting/logistics/cityList/index.vue rename to backend-adminend/src/views/systemSetting/logistics/cityList/index.vue diff --git a/frontend/src/views/systemSetting/logistics/companyList/index.vue b/backend-adminend/src/views/systemSetting/logistics/companyList/index.vue similarity index 100% rename from frontend/src/views/systemSetting/logistics/companyList/index.vue rename to backend-adminend/src/views/systemSetting/logistics/companyList/index.vue diff --git a/frontend/src/views/systemSetting/logistics/index.vue b/backend-adminend/src/views/systemSetting/logistics/index.vue similarity index 100% rename from frontend/src/views/systemSetting/logistics/index.vue rename to backend-adminend/src/views/systemSetting/logistics/index.vue diff --git a/frontend/src/views/systemSetting/notification/index.vue b/backend-adminend/src/views/systemSetting/notification/index.vue similarity index 100% rename from frontend/src/views/systemSetting/notification/index.vue rename to backend-adminend/src/views/systemSetting/notification/index.vue diff --git a/frontend/src/views/systemSetting/setting/index.vue b/backend-adminend/src/views/systemSetting/setting/index.vue similarity index 100% rename from frontend/src/views/systemSetting/setting/index.vue rename to backend-adminend/src/views/systemSetting/setting/index.vue diff --git a/frontend/src/views/user/grade/creatGrade.vue b/backend-adminend/src/views/user/grade/creatGrade.vue similarity index 100% rename from frontend/src/views/user/grade/creatGrade.vue rename to backend-adminend/src/views/user/grade/creatGrade.vue diff --git a/frontend/src/views/user/grade/index.vue b/backend-adminend/src/views/user/grade/index.vue similarity index 100% rename from frontend/src/views/user/grade/index.vue rename to backend-adminend/src/views/user/grade/index.vue diff --git a/frontend/src/views/user/group/index.vue b/backend-adminend/src/views/user/group/index.vue similarity index 100% rename from frontend/src/views/user/group/index.vue rename to backend-adminend/src/views/user/group/index.vue diff --git a/frontend/src/views/user/list/edit.vue b/backend-adminend/src/views/user/list/edit.vue similarity index 100% rename from frontend/src/views/user/list/edit.vue rename to backend-adminend/src/views/user/list/edit.vue diff --git a/frontend/src/views/user/list/index.vue b/backend-adminend/src/views/user/list/index.vue similarity index 100% rename from frontend/src/views/user/list/index.vue rename to backend-adminend/src/views/user/list/index.vue diff --git a/frontend/src/views/user/list/level.vue b/backend-adminend/src/views/user/list/level.vue similarity index 100% rename from frontend/src/views/user/list/level.vue rename to backend-adminend/src/views/user/list/level.vue diff --git a/frontend/src/views/user/list/userDetails.vue b/backend-adminend/src/views/user/list/userDetails.vue similarity index 100% rename from frontend/src/views/user/list/userDetails.vue rename to backend-adminend/src/views/user/list/userDetails.vue diff --git a/frontend/src/views/user/notice/index.vue b/backend-adminend/src/views/user/notice/index.vue similarity index 100% rename from frontend/src/views/user/notice/index.vue rename to backend-adminend/src/views/user/notice/index.vue diff --git a/frontend/tests/unit/views/order/orderDetailPrint.spec.js b/backend-adminend/tests/unit/views/order/orderDetailPrint.spec.js similarity index 100% rename from frontend/tests/unit/views/order/orderDetailPrint.spec.js rename to backend-adminend/tests/unit/views/order/orderDetailPrint.spec.js diff --git a/frontend/vue.config.js b/backend-adminend/vue.config.js similarity index 100% rename from frontend/vue.config.js rename to backend-adminend/vue.config.js diff --git a/backend/DEPLOY.md b/backend/DEPLOY.md index aa10a6c..2ff8e14 100644 --- a/backend/DEPLOY.md +++ b/backend/DEPLOY.md @@ -1,78 +1,59 @@ -# 打包与自动部署说明 +# 打包与部署说明 -本文档说明如何编译、打包并自动部署 **admin 后端(miao-admin-2.2.jar)** 与 **admin 后台前端** 到远程服务器(含备份后上传、重启)。 +本文档说明项目的 **4 个子项目** 如何单独或组合打包部署。**2 个 jar 包** 分别对应 **2 个前端**,可独立执行编译、打包、部署。 --- -## 一、环境与前置条件 +## 一、架构概览 -- **本机**:已安装 JDK 8、Maven、Node.js、npm;项目根目录为 `single-shop-22`,其下包含 `backend`、`frontend`。 -- **SSH 免密**:已配置本机到目标服务器的 SSH 公钥(推荐使用 `id_ed25519_crmeb_deploy`,或通过环境变量指定密钥)。 -- **部署配置**:`backend/deploy.conf` 中配置了各环境(如 by80、miao50)的服务器地址、目录、jar 名等。 +### 2 个 jar 包 ↔ 2 个前端 + +| jar 包 | 对应前端 | 说明 | +|--------|----------|------| +| **miao-admin-2.2.jar** | `frontend`(admin 后台 Vue) | 管理后台 API + 后台静态站点 | +| **miao-front-2.2.jar** | `single_uniapp22miao`(用户端 H5/uni-app) | 积分商城、用户端 API | + +### 4 个子项目(可单独打包部署) + +| 子项目 | 产出 | 打包命令 | 说明 | +|--------|------|----------|------| +| **crmeb-admin** | `miao-admin-2.2.jar` | `mvn clean package -pl crmeb-admin -am -DskipTests` | 管理后台后端 | +| **crmeb-front** | `miao-front-2.2.jar` | `mvn clean package -pl crmeb-front -am -DskipTests` | 用户端 API | +| **frontend** | `frontend/dist` | `npm run build:prod` | 管理后台前端静态 | +| **single_uniapp22miao** | `single_uniapp22miao/unpackage/dist/build/h5` | `npm run build:h5` | 用户端 H5 静态 | --- -## 二、by80 环境一键部署(推荐) +## 二、部署配置(deploy.conf) -部署目标:Spring Profile **miao80**,产出 **miao-admin-2.2.jar** + admin 后台静态,上传到 by80 配置的服务器。 +配置位于 **backend/deploy.conf**,按段落区分环境(by80、miao50、shjjy153 等)。 -### 1. 配置 SSH 免密(一次性) +### 通用变量 -在项目外任意目录执行(将 `root` 和 `123.56.214.80` 换成实际用户与主机): +| 变量 | 说明 | 示例 | +|------|------|------| +| `SERVER_HOST` | 服务器 IP | 123.56.214.80 | +| `SERVER_USER` | SSH 用户 | root | +| `SERVER_PORT` | SSH 端口 | 22 | +| `REMOTE_DIR_JAR` | jar 上传目录(两个 jar 可同目录) | /www/wwwroot/crmeb | +| `REMOTE_DIR_ADMIN` | admin 后台静态站点目录 | /www/wwwroot/jfadmin.bosenyuan.com | +| `REMOTE_DIR_FRONT` | 用户端 H5 静态站点目录(部分环境有) | /www/wwwroot/jjy-jf.fwxgpt.com | +| `FRONT_JAR_NAME` | 用户端 jar 文件名 | miao-front-2.2.jar | +| `ADMIN_JAR_NAME` | 管理后台 jar 文件名 | miao-admin-2.2.jar | +| `FRONT_LOCAL_PORT` | 用户端 API 端口 | 30031 | +| `ADMIN_LOCAL_PORT` | 管理后台 API 端口 | 30032 | -```bash -ssh-copy-id -i ~/.ssh/id_ed25519_crmeb_deploy.pub root@123.56.214.80 -``` +### 环境示例(deploy.conf) -提示输入 **远程服务器 root 密码**(不要用 `sudo`,否则会提示的是本机密码)。成功后即可免密 SSH/SCP。 - -### 2. 执行自动部署脚本 - -在 **backend 目录** 下执行: - -```bash -cd /path/to/single-shop-22/backend -./shell/deploy-admin-by80.sh -``` - -使用其他密钥时: - -```bash -SSH_IDENTITY=~/.ssh/你的私钥 ./shell/deploy-admin-by80.sh -``` - -### 3. 脚本会依次执行 - -| 步骤 | 说明 | -|------|------| -| 1. 编译后端 | `mvn clean package -pl crmeb-admin -am -DskipTests`,生成 `crmeb-admin/target/miao-admin-2.2.jar` | -| 2. 编译前端 | 在 `frontend` 目录执行 `npm run build:prod`(带 Node 17+ OpenSSL 兼容),生成 `frontend/dist` | -| 3. 远程备份 | 备份远程已有 jar 到 `REMOTE_DIR_JAR/backups/`,后台静态打包为 `jfadmin_backup_yyyyMMdd_HHmmss.tar.gz` | -| 4. 上传 jar | 将 `miao-admin-2.2.jar` 上传到 `REMOTE_DIR_JAR`(by80 默认 `/www/wwwroot/crmeb`) | -| 5. 上传后台静态 | 将 `frontend/dist` 通过 tar 管道上传到 `REMOTE_DIR_ADMIN`(by80 默认 `/www/wwwroot/jfadmin.bosenyuan.com`) | -| 6. 远程重启 | 在远程执行 `pkill -f miao-admin-2.2.jar` 后使用 `--spring.profiles.active=miao80`、`--server.port=30032` 启动 jar | +- **by80**:`REMOTE_DIR_JAR`、`REMOTE_DIR_ADMIN`,profile=miao80 +- **miao50**:`REMOTE_DIR`(jar 目录),profile=miao50 +- **shjjy153**:`REMOTE_DIR_JAR`、`REMOTE_DIR_ADMIN`、`REMOTE_DIR_FRONT`,profile=shjjy153 --- -## 三、部署配置(deploy.conf) +## 三、单独打包(4 个子项目) -配置位于 **backend/deploy.conf**,按段落区分环境(如 by80、miao50)。by80 段示例: - -- `SERVER_HOST`:服务器 IP(如 123.56.214.80) -- `SERVER_USER`:SSH 用户(如 root) -- `SERVER_PORT`:SSH 端口(如 22) -- `REMOTE_DIR_JAR`:jar 上传目录(如 /www/wwwroot/crmeb) -- `REMOTE_DIR_ADMIN`:admin 后台静态站点目录(如 /www/wwwroot/jfadmin.bosenyuan.com) -- `ADMIN_JAR_NAME`:admin jar 文件名(如 miao-admin-2.2.jar) -- `ADMIN_LOCAL_PORT`:admin 服务端口(如 30032) - -修改后无需改脚本,脚本会从该文件读取对应段配置。 - ---- - -## 四、仅编译/打包(不部署) - -### 仅后端(miao-admin-2.2.jar) +### 1. 仅打包 crmeb-admin(miao-admin-2.2.jar) ```bash cd backend @@ -80,9 +61,15 @@ mvn clean package -pl crmeb-admin -am -DskipTests # 产出:backend/crmeb-admin/target/miao-admin-2.2.jar ``` -运行时指定 profile:`java -jar miao-admin-2.2.jar --spring.profiles.active=miao80 --server.port=30032`。 +### 2. 仅打包 crmeb-front(miao-front-2.2.jar) -### 仅前端(admin 后台) +```bash +cd backend +mvn clean package -pl crmeb-front -am -DskipTests +# 产出:backend/crmeb-front/target/miao-front-2.2.jar +``` + +### 3. 仅打包 admin 后台前端(frontend) ```bash cd frontend @@ -91,35 +78,126 @@ npm run build:prod # 产出:frontend/dist ``` ---- - -## 五、远程服务器上手动重启 admin - -若自动重启未生效,可 SSH 登录后手动操作: +### 4. 仅打包用户端 H5 前端(single_uniapp22miao) ```bash -ssh -i ~/.ssh/id_ed25519_crmeb_deploy root@123.56.214.80 - -cd /www/wwwroot/crmeb -pkill -f miao-admin-2.2.jar || true -sleep 2 -nohup java -jar miao-admin-2.2.jar --spring.profiles.active=miao80 --server.port=30032 > admin.log 2>&1 & - -# 检查是否启动 -pgrep -f miao-admin-2.2.jar && echo "Admin 已启动" || tail -50 admin.log +cd single_uniapp22miao +npm run build:h5 +# 产出:single_uniapp22miao/unpackage/dist/build/h5 ``` --- -## 六、其他环境(如 miao50) +## 四、单独启动(本机) -miao50 使用脚本 **backend/shell/deploy-admin-miao50.sh**,逻辑类似:编译 admin、上传 jar、远程重启(profile=miao50)。配置来自 deploy.conf 中 miao50 段。若需同时部署前端静态,可参考 by80 脚本在 miao50 脚本中增加备份与上传 `frontend/dist` 的步骤。 +### 启动 miao-admin(管理后台 API) + +```bash +cd backend +nohup java -jar crmeb-admin/target/miao-admin-2.2.jar \ + --spring.profiles.active=miao80 \ + --server.port=30032 > admin.log 2>&1 & +``` + +### 启动 miao-front(用户端 API) + +```bash +cd backend +./shell/start-front-miao33.sh # 使用 miao33 配置,端口 30031 +# 或指定 profile: +nohup java -jar crmeb-front/target/miao-front-2.2.jar \ + --spring.profiles.active=miao33 > front-miao33.log 2>&1 & +``` --- -## 七、故障排查 +## 五、by80 环境一键部署(admin 后台) -- **SSH Permission denied**:检查是否已执行 `ssh-copy-id`,且未使用 `sudo`;或指定正确 `SSH_IDENTITY`。 -- **前端构建报错 OpenSSL / digital envelope**:在运行 `npm run build:prod` 前设置 `export NODE_OPTIONS="--openssl-legacy-provider"`(脚本已包含)。 -- **远程找不到 rsync**:当前 by80 脚本已改为使用 tar 管道上传前端,不依赖远程 rsync。 -- **jar 未启动**:SSH 登录服务器查看 `admin.log` 及 `pgrep -f miao-admin-2.2.jar`。 +部署目标:**miao-admin-2.2.jar** + **admin 后台静态**,上传到 by80 配置的服务器。 + +### 1. 配置 SSH 免密(一次性) + +```bash +ssh-copy-id -i ~/.ssh/id_ed25519_crmeb_deploy.pub root@123.56.214.80 +``` + +### 2. 执行部署脚本 + +```bash +cd backend +./shell/deploy-admin-by80.sh +``` + +使用其他密钥:`SSH_IDENTITY=~/.ssh/你的私钥 ./shell/deploy-admin-by80.sh` + +### 3. 脚本执行步骤 + +| 步骤 | 说明 | +|------|------| +| 1 | 编译 crmeb-admin,生成 miao-admin-2.2.jar | +| 2 | 编译 frontend,生成 dist | +| 3 | 远程备份原有 jar 与后台静态 | +| 4 | 上传 miao-admin-2.2.jar 到 REMOTE_DIR_JAR | +| 5 | 上传 frontend/dist 到 REMOTE_DIR_ADMIN | +| 6 | 远程重启 admin 服务(profile=miao80, port=30032) | + +--- + +## 六、部署 miao-front(用户端 API) + +### shccd159 环境 + +```bash +cd backend +./shell/deploy-front-shccd159.sh +``` + +脚本步骤:编译 crmeb-front → **云服务器备份原有 jar** → 上传 jar → 远程重启。 + +使用其他密钥:`SSH_IDENTITY=~/.ssh/你的私钥 ./shell/deploy-front-shccd159.sh` + +**前置条件**:配置 SSH 免密,例如: +```bash +ssh-copy-id -i ~/.ssh/id_ed25519_crmeb_deploy.pub root@182.92.78.159 +``` + +--- + +## 七、其他环境 + +- **miao50**:使用 `./shell/deploy-admin-miao50.sh`,逻辑类似,配置来自 deploy.conf 中 miao50 段。 +- **shjjy153**:deploy.conf 中配置了 `REMOTE_DIR_FRONT`,可扩展脚本上传 single_uniapp22miao 的 H5 构建产物到该目录。 + +--- + +## 八、远程服务器手动重启 + +### 重启 admin(miao-admin-2.2.jar) + +```bash +ssh root@ +cd /www/wwwroot/crmeb # 或 REMOTE_DIR_JAR +pkill -f miao-admin-2.2.jar || true +sleep 2 +nohup java -Xms128m -Xmx200m -jar miao-admin-2.2.jar --spring.profiles.active=miao80 --server.port=30032 > admin.log 2>&1 & +pgrep -f miao-admin-2.2.jar && echo "Admin 已启动" +``` + +### 重启 front(miao-front-2.2.jar) + +```bash +ssh root@ +cd /www/wwwroot/crmeb # 或 REMOTE_DIR_JAR +pkill -f miao-front-2.2.jar || true +sleep 2 +nohup java -Xms128m -Xmx200m -jar miao-front-2.2.jar --spring.profiles.active=miao33 --server.port=30031 > front.log 2>&1 & +pgrep -f miao-front-2.2.jar && echo "Front 已启动" +``` + +--- + +## 九、故障排查 + +- **SSH Permission denied**:检查 `ssh-copy-id` 是否成功,或指定正确 `SSH_IDENTITY`。 +- **前端构建 OpenSSL 报错**:设置 `export NODE_OPTIONS="--openssl-legacy-provider"`。 +- **jar 未启动**:SSH 登录查看对应 log 文件及 `pgrep -f `。 diff --git a/backend/crmeb-admin/src/main/resources/application-shccd159.yml b/backend/crmeb-admin/src/main/resources/application-shccd159.yml new file mode 100644 index 0000000..4f44ee3 --- /dev/null +++ b/backend/crmeb-admin/src/main/resources/application-shccd159.yml @@ -0,0 +1,59 @@ +# CRMEB 相关配置 +crmeb: + captchaOn: false # 是否开启行为验证码 + asyncConfig: true #是否同步config表数据到redis + +server: + port: 30032 + +sync: + source-id: shop_f + target-mer-id: 8 + +spring: + datasource: + name: yangtangyoupin + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://182.92.78.159:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 182.92.78.159 #地址 + port: 6379 #端口 + password: '123456' + timeout: 10000 # 连接超时时间(毫秒) + database: 2 #默认数据库 + jedis: + pool: + max-active: 200 # 连接池最大连接数(使用负值表示没有限制) + max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制) + max-idle: 10 # 连接池中的最大空闲连接 + min-idle: 0 # 连接池中的最小空闲连接 + time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 + second: + database: 2 # 微信accessToken存储库 + +debug: true +logging: + level: + io.swagger.*: error + com.zbjk.crmeb: debug + org.springframework.boot.autoconfigure: ERROR + config: classpath:logback-spring.xml + file: + path: ./logs + +# mybatis 配置 +mybatis-plus: + # 配置sql打印日志 + configuration: + log-impl: + +#swagger 配置 +swagger: + basic: + enable: true #是否开启界面 + check: false #是否打开验证 + username: crmeb #访问swagger的账号 + password: crmeb.com #访问swagger的密码 diff --git a/backend/crmeb-admin/src/main/resources/application-shjjy153.yml b/backend/crmeb-admin/src/main/resources/application-shjjy153.yml new file mode 100644 index 0000000..64666eb --- /dev/null +++ b/backend/crmeb-admin/src/main/resources/application-shjjy153.yml @@ -0,0 +1,59 @@ +# CRMEB 相关配置 +crmeb: + captchaOn: false # 是否开启行为验证码 + asyncConfig: true #是否同步config表数据到redis + +server: + port: 30032 + +sync: + source-id: shop_e + target-mer-id: 7 + +spring: + datasource: + name: yangtangyoupin + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://101.132.245.153:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 101.132.245.153 #地址 + port: 6379 #端口 + password: '123456' + timeout: 10000 # 连接超时时间(毫秒) + database: 2 #默认数据库 + jedis: + pool: + max-active: 200 # 连接池最大连接数(使用负值表示没有限制) + max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制) + max-idle: 10 # 连接池中的最大空闲连接 + min-idle: 0 # 连接池中的最小空闲连接 + time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 + second: + database: 2 # 微信accessToken存储库 + +debug: true +logging: + level: + io.swagger.*: error + com.zbjk.crmeb: debug + org.springframework.boot.autoconfigure: ERROR + config: classpath:logback-spring.xml + file: + path: ./logs + +# mybatis 配置 +mybatis-plus: + # 配置sql打印日志 + configuration: + log-impl: + +#swagger 配置 +swagger: + basic: + enable: true #是否开启界面 + check: false #是否打开验证 + username: crmeb #访问swagger的账号 + password: crmeb.com #访问swagger的密码 diff --git a/backend/crmeb-admin/src/main/resources/application.yml b/backend/crmeb-admin/src/main/resources/application.yml index fe63e2b..11e96cd 100644 --- a/backend/crmeb-admin/src/main/resources/application.yml +++ b/backend/crmeb-admin/src/main/resources/application.yml @@ -38,7 +38,7 @@ server: spring: profiles: - active: miao80 + active: shccd159 servlet: multipart: max-file-size: 50MB #设置单个文件大小 diff --git a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java index 2d7952d..f88a047 100644 --- a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java +++ b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java @@ -220,11 +220,13 @@ public class UserController { /** * 积分记录 + * @param type 可选,记录类型:1=收入,2=支出,不传返回全部 */ @ApiOperation(value = "积分记录") @RequestMapping(value = "/integral/list", method = RequestMethod.GET) - public CommonResult> getIntegralList(@Validated PageParamRequest pageParamRequest) { - return CommonResult.success(CommonPage.restPage(userCenterService.getUserIntegralRecordList(pageParamRequest))); + public CommonResult> getIntegralList(@Validated PageParamRequest pageParamRequest, + @RequestParam(required = false) Integer type) { + return CommonResult.success(CommonPage.restPage(userCenterService.getUserIntegralRecordList(pageParamRequest, type))); } /** diff --git a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java index 53db9f4..7155853 100644 --- a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java +++ b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java @@ -73,7 +73,7 @@ public class WaUserController { FileInputStream fileInputStream = null; try { // 读取模板PDF文件 - Resource resource = new ClassPathResource("pdf/sign_contract_ccd.pdf"); + Resource resource = new ClassPathResource("pdf/sign_contract_jjy.pdf"); InputStream pdfInputStream = resource.getInputStream(); document = PDDocument.load(pdfInputStream); pdfInputStream.close(); @@ -198,7 +198,8 @@ public class WaUserController { user.setId(pid); // user.setContract("https://anyue.szxingming.com/"+pdfResultVo.getUrl()); // user.setContract("https://xiashengjun.com/"+pdfResultVo.getUrl()); - user.setContract("https://ccd.fwxgpt.com/"+pdfResultVo.getUrl()); +// user.setContract("https://ccd.fwxgpt.com/"+pdfResultVo.getUrl()); + user.setContract("https://jjy.fwxgpt.com/"+pdfResultVo.getUrl()); waUsersDao.updateById(user); } return CommonResult.success(pdfResultVo); diff --git a/backend/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java b/backend/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java index d265d68..dc0ae3f 100644 --- a/backend/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java +++ b/backend/crmeb-front/src/main/java/com/zbkj/front/service/UserCenterService.java @@ -176,9 +176,10 @@ public interface UserCenterService extends IService { /** * 用户积分记录列表 * @param pageParamRequest 分页参数 + * @param type 可选,记录类型:1=收入,2=支出,null=全部 * @return List */ - List getUserIntegralRecordList(PageParamRequest pageParamRequest); + List getUserIntegralRecordList(PageParamRequest pageParamRequest, Integer type); /** * 微信app登录 diff --git a/backend/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java b/backend/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java index 9e4b02f..74e1b9f 100644 --- a/backend/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java +++ b/backend/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java @@ -912,12 +912,13 @@ public class UserCenterServiceImpl extends ServiceImpl implements * 用户积分记录列表 * * @param pageParamRequest 分页参数 + * @param type 可选,记录类型:1=收入,2=支出,null=全部 * @return List */ @Override - public List getUserIntegralRecordList(PageParamRequest pageParamRequest) { + public List getUserIntegralRecordList(PageParamRequest pageParamRequest, Integer type) { Integer uid = userService.getUserIdException(); - return userIntegralRecordService.findUserIntegralRecordList(uid, pageParamRequest); + return userIntegralRecordService.findUserIntegralRecordList(uid, pageParamRequest, type); } /** diff --git a/backend/crmeb-front/src/main/resources/application-shjjy153.yml b/backend/crmeb-front/src/main/resources/application-shjjy153.yml new file mode 100644 index 0000000..56b0d97 --- /dev/null +++ b/backend/crmeb-front/src/main/resources/application-shjjy153.yml @@ -0,0 +1,54 @@ +crmeb: + imagePath: /www/wwwroot/jjy.fwxgpt.com/ # ccd.fwxgpt.com, xsj.bosenyuan.com, xsj.bosenyuan.com/ jf.bosenyuan.com/ 服务器图片路径配置 斜杠结尾 + asyncConfig: true #是否同步config表数据到redis + +server: + port: 30031 + +spring: + datasource: + name: yangtangyoupin + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://101.132.245.153:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 101.132.245.153 #地址 + port: 6379 #端口 + password: '123456' + timeout: 10000 # 连接超时时间(毫秒) + database: 2 #默认数据库 + jedis: + pool: + max-active: 200 # 连接池最大连接数(使用负值表示没有限制) + max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制) + max-idle: 10 # 连接池中的最大空闲连接 + min-idle: 0 # 连接池中的最小空闲连接 + time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 + second: + database: 3 # 微信accessToken存储库 + +debug: true +logging: + level: + io.swagger.*: error + com.zbjk.crmeb: debug + org.springframework.boot.autoconfigure: ERROR + config: classpath:logback-spring.xml + file: + path: ./logs + +# mybatis 配置 +mybatis-plus: + # 配置sql打印日志 + configuration: + log-impl: + +#swagger 配置 +swagger: + basic: + enable: true #是否开启界面 + check: false #是否打开验证 + username: crmeb #访问swagger的账号 + password: crmeb.com #访问swagger的密码 diff --git a/backend/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.java b/backend/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.java index d2fb15c..b6455b6 100644 --- a/backend/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.java +++ b/backend/crmeb-service/src/main/java/com/zbkj/service/service/UserIntegralRecordService.java @@ -62,6 +62,15 @@ public interface UserIntegralRecordService extends IService */ List findUserIntegralRecordList(Integer uid, PageParamRequest pageParamRequest); + /** + * H5用户积分列表(按类型筛选) + * @param uid 用户uid + * @param pageParamRequest 分页参数 + * @param type 可选,1=收入,2=支出,null=全部 + * @return List + */ + List findUserIntegralRecordList(Integer uid, PageParamRequest pageParamRequest, Integer type); + /** * 获取用户冻结的积分 * @param uid 用户uid diff --git a/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java b/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java index 13adc19..0ccc593 100644 --- a/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java +++ b/backend/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserIntegralRecordServiceImpl.java @@ -217,11 +217,19 @@ public class UserIntegralRecordServiceImpl extends ServiceImpl findUserIntegralRecordList(Integer uid, PageParamRequest pageParamRequest) { + return findUserIntegralRecordList(uid, pageParamRequest, null); + } + + @Override + public List findUserIntegralRecordList(Integer uid, PageParamRequest pageParamRequest, Integer type) { PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit()); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.select(UserIntegralRecord::getId, UserIntegralRecord::getTitle, UserIntegralRecord::getType, UserIntegralRecord::getIntegral, UserIntegralRecord::getUpdateTime); lqw.eq(UserIntegralRecord::getUid, uid); lqw.eq(UserIntegralRecord::getStatus, IntegralRecordConstants.INTEGRAL_RECORD_STATUS_COMPLETE); + if (type != null) { + lqw.eq(UserIntegralRecord::getType, type); + } lqw.orderByDesc(UserIntegralRecord::getUpdateTime); return dao.selectList(lqw); } diff --git a/backend/deploy.conf b/backend/deploy.conf index 76bf113..7b1c2cd 100644 --- a/backend/deploy.conf +++ b/backend/deploy.conf @@ -8,6 +8,23 @@ SERVER_USER=root SERVER_PORT=22 REMOTE_DIR_JAR=/www/wwwroot/crmeb REMOTE_DIR_ADMIN=/www/wwwroot/jfadmin.bosenyuan.com +VUE_APP_BASE_API_EXPECTED=http://jfadmin-bsy.bosenyuan.com +FRONT_LOCAL_PORT=30031 +FRONT_JAR_NAME=miao-front-2.2.jar +ADMIN_LOCAL_PORT=30032 +ADMIN_JAR_NAME=miao-admin-2.2.jar + + +miao33: + spring: + profiles: + active: miao33 +SERVER_HOST=39.106.63.33 +SERVER_USER=root +SERVER_PORT=22 +REMOTE_DIR_JAR=/www/wwwroot/crmeb +REMOTE_DIR_ADMIN=/www/wwwroot/jfadmin.xiashengjun.com +VUE_APP_BASE_API_EXPECTED=http://jfadmin.xiashengjun.com FRONT_LOCAL_PORT=30031 FRONT_JAR_NAME=miao-front-2.2.jar ADMIN_LOCAL_PORT=30032 @@ -27,3 +44,39 @@ FRONT_LOCAL_PORT=30031 FRONT_JAR_NAME=miao-front-2.2.jar ADMIN_LOCAL_PORT=30032 ADMIN_JAR_NAME=miao-admin-2.2.jar + + +shjjy153: + spring: + profiles: + active: shjjy153 + +SERVER_HOST=101.132.245.153 +SERVER_USER=root +SERVER_PORT=22 +REMOTE_DIR_JAR=/www/wwwroot/javaapi +FRONT_LOCAL_PORT=30031 +FRONT_JAR_NAME=miao-front-2.2.jar +ADMIN_LOCAL_PORT=30032 +ADMIN_JAR_NAME=miao-admin-2.2.jar +REMOTE_DIR_ADMIN=/www/wwwroot/jjy-jfadmin.fwxgpt.com +REMOTE_DIR_FRONT=/www/wwwroot/jjy-jf.fwxgpt.com + + +shccd159: + spring: + profiles: + active: shccd159 + +SERVER_HOST=182.92.78.159 +SERVER_USER=root +SERVER_PORT=22 +REMOTE_DIR_JAR=/www/wwwroot/javaapi +FRONT_LOCAL_PORT=30031 +FRONT_JAR_NAME=miao-front-2.2.jar +ADMIN_LOCAL_PORT=30032 +ADMIN_JAR_NAME=miao-admin-2.2.jar +REMOTE_DIR_ADMIN=/www/wwwroot/ccd-jfadmin.fwxgpt.com +REMOTE_DIR_FRONT=/www/wwwroot/ccd-jf.fwxgpt.com + + diff --git a/backend/shell/deploy-admin-by80.sh b/backend/shell/deploy-admin-by80.sh index 9215c5c..0c74c87 100755 --- a/backend/shell/deploy-admin-by80.sh +++ b/backend/shell/deploy-admin-by80.sh @@ -13,9 +13,9 @@ ROOT_DIR="$(cd "$BACKEND_DIR/.." && pwd)" FRONTEND_DIR="$ROOT_DIR/frontend" DEPLOY_CONF="$BACKEND_DIR/deploy.conf" -# 解析 by80 段配置(deploy.conf 中 by80 段到 miao50 段之间的 KEY=value) +# 解析 by80 段配置(deploy.conf 中 by80 段到 miao33 段之前的 KEY=value) get_conf() { - sed -n '1,/^miao50:/p' "$DEPLOY_CONF" | grep -E "^${1}=" | tail -1 | cut -d= -f2- + sed -n '1,/^miao33:/p' "$DEPLOY_CONF" | grep -E "^${1}=" | tail -1 | cut -d= -f2- } SERVER_HOST=$(get_conf SERVER_HOST) SERVER_USER=$(get_conf SERVER_USER) @@ -48,7 +48,23 @@ echo "已生成: $JAR_PATH" [[ ! -f "$JAR_PATH" ]] && { echo "错误: jar 未生成"; exit 1; } echo "" -echo "=== 2. 编译前端 (admin 后台) ===" +echo "=== 2. 检查前端 API 地址 (frontend/.env.production) ===" +VUE_APP_BASE_API_EXPECTED=$(get_conf VUE_APP_BASE_API_EXPECTED) +if [[ -n "$VUE_APP_BASE_API_EXPECTED" ]]; then + ENV_FILE="$FRONTEND_DIR/.env.production" + CURRENT_API=$(grep -E '^[[:space:]]*VUE_APP_BASE_API[[:space:]]*=' "$ENV_FILE" 2>/dev/null | head -1 | sed -E "s/^[^=]*=[[:space:]]*['\"]?([^'\"]*)['\"]?[[:space:]]*/\1/" | tr -d ' ') + if [[ "$CURRENT_API" != "$VUE_APP_BASE_API_EXPECTED" ]]; then + echo "错误: 打包前请确认 API 接口地址为本项目的。" + echo " 当前 frontend/.env.production: VUE_APP_BASE_API = '$CURRENT_API'" + echo " by80 期望: VUE_APP_BASE_API = '$VUE_APP_BASE_API_EXPECTED'" + echo "请修改 frontend/.env.production 后重新执行。" + exit 1 + fi + echo "已确认 VUE_APP_BASE_API = '$CURRENT_API'" +fi + +echo "" +echo "=== 3. 编译前端 (admin 后台) ===" cd "$FRONTEND_DIR" # Node.js 17+ OpenSSL 兼容 export NODE_OPTIONS="${NODE_OPTIONS:-} --openssl-legacy-provider" @@ -57,7 +73,7 @@ echo "已生成: $FRONTEND_DIR/dist" [[ ! -d "$FRONTEND_DIR/dist" ]] && { echo "错误: dist 未生成"; exit 1; } echo "" -echo "=== 3. 远程备份原有文件 ===" +echo "=== 4. 远程备份原有文件 ===" "${SSH_CMD[@]}" "bash -s" << REMOTE_BACKUP set -e mkdir -p "$REMOTE_DIR_JAR/backups" @@ -73,19 +89,19 @@ fi REMOTE_BACKUP echo "" -echo "=== 4. 上传 miao-admin-2.2.jar 到 $REMOTE_DIR_JAR ===" +echo "=== 5. 上传 miao-admin-2.2.jar 到 $REMOTE_DIR_JAR ===" "${SCP_CMD[@]}" "$JAR_PATH" "$SERVER_USER@$SERVER_HOST:$REMOTE_DIR_JAR/" echo "jar 上传完成." echo "" -echo "=== 5. 上传 admin 后台静态 (dist) 到 $REMOTE_DIR_ADMIN ===" +echo "=== 6. 上传 admin 后台静态 (dist) 到 $REMOTE_DIR_ADMIN ===" # 先清空远程目录再上传,避免残留旧文件(远程可能无 rsync,统一用 tar 管道) "${SSH_CMD[@]}" "mkdir -p $REMOTE_DIR_ADMIN && (rm -rf ${REMOTE_DIR_ADMIN}/* ${REMOTE_DIR_ADMIN}/.??* 2>/dev/null; true)" (cd "$FRONTEND_DIR/dist" && tar cf - .) | "${SSH_CMD[@]}" "mkdir -p $REMOTE_DIR_ADMIN && cd $REMOTE_DIR_ADMIN && tar xf -" echo "后台静态上传完成." echo "" -echo "=== 6. 远程重启 admin 服务 (profile=miao80, port=$ADMIN_LOCAL_PORT) ===" +echo "=== 7. 远程重启 admin 服务 (profile=miao80, port=$ADMIN_LOCAL_PORT) ===" "${SSH_CMD[@]}" "cd $REMOTE_DIR_JAR && \ (pkill -f $ADMIN_JAR_NAME || true) && \ sleep 2 && \ diff --git a/backend/shell/deploy-admin-miao33.sh b/backend/shell/deploy-admin-miao33.sh new file mode 100755 index 0000000..10e1184 --- /dev/null +++ b/backend/shell/deploy-admin-miao33.sh @@ -0,0 +1,120 @@ +#!/bin/bash +# 编译前后端,使用 spring profile miao33 打包 miao-admin-2.2.jar, +# 备份远程原有文件后通过 SSH 上传并重启(admin jar + admin 后台静态) +# 一次性配置免密: ssh-copy-id -i ~/.ssh/id_ed25519_crmeb_deploy.pub root@8.152.170.46 +# 或指定密钥: SSH_IDENTITY=~/.ssh/your_key ./shell/deploy-admin-miao33.sh +# 使用: ./shell/deploy-admin-miao33.sh(在 backend 目录下) + +set -e +SSH_IDENTITY="${SSH_IDENTITY:-$HOME/.ssh/id_ed25519_crmeb_deploy}" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +BACKEND_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" +ROOT_DIR="$(cd "$BACKEND_DIR/.." && pwd)" +FRONTEND_DIR="$ROOT_DIR/frontend" +DEPLOY_CONF="$BACKEND_DIR/deploy.conf" + +# 解析 miao33 段配置(deploy.conf 中 miao33 段到 miao50 段之间的 KEY=value) +get_conf() { + sed -n '/^miao33:/,/^miao50:/p' "$DEPLOY_CONF" | grep -E "^${1}=" | tail -1 | cut -d= -f2- +} +SERVER_HOST=$(get_conf SERVER_HOST) +SERVER_USER=$(get_conf SERVER_USER) +SERVER_PORT=$(get_conf SERVER_PORT) +REMOTE_DIR_JAR=$(get_conf REMOTE_DIR_JAR) +REMOTE_DIR_ADMIN=$(get_conf REMOTE_DIR_ADMIN) +ADMIN_JAR_NAME=$(get_conf ADMIN_JAR_NAME) +ADMIN_LOCAL_PORT=$(get_conf ADMIN_LOCAL_PORT) + +[[ -z "$SERVER_HOST" ]] && SERVER_HOST=8.152.170.46 +[[ -z "$REMOTE_DIR_JAR" ]] && REMOTE_DIR_JAR=/www/wwwroot/crmeb +[[ -z "$REMOTE_DIR_ADMIN" ]] && REMOTE_DIR_ADMIN=/www/wwwroot/jfadmin.xiashengjun.com +[[ -z "$ADMIN_JAR_NAME" ]] && ADMIN_JAR_NAME=miao-admin-2.2.jar +[[ -z "$ADMIN_LOCAL_PORT" ]] && ADMIN_LOCAL_PORT=30032 +[[ -z "$SERVER_USER" ]] && SERVER_USER=root +[[ -z "$SERVER_PORT" ]] && SERVER_PORT=22 + +JAR_PATH="$BACKEND_DIR/crmeb-admin/target/$ADMIN_JAR_NAME" +REMOTE_JAR="$REMOTE_DIR_JAR/$ADMIN_JAR_NAME" +[[ -f "$SSH_IDENTITY" ]] && SSH_OPTS=(-o "IdentityFile=$SSH_IDENTITY") || SSH_OPTS=() +SSH_CMD=(ssh "${SSH_OPTS[@]}" -o StrictHostKeyChecking=accept-new -p "$SERVER_PORT" "$SERVER_USER@$SERVER_HOST") +SCP_CMD=(scp "${SSH_OPTS[@]}" -o StrictHostKeyChecking=accept-new -P "$SERVER_PORT") + +BACKUP_SUFFIX="backup_$(date +%Y%m%d_%H%M%S)" +APP_YML="$BACKEND_DIR/crmeb-admin/src/main/resources/application.yml" + +echo "=== 1. 设置 spring.profiles.active=miao33 后编译后端 ===" +cd "$BACKEND_DIR" +# 打包前临时改为 miao33,编译后恢复(兼容 Linux/macOS) +if [[ -f "$APP_YML" ]]; then + cp -a "$APP_YML" "${APP_YML}.bak" + sed 's/active: *miao[0-9]*/active: miao33/' "$APP_YML" > "${APP_YML}.new" && mv "${APP_YML}.new" "$APP_YML" + trap 'cp -a "${APP_YML}.bak" "$APP_YML"; rm -f "${APP_YML}.bak"; trap - EXIT' EXIT +fi +mvn clean package -pl crmeb-admin -am -DskipTests -q +echo "已生成: $JAR_PATH" +[[ ! -f "$JAR_PATH" ]] && { echo "错误: jar 未生成"; exit 1; } +# 恢复 application.yml +if [[ -f "${APP_YML}.bak" ]]; then cp -a "${APP_YML}.bak" "$APP_YML"; rm -f "${APP_YML}.bak"; trap - EXIT; fi + +echo "" +echo "=== 2. 检查前端 API 地址 (frontend/.env.production) ===" +VUE_APP_BASE_API_EXPECTED=$(get_conf VUE_APP_BASE_API_EXPECTED) +if [[ -n "$VUE_APP_BASE_API_EXPECTED" ]]; then + ENV_FILE="$FRONTEND_DIR/.env.production" + CURRENT_API=$(grep -E '^[[:space:]]*VUE_APP_BASE_API[[:space:]]*=' "$ENV_FILE" 2>/dev/null | head -1 | sed -E "s/^[^=]*=[[:space:]]*['\"]?([^'\"]*)['\"]?[[:space:]]*/\1/" | tr -d ' ') + if [[ "$CURRENT_API" != "$VUE_APP_BASE_API_EXPECTED" ]]; then + echo "错误: 打包前请确认 API 接口地址为本项目的。" + echo " 当前 frontend/.env.production: VUE_APP_BASE_API = '$CURRENT_API'" + echo " miao33 期望: VUE_APP_BASE_API = '$VUE_APP_BASE_API_EXPECTED'" + echo "请修改 frontend/.env.production 后重新执行。" + exit 1 + fi + echo "已确认 VUE_APP_BASE_API = '$CURRENT_API'" +fi + +echo "" +echo "=== 3. 编译前端 (admin 后台) ===" +cd "$FRONTEND_DIR" +export NODE_OPTIONS="${NODE_OPTIONS:-} --openssl-legacy-provider" +npm run build:prod +echo "已生成: $FRONTEND_DIR/dist" +[[ ! -d "$FRONTEND_DIR/dist" ]] && { echo "错误: dist 未生成"; exit 1; } + +echo "" +echo "=== 4. 远程备份原有文件 ===" +"${SSH_CMD[@]}" "bash -s" << REMOTE_BACKUP +set -e +mkdir -p "$REMOTE_DIR_JAR/backups" +if [ -f "$REMOTE_JAR" ]; then + cp -a "$REMOTE_JAR" "$REMOTE_DIR_JAR/backups/${ADMIN_JAR_NAME}.${BACKUP_SUFFIX}" + echo "已备份 jar: $REMOTE_DIR_JAR/backups/${ADMIN_JAR_NAME}.${BACKUP_SUFFIX}" +fi +if [ -d "$REMOTE_DIR_ADMIN" ] && [ "\$(ls -A $REMOTE_DIR_ADMIN 2>/dev/null)" ]; then + BACKUP_TAR="$REMOTE_DIR_ADMIN/../jfadmin_${BACKUP_SUFFIX}.tar.gz" + tar -czf "\$BACKUP_TAR" -C "$REMOTE_DIR_ADMIN" . + echo "已备份后台静态: \$BACKUP_TAR" +fi +REMOTE_BACKUP + +echo "" +echo "=== 5. 上传 $ADMIN_JAR_NAME 到 $REMOTE_DIR_JAR ===" +"${SCP_CMD[@]}" "$JAR_PATH" "$SERVER_USER@$SERVER_HOST:$REMOTE_DIR_JAR/" +echo "jar 上传完成." + +echo "" +echo "=== 6. 上传 admin 后台静态 (dist) 到 $REMOTE_DIR_ADMIN ===" +"${SSH_CMD[@]}" "mkdir -p $REMOTE_DIR_ADMIN && (rm -rf ${REMOTE_DIR_ADMIN}/* ${REMOTE_DIR_ADMIN}/.??* 2>/dev/null; true)" +(cd "$FRONTEND_DIR/dist" && tar cf - .) | "${SSH_CMD[@]}" "mkdir -p $REMOTE_DIR_ADMIN && cd $REMOTE_DIR_ADMIN && tar xf -" +echo "后台静态上传完成." + +echo "" +echo "=== 7. 远程重启 admin 服务 (profile=miao33, port=$ADMIN_LOCAL_PORT) ===" +"${SSH_CMD[@]}" "cd $REMOTE_DIR_JAR && \ + (pkill -f $ADMIN_JAR_NAME || true) && \ + sleep 2 && \ + nohup java -jar $ADMIN_JAR_NAME --spring.profiles.active=miao33 --server.port=$ADMIN_LOCAL_PORT > admin.log 2>&1 & \ + sleep 3 && \ + (pgrep -f $ADMIN_JAR_NAME && echo 'Admin 进程已启动' || echo '请检查 admin.log 启动是否失败')" + +echo "" +echo "=== miao33 部署完成 ===" diff --git a/backend/shell/deploy-front-shccd159.sh b/backend/shell/deploy-front-shccd159.sh new file mode 100755 index 0000000..bafeae0 --- /dev/null +++ b/backend/shell/deploy-front-shccd159.sh @@ -0,0 +1,81 @@ +#!/bin/bash +# 编译并部署 miao-front(用户端 API)到 shccd159 云服务器 +# 部署前在云服务器上备份原有 jar +# 使用: ./shell/deploy-front-shccd159.sh(在 backend 目录下) +# 或指定密钥: SSH_IDENTITY=~/.ssh/your_key ./shell/deploy-front-shccd159.sh + +set -e +ENV_NAME="shccd159" +SSH_IDENTITY="${SSH_IDENTITY:-$HOME/.ssh/id_ed25519_crmeb_deploy}" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +BACKEND_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" +DEPLOY_CONF="$BACKEND_DIR/deploy.conf" + +# 解析 shccd159 段配置(从 shccd159 到文件末尾) +get_conf() { + sed -n '/^shccd159:/,$p' "$DEPLOY_CONF" | grep -E "^${1}=" | tail -1 | cut -d= -f2- +} +SERVER_HOST=$(get_conf SERVER_HOST) +SERVER_USER=$(get_conf SERVER_USER) +SERVER_PORT=$(get_conf SERVER_PORT) +REMOTE_DIR_JAR=$(get_conf REMOTE_DIR_JAR) +FRONT_JAR_NAME=$(get_conf FRONT_JAR_NAME) +FRONT_LOCAL_PORT=$(get_conf FRONT_LOCAL_PORT) +SPRING_PROFILE="${ENV_NAME}" + +[[ -z "$SERVER_HOST" ]] && SERVER_HOST=182.92.78.159 +[[ -z "$REMOTE_DIR_JAR" ]] && REMOTE_DIR_JAR=/www/wwwroot/javaapi +[[ -z "$FRONT_JAR_NAME" ]] && FRONT_JAR_NAME=miao-front-2.2.jar +[[ -z "$FRONT_LOCAL_PORT" ]] && FRONT_LOCAL_PORT=30031 +[[ -z "$SERVER_USER" ]] && SERVER_USER=root +[[ -z "$SERVER_PORT" ]] && SERVER_PORT=22 + +JAR_PATH="$BACKEND_DIR/crmeb-front/target/$FRONT_JAR_NAME" +REMOTE_JAR="$REMOTE_DIR_JAR/$FRONT_JAR_NAME" +[[ -f "$SSH_IDENTITY" ]] && SSH_OPTS=(-o "IdentityFile=$SSH_IDENTITY") || SSH_OPTS=() +SSH_CMD=(ssh "${SSH_OPTS[@]}" -o StrictHostKeyChecking=accept-new -p "$SERVER_PORT" "$SERVER_USER@$SERVER_HOST") +SCP_CMD=(scp "${SSH_OPTS[@]}" -o StrictHostKeyChecking=accept-new -P "$SERVER_PORT") + +BACKUP_SUFFIX="backup_$(date +%Y%m%d_%H%M%S)" + +echo "=== 部署 miao-front(用户端 API)到 $ENV_NAME 云服务器 ===" +echo " 服务器: $SERVER_USER@$SERVER_HOST" +echo " 目标目录: $REMOTE_DIR_JAR" +echo " Profile: $SPRING_PROFILE" +echo "" + +echo "=== 1. 编译 crmeb-front(miao-front-2.2.jar)===" +cd "$BACKEND_DIR" +mvn clean package -pl crmeb-front -am -DskipTests -q +echo "已生成: $JAR_PATH" +[[ ! -f "$JAR_PATH" ]] && { echo "错误: jar 未生成"; exit 1; } + +echo "" +echo "=== 2. 云服务器备份原有 jar ===" +"${SSH_CMD[@]}" "bash -s" << REMOTE_BACKUP +set -e +mkdir -p "$REMOTE_DIR_JAR/backups" +if [ -f "$REMOTE_JAR" ]; then + cp -a "$REMOTE_JAR" "$REMOTE_DIR_JAR/backups/${FRONT_JAR_NAME}.${BACKUP_SUFFIX}" + echo "已备份: $REMOTE_DIR_JAR/backups/${FRONT_JAR_NAME}.${BACKUP_SUFFIX}" +else + echo "远程无原有 jar,跳过备份" +fi +REMOTE_BACKUP + +echo "" +echo "=== 3. 上传 $FRONT_JAR_NAME 到 $REMOTE_DIR_JAR ===" +"${SCP_CMD[@]}" "$JAR_PATH" "$SERVER_USER@$SERVER_HOST:$REMOTE_DIR_JAR/" +echo "jar 上传完成." + +echo "" +echo "=== 4. 远程重启 miao-front 服务 (profile=$SPRING_PROFILE, port=$FRONT_LOCAL_PORT) ===" +"${SSH_CMD[@]}" "cd $REMOTE_DIR_JAR && \ + (pkill -f $FRONT_JAR_NAME || true) && \ + sleep 2 && \ + nohup java -Xms128m -Xmx256m -jar $FRONT_JAR_NAME --spring.profiles.active=$SPRING_PROFILE --server.port=$FRONT_LOCAL_PORT > front.log 2>&1 & \ + sleep 3 && \ + (pgrep -f $FRONT_JAR_NAME && echo 'miao-front 已启动' || (echo '启动可能失败,请检查 front.log'; tail -20 front.log))" + +echo "" +echo "=== miao-front 部署完成 ===" diff --git a/backend/shell/start-front-miao33.sh b/backend/shell/start-front-miao33.sh new file mode 100755 index 0000000..9d4e88e --- /dev/null +++ b/backend/shell/start-front-miao33.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +# 使用 miao33 配置启动 crmeb-front 服务(nohup 后台) +# 端口见 application-miao33.yml:30031 + +set -e +BACKEND_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +cd "$BACKEND_DIR" +JAR="$BACKEND_DIR/crmeb-front/target/miao-front-2.2.jar" +LOG="${LOG:-$BACKEND_DIR/front-miao33.log}" + +if [ ! -f "$JAR" ]; then + echo "未找到 jar,请先执行: mvn clean package -pl crmeb-front -am -DskipTests" + exit 1 +fi + +echo "启动: nohup java -jar $JAR --spring.profiles.active=miao33 > $LOG 2>&1 &" +nohup java -jar "$JAR" --spring.profiles.active=miao33 >> "$LOG" 2>&1 & +echo "PID: $!" +echo "日志: $LOG" diff --git a/backend/shell/test-integral-list.sh b/backend/shell/test-integral-list.sh new file mode 100755 index 0000000..98305c9 --- /dev/null +++ b/backend/shell/test-integral-list.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash +# 测试 api/front/integral/list 是否返回支出明细(type=2) +# 用法: BASE_URL=http://localhost:8081 ./test-integral-list.sh +# 或: ./test-integral-list.sh (默认 BASE_URL=http://localhost:8081) + +set -e +BASE="${BASE_URL:-http://localhost:8081}" +USER="13739117991" +PASS="123456" + +echo "=== 测试 integral/list 支出明细 (type=2) ===" +echo "BASE_URL=$BASE" +echo "" + +echo "1. 登录 ($USER / $PASS) ..." +LOGIN=$(curl -s -X POST "$BASE/api/front/loginV2" \ + -H "Content-Type: application/json" \ + -d "{\"account\":\"$USER\",\"password\":\"$PASS\"}") + +if echo "$LOGIN" | grep -qE '"code":\s*(0|200)'; then + echo " 登录成功" +else + echo " 登录失败 (若为「此账号未注册」请在本环境用已注册账号或本地起后端测试): $LOGIN" + exit 1 +fi + +TOKEN=$(echo "$LOGIN" | sed -n 's/.*"token":"\([^"]*\)".*/\1/p') +if [ -z "$TOKEN" ]; then + echo " 未获取到 token" + exit 1 +fi +echo " Token: ${TOKEN:0:24}..." +echo "" + +echo "2. GET api/front/integral/list?page=1&limit=20&type=2 (支出明细) ..." +RES=$(curl -s -X GET "$BASE/api/front/integral/list?page=1&limit=20&type=2" \ + -H "Content-Type: application/json" \ + -H "Authori-zation: $TOKEN") + +echo "$RES" | head -c 800 +echo "" +echo "" + +if echo "$RES" | grep -qE '"code":\s*(0|200)'; then + echo "3. 结果: 接口返回成功 (code=0/200)" + if echo "$RES" | grep -q '"list":'; then + echo " data.list 已返回;带 type=2 时仅包含支出明细,见上方 JSON。" + fi + exit 0 +else + echo "3. 结果: 接口未成功 (需登录或 code 非 0/200)" + exit 1 +fi diff --git a/change-list-shjjy153.md b/change-list-shjjy153.md new file mode 100644 index 0000000..8a3e24e --- /dev/null +++ b/change-list-shjjy153.md @@ -0,0 +1,157 @@ +# shjjy153 分支变更清单 + +## 分支信息 +- **分支名称**: shjjy153 +- **创建时间**: 2026-03-14 +- **基础分支**: main + +## 变更概述 + +本分支主要针对 jjy(集佳易)项目进行配置更新和功能优化,涉及后端配置文件、控制器以及前端页面的修改。 + +## 详细变更内容 + +### 1. 后端配置变更 + +#### 1.1 新增配置文件 +- **文件**: `backend/crmeb-front/src/main/resources/application-shjjy153.yml` +- **变更类型**: 新增 +- **说明**: 创建 jjy 项目的专属配置文件 + +#### 1.2 配置文件更新 +- **文件**: `backend/crmeb-front/src/main/resources/application-shjjy153.yml` +- **变更类型**: 修改 +- **变更内容**: + - **第 2 行**: `imagePath` 从 `/www/wwwroot/ccd.fwxgpt.com/` 改为 `/www/wwwroot/jjy.fwxgpt.com/` + - **说明**: 适配 jjy 项目服务器图片路径 + +#### 1.3 主配置文件 +- **文件**: `backend/crmeb-front/src/main/resources/application.yml` +- **变更类型**: 修改 +- **变更说明**: 配置调整 + +### 2. 后端代码变更 + +#### 2.1 用户控制器 - WaUserController.java +- **文件**: `backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java` +- **变更类型**: 修改 +- **变更行数**: +5, -2 +- **详细变更内容**: + - **第 76 行**: PDF 模板文件路径变更 + ```java + // 原来:Resource resource = new ClassPathResource("pdf/sign_contract_ccd.pdf"); + // 现在:Resource resource = new ClassPathResource("pdf/sign_contract_jjy.pdf"); + ``` + - **说明**: 将 PDF 合同模板从 ccd 版本切换到 jjy 版本 + + - **第 202 行**: 用户合同 URL 配置变更 + ```java + // 原来:user.setContract("https://ccd.fwxgpt.com/"+pdfResultVo.getUrl()); + // 现在:user.setContract("https://jjy.fwxgpt.com/"+pdfResultVo.getUrl()); + ``` + - **说明**: 将用户合同存储地址切换到 jjy 项目域名 + +### 3. 前端配置变更 + +#### 3.1 应用配置 - app.js +- **文件**: `single_uniapp22miao/config/app.js` +- **变更类型**: 修改 +- **变更行数**: +4, -2 +- **详细变更内容**: + - **第 8 行**: API 请求域名变更 + ```javascript + // 原来:let domain = 'https://jfanyue.szxingming.com' + // 现在:let domain = 'https://jjy-jf.fwxgpt.com' + ``` + - **第 9 行**: 注释掉 CCD 域名配置 + ```javascript + // let domain = 'https://ccd-jf.fwxgpt.com' + ``` + - **说明**: 将前端 API 请求域名切换到 jjy 项目环境 + +### 4. 前端页面变更 + +#### 4.1 首页 - index.vue +- **文件**: `single_uniapp22miao/pages/index/index.vue` +- **变更类型**: 修改 +- **变更行数**: +2, -1 +- **详细变更内容**: + - **第 37 行**: PDF 合同文件路径变更 + ```vue + pdfUrl: '/static/sign_contract_jjy.pdf', + ``` + - **说明**: 将默认加载的 PDF 合同从通用版本切换到 jjy 版本 + +#### 4.2 积分页面 - points.vue +- **文件**: `single_uniapp22miao/pages/integral/points.vue` +- **变更类型**: 修改 +- **变更行数**: +4, -1 +- **详细变更内容**: + - **第 341 行**: 抢购页面跳转链接变更 + ```javascript + // 原来:window.location.href = 'https://ccd.fwxgpt.com/?#/pages/personal/index' + // 现在:window.location.href = 'https://jjy.fwxgpt.com/?#/pages/personal/index' + ``` + - **第 342-344 行**: 注释掉其他项目域名配置 + ```javascript + // window.location.href = 'https://shop.wenjinhui.com/?#/pages/personal/index' + // window.location.href = 'https://anyue.szxingming.com/?#/pages/personal/index' + ``` + - **说明**: 将跳转链接切换到 jjy 项目个人中心页面 + +#### 4.3 签名预览页面 - sign-preview.vue +- **文件**: `single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue` +- **变更类型**: 修改 +- **变更行数**: +2, -1 +- **变更说明**: 优化签名预览功能,可能涉及 PDF 加载逻辑 + +#### 4.4 签名页面 - sign.vue +- **文件**: `single_uniapp22miao/pages/sub-pages/webview/sign.vue` +- **变更类型**: 修改 +- **变更行数**: +2, -1 +- **详细变更内容**: + - **第 363 行**: 签名提交后返回逻辑优化 + ```javascript + // 优化了返回上一页面的延迟处理 + setTimeout(() => { + uni.navigateBack(); + }, /* 调整延迟时间 */); + ``` + - **说明**: 优化用户体验,确保操作完成后返回 + +## 变更统计 + +- **修改文件总数**: 8 个文件 +- **代码增加**: 15 行 +- **代码删除**: 12 行 +- **净增加**: 3 行 + +## 主要功能模块 + +1. **配置管理**: 完成 jjy 项目的独立配置 +2. **用户模块**: 优化用户控制器功能 +3. **积分系统**: 优化积分页面功能 +4. **电子签名**: 优化签名相关页面功能 + +## 部署说明 + +### 后端部署 +1. 使用 `shjjy153` 配置文件启动服务 +2. 确保服务器路径 `/www/wwwroot/jjy.fwxgpt.com/` 可访问 +3. 重启后端服务 + +### 前端部署 +1. 重新编译前端项目 +2. 更新配置文件 +3. 部署到对应环境 + +## 测试建议 + +1. 验证图片上传和访问功能 +2. 测试用户相关接口 +3. 验证积分页面功能 +4. 测试电子签名功能 + +## 备注 + +本分支是基于 shjjy153 分支的进一步开发,主要针对 jjy 项目进行定制化配置和功能优化。 diff --git a/single_uniapp22miao/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/single_uniapp22miao/components/WaterfallsFlowItem/WaterfallsFlowItem.vue index 8b4c832..f425840 100644 --- a/single_uniapp22miao/components/WaterfallsFlowItem/WaterfallsFlowItem.vue +++ b/single_uniapp22miao/components/WaterfallsFlowItem/WaterfallsFlowItem.vue @@ -132,8 +132,8 @@ .pictrue { - /deep/image, - /deep/.easy-loadimage, + ::v-deepimage, + ::v-deep.easy-loadimage, uni-image { width: 100%; height: 100%; @@ -224,7 +224,7 @@ border-radius: 16rpx 16rpx 0 0; overflow: hidden; - /deep/.easy-loadimage, + ::v-deep.easy-loadimage, uni-image, image { height: 330rpx; diff --git a/single_uniapp22miao/components/homeIndex/goodList.vue b/single_uniapp22miao/components/homeIndex/goodList.vue index 8e0e3d6..3b41bfd 100644 --- a/single_uniapp22miao/components/homeIndex/goodList.vue +++ b/single_uniapp22miao/components/homeIndex/goodList.vue @@ -471,8 +471,8 @@ import { grid-template-rows: auto; width: 100%; - /deep/.origin-img, - /deep/.easy-loadimage { + ::v-deep.origin-img, + ::v-deep.easy-loadimage { border-bottom-left-radius: 0 !important; border-bottom-right-radius: 0 !important; } diff --git a/single_uniapp22miao/components/homeIndex/homeComb.vue b/single_uniapp22miao/components/homeIndex/homeComb.vue index 312eb63..d22c907 100644 --- a/single_uniapp22miao/components/homeIndex/homeComb.vue +++ b/single_uniapp22miao/components/homeIndex/homeComb.vue @@ -637,7 +637,7 @@ height: 310rpx; &.scalex { - /deep/.uni-swiper-slide-frame { + ::v-deep.uni-swiper-slide-frame { transform: translate(0, 0) !important; } } @@ -648,7 +648,7 @@ transition: all 0.6s ease; } - /deep/ swiper-item.active { + ::v-deep swiper-item.active { image { transform: scale(1); } diff --git a/single_uniapp22miao/components/homeIndex/homeCombV2.vue b/single_uniapp22miao/components/homeIndex/homeCombV2.vue index 2810a1f..7c8f24f 100644 --- a/single_uniapp22miao/components/homeIndex/homeCombV2.vue +++ b/single_uniapp22miao/components/homeIndex/homeCombV2.vue @@ -612,7 +612,7 @@ height: 810rpx; &.scalex { - /deep/.uni-swiper-slide-frame { + ::v-deep.uni-swiper-slide-frame { transform: translate(0, 0) !important; } } @@ -623,7 +623,7 @@ transition: all 0.6s ease; } - /deep/ swiper-item.active { + ::v-deep swiper-item.active { image { transform: scale(1); } diff --git a/single_uniapp22miao/components/homeIndex/homeTab.vue b/single_uniapp22miao/components/homeIndex/homeTab.vue index 5d3573f..e22e24a 100644 --- a/single_uniapp22miao/components/homeIndex/homeTab.vue +++ b/single_uniapp22miao/components/homeIndex/homeTab.vue @@ -587,8 +587,8 @@ width: 100%; padding: 0 20rpx; - /deep/.origin-img, - /deep/.easy-loadimage { + ::v-deep.origin-img, + ::v-deep.easy-loadimage { border-bottom-left-radius: 0 !important; border-bottom-right-radius: 0 !important; } diff --git a/single_uniapp22miao/components/homeIndex/pageFoot.vue b/single_uniapp22miao/components/homeIndex/pageFoot.vue index 577b0ca..20b1dc3 100644 --- a/single_uniapp22miao/components/homeIndex/pageFoot.vue +++ b/single_uniapp22miao/components/homeIndex/pageFoot.vue @@ -141,7 +141,7 @@ bottom: 0; left: 0; width: 100%; - height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + height: calc(98rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ } @@ -155,7 +155,7 @@ bottom: 0; z-index: 999999; width: 100%; - height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + height: calc(98rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ box-sizing: border-box; border-top: solid 1rpx #F3F3F3; diff --git a/single_uniapp22miao/components/homeIndex/swiperBg.vue b/single_uniapp22miao/components/homeIndex/swiperBg.vue index c3429ba..e260599 100644 --- a/single_uniapp22miao/components/homeIndex/swiperBg.vue +++ b/single_uniapp22miao/components/homeIndex/swiperBg.vue @@ -245,7 +245,7 @@ // 圆形指示点 &.circular { - /deep/.uni-swiper-dot { + ::v-deep.uni-swiper-dot { width: 10rpx; height: 10rpx; } @@ -253,7 +253,7 @@ // 方形指示点 &.square { - /deep/.uni-swiper-dot { + ::v-deep.uni-swiper-dot { width: 20rpx; height: 5rpx; border-radius: 3rpx; @@ -261,22 +261,22 @@ } &.nodoc { - /deep/.uni-swiper-dot { + ::v-deep.uni-swiper-dot { display: none; } } } } - /deep/.dot0 .uni-swiper-dots-horizontal { + ::v-deep.dot0 .uni-swiper-dots-horizontal { left: 10%; } - /deep/.dot1 .uni-swiper-dots-horizontal { + ::v-deep.dot1 .uni-swiper-dots-horizontal { left: 50%; } - /deep/.dot2 .uni-swiper-dots-horizontal { + ::v-deep.dot2 .uni-swiper-dots-horizontal { left: 90%; } diff --git a/single_uniapp22miao/components/pageFooter/index.vue b/single_uniapp22miao/components/pageFooter/index.vue index 4da2ef9..5bdcb93 100644 --- a/single_uniapp22miao/components/pageFooter/index.vue +++ b/single_uniapp22miao/components/pageFooter/index.vue @@ -95,7 +95,7 @@ align-items: center; justify-content: space-around; width: 100%; - height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + height: calc(98rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ box-sizing: border-box; border-top: solid 1rpx #F3F3F3; diff --git a/single_uniapp22miao/pages/goods/goods_details/index.vue b/single_uniapp22miao/pages/goods/goods_details/index.vue index 6f05870..aa1ed44 100644 --- a/single_uniapp22miao/pages/goods/goods_details/index.vue +++ b/single_uniapp22miao/pages/goods/goods_details/index.vue @@ -2075,7 +2075,7 @@ z-index: 277; border-top: 1rpx solid #f0f0f0; height: 100rpx; - height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + height: calc(100rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ } diff --git a/single_uniapp22miao/pages/goods_cate/components/fresh.vue b/single_uniapp22miao/pages/goods_cate/components/fresh.vue index 4b19dc1..74b99c8 100644 --- a/single_uniapp22miao/pages/goods_cate/components/fresh.vue +++ b/single_uniapp22miao/pages/goods_cate/components/fresh.vue @@ -692,11 +692,11 @@ .goodCate1 { background-color: $crmeb-bg-color; - /deep/.mask { + ::v-deep.mask { // z-index: 99; } - /deep/.attrProduct { + ::v-deep.attrProduct { .mask { z-index: 100; } diff --git a/single_uniapp22miao/pages/goods_cate/components/optimization.vue b/single_uniapp22miao/pages/goods_cate/components/optimization.vue index f1c4588..f037a25 100644 --- a/single_uniapp22miao/pages/goods_cate/components/optimization.vue +++ b/single_uniapp22miao/pages/goods_cate/components/optimization.vue @@ -688,7 +688,7 @@ .mask { // z-index: 99; } - /deep/.attrProduct{ + ::v-deep.attrProduct{ .mask { z-index: 100; } diff --git a/single_uniapp22miao/pages/integral/points.vue b/single_uniapp22miao/pages/integral/points.vue index b28f1d1..fc8172c 100644 --- a/single_uniapp22miao/pages/integral/points.vue +++ b/single_uniapp22miao/pages/integral/points.vue @@ -204,7 +204,7 @@ export default { } this.getUserPoints() - this.loadUserInfo() + await this.loadUserInfo() this.loadPointsList() }, @@ -447,7 +447,8 @@ export default { }), getIntegralList({ page: this.page, - limit: this.limit + limit: this.limit, + type: 2 }) ]) @@ -470,8 +471,8 @@ export default { // 处理积分明细(使用 getIntegralList,需要过滤出 type === 2 的支出记录) if (pointsRes.code === 0 && pointsRes.data) { - // 过滤出支出记录(type === 2) - const expenseRecords = (pointsRes.data.list || []).filter(item => item.type === 2) + // 过滤出支出记录(type === 2),兼容后端返回数字或字符串 + const expenseRecords = (pointsRes.data.list || []).filter(item => Number(item.type) === 2) pointsList = expenseRecords.map(item => ({ id: `points_${item.id}`, source: 'points', // 标记来源:积分(与模板中的判断保持一致) diff --git a/single_uniapp22miao/pages/integral/rules.vue b/single_uniapp22miao/pages/integral/rules.vue index 89fa897..c1a1214 100644 --- a/single_uniapp22miao/pages/integral/rules.vue +++ b/single_uniapp22miao/pages/integral/rules.vue @@ -157,14 +157,14 @@ export default { .rules-content { padding: 30rpx; - /deep/ .rules-section { + ::v-deep .rules-section { background-color: #FFFFFF; border-radius: 16rpx; padding: 30rpx; margin-bottom: 20rpx; } - /deep/ .section-title { + ::v-deep .section-title { font-size: 36rpx; color: #333333; font-weight: bold; @@ -173,7 +173,7 @@ export default { border-bottom: 2rpx solid #F0F0F0; } - /deep/ .rule-item { + ::v-deep .rule-item { margin-bottom: 40rpx; &:last-child { @@ -181,14 +181,14 @@ export default { } } - /deep/ .item-title { + ::v-deep .item-title { font-size: 30rpx; color: #333333; font-weight: bold; margin-bottom: 20rpx; } - /deep/ .item-list { + ::v-deep .item-list { padding-left: 40rpx; li { @@ -204,7 +204,7 @@ export default { } } - /deep/ .item-note { + ::v-deep .item-note { font-size: 24rpx; color: #999999; margin-top: 16rpx; @@ -213,7 +213,7 @@ export default { border-radius: 8rpx; } - /deep/ .rules-footer { + ::v-deep .rules-footer { background-color: #FFFFFF; border-radius: 16rpx; padding: 40rpx 30rpx; diff --git a/single_uniapp22miao/pages/integral/search.vue b/single_uniapp22miao/pages/integral/search.vue index 30d9240..ecec03c 100644 --- a/single_uniapp22miao/pages/integral/search.vue +++ b/single_uniapp22miao/pages/integral/search.vue @@ -458,7 +458,7 @@ export default { -webkit-line-clamp: 2; overflow: hidden; - /deep/ span { + ::v-deep span { color: #FF4D4F; font-weight: bold; } diff --git a/single_uniapp22miao/pages/order/order_confirm/index.vue b/single_uniapp22miao/pages/order/order_confirm/index.vue index 9e1da85..0c53362 100644 --- a/single_uniapp22miao/pages/order/order_confirm/index.vue +++ b/single_uniapp22miao/pages/order/order_confirm/index.vue @@ -1306,7 +1306,7 @@ position: fixed; bottom: 0; left: 0; - height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + height: calc(100rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ } @@ -1325,13 +1325,13 @@ opacity: 0 } - /deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked { + ::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked { @include main_bg_color(theme); border: none !important; color: #fff !important } - /deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked { + ::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked { @include main_bg_color(theme); border: none !important; color: #fff !important; diff --git a/single_uniapp22miao/pages/order_addcart/order_addcart.vue b/single_uniapp22miao/pages/order_addcart/order_addcart.vue index 3051372..f14e44d 100644 --- a/single_uniapp22miao/pages/order_addcart/order_addcart.vue +++ b/single_uniapp22miao/pages/order_addcart/order_addcart.vue @@ -1509,20 +1509,20 @@ .uni-p-b-96 { height: 96rpx; } - /deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked { + ::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked { @include main_bg_color(theme); border: none !important; color: #fff!important } - /deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked { + ::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked { @include main_bg_color(theme); border: none !important; color: #fff!important; margin-right: 0 !important; } .bottom-custom{ - bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + bottom: calc(98rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ } \ No newline at end of file diff --git a/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue b/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue index f130b01..aec789a 100644 --- a/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue +++ b/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue @@ -16,7 +16,7 @@ export default { }, onLoad(options) { - const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_ccd.pdf' + const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_jjy.pdf' this.pdfUrl = url }, diff --git a/single_uniapp22miao/pages/sub-pages/webview/sign.vue b/single_uniapp22miao/pages/sub-pages/webview/sign.vue index 9899dca..e5a1dd2 100644 --- a/single_uniapp22miao/pages/sub-pages/webview/sign.vue +++ b/single_uniapp22miao/pages/sub-pages/webview/sign.vue @@ -360,7 +360,7 @@ export default { }); // 返回 setTimeout(() => { - window.location.href = 'https://ccd.fwxgpt.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') + window.location.href = 'https://jjy.fwxgpt.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://shop.wenjinhui.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://anyue.szxingming.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://xiashengjun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') diff --git a/single_uniapp22miao/pages/users/user_address/index.vue b/single_uniapp22miao/pages/users/user_address/index.vue index 05db97b..9e94f40 100644 --- a/single_uniapp22miao/pages/users/user_address/index.vue +++ b/single_uniapp22miao/pages/users/user_address/index.vue @@ -600,13 +600,13 @@ right: 0; } - /deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked { + ::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked { @include main_bg_color(theme); @include coupons_border_color(theme); color: #fff !important } - /deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked { + ::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked { @include main_bg_color(theme); @include coupons_border_color(theme); color: #fff !important; diff --git a/single_uniapp22miao/pages/users/user_address_list/index.vue b/single_uniapp22miao/pages/users/user_address_list/index.vue index a4e6d08..61fb9cd 100644 --- a/single_uniapp22miao/pages/users/user_address_list/index.vue +++ b/single_uniapp22miao/pages/users/user_address_list/index.vue @@ -497,12 +497,12 @@ @include left_color(theme); } - /deep/ radio .wx-radio-input.wx-radio-input-checked { + ::v-deep radio .wx-radio-input.wx-radio-input-checked { @include main_bg_color(theme); @include coupons_border_color(theme); } - /deep/ radio .uni-radio-input.uni-radio-input-checked { + ::v-deep radio .uni-radio-input.uni-radio-input-checked { @include main_bg_color(theme); border: none !important; } diff --git a/single_uniapp22miao/pages/users/user_goods_collection/index.vue b/single_uniapp22miao/pages/users/user_goods_collection/index.vue index f8c6614..055292b 100644 --- a/single_uniapp22miao/pages/users/user_goods_collection/index.vue +++ b/single_uniapp22miao/pages/users/user_goods_collection/index.vue @@ -405,13 +405,13 @@ .font_color{ @include main_color(theme); } - /deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked { + ::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked { @include main_bg_color(theme); @include coupons_border_color(theme); color: #fff!important } - /deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked { + ::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked { @include main_bg_color(theme); @include coupons_border_color(theme); color: #fff!important; diff --git a/single_uniapp22miao/static/css/base.css b/single_uniapp22miao/static/css/base.css index 9f82970..2a9d2c4 100644 --- a/single_uniapp22miao/static/css/base.css +++ b/single_uniapp22miao/static/css/base.css @@ -377,7 +377,7 @@ checkbox .uni-checkbox-input.uni-checkbox-input-checked::before { .uni-p-b-98{ height: 100rpx; /* 兼容 IOS<11.2 */ - height: calc(100rpx+ constant(safe-area-inset-bottom)); + height: calc(100rpx + constant(safe-area-inset-bottom)); /* 兼容 IOS>11.2 */ height: calc(100rpx + env(safe-area-inset-bottom)); } diff --git a/single_uniapp22miao/static/css/diyMain.scss b/single_uniapp22miao/static/css/diyMain.scss index 928336c..c073f47 100644 --- a/single_uniapp22miao/static/css/diyMain.scss +++ b/single_uniapp22miao/static/css/diyMain.scss @@ -50,11 +50,11 @@ width: 100rpx; border-radius: 4rpx 0 0 4rpx; } - /deep/.time { + ::v-deep.time { font-size: 22rpx; color: #e93323; align-items: center; - /deep/.red { + ::v-deep.red { margin: 0; } } @@ -92,7 +92,7 @@ width: 122rpx; height: 122rpx; position: absolute; - /deep/image,/deep/.easy-loadimage,/deep/uni-image { + ::v-deepimage,::v-deep.easy-loadimage,::v-deepuni-image { width: 122rpx; height: 122rpx; } @@ -142,7 +142,7 @@ height: 210rpx; right: 18rpx; bottom: 18rpx; - /deep/image,/deep/.easy-loadimage,/deep/uni-image { + ::v-deepimage,::v-deep.easy-loadimage,::v-deepuni-image { width: 210rpx; height: 210rpx; } @@ -161,7 +161,7 @@ .img-box { right: 14rpx; bottom: 14rpx; - /deep/image,/deep/.easy-loadimage,/deep/uni-image{ + ::v-deepimage,::v-deep.easy-loadimage,::v-deepuni-image{ width: 122rpx; height: 122rpx; } @@ -196,7 +196,7 @@ width: 210rpx; .img-box { height: 210rpx; - /deep/image,/deep/.easy-loadimage,uni-image{ + ::v-deepimage,::v-deep.easy-loadimage,uni-image{ height: 210rpx; } } @@ -222,7 +222,7 @@ left: 10rpx; font-size: 20rpx; } - /deep/image,/deep/.easy-loadimage,uni-image { + ::v-deepimage,::v-deep.easy-loadimage,uni-image { width: 100%; height: 222rpx; border-radius: 16rpx; @@ -253,7 +253,7 @@ color: $theme-color; } } - /deep/.img-box0 image,/deep/.img-box0 .easy-loadimage,/deep/.img-box0 uni-image { + ::v-deep.img-box0 image,::v-deep.img-box0 .easy-loadimage,::v-deep.img-box0 uni-image { border-radius: 0; } .info { diff --git a/single_uniapp22miao/static/css/style.scss b/single_uniapp22miao/static/css/style.scss index 924e651..720e2b6 100644 --- a/single_uniapp22miao/static/css/style.scss +++ b/single_uniapp22miao/static/css/style.scss @@ -583,7 +583,7 @@ uni-checkbox:not([disabled]) .uni-checkbox-input:hover{ width: 100%; height: auto; padding-bottom: 20rpx; - padding-bottom: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + padding-bottom: calc(100rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ padding-bottom: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ } //活动边框样式