This commit is contained in:
faiz 2024-04-22 17:44:20 +08:00
parent 0c75467976
commit c8349f92b7
4 changed files with 38 additions and 14 deletions

View File

@ -50,7 +50,7 @@
<el-input
v-model="formValidate.store_name"
placeholder="请输入商品名称"
maxlength="10"
maxlength="40"
show-word-limit
size="small"
class="pageWidth"
@ -2707,7 +2707,7 @@ export default {
if (fileList.every(item => item.status == "success")) {
let arr = []
fileList.map(item => {
item.response && arr.push({ ...item,url: item.response.data.src,type:item.raw.type})
item.response && arr.push({ ...item,url: item.response.data.src,type:item.raw.type||item.type})
})
this.formValidate.qualification[name] = arr
}

View File

@ -468,7 +468,7 @@
</div>
</span>
<span class="upload">
<div class="upload_left">销售授权及其他</div>
<div class="upload_left">销售授权及品牌方营业执照</div>
<div class="upload_right">
<div
v-for="(item,index) in qualification.authorizedList"
@ -486,7 +486,7 @@
</div>
</span>
<span class="upload">
<div class="upload_left">商品检测报告</div>
<div class="upload_left">商品检测报告及备案</div>
<div class="upload_right">
<div
v-for="(item,index) in qualification.commodityList"
@ -504,7 +504,7 @@
</div>
</span>
<span class="upload">
<div class="upload_left">其他资质</div>
<div class="upload_left">助农文件及其他资质</div>
<div class="upload_right">
<div
v-for="(item,index) in qualification.otherList"

View File

@ -19,9 +19,9 @@
v-loading="listLoading"
:data="tableData.data"
size="small"
:expand-row-keys="expands"
@expand-change="handleRead"
:row-key="getRowKeys"
:expand-row-keys="expands"
>
<el-table-column label="序号" min-width="50">
<template scope="scope">
@ -45,7 +45,16 @@
<span :class="scope.row.is_read === 0 ? 'unread' : 'read'">{{ scope.row.create_time }}</span>
</template>
</el-table-column>
<el-table-column type="expand">
<el-table-column width="102" align="center">
<template slot-scope="scope">
<el-button
class="table_button"
size="mini"
@click="expandRow(scope.row)"
>点击查看<i :class="`${!expands.length ? 'el-icon-caret-right' : 'el-icon-caret-bottom'} 'el-icon--right'`" /></el-button>
</template>
</el-table-column>
<el-table-column type="expand" width="0">
<template slot-scope="props">
<el-form label-position="left" inline class="demo-table-expand">
<el-form-item>
@ -116,6 +125,18 @@ export default {
this.$refs.searchForm.resetFields()
this.getList(1)
},
// table
expandRow(row) {
if (this.expands.indexOf(row.notice_log_id) < 0) {
// expands
this.expands = []
this.expands.push(row.notice_log_id)
this.handleRead(row)
} else {
// expands
this.expands = []
}
},
// rowkey
getRowKeys(row) {
return row.notice_log_id;
@ -199,6 +220,9 @@ export default {
.read{
color: #999;
}
::v-deep .el-table__expand-icon{
visibility: hidden;
}
.circle{
display: inline-block;
height: 8px;

View File

@ -13,10 +13,10 @@
<span class="basic-label">商户负责人手机号</span>
{{ merData.mer_phone }}
</div>
<div v-if="merData.merchantCategory.category_name" class="basic-information">
<!-- <div v-if="merData.merchantCategory.category_name" class="basic-information">
<span class="basic-label">商户分类</span>
{{ merData.merchantCategory.category_name || "" }}
</div>
</div> -->
<div v-if="merData.merchantType" class="basic-information">
<span class="basic-label"> 商户类型</span>
{{ merData.merchantType.type_name }}
@ -83,12 +83,12 @@
</div>
<el-button v-if="!merData.offline.includes(10)" type="success" size="small" class="mr10 pay_btn" @click="handleTransfer(10)">提交转账信息</el-button>
</div>
<!--产品服务费-->
<!--技术服务费-->
<div v-if="merData.is_service == 1">
<span class="basic-label">产品服务费</span>
<span class="basic-label">技术服务费</span>
<span class="font_red">{{ merData.service_cost }}</span>
<div class="margin_count" @mouseenter="getCode('service')">
<el-button type="text" size="small" class="mr10 pay_btn">去支付产品服务费</el-button>
<el-button type="text" size="small" class="mr10 pay_btn">去支付技术服务费</el-button>
<!--支付二维码-->
<div class="erweima">
<div class="pay_title">对公账户</div>
@ -482,10 +482,10 @@
</div>
</div>
<div v-if="infoType == '3'" class="user-msg">
<div class="basic-information">
<!-- <div class="basic-information">
<span class="basic-label"> 商户手续费</span>
{{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2) }}%
</div>
</div> -->
<div class="basic-information">
<span class="basic-label"> 添加商品</span>
{{ merData.is_audit ? "需平台审核" : "平台免审核" }}