Skip to content

I
integral-mall
Commit 3b857a5e by damodmg
Options

积分商城样式调整

parent 68dddc54
Showing with 22 additions and 7 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.b36dafaad247fc43f4ac4932020fec43.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.18cfc34dddb593b2154e.js></script><script type=text/javascript src=/integral-mall/static/js/app.7fa91de1ba0ae5652799.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="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.e6008df01ca034b2dbbf51a9e1755e01.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.18cfc34dddb593b2154e.js></script><script type=text/javascript src=/integral-mall/static/js/app.6926f22c5ef78235f73b.js></script></body></html>
\ No newline at end of file
dist/static/js/app.6926f22c5ef78235f73b.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.7fa91de1ba0ae5652799.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/mall/common/card-temp.vue
......@@ -3,7 +3,7 @@
<div class="pb22">
<span class="pr10">共{{total}}条</span>
<el-input :disabled="disabled" v-model="listParams.searchParam" class="w200" clearable placeholder="请输入卡券名称" @change="getCardList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<span class="fz12 gray pl20">领取限制 < 100的卡券不支持选择，系统已自动过滤</span>
<span class="fz12 gray pl20">领取限制 > 100的卡券不支持选择，系统已自动过滤</span>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading" @row-click="chooseCard">
<el-table-column :show-overflow-tooltip="false" width="60" align="center" prop="coupCardId">
......@@ -57,7 +57,7 @@ export default {
listParams:{
searchParam:'',
currentPage:1,
pageSize:20,
pageSize:10,
requestProject:'gic-web',
coupCardId:'',
cardType:this.cardType
......
src/views/mall/coupon/list.vue
......@@ -35,7 +35,7 @@
<span @click="$router.push('/coupon/exchange/'+scope.row.integralMallProId)" class="blue">{{scope.row.allExchangeNumber}}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="left" prop="status">
<el-table-column label="状态" align="left" prop="status" min-width="100px">
<template slot-scope="scope" >
<span v-html="renderStatus(scope.row).html"></span>
</template>
......
src/views/mall/gift/info.js
......@@ -278,6 +278,15 @@ export default {
this.$tips({ type: 'warning', message: '请选择优惠券' });
return;
}
if(this.form.detailDescription){
if(this.form.detailDescription.length>2000){
this.$tips({ type: 'error', message: '图文详情编辑超过字数限制' });
return;
}
}else{
this.form.detailDescription=''
}
let params = {
integralMallProId: this.form.integralMallProId || '',
proType: this.form.changeType === 1 ? 2 : 3, // 商品类型 1 优惠券，2礼品，3实物
......
src/views/mall/gift/list.vue
......@@ -35,7 +35,13 @@
<img class="vertical-middle table__avatar--gift" :src="scope.row.mainImageUrl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.proName || '--'}}</p>
<p class="fz13 gray table-name--ellipsis">{{scope.row.giftCategoryName || '--'}}</p>
<div v-if="scope.row.giftCategoryName">
<el-tooltip class="item" effect="dark" :content="scope.row.giftCategoryName" placement="bottom">
<p class="fz13 gray table-name--ellipsis">{{scope.row.giftCategoryName}}</p>
</el-tooltip>
</div>
<p v-else>--</p>
<!-- <p class="fz13 gray table-name--ellipsis">{{scope.row.giftCategoryName || '--'}}</p> -->
</div>
</div>
</template>
......@@ -68,7 +74,7 @@
<span v-if="scope.row.changeType == 3">在线发货</span>
</template>
</el-table-column>
<el-table-column label="兑换状态" align="left" prop="status">
<el-table-column label="兑换状态" align="left" prop="status" min-width="100px">
<template slot-scope="scope" >
<span v-html="renderStatus(scope.row).html"></span>
</template>
......
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