aiotagro/admin-vue3
1
0
Fork 0
Code Issues Pull Requests 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

2
src/views/mall/home/components/TradeTrendCard.vue
View File

@@ -6,7 +6,7 @@
<!-- 查询条件 -->
<div class="flex flex-row items-center gap-2">
<el-radio-group v-model="timeRangeType" @change="handleTimeRangeTypeChange">
<el-radio-button v-for="[key, value] in timeRange.entries()" :key="key" :value="key">
<el-radio-button v-for="[key, value] in timeRange.entries()" :key="key" :label="key">
{{ value.name }}
</el-radio-button>
</el-radio-group>

2
src/views/mall/product/brand/BrandForm.vue
View File

@@ -21,7 +21,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>

2
src/views/mall/product/category/CategoryForm.vue
View File

@@ -33,7 +33,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>

23
src/views/mall/product/comment/index.vue
View File

@@ -11,34 +11,19 @@
label-width="68px"
>
<el-form-item label="回复状态" prop="replyStatus">
<el-select v-model="queryParams.replyStatus" class="!w-240px">
<el-select v-model="queryParams.replyStatus">
<el-option label="已回复" :value="true" />
<el-option label="未回复" :value="false" />
</el-select>
</el-form-item>
<el-form-item label="商品名称" prop="spuName">
<el-input
v-model="queryParams.spuName"
placeholder="请输入商品名称"
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.spuName" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="用户名称" prop="userNickname">
<el-input
v-model="queryParams.userNickname"
placeholder="请输入用户名称"
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.userNickname" placeholder="请输入用户名称" />
</el-form-item>
<el-form-item label="订单编号" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入订单编号"
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.orderId" placeholder="请输入订单编号" />
</el-form-item>
<el-form-item label="评论时间" prop="createTime">
<el-date-picker

2
src/views/mall/product/spu/components/SkuTableSelect.vue
View File

@@ -3,7 +3,7 @@
<el-table v-loading="loading" :data="list" show-overflow-tooltip>
<el-table-column label="#" width="55">
<template #default="{ row }">
<el-radio :value="row.id" v-model="selectedSkuId" @change="handleSelected(row)"
<el-radio :label="row.id" v-model="selectedSkuId" @change="handleSelected(row)"
>&nbsp;
</el-radio>
</template>

2
src/views/mall/product/spu/components/SpuTableSelect.vue
View File

@@ -70,7 +70,7 @@
<!-- 2. 单选模式 -->
<el-table-column label="#" width="55" v-else>
<template #default="{ row }">
<el-radio :value="row.id" v-model="selectedSpuId" @change="handleSingleSelected(row)">
<el-radio :label="row.id" v-model="selectedSpuId" @change="handleSingleSelected(row)">
<!-- 空格不能省略，是为了让单选框不显示label，如果不指定label不会有选中的效果 -->
&nbsp;
</el-radio>

8
src/views/mall/product/spu/form/SkuForm.vue
View File

@@ -14,14 +14,14 @@
class="w-80"
@change="changeSubCommissionType"
>
<el-radio :value="false">默认设置</el-radio>
<el-radio :value="true" class="radio">单独设置</el-radio>
<el-radio :label="false">默认设置</el-radio>
<el-radio :label="true" class="radio">单独设置</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="商品规格" props="specType">
<el-radio-group v-model="formData.specType" class="w-80" @change="onChangeSpec">
<el-radio :value="false" class="radio">单规格</el-radio>
<el-radio :value="true">多规格</el-radio>
<el-radio :label="false" class="radio">单规格</el-radio>
<el-radio :label="true">多规格</el-radio>
</el-radio-group>
</el-form-item>
<!-- 多规格添加-->

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>

2
src/views/mall/trade/afterSale/index.vue
View File

@@ -81,7 +81,7 @@
<el-date-picker
v-model="queryParams.createTime"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-280px"
class="!w-260px"
end-placeholder="自定义时间"
start-placeholder="自定义时间"
type="daterange"

4
src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
View File

@@ -12,8 +12,8 @@
<el-form-item label="用户类型" prop="level">
<el-radio-group v-model="queryParams.level" @change="handleQuery">
<el-radio-button checked>全部</el-radio-button>
<el-radio-button value="1">一级推广人</el-radio-button>
<el-radio-button value="2">二级推广人</el-radio-button>
<el-radio-button label="1">一级推广人</el-radio-button>
<el-radio-button label="2">二级推广人</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="状态" prop="status">

4
src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
View File

@@ -12,8 +12,8 @@
<el-form-item label="用户类型" prop="level">
<el-radio-group v-model="queryParams.level" @change="handleQuery">
<el-radio-button checked>全部</el-radio-button>
<el-radio-button value="1">一级推广人</el-radio-button>
<el-radio-button value="2">二级推广人</el-radio-button>
<el-radio-button label="1">一级推广人</el-radio-button>
<el-radio-button label="2">二级推广人</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="绑定时间" prop="bindUserTime">

4
src/views/mall/trade/config/index.vue
View File

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

2
src/views/mall/trade/delivery/express/ExpressForm.vue
View File

@@ -25,7 +25,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>

2
src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
View File

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

17
src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.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>
@@ -106,8 +106,14 @@
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
<el-dialog v-model="mapDialogVisible" title="获取经纬度" append-to-body>
<IFrame class="h-609px" :src="tencentLbsUrl" />
<el-dialog
v-model="mapDialogVisible"
title="获取经纬度"
append-to-body
width="500px"
class="mapBox"
>
<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="tencentLbsUrl"></iframe>
</el-dialog>
</Dialog>
</template>
@@ -260,3 +266,8 @@ onMounted(async () => {
await initTencentLbsMap()
})
</script>
<style lang="scss">
.mapBox .el-dialog__body {
height: 640px !important;
}
</style>

4
src/views/mall/trade/order/form/OrderDeliveryForm.vue
View File

@@ -3,8 +3,8 @@
<el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
<el-form-item label="发货方式">
<el-radio-group v-model="expressType">
<el-radio border value="express">快递物流</el-radio>
<el-radio border value="none">无需发货</el-radio>
<el-radio border label="express">快递物流</el-radio>
<el-radio border label="none">无需发货</el-radio>
</el-radio-group>
</el-form-item>
<template v-if="expressType === 'express'">