Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/roomReservationsDetails.vue

@@ -596,7 +596,16 @@
               this.list[this.findex].HotelOrderList[this.childIndex].NewHotelId = ckedObj.ID;
               this.list[this.findex].HotelOrderList[this.childIndex].PayStyle = ckedObj.PayStyle;
               this.list[this.findex].HotelOrderList[this.childIndex].PayStyleExt = ckedObj.PayStyle;
-              this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach(subItem => {
+              this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach((subItem,subIndex) => {
+                //判断是否有库存价格
+                if(subIndex==1 && ckedObj.CostPrice>0)
+                {
+                  subItem.IsHaveStockPrice=1;
+                }
+                else
+                {
+                   subItem.IsHaveStockPrice=0;
+                }
                 subItem.UnitPrice = ckedObj.CostPrice;
                 subItem.RebateRatio = ckedObj.RebateRatio;
               });

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -634,7 +634,6 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
-                console.log("tempData",tempData);
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;