hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-08-17 11:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

回退 'Pull Request !505 : 【修复】el-input、el-select、el-date-picker宽度；el-radio的label属性兼容下个版本；优化iframe布局'

Browse Source
This commit is contained in:
芋道源码
2024-08-21 13:41:32 +00:00
committed by Gitee
parent ce5d8d3780
commit 1d07068806
143 changed files with 344 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/mall/promotion/article/ArticleForm.vue
View File

@@ -51,7 +51,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -64,7 +64,7 @@
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -77,7 +77,7 @@
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

2
src/views/mall/promotion/article/category/ArticleCategoryForm.vue
View File

@@ -20,7 +20,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

4
src/views/mall/promotion/banner/BannerForm.vue
View File

@@ -34,7 +34,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -47,7 +47,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_BANNER_POSITION)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

10
src/views/mall/promotion/coupon/template/CouponTemplateForm.vue
View File

@@ -15,7 +15,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -40,7 +40,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_DISCOUNT_TYPE)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -101,8 +101,8 @@
</el-form-item>
<el-form-item label="领取方式" prop="takeType">
<el-radio-group v-model="formData.takeType">
<el-radio :key="1" :value="1">直接领取</el-radio>
<el-radio :key="2" :value="2">指定发放</el-radio>
<el-radio :key="1" :label="1">直接领取</el-radio>
<el-radio :key="2" :label="2">指定发放</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="formData.takeType === 1" label="发放数量" prop="totalCount">
@@ -130,7 +130,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

2
src/views/mall/promotion/diy/template/decorate.vue
View File

@@ -18,7 +18,7 @@
@change="handleTemplateItemChange"
>
<el-tooltip v-for="(item, index) in templateItems" :key="index" :content="item.name">
<el-radio-button :value="index">
<el-radio-button :label="index">
<Icon :icon="item.icon" :size="24" />
</el-radio-button>
</el-tooltip>

16
src/views/mall/promotion/kefu/components/KeFuConversationList.vue
View File

@@ -23,7 +23,7 @@
<div class="flex justify-between items-center w-100%">
<span class="username">{{ item.userNickname }}</span>
<span class="color-[#989EA6]">
{{ formatPast(item.lastMessageTime, 'YYYY-MM-DD') }}
{{ formatPast(item.lastMessageTime, 'YYYY-mm-dd') }}
</span>
</div>
<!-- 最后聊天内容 -->
@@ -186,11 +186,11 @@ watch(showRightMenu, (val) => {
transition: border-left 0.05s ease-in-out; /* 设置过渡效果 */
.username {
display: -webkit-box;
max-width: 60%;
min-width: 0;
max-width: 60%;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
}
@@ -198,14 +198,14 @@ watch(showRightMenu, (val) => {
.last-message {
width: 200px;
overflow: hidden; // 隐藏超出的文本
text-overflow: ellipsis; // 添加省略号
white-space: nowrap; // 禁止换行
text-overflow: ellipsis; // 添加省略号
}
}
.active {
background-color: #eff0f1;
border-left: 5px #3271ff solid;
background-color: #eff0f1;
}
.pinned {
@@ -214,13 +214,13 @@ watch(showRightMenu, (val) => {
.right-menu-ul {
position: absolute;
width: 130px;
background-color: #fff;
padding: 10px;
margin: 0;
list-style-type: none; /* 移除默认的项目符号 */
background-color: #fff;
border-radius: 12px;
box-shadow: 0 2px 4px rgb(0 0 0 / 10%); /* 阴影效果 */
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影效果 */
width: 130px;
li {
padding: 8px 16px;

4
src/views/mall/promotion/rewardActivity/RewardForm.vue
View File

@@ -24,7 +24,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_CONDITION_TYPE)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
@@ -110,7 +110,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>

2
src/views/mall/promotion/seckill/config/SeckillConfigForm.vue
View File

@@ -32,7 +32,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>