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
e2ae488d76

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

@@ -115,7 +115,7 @@
           </div>
           <div class="fullGiftRuleBox" v-else>
             <div class="ruleDescList" v-for="(con,i) in fullGiftRuleList" :key="i">
-              <span>{{ i*1+1 }}、</span>
+              <span v-if="fullGiftRuleList.length>1">{{ i*1+1 }}、</span>
               购买满
               <a-input-number
                 v-model="con.regularValue"
@@ -459,7 +459,7 @@ export default {
           } else {
             newInfo = '按比例;'
             _this.fullGiftRuleList.forEach((item, i) => {
-              newInfo += `<div>${i * 1 + 1}、购买满${item.regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送正价产品总金额的${item.promotionValue}%为促销品采购额</div>`
+              newInfo += `<div>${i > 0 ? (i * 1 + 1) + '、' : ''}购买满${item.regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送正价产品总金额的${item.promotionValue}%为促销品采购额</div>`
             })
           }
           form.ruleInfo = newInfo

+ 4 - 6
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -835,13 +835,11 @@ export default {
   }
 }
 </script>
-<style>
-  .ant-modal-confirm-body{
-    max-height: 500px;
-    overflow-y:scroll;
-  }
-</style>
 <style lang="less" scoped>
+  // .ant-modal-confirm-body{
+  //   max-height: 500px;
+  //   overflow-y:scroll;
+  // }
   .promotionList-basicInfo-modal{
     /deep/.ant-modal-body {
       padding: 20px 30px;