|
@@ -45,7 +45,7 @@
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span style="margin-left: 50px;">订单起订金额(元):</span>{{ descDetail.minOrderAmount||'无' }}
|
|
<span style="margin-left: 50px;">订单起订金额(元):</span>{{ descDetail.minOrderAmount||'无' }}
|
|
- <span style="margin-left: 50px;">活动经费上线(元):</span>{{ descDetail.upperLimitAmount||'无' }}
|
|
|
|
|
|
+ <span style="margin-left: 50px;">活动经费上限(元):</span>{{ descDetail.upperLimitAmount||'无' }}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -120,13 +120,13 @@
|
|
|
|
|
|
<a-dropdown :disabled="disablePromo">
|
|
<a-dropdown :disabled="disablePromo">
|
|
<a-menu slot="overlay" @click="handleImportClick">
|
|
<a-menu slot="overlay" @click="handleImportClick">
|
|
- <a-menu-item key="GATE" v-if="promo&&promo.promotionRule&&promo.promotionRule.promotionRuleType!='PROMO_PROD'">
|
|
|
|
|
|
+ <a-menu-item key="GATE" v-if="promo&&promo.promotionRule&&promo.promotionRule.gateFlag==='1'">
|
|
导入门槛产品
|
|
导入门槛产品
|
|
</a-menu-item>
|
|
</a-menu-item>
|
|
<a-menu-item key="REGULAR" v-if="promo&&promo.promotionRule&&promo.promotionRule.promotionRuleType!='PROMO_PROD'">
|
|
<a-menu-item key="REGULAR" v-if="promo&&promo.promotionRule&&promo.promotionRule.promotionRuleType!='PROMO_PROD'">
|
|
导入正价产品
|
|
导入正价产品
|
|
</a-menu-item>
|
|
</a-menu-item>
|
|
- <a-menu-item key="GIFT" v-if="promo&&promo.promotionRule&&promo.promotionRule.promotionRuleType!='PROMO_PROD'">
|
|
|
|
|
|
+ <a-menu-item key="GIFT" v-if="promo&&promo.promotionRule&&(promo.promotionRule.regularPromotionSameFlag==='0'||promo.promotionRule.scopeFlag==='0')">
|
|
导入促销产品
|
|
导入促销产品
|
|
</a-menu-item>
|
|
</a-menu-item>
|
|
<a-menu-item key="DISCOUNT" v-if="promo&&promo.promotionRule&&promo.promotionRule.promotionRuleType=='PROMO_PROD'">
|
|
<a-menu-item key="DISCOUNT" v-if="promo&&promo.promotionRule&&promo.promotionRule.promotionRuleType=='PROMO_PROD'">
|