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

src/components/orderCommon/order-form2.vue

@@ -2270,6 +2270,8 @@
           this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
           this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
           this.addMsg.SonControlID = oldValue.SonControlID;
+          this.SingleDMCPrice = oldValue.SingleDMCPrice;
+          this.SingleDMCPricex = oldValue.SingleDMCPrice;
           this.priceObj = JSON.parse(JSON.stringify(oldValue));
           if (this.pagesTitle == "当地游产品") {
             let str = "";
@@ -2278,8 +2280,6 @@
             }
             this.addMsg.Remarks = str;
             this.otherRemark = str;
-            this.SingleDMCPrice = oldValue.SingleDMCPrice;
-            this.SingleDMCPricex = oldValue.SingleDMCPrice;
           }
           // crm自动登陆传过来的参数
           if (this.$route.query.crmOrderObj) {