no message

src/components/orderCommon/order-form2.vue

@@ -2142,7 +2142,9 @@
         if (this.addMsg.GroupType == 4) {
           ChirdNum = 0;
         }
+        let Price = 0
         let PreferPrice = 0
+        let PreferPriceTwo = 0
         let DiscountNumber =
           Number(this.addMsg.ManNum) +
           ChirdNum +
@@ -2151,29 +2153,34 @@
         if(DiscountNumber>0&&this.DiscountAmountId&&(this.addMsg.GroupType==1||this.addMsg.GroupType==2)){
           if(this.DiscountAmountObj&&this.DiscountAmountObj.couponsType==1){
             if(this.addMsg.GroupType==2){
-              if(DiscountNumber==this.DiscountAmountObj.expansionModel.orderGuestNum){
+              if(DiscountNumber>=this.DiscountAmountObj.expansionModel.orderGuestNum){
                 PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.expansionModel.denomination
-              }else{
-                PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.denomination
               }
+              PreferPriceTwo = this.addMsg.PreferPrice-this.DiscountAmountObj.denomination
             }else{
-              PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.denomination
+              PreferPriceTwo = this.addMsg.PreferPrice-this.DiscountAmountObj.denomination
             }
 
           }else if(this.DiscountAmountObj&&this.DiscountAmountObj.couponsType==2){
             if(this.addMsg.GroupType==2){
-              if(DiscountNumber==this.DiscountAmountObj.expansionModel.orderGuestNum){
+              if(DiscountNumber>=this.DiscountAmountObj.expansionModel.orderGuestNum){
                 PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.expansionModel.denomination
-              }else{
-                PreferPrice = this.addMsg.PreferPrice*(this.DiscountAmountObj.denomination/100)
               }
+              PreferPriceTwo = this.addMsg.PreferPrice*(this.DiscountAmountObj.denomination/100)
             }else{
-              PreferPrice = this.addMsg.PreferPrice*(this.DiscountAmountObj.denomination/100)
+              PreferPriceTwo = this.addMsg.PreferPrice*(this.DiscountAmountObj.denomination/100)
             }
           }
-          return PreferPrice
+          if((PreferPrice>PreferPriceTwo)||PreferPrice==0){
+            Price = PreferPriceTwo
+          }else{
+            Price = PreferPrice
+          }
+          // console.log(PreferPrice,'----优惠',PreferPriceTwo)
+          // console.log(Price,'=-=-=-=-')
+          return Price
         }else {
-          return PreferPrice
+          return Price
         }
       },