This commit is contained in:
faiz 2024-04-24 18:33:01 +08:00
parent 5633ca41e7
commit 51090791d3
5 changed files with 8 additions and 5 deletions

View File

@ -31,7 +31,7 @@
</div>
<!-- 禁用状态 -->
<!-- 可选状态 -->
<el-popover v-else ref="popover" trigger="click" placement="bottom-start">
<el-popover v-else ref="popover" trigger="click" placement="top-start">
<!-- 搜索 -->
<div class="lazy-cascader-search">
<el-autocomplete

View File

@ -16,7 +16,7 @@
</el-form-item>
<el-form-item label="配送区域及运费:" prop="region">
<el-table v-loading="listLoading" :data="ruleForm.region" border fit highlight-current-row size="small" class="tempBox">
<el-table-column align="center" label="可配送区域" width="250">
<el-table-column align="center" label="可配送区域" min-width="250">
<template slot-scope="scope">
<span v-if="scope.$index === 0">默认全国 <span style="font-weight: bold;">(开启指定区域不配送时无效)</span></span>
<LazyCascader
@ -482,7 +482,8 @@ export default {
text-overflow: clip;
}
::v-deep .lazy-cascader{
width: 220px!important;
// width: 220px!important;
width: 90% !important;
text-align: left;
}
</style>

View File

@ -6,6 +6,7 @@ export default function modalTemplates(id, callback, componentKey) {
title: '运费模板',
customClass: 'upload-form-temp',
closeOnClickModal: false,
lockScroll: true,
showClose: false,
message: h('div', { class: 'common-form-upload' }, [
h('templatesFrom', {

View File

@ -153,7 +153,8 @@ div:focus {
color: #fff;
}
.upload-form-temp{
width: 1100px;
width: 80%;
top: 4%;
}
// el-image 关闭预览样式
.el-image-viewer__close {

View File

@ -44,7 +44,7 @@
<div class="basic-information">
<div>
<span class="basic-label">是否开启商户</span>
<el-tooltip v-if="merData.is_margin == 1 && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金!" placement="top-start">
<el-tooltip v-if="(marginNumber>0 || serviceNumber>0 || goodsNumber>0) && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金!" placement="top-start">
<el-switch v-model="merData.mer_state" disabled :width="55" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
</el-tooltip>
<el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" :width="55" />