Skip to content

I
integral-mall
Commit 94623dd8 by 萱草
Options

update: 样式调整

parent cce31a83
Showing with 17 additions and 11 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.157484c8b868a8b42bafc67c6be53e85.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.da6615ea20eb3ca81438.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.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
dist/static/css/app.157484c8b868a8b42bafc67c6be53e85.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.cd80c432ccb2405b48b36e8c82abd7c9.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.43365edf222fb5a43e42.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.da6615ea20eb3ca81438.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/goodsSelect.vue
......@@ -58,10 +58,10 @@
</el-table-column>
<el-table-column label="商品状态">
<template slot-scope="{ row }">
<span class="dm-status--info" v-if="row.status === 2 && row.canEdit && row.releaseType === 1">已上架</span>
<span class="dm-status--primary" v-if="row.status === 2 && row.canEdit && row.releaseType === 2 && row.isShelves === 1">已下架</span>
<span class="dm-status--info" v-if="row.status === 2 && row.canEdit && row.releaseType === 2 && row.isShelves === 0">已上架</span>
<span class="dm-status--primary" v-if="row.status === 1 && row.canEdit">已下架</span>
<span class="dm-status--success" v-if="row.status === 2 && row.canEdit && row.releaseType === 1">已上架</span>
<span class="dm-status--info" v-if="row.status === 2 && row.canEdit && row.releaseType === 2 && row.isShelves === 1">已下架</span>
<span class="dm-status--success" v-if="row.status === 2 && row.canEdit && row.releaseType === 2 && row.isShelves === 0">已上架</span>
<span class="dm-status--info" v-if="row.status === 1 && row.canEdit">已下架</span>
</template>
</el-table-column>
<el-table-column label="积分" prop="integralCost"></el-table-column>
......
src/views/activities/flashSale/detail.vue
......@@ -1177,7 +1177,7 @@ export default {
width: 80%;
}
.pro-ellipsis {
color: #303133;
color: #606266;
/* height: 45px; */
line-height: 18px;
/* width: 230px; */
......
src/views/activities/flashSale/list.vue
......@@ -18,17 +18,17 @@
<div class="operate-top">
<div class="fl">
<div class="search-item">
<el-select v-model="query.activityStatus" placeholder="所有活动状态" clearable class="w-140" @change="getSearchList('1')">
<el-select v-model="query.activityStatus" placeholder="所有活动状态" clearable class="w-160" @change="getSearchList('1')">
<el-option label="未开始" :value="0"></el-option>
<el-option label="进行中" :value="1"></el-option>
<el-option label="已结束" :value="2"></el-option>
</el-select>
</div>
<div class="search-item">
<el-input v-model.trim="query.activityName" placeholder="请输入关键词进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @change="getSearchList('1')"></el-input>
<el-input v-model.trim="query.activityName" placeholder="请输入关键词进行搜索" prefix-icon="el-icon-search" clearable class="w-300" @change="getSearchList('1')"></el-input>
</div>
<div class="search-item">
<el-date-picker class="date-picker" @change="getSearchList('1')" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker class="date-picker" @change="getSearchList('1')" v-model="dateValue" type="datetimerange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
</div>
<div class="fr">
......@@ -58,7 +58,7 @@
</el-table-column>
<el-table-column label="适用会员" :render-header="renderHeader">
<template slot-scope="{ row }">
{{ row.memberSearchType === 1 ? '全部会员' : row.memberSearchType === 2 ? '会员分组' : '部分会员' }}
{{ row.memberSearchType === 1 ? '所有会员' : row.memberSearchType === 2 ? row.memberSearchParams.split(',').length + '个会员分组' : '部分会员' }}
</template>
</el-table-column>
<el-table-column label="操作">
......@@ -214,9 +214,15 @@ export default {
.w-280 {
width: 280px;
}
.w-300 {
width: 300px;
}
.w-140 {
width: 140px;
}
.w-160 {
width: 160px;
}
.gift-info img {
width: 75px;
height: 75px;
......
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