Commit 780f0e70 by chenyu

update: update

parent 373ff99d
......@@ -11,8 +11,7 @@
</header>
<div class="table-content" v-loading="load">
<el-table :class="['only-head-table',!memberData.length?'no-data':'']">
<el-table-column v-for="colunm in tableColumnList" :key="colunm" :label="colunm.label"
:min-width="colunm.width" />
<el-table-column v-for="colunm in tableColumnList" :key="colunm" v-bind="{...colunm}" />
</el-table>
<div class="only-content-table-list" style=""
v-if="memberData.length">
......@@ -30,8 +29,7 @@
<el-table class="only-content-table" :data="group.orderItemList"
:span-method="(obj)=>spanMethod({...obj,length:group.orderItemList.length})">
<template v-for="colunm in tableColumnList">
<el-table-column :key="colunm" :label="colunm.label" :min-width="colunm.width"
:show-overflow-tooltip="colunm.tooltip" :prop="colunm.prop">
<el-table-column :key="colunm" v-bind="{...colunm}">
<template slot-scope="{row}">
<template
v-if="['orderStatus','deliveryInfo','payAmount'].includes(colunm.prop)">
......@@ -45,7 +43,9 @@
<div class="delivery-info">
<p class="delivery-info-line">收件人:{{ group.buyerName }}</p>
<p class="delivery-info-line">手机号:{{ group.buyerPhone }}</p>
<p class="delivery-info-line" style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;" :title="group.addressInfo">收货地址:{{ group.addressInfo }}</p>
<el-tooltip class="item" :disabled="group.addressInfo.length<=25" effect="dark" :content="`收货地址:${group.addressInfo}`" placement="top-start" :open-delay="200">
<p class="delivery-info-line" style="overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">收货地址:{{ group.addressInfo }}</p>
</el-tooltip>
</div>
</template>
<!-- 小计 -->
......@@ -65,8 +65,10 @@
</div>
</el-image>
<div class="info-detail">
<div class="good-name" :title="row.mallProName">{{ row.mallProName }}</div>
<div class="good-attr" :title="row.mallProName">{{ row.mallProSkuAttr }}</div>
<el-tooltip class="item" :disabled="row.mallProName.length<49" effect="dark" :content="row.mallProName" placement="top-start" :open-delay="200">
<div class="good-name">{{ row.mallProName }}</div>
</el-tooltip>
<div class="good-attr">{{ row.mallProSkuAttr }}</div>
</div>
</div>
<!-- 单价 -->
......@@ -161,12 +163,12 @@ export default {
search: '',
isWm:true, //当前页面是微盟
tableColumnList: [
{ label: '商品', width: '200', prop: 'mallProName', tooltip:false },
{ label: '单价', width: '80', prop: 'mallProPrice', tooltip:false },
{ label: '数量', width: '80', prop: 'mallProNumber', tooltip:false },
{ label: '订单类型', width: '80', prop: 'orderStatus', tooltip:false },
{ label: '小计(实付)', width: '80', prop: 'payAmount', tooltip:false },
{ label: '收货信息', width: '200', prop: 'deliveryInfo', tooltip:false },
{ label: '商品', width: '500', prop: 'mallProName', 'show-overflow-tooltip':false },
{ label: '单价', 'min-width': '55', prop: 'mallProPrice', 'show-overflow-tooltip':true },
{ label: '数量', 'min-width': '55', prop: 'mallProNumber', 'show-overflow-tooltip':true },
{ label: '订单类型', 'min-width': '80', prop: 'orderStatus', 'show-overflow-tooltip':true },
{ label: '小计(实付)', 'min-width': '110', prop: 'payAmount', 'show-overflow-tooltip':true },
{ label: '收货信息', width: '400', prop: 'deliveryInfo', 'show-overflow-tooltip':false },
],
orderColor:{1:'#303133',2:'#FA8C16',4:'#F5222D'},
};
......@@ -256,7 +258,9 @@ export default {
};
</script>
<style lang="less" scoped>
.mall-container-new{
min-width: 1400px;
}
.record {
margin: 20px;
padding: 20px;
......@@ -267,6 +271,7 @@ export default {
}
}
.table-content {
min-width: 1200px;
.only-head-table {
/deep/.el-table__body-wrapper {
display: none;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment