From d015da898dc22c8492d69e72031c8a3f907359bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= Date: Sun, 16 Mar 2025 14:43:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(api):=20=E6=96=B0=E5=A2=9E=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 uploadFileWidthSn 和 uploadFileWidthSnForAnswer 方法用于上传文件 - 实现 getOssInfo 方法获取 OSS 信息 - 添加 cosUpload3D 和 cosUpload 方法上传文件到 COS- 实现 docuHousecosUpload 方法上传文件到阿里云和文档库 - 优化文件命名和错误处理 --- components.d.ts | 13 +- src/api/common.js | 147 ++++++++++++++++++ src/api/upload/index.js | 8 + src/components/contenteditable.vue | 120 +++++++++++--- src/fonts/moblie/demo.css | 4 +- src/fonts/moblie/iconfont.css | 16 ++ src/fonts/moblie/iconfont.woff | Bin 4296 -> 4752 bytes src/layouts/config3d.constant.js | 2 +- src/layouts/logic.js | 60 +++---- src/layouts/utils.js | 68 ++++---- src/utils/txyunCosUpLoad.js | 56 +++++++ .../Design/components/Questions/Choice.vue | 2 + .../components/Questions/SignQuestion.vue | 10 +- src/views/Survey/views/Create/Index.vue | 22 +-- src/views/Survey/views/Publish/Index.vue | 53 ++++--- 15 files changed, 462 insertions(+), 119 deletions(-) create mode 100644 src/api/common.js create mode 100644 src/api/upload/index.js create mode 100644 src/utils/txyunCosUpLoad.js diff --git a/components.d.ts b/components.d.ts index bc1c037..bdaf31a 100644 --- a/components.d.ts +++ b/components.d.ts @@ -2,15 +2,21 @@ // @ts-nocheck // Generated by unplugin-vue-components // Read more: https://github.com/vuejs/core/pull/3399 -export {}; +export {} /* prettier-ignore */ declare module 'vue' { export interface GlobalComponents { Contenteditable: typeof import('./src/components/contenteditable.vue')['default'] + ElButton: typeof import('element-plus/es')['ElButton'] + ElDropdown: typeof import('element-plus/es')['ElDropdown'] + ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] + ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] ElInput: typeof import('element-plus/es')['ElInput'] ElOption: typeof import('element-plus/es')['ElOption'] ElSelect: typeof import('element-plus/es')['ElSelect'] + ElSpace: typeof import('element-plus/es')['ElSpace'] + ElText: typeof import('element-plus/es')['ElText'] RichText: typeof import('./src/components/RichText.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] @@ -32,8 +38,13 @@ declare module 'vue' { VanRadio: typeof import('vant/es')['Radio'] VanRadioGroup: typeof import('vant/es')['RadioGroup'] VanRow: typeof import('vant/es')['Row'] + VanSearch: typeof import('vant/es')['Search'] VanStepper: typeof import('vant/es')['Stepper'] VanSwitch: typeof import('vant/es')['Switch'] + VanTab: typeof import('vant/es')['Tab'] + VanTabbar: typeof import('vant/es')['Tabbar'] + VanTabbarItem: typeof import('vant/es')['TabbarItem'] + VanTabs: typeof import('vant/es')['Tabs'] YLCascader: typeof import('./src/components/YLCascader.vue')['default'] YLInput: typeof import('./src/components/YLInput.vue')['default'] YLPicker: typeof import('./src/components/YLPicker.vue')['default'] diff --git a/src/api/common.js b/src/api/common.js new file mode 100644 index 0000000..fc4dfe9 --- /dev/null +++ b/src/api/common.js @@ -0,0 +1,147 @@ +import request from '@/utils/request'; +import createCOS from '@/utils/txyunCosUpLoad.js'; +import { uploadDocumentFile } from './upload/index.js'; +import router from '../router/index'; +import { computed } from 'vue'; +import { shrinkImage } from 'shrinkpng'; +const sn = computed(() => router.currentRoute.value.query.sn || 'default'); +export default class CommonApi { + static uploadFileWidthSn(file, sn) { + const formData = new FormData(); + formData.append('file', file); + formData.append('sn', sn || ''); + + return request({ + url: '/console/upload_file', + method: 'post', + data: formData + }); + } + static uploadFileWidthSnForAnswer(file, sn) { + const formData = new FormData(); + formData.append('file', file); + + return request({ + url: `/answer/upload_file/${sn}`, + method: 'post', + data: formData + }); + } + /** OssInfo */ + static getOssInfo() { + return request({ + url: '/console/files/credentials' + }); + } + static async cosUpload3DCompress(file, quality = 20) { + const _file = await shrinkImage(file, { quality }); + return await this.cosUpload3D(_file); + } + static async cosUpload3D(file, defaultName = '') { + let name = defaultName?.replace?.(/[\s+]/g, '_') || ''; + + const getRandomFileName = () => { + return `3D/upload/${new Date().getTime()}_${Math.floor(Math.random() * 1000)}`; + }; + + name = name || getRandomFileName(); + const { data } = await CommonApi.getOssInfo(); + const param = { + region: data.Region, + host: data.Host, + sessionToken: data.sessionToken, + tmpSecretId: data.tmpSecretId, + tmpSecretKey: data.tmpSecretKey, + bucket: data.Bucket, + startTime: data.startTime, + expiredTime: data.expiredTime, + name: `${data.prefix}/${name}`, + file + }; + + try { + const location = await createCOS(param); + return { + url: `https://${location}`, + name + }; + } catch (error) { + return { + url: '', + name: '' + }; + } + } + /** + * 上传文件 + * @param {文件file} file + * @returns {url:"",name:'fileName'} + */ + static async cosUpload(file, fileName) { + let name = fileName?.replace?.(/[\s+]/g, '_') || ''; + + const getRandomFileName = (name) => { + return `survey/${sn.value}/${new Date().getTime()}-${Math.floor(Math.random() * 1000)}-${name}`; + }; + /* eslint-disable no-useless-escape */ + const reg = /\\|\/|\?|\？|\*|"|“|”|'|‘|’|<|>|{|}|\[|\]|\【|\】|：|:|、|\^|\$|!|~|`|\s|\+/g; + name = + name || + getRandomFileName(file?.name?.replace(reg, '') ?? '' ?? `${new Date().getTime()}.png`); + const res = await CommonApi.getOssInfo(); + /* eslint-enable no-useless-escape */ + + const { data } = res.data; + const param = { + region: data.Region, + host: data.Host, + sessionToken: data.sessionToken, + tmpSecretId: data.tmpSecretId, + tmpSecretKey: data.tmpSecretKey, + bucket: data.Bucket, + startTime: data.startTime, + expiredTime: data.expiredTime, + name: `${data.prefix}/${name}`, + file + }; + try { + const location = await createCOS(param); + return { + url: `https://${location}`, + name + }; + } catch (error) { + return { + url: '', + name: '' + }; + } + } + /** + * 上传文件到阿里云和文档库 + * @param {文件file} file + * @param {问卷id} sn + * @param {1=问卷设计,2=数据分析,3=问卷预览,4=数据明细,5=图表分析,6=高级分析,7=市场模拟} importType + * @returns {url:"",name:'fileName'} + */ + static async docuHousecosUpload(file, sn, importType, startFileName = 'survey') { + // eslint-disable-next-line standard/no-callback-literal + const reg = /\\|\/|\?|？|\*|"|“|”|'|‘|’|<|>|{|}|\[|\]|【|】|：|:|、|\^|\$|!|~|`|\s|\+/g; + + // eslint-disable-next-line standard/no-callback-literal + const fileName = `${startFileName}/${new Date().getTime()}_${Math.floor(Math.random() * 1000)}_${ + file?.name?.replace(reg, '') ?? '' ?? `${new Date().getTime()}.png` + }`; + try { + const result = await this.cosUpload(file, fileName); + uploadDocumentFile({ + url: JSON.stringify([{ name: file.name, url: result.url, size: file.size }]), + parent_sn: sn?.value || sn, + import_type: importType || 1 + }); + return result; + } catch (error) { + // error + } + } +} diff --git a/src/api/upload/index.js b/src/api/upload/index.js new file mode 100644 index 0000000..2d06e5e --- /dev/null +++ b/src/api/upload/index.js @@ -0,0 +1,8 @@ +import request from '@/utils/request.js'; +export function uploadDocumentFile(data) { + return request({ + url: `/console/document_import`, + method: 'post', + data + }); +} diff --git a/src/components/contenteditable.vue b/src/components/contenteditable.vue index 67418c6..469cdca 100644 --- a/src/components/contenteditable.vue +++ b/src/components/contenteditable.vue @@ -1,9 +1,11 @@ diff --git a/src/fonts/moblie/demo.css b/src/fonts/moblie/demo.css index 18e8077..12ec742 100644 --- a/src/fonts/moblie/demo.css +++ b/src/fonts/moblie/demo.css @@ -4,11 +4,11 @@ src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834'); src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') - format('embedded-opentype'), + format('embedded-opentype'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'), url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') - format('svg'); + format('svg'); } .logo { diff --git a/src/fonts/moblie/iconfont.css b/src/fonts/moblie/iconfont.css index 2ad02d0..68b34b2 100644 --- a/src/fonts/moblie/iconfont.css +++ b/src/fonts/moblie/iconfont.css @@ -14,6 +14,22 @@ -moz-osx-font-smoothing: grayscale; } +.mobilefont-jiacu::before { + content: '\e71d'; +} + +.mobilefont-qingxie::before { + content: '\e71e'; +} + +.mobilefont-xiahuaxian::before { + content: '\e720'; +} + +.mobilefont-tupian::before { + content: '\e730'; +} + .mobilefont-del1::before { content: '\e637'; } diff --git a/src/fonts/moblie/iconfont.woff b/src/fonts/moblie/iconfont.woff index c21f7d0d95bed6a29c30e6549f90a4d52c321797..ff340bbf5f8d52b5afe65d7f770723d409b4f0fe 100644 GIT binary patch delta 4289 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 delta 3827 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 this[key] == item); + return Object.keys(this).some((key) => this[key] === item); } }; diff --git a/src/layouts/logic.js b/src/layouts/logic.js index 7ff8ce3..5c46026 100644 --- a/src/layouts/logic.js +++ b/src/layouts/logic.js @@ -368,39 +368,39 @@ export function isCross(range1, range2) { const isSibling = isLeft || isRight; // 逻辑包含循环 - const contain = - (isPlainSequence && - (((isNullish(start2) || isSequence(judge, start2, start1)) && - (isNullish(end2) || isSequence(judge, end2, start1))) || - ((isNullish(start2) || isSequence(start1, start2, end1)) && - (isNullish(end2) || isSequence(start1, end2, end1))))) || - (!isPlainSequence && - (judge < start1 - ? ((isNullish(start2) || isSequence(judge, start2, start1)) && - (isNullish(end2) || isSequence(judge, end2, start1))) || - ((isNullish(start2) || isSequence(start1, start2, end1)) && - (isNullish(end2) || isSequence(start1, end2, end1))) - : ((isNullish(start2) || isSequence(start1, start2, judge)) && - (isNullish(end2) || isSequence(start1, end2, judge))) || - ((isNullish(start2) || isSequence(judge, start2, end1)) && - (isNullish(end2) || isSequence(judge, end2, end1))))); + const contain + = (isPlainSequence + && (((isNullish(start2) || isSequence(judge, start2, start1)) + && (isNullish(end2) || isSequence(judge, end2, start1))) + || ((isNullish(start2) || isSequence(start1, start2, end1)) + && (isNullish(end2) || isSequence(start1, end2, end1))))) + || (!isPlainSequence + && (judge < start1 + ? ((isNullish(start2) || isSequence(judge, start2, start1)) + && (isNullish(end2) || isSequence(judge, end2, start1))) + || ((isNullish(start2) || isSequence(start1, start2, end1)) + && (isNullish(end2) || isSequence(start1, end2, end1))) + : ((isNullish(start2) || isSequence(start1, start2, judge)) + && (isNullish(end2) || isSequence(start1, end2, judge))) + || ((isNullish(start2) || isSequence(judge, start2, end1)) + && (isNullish(end2) || isSequence(judge, end2, end1))))); // 循环存在封闭区间，并且循环包含逻辑 - const contained = - !isNullish(start2) && - !isNullish(end2) && + const contained + = !isNullish(start2) + && !isNullish(end2) // [judge, start1, end1]; - ((isPlainSequence && start2 <= judge && end1 <= end2) || + && ((isPlainSequence && start2 <= judge && end1 <= end2) // [judge, start1, end1]; // [start1, judge, end1]; - (!isPlainSequence && start2 <= start1 && start2 <= judge && end1 <= end2)); + || (!isPlainSequence && start2 <= start1 && start2 <= judge && end1 <= end2)); // 循环不存在封闭区间 - const unCircled = - (!isNullish(start2) && - isNullish(end2) && - ((isPlainSequence && start2 === judge) || (!isPlainSequence && judge < start1) + const unCircled + = (!isNullish(start2) + && isNullish(end2) + && ((isPlainSequence && start2 === judge) || (!isPlainSequence && judge < start1) ? start2 === judge - : start2 === start1)) || - (isNullish(start2) && !isNullish(end2) && end2 === end1); + : start2 === start1)) + || (isNullish(start2) && !isNullish(end2) && end2 === end1); return !(isSibling || contain || contained || unCircled); } @@ -420,13 +420,13 @@ function isSequence(s1, s2, s3, equal) { * @param store */ export function updateNewQuestionsByLoopingEffect(quesSaveParam, store) { - const { questionInfoBeforeModified = {}, questionInfo = {} } = - JSON.parse(JSON.stringify(store.state.common)) || {}; + const { questionInfoBeforeModified = {}, questionInfo = {} } + = JSON.parse(JSON.stringify(store.state.common)) || {}; const oldPages = questionInfoBeforeModified.survey.pages; const newQuestions = questionInfo.questions; const newPages = questionInfo.survey.is_one_page_one_question - ? questionInfo.questions.filter((i) => i.question_index).map((i, idx) => [i.question_index]) + ? questionInfo.questions.filter((i) => i.question_index).map((i) => [i.question_index]) : questionInfo.survey.pages; const cycles = questionInfo.cycle_pages || []; diff --git a/src/layouts/utils.js b/src/layouts/utils.js index 8df15ec..7c44672 100644 --- a/src/layouts/utils.js +++ b/src/layouts/utils.js @@ -33,7 +33,9 @@ function showModal(options) { .then(() => { // confirm(); }) - .catch(() => {}); + .catch(() => { + // catch(); + }); } /** @@ -41,13 +43,13 @@ function showModal(options) { * @param {*} data * @returns */ -const canPlanetPublishPSM = function (data) { +const canPlanetPublishPSM = function(data) { let isFb = true; let message = ''; let title = '题目设置未完成'; const incompleteQuestionList = []; - data.questions && - data.questions.forEach((s) => { + data.questions + && data.questions.forEach((s) => { if (s.question_type === 101 && s.config.price_gradient.length <= 0) { isFb = false; message = 'psm题目未完成设置，请设置价格区间后投放'; @@ -72,15 +74,15 @@ const canPlanetPublishPSM = function (data) { * @param {*} data * @returns */ -const canPlanetPublishMxdAndHotArea = function (data) { +const canPlanetPublishMxdAndHotArea = function(data) { let isFb = true; let message = ''; const qSteams = []; const incompleteQuestionList = []; let type = 0; let title = '题目设置未完成'; - data.questions && - data.questions.forEach((s) => { + data.questions + && data.questions.forEach((s) => { if (s.question_type === 105 && s.config.design_version <= 0) { isFb = false; message = 'maxdiff题目未完成设置，请生成设计后投放'; @@ -119,21 +121,23 @@ const canPlanetPublishMxdAndHotArea = function (data) { * @param {*} data * @returns */ -const canPlanetPublish3D = function (data) { +const canPlanetPublish3D = function(data) { { let canFB = true; let message = ''; const qSteams = []; let title = ''; - data.questions && - data.questions.forEach((s) => { + data.questions + && data.questions.forEach((s) => { if (QUESTION_TYPE.contains(s.question_type)) { try { if (s.config.is_three_dimensions && !s.config.scene) { canFB = false; qSteams.push(`(${s.title})`); } - } catch (error) {} + } catch (error) { + // eslint-disable-next-line no-eval + } } }); @@ -154,15 +158,15 @@ const canPlanetPublish3D = function (data) { let message = ''; const qSteams = []; let title = ''; - data.questions && - data.questions.forEach((s) => { + data.questions + && data.questions.forEach((s) => { if (QUESTION_TYPE.contains(s.question_type)) { try { if (s.config.is_three_dimensions && s.config.is_binding_goods) { const wares = []; const _sceneInformation = s.config.scene_information; - const sceneInformation = - typeof _sceneInformation === 'string' + const sceneInformation + = typeof _sceneInformation === 'string' ? JSON.parse(_sceneInformation) : _sceneInformation; sceneInformation.shelves.forEach((shelf) => { @@ -174,7 +178,10 @@ const canPlanetPublish3D = function (data) { const options = s.options.flat(); s.associate.forEach((ass) => { - const question = data.questions.find((q) => q.question_index == ass.question_index); + // eslint-disable-next-line no-eval + const question = data.questions.find( + (q) => q.question_index === ass.question_index + ); if (!question) return; options.push(...question.options.flat()); }); @@ -184,7 +191,9 @@ const canPlanetPublish3D = function (data) { qSteams.push(`(${s.title})`); } } - } catch (error) {} + } catch (error) { + // error + } } }); @@ -207,14 +216,14 @@ const canPlanetPublish3D = function (data) { * @param {*} data * @returns */ -const canPlanetPublishImage = function (data) { +const canPlanetPublishImage = function(data) { { let canFB = true; let message = ''; const qSteams = []; let title = ''; - data.questions && - data.questions.forEach((s) => { + data.questions + && data.questions.forEach((s) => { if (s.question_type === 13) { try { if (s.options.length <= 0 || s.options.some((y) => y.length <= 0)) { @@ -284,9 +293,10 @@ function canPublishRandom(data, publishType) { const publishStr = ['', '预览', '投放'][publishType] || '投放'; const errors = []; + // eslint-disable-next-line no-eval const randomList = data?.survey?.group_pages || []; - randomList.forEach((random, randomIndex) => { + randomList.forEach((random) => { const list = random.list || []; // 每一个随机，至少要有两个随机题组 @@ -308,8 +318,8 @@ function canPublishRandom(data, publishType) { if (!isValidated) { errors.push({ message: - field.message || - `请填写"${random.title}"中第${index + 1}组"随机题组"的"${field.name}"` + field.message + || `请填写"${random.title}"中第${index + 1}组"随机题组"的"${field.name}"` }); } }); @@ -369,11 +379,11 @@ function isLoopingLogicValid(data, publishType) { if ( (data?.cycle_pages || []).every((i) => { return ( - i.question_index && - i.relation_type !== undefined && - i.relation_type !== null && - i.first_page && - i.last_page + i.question_index + && i.relation_type !== undefined + && i.relation_type !== null + && i.first_page + && i.last_page ); }) ) { @@ -397,7 +407,7 @@ function isLoopingLogicValid(data, publishType) { * @param sn * @param publishType undefined投放；null投放；0投放；1预览；2投放；3测试 */ -export const canPlanetPublish = async function (sn, publishType) { +export const canPlanetPublish = async function(sn, publishType) { const parsedPublishType = !publishType ? 2 : publishType; const num = window.location.href.indexOf('code='); let code; diff --git a/src/utils/txyunCosUpLoad.js b/src/utils/txyunCosUpLoad.js new file mode 100644 index 0000000..f4b9185 --- /dev/null +++ b/src/utils/txyunCosUpLoad.js @@ -0,0 +1,56 @@ +// const COS = require('cos-js-sdk-v5'); +import COS from 'cos-js-sdk-v5'; +/** + * + * @param {腾讯云的pramas} data + * @returns + */ +export default function createCOS(data) { + const { + bucket, + host, + region, + sessionToken, + tmpSecretId, + tmpSecretKey, + startTime, + expiredTime, + name, + file + } = data; + + const config = { + Region: region, + Host: host, + Bucket: bucket, + Key: name, + Body: file, + onProgress: (progressData) => { + console.log(progressData); + } + }; + const client = new COS({ + getAuthorization: (options, callback) => { + // eslint-disable-next-line standard/no-callback-literal + callback({ + TmpSecretId: tmpSecretId, + TmpSecretKey: tmpSecretKey, + SecurityToken: sessionToken, + // 建议返回服务器时间作为签名的开始时间，避免用户浏览器本地时间偏差过大导致签名错误 + StartTime: startTime, // 时间戳，单位秒，如：1580000000 + ExpiredTime: expiredTime + }); + } + // eslint-enable standard/no-callback-literal + }); + return new Promise((resolve, reject) => { + client.putObject(config, (err, data) => { + console.log('腾讯上传', err, data); + if (err) { + reject(err); + } else { + resolve(data.Location); + } + }); + }); +} diff --git a/src/views/Design/components/Questions/Choice.vue b/src/views/Design/components/Questions/Choice.vue index f9e0ddb..6257010 100644 --- a/src/views/Design/components/Questions/Choice.vue +++ b/src/views/Design/components/Questions/Choice.vue @@ -57,9 +57,11 @@ + diff --git a/src/views/Design/components/Questions/SignQuestion.vue b/src/views/Design/components/Questions/SignQuestion.vue index 06bc5b2..fe923a0 100644 --- a/src/views/Design/components/Questions/SignQuestion.vue +++ b/src/views/Design/components/Questions/SignQuestion.vue @@ -13,7 +13,6 @@ const signatureCanvas = useTemplateRef('signatureCanvas'); const canvasWidth = ref(100); const canvasHeight = computed(() => canvasWidth.value / 1.5); -const showSignText = ref(true); const isEraser = ref(false); let ctx: CanvasRenderingContext2D; @@ -193,7 +192,7 @@ const emitValue = () => { style="border: 1px dashed #ccc; border-radius: 4px" > -
+
{ >
-
请在空白区域书写您的签名
+
请在空白区域书写您的签名
@@ -259,13 +258,14 @@ const emitValue = () => { } } } + .sign-tips { position: absolute; - left: 50%; top: 50%; + left: 50%; width: max-content; - transform: translate(-50%, -50%); color: #cdcdcd; + transform: translate(-50%, -50%); } } diff --git a/src/views/Survey/views/Create/Index.vue b/src/views/Survey/views/Create/Index.vue index 468ec17..97e1616 100644 --- a/src/views/Survey/views/Create/Index.vue +++ b/src/views/Survey/views/Create/Index.vue @@ -97,6 +97,10 @@
+ + + +
保存 预览 @@ -397,14 +401,14 @@ const questionEvent = (item) => { options: item.json.options.length > 0 ? item.json.options.map((item) => { - return item.map((it) => { - return { - ...it, - // 主键生成 - id: uuidv4() - }; - }); - }) + return item.map((it) => { + return { + ...it, + // 主键生成 + id: uuidv4() + }; + }); + }) : [] }) ); @@ -537,7 +541,7 @@ const previewQuestion = () => { router.push({ name: 'preview', query: { ...route.query } }); }; -onMounted(async () => { +onMounted(async() => { await getQuestionDetail(); }); diff --git a/src/views/Survey/views/Publish/Index.vue b/src/views/Survey/views/Publish/Index.vue index 04661b8..bf76b21 100644 --- a/src/views/Survey/views/Publish/Index.vue +++ b/src/views/Survey/views/Publish/Index.vue @@ -4,9 +4,11 @@
- + alt="" + />
@@ -26,8 +28,13 @@
点击"启用"按钮后，问卷才可以开始回收数据
- + @@ -92,21 +99,21 @@ type OperateItem = (typeof operateList)[0]; const operateBtn = (item: OperateItem) => { switch (item.type) { - case 'shareLink': - shareLink(); - break; - case 'copyLink': - copyLink(); - break; - case 'qrCode': - downLoadImg(); - break; - default: - break; + case 'shareLink': + shareLink(); + break; + case 'copyLink': + copyLink(); + break; + case 'qrCode': + downLoadImg(); + break; + default: + break; } }; // 复制链接 -function copyLink () { +function copyLink() { const input = document.createElement('input'); input.value = publishInfo.value.url; document.body.appendChild(input); @@ -116,7 +123,7 @@ function copyLink () { showToast('复制成功'); } // 分享链接 -function shareLink () { +function shareLink() { const params = { type: 'shareToWx', title: publishInfo.value.download_url.title, @@ -126,11 +133,11 @@ function shareLink () { scene: 0 // 朋友圈1 微信好友0 }; console.log('shareUrl', publishInfo.value.url); - appBridge.shareToWeChat(params, () => { }); + appBridge.shareToWeChat(params); } // 下载二维码 -function downLoadImg () { +function downLoadImg() { const { title, url } = publishInfo.value.download_url; if (utils.getSessionStorage('xToken')) { appBridge.save2Album(url, () => { @@ -145,7 +152,7 @@ function downLoadImg () { document.body.removeChild(link); } } -async function openPublishModal () { +async function openPublishModal() { const res = await canPlanetPublish(route.query.sn as string, publishType.value); if (res) { await publishSurvey({ @@ -161,7 +168,7 @@ async function openPublishModal () { } } -function getCode () { +function getCode() { getQrcode(sn) .then((res) => { if (res.data) { @@ -172,7 +179,7 @@ function getCode () { showFailToast(error.data?.message || error.message || '服务器错误'); }); } -function fetchInfo () { +function fetchInfo() { getSurveyInfo(sn) .then((res) => { status.value = Number(res.data.data.status); @@ -186,7 +193,7 @@ watch(status, (val) => { getCode(); } }); -onMounted(async () => { +onMounted(async() => { // status.value = 0; // publishInfo.value.img_url // = 'https://test-cxp-pubcos.yili.com/uat-yls//survey-api/publish/202503130938138261340.png';