Commit e72cef56 by damodmg

样式调整

parent 5c8d5148
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.ba48f911d0e7bf809ded217581d9721d.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.89c5cab0dd575144cad1.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.b014c2abdb12ab3d3e9bba31bda11f2f.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.db42257d389cf7dcd3fb.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -41,9 +41,9 @@
<el-table-column label="礼品信息" min-width="310px">
<template slot-scope="scope">
<div class="gift-info">
<img v-if="scope.row.cardType === 2" src="../../../../static/img/dui.png" alt="" />
<img v-if="scope.row.cardType === 0" src="../../../../static/img/di.png" alt="" />
<img v-if="scope.row.cardType === 1" src="../../../../static/img/zhe.png" alt="" />
<img v-if="scope.row.cardType === 2" src="../../../../static/img/quan02.png" alt="" />
<img v-if="scope.row.cardType === 0" src="../../../../static/img/quan01.png" alt="" />
<img v-if="scope.row.cardType === 1" src="../../../../static/img/quan03.png" alt="" />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
......@@ -375,8 +375,8 @@ export default {
width: 140px;
}
.gift-info img {
width: 44px;
height: 44px;
width: 75px;
height: 75px;
border-radius: 4px;
padding: 4px;
border: 1px solid #dcdfe6;
......@@ -384,7 +384,7 @@ export default {
.info-name {
display: inline-block;
vertical-align: top;
width: 80%;
width: 70%;
margin-left: 5px;
}
.pro-ellipsis {
......
......@@ -553,8 +553,8 @@ export default {
width: 140px;
}
.gift-info img {
width: 44px;
height: 44px;
width: 75px;
height: 75px;
border-radius: 4px;
padding: 4px;
border: 1px solid #dcdfe6;
......@@ -562,7 +562,7 @@ export default {
.info-name {
display: inline-block;
vertical-align: top;
width: 75%;
width: 70%;
}
.pro-ellipsis {
color: #303133;
......
......@@ -44,16 +44,19 @@
<el-table-column label="礼品信息" width="300px">
<template slot-scope="scope">
<div class="gift-info">
<img :src="scope.row.giftMainPic" v-if="scope.row.cardType === 2" />
<!-- <img v-if="scope.row.cardType === 2" src="../../../static/img/dui.png" alt="" /> -->
<!-- 抵换券 -->
<img v-if="scope.row.cardType === 0" src="../../../static/img/quan01.png" alt="" />
<!-- <img v-if="scope.row.cardType === 0" src="../../../static/img/di.png" alt="" /> -->
<!-- 折扣券 -->
<!-- <img v-if="scope.row.cardType === 1" src="../../../static/img/zhe.png" alt="" /> -->
<img v-if="scope.row.cardType === 2" src="../../../static/img/quan02.png" alt="" />
<img v-if="scope.row.cardType === 0" src="../../../static/img/quan01.png" alt="" />
<img v-if="scope.row.cardType === 1" src="../../../static/img/quan03.png" alt="" />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<!-- status: 1是未领取,2是已领取 -->
<p><span style="margin-right:10px;">领取状态:</span><span v-if="scope.row.cardType === 2">已领取</span><span v-if="scope.row.cardType <= 0">未领取</span></p>
<p><span>使用状态:</span><span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p>
<p style="font-size:13px;color:#909399"><span v-if="scope.row.cardType === 2">已领取</span><span v-if="scope.row.cardType <= 0">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p>
<!-- <p class="category-ellipsis">
<span v-for="(i, v) in scope.row.sku" :key="v" style="margin-right:3px">{{ i.proName }}:{{ v.valueName ? v.valueName : '--' }}</span>
</p>
......@@ -351,10 +354,11 @@ export default {
display: flex;
}
.gift-info img {
width: 80px;
height: 80px;
width: 63px;
height: 63px;
border-radius: 4px;
margin-right: 5px;
border: 1px solid #dcdfe6;
}
.info-name {
display: inline-block;
......@@ -363,13 +367,14 @@ export default {
}
.pro-ellipsis {
color: #303133;
height: 36px;
line-height: 18px;
height: 36px;
font-size: 14px;
}
.category-ellipsis {
color: #909399;
font-size: 13px;
line-height: 18px;
}
.el-icon-edit {
margin-left: 5px;
......
......@@ -521,10 +521,11 @@ export default {
display: flex;
}
.gift-info img {
width: 80px;
height: 80px;
width: 63px;
height: 63px;
border-radius: 4px;
margin-right: 5px;
border: 1px solid #dcdfe6;
}
.info-name {
display: inline-block;
......@@ -533,7 +534,6 @@ export default {
}
.pro-ellipsis {
color: #303133;
height: 36px;
line-height: 18px;
font-size: 14px;
}
......
......@@ -333,10 +333,11 @@ export default {
background: #fff;
}
.gift-info img {
width: 80px;
height: 80px;
width: 63px;
height: 63px;
border-radius: 4px;
margin-right: 5px;
border: 1px solid #dcdfe6;
}
.info-name {
display: inline-block;
......@@ -352,6 +353,7 @@ export default {
.category-ellipsis {
color: #909399;
font-size: 13px;
line-height: 14px;
}
.el-icon-edit {
margin-left: 5px;
......
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