diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss index 501047c..d8616ea 100644 --- a/src/assets/css/base.scss +++ b/src/assets/css/base.scss @@ -22,6 +22,9 @@ --status-bar-height: 20px; --sticky-top-height: calc(var(--status-bar-height) + calc(var(--van-nav-bar-height) + 13px)); --van-radius-sm: 16px; + --van-tabs-line-height: 30px; + --van-tabs-bottom-bar-height: 2px; + --van-tabs-bottom-bar-width: 28px; } /* semantic color variables for this project */ diff --git a/src/assets/css/public.scss b/src/assets/css/public.scss index 27a36fb..a557ca5 100644 --- a/src/assets/css/public.scss +++ b/src/assets/css/public.scss @@ -17,6 +17,20 @@ background: #f2f2f2; } +.van-tabs__nav--line.van-tabs__nav--shrink, +.van-tabs__nav--line.van-tabs__nav--complete { + padding-left: 0; +} + +.van-tab--grow { + margin: 0 20px 0 0; + padding: 0; +} + +.van-tab--grow:last-child { + margin-right: 0; +} + .van-radio-group { & .van-radio { .van-radio__icon--checked { diff --git a/src/assets/img/home/home-back.png b/src/assets/img/home/home-back.png new file mode 100644 index 0000000..fcb37f9 Binary files /dev/null and b/src/assets/img/home/home-back.png differ diff --git a/src/assets/img/home/home-pen.png b/src/assets/img/home/home-pen.png new file mode 100644 index 0000000..7212b5f Binary files /dev/null and b/src/assets/img/home/home-pen.png differ diff --git a/src/fonts/iconfont.css b/src/fonts/iconfont.css index 8d53a6b..a7b45e4 100644 --- a/src/fonts/iconfont.css +++ b/src/fonts/iconfont.css @@ -138,6 +138,6 @@ content: '\e6a0'; } -.mobilefont-fasong:before { +.mobilefont-fasong::before { content: '\e647'; } diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 05e1744..3f142ed 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -3,7 +3,7 @@
@@ -36,16 +36,28 @@ function goBack() { diff --git a/src/layouts/utils.js b/src/layouts/utils.js index 6b55ed1..f2d52b8 100644 --- a/src/layouts/utils.js +++ b/src/layouts/utils.js @@ -1,9 +1,8 @@ import { showConfirmDialog } from 'vant'; -import { getQuestionList, getCheckSurvey } from '@/api/survey'; +import { getQuestionList } from '@/api/survey'; import { QUESTION_TYPE } from '@/layouts/config3d.constant.js'; import { loopingAvailable } from '@/layouts/logic.js'; import { getDomText } from '@/utils/utils'; -import utils from '@/assets/js/common'; // /** // * 统一的弹窗 // * @param options @@ -431,6 +430,7 @@ export const canPlanetPublish = async function(sn, publishType) { if (!canPublishRandom(data?.data, parsedPublishType)) return false; if (!isLoopingLogicValid(data?.data, parsedPublishType)) return false; + /* eslint-disable */ // if (parsedPublishType === 2) { // const qrcodeRes = await getCheckSurvey(sn); // if (qrcodeRes?.data?.data?.show_test_button) { @@ -478,6 +478,6 @@ export const canPlanetPublish = async function(sn, publishType) { // if (!res) return; // } // } - + /* eslint-enable */ return true; }; diff --git a/src/router/index.ts b/src/router/index.ts index 9bb275c..fecb8c5 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,6 +1,7 @@ import { createRouter, createWebHistory } from 'vue-router'; import layout from '@/layouts/index.vue'; import Design from '@/views/Design/Index.vue'; +import Redirect from '@/layouts/redirect.vue'; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), routes: [ @@ -20,7 +21,18 @@ const router = createRouter({ title: '伊调研' }, component: () => import('../views/Home/Index.vue') - }, + } + ] + }, + { + path: '/redirect', + name: '/redirect', + component: Redirect, + redirect: '/survey', + meta: { + title: '伊调研' + }, + children: [ { path: '/survey', name: 'survey', diff --git a/src/views/Design/components/Questions/NPS.vue b/src/views/Design/components/Questions/NPS.vue index 63a6294..46d769e 100644 --- a/src/views/Design/components/Questions/NPS.vue +++ b/src/views/Design/components/Questions/NPS.vue @@ -32,8 +32,9 @@ + /> @@ -45,8 +46,9 @@ import { ref } from 'vue'; import RateCharacter from './RateCharacter.vue'; +const value = defineModel('value', { default: -1, type: Number }); const isPreview = defineModel('isPreview', { default: false, type: Boolean }); -/*const props = */ defineProps({ +/* const props = */ defineProps({ index: { type: Number, default: 0 diff --git a/src/views/Design/components/Questions/RateCharacter.vue b/src/views/Design/components/Questions/RateCharacter.vue index 622518d..77b9676 100644 --- a/src/views/Design/components/Questions/RateCharacter.vue +++ b/src/views/Design/components/Questions/RateCharacter.vue @@ -16,8 +16,8 @@ diff --git a/src/views/Home/components/Market/Index.vue b/src/views/Home/components/Market/Index.vue index d415552..f352511 100644 --- a/src/views/Home/components/Market/Index.vue +++ b/src/views/Home/components/Market/Index.vue @@ -3,9 +3,10 @@
模板市场
- + + + -

-更多模板期待您的探索-

@@ -70,11 +71,12 @@ onMounted(() => { .market { margin-top: 10px; - padding: 15px 15px 0; - border-radius: 10px; + padding: 10px 12px 0; + border-radius: 16px; background: #fff; .market_title { + margin-bottom: 5px; color: #000; font-size: 15px; } diff --git a/src/views/Home/components/Market/components/MarketItem.vue b/src/views/Home/components/Market/components/MarketItem.vue index 938ffe5..fe3ffaf 100644 --- a/src/views/Home/components/Market/components/MarketItem.vue +++ b/src/views/Home/components/Market/components/MarketItem.vue @@ -26,11 +26,12 @@ style="color: #c1c1c1" />
-
+

创建人

{{ item.created_user }}

+

引用次数

{{ item.quote_nums }}

@@ -93,23 +94,36 @@ onMounted(() => { display: flex; flex-wrap: wrap; justify-content: space-between; + padding: 10px 0; } .market-item { //margin-right: 4%; + flex: 1; box-sizing: border-box; - width: 49%; - margin-bottom: 12px; - padding: 10px; - border-radius: 8px; - background: #fff; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + max-width: 50%; + margin-bottom: 5px; + margin-left: 7px; + padding: 15px 12px; + border: 1px solid #fff; + border-radius: 10px; + background: rgba(241, 241, 241, 0.39); - // 偶数项的 margin-right 设置为 0 - &:nth-child(even) { + &:nth-child(n-1) { + margin-right: 7px; + margin-left: 0; + } + + &:nth-child(2n) { margin-right: 0; } + //width: 49%; + //margin-bottom: 12px; + //padding: 10px; + //border-radius: 8px; + //background: #fff; + //box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); .content { .title { display: flex; @@ -137,6 +151,13 @@ onMounted(() => { color: #666; font-size: 12px; + .line { + width: 1px; + height: 20px; + background: #979797; + opacity: 0.1; + } + div p:last-child { color: #000; } diff --git a/src/views/Survey/Index.vue b/src/views/Survey/Index.vue index af21793..b737ff5 100644 --- a/src/views/Survey/Index.vue +++ b/src/views/Survey/Index.vue @@ -1,10 +1,10 @@