|
@@ -61,7 +61,7 @@
|
|
|
{{ form.publishFlag?form.publishFlag==='1'?'是':'否':'--' }}
|
|
|
</a-form-model-item>
|
|
|
</div>
|
|
|
- <div v-if="form.contentType==='LINK'">
|
|
|
+ <div v-show="form.contentType==='LINK'&&form.content === '/pagesB/promoDetail'">
|
|
|
<a-form-model-item label="基本规则" prop="ruleType">
|
|
|
{{ form.promoRule&&form.promoRule.ruleType?form.promoRule.ruleType==='ticket'?'指定产品返代金券':'--':'--' }}
|
|
|
</a-form-model-item>
|
|
@@ -107,24 +107,24 @@
|
|
|
</div>
|
|
|
<div>--</div>
|
|
|
</a-form-model-item>
|
|
|
+ <a-form-model-item label="返券产品" prop="publishFlag" >
|
|
|
+ <div class="productTable">
|
|
|
+ <s-table
|
|
|
+ class="sTable"
|
|
|
+ ref="table"
|
|
|
+ size="small"
|
|
|
+ :rowKey="(record) => record.id"
|
|
|
+ :columns="columns"
|
|
|
+ :data="loadData"
|
|
|
+ :defaultLoadData="false"
|
|
|
+ :style="{ maxHeight: 300+'px' }"
|
|
|
+ :scroll="{ y:230 }"
|
|
|
+ bordered>
|
|
|
+ </s-table>
|
|
|
+ </div>
|
|
|
+ </a-form-model-item>
|
|
|
</div>
|
|
|
</a-form-model>
|
|
|
- <a-card size="small" :bordered="false" class="pages-wrap" v-show="form.contentType==='LINK'">
|
|
|
- <div class="productTable">
|
|
|
- <s-table
|
|
|
- class="sTable"
|
|
|
- ref="table"
|
|
|
- size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :data="loadData"
|
|
|
- :defaultLoadData="false"
|
|
|
- :style="{ maxHeight: 300+'px' }"
|
|
|
- :scroll="{ y:230 }"
|
|
|
- bordered>
|
|
|
- </s-table>
|
|
|
- </div>
|
|
|
- </a-card>
|
|
|
<div class="btn-cont">
|
|
|
<a-button id="promotion-basicInfo-modal-back" @click="isShow = false">关闭</a-button>
|
|
|
</div>
|
|
@@ -238,7 +238,7 @@ export default {
|
|
|
methods: {
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
- this.form = {
|
|
|
+ this.form = {
|
|
|
promoActiveSn: undefined, // 促销活动sn
|
|
|
title: '', // 标题
|
|
|
imageSet: '', // 图片
|
|
@@ -384,8 +384,7 @@ export default {
|
|
|
background:#fff;
|
|
|
}
|
|
|
.productTable{
|
|
|
- width:85%;
|
|
|
- margin:0 auto;
|
|
|
+ width:100%;
|
|
|
}
|
|
|
}
|
|
|
|