|
@@ -116,16 +116,16 @@
|
|
|
</template>
|
|
|
<!-- 活动规则 -->
|
|
|
<template slot="promoRules" slot-scope="text, record">
|
|
|
- <span v-if="record.promoType==='BUY_PROD_GIVE_PROD'">买{{ record.conditionValue }}赠{{ record.resultValue }}</span>
|
|
|
- <span v-else-if="record.promoType==='PROMO_PROD'">优惠了{{ (record.shopProductPrice - record.resultValue)?(record.shopProductPrice - record.resultValue).toFixed(2):'--' }}元</span>
|
|
|
- <span v-else-if="record.promoType==='BUY_PROD_GIVE_VALID'">返{{ record.resultValue ? record.resultValue.toFixed(2):'--' }}元</span>
|
|
|
+ <span v-if="record.promoType==='BUY_PROD_GIVE_PROD'&&record.conditionValue&&record.resultValue">买{{ record.conditionValue }}赠{{ record.resultValue }}</span>
|
|
|
+ <span v-else-if="record.promoType==='PROMO_PROD'&&record.shopProductPrice&&record.resultValue">优惠了{{ (record.shopProductPrice - record.resultValue)?(record.shopProductPrice - record.resultValue).toFixed(2):'--' }}元</span>
|
|
|
+ <span v-else-if="record.promoType==='BUY_PROD_GIVE_VALID'&&record.resultValue">返{{ record.resultValue ? record.resultValue.toFixed(2):'--' }}元</span>
|
|
|
<span v-else>--</span>
|
|
|
</template>
|
|
|
<!-- 促销售价 -->
|
|
|
<template slot="promoPrice" slot-scope="text, record">
|
|
|
- <span v-if="record.promoType==='BUY_PROD_GIVE_PROD'">{{ record.shopProductPrice ?record.shopProductPrice.toFixed(2):'--' }}</span>
|
|
|
- <span v-else-if="record.promoType==='PROMO_PROD'">{{ (record.shopProductPrice - record.resultValue)?(record.shopProductPrice - record.resultValue).toFixed(2):'--' }}</span>
|
|
|
- <span v-else-if="record.promoType==='BUY_PROD_GIVE_VALID'">{{ record.shopProductPrice?record.shopProductPrice.toFixed(2):'--' }}</span>
|
|
|
+ <span v-if="record.promoType==='BUY_PROD_GIVE_PROD'&&record.shopProductPrice">{{ record.shopProductPrice ?record.shopProductPrice.toFixed(2):'--' }}</span>
|
|
|
+ <span v-else-if="record.promoType==='PROMO_PROD'&&record.shopProductPrice&&record.resultValue">{{ record.shopProductPrice?record.shopProductPrice.toFixed(2):'--' }}</span>
|
|
|
+ <span v-else-if="record.promoType==='BUY_PROD_GIVE_VALID'&&record.shopProductPrice">{{ record.shopProductPrice?record.shopProductPrice.toFixed(2):'--' }}</span>
|
|
|
<span v-else>--</span>
|
|
|
</template>
|
|
|
<!-- 商城类目 -->
|
|
@@ -145,14 +145,13 @@ import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import productType from '@/views/common/productType.js'
|
|
|
import productBrand from '@/views/common/productBrand.js'
|
|
|
-import chooseProduct from '@/views/easyPassManagement/shoppingManagement/chooseProductsModal'
|
|
|
// 接口
|
|
|
import { shopPromoProductList } from '@/api/shopPromoProduct'
|
|
|
import { queryExtList } from '@/api/shopProduct'
|
|
|
export default {
|
|
|
name: 'PromoProductsList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, productType, productBrand, chooseProduct },
|
|
|
+ components: { STable, VSelect, productType, productBrand },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|