Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-10-09 17:42:39 +08:00
commit 34c26b1aa0
2 changed files with 2 additions and 3 deletions

View File

@ -21,7 +21,7 @@
<el-radio v-for="item in base_list.article_theme_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.theme == '4'" label="轮播列数">
<el-form-item v-if="form.article_theme == '4'" label="轮播列数">
<el-radio-group v-model="form.article_carousel_col">
<el-radio v-for="item in base_list.carousel_col_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
</el-radio-group>

View File

@ -73,7 +73,6 @@
</div>
</template>
<script setup lang="ts">
import { omit } from 'lodash';
const props = defineProps({
value: {
type: Object,
@ -99,7 +98,7 @@ const state = reactive({
});
// 使toRefs
const { form, data } = toRefs(state);
const theme = computed(() => data.value.theme);
const theme = computed(() => data.value.article_theme);
if (theme.value == '0') {
if (form.value.img_radius.radius == props.defaultConfig.img_radius_0 || (form.value.img_radius.radius_bottom_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_bottom_right == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_left == props.defaultConfig.img_radius_1 && form.value.img_radius.radius_top_right == props.defaultConfig.img_radius_1)) {
form.value.img_radius.radius = props.defaultConfig.img_radius_0;