bugfix
This commit is contained in:
parent
a5d62b47c3
commit
3fc5a36988
@ -36,7 +36,7 @@
|
|||||||
<i class="el-icon-upload2"></i> 全部导出
|
<i class="el-icon-upload2"></i> 全部导出
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-table size="mini" border height="calc(100vh - 210px)" v-loading="loading" :data="tableData"
|
<el-table size="large" border height="calc(100vh - 210px)" v-loading="loading" :data="tableData"
|
||||||
style="width: 100%;border:1px solid #ccc;" element-loading-text="加载中..."
|
style="width: 100%;border:1px solid #ccc;" element-loading-text="加载中..."
|
||||||
element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.8)">
|
element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.8)">
|
||||||
<el-table-column prop="date" label="图片" width="180">
|
<el-table-column prop="date" label="图片" width="180">
|
||||||
@ -51,7 +51,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="product_name" show-overflow-tooltip label="名称" min-width="180">
|
<el-table-column prop="product_name" show-overflow-tooltip label="名称" min-width="180">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="product_category" show-overflow-tooltip label="所属类别" min-width="180">
|
<el-table-column prop="category_name" show-overflow-tooltip label="所属类别" min-width="180">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column show-overflow-tooltip label="审核状态" min-width="180">
|
<el-table-column show-overflow-tooltip label="审核状态" min-width="180">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@ -80,23 +80,23 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column fixed="right" min-width="260" label="操作">
|
<el-table-column fixed="right" min-width="260" label="操作">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" size="small" @click="openDetail(scope.row, 1)">查看</el-button>
|
<el-button type="text" size="large" @click="openDetail(scope.row, 1)">查看</el-button>
|
||||||
<el-button @click="editProduct(scope.row)" type="text" style="color: #409EFF;"
|
<el-button @click="editProduct(scope.row)" type="text" style="color: #409EFF;"
|
||||||
size="small">修改</el-button>
|
size="large">修改</el-button>
|
||||||
<el-button v-if="role.role_type == 'customer'" type="text" size="small"
|
<el-button v-if="role.role_type == 'customer'" type="text" size="large"
|
||||||
@click="openDetail(scope.row, 2)">审核</el-button>
|
@click="openDetail(scope.row, 2)">审核</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
:disabled="scope.row.audit_status=='rejected'||scope.row.audit_status === 'approved' && scope.row.listing_status === 'listing'"
|
:disabled="scope.row.audit_status=='rejected'||scope.row.audit_status === 'approved' && scope.row.listing_status === 'listing'"
|
||||||
@click="grounding(scope.row, 'listing')" type="text" style="color: #67C23A;"
|
@click="grounding(scope.row, 'listing')" type="text" style="color: #67C23A;"
|
||||||
size="small">上架</el-button>
|
size="large">上架</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
:disabled="scope.row.audit_status=='rejected'||scope.row.audit_status === 'approved' && scope.row.listing_status === 'delisting'"
|
:disabled="scope.row.audit_status=='rejected'||scope.row.audit_status === 'approved' && scope.row.listing_status === 'delisting'"
|
||||||
@click="grounding(scope.row, 'delisting')" type="text" size="small">下架</el-button>
|
@click="grounding(scope.row, 'delisting')" type="text" size="large">下架</el-button>
|
||||||
<el-button type="text" size="small" @click="exportData(scope.row)">导出</el-button>
|
<el-button type="text" size="large" @click="exportData(scope.row)">导出</el-button>
|
||||||
<el-popconfirm v-if="role.role_type == 'customer'" title="确定删除该条目吗?"
|
<el-popconfirm v-if="role.role_type == 'customer'" title="确定删除该条目吗?"
|
||||||
@confirm="deleteProduct(scope.row)">
|
@confirm="deleteProduct(scope.row)">
|
||||||
<el-button slot="reference" type="text" style="color: #F56C6C;margin-left: 10px;"
|
<el-button slot="reference" type="text" style="color: #F56C6C;margin-left: 10px;" size="large"
|
||||||
size="small">删除</el-button>
|
>删除</el-button>
|
||||||
</el-popconfirm>
|
</el-popconfirm>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@ -177,9 +177,13 @@ export default Vue.extend({
|
|||||||
const hasAuditInfo = Array.isArray(dataList) && dataList.length !== 0
|
const hasAuditInfo = Array.isArray(dataList) && dataList.length !== 0
|
||||||
const roles = sessionStorage.getItem('jueseNew')
|
const roles = sessionStorage.getItem('jueseNew')
|
||||||
const isCustomer = roles ? roles.includes('客户') : true
|
const isCustomer = roles ? roles.includes('客户') : true
|
||||||
if (hasAuditInfo || !isCustomer) {
|
if(res.data.data[0].audit_status==='pending') {
|
||||||
|
this.$message.warning('您的审核状态为待审核,请等待审核通过后发布~')
|
||||||
|
} else if (hasAuditInfo || !isCustomer) {
|
||||||
this.publish_type = type
|
this.publish_type = type
|
||||||
this.sendProductVisible = true
|
this.sendProductVisible = true
|
||||||
|
} else if(res.data.data[0].audit_status==='rejected') {
|
||||||
|
this.$message.warning('您的审核状态为驳回,请重新提交~')
|
||||||
} else {
|
} else {
|
||||||
this.showTip = true
|
this.showTip = true
|
||||||
}
|
}
|
||||||
@ -681,6 +685,9 @@ export default Vue.extend({
|
|||||||
|
|
||||||
.user-sidebar {
|
.user-sidebar {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
*{
|
||||||
|
font-size: 20px!important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 响应式设计
|
// 响应式设计
|
||||||
|
|||||||
@ -193,7 +193,7 @@ export default {
|
|||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.menu-item {
|
.menu-item {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
font-size: 13px;
|
font-size: 14px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
@ -244,7 +244,8 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.category-name {
|
.category-name {
|
||||||
font-size: 14px;
|
// font-size: 14px;
|
||||||
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -314,7 +315,7 @@ export default {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
display: flex;
|
display: flex;
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s ease;
|
||||||
font-size: 12px;
|
font-size: 16px;
|
||||||
color: #333;
|
color: #333;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
|
||||||
@ -349,7 +350,7 @@ export default {
|
|||||||
|
|
||||||
|
|
||||||
.section-title {
|
.section-title {
|
||||||
font-size: 12px;
|
font-size: 16px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: #333;
|
color: #333;
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
@ -372,7 +373,7 @@ export default {
|
|||||||
|
|
||||||
.product-tag {
|
.product-tag {
|
||||||
height: fit-content !important;
|
height: fit-content !important;
|
||||||
font-size: 12px;
|
font-size: 14px;
|
||||||
color: #666;
|
color: #666;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s ease;
|
||||||
|
|||||||
@ -5,7 +5,8 @@
|
|||||||
{{ productDetailInfo.product_name }}
|
{{ productDetailInfo.product_name }}
|
||||||
|
|
||||||
</h1>
|
</h1>
|
||||||
<span style="color: red;font-weight: bold;font-size: 20px;">¥{{ productDetailInfo.discount_price }}{{ productDetailInfo.unit }}</span>
|
<span style="color: red;font-weight: bold;font-size: 20px;">¥{{ productDetailInfo.discount_price }}{{
|
||||||
|
productDetailInfo.unit }}</span>
|
||||||
<button v-if="!isApprove" class="consult-btn" @click="openTalk">立即咨询</button>
|
<button v-if="!isApprove" class="consult-btn" @click="openTalk">立即咨询</button>
|
||||||
</div>
|
</div>
|
||||||
<!-- 标题区域 -->
|
<!-- 标题区域 -->
|
||||||
@ -54,7 +55,7 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div v-if="productDetailInfo.cart_flag === '1'" style="position: relative;width: 100%;padding-left: 16px;"
|
<div v-if="productDetailInfo.cart_flag === '1'" style="position: relative;width: 100%;padding-left: 16px;"
|
||||||
class="mysection">
|
class="mysection my">
|
||||||
<div class="section-title">配置数据</div>
|
<div class="section-title">配置数据</div>
|
||||||
<div class="section-content">
|
<div class="section-content">
|
||||||
|
|
||||||
@ -176,6 +177,12 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
.my {
|
||||||
|
.section-title::before {
|
||||||
|
top: 6px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.consult-btn {
|
.consult-btn {
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
background: linear-gradient(90deg, #275AFF 0%, #2EBDFA 100%);
|
background: linear-gradient(90deg, #275AFF 0%, #2EBDFA 100%);
|
||||||
@ -201,6 +208,10 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.infoUl {
|
.infoUl {
|
||||||
|
* {
|
||||||
|
font-size: 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
border-top: 1px solid #e5e5e5;
|
border-top: 1px solid #e5e5e5;
|
||||||
padding: 30px 0;
|
padding: 30px 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -235,11 +246,11 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
.leftBox {
|
.leftBox {
|
||||||
width: 50px;
|
width: 65px;
|
||||||
height: 50px;
|
height: 65px;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
min-width: 50px;
|
min-width: 65px;
|
||||||
min-height: 50px;
|
min-height: 65px;
|
||||||
|
|
||||||
img {
|
img {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -254,13 +265,13 @@ export default {
|
|||||||
flex-direction: column !important;
|
flex-direction: column !important;
|
||||||
|
|
||||||
.subTitle {
|
.subTitle {
|
||||||
font-size: 16px;
|
font-size: 18px;
|
||||||
color: #333;
|
color: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
.subDescription {
|
.subDescription {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
font-size: 14px;
|
font-size: 16px;
|
||||||
color: #999;
|
color: #999;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -340,6 +351,10 @@ export default {
|
|||||||
.title-section {
|
.title-section {
|
||||||
margin-bottom: 30px;
|
margin-bottom: 30px;
|
||||||
|
|
||||||
|
* {
|
||||||
|
font-size: 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
.demand-title {
|
.demand-title {
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
@ -447,7 +462,7 @@ export default {
|
|||||||
|
|
||||||
.section-title {
|
.section-title {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
font-size: 14px;
|
font-size: 18px;
|
||||||
color: #333;
|
color: #333;
|
||||||
font-weight: bold !important;
|
font-weight: bold !important;
|
||||||
position: relative;
|
position: relative;
|
||||||
@ -455,11 +470,11 @@ export default {
|
|||||||
&::before {
|
&::before {
|
||||||
content: '';
|
content: '';
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 6px;
|
top: 9px;
|
||||||
left: -5px;
|
left: -4px;
|
||||||
display: block;
|
display: block;
|
||||||
width: 2px;
|
width: 2px;
|
||||||
height: 12px;
|
height: 16px;
|
||||||
background: #666;
|
background: #666;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -507,6 +522,7 @@ export default {
|
|||||||
line-height: 1.8;
|
line-height: 1.8;
|
||||||
color: #333;
|
color: #333;
|
||||||
text-align: justify;
|
text-align: justify;
|
||||||
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -327,6 +327,7 @@ export default {
|
|||||||
background: #fff;
|
background: #fff;
|
||||||
border: 1px solid #e8e8e8;
|
border: 1px solid #e8e8e8;
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
|
font-size: 16px!important;
|
||||||
|
|
||||||
&:last-child {
|
&:last-child {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
@ -340,7 +341,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.radio-text {
|
.radio-text {
|
||||||
font-size: 14px;
|
font-size: 16px;
|
||||||
color: #275AFF;
|
color: #275AFF;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s ease;
|
||||||
@ -446,7 +447,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.category-title {
|
.category-title {
|
||||||
font-size: 14px;
|
font-size: 16px;
|
||||||
color: #333;
|
color: #333;
|
||||||
// margin-bottom: 12px;
|
// margin-bottom: 12px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
@ -462,16 +463,17 @@ export default {
|
|||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
|
|
||||||
|
|
||||||
.category-tag {
|
.category-tag {
|
||||||
|
|
||||||
padding: 3px 6px;
|
padding: 3px 6px;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border: 1px solid #e8e8e8;
|
border: 1px solid #e8e8e8;
|
||||||
border-radius: 2px;
|
border-radius: 2px;
|
||||||
font-size: 12px;
|
|
||||||
color: #666;
|
color: #666;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s ease;
|
||||||
|
font-size: 14px;
|
||||||
&:hover {
|
&:hover {
|
||||||
border-color: #1890ff;
|
border-color: #1890ff;
|
||||||
color: #1890ff;
|
color: #1890ff;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user