Skip to content

I
integral-mall
Commit 81fa6a7c by 萱草
Options

update: UI调整

parent 94623dd8
Showing with 31 additions and 16 deletions
dist/index.html
<!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.cd80c432ccb2405b48b36e8c82abd7c9.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.43365edf222fb5a43e42.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.66d64afec27b9ab677ea868673d8d0d9.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.f5de00bbd4ca1d2ddfd3.js></script></body></html>
\ No newline at end of file
dist/static/css/app.66d64afec27b9ab677ea868673d8d0d9.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.cd80c432ccb2405b48b36e8c82abd7c9.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.43365edf222fb5a43e42.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.f5de00bbd4ca1d2ddfd3.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/giftLadderPrice.vue
......@@ -2,7 +2,7 @@
<el-dialog :visible.sync="dialogVisible" width="600px" @close="cancelSubmit()">
<div slot="title" style="margin-top:10px;margin-bottom:10px">
<span style="color:#303133;font-size:16px">设置阶梯价</span>
<span style="color:#606266;font-size:12px">*若未设置阶梯价则以原价进行兑换，请勿随意填入0积分/现金；</span>
<span style="color:#606266;font-size:12px;margin-left:20px">*若未设置阶梯价则以原价进行兑换，请勿随意填入0积分/现金；</span>
</div>
<div v-loading="loading">
<!-- <div style="margin-top:10px;margin-bottom:10px">
......
src/components/goodsSelect.vue
......@@ -31,8 +31,10 @@
<div class="gift-info" v-if="!type">
<img :src="row.mainImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ row.proName }}</p>
<p class="category-ellipsis">礼品编码：{{ row.proCode }}</p>
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:7px">
<p class="pro-ellipsis">{{ row.proName }}</p>
<p class="category-ellipsis">礼品编码：{{ row.proCode }}</p>
</div>
</div>
</div>
<div class="gift-info" v-else>
......@@ -41,9 +43,11 @@
<img v-if="row.cardType === 0 && !row.mainImageUrl" src="../../static/img/quan01.png" alt />
<img v-if="row.cardType === 1 && !row.mainImageUrl" src="../../static/img/quan03.png" alt />
<div class="info-name">
<p class="pro-ellipsis">{{ row.proTitle }}</p>
<p v-if="row.proReferId.split(',').length > 1" class="category-ellipsis">--</p>
<p v-else class="category-ellipsis">{{ row.remarks || '--' }}</p>
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:7px">
<p class="pro-ellipsis">{{ row.proTitle }}</p>
<p v-if="row.proReferId.split(',').length > 1" class="category-ellipsis">--</p>
<p v-else class="category-ellipsis">{{ row.remarks || '--' }}</p>
</div>
</div>
</div>
</template>
......@@ -316,7 +320,7 @@ export default {
}
.pro-ellipsis {
color: #606266;
height: 45px;
height: 22px;
line-height: 22px;
/* width: 230px; */
font-size: 14px;
......@@ -325,5 +329,6 @@ export default {
color: #909399;
font-size: 12px;
line-height: 17px;
margin-top: 6px;
}
</style>
src/views/activities/flashSale/detail.vue
......@@ -88,12 +88,15 @@
<template slot-scope="{ row }">
<div style="display: flex">
<!-- 保持第一级节点的排序框左对齐 -->
<div style="padding-left: 40px;" v-if="row.level == 1"></div>
<div style="padding-left: 20px;" v-if="row.level == 1"></div>
<div class="gift-info" style="display: flex" v-if="row.giftType">
<img :src="row.mainImageUrl" alt />
<div class="info-name">
<p class="pro-ellipsis" :class="[row.giftType ? 'height40' : '']">{{ row.proName }}</p>
<p class="category-ellipsis">礼品编码：{{ row.proCode }}</p>
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:7px">
<p class="pro-ellipsis">{{ row.proName }}</p>
<!-- <p class="pro-ellipsis" :class="[row.giftType ? 'height40' : '']">{{ row.proName }}</p> -->
<p class="category-ellipsis">礼品编码：{{ row.proCode }}</p>
</div>
</div>
</div>
<div class="gift-info" style="display: flex" v-else>
......@@ -1179,13 +1182,14 @@ export default {
.pro-ellipsis {
color: #606266;
/* height: 45px; */
line-height: 18px;
line-height: 22px;
/* width: 230px; */
font-size: 14px;
}
.category-ellipsis {
color: #909399;
font-size: 13px;
font-size: 12px;
line-height: 17px;
}
.el-icon-edit {
margin-left: 5px;
......@@ -1239,4 +1243,10 @@ export default {
.label-icons .el-form-item__label {
padding-right: 40px !important;
}
.add-table .el-table__row--level-1 .el-table__indent {
display: none;
}
.add-table .el-table__row--level-1 .el-table__placeholder {
display: none;
}
</style>
src/views/goods/coupon/info.vue
......@@ -184,7 +184,7 @@
<el-popover placement="bottom" width="500" trigger="click" ref="popover">
<div style="margin-top:10px;margin-bottom:10px">
<span style="color:#303133;font-size:16px">设置阶梯价</span>
<span>*若未设置阶梯价则以原价进行兑换，请勿随意填入0积分/现金；</span>
<span style="color:#606266;font-size:12px;margin-left:20px">*若未设置阶梯价则以原价进行兑换，请勿随意填入0积分/现金；</span>
</div>
<el-tabs :value="selectTab" type="border-card">
<el-tab-pane :name="index" v-for="(item, index) in ladderMemberGrade" :key="index" :label="item.gradeName" :value="item.gradeId">
......
src/views/goods/gift/info.vue
......@@ -137,7 +137,7 @@
<el-popover placement="bottom" width="500" trigger="click" ref="popover">
<div style="margin-top:10px;margin-bottom:10px">
<span style="color:#303133;font-size:16px">设置阶梯价</span>
<span>*若未设置阶梯价则以原价进行兑换，请勿随意填入0积分/现金；</span>
<span style="color:#606266;font-size:12px;margin-left:20px">*若未设置阶梯价则以原价进行兑换，请勿随意填入0积分/现金；</span>
</div>
<el-tabs :value="selectTab" type="border-card">
<el-tab-pane :name="index" v-for="(item, index) in ladderMemberGrade" :key="index" :label="item.gradeName" :value="item.gradeId">
......
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