diff --git a/admin/.browserslistrc b/admin/.browserslistrc index 669db34..cac3fac 100644 --- a/admin/.browserslistrc +++ b/admin/.browserslistrc @@ -1,4 +1,3 @@ > 1% last 2 versions -Chrome >= 63 -not dead +not ie <= 9 diff --git a/admin/.env b/admin/.env index 1f78438..c6f2eea 100644 --- a/admin/.env +++ b/admin/.env @@ -1,3 +1,2 @@ -VUE_APP_NAME='' -VUE_APP_API_BASE_URL=https://market.liche.cn/api -#npm run build 加载环境 \ No newline at end of file +VUE_APP_NAME=Ele Admin +VUE_APP_API_BASE_URL=https://v2.eleadmin.com/api diff --git a/admin/.env.development b/admin/.env.development index 2ae4acf..89af61d 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -1,2 +1 @@ -VUE_APP_API_BASE_URL=http://market.lc.haodian.cn/api -#npm run serve 加载环境 +VUE_APP_API_BASE_URL=http://agent.admin.haodian.cn/api diff --git a/admin/.env.preview b/admin/.env.preview index 5ed0bc1..340d0d1 100644 --- a/admin/.env.preview +++ b/admin/.env.preview @@ -1,3 +1,2 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=https://market.liche.cn/api -npm run build:preview 加载环境 \ No newline at end of file +VUE_APP_API_BASE_URL=https://v2.eleadmin.com/api diff --git a/admin/README.md b/admin/README.md index 63e2619..9973043 100644 --- a/admin/README.md +++ b/admin/README.md @@ -1,74 +1,29 @@ -技术文档 -https://eleadmin.com/doc/eleadmin/#/ +# ele-admin-template -1.2.安装运行 -# 先安装依赖 +## Project setup + +``` npm install +``` -# 访问国外网站比较慢的用户可以在后面加--registry -npm install --registry=https://registry.npmmirror.com +### Compiles and hot-reloads for development -# 运行项目 +``` npm run serve +``` -下载产品时可查看自己的产品授权码并复制,然后需要在 src/config/setting.js 中配置,永久授权用户的授权码没有域名和时长的限制: +### Compiles and minifies for production -// EleAdmin 授权码 -export const LICENSE_CODE = '这里换成你的授权码'; // 在 main.js 的 Vue.use(EleAdmin, {}) 时引用了此配置 +``` +npm run build +``` -v1.10.0 授权码 dk9mcwJyetRWQlxWRiojIqJWdzJCLi4Wa4QDN5ojI0NWZIVnI6ICZpJCLiwiI3VkUMNVa6Iibvl2cyVmdQfiATMuEjI0NW== +### Lints and fixes files +``` +npm run lint +``` -安装nodejs -https://nodejs.org/en/ +### Customize configuration -升级npm -npm install -g npm - - -tinymce编辑器参数设置 -tinymce.init({ - selector: '#tinydemo2', - //skin:'oxide-dark', - language:'zh_CN', - plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave bdmap indent2em autoresize formatpainter axupimgs', - toolbar: 'code undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | \ - styleselect formatselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \ - table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | bdmap indent2em lineheight formatpainter axupimgs', - height: 650, //编辑器高度 - min_height: 400, - /*content_css: [ //可设置编辑区内容展示的css,谨慎使用 - '/static/reset.css', - '/static/ax.css', - '/static/css.css', - ],*/ - fontsize_formats: '12px 14px 16px 18px 24px 36px 48px 56px 72px', - font_formats: '微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;', - link_list: [ - { title: '预置链接1', value: 'http://www.tinymce.com' }, - { title: '预置链接2', value: 'http://tinymce.ax-z.cn' } - ], - image_list: [ - { title: '预置图片1', value: 'https://www.tiny.cloud/images/glyph-tinymce@2x.png' }, - { title: '预置图片2', value: 'https://www.baidu.com/img/bd_logo1.png' } - ], - image_class_list: [ - { title: 'None', value: '' }, - { title: 'Some class', value: 'class-name' } - ], - importcss_append: true, - //自定义文件选择器的回调内容 - file_picker_callback: function (callback, value, meta) { - if (meta.filetype === 'file') { - callback('https://www.baidu.com/img/bd_logo1.png', { text: 'My text' }); - } - if (meta.filetype === 'image') { - callback('https://www.baidu.com/img/bd_logo1.png', { alt: 'My alt text' }); - } - if (meta.filetype === 'media') { - callback('movie.mp4', { source2: 'alt.ogg', poster: 'https://www.baidu.com/img/bd_logo1.png' }); - } - }, - toolbar_sticky: true, - autosave_ask_before_unload: false, -}); \ No newline at end of file +See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/admin/exclude.list b/admin/exclude.list deleted file mode 100644 index 7da99cc..0000000 --- a/admin/exclude.list +++ /dev/null @@ -1,22 +0,0 @@ -/sh -/sql -/node_modules -.svn -.git - -.DS_Store -.env.local -.env.*.local -npm-debug.log* -yarn-debug.log* -yarn-error.log* -.pnpm-debug.log -.eslintcache - -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? \ No newline at end of file diff --git a/admin/package-lock.json b/admin/package-lock.json index d3d164a..9405c52 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -1,12 +1,12 @@ { "name": "ele-admin-template", - "version": "1.10.1", + "version": "1.11.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ele-admin-template", - "version": "1.10.1", + "version": "1.11.3", "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", "@ant-design/colors": "^6.0.0", @@ -20,7 +20,7 @@ "cropperjs": "^1.5.12", "echarts": "^5.3.3", "echarts-wordcloud": "^2.0.0", - "ele-admin": "^1.10.1", + "ele-admin": "^1.11.3", "element-ui": "2.15.7", "github-markdown-css": "^5.1.0", "jsbarcode": "^3.11.5", @@ -5080,9 +5080,9 @@ "dev": true }, "node_modules/ele-admin": { - "version": "1.10.1", - "resolved": "https://registry.npmmirror.com/ele-admin/-/ele-admin-1.10.1.tgz", - "integrity": "sha512-M+wpSbyzyF8H27iXRvscq8Gm+wNKPe+rS+sI3ZGBVUJ5AMvu92XUe1KnvUjG+4eD7sQ59nLI810VLYroruD7jg==", + "version": "1.11.3", + "resolved": "https://registry.npmmirror.com/ele-admin/-/ele-admin-1.11.3.tgz", + "integrity": "sha512-1ndKGyGVldR5fSUX/qNLmxWOIcjCxbU9OJp84TKJEuJTal87ZWAOLO0or4LNVVxh0Z0JTEkUdvkwcwOruvaxyg==", "peerDependencies": { "element-ui": ">=2.15.4", "vue": ">=2.6.0 <3.0.0" @@ -16443,9 +16443,9 @@ "dev": true }, "ele-admin": { - "version": "1.10.1", - "resolved": "https://registry.npmmirror.com/ele-admin/-/ele-admin-1.10.1.tgz", - "integrity": "sha512-M+wpSbyzyF8H27iXRvscq8Gm+wNKPe+rS+sI3ZGBVUJ5AMvu92XUe1KnvUjG+4eD7sQ59nLI810VLYroruD7jg==", + "version": "1.11.3", + "resolved": "https://registry.npmmirror.com/ele-admin/-/ele-admin-1.11.3.tgz", + "integrity": "sha512-1ndKGyGVldR5fSUX/qNLmxWOIcjCxbU9OJp84TKJEuJTal87ZWAOLO0or4LNVVxh0Z0JTEkUdvkwcwOruvaxyg==", "requires": {} }, "electron-to-chromium": { diff --git a/admin/package.json b/admin/package.json index ac40acc..99d1bc4 100644 --- a/admin/package.json +++ b/admin/package.json @@ -1,6 +1,6 @@ { "name": "ele-admin-template", - "version": "1.10.1", + "version": "1.11.3", "private": true, "scripts": { "dev": "vue-cli-service serve", @@ -24,7 +24,7 @@ "cropperjs": "^1.5.12", "echarts": "^5.3.3", "echarts-wordcloud": "^2.0.0", - "ele-admin": "^1.10.1", + "ele-admin": "^1.11.3", "element-ui": "2.15.7", "github-markdown-css": "^5.1.0", "jsbarcode": "^3.11.5", diff --git a/admin/prettier.config.js b/admin/prettier.config.js index c8ba024..33ad45b 100644 --- a/admin/prettier.config.js +++ b/admin/prettier.config.js @@ -15,5 +15,5 @@ module.exports = { proseWrap: 'never', htmlWhitespaceSensitivity: 'strict', vueIndentScriptAndStyle: true, - endOfLine: 'auto' + endOfLine: 'lf' }; diff --git a/admin/public/ele-file-list/ic_file_android.png b/admin/public/ele-file-list/ic_file_android.png new file mode 100644 index 0000000..08de045 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_android.png differ diff --git a/admin/public/ele-file-list/ic_file_android_sm.png b/admin/public/ele-file-list/ic_file_android_sm.png new file mode 100644 index 0000000..4442119 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_android_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_bt.png b/admin/public/ele-file-list/ic_file_bt.png new file mode 100644 index 0000000..909255c Binary files /dev/null and b/admin/public/ele-file-list/ic_file_bt.png differ diff --git a/admin/public/ele-file-list/ic_file_bt_sm.png b/admin/public/ele-file-list/ic_file_bt_sm.png new file mode 100644 index 0000000..4e9aa96 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_bt_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_cad.png b/admin/public/ele-file-list/ic_file_cad.png new file mode 100644 index 0000000..456943c Binary files /dev/null and b/admin/public/ele-file-list/ic_file_cad.png differ diff --git a/admin/public/ele-file-list/ic_file_cad_sm.png b/admin/public/ele-file-list/ic_file_cad_sm.png new file mode 100644 index 0000000..e03193e Binary files /dev/null and b/admin/public/ele-file-list/ic_file_cad_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_code.png b/admin/public/ele-file-list/ic_file_code.png new file mode 100644 index 0000000..6279b2c Binary files /dev/null and b/admin/public/ele-file-list/ic_file_code.png differ diff --git a/admin/public/ele-file-list/ic_file_code_sm.png b/admin/public/ele-file-list/ic_file_code_sm.png new file mode 100644 index 0000000..c39d65f Binary files /dev/null and b/admin/public/ele-file-list/ic_file_code_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_excel.png b/admin/public/ele-file-list/ic_file_excel.png new file mode 100644 index 0000000..20e6b2d Binary files /dev/null and b/admin/public/ele-file-list/ic_file_excel.png differ diff --git a/admin/public/ele-file-list/ic_file_excel_sm.png b/admin/public/ele-file-list/ic_file_excel_sm.png new file mode 100644 index 0000000..59012f1 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_excel_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_exe.png b/admin/public/ele-file-list/ic_file_exe.png new file mode 100644 index 0000000..a754581 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_exe.png differ diff --git a/admin/public/ele-file-list/ic_file_exe_sm.png b/admin/public/ele-file-list/ic_file_exe_sm.png new file mode 100644 index 0000000..584892d Binary files /dev/null and b/admin/public/ele-file-list/ic_file_exe_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_flash.png b/admin/public/ele-file-list/ic_file_flash.png new file mode 100644 index 0000000..dc60dd7 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_flash.png differ diff --git a/admin/public/ele-file-list/ic_file_flash_sm.png b/admin/public/ele-file-list/ic_file_flash_sm.png new file mode 100644 index 0000000..d6c4e59 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_flash_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_folder.png b/admin/public/ele-file-list/ic_file_folder.png new file mode 100644 index 0000000..c60a935 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_folder.png differ diff --git a/admin/public/ele-file-list/ic_file_folder_sm.png b/admin/public/ele-file-list/ic_file_folder_sm.png new file mode 100644 index 0000000..5475f5b Binary files /dev/null and b/admin/public/ele-file-list/ic_file_folder_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_fonts.png b/admin/public/ele-file-list/ic_file_fonts.png new file mode 100644 index 0000000..e757c99 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_fonts.png differ diff --git a/admin/public/ele-file-list/ic_file_fonts_sm.png b/admin/public/ele-file-list/ic_file_fonts_sm.png new file mode 100644 index 0000000..bae84b9 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_fonts_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_htm.png b/admin/public/ele-file-list/ic_file_htm.png new file mode 100644 index 0000000..264f1b4 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_htm.png differ diff --git a/admin/public/ele-file-list/ic_file_htm_sm.png b/admin/public/ele-file-list/ic_file_htm_sm.png new file mode 100644 index 0000000..2246728 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_htm_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_ipa.png b/admin/public/ele-file-list/ic_file_ipa.png new file mode 100644 index 0000000..71612bc Binary files /dev/null and b/admin/public/ele-file-list/ic_file_ipa.png differ diff --git a/admin/public/ele-file-list/ic_file_ipa_sm.png b/admin/public/ele-file-list/ic_file_ipa_sm.png new file mode 100644 index 0000000..7d2e591 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_ipa_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_misc.png b/admin/public/ele-file-list/ic_file_misc.png new file mode 100644 index 0000000..acf4dc2 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_misc.png differ diff --git a/admin/public/ele-file-list/ic_file_misc_sm.png b/admin/public/ele-file-list/ic_file_misc_sm.png new file mode 100644 index 0000000..aa2c12f Binary files /dev/null and b/admin/public/ele-file-list/ic_file_misc_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_music.png b/admin/public/ele-file-list/ic_file_music.png new file mode 100644 index 0000000..0343055 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_music.png differ diff --git a/admin/public/ele-file-list/ic_file_music_sm.png b/admin/public/ele-file-list/ic_file_music_sm.png new file mode 100644 index 0000000..20c2117 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_music_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_pdf.png b/admin/public/ele-file-list/ic_file_pdf.png new file mode 100644 index 0000000..1944f1e Binary files /dev/null and b/admin/public/ele-file-list/ic_file_pdf.png differ diff --git a/admin/public/ele-file-list/ic_file_pdf_sm.png b/admin/public/ele-file-list/ic_file_pdf_sm.png new file mode 100644 index 0000000..a180b05 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_pdf_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_picture.png b/admin/public/ele-file-list/ic_file_picture.png new file mode 100644 index 0000000..e62922e Binary files /dev/null and b/admin/public/ele-file-list/ic_file_picture.png differ diff --git a/admin/public/ele-file-list/ic_file_picture_sm.png b/admin/public/ele-file-list/ic_file_picture_sm.png new file mode 100644 index 0000000..076d2ad Binary files /dev/null and b/admin/public/ele-file-list/ic_file_picture_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_ppt.png b/admin/public/ele-file-list/ic_file_ppt.png new file mode 100644 index 0000000..deefc6e Binary files /dev/null and b/admin/public/ele-file-list/ic_file_ppt.png differ diff --git a/admin/public/ele-file-list/ic_file_ppt_sm.png b/admin/public/ele-file-list/ic_file_ppt_sm.png new file mode 100644 index 0000000..6f14287 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_ppt_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_ps.png b/admin/public/ele-file-list/ic_file_ps.png new file mode 100644 index 0000000..548fee4 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_ps.png differ diff --git a/admin/public/ele-file-list/ic_file_ps_sm.png b/admin/public/ele-file-list/ic_file_ps_sm.png new file mode 100644 index 0000000..3358eb7 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_ps_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_text.png b/admin/public/ele-file-list/ic_file_text.png new file mode 100644 index 0000000..265f9ff Binary files /dev/null and b/admin/public/ele-file-list/ic_file_text.png differ diff --git a/admin/public/ele-file-list/ic_file_text_sm.png b/admin/public/ele-file-list/ic_file_text_sm.png new file mode 100644 index 0000000..f55b602 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_text_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_video.png b/admin/public/ele-file-list/ic_file_video.png new file mode 100644 index 0000000..2487c7c Binary files /dev/null and b/admin/public/ele-file-list/ic_file_video.png differ diff --git a/admin/public/ele-file-list/ic_file_video_sm.png b/admin/public/ele-file-list/ic_file_video_sm.png new file mode 100644 index 0000000..fe45337 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_video_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_visio.png b/admin/public/ele-file-list/ic_file_visio.png new file mode 100644 index 0000000..34728a5 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_visio.png differ diff --git a/admin/public/ele-file-list/ic_file_visio_sm.png b/admin/public/ele-file-list/ic_file_visio_sm.png new file mode 100644 index 0000000..c158664 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_visio_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_word.png b/admin/public/ele-file-list/ic_file_word.png new file mode 100644 index 0000000..3ed0c88 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_word.png differ diff --git a/admin/public/ele-file-list/ic_file_word_sm.png b/admin/public/ele-file-list/ic_file_word_sm.png new file mode 100644 index 0000000..03a8b05 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_word_sm.png differ diff --git a/admin/public/ele-file-list/ic_file_zip.png b/admin/public/ele-file-list/ic_file_zip.png new file mode 100644 index 0000000..eddd297 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_zip.png differ diff --git a/admin/public/ele-file-list/ic_file_zip_sm.png b/admin/public/ele-file-list/ic_file_zip_sm.png new file mode 100644 index 0000000..58a0298 Binary files /dev/null and b/admin/public/ele-file-list/ic_file_zip_sm.png differ diff --git a/admin/public/favicon.ico b/admin/public/favicon.ico index d1ba6be..bac3b38 100644 Binary files a/admin/public/favicon.ico and b/admin/public/favicon.ico differ diff --git a/admin/public/favicon_df.ico b/admin/public/favicon_df.ico deleted file mode 100644 index b348d44..0000000 Binary files a/admin/public/favicon_df.ico and /dev/null differ diff --git a/admin/public/favicon_hd.ico b/admin/public/favicon_hd.ico deleted file mode 100644 index d1ba6be..0000000 Binary files a/admin/public/favicon_hd.ico and /dev/null differ diff --git a/admin/public/favicon_liche.ico b/admin/public/favicon_liche.ico deleted file mode 100644 index dd3688a..0000000 Binary files a/admin/public/favicon_liche.ico and /dev/null differ diff --git a/admin/public/index.html b/admin/public/index.html index 89aa9b3..bf363df 100644 --- a/admin/public/index.html +++ b/admin/public/index.html @@ -50,28 +50,6 @@ position: fixed; } -