From d55d53528eafd4533ee248d15e5dbecafece1331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 3 Jun 2021 11:47:34 +0800 Subject: [PATCH] c --- manager/src/api/promotion.js | 245 ++++--- manager/src/config/index.js | 12 +- manager/src/router/router.js | 6 + manager/src/utils/filters.js | 68 +- .../distribution/distributionSetting.vue | 114 +-- manager/src/views/live/live.vue | 249 +++++++ manager/src/views/live/liveDetail.vue | 300 ++++++++ manager/src/views/order/order/orderList.vue | 78 ++- .../src/views/promotion/seckill/seckill.vue | 9 +- manager/src/views/statistics/traffic.vue | 8 +- .../_downloadjs@1.4.7@downloadjs/LICENSE.md | 21 + .../_downloadjs@1.4.7@downloadjs/README.md | 123 ++++ .../_downloadjs@1.4.7@downloadjs/download.js | 167 +++++ .../download.min.js | 2 + .../_downloadjs@1.4.7@downloadjs/package.json | 42 ++ .../JsonExcel.vue | 360 ++++++++++ .../LICENSE | 21 + .../README.md | 321 +++++++++ .../dist/vue-json-excel.cjs.js | 654 +++++++++++++++++ .../dist/vue-json-excel.esm.js | 652 +++++++++++++++++ .../dist/vue-json-excel.umd.js | 660 ++++++++++++++++++ .../example-multi-line.png | Bin 0 -> 12028 bytes .../node_modules/downloadjs | 1 + .../package.json | 47 ++ .../rollup.config.js | 27 + node_modules/downloadjs | 1 + node_modules/vue-json-excel | 1 + package.json | 5 + seller/src/api/promotion.js | 32 +- seller/src/config/index.js | 8 +- seller/src/views/goods/goods-seller/goods.vue | 3 + seller/src/views/promotion/live/addLive.vue | 324 ++++++++- seller/src/views/promotion/live/live.vue | 181 +++-- seller/src/views/promotion/live/liveGoods.vue | 293 ++++++-- .../src/views/promotion/seckill/seckill.vue | 81 +-- seller/src/views/statistics/order.vue | 58 +- seller/src/views/statistics/traffic.vue | 5 +- 37 files changed, 4760 insertions(+), 419 deletions(-) create mode 100644 manager/src/views/live/live.vue create mode 100644 manager/src/views/live/liveDetail.vue create mode 100644 node_modules/_downloadjs@1.4.7@downloadjs/LICENSE.md create mode 100644 node_modules/_downloadjs@1.4.7@downloadjs/README.md create mode 100644 node_modules/_downloadjs@1.4.7@downloadjs/download.js create mode 100644 node_modules/_downloadjs@1.4.7@downloadjs/download.min.js create mode 100644 node_modules/_downloadjs@1.4.7@downloadjs/package.json create mode 100755 node_modules/_vue-json-excel@0.3.0@vue-json-excel/JsonExcel.vue create mode 100755 node_modules/_vue-json-excel@0.3.0@vue-json-excel/LICENSE create mode 100755 node_modules/_vue-json-excel@0.3.0@vue-json-excel/README.md create mode 100755 node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.cjs.js create mode 100755 node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.esm.js create mode 100755 node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.umd.js create mode 100755 node_modules/_vue-json-excel@0.3.0@vue-json-excel/example-multi-line.png create mode 120000 node_modules/_vue-json-excel@0.3.0@vue-json-excel/node_modules/downloadjs create mode 100644 node_modules/_vue-json-excel@0.3.0@vue-json-excel/package.json create mode 100755 node_modules/_vue-json-excel@0.3.0@vue-json-excel/rollup.config.js create mode 120000 node_modules/downloadjs create mode 120000 node_modules/vue-json-excel create mode 100644 package.json diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js index 4fd81dfd..517a9ed8 100644 --- a/manager/src/api/promotion.js +++ b/manager/src/api/promotion.js @@ -1,174 +1,197 @@ // 统一请求路径前缀在libs/axios.js中修改 -import { getRequest, postRequest, putRequest, deleteRequest } from '@/libs/axios'; - - +import { + getRequest, + postRequest, + putRequest, + deleteRequest +} from "@/libs/axios"; // 获取限时抢购申请列表 -export const getPromotionSeckill = (params) => { +export const getPromotionSeckill = params => { + return getRequest(`/promotion/seckill/apply`, params); +}; - return getRequest(`/promotion/seckill/apply`, params) -} +// 是否推荐直播间 +export const whetherStar = params => { + return getRequest(`/broadcast/studio/id/${params.id}&recommend=${params.recommend}`); +}; + +// 获取店铺直播间列表 +export const getLiveList = params => { + return getRequest("/broadcast/studio", params); +}; + +// 获取直播间详情 +export const getLiveInfo = studioId => { + return getRequest(`/broadcast/studio/studioInfo/${studioId}`); +}; // 获取当前进行中的促销活动商品 -export const getPromotionGoods = (promotionId,params) => { - return getRequest(`/promotion/${promotionId}/goods`, params) -} +export const getPromotionGoods = (promotionId, params) => { + return getRequest(`/promotion/${promotionId}/goods`, params); +}; // 获取当前进行中的促销活动 -export const getAllPromotion = (params) => { - return getRequest('/promotion/current', params) -} +export const getAllPromotion = params => { + return getRequest("/promotion/current", params); +}; // 获取拼团数据 -export const getPintuanList = (params) => { - return getRequest('/promotion/pintuan', params) -} +export const getPintuanList = params => { + return getRequest("/promotion/pintuan", params); +}; // 获取拼团详情 -export const getPintuanDetail = (id) => { - return getRequest(`/promotion/pintuan/${id}`) -} +export const getPintuanDetail = id => { + return getRequest(`/promotion/pintuan/${id}`); +}; // 获取拼团商品数据 -export const getPintuanGoodsList = (params) => { - return getRequest(`/promotion/pintuan/goods/${params.pintuanId}`,params) -} +export const getPintuanGoodsList = params => { + return getRequest(`/promotion/pintuan/goods/${params.pintuanId}`, params); +}; // 关闭拼团活动 -export const closePintuan = (pintuanId) => { - return putRequest(`/promotion/pintuan/close/${pintuanId}`) -} +export const closePintuan = pintuanId => { + return putRequest(`/promotion/pintuan/close/${pintuanId}`); +}; // 保存平台优惠券 -export const savePlatformCoupon = (params) => { - return postRequest('/promotion/coupon', params,{'Content-type': 'application/json'}) -} +export const savePlatformCoupon = params => { + return postRequest("/promotion/coupon", params, { + "Content-type": "application/json" + }); +}; // 修改平台优惠券 -export const editPlatformCoupon = (params) => { - return putRequest('/promotion/coupon', params,{'Content-type': 'application/json'}) -} +export const editPlatformCoupon = params => { + return putRequest("/promotion/coupon", params, { + "Content-type": "application/json" + }); +}; // 获取平台优惠券 -export const getPlatformCouponList = (params) => { - return getRequest('/promotion/coupon', params) -} +export const getPlatformCouponList = params => { + return getRequest("/promotion/coupon", params); +}; // 作废优惠券 -export const deletePlatformCoupon = (ids) => { - return deleteRequest(`/promotion/coupon/${ids}`) -} +export const deletePlatformCoupon = ids => { + return deleteRequest(`/promotion/coupon/${ids}`); +}; // 更新优惠券状态 -export const updatePlatformCouponStatus = ( params) => { - return putRequest(`/promotion/coupon/status`, params) -} +export const updatePlatformCouponStatus = params => { + return putRequest(`/promotion/coupon/status`, params); +}; // 获取单个优惠券 -export const getPlatformCoupon = (id) => { - return getRequest(`/promotion/coupon/${id}`) -} - +export const getPlatformCoupon = id => { + return getRequest(`/promotion/coupon/${id}`); +}; // 获取优惠券领取详情 -export const getMemberReceiveCouponList = (id) => { - return getRequest(`/promotion/coupon/member/${id}`) -} +export const getMemberReceiveCouponList = id => { + return getRequest(`/promotion/coupon/member/${id}`); +}; // 作废会员优惠券 -export const deleteMemberReceiveCoupon = (id) => { - return putRequest(`/promotion/coupon/member/cancellation/${id}`) -} +export const deleteMemberReceiveCoupon = id => { + return putRequest(`/promotion/coupon/member/cancellation/${id}`); +}; // 获取限时抢购数据 -export const getSeckillList = (params) => { - return getRequest('/promotion/seckill', params) -} +export const getSeckillList = params => { + return getRequest("/promotion/seckill", params); +}; // 获取限时抢购审核列表 -export const seckillGoodsList = (params) => { - return getRequest('/promotion/seckill/apply', params) -} +export const seckillGoodsList = params => { + return getRequest("/promotion/seckill/apply", params); +}; // 获取限时抢购详情数据 export const seckillDetail = (id, params) => { - return getRequest(`/promotion/seckill/${id}`, params) -} + return getRequest(`/promotion/seckill/${id}`, params); +}; // 删除限时抢购 -export const delSeckill = (id) => { - return deleteRequest(`/promotion/seckill/${id}`) -} +export const delSeckill = id => { + return deleteRequest(`/promotion/seckill/${id}`); +}; // 保存限时抢购 -export const saveSeckill = (params) => { - return postRequest('/promotion/seckill', params) -} +export const saveSeckill = params => { + return postRequest("/promotion/seckill", params); +}; // 修改限时抢购 -export const updateSeckill = (params) => { - return putRequest('/promotion/seckill', params) -} +export const updateSeckill = params => { + return putRequest("/promotion/seckill", params); +}; // 关闭限时抢购 -export const closeSeckill = (id) => { - return putRequest(`/promotion/seckill/close/${id}`) -} +export const closeSeckill = id => { + return putRequest(`/promotion/seckill/close/${id}`); +}; // 审核限时抢购 -export const auditApplySeckill = (params) => { - return putRequest(`/promotion/seckill/apply/audit/${params.ids}`, params) -} +export const auditApplySeckill = params => { + return putRequest(`/promotion/seckill/apply/audit/${params.ids}`, params); +}; // 满优惠列表 -export const getFullDiscountList = (params) => { - return getRequest(`/promotion/fullDiscount`,params) -} +export const getFullDiscountList = params => { + return getRequest(`/promotion/fullDiscount`, params); +}; // 满优惠列表 -export const getFullDiscountById = (id) => { - return getRequest(`/promotion/fullDiscount/${id}`) -} +export const getFullDiscountById = id => { + return getRequest(`/promotion/fullDiscount/${id}`); +}; // 积分商品列表 -export const getPointsGoodsList = (params) => { - return getRequest(`/promotion/pointsGoods`,params) -} +export const getPointsGoodsList = params => { + return getRequest(`/promotion/pointsGoods`, params); +}; // 积分商品详情 -export const getPointsGoodsById = (id) => { - return getRequest(`/promotion/pointsGoods/${id}`) -} +export const getPointsGoodsById = id => { + return getRequest(`/promotion/pointsGoods/${id}`); +}; // 添加积分商品 -export const addPointsGoods = (params) => { - return postRequest(`/promotion/pointsGoods`,params, {'Content-type': 'application/json'}) -} +export const addPointsGoods = params => { + return postRequest(`/promotion/pointsGoods`, params, { + "Content-type": "application/json" + }); +}; // 修改积分商品 -export const updatePointsGoods = (params) => { - return putRequest(`/promotion/pointsGoods`,params, {'Content-type': 'application/json'}) -} +export const updatePointsGoods = params => { + return putRequest(`/promotion/pointsGoods`, params, { + "Content-type": "application/json" + }); +}; // 修改积分商品状态 export const editPointsGoodsStatus = (id, params) => { - return putRequest(`/promotion/pointsGoods/${id}`,params) -} + return putRequest(`/promotion/pointsGoods/${id}`, params); +}; // 删除积分商品 -export const deletePointsGoodsStatus = (id) => { - return deleteRequest(`/promotion/pointsGoods/${id}`) -} - +export const deletePointsGoodsStatus = id => { + return deleteRequest(`/promotion/pointsGoods/${id}`); +}; // 积分商品分类列表 -export const getPointsGoodsCategoryList = (params) => { - return getRequest(`/promotion/pointsGoodsCategory`,params) -} +export const getPointsGoodsCategoryList = params => { + return getRequest(`/promotion/pointsGoodsCategory`, params); +}; // 积分商品分类详情 -export const getPointsGoodsCategoryById = (id) => { - return getRequest(`/promotion/pointsGoodsCategory/${id}`) -} +export const getPointsGoodsCategoryById = id => { + return getRequest(`/promotion/pointsGoodsCategory/${id}`); +}; // 添加积分商品分类 -export const addPointsGoodsCategory = (params) => { - return postRequest(`/promotion/pointsGoodsCategory`, params) -} +export const addPointsGoodsCategory = params => { + return postRequest(`/promotion/pointsGoodsCategory`, params); +}; // 更新积分商品分类 -export const updatePointsGoodsCategory = (params) => { - return putRequest(`/promotion/pointsGoodsCategory`, params) -} +export const updatePointsGoodsCategory = params => { + return putRequest(`/promotion/pointsGoodsCategory`, params); +}; // 删除积分商品分类 -export const deletePointsGoodsCategoryById = (id) => { - return deleteRequest(`/promotion/pointsGoodsCategory/${id}`) -} +export const deletePointsGoodsCategoryById = id => { + return deleteRequest(`/promotion/pointsGoodsCategory/${id}`); +}; diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 38f3e8e9..8b6b162f 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,10 +17,14 @@ export default { * @description api请求基础路径 */ api_dev: { - common: "http://192.168.0.103:8890", - buyer: "http://192.168.0.103:8888", - seller: "http://192.168.0.103:8889", - manager: "http://192.168.0.103:8887" + // common: "https://common-api.pickmall.cn", + // buyer: "https://buyer-api.pickmall.cn", + // seller: "https://store-api.pickmall.cn", + // manager: "https://admin-api.pickmall.cn" + common: 'http://192.168.0.109:8890', + buyer: 'http://192.168.0.109:8888', + seller: 'http://192.168.0.109:8889', + manager: 'http://192.168.0.109:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/router/router.js b/manager/src/router/router.js index 5e3497f7..5f9c9e54 100644 --- a/manager/src/router/router.js +++ b/manager/src/router/router.js @@ -296,6 +296,12 @@ export const otherRouter = { title: "短信签名", name: "add-sms-sign", component: () => import("@/views/sys/message/smsSign.vue") + }, + { + path: "liveDetail", + title: "查看直播", + name: "liveDetail", + component: () => import("@/views/live/liveDetail.vue") } ] }; diff --git a/manager/src/utils/filters.js b/manager/src/utils/filters.js index d581cc7d..71c092db 100644 --- a/manager/src/utils/filters.js +++ b/manager/src/utils/filters.js @@ -18,6 +18,72 @@ export function unitPrice(val, unit, location) { + +let timer, flag; +/** + * 节流原理：在一定时间内，只能触发一次 + * + * @param {Function} func 要执行的回调函数 + * @param {Number} wait 延时的时间 + * @param {Boolean} immediate 是否立即执行 + * @return null + */ + export function throttle(func, wait = 500, immediate = true) { + if (immediate) { + if (!flag) { + flag = true; + // 如果是立即执行，则在wait毫秒内开始时执行 + typeof func === 'function' && func(); + timer = setTimeout(() => { + flag = false; + }, wait); + } + } else { + if (!flag) { + flag = true + // 如果是非立即执行，则在wait毫秒内的结束处执行 + timer = setTimeout(() => { + flag = false + typeof func === 'function' && func(); + }, wait); + } + + } +}; + + + + + +let timeout = null; + +/** + * 防抖原理：一定时间内，只有最后一次操作，再过wait毫秒后才执行函数 + * + * @param {Function} func 要执行的回调函数 + * @param {Number} wait 延时的时间 + * @param {Boolean} immediate 是否立即执行 + * @return null + */ + export function debounce(func, wait = 500, immediate = false) { + // 清除定时器 + if (timeout !== null) clearTimeout(timeout); + // 立即执行，此类情况一般用不到 + if (immediate) { + var callNow = !timeout; + timeout = setTimeout(function() { + timeout = null; + }, wait); + if (callNow) typeof func === 'function' && func(); + } else { + // 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法 + timeout = setTimeout(function() { + typeof func === 'function' && func(); + }, wait); + } +} + + /** * 货币格式化 * @param price @@ -172,4 +238,4 @@ export function formatLinkType (item) { break; } return url; -} \ No newline at end of file +} diff --git a/manager/src/views/distribution/distributionSetting.vue b/manager/src/views/distribution/distributionSetting.vue index 096c33ac..8a6e48cb 100644 --- a/manager/src/views/distribution/distributionSetting.vue +++ b/manager/src/views/distribution/distributionSetting.vue @@ -10,67 +10,77 @@ 关闭 + + + + + + diff --git a/manager/src/views/live/live.vue b/manager/src/views/live/live.vue new file mode 100644 index 00000000..25614680 --- /dev/null +++ b/manager/src/views/live/live.vue @@ -0,0 +1,249 @@ + + + + + diff --git a/manager/src/views/live/liveDetail.vue b/manager/src/views/live/liveDetail.vue new file mode 100644 index 00000000..e7880dfc --- /dev/null +++ b/manager/src/views/live/liveDetail.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index a36f93c8..31e6cdbc 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -22,10 +22,17 @@ + + + + + + + @@ -43,12 +50,60 @@ diff --git a/manager/src/views/statistics/traffic.vue b/manager/src/views/statistics/traffic.vue index 6f571a97..f5fbe08d 100644 --- a/manager/src/views/statistics/traffic.vue +++ b/manager/src/views/statistics/traffic.vue @@ -66,7 +66,8 @@ export default { uvs: 0, // 访客数 pvs: 0, // 浏览量 - dateList: [ // 选择项 + dateList: [ + // 选择项 { title: "今天", selected: false, @@ -90,7 +91,8 @@ export default { ], orderChart: "", // 初始化图表 - params: { // 请求参数 + params: { + // 请求参数 searchType: "LAST_SEVEN", year: "", month: "", @@ -117,6 +119,8 @@ export default { watch: { params: { handler(val) { + this.uvs = 0; + this.pvs = 0; this.init(); }, deep: true, diff --git a/node_modules/_downloadjs@1.4.7@downloadjs/LICENSE.md b/node_modules/_downloadjs@1.4.7@downloadjs/LICENSE.md new file mode 100644 index 00000000..19b80ba4 --- /dev/null +++ b/node_modules/_downloadjs@1.4.7@downloadjs/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 dandavis + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/node_modules/_downloadjs@1.4.7@downloadjs/README.md b/node_modules/_downloadjs@1.4.7@downloadjs/README.md new file mode 100644 index 00000000..67eb6c6a --- /dev/null +++ b/node_modules/_downloadjs@1.4.7@downloadjs/README.md @@ -0,0 +1,123 @@ +# download +======== + +## Summary +--------- +The download() function is used to trigger a file download from JavaScript. + +It specifies the contents and name of a new file placed in the browser's download directory. The input can be a URL, String, Blob, or Typed Array of data, or via a dataURL representing the file's data as base64 or url-encoded string. No matter the input format, download() saves a file using the specified file name and mime information in the same manner as a server using a Content-Disposition HTTP header. + +## Getting and Using +--------- + +### Via NPM/Bower +`npm install downloadjs`
+`bower install downloadjs` + +`require("downloadjs")(data, strFileName, strMimeType);` + +### Simple global `download` function via ` diff --git a/node_modules/_vue-json-excel@0.3.0@vue-json-excel/LICENSE b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/LICENSE new file mode 100755 index 00000000..25f291d4 --- /dev/null +++ b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 Pooya Parsa + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/node_modules/_vue-json-excel@0.3.0@vue-json-excel/README.md b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/README.md new file mode 100755 index 00000000..78c8350f --- /dev/null +++ b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/README.md @@ -0,0 +1,321 @@ +# JSON to Excel for VUE 2 + +Download your JSON data as an Excel file directly from the browser. This component is based on the solution proposed on [this thread](https://stackoverflow.com/questions/17142427/javascript-to-export-html-table-to-excel) + +### Important! Extra prompt in Microsoft Excel + +**The method implemented in this component uses HTML tables to draw the .xls files, Microsoft Excel no longer recognize HTML as native content so a warning message will be displayed before opening the file. The content will be rendered perfectly but the message can't be avoided.** + +## Getting started + +Get the package: + +```bash +npm install vue-json-excel +``` + +Register JsonExcel in your vue app entry point: + +```js +import Vue from "vue"; +import JsonExcel from "vue-json-excel"; + +Vue.component("downloadExcel", JsonExcel); +``` + +In your template + +```html + + Download Data + + +``` + +## Props List + +| Name | Type | Description | Default | +| :--------------------------- | :----------: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------: | +| data | Array | Data to be exported. | +| fields | Object | Fields inside the JSON Object that you want to export. If none provided, all properties in the JSON will be exported. | +| export-fields (exportFields) | Object | Used to fix the problem with other components that use the variable fields, like vee-validate. exportFields works exactly like fields | +| type | string | Mime type [xls, csv] | xls | +| name | string | File name to export. | data.xls | +| header | string/Array | Title(s) for the data. Can be a string (one title) or an array of strings (multiple titles). | +| title(deprecated) | string/Array | same as header, title is maintained for retro-compatibility purposes but its use is not recommended due to the conflict with the HTML5 title attribute. | +| footer | string/Array | Footer(s) for the data. Can be a string (one footer) or an array of strings (multiple footers). | +| default-value (defaultValue) | string | Use as fallback when the row has no field values. | '' | +| worksheet | string | Name of the worksheet tab. | 'Sheet1' | +| fetch | Function | Callback to fetch data before download, if it's set it runs immediately after mouse pressed and before download process.
IMPORTANT: only works if no data prop is defined. | +| before-generate | Function | Callback to call a method right before the generate / fetch data, eg:show loading progress | +| before-finish | Function | Callback to call a method right before the download box pops out, eg:hide loading progress | +| stringifyLongNum | Boolean | stringify long number and decimal(solve the problem of loss of digital accuracy), default: false | +| escapeCsv | Boolean | This escapes CSV values in order to fix some excel problems with number fields. But this will wrap every csv data with **="** and **"**, to avoid that you have to set this prop to false. default: True | + +## Example + +```js +import Vue from "vue"; +import JsonExcel from "vue-json-excel"; + +Vue.component("downloadExcel", JsonExcel); + +const app = new Vue({ + el: "#app", + data: { + json_fields: { + "Complete name": "name", + City: "city", + Telephone: "phone.mobile", + "Telephone 2": { + field: "phone.landline", + callback: (value) => { + return `Landline Phone - ${value}`; + }, + }, + }, + json_data: [ + { + name: "Tony Peña", + city: "New York", + country: "United States", + birthdate: "1978-03-15", + phone: { + mobile: "1-541-754-3010", + landline: "(541) 754-3010", + }, + }, + { + name: "Thessaloniki", + city: "Athens", + country: "Greece", + birthdate: "1987-11-23", + phone: { + mobile: "+1 855 275 5071", + landline: "(2741) 2621-244", + }, + }, + ], + json_meta: [ + [ + { + key: "charset", + value: "utf-8", + }, + ], + ], + }, +}); +``` + +In your HTML call it like + +```html + + Download Excel (you can customize this with html code!) + +``` + +REQUIRED + +- json_data: Contains the data you want to export. +- json_fields: You can select what fields to export. Specify nested data and assign labels to the fields. The key is the label, the value is the JSON field. This will export the field data 'as is'. If you need to customize the the exported data you can define a callback function. Thanks to @gucastiliao. + +```js +let json_fields = { + // regular field (exported data 'as is') + fieldLabel: attributeName, // nested attribute supported + // callback function for data formatting + anotherFieldLabel: { + field: anotherAttributeName, // nested attribute supported + callback: (value) => { + return `formatted value ${value}`; + }, + }, +}; +``` + +json_fields is a object that represents which columns will be exported. If no object is provided, the component will be use the first object in your data array to extract the keys as columns names. Json field example: + +``` +:export-fields="{ + 'Human friendly name': '_name_field_from_json', + 'user's last name': '_last_name_text' +}" +``` + +## Export CSV + +To export JSON as a CSV file, just add the prop `type` with a value of "csv": + +```html + + Download CSV (you can customize this with html code!) + +``` + +## Multi-line values will appear in a single cell + +A single text value in the data that contains newline characters will appear as a single cell in Excel. This avoids the undesired behavior of multi-line values getting split into multiple cells that must be merged before using data filters and pivot tables. + +For example: + +```html + + +``` + +![Example of Excel showing multi-line cell](example-multi-line.png) + +## Fetch Data on Demand + +In case you need to fetch data from the server, you could use the fetch prop that allows you to define a callback function that is executed when your user click the download button. This function has to return a JSON value containing the data to export. A basic use case is: + +```js + + + + +``` + +## Using callbacks + +when using callback functions in the fields description, you have three option to retrieve data: + +- **field: 'path.to.nested.property'** you can retrieve a specific value using the nested property notation. + +```js + json_fields: { + 'Complete name': 'name', + 'City': 'city', + 'Telephone': 'phone.mobile', + 'Telephone 2' : { + field: 'phone.landline', + callback: (value) => { + return `Landline Phone - ${value}`; + } + }, + }, +``` + +- **field: 'define.nested.object'** you can retrieve a nested object too. + +```js + json_fields: {s + 'Complete name': 'name', + 'City': 'city', + 'Telephone': 'phone.mobile', + 'Telephone 2' : { + field: 'phone', + callback: (value) => { + return `Landline Phone - ${value.landline}`; + } + }, + }, +``` + +- Or **get the whole row** if field is undefined. + +```js + json_fields: { + 'Complete name': 'name', + 'City': 'city', + 'Telephone': 'phone.mobile', + 'Telephone 2' : { + callback: (value) => { + return `Landline Phone - ${value.phone.landline}`; + } + }, + }, +``` + +## License + +MIT + +#### Status + +This project is in an early stage of development. Any contribution is welcome :D diff --git a/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.cjs.js b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.cjs.js new file mode 100755 index 00000000..48b0d55c --- /dev/null +++ b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.cjs.js @@ -0,0 +1,654 @@ +'use strict'; + +var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {}; + +function createCommonjsModule(fn, module) { + return module = { exports: {} }, fn(module, module.exports), module.exports; +} + +var download = createCommonjsModule(function (module, exports) { +//download.js v4.2, by dandavis; 2008-2016. [MIT] see http://danml.com/download.html for tests/usage +// v1 landed a FF+Chrome compat way of downloading strings to local un-named files, upgraded to use a hidden frame and optional mime +// v2 added named files via a[download], msSaveBlob, IE (10+) support, and window.URL support for larger+faster saves than dataURLs +// v3 added dataURL and Blob Input, bind-toggle arity, and legacy dataURL fallback was improved with force-download mime and base64 support. 3.1 improved safari handling. +// v4 adds AMD/UMD, commonJS, and plain browser support +// v4.1 adds url download capability via solo URL argument (same domain/CORS only) +// v4.2 adds semantic variable names, long (over 2MB) dataURL support, and hidden by default temp anchors +// https://github.com/rndme/download + +(function (root, factory) { + { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } +}(commonjsGlobal, function () { + + return function download(data, strFileName, strMimeType) { + + var self = window, // this script is only for browsers anyway... + defaultMime = "application/octet-stream", // this default mime also triggers iframe downloads + mimeType = strMimeType || defaultMime, + payload = data, + url = !strFileName && !strMimeType && payload, + anchor = document.createElement("a"), + toString = function(a){return String(a);}, + myBlob = (self.Blob || self.MozBlob || self.WebKitBlob || toString), + fileName = strFileName || "download", + blob, + reader; + myBlob= myBlob.call ? myBlob.bind(self) : Blob ; + + if(String(this)==="true"){ //reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback + payload=[payload, mimeType]; + mimeType=payload[0]; + payload=payload[1]; + } + + + if(url && url.length< 2048){ // if no filename and no mime, assume a url was passed as the only argument + fileName = url.split("/").pop().split("?")[0]; + anchor.href = url; // assign href prop to temp anchor + if(anchor.href.indexOf(url) !== -1){ // if the browser determines that it's a potentially valid url path: + var ajax=new XMLHttpRequest(); + ajax.open( "GET", url, true); + ajax.responseType = 'blob'; + ajax.onload= function(e){ + download(e.target.response, fileName, defaultMime); + }; + setTimeout(function(){ ajax.send();}, 0); // allows setting custom ajax headers using the return: + return ajax; + } // end if valid url? + } // end if url? + + + //go ahead and download dataURLs right away + if(/^data:([\w+-]+\/[\w+.-]+)?[,;]/.test(payload)){ + + if(payload.length > (1024*1024*1.999) && myBlob !== toString ){ + payload=dataUrlToBlob(payload); + mimeType=payload.type || defaultMime; + }else { + return navigator.msSaveBlob ? // IE10 can't do a[download], only Blobs: + navigator.msSaveBlob(dataUrlToBlob(payload), fileName) : + saver(payload) ; // everyone else can save dataURLs un-processed + } + + }else {//not data url, is it a string with special needs? + if(/([\x80-\xff])/.test(payload)){ + var i=0, tempUiArr= new Uint8Array(payload.length), mx=tempUiArr.length; + for(i;i null, + }, + // this prop is used to fix the problem with other components that use the + // variable fields, like vee-validate. exportFields works exactly like fields + exportFields: { + type: Object, + default: () => null, + }, + // Use as fallback when the row has no field values + defaultValue: { + type: String, + required: false, + default: "", + }, + // Title(s) for the data, could be a string or an array of strings (multiple titles) + header: { + default: null, + }, + // Footer(s) for the data, could be a string or an array of strings (multiple footers) + footer: { + default: null, + }, + // filename to export + name: { + type: String, + default: "data.xls", + }, + fetch: { + type: Function, + }, + meta: { + type: Array, + default: () => [], + }, + worksheet: { + type: String, + default: "Sheet1", + }, + //event before generate was called + beforeGenerate: { + type: Function, + }, + //event before download pops up + beforeFinish: { + type: Function, + }, + // Determine if CSV Data should be escaped + escapeCsv: { + type: Boolean, + default: true, + }, + // long number stringify + stringifyLongNum: { + type: Boolean, + default: false, + }, + }, + computed: { + // unique identifier + idName() { + var now = new Date().getTime(); + return "export_" + now; + }, + + downloadFields() { + if (this.fields) return this.fields; + + if (this.exportFields) return this.exportFields; + }, + }, + methods: { + async generate() { + if (typeof this.beforeGenerate === "function") { + await this.beforeGenerate(); + } + let data = this.data; + if (typeof this.fetch === "function" || !data) data = await this.fetch(); + + if (!data || !data.length) { + return; + } + + let json = this.getProcessedJson(data, this.downloadFields); + if (this.type === "html") { + // this is mainly for testing + return this.export( + this.jsonToXLS(json), + this.name.replace(".xls", ".html"), + "text/html" + ); + } else if (this.type === "csv") { + return this.export( + this.jsonToCSV(json), + this.name.replace(".xls", ".csv"), + "application/csv" + ); + } + return this.export( + this.jsonToXLS(json), + this.name, + "application/vnd.ms-excel" + ); + }, + /* + Use downloadjs to generate the download link + */ + export: async function (data, filename, mime) { + let blob = this.base64ToBlob(data, mime); + if (typeof this.beforeFinish === "function") await this.beforeFinish(); + download(blob, filename, mime); + }, + /* + jsonToXLS + --------------- + Transform json data into an xml document with MS Excel format, sadly + it shows a prompt when it opens, that is a default behavior for + Microsoft office and cannot be avoided. It's recommended to use CSV format instead. + */ + jsonToXLS(data) { + let xlsTemp = + ' ${table}
'; + let xlsData = ""; + const colspan = Object.keys(data[0]).length; + let _self = this; + + //Header + const header = this.header || this.$attrs.title; + if (header) { + xlsData += this.parseExtraData( + header, + '${data}' + ); + } + + //Fields + xlsData += ""; + for (let key in data[0]) { + xlsData += "" + key + ""; + } + xlsData += ""; + xlsData += ""; + + //Data + xlsData += ""; + data.map(function (item, index) { + xlsData += ""; + for (let key in item) { + xlsData += + "" + + _self.preprocessLongNum( + _self.valueReformattedForMultilines(item[key]) + ) + + ""; + } + xlsData += ""; + }); + xlsData += ""; + + //Footer + if (this.footer != null) { + xlsData += ""; + xlsData += this.parseExtraData( + this.footer, + '${data}' + ); + xlsData += ""; + } + + return xlsTemp + .replace("${table}", xlsData) + .replace("${worksheet}", this.worksheet); + }, + /* + jsonToCSV + --------------- + Transform json data into an CSV file. + */ + jsonToCSV(data) { + let _self = this; + var csvData = []; + + //Header + const header = this.header || this.$attrs.title; + if (header) { + csvData.push(this.parseExtraData(header, "${data}\r\n")); + } + + //Fields + for (let key in data[0]) { + csvData.push(key); + csvData.push(","); + } + csvData.pop(); + csvData.push("\r\n"); + //Data + data.map(function (item) { + for (let key in item) { + let escapedCSV = item[key] + ""; + // Escaped CSV data to string to avoid problems with numbers or other types of values + // this is controlled by the prop escapeCsv + if (_self.escapeCsv) { + escapedCSV = '="' + escapedCSV + '"'; // cast Numbers to string + if (escapedCSV.match(/[,"\n]/)) { + escapedCSV = '"' + escapedCSV.replace(/\"/g, '""') + '"'; + } + } + csvData.push(escapedCSV); + csvData.push(","); + } + csvData.pop(); + csvData.push("\r\n"); + }); + //Footer + if (this.footer != null) { + csvData.push(this.parseExtraData(this.footer, "${data}\r\n")); + } + return csvData.join(""); + }, + /* + getProcessedJson + --------------- + Get only the data to export, if no fields are set return all the data + */ + getProcessedJson(data, header) { + let keys = this.getKeys(data, header); + let newData = []; + let _self = this; + data.map(function (item, index) { + let newItem = {}; + for (let label in keys) { + let property = keys[label]; + newItem[label] = _self.getValue(property, item); + } + newData.push(newItem); + }); + + return newData; + }, + getKeys(data, header) { + if (header) { + return header; + } + + let keys = {}; + for (let key in data[0]) { + keys[key] = key; + } + return keys; + }, + /* + parseExtraData + --------------- + Parse title and footer attribute to the csv format + */ + parseExtraData(extraData, format) { + let parseData = ""; + if (Array.isArray(extraData)) { + for (var i = 0; i < extraData.length; i++) { + if (extraData[i]) + parseData += format.replace("${data}", extraData[i]); + } + } else { + parseData += format.replace("${data}", extraData); + } + return parseData; + }, + + getValue(key, item) { + const field = typeof key !== "object" ? key : key.field; + let indexes = typeof field !== "string" ? [] : field.split("."); + let value = this.defaultValue; + + if (!field) value = item; + else if (indexes.length > 1) + value = this.getValueFromNestedItem(item, indexes); + else value = this.parseValue(item[field]); + + if (key.hasOwnProperty("callback")) + value = this.getValueFromCallback(value, key.callback); + + return value; + }, + + /* + convert values with newline \n characters into
+ */ + valueReformattedForMultilines(value) { + if (typeof value == "string") return value.replace(/\n/gi, "
"); + else return value; + }, + preprocessLongNum(value) { + if (this.stringifyLongNum) { + if (String(value).startsWith("0x")) { + return value; + } + if (!isNaN(value) && value != "") { + if (value > 99999999999 || value < 0.0000000000001) { + return '="' + value + '"'; + } + } + } + return value; + }, + getValueFromNestedItem(item, indexes) { + let nestedItem = item; + for (let index of indexes) { + if (nestedItem) nestedItem = nestedItem[index]; + } + return this.parseValue(nestedItem); + }, + + getValueFromCallback(item, callback) { + if (typeof callback !== "function") return this.defaultValue; + const value = callback(item); + return this.parseValue(value); + }, + parseValue(value) { + return value || value === 0 || typeof value === "boolean" + ? value + : this.defaultValue; + }, + base64ToBlob(data, mime) { + let base64 = window.btoa(window.unescape(encodeURIComponent(data))); + let bstr = atob(base64); + let n = bstr.length; + let u8arr = new Uint8ClampedArray(n); + while (n--) { + u8arr[n] = bstr.charCodeAt(n); + } + return new Blob([u8arr], { type: mime }); + }, + }, // end methods +}; + +function normalizeComponent(template, style, script, scopeId, isFunctionalTemplate, moduleIdentifier +/* server only */ +, shadowMode, createInjector, createInjectorSSR, createInjectorShadow) { + if (typeof shadowMode !== 'boolean') { + createInjectorSSR = createInjector; + createInjector = shadowMode; + shadowMode = false; + } // Vue.extend constructor export interop. + + + var options = typeof script === 'function' ? script.options : script; // render functions + + if (template && template.render) { + options.render = template.render; + options.staticRenderFns = template.staticRenderFns; + options._compiled = true; // functional template + + if (isFunctionalTemplate) { + options.functional = true; + } + } // scopedId + + + if (scopeId) { + options._scopeId = scopeId; + } + + var hook; + + if (moduleIdentifier) { + // server build + hook = function hook(context) { + // 2.3 injection + context = context || // cached call + this.$vnode && this.$vnode.ssrContext || // stateful + this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext; // functional + // 2.2 with runInNewContext: true + + if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') { + context = __VUE_SSR_CONTEXT__; + } // inject component styles + + + if (style) { + style.call(this, createInjectorSSR(context)); + } // register component module identifier for async chunk inference + + + if (context && context._registeredComponents) { + context._registeredComponents.add(moduleIdentifier); + } + }; // used by ssr in case component is cached and beforeCreate + // never gets called + + + options._ssrRegister = hook; + } else if (style) { + hook = shadowMode ? function () { + style.call(this, createInjectorShadow(this.$root.$options.shadowRoot)); + } : function (context) { + style.call(this, createInjector(context)); + }; + } + + if (hook) { + if (options.functional) { + // register for functional component in vue file + var originalRender = options.render; + + options.render = function renderWithStyleInjection(h, context) { + hook.call(context); + return originalRender(h, context); + }; + } else { + // inject component registration as beforeCreate hook + var existing = options.beforeCreate; + options.beforeCreate = existing ? [].concat(existing, hook) : [hook]; + } + } + + return script; +} + +var normalizeComponent_1 = normalizeComponent; + +/* script */ +const __vue_script__ = script; + +/* template */ +var __vue_render__ = function() { + var _vm = this; + var _h = _vm.$createElement; + var _c = _vm._self._c || _h; + return _c( + "div", + { attrs: { id: _vm.idName }, on: { click: _vm.generate } }, + [_vm._t("default", [_vm._v(" Download " + _vm._s(_vm.name) + " ")])], + 2 + ) +}; +var __vue_staticRenderFns__ = []; +__vue_render__._withStripped = true; + + /* style */ + const __vue_inject_styles__ = undefined; + /* scoped */ + const __vue_scope_id__ = undefined; + /* module identifier */ + const __vue_module_identifier__ = undefined; + /* functional template */ + const __vue_is_functional_template__ = false; + /* style inject */ + + /* style inject SSR */ + + + + var JsonExcel = normalizeComponent_1( + { render: __vue_render__, staticRenderFns: __vue_staticRenderFns__ }, + __vue_inject_styles__, + __vue_script__, + __vue_scope_id__, + __vue_is_functional_template__, + __vue_module_identifier__, + undefined, + undefined + ); + +module.exports = JsonExcel; diff --git a/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.esm.js b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.esm.js new file mode 100755 index 00000000..2d9535d4 --- /dev/null +++ b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.esm.js @@ -0,0 +1,652 @@ +var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {}; + +function createCommonjsModule(fn, module) { + return module = { exports: {} }, fn(module, module.exports), module.exports; +} + +var download = createCommonjsModule(function (module, exports) { +//download.js v4.2, by dandavis; 2008-2016. [MIT] see http://danml.com/download.html for tests/usage +// v1 landed a FF+Chrome compat way of downloading strings to local un-named files, upgraded to use a hidden frame and optional mime +// v2 added named files via a[download], msSaveBlob, IE (10+) support, and window.URL support for larger+faster saves than dataURLs +// v3 added dataURL and Blob Input, bind-toggle arity, and legacy dataURL fallback was improved with force-download mime and base64 support. 3.1 improved safari handling. +// v4 adds AMD/UMD, commonJS, and plain browser support +// v4.1 adds url download capability via solo URL argument (same domain/CORS only) +// v4.2 adds semantic variable names, long (over 2MB) dataURL support, and hidden by default temp anchors +// https://github.com/rndme/download + +(function (root, factory) { + { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } +}(commonjsGlobal, function () { + + return function download(data, strFileName, strMimeType) { + + var self = window, // this script is only for browsers anyway... + defaultMime = "application/octet-stream", // this default mime also triggers iframe downloads + mimeType = strMimeType || defaultMime, + payload = data, + url = !strFileName && !strMimeType && payload, + anchor = document.createElement("a"), + toString = function(a){return String(a);}, + myBlob = (self.Blob || self.MozBlob || self.WebKitBlob || toString), + fileName = strFileName || "download", + blob, + reader; + myBlob= myBlob.call ? myBlob.bind(self) : Blob ; + + if(String(this)==="true"){ //reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback + payload=[payload, mimeType]; + mimeType=payload[0]; + payload=payload[1]; + } + + + if(url && url.length< 2048){ // if no filename and no mime, assume a url was passed as the only argument + fileName = url.split("/").pop().split("?")[0]; + anchor.href = url; // assign href prop to temp anchor + if(anchor.href.indexOf(url) !== -1){ // if the browser determines that it's a potentially valid url path: + var ajax=new XMLHttpRequest(); + ajax.open( "GET", url, true); + ajax.responseType = 'blob'; + ajax.onload= function(e){ + download(e.target.response, fileName, defaultMime); + }; + setTimeout(function(){ ajax.send();}, 0); // allows setting custom ajax headers using the return: + return ajax; + } // end if valid url? + } // end if url? + + + //go ahead and download dataURLs right away + if(/^data:([\w+-]+\/[\w+.-]+)?[,;]/.test(payload)){ + + if(payload.length > (1024*1024*1.999) && myBlob !== toString ){ + payload=dataUrlToBlob(payload); + mimeType=payload.type || defaultMime; + }else { + return navigator.msSaveBlob ? // IE10 can't do a[download], only Blobs: + navigator.msSaveBlob(dataUrlToBlob(payload), fileName) : + saver(payload) ; // everyone else can save dataURLs un-processed + } + + }else {//not data url, is it a string with special needs? + if(/([\x80-\xff])/.test(payload)){ + var i=0, tempUiArr= new Uint8Array(payload.length), mx=tempUiArr.length; + for(i;i null, + }, + // this prop is used to fix the problem with other components that use the + // variable fields, like vee-validate. exportFields works exactly like fields + exportFields: { + type: Object, + default: () => null, + }, + // Use as fallback when the row has no field values + defaultValue: { + type: String, + required: false, + default: "", + }, + // Title(s) for the data, could be a string or an array of strings (multiple titles) + header: { + default: null, + }, + // Footer(s) for the data, could be a string or an array of strings (multiple footers) + footer: { + default: null, + }, + // filename to export + name: { + type: String, + default: "data.xls", + }, + fetch: { + type: Function, + }, + meta: { + type: Array, + default: () => [], + }, + worksheet: { + type: String, + default: "Sheet1", + }, + //event before generate was called + beforeGenerate: { + type: Function, + }, + //event before download pops up + beforeFinish: { + type: Function, + }, + // Determine if CSV Data should be escaped + escapeCsv: { + type: Boolean, + default: true, + }, + // long number stringify + stringifyLongNum: { + type: Boolean, + default: false, + }, + }, + computed: { + // unique identifier + idName() { + var now = new Date().getTime(); + return "export_" + now; + }, + + downloadFields() { + if (this.fields) return this.fields; + + if (this.exportFields) return this.exportFields; + }, + }, + methods: { + async generate() { + if (typeof this.beforeGenerate === "function") { + await this.beforeGenerate(); + } + let data = this.data; + if (typeof this.fetch === "function" || !data) data = await this.fetch(); + + if (!data || !data.length) { + return; + } + + let json = this.getProcessedJson(data, this.downloadFields); + if (this.type === "html") { + // this is mainly for testing + return this.export( + this.jsonToXLS(json), + this.name.replace(".xls", ".html"), + "text/html" + ); + } else if (this.type === "csv") { + return this.export( + this.jsonToCSV(json), + this.name.replace(".xls", ".csv"), + "application/csv" + ); + } + return this.export( + this.jsonToXLS(json), + this.name, + "application/vnd.ms-excel" + ); + }, + /* + Use downloadjs to generate the download link + */ + export: async function (data, filename, mime) { + let blob = this.base64ToBlob(data, mime); + if (typeof this.beforeFinish === "function") await this.beforeFinish(); + download(blob, filename, mime); + }, + /* + jsonToXLS + --------------- + Transform json data into an xml document with MS Excel format, sadly + it shows a prompt when it opens, that is a default behavior for + Microsoft office and cannot be avoided. It's recommended to use CSV format instead. + */ + jsonToXLS(data) { + let xlsTemp = + ' ${table}
'; + let xlsData = ""; + const colspan = Object.keys(data[0]).length; + let _self = this; + + //Header + const header = this.header || this.$attrs.title; + if (header) { + xlsData += this.parseExtraData( + header, + '${data}' + ); + } + + //Fields + xlsData += ""; + for (let key in data[0]) { + xlsData += "" + key + ""; + } + xlsData += ""; + xlsData += ""; + + //Data + xlsData += ""; + data.map(function (item, index) { + xlsData += ""; + for (let key in item) { + xlsData += + "" + + _self.preprocessLongNum( + _self.valueReformattedForMultilines(item[key]) + ) + + ""; + } + xlsData += ""; + }); + xlsData += ""; + + //Footer + if (this.footer != null) { + xlsData += ""; + xlsData += this.parseExtraData( + this.footer, + '${data}' + ); + xlsData += ""; + } + + return xlsTemp + .replace("${table}", xlsData) + .replace("${worksheet}", this.worksheet); + }, + /* + jsonToCSV + --------------- + Transform json data into an CSV file. + */ + jsonToCSV(data) { + let _self = this; + var csvData = []; + + //Header + const header = this.header || this.$attrs.title; + if (header) { + csvData.push(this.parseExtraData(header, "${data}\r\n")); + } + + //Fields + for (let key in data[0]) { + csvData.push(key); + csvData.push(","); + } + csvData.pop(); + csvData.push("\r\n"); + //Data + data.map(function (item) { + for (let key in item) { + let escapedCSV = item[key] + ""; + // Escaped CSV data to string to avoid problems with numbers or other types of values + // this is controlled by the prop escapeCsv + if (_self.escapeCsv) { + escapedCSV = '="' + escapedCSV + '"'; // cast Numbers to string + if (escapedCSV.match(/[,"\n]/)) { + escapedCSV = '"' + escapedCSV.replace(/\"/g, '""') + '"'; + } + } + csvData.push(escapedCSV); + csvData.push(","); + } + csvData.pop(); + csvData.push("\r\n"); + }); + //Footer + if (this.footer != null) { + csvData.push(this.parseExtraData(this.footer, "${data}\r\n")); + } + return csvData.join(""); + }, + /* + getProcessedJson + --------------- + Get only the data to export, if no fields are set return all the data + */ + getProcessedJson(data, header) { + let keys = this.getKeys(data, header); + let newData = []; + let _self = this; + data.map(function (item, index) { + let newItem = {}; + for (let label in keys) { + let property = keys[label]; + newItem[label] = _self.getValue(property, item); + } + newData.push(newItem); + }); + + return newData; + }, + getKeys(data, header) { + if (header) { + return header; + } + + let keys = {}; + for (let key in data[0]) { + keys[key] = key; + } + return keys; + }, + /* + parseExtraData + --------------- + Parse title and footer attribute to the csv format + */ + parseExtraData(extraData, format) { + let parseData = ""; + if (Array.isArray(extraData)) { + for (var i = 0; i < extraData.length; i++) { + if (extraData[i]) + parseData += format.replace("${data}", extraData[i]); + } + } else { + parseData += format.replace("${data}", extraData); + } + return parseData; + }, + + getValue(key, item) { + const field = typeof key !== "object" ? key : key.field; + let indexes = typeof field !== "string" ? [] : field.split("."); + let value = this.defaultValue; + + if (!field) value = item; + else if (indexes.length > 1) + value = this.getValueFromNestedItem(item, indexes); + else value = this.parseValue(item[field]); + + if (key.hasOwnProperty("callback")) + value = this.getValueFromCallback(value, key.callback); + + return value; + }, + + /* + convert values with newline \n characters into
+ */ + valueReformattedForMultilines(value) { + if (typeof value == "string") return value.replace(/\n/gi, "
"); + else return value; + }, + preprocessLongNum(value) { + if (this.stringifyLongNum) { + if (String(value).startsWith("0x")) { + return value; + } + if (!isNaN(value) && value != "") { + if (value > 99999999999 || value < 0.0000000000001) { + return '="' + value + '"'; + } + } + } + return value; + }, + getValueFromNestedItem(item, indexes) { + let nestedItem = item; + for (let index of indexes) { + if (nestedItem) nestedItem = nestedItem[index]; + } + return this.parseValue(nestedItem); + }, + + getValueFromCallback(item, callback) { + if (typeof callback !== "function") return this.defaultValue; + const value = callback(item); + return this.parseValue(value); + }, + parseValue(value) { + return value || value === 0 || typeof value === "boolean" + ? value + : this.defaultValue; + }, + base64ToBlob(data, mime) { + let base64 = window.btoa(window.unescape(encodeURIComponent(data))); + let bstr = atob(base64); + let n = bstr.length; + let u8arr = new Uint8ClampedArray(n); + while (n--) { + u8arr[n] = bstr.charCodeAt(n); + } + return new Blob([u8arr], { type: mime }); + }, + }, // end methods +}; + +function normalizeComponent(template, style, script, scopeId, isFunctionalTemplate, moduleIdentifier +/* server only */ +, shadowMode, createInjector, createInjectorSSR, createInjectorShadow) { + if (typeof shadowMode !== 'boolean') { + createInjectorSSR = createInjector; + createInjector = shadowMode; + shadowMode = false; + } // Vue.extend constructor export interop. + + + var options = typeof script === 'function' ? script.options : script; // render functions + + if (template && template.render) { + options.render = template.render; + options.staticRenderFns = template.staticRenderFns; + options._compiled = true; // functional template + + if (isFunctionalTemplate) { + options.functional = true; + } + } // scopedId + + + if (scopeId) { + options._scopeId = scopeId; + } + + var hook; + + if (moduleIdentifier) { + // server build + hook = function hook(context) { + // 2.3 injection + context = context || // cached call + this.$vnode && this.$vnode.ssrContext || // stateful + this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext; // functional + // 2.2 with runInNewContext: true + + if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') { + context = __VUE_SSR_CONTEXT__; + } // inject component styles + + + if (style) { + style.call(this, createInjectorSSR(context)); + } // register component module identifier for async chunk inference + + + if (context && context._registeredComponents) { + context._registeredComponents.add(moduleIdentifier); + } + }; // used by ssr in case component is cached and beforeCreate + // never gets called + + + options._ssrRegister = hook; + } else if (style) { + hook = shadowMode ? function () { + style.call(this, createInjectorShadow(this.$root.$options.shadowRoot)); + } : function (context) { + style.call(this, createInjector(context)); + }; + } + + if (hook) { + if (options.functional) { + // register for functional component in vue file + var originalRender = options.render; + + options.render = function renderWithStyleInjection(h, context) { + hook.call(context); + return originalRender(h, context); + }; + } else { + // inject component registration as beforeCreate hook + var existing = options.beforeCreate; + options.beforeCreate = existing ? [].concat(existing, hook) : [hook]; + } + } + + return script; +} + +var normalizeComponent_1 = normalizeComponent; + +/* script */ +const __vue_script__ = script; + +/* template */ +var __vue_render__ = function() { + var _vm = this; + var _h = _vm.$createElement; + var _c = _vm._self._c || _h; + return _c( + "div", + { attrs: { id: _vm.idName }, on: { click: _vm.generate } }, + [_vm._t("default", [_vm._v(" Download " + _vm._s(_vm.name) + " ")])], + 2 + ) +}; +var __vue_staticRenderFns__ = []; +__vue_render__._withStripped = true; + + /* style */ + const __vue_inject_styles__ = undefined; + /* scoped */ + const __vue_scope_id__ = undefined; + /* module identifier */ + const __vue_module_identifier__ = undefined; + /* functional template */ + const __vue_is_functional_template__ = false; + /* style inject */ + + /* style inject SSR */ + + + + var JsonExcel = normalizeComponent_1( + { render: __vue_render__, staticRenderFns: __vue_staticRenderFns__ }, + __vue_inject_styles__, + __vue_script__, + __vue_scope_id__, + __vue_is_functional_template__, + __vue_module_identifier__, + undefined, + undefined + ); + +export default JsonExcel; diff --git a/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.umd.js b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.umd.js new file mode 100755 index 00000000..bd2c0dc0 --- /dev/null +++ b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/dist/vue-json-excel.umd.js @@ -0,0 +1,660 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global = global || self, global.JsonExcel = factory()); +}(this, (function () { 'use strict'; + + var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {}; + + function createCommonjsModule(fn, module) { + return module = { exports: {} }, fn(module, module.exports), module.exports; + } + + var download = createCommonjsModule(function (module, exports) { + //download.js v4.2, by dandavis; 2008-2016. [MIT] see http://danml.com/download.html for tests/usage + // v1 landed a FF+Chrome compat way of downloading strings to local un-named files, upgraded to use a hidden frame and optional mime + // v2 added named files via a[download], msSaveBlob, IE (10+) support, and window.URL support for larger+faster saves than dataURLs + // v3 added dataURL and Blob Input, bind-toggle arity, and legacy dataURL fallback was improved with force-download mime and base64 support. 3.1 improved safari handling. + // v4 adds AMD/UMD, commonJS, and plain browser support + // v4.1 adds url download capability via solo URL argument (same domain/CORS only) + // v4.2 adds semantic variable names, long (over 2MB) dataURL support, and hidden by default temp anchors + // https://github.com/rndme/download + + (function (root, factory) { + { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } + }(commonjsGlobal, function () { + + return function download(data, strFileName, strMimeType) { + + var self = window, // this script is only for browsers anyway... + defaultMime = "application/octet-stream", // this default mime also triggers iframe downloads + mimeType = strMimeType || defaultMime, + payload = data, + url = !strFileName && !strMimeType && payload, + anchor = document.createElement("a"), + toString = function(a){return String(a);}, + myBlob = (self.Blob || self.MozBlob || self.WebKitBlob || toString), + fileName = strFileName || "download", + blob, + reader; + myBlob= myBlob.call ? myBlob.bind(self) : Blob ; + + if(String(this)==="true"){ //reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback + payload=[payload, mimeType]; + mimeType=payload[0]; + payload=payload[1]; + } + + + if(url && url.length< 2048){ // if no filename and no mime, assume a url was passed as the only argument + fileName = url.split("/").pop().split("?")[0]; + anchor.href = url; // assign href prop to temp anchor + if(anchor.href.indexOf(url) !== -1){ // if the browser determines that it's a potentially valid url path: + var ajax=new XMLHttpRequest(); + ajax.open( "GET", url, true); + ajax.responseType = 'blob'; + ajax.onload= function(e){ + download(e.target.response, fileName, defaultMime); + }; + setTimeout(function(){ ajax.send();}, 0); // allows setting custom ajax headers using the return: + return ajax; + } // end if valid url? + } // end if url? + + + //go ahead and download dataURLs right away + if(/^data:([\w+-]+\/[\w+.-]+)?[,;]/.test(payload)){ + + if(payload.length > (1024*1024*1.999) && myBlob !== toString ){ + payload=dataUrlToBlob(payload); + mimeType=payload.type || defaultMime; + }else { + return navigator.msSaveBlob ? // IE10 can't do a[download], only Blobs: + navigator.msSaveBlob(dataUrlToBlob(payload), fileName) : + saver(payload) ; // everyone else can save dataURLs un-processed + } + + }else {//not data url, is it a string with special needs? + if(/([\x80-\xff])/.test(payload)){ + var i=0, tempUiArr= new Uint8Array(payload.length), mx=tempUiArr.length; + for(i;i null, + }, + // this prop is used to fix the problem with other components that use the + // variable fields, like vee-validate. exportFields works exactly like fields + exportFields: { + type: Object, + default: () => null, + }, + // Use as fallback when the row has no field values + defaultValue: { + type: String, + required: false, + default: "", + }, + // Title(s) for the data, could be a string or an array of strings (multiple titles) + header: { + default: null, + }, + // Footer(s) for the data, could be a string or an array of strings (multiple footers) + footer: { + default: null, + }, + // filename to export + name: { + type: String, + default: "data.xls", + }, + fetch: { + type: Function, + }, + meta: { + type: Array, + default: () => [], + }, + worksheet: { + type: String, + default: "Sheet1", + }, + //event before generate was called + beforeGenerate: { + type: Function, + }, + //event before download pops up + beforeFinish: { + type: Function, + }, + // Determine if CSV Data should be escaped + escapeCsv: { + type: Boolean, + default: true, + }, + // long number stringify + stringifyLongNum: { + type: Boolean, + default: false, + }, + }, + computed: { + // unique identifier + idName() { + var now = new Date().getTime(); + return "export_" + now; + }, + + downloadFields() { + if (this.fields) return this.fields; + + if (this.exportFields) return this.exportFields; + }, + }, + methods: { + async generate() { + if (typeof this.beforeGenerate === "function") { + await this.beforeGenerate(); + } + let data = this.data; + if (typeof this.fetch === "function" || !data) data = await this.fetch(); + + if (!data || !data.length) { + return; + } + + let json = this.getProcessedJson(data, this.downloadFields); + if (this.type === "html") { + // this is mainly for testing + return this.export( + this.jsonToXLS(json), + this.name.replace(".xls", ".html"), + "text/html" + ); + } else if (this.type === "csv") { + return this.export( + this.jsonToCSV(json), + this.name.replace(".xls", ".csv"), + "application/csv" + ); + } + return this.export( + this.jsonToXLS(json), + this.name, + "application/vnd.ms-excel" + ); + }, + /* + Use downloadjs to generate the download link + */ + export: async function (data, filename, mime) { + let blob = this.base64ToBlob(data, mime); + if (typeof this.beforeFinish === "function") await this.beforeFinish(); + download(blob, filename, mime); + }, + /* + jsonToXLS + --------------- + Transform json data into an xml document with MS Excel format, sadly + it shows a prompt when it opens, that is a default behavior for + Microsoft office and cannot be avoided. It's recommended to use CSV format instead. + */ + jsonToXLS(data) { + let xlsTemp = + ' ${table}
'; + let xlsData = ""; + const colspan = Object.keys(data[0]).length; + let _self = this; + + //Header + const header = this.header || this.$attrs.title; + if (header) { + xlsData += this.parseExtraData( + header, + '${data}' + ); + } + + //Fields + xlsData += ""; + for (let key in data[0]) { + xlsData += "" + key + ""; + } + xlsData += ""; + xlsData += ""; + + //Data + xlsData += ""; + data.map(function (item, index) { + xlsData += ""; + for (let key in item) { + xlsData += + "" + + _self.preprocessLongNum( + _self.valueReformattedForMultilines(item[key]) + ) + + ""; + } + xlsData += ""; + }); + xlsData += ""; + + //Footer + if (this.footer != null) { + xlsData += ""; + xlsData += this.parseExtraData( + this.footer, + '${data}' + ); + xlsData += ""; + } + + return xlsTemp + .replace("${table}", xlsData) + .replace("${worksheet}", this.worksheet); + }, + /* + jsonToCSV + --------------- + Transform json data into an CSV file. + */ + jsonToCSV(data) { + let _self = this; + var csvData = []; + + //Header + const header = this.header || this.$attrs.title; + if (header) { + csvData.push(this.parseExtraData(header, "${data}\r\n")); + } + + //Fields + for (let key in data[0]) { + csvData.push(key); + csvData.push(","); + } + csvData.pop(); + csvData.push("\r\n"); + //Data + data.map(function (item) { + for (let key in item) { + let escapedCSV = item[key] + ""; + // Escaped CSV data to string to avoid problems with numbers or other types of values + // this is controlled by the prop escapeCsv + if (_self.escapeCsv) { + escapedCSV = '="' + escapedCSV + '"'; // cast Numbers to string + if (escapedCSV.match(/[,"\n]/)) { + escapedCSV = '"' + escapedCSV.replace(/\"/g, '""') + '"'; + } + } + csvData.push(escapedCSV); + csvData.push(","); + } + csvData.pop(); + csvData.push("\r\n"); + }); + //Footer + if (this.footer != null) { + csvData.push(this.parseExtraData(this.footer, "${data}\r\n")); + } + return csvData.join(""); + }, + /* + getProcessedJson + --------------- + Get only the data to export, if no fields are set return all the data + */ + getProcessedJson(data, header) { + let keys = this.getKeys(data, header); + let newData = []; + let _self = this; + data.map(function (item, index) { + let newItem = {}; + for (let label in keys) { + let property = keys[label]; + newItem[label] = _self.getValue(property, item); + } + newData.push(newItem); + }); + + return newData; + }, + getKeys(data, header) { + if (header) { + return header; + } + + let keys = {}; + for (let key in data[0]) { + keys[key] = key; + } + return keys; + }, + /* + parseExtraData + --------------- + Parse title and footer attribute to the csv format + */ + parseExtraData(extraData, format) { + let parseData = ""; + if (Array.isArray(extraData)) { + for (var i = 0; i < extraData.length; i++) { + if (extraData[i]) + parseData += format.replace("${data}", extraData[i]); + } + } else { + parseData += format.replace("${data}", extraData); + } + return parseData; + }, + + getValue(key, item) { + const field = typeof key !== "object" ? key : key.field; + let indexes = typeof field !== "string" ? [] : field.split("."); + let value = this.defaultValue; + + if (!field) value = item; + else if (indexes.length > 1) + value = this.getValueFromNestedItem(item, indexes); + else value = this.parseValue(item[field]); + + if (key.hasOwnProperty("callback")) + value = this.getValueFromCallback(value, key.callback); + + return value; + }, + + /* + convert values with newline \n characters into
+ */ + valueReformattedForMultilines(value) { + if (typeof value == "string") return value.replace(/\n/gi, "
"); + else return value; + }, + preprocessLongNum(value) { + if (this.stringifyLongNum) { + if (String(value).startsWith("0x")) { + return value; + } + if (!isNaN(value) && value != "") { + if (value > 99999999999 || value < 0.0000000000001) { + return '="' + value + '"'; + } + } + } + return value; + }, + getValueFromNestedItem(item, indexes) { + let nestedItem = item; + for (let index of indexes) { + if (nestedItem) nestedItem = nestedItem[index]; + } + return this.parseValue(nestedItem); + }, + + getValueFromCallback(item, callback) { + if (typeof callback !== "function") return this.defaultValue; + const value = callback(item); + return this.parseValue(value); + }, + parseValue(value) { + return value || value === 0 || typeof value === "boolean" + ? value + : this.defaultValue; + }, + base64ToBlob(data, mime) { + let base64 = window.btoa(window.unescape(encodeURIComponent(data))); + let bstr = atob(base64); + let n = bstr.length; + let u8arr = new Uint8ClampedArray(n); + while (n--) { + u8arr[n] = bstr.charCodeAt(n); + } + return new Blob([u8arr], { type: mime }); + }, + }, // end methods + }; + + function normalizeComponent(template, style, script, scopeId, isFunctionalTemplate, moduleIdentifier + /* server only */ + , shadowMode, createInjector, createInjectorSSR, createInjectorShadow) { + if (typeof shadowMode !== 'boolean') { + createInjectorSSR = createInjector; + createInjector = shadowMode; + shadowMode = false; + } // Vue.extend constructor export interop. + + + var options = typeof script === 'function' ? script.options : script; // render functions + + if (template && template.render) { + options.render = template.render; + options.staticRenderFns = template.staticRenderFns; + options._compiled = true; // functional template + + if (isFunctionalTemplate) { + options.functional = true; + } + } // scopedId + + + if (scopeId) { + options._scopeId = scopeId; + } + + var hook; + + if (moduleIdentifier) { + // server build + hook = function hook(context) { + // 2.3 injection + context = context || // cached call + this.$vnode && this.$vnode.ssrContext || // stateful + this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext; // functional + // 2.2 with runInNewContext: true + + if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') { + context = __VUE_SSR_CONTEXT__; + } // inject component styles + + + if (style) { + style.call(this, createInjectorSSR(context)); + } // register component module identifier for async chunk inference + + + if (context && context._registeredComponents) { + context._registeredComponents.add(moduleIdentifier); + } + }; // used by ssr in case component is cached and beforeCreate + // never gets called + + + options._ssrRegister = hook; + } else if (style) { + hook = shadowMode ? function () { + style.call(this, createInjectorShadow(this.$root.$options.shadowRoot)); + } : function (context) { + style.call(this, createInjector(context)); + }; + } + + if (hook) { + if (options.functional) { + // register for functional component in vue file + var originalRender = options.render; + + options.render = function renderWithStyleInjection(h, context) { + hook.call(context); + return originalRender(h, context); + }; + } else { + // inject component registration as beforeCreate hook + var existing = options.beforeCreate; + options.beforeCreate = existing ? [].concat(existing, hook) : [hook]; + } + } + + return script; + } + + var normalizeComponent_1 = normalizeComponent; + + /* script */ + const __vue_script__ = script; + + /* template */ + var __vue_render__ = function() { + var _vm = this; + var _h = _vm.$createElement; + var _c = _vm._self._c || _h; + return _c( + "div", + { attrs: { id: _vm.idName }, on: { click: _vm.generate } }, + [_vm._t("default", [_vm._v(" Download " + _vm._s(_vm.name) + " ")])], + 2 + ) + }; + var __vue_staticRenderFns__ = []; + __vue_render__._withStripped = true; + + /* style */ + const __vue_inject_styles__ = undefined; + /* scoped */ + const __vue_scope_id__ = undefined; + /* module identifier */ + const __vue_module_identifier__ = undefined; + /* functional template */ + const __vue_is_functional_template__ = false; + /* style inject */ + + /* style inject SSR */ + + + + var JsonExcel = normalizeComponent_1( + { render: __vue_render__, staticRenderFns: __vue_staticRenderFns__ }, + __vue_inject_styles__, + __vue_script__, + __vue_scope_id__, + __vue_is_functional_template__, + __vue_module_identifier__, + undefined, + undefined + ); + + return JsonExcel; + +}))); diff --git a/node_modules/_vue-json-excel@0.3.0@vue-json-excel/example-multi-line.png b/node_modules/_vue-json-excel@0.3.0@vue-json-excel/example-multi-line.png new file mode 100755 index 0000000000000000000000000000000000000000..b6993ebf26d2733163ce2f2d0bd524b595e4ec99 GIT binary patch literal 12028 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 gQQPh=XcRN@a5XD5^2P`KVk { +export const getLiveList = (params) => { return getRequest('/broadcast/studio', params) } +// 添加直播间 +export const addLive = (params) => { + return postRequest('/broadcast/studio', params) +} + +// 获取直播间详情 +export const getLiveInfo = (studioId) => { + return getRequest(`/broadcast/studio/studioInfo/${studioId}`) +} + +// 修改直播间 +export const editLive = (params) => { + return putRequest('/broadcast/studio/edit', params) +} // 获取店铺直播商品 export const getLiveGoods = (params) => { return getRequest('/broadcast/commodity', params) } +// 店铺直播间删除商品 +export const delLiveGoods = (goodsId) => { + return deleteRequest(`/broadcast/commodity/${goodsId}`) +} + +// 直播间删除商品 +export const delRoomLiveGoods = (roomId,liveGoodsId) => { + return deleteRequest(`/broadcast/studio/deleteInRoom/${roomId}/${liveGoodsId}`) +} + // 添加店铺直播商品 -export const addLiveGoods = (params) => { +export const addLiveStoreGoods = (params) => { return postRequestWithNoForm('/broadcast/commodity', params) } +// 店铺直播间添加 +export const addLiveGoods = (params) => { + return putRequest(`/broadcast/studio/push/${params.roomId}/${params.liveGoodsId}`) +} // 获取拼团列表 export const getPintuanList = (params) => { diff --git a/seller/src/config/index.js b/seller/src/config/index.js index d0a31bb8..f468ec53 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -22,10 +22,10 @@ export default { // buyer: 'https://buyer-api.pickmall.cn', // seller: 'https://store-api.pickmall.cn', // manager: 'https://admin-api.pickmall.cn' - common: 'http://192.168.0.103:8890', - buyer: 'http://192.168.0.103:8888', - seller: 'http://192.168.0.103:8889', - manager: 'http://192.168.0.103:8887' + common: 'http://192.168.0.109:8890', + buyer: 'http://192.168.0.109:8888', + seller: 'http://192.168.0.109:8889', + manager: 'http://192.168.0.109:8887' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index 165f9944..8e12694d 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -718,6 +718,9 @@ export default { }); }, }, + mounted () { + this.init(); + }, activated () { this.init(); }, diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index a345e731..cfa0c37e 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -1,8 +1,9 @@ diff --git a/seller/src/views/promotion/live/liveGoods.vue b/seller/src/views/promotion/live/liveGoods.vue index 62c7780f..0073af23 100644 --- a/seller/src/views/promotion/live/liveGoods.vue +++ b/seller/src/views/promotion/live/liveGoods.vue @@ -1,72 +1,102 @@ diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue index b2448ac9..7516938c 100644 --- a/seller/src/views/promotion/seckill/seckill.vue +++ b/seller/src/views/promotion/seckill/seckill.vue @@ -2,29 +2,12 @@
-
+ - + - @@ -32,13 +15,7 @@ - + @@ -46,14 +23,7 @@ - +
@@ -63,36 +33,14 @@ }}
 - +
@@ -193,8 +141,8 @@ export default { this.getDataList(); }, handleReset() { - this.searchForm = {} - this.selectDate = '' + this.searchForm = {}; + this.selectDate = ""; this.searchForm.pageNumber = 0; this.searchForm.pageSize = 10; this.getDataList(); @@ -234,9 +182,12 @@ export default { return hourArr; }, }, - activated () { + activated() { this.init(); - } + }, + mounted() { + this.init(); + }, };