diff --git a/src/App.vue b/src/App.vue
index 31ddf52..d1fd5a8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,9 @@
-
+
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/router/index.ts b/src/router/index.ts
index 429ec77..65cdbaf 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,16 +1,43 @@
import { createRouter, createWebHistory } from 'vue-router';
-import Home from '../views/Home/Index.vue';
+import layout from '@/layouts/index.vue';
import Design from '@/views/Design/Index.vue';
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
routes: [
{
path: '/',
- name: 'home',
- component: Home,
+ name: '/',
+ component: layout,
+ redirect: '/home',
meta: {
title: '首页'
- }
+ },
+ children: [
+ {
+ path: '/home',
+ name: 'home',
+ meta: {
+ title: '首页'
+ },
+ component: () => import('../views/Home/Index.vue')
+ },
+ {
+ path: '/survey',
+ name: 'survey',
+ meta: {
+ title: '问卷'
+ },
+ component: () => import('../views/Survey/Index.vue')
+ },
+ {
+ path: '/market',
+ name: 'market',
+ meta: {
+ title: '模板'
+ },
+ component: () => import('../views/Market/Index.vue')
+ }
+ ]
},
{
path: '/design',
@@ -20,22 +47,6 @@ const router = createRouter({
// this generates a separate chunk (About.[hash].js) for this route
// which is lazy-loaded when the route is visited.
component: Design
- },
- {
- path: '/survey',
- name: 'survey',
- meta: {
- title: '问卷'
- },
- component: () => import('../views/Survey/Index.vue')
- },
- {
- path: '/market',
- name: 'market',
- meta: {
- title: '模板'
- },
- component: () => import('../views/Market/Index.vue')
}
]
});
diff --git a/src/views/Design/components/ActionCompoents/OptionAction.vue b/src/views/Design/components/ActionCompoents/OptionAction.vue
index d215430..ae6c5a6 100644
--- a/src/views/Design/components/ActionCompoents/OptionAction.vue
+++ b/src/views/Design/components/ActionCompoents/OptionAction.vue
@@ -82,23 +82,23 @@ const openOptionActionModel = (item, index) => {
// 上下移动
const optionMove = (action) => {
switch (action) {
- case 'up':
- if (activeIndex.value === 0) {
- show.value = false;
- return;
- }
- // 向上移动
- 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) {
- show.value = false;
- return;
- }
- element.value.splice(activeIndex.value + 1, 0, element.value.splice(activeIndex.value, 1)[0]);
- activeIndex.value += 1;
- break;
+ case 'up':
+ if (activeIndex.value === 0) {
+ show.value = false;
+ return;
+ }
+ // 向上移动
+ 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) {
+ show.value = false;
+ return;
+ }
+ element.value.splice(activeIndex.value + 1, 0, element.value.splice(activeIndex.value, 1)[0]);
+ activeIndex.value += 1;
+ break;
}
};
diff --git a/src/views/Design/components/ActionCompoents/QuestionAction.vue b/src/views/Design/components/ActionCompoents/QuestionAction.vue
index e62b8dd..858aee7 100644
--- a/src/views/Design/components/ActionCompoents/QuestionAction.vue
+++ b/src/views/Design/components/ActionCompoents/QuestionAction.vue
@@ -35,19 +35,21 @@
- {{ getSkipTypeText() }}
+ {{ getSkipTypeText(0) }}
- 设置
+ {{ getSkipTypeText(1) }}
-
-
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/Home/components/Suvrey/Index.vue b/src/views/Home/components/Suvrey/Index.vue
index 4c57425..3b9f51a 100644
--- a/src/views/Home/components/Suvrey/Index.vue
+++ b/src/views/Home/components/Suvrey/Index.vue
@@ -6,25 +6,22 @@
全部问卷>
-
+
\ No newline at end of file
+
diff --git a/src/views/Market/Index.vue b/src/views/Market/Index.vue
index e15e443..e25ee42 100644
--- a/src/views/Market/Index.vue
+++ b/src/views/Market/Index.vue
@@ -3,7 +3,9 @@
报名/签到模板
-
报名签到 | 引用 {{ item }} 次 | 创建人: {{ '张三' }}
+
报名签到 | 引用 {{ item }} 次 | 创建人: {{ '张三' }}