diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 9d24007..b0b0357 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -5,6 +5,4 @@ // Generated by unplugin-auto-import // biome-ignore lint: disable export {} -declare global { - -} +declare global {} diff --git a/components.d.ts b/components.d.ts index bdaf31a..8457d1e 100644 --- a/components.d.ts +++ b/components.d.ts @@ -29,8 +29,6 @@ declare module 'vue' { VanCol: typeof import('vant/es')['Col'] VanDivider: typeof import('vant/es')['Divider'] VanField: typeof import('vant/es')['Field'] - VanGrid: typeof import('vant/es')['Grid'] - VanGridItem: typeof import('vant/es')['GridItem'] VanIcon: typeof import('vant/es')['Icon'] VanNavBar: typeof import('vant/es')['NavBar'] VanPicker: typeof import('vant/es')['Picker'] @@ -38,12 +36,9 @@ 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'] diff --git a/package-lock.json b/package-lock.json index 6709658..c42e2e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,13 @@ "dependencies": { "@element-plus/icons-vue": "^2.3.1", "axios": "^1.8.2", + "cos-js-sdk-v5": "^1.8.7", "dotenv": "^16.4.7", "element-plus": "^2.7.8", "js-base64": "^3.7.7", "lodash": "^4.17.21", "pinia": "^2.1.7", + "shrinkpng": "^1.2.0-beta.1", "sortablejs": "^1.15.6", "uuid": "^11.1.0", "vant": "^4.9.17", @@ -508,6 +510,18 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/runtime-corejs3": { + "version": "7.26.10", + "resolved": "https://registry.npmmirror.com/@babel/runtime-corejs3/-/runtime-corejs3-7.26.10.tgz", + "integrity": "sha512-uITFQYO68pMEYR46AHgQoyBg7KPPJDAbGn4jUTIRgCFJIp88MIBUianVOplhZDEec07bp9zIyr4Kp0FCyQzmWg==", + "dependencies": { + "core-js-pure": "^3.30.2", + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/template": { "version": "7.26.9", "dev": true, @@ -5416,6 +5430,24 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/core-js-pure": { + "version": "3.41.0", + "resolved": "https://registry.npmmirror.com/core-js-pure/-/core-js-pure-3.41.0.tgz", + "integrity": "sha512-71Gzp96T9YPk63aUvE5Q5qP+DryB4ZloUZPSOebGM88VNw8VNfvdA7z6kGA8iGOTEzAomsRidp4jXSmUIJsL+Q==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/cos-js-sdk-v5": { + "version": "1.8.7", + "resolved": "https://registry.npmmirror.com/cos-js-sdk-v5/-/cos-js-sdk-v5-1.8.7.tgz", + "integrity": "sha512-KK3PYbUiLxcjvVhyvEeBQRWzDgAmuldDZQL1lTRM0aeQaI+hlm84xQQQyv+oIRxPnnAIleZF2vUgB4sJFUzcxQ==", + "dependencies": { + "fast-xml-parser": "4.5.0" + } + }, "node_modules/cosmiconfig": { "version": "9.0.0", "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz", @@ -6848,6 +6880,27 @@ } ] }, + "node_modules/fast-xml-parser": { + "version": "4.5.0", + "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", + "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + }, + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + } + ], + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, "node_modules/fastest-levenshtein": { "version": "1.0.16", "resolved": "https://registry.npmmirror.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", @@ -8635,6 +8688,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/pako": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz", + "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==" + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz", @@ -9545,6 +9603,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/shrinkpng": { + "version": "1.2.0-beta.1", + "resolved": "https://registry.npmmirror.com/shrinkpng/-/shrinkpng-1.2.0-beta.1.tgz", + "integrity": "sha512-14B3Na+thQHyXkz1cMXKcMQ/mYBCJFWck1Z5z3NzmQqF5x712vuM9WWt2g/2V6/+ZYUA40FQLyNl6Q9TcffdEw==", + "dependencies": { + "@babel/runtime-corejs3": "^7.18.3", + "pako": "^2.0.4", + "uzip": "^0.20201231.0" + } + }, "node_modules/side-channel": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz", @@ -9825,6 +9893,17 @@ "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", "dev": true }, + "node_modules/strnum": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/strnum/-/strnum-1.1.2.tgz", + "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ] + }, "node_modules/style-search": { "version": "0.1.0", "resolved": "https://registry.npmmirror.com/style-search/-/style-search-0.1.0.tgz", @@ -10768,6 +10847,11 @@ "uuid": "dist/esm/bin/uuid" } }, + "node_modules/uzip": { + "version": "0.20201231.0", + "resolved": "https://registry.npmmirror.com/uzip/-/uzip-0.20201231.0.tgz", + "integrity": "sha512-OZeJfZP+R0z9D6TmBgLq2LHzSSptGMGDGigGiEe0pr8UBe/7fdflgHlHBNDASTXB5jnFuxHpNaJywSg8YFeGng==" + }, "node_modules/vant": { "version": "4.9.17", "resolved": "https://registry.npmmirror.com/vant/-/vant-4.9.17.tgz", diff --git a/src/App.vue b/src/App.vue index 1301bf3..aee81b0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,7 +4,7 @@ import { onMounted } from 'vue'; import appBridge from '@/assets/js/appBridge'; import utils from '@/assets/js/common'; -onMounted(async() => { +onMounted(async () => { if (utils.getParameter('digitalYiliToken')) { // 隐藏/显示 header appBridge.setHeaderShown(false); diff --git a/src/api/common.js b/src/api/common.js index 1c90620..fc4dfe9 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -85,9 +85,9 @@ export default class CommonApi { }; /* eslint-disable no-useless-escape */ const reg = /\\|\/|\?|\？|\*|"|“|”|'|‘|’|<|>|{|}|\[|\]|\【|\】|：|:|、|\^|\$|!|~|`|\s|\+/g; - name - = name - || getRandomFileName(file?.name?.replace(reg, '') ?? '' ?? `${new Date().getTime()}.png`); + name = + name || + getRandomFileName(file?.name?.replace(reg, '') ?? '' ?? `${new Date().getTime()}.png`); const res = await CommonApi.getOssInfo(); /* eslint-enable no-useless-escape */ diff --git a/src/assets/css/public.scss b/src/assets/css/public.scss index cc802c0..f91a578 100644 --- a/src/assets/css/public.scss +++ b/src/assets/css/public.scss @@ -1,5 +1,5 @@ .van-nav-bar { - z-index:999; + z-index: 999; padding-top: calc(var(--status-bar-height) + 15px) !important; } diff --git a/src/components/YLPicker.vue b/src/components/YLPicker.vue index c5108d0..7e5cf8f 100644 --- a/src/components/YLPicker.vue +++ b/src/components/YLPicker.vue @@ -170,8 +170,8 @@ const getMaxDateLimit = computed(() => { props.format ); const tempStr = '0000-12-31 23:59:59'; - const result - = props.maxDate.length !== 0 && thisMax.length > props.maxDate.length + const result = + props.maxDate.length !== 0 && thisMax.length > props.maxDate.length ? thisMax.slice(0, props.maxDate.length) + tempStr.slice(props.maxDate.length) : thisMax; return result.slice(0, props.format.length); @@ -194,8 +194,8 @@ function onChange({ selectedValues, columnIndex }) { renderMinuteColumns, renderSecondColumns ]; - updateColumns[columnIndex] - && updateColumns[columnIndex](changeValue, getMinDateLimit.value, getMaxDateLimit.value, false); + updateColumns[columnIndex] && + updateColumns[columnIndex](changeValue, getMinDateLimit.value, getMaxDateLimit.value, false); } // 渲染全部列 diff --git a/src/components/contenteditable.vue b/src/components/contenteditable.vue index ca0cbd0..b49a89b 100644 --- a/src/components/contenteditable.vue +++ b/src/components/contenteditable.vue @@ -62,7 +62,7 @@ const functions = { document.execCommand('italic', false, null); }, - uploadImage: async() => { + uploadImage: async () => { // 保存当前光标位置 savedRange.value = saveSelection(); @@ -71,7 +71,7 @@ const functions = { fileInput.click(); - fileInput.onchange = async(e) => { + fileInput.onchange = async (e) => { const [file] = e.target.files; if (!file) return; if (file.size > 2 * 1024 * 1024) { diff --git a/src/fonts/demo.css b/src/fonts/demo.css index 12ec742..18e8077 100644 --- a/src/fonts/demo.css +++ b/src/fonts/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/demo.css b/src/fonts/moblie/demo.css index 12ec742..18e8077 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/layouts/index.vue b/src/layouts/index.vue index e2407be..6158244 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -4,7 +4,7 @@
diff --git a/src/layouts/logic.js b/src/layouts/logic.js index faf812e..c121a41 100644 --- a/src/layouts/logic.js +++ b/src/layouts/logic.js @@ -376,39 +376,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); } @@ -428,8 +428,8 @@ 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; diff --git a/src/layouts/utils.js b/src/layouts/utils.js index 1f7473d..b56ec84 100644 --- a/src/layouts/utils.js +++ b/src/layouts/utils.js @@ -43,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题目未完成设置，请设置价格区间后投放'; @@ -73,15 +73,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题目未完成设置，请生成设计后投放'; @@ -120,14 +120,14 @@ 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) { @@ -157,15 +157,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) => { @@ -215,14 +215,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)) { @@ -317,8 +317,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}"` }); } }); @@ -397,11 +397,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 ); }) ) { @@ -425,7 +425,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/request/api/modules/survey.ts b/src/request/api/modules/survey.ts index 24a3eba..c665a46 100644 --- a/src/request/api/modules/survey.ts +++ b/src/request/api/modules/survey.ts @@ -1,2 +1,2 @@ -export const surveyQuestion - = 'https://yls-api-uat.dctest.digitalyili.com/api/console/surveys/RWNK9BYp/questions'; +export const surveyQuestion = + 'https://yls-api-uat.dctest.digitalyili.com/api/console/surveys/RWNK9BYp/questions'; diff --git a/src/request/axios/index.ts b/src/request/axios/index.ts index bded0ab..9f947d0 100644 --- a/src/request/axios/index.ts +++ b/src/request/axios/index.ts @@ -39,10 +39,10 @@ service.interceptors.request.use( service.interceptors.response.use( (response) => { if ( - response.status === 200 - || response.status === 201 - || response.status === 202 - || response.status === 204 + response.status === 200 || + response.status === 201 || + response.status === 202 || + response.status === 204 ) { if (response.config.method === 'put') { // message.success('保存中...'); diff --git a/src/utils/request.js b/src/utils/request.js index 9f27953..22eaabf 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -45,10 +45,10 @@ service.interceptors.request.use( service.interceptors.response.use( (response) => { if ( - response.status === 200 - || response.status === 201 - || response.status === 202 - || response.status === 204 + response.status === 200 || + response.status === 201 || + response.status === 202 || + response.status === 204 ) { if (response.config.method === 'put') { // message.success('保存中...'); diff --git a/src/views/Design/Index.vue b/src/views/Design/Index.vue index 3de68be..1476471 100644 --- a/src/views/Design/Index.vue +++ b/src/views/Design/Index.vue @@ -52,8 +52,8 @@
@@ -13,7 +17,11 @@ name="setting " @click="openMoveModel(element, index) "/>--> - +
@@ -29,7 +37,10 @@ @@ -37,17 +48,26 @@ - + @@ -115,23 +135,23 @@ const openOptionActionModel = (item, index) => { // 上下移动 const optionMove = (action) => { switch (action.action) { - case 'up': - if (activeIndex.value === 0) { - moveShow.value = false; - return false; - } - // 向上移动 - element.value.splice(activeIndex.value - 1, 0, element.value.splice(activeIndex.value, 1)[0]); - activeIndex.value -= 1; - break; - case 'down': - if (activeIndex.value === element.value.length - 1) { - moveShow.value = false; - return false; - } - element.value.splice(activeIndex.value + 1, 0, element.value.splice(activeIndex.value, 1)[0]); - activeIndex.value += 1; - break; + case 'up': + if (activeIndex.value === 0) { + moveShow.value = false; + return false; + } + // 向上移动 + element.value.splice(activeIndex.value - 1, 0, element.value.splice(activeIndex.value, 1)[0]); + activeIndex.value -= 1; + break; + case 'down': + if (activeIndex.value === element.value.length - 1) { + moveShow.value = false; + return false; + } + element.value.splice(activeIndex.value + 1, 0, element.value.splice(activeIndex.value, 1)[0]); + activeIndex.value += 1; + break; } }; @@ -166,15 +186,15 @@ const deleteOption = (index) => { font-size: 16px; } - & .mobilefont+.mobilefont { + & .mobilefont + .mobilefont { margin-left: 5px; } - & .van-icon+.van-icon { + & .van-icon + .van-icon { margin-left: 5px; } - & .van-icon+.mobilefont { + & .van-icon + .mobilefont { margin-left: 5px; } } diff --git a/src/views/Design/components/ActionCompoents/QuestionAction.vue b/src/views/Design/components/ActionCompoents/QuestionAction.vue index 806f851..9f6630e 100644 --- a/src/views/Design/components/ActionCompoents/QuestionAction.vue +++ b/src/views/Design/components/ActionCompoents/QuestionAction.vue @@ -260,8 +260,8 @@ const getSkipTypeText = (skipType) => { const ls = []; logics.map((item) => { if ( - item.skip_type === skipType - && item.question_index === activeQuestion.value.question_index + item.skip_type === skipType && + item.question_index === activeQuestion.value.question_index ) { ls.push(item); } @@ -277,13 +277,13 @@ const getSkipTypeText = (skipType) => { const questionSetting = (type) => { switch (type) { - case 'before': - questionBeforeShow.value = true; + case 'before': + questionBeforeShow.value = true; - break; - case 'after': - questionBeforeShow.value = true; - break; + break; + case 'after': + questionBeforeShow.value = true; + break; } skipType.value = type === 'before' ? 1 : 0; }; diff --git a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/BeforComponent/BeforeMartrixCheckbox.vue b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/BeforComponent/BeforeMartrixCheckbox.vue index cc11ec5..9531127 100644 --- a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/BeforComponent/BeforeMartrixCheckbox.vue +++ b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/BeforComponent/BeforeMartrixCheckbox.vue @@ -4,7 +4,11 @@ - + diff --git a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/BeforComponent/BeforeMartrixRadio.vue b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/BeforComponent/BeforeMartrixRadio.vue index 02f1277..d4e330f 100644 --- a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/BeforComponent/BeforeMartrixRadio.vue +++ b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/BeforComponent/BeforeMartrixRadio.vue @@ -4,7 +4,11 @@ - + diff --git a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/QuestionBefore.vue b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/QuestionBefore.vue index 994803c..1babf29 100644 --- a/src/views/Design/components/ActionCompoents/components/QuestionItemAction/QuestionBefore.vue +++ b/src/views/Design/components/ActionCompoents/components/QuestionItemAction/QuestionBefore.vue @@ -144,8 +144,8 @@