From 6ecb6b805502c9df350a57eb9ee29289027de64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Mon, 22 Nov 2021 11:16:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E7=AB=AFnpmrc=E9=85=8D=E7=BD=AE=20=20=E5=90=8E?= =?UTF-8?q?=E7=BB=AD=E8=BF=98=E4=BC=9A=E6=96=B0=E5=A2=9Eyarnrc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/config/index.js | 6 +- manager/src/config/index.js | 28 +---- manager/src/libs/table2excel.js | 100 ------------------ manager/src/libs/zh.json | 20 ---- manager/src/styles/table-common.scss | 5 +- manager/src/styles/tree-common.scss | 4 - manager/src/views/order/order/orderDetail.vue | 4 - .../src/views/sys/oss-manage/ossManage.vue | 2 +- seller/.npmrc | 5 + seller/.yarnrc | 0 seller/src/config/index.js | 21 +--- seller/src/libs/eventBus.js | 3 - seller/src/libs/routerJson.js | 4 + seller/src/libs/zh.json | 20 ---- .../views/promotion/pintuan/pintuanGoods.vue | 2 +- 15 files changed, 18 insertions(+), 206 deletions(-) delete mode 100644 manager/src/libs/table2excel.js delete mode 100644 manager/src/libs/zh.json create mode 100644 seller/.npmrc create mode 100644 seller/.yarnrc delete mode 100644 seller/src/libs/eventBus.js delete mode 100644 seller/src/libs/zh.json diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index c4ec7c50..17a6b2f3 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -16,11 +16,7 @@ module.exports = { * @description icp备案号 */ icpMessage: "京ICP备20009696号-1", - /** - * @description token在Cookie中存储的天数，默认1天 - */ - cookieExpires: 1, - /** + /** * @description 是否使用国际化，默认为false * 如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'} * 用来在菜单中显示文字 diff --git a/manager/src/config/index.js b/manager/src/config/index.js index a35d0cc8..a4299efc 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -4,33 +4,11 @@ export default { */ title: "lilishop", /** - * @description token在Cookie中存储的天数，默认1天 - */ - cookieExpires: 1, - /** - * @description 是否使用国际化，默认为false - * 如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'} - * 用来在菜单中显示文字 - */ - useI18n: true, - /** - * @description api请求基础路径 - */ - /** * @description 高德web端申请的api key */ - aMapKey: "b440952723253aa9fe483e698057bf7d", - /** - * @description 官网地址 - */ - website: "https://www.pickmall.cn", + aMapKey: "b440952723253aa9fe483e698057bf7d", /** - * @description 需要加载的插件 + * @description 官网地址 */ - plugin: { - "error-store": { - showInHeader: true, // 设为false后不会在顶部显示错误日志徽标 - developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误 - } - } + website: "https://www.pickmall.cn", }; diff --git a/manager/src/libs/table2excel.js b/manager/src/libs/table2excel.js deleted file mode 100644 index 1569a9fd..00000000 --- a/manager/src/libs/table2excel.js +++ /dev/null @@ -1,100 +0,0 @@ -var idTmr; -function getExplorer () { - var explorer = window.navigator.userAgent; - if (explorer.indexOf('MSIE') >= 0) { - // ie - return 'ie'; - } else if (explorer.indexOf('Firefox') >= 0) { - // firefox - return 'Firefox'; - } else if (explorer.indexOf('Chrome') >= 0) { - // Chrome - return 'Chrome'; - } else if (explorer.indexOf('Opera') >= 0) { - // Opera - return 'Opera'; - } else if (explorer.indexOf('Safari') >= 0) { - // Safari - return 'Safari'; - }; -}; -function tranform (table, aId, name) { - let tableHead = table.$children[0].$el; - let tableBody = table.$children[1].$el; - let tableInnerHTML = ''; - if (table.$children.length !== 1) { - let len = tableBody.rows.length; - let i = -1; - while (i < len) { - if (i == -1) { - Array.from(tableHead.rows[0].children).forEach((td) => { - tableInnerHTML = tableInnerHTML + '' + td.children[0].children[0].innerHTML + ''; - }); - tableInnerHTML += ''; - } else { - tableInnerHTML += ''; - Array.from(tableBody.rows[i].children).forEach((td) => { - tableInnerHTML = tableInnerHTML + '' + td.children[0].children[0].innerHTML + ''; - }); - tableInnerHTML += ''; - } - i++; - } - tableInnerHTML += ''; - } - - if (getExplorer() !== 'Safari' && name.substr(-1, 4) !== '.xls') { - name += '.xls'; - } - - if (getExplorer() == 'ie') { - var curTbl = table; - var oXL = new ActiveXObject('Excel.Application'); - var oWB = oXL.Workbooks.Add(); - var xlsheet = oWB.Worksheets(1); - var sel = document.body.createTextRange(); - sel.moveToElementText(curTbl); - sel.select(); - sel.execCommand('Copy'); - xlsheet.Paste(); - oXL.Visible = true; - - try { - var fname = oXL.Application.GetSaveAsFilename('Excel.xls', 'Excel Spreadsheets (*.xls), *.xls'); - } catch (e) { - print('Nested catch caught ' + e); - } finally { - oWB.SaveAs(fname); - // oWB.Close(savechanges = false); - oXL.Quit(); - oXL = null; - idTmr = setInterval(Cleanup(), 1); - } - } else { - tableToExcel(tableInnerHTML, aId, name); - } -} -function Cleanup () { - window.clearInterval(idTmr); - // CollectGarbage(); -} -let tableToExcel = (function () { - let uri = 'data:application/vnd.ms-excel;base64,'; - let template = '{table}
'; - let base64 = function (s) { return window.btoa(unescape(encodeURIComponent(s))); }; - let format = function (s, c) { - return s.replace(/{(\w+)}/g, function (m, p) { return c[p]; }); - }; - return function (table, aId, name) { - let ctx = {worksheet: name || 'Worksheet', table: table}; - document.getElementById(aId).href = uri + base64(format(template, ctx)); - document.getElementById(aId).download = name; - document.getElementById(aId).click(); - }; -})(); - -const table2excel = {}; - -table2excel.transform = tranform; - -export default table2excel; diff --git a/manager/src/libs/zh.json b/manager/src/libs/zh.json deleted file mode 100644 index 70dcf56b..00000000 --- a/manager/src/libs/zh.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "zh", - "options": { - "months": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], - "shortMonths": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], - "days": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"], - "shortDays": ["周日", "周一", "周二", "周三", "周四", "周五", "周六"], - "toolbar": { - "exportToSVG": "下载图表 SVG", - "exportToPNG": "下载图表 PNG", - "menu": "菜单", - "selection": "选择", - "selectionZoom": "区域缩放", - "zoomIn": "缩小", - "zoomOut": "放大", - "pan": "移动", - "reset": "重置缩放" - } - } - } \ No newline at end of file diff --git a/manager/src/styles/table-common.scss b/manager/src/styles/table-common.scss index ccce9a12..2720eafe 100644 --- a/manager/src/styles/table-common.scss +++ b/manager/src/styles/table-common.scss @@ -3,10 +3,7 @@ margin-bottom: 2vh; } - .select-count { - font-weight: 600; - color: #40a9ff; - } + .select-clear { margin-left: 10px; diff --git a/manager/src/styles/tree-common.scss b/manager/src/styles/tree-common.scss index a8326c56..5605db29 100644 --- a/manager/src/styles/tree-common.scss +++ b/manager/src/styles/tree-common.scss @@ -3,10 +3,6 @@ margin-bottom: 2vh; } - .select-title { - font-weight: 600; - color: #40a9ff; - } .select-clear { margin-left: 10px; diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index 1fba9dcd..b40d6bb1 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -657,10 +657,6 @@ export default { margin-bottom: 2vh; } - .select-count { - font-weight: 600; - color: #40a9ff; - } .select-clear { margin-left: 10px; diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue index ff2b7a13..d8d2b09c 100644 --- a/manager/src/views/sys/oss-manage/ossManage.vue +++ b/manager/src/views/sys/oss-manage/ossManage.vue @@ -103,7 +103,7 @@ 已选择 - {{ selectCount }} 项 + {{ selectCount }} 项 清空 共计 {{ totalSize }} 存储量 - 已选择 {{ selectCount }} 项 + 已选择 {{ selectCount }} 项 清空