Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -29,7 +29,7 @@
|
|||||||
<radio-group @change="({detail})=>op.fieldValue=detail.value">
|
<radio-group @change="({detail})=>op.fieldValue=detail.value">
|
||||||
<div class="option" flex v-for="option in op.fieldInfo.options" :key="option.label">
|
<div class="option" flex v-for="option in op.fieldInfo.options" :key="option.label">
|
||||||
<radio :value="option.label" :disabled="isResult" :checked="op.fieldValue==option.label"/>
|
<radio :value="option.label" :disabled="isResult" :checked="op.fieldValue==option.label"/>
|
||||||
<AiImage v-if="option.img" :src="option.img" preview/>
|
<AiImage class="option-img" v-if="option.img" :src="option.img" preview/>
|
||||||
<div class="label fill">{{ option.label }}</div>
|
<div class="label fill">{{ option.label }}</div>
|
||||||
</div>
|
</div>
|
||||||
</radio-group>
|
</radio-group>
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
<div class="option" flex v-for="option in op.fieldInfo.options" :key="option.label">
|
<div class="option" flex v-for="option in op.fieldInfo.options" :key="option.label">
|
||||||
<checkbox :value="option.label" :disabled="isResult"
|
<checkbox :value="option.label" :disabled="isResult"
|
||||||
:checked="option.checked"/>
|
:checked="option.checked"/>
|
||||||
<AiImage v-if="option.img" :src="option.img" preview/>
|
<AiImage class="option-img" v-if="option.img" :src="option.img" preview/>
|
||||||
<div class="label fill">{{ option.label }}</div>
|
<div class="label fill">{{ option.label }}</div>
|
||||||
</div>
|
</div>
|
||||||
</checkbox-group>
|
</checkbox-group>
|
||||||
@@ -303,6 +303,15 @@ export default {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
margin-right: 16px;
|
margin-right: 16px;
|
||||||
margin-bottom: 16px;
|
margin-bottom: 16px;
|
||||||
|
|
||||||
|
.option-img {
|
||||||
|
margin-right: 20px;
|
||||||
|
|
||||||
|
::v-deep uni-image {
|
||||||
|
width: 130px;
|
||||||
|
height: 130px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,13 @@
|
|||||||
<div class="form-info">
|
<div class="form-info">
|
||||||
<h2>文本选项</h2>
|
<h2>文本选项</h2>
|
||||||
<div class="form-info__wrapper">
|
<div class="form-info__wrapper">
|
||||||
<textarea class="title" placeholder="请输入标题 (必填)" :maxlength="30" :auto-height="true"
|
<textarea
|
||||||
v-model="form.title"></textarea>
|
class="title"
|
||||||
|
placeholder="请输入标题 (必填)"
|
||||||
|
:maxlength="30"
|
||||||
|
:auto-height="true"
|
||||||
|
v-model="form.title">
|
||||||
|
</textarea>
|
||||||
<textarea
|
<textarea
|
||||||
class="content"
|
class="content"
|
||||||
border="none"
|
border="none"
|
||||||
@@ -32,16 +37,14 @@
|
|||||||
}"
|
}"
|
||||||
draggable=".components-item"
|
draggable=".components-item"
|
||||||
:sort="true">
|
:sort="true">
|
||||||
<div class="components-item" v-for="(item, index) in targetList" :key="index"
|
<div class="components-item" v-for="(item, index) in targetList" :key="index" @click="toFiledSetting(item, index)">
|
||||||
@click="toFiledSetting(item, index)">
|
|
||||||
<div class="components-item__title">
|
<div class="components-item__title">
|
||||||
<div class="components-item__title--left">
|
<div class="components-item__title--left">
|
||||||
<em :style="{opacity: item.required ? 1 : 0}">*</em>
|
<em :style="{opacity: item.required ? 1 : 0}">*</em>
|
||||||
<i>{{ index + 1 }}.</i>
|
<i>{{ index + 1 }}.</i>
|
||||||
<h2>{{ item.label }}</h2>
|
<h2>{{ item.label }}</h2>
|
||||||
</div>
|
</div>
|
||||||
<image :src="`${$cdn}askform/sc1.png`" @click.stop="removeComponent(index)"
|
<image :src="`${$cdn}askform/sc1.png`" @click.stop="removeComponent(index)" @touchstart.stop="removeComponent(index)"/>
|
||||||
@touchstart.stop="removeComponent(index)"/>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="components-item__filed">
|
<div class="components-item__filed">
|
||||||
<template v-if="(item.type === 'radio')">
|
<template v-if="(item.type === 'radio')">
|
||||||
@@ -91,11 +94,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="add-form__footer">
|
<div class="add-form__footer">
|
||||||
<div class="add-form__footer--item-wrapper">
|
<div class="add-form__footer--item-wrapper">
|
||||||
<div class="add-form__footer--item" @click="toPreview">
|
<div class="add-form__footer--item" @click="toPreview" hover-class="text-hover">
|
||||||
<image :src="`${$cdn}sass/preview.png`"/>
|
<image :src="`${$cdn}sass/preview.png`"/>
|
||||||
<span>预览</span>
|
<span>预览</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="add-form__footer--item" @click="toSetting">
|
<div class="add-form__footer--item" @click="toSetting" hover-class="text-hover">
|
||||||
<image :src="`${$cdn}sass/setting.png`"/>
|
<image :src="`${$cdn}sass/setting.png`"/>
|
||||||
<span>设置</span>
|
<span>设置</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user