Browse Source

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

lilei 1 year ago
parent
commit
adc69eef25

+ 2 - 3
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -266,7 +266,7 @@ export default {
       id: null,
       code: 'SCOPE_UNIT_TYPE', // 起订类型数据字典
       unitTypeDataList: [],
-      loadingSave:false
+      loadingSave: false
     }
   },
   methods: {
@@ -490,7 +490,7 @@ export default {
           }
           var newInfo = `<div>${form.accrualFlag == '1' ? '数量叠加;' : ''}${form.convertExpenseFlag == '1' ? '可转费用报销单;' : ''}</div>`
           _this.fullGiftRuleList.forEach((item, i) => {
-            newInfo += `<div>${i * 1 + 1}、${form.regularSameFlag == '1' ? '同款' : '不同款'}产品购买满${item.regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送${item.promotionValue}个促销产品</div>`
+            newInfo += `<div>${i > 0 ? (i * 1 + 1) + '、' : ''}${form.regularSameFlag == '1' ? '同款' : '不同款'}产品购买满${item.regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送${item.promotionValue}个促销产品</div>`
           })
           newInfo += form.restrictFlag == '1' ? `<div>限制正价产品${form.restrictCategory}款</div>` : ''
           form.ruleInfo = newInfo
@@ -509,7 +509,6 @@ export default {
               _this.spinning = false
               _this.loadingSave = false
             }
-            
           })
         } else {
           return false