hz/ylst-h5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/feature-20250331-h5' into uat

Browse Source
This commit is contained in:
LHY\18810
2025-03-16 11:57:25 +08:00
parent 78c4f11039 4952201e77
commit d7bedc95e1
8 changed files with 76 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/Design/Index.vue
View File

@@ -52,8 +52,8 @@
<martrix-question
v-if="
element.question_type === 8 ||
element.question_type === 9 ||
element.question_type === 10
element.question_type === 9 ||
element.question_type === 10
"
:element="computedElement(element)"
:index="index"
@@ -87,7 +87,7 @@
:active="chooseQuestionId === element.id"
@update:element="updateElement"
/>
<!--图文-->
<!--NPS-->
<NPS
v-if="element.question_type === 106"
:element="computedElement(element)"

20
src/views/Design/components/ActionCompoents/QuestionAction.vue
View File

@@ -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;
};
@@ -316,8 +316,8 @@ const updateConfig = (value) => {
.question-action-container {
font-size: 20px;
& .mobilefont{
font-size:18px;
& .mobilefont {
font-size: 18px;
}
& .van-icon + .van-icon {

4
src/views/Design/components/Questions/NPS.vue
View File

@@ -19,12 +19,12 @@
:key="optionIndex"
@click="chooseOption(item)"
>
<RateCharacter v-model="answerValue" :config="element.config"></RateCharacter>
<div class="tips">
<p>{{ element.config.prompt_left }}</p>
<p>{{ element.config.prompt_center }}</p>
<p>{{ element.config.prompt_right }}</p>
</div>
<RateCharacter v-model="answerValue" :config="element.config"></RateCharacter>
</div>
</div>
</template>
@@ -71,6 +71,6 @@ const chooseOption = (item) => {
.tips {
display: flex;
justify-content: space-between;
color: #bfbfbf;
color: #b8b8b8;
}
</style>

1
src/views/Design/components/Questions/Rate.vue
View File

@@ -5,6 +5,7 @@
:label="element.stem"
:required="element.config.is_required === 1"
label-align="top"
class="contenteditable-question-title"
>
<template #left-icon>
{{ index + 1 }}

2
src/views/Design/components/Questions/RateCharacter.vue
View File

@@ -95,7 +95,7 @@ ul {
.rate_item {
margin: 0 3px;
margin-top: 5px;
padding: 0 7px;
padding: 0 6px;
border: 1px solid #ddd;
border-radius: 4px;
color: #666;

6
src/views/Home/components/CreateSurvey/Index.vue
View File

@@ -96,9 +96,7 @@ onMounted(() => {
color: #000;
font-weight: bold;
font-size: 15px;
font-family:
PingFangSC,
'PingFang SC';
font-family: PingFangSC, 'PingFang SC';
}
}
@@ -114,8 +112,6 @@ onMounted(() => {
color: #000;
font-weight: 400;
font-size: 0.34rem;
//font-family: PingFangHK, PingFangHK;
}
}
</style>

4
src/views/Home/components/Market/Index.vue
View File

@@ -20,7 +20,7 @@ const marketList = ref([]);
const active = ref(null);
const marketInfo = ref([]);
const getTableList = async() => {
const getTableList = async () => {
const res = await getListScene();
if (res.data.code === 0) {
res.data.data.forEach((item) => {
@@ -32,7 +32,7 @@ const getTableList = async() => {
getMarketInfo(marketList.value[0]);
}
};
const getMarketInfo = async(item) => {
const getMarketInfo = async (item) => {
const code = marketList.value.filter((market, index) => item === index)[0].code;
const params = {
page: 1,

81
src/views/Survey/views/Create/Index.vue
View File

@@ -97,16 +97,12 @@
<!-- 底部功能性按钮 -->
<div class="survey-action">
<!-- <div class="survey-action_setting" @click="openSettingAction">-->
<!-- <van-icon name="setting" size="18" class="grid-icon" />-->
<!-- <span>投放设置</span>-->
<!-- </div>-->
<div class="survey-action_btn">
<van-button size="small" plain type="primary" @click="saveAs">保存</van-button>
<van-button size="small" plain type="primary" @click="previewQuestion">预览</van-button>
<van-button size="small" plain type="success" @click="openSettingAction"
>投放设置</van-button
>
<van-button size="small" plain type="success" @click="openSettingAction">
投放设置
</van-button>
<van-button size="small" icon="guide-o" @click="publishQuestion">立即投放</van-button>
</div>
</div>
@@ -114,12 +110,12 @@
<!-- 投放设置-->
<van-action-sheet v-model:show="showSetting" title="">
<van-action-sheet v-model:show="showSetting" title="" style="background-color: #f2f2f2">
<template #description>
<div class="flex flex-start">设置</div>
<div class="setting_title flex flex-start">投放设置</div>
</template>
<van-cell-group :border="false" class="ml10">
<van-cell title="每页一题" :border="false" label-align="left">
<van-cell-group :border="false" class="setting_group">
<van-cell title="每页一题" class="setting_block" :border="false" label-align="left">
<template #right-icon>
<van-switch
v-model="questionInfo.survey.is_one_page_one_question"
@@ -132,7 +128,7 @@
</template>
</van-cell>
<van-divider></van-divider>
<van-cell title="投放数量" :border="false" label-align="left">
<van-cell title="投放数量" class="setting_block" :border="false" label-align="left">
<template #right-icon>
<van-switch
v-model="questionInfo.survey.is_publish_number"
@@ -146,7 +142,7 @@
</van-cell>
<van-cell-group
v-if="questionInfo.survey.is_publish_number === 1"
class="child-group"
class="child-group setting_block"
:border="false"
>
<van-field
@@ -160,7 +156,7 @@
</van-field>
</van-cell-group>
<van-divider></van-divider>
<van-cell title="有效期" :border="false" label-align="left">
<van-cell title="有效期" class="border-top" :border="false" label-align="left">
<template #right-icon>
<van-switch
v-model="questionInfo.survey.is_time"
@@ -209,6 +205,7 @@
<van-cell
title="企微身份获取(开启后仅支持私有化企业环境作答)"
class="border-bottom"
:border="false"
label-align="left"
>
@@ -224,7 +221,7 @@
</template>
</van-cell>
<van-divider></van-divider>
<van-cell title="IP答题次数限制" :border="false" label-align="left">
<van-cell title="IP答题次数限制" class="border-top" :border="false" label-align="left">
<template #right-icon>
<van-switch
v-model="questionInfo.survey.is_ip_number"
@@ -247,7 +244,7 @@
<template #right-icon> 次 </template>
</van-field>
</van-cell-group>
<van-cell title="设备答题次数限制" :border="false" label-align="left">
<van-cell title="设备答题次数限制" class="border-bottom" :border="false" label-align="left">
<template #right-icon>
<van-switch
v-model="questionInfo.survey.is_browser_number"
@@ -594,9 +591,9 @@ onMounted(async () => {
button {
padding: 3px 20px;
border: none;
border-radius: 10px;
background-color: #70b937;
color: #fff;
border-radius: 10px;
font-weight: bold;
}
@@ -605,6 +602,37 @@ onMounted(async () => {
}
}
::v-deep .van-popup--bottom.van-popup--round {
background-color: #f2f2f2 !important;
}
.setting_title {
color: #000;
font-weight: bold;
font-style: normal;
font-size: 19px;
font-family: PingFangSC, 'PingFang SC';
line-height: 26px;
text-align: left;
}
.setting_group {
padding: 10px;
background-color: #f2f2f2;
}
.setting_block {
border-radius: 12px;
}
.border-top {
border-radius: 12px 12px 0 0;
}
.border-bottom {
border-radius: 0 0 12px 12px;
}
.result-cell {
margin: 10px 5px;
padding: 5px;
@@ -700,22 +728,25 @@ onMounted(async () => {
font-size: 12px;
}
}
::v-deep .van-button--plain.van-button--primary {
color: #4b4b59;
padding: 13px 15px;
border: 1px solid #f0f0f0;
background-color: #fff;
font-weight: bold;
padding: 13px 15px;
border-radius: 10px;
background-color: #fff;
color: #4b4b59;
font-weight: bold;
}
::v-deep .van-button--plain.van-button--success {
color: #70b937;
border: 1px solid #70b937;
background-color: #fff;
font-weight: bold;
padding: 13px 15px;
border: 1px solid #70b937;
border-radius: 10px;
background-color: #fff;
color: #70b937;
font-weight: bold;
}
.survey-action {
position: fixed;
bottom: 0;