Browse Source

修改bug

chenrui 1 năm trước cách đây
mục cha
commit
856645c7b4

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

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