Prechádzať zdrojové kódy

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei 1 rok pred
rodič
commit
8b90bcbcd2

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -61,7 +61,7 @@
                 购买门槛产品金额{{ record.gateAmount*100 }}%作为配额
               </span>
               <span v-else-if="record.gateType==='MIN_AMOUNT'">
-                购买门槛产品满最低金额{{ record.gateAmount }}元,不限制配额
+                购买门槛产品满最低金额{{ record.gateAmount }}元,不限制配额
               </span>
               <span v-else>购买满{{ record.gateAmount }}元门槛产品,可使用 {{ record.quotaAmount }}元配额,采购规则中的{{ record.promotionRuleType!='PROMO_PROD'?'正价':'特价' }}商品</span>
             </div>
@@ -70,7 +70,7 @@
           <!-- 规则 -->
           <template slot="ruleProduct" slot-scope="text, record">
             <div v-if="record.promotionRuleType == 'BUY_PROD_GIVE_PROD'">
-              {{ record.regularSameFlag==1?'同款':'不同款' }}产品,购买满{{ record.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品{{ record.promotionRuleType ==='BUY_PROD_GIVE_MONEY'?(record.accrualFlag&&record.accrualFlag==1)?',金额叠加':',金额不叠加':'' }}
+              {{ record.regularSameFlag==1?'同款':'不同款' }}产品,购买满{{ record.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品{{ (record.accrualFlag&&record.accrualFlag==1)?',数量叠加':',数量不叠加' }}
             </div>
             <div v-else-if="record.promotionRuleType == 'BUY_PROD_GIVE_MONEY'">
               购买满{{ record.regularAmount }}元正价产品,送{{ record.giveAmount }}元促销品采购额{{ record.promotionRuleType ==='BUY_PROD_GIVE_MONEY'?(record.accrualFlag&&record.accrualFlag==1)?',金额叠加':',金额不叠加':'' }}