Skip to content

I
integral-mall
Commit f21b1873 by 萱草
Options

update: 更新

parent cbec0b1e
Showing with 24 additions and 9 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.b687dfdd19d2372bd348ea89c357a732.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.b4318f230e53490853d9.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.13ffeac7d06a984efe4e142ee976e2bd.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.152fbbc1c5621def3f8a.js></script></body></html>
\ No newline at end of file
dist/static/css/app.13ffeac7d06a984efe4e142ee976e2bd.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.b687dfdd19d2372bd348ea89c357a732.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.152fbbc1c5621def3f8a.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.b4318f230e53490853d9.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/checkStockDistirbute.vue
......@@ -76,7 +76,11 @@ export default {
activityStock: totalActivityStock
});
}
this.giftPropValues = this.stockTableData[1].giftPropValues;
if (this.stockTableData.length > 1) {
this.giftPropValues = this.stockTableData[1].giftPropValues;
} else {
this.giftPropValues = '';
}
} else {
this.$message.error(res.data.message);
this.loading = false;
......
src/views/goods/coupon/coupon.vue
......@@ -62,15 +62,16 @@
<div class="info-name">
<div>
<el-tooltip :content="'优惠券id：' + scope.row.integralMallProId" effect="dark" placement="top-start">
<p class="pro-ellipsis" :class="[scope.row.hasActivity ? 'pro-ellipsis2' : 'pro-ellipsis']" style="display:inline-block">{{ scope.row.proTitle }}</p>
<p class="pro-ellipsis" :class="[!scope.row.hasActivity ? 'pro-ellipsis' : scope.row.proReferId.split(',').length > 1 ? 'pro-ellipsis2' : 'pro-ellipsis3']" style="display:inline-block">{{ scope.row.proTitle }}</p>
</el-tooltip>
<el-tooltip v-if="scope.row.cardErrorMessage && scope.row.cardErrorMessage !== ''" class="tips-content" popper-class="store-tips" effect="light" :content="scope.row.cardErrorMessage && scope.row.cardErrorMessage !== '' ? '卡券存在异常，请进入详情查看' : ''" placement="top-start">
<i class="iconfont icon-xinxixianshi" style="color:#f5222d;display:inline-block"></i>
<i class="iconfont icon-xinxixianshi" style="colorfs:#f5222d;display:inline-block"></i>
</el-tooltip>
</div>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
<p class="category-ellipsis">{{ scope.row.remarks }}</p>
<div v-if="scope.row.hasActivity" style="font-size:14px;background-color:#f56c6c;color:#fff;line-height:20px;width:35px;text-align:center">秒杀</div>
<div v-if="scope.row.hasActivity" style="font-size:12px;background-color:#f56c6c;color:#fff;line-height:16px;width:32px;text-align:center">秒杀</div>
<!-- <div style="font-size:14px;background-color:#f56c6c;color:#fff;line-height:20px;width:35px;text-align:center">秒杀</div> -->
</div>
</div>
</template>
......@@ -666,7 +667,7 @@ export default {
}
.pro-ellipsis {
color: #303133;
height: 36px;
height: 35px;
line-height: 18px;
/* width: 230px; */
font-size: 14px;
......@@ -678,6 +679,13 @@ export default {
/* width: 230px; */
font-size: 14px;
}
.pro-ellipsis3 {
color: #303133;
height: 21px;
line-height: 18px;
/* width: 230px; */
font-size: 14px;
}
.category-ellipsis {
color: #909399;
font-size: 13px;
......
src/views/goods/gift/gift.vue
......@@ -72,7 +72,7 @@
</p>
</el-tooltip>
<p class="category-ellipsis">编码：{{ scope.row.proCode }}</p>
<div v-if="scope.row.hasActivity" style="font-size:14px;background-color:#f56c6c;color:#fff;line-height:20px;width:35px;text-align:center">秒杀</div>
<div v-if="scope.row.hasActivity" style="font-size:12px;background-color:#f56c6c;color:#fff;line-height:16px;width:32px;text-align:center">秒杀</div>
</div>
</div>
</template>
......
src/views/goods/soldStatistics/statistics.vue
......@@ -51,7 +51,10 @@
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="{ row }"><el-button type="text" @click="checkDistribution(row)">查看分布</el-button></template>
<template slot-scope="{ row }">
<el-button v-if="row.hasSku" type="text" @click="checkDistribution(row)">查看分布</el-button>
<span v-else>--</span>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
......
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