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

src/components/leaderPay2.vue

@@ -786,7 +786,7 @@
             <td>{{moneyFormat(item.PlanTotalPrice)}}</td>
             <td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
             <td>
-              {{index == 0 ? moneyFormat(item.PlanTotalPrice - AllBZPrice): moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)}}
+              {{ (nav!=null&&nav.length>0&& nav[0].LineId=="90"?moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice):((index == 0) ? moneyFormat(item.PlanTotalPrice - AllBZPrice): moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)))  }}
             </td>
           </tr>
         </template>
@@ -1875,12 +1875,16 @@
         let BusPrice = this.BaoZhangPrice.BusPrice ? parseFloat(this.BaoZhangPrice.BusPrice) : 0;
         let DiningPrice = this.BaoZhangPrice.DiningPrice ? parseFloat(this.BaoZhangPrice.DiningPrice) : 0;
         let ScenicPrice = this.BaoZhangPrice.ScenicPrice ? parseFloat(this.BaoZhangPrice.ScenicPrice) : 0;
-         console.log("allPrice",allPrice);
-         console.log("endPrice",endPrice);
-          console.log("HotelPrice",HotelPrice);
-          console.log("BusPrice",BusPrice);
-          console.log("DiningPrice",DiningPrice);
-          console.log("ScenicPrice",ScenicPrice);
+        //  console.log("this.totalScenicPrice",this.totalScenicPrice);
+        //  console.log("this.totalTrafficPrice ",this.totalTrafficPrice );
+        //   console.log("this.totalDinnerPrice ",this.totalDinnerPrice );
+        //   console.log("this.totalHotelPrice",this.totalHotelPrice);
+        //  console.log("allPrice",allPrice);
+        //  console.log("endPrice",endPrice);
+        //   console.log("HotelPrice",HotelPrice);
+        //   console.log("BusPrice",BusPrice);
+        //   console.log("DiningPrice",DiningPrice);
+        //   console.log("ScenicPrice",ScenicPrice);
         let newPrice = endPrice + HotelPrice + BusPrice + DiningPrice + ScenicPrice
         this.AllBZPrice = newPrice
       },

src/plug/index.js

@@ -123,8 +123,9 @@ export default {
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
         // domainUrl = "http://192.168.5.214";
-        domainUrl = "http://192.168.5.214"
+        domainUrl = "http://192.168.5.39:8083"
         // domainUrl = "http://192.168.5.204:8030"
+        domainUrl = "http://192.168.5.46"
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
@@ -1434,7 +1435,7 @@ export default {
       this.$forceUpdate();
     }
     // 计算当前日期的前后日期
-    Vue.prototype.getBeforeDate = function (num, time) {
+    Vue.prototype.getBeforeDate = function (num, time, format) {
         let n = num;
         let d = '';
         if (time) {
@@ -1458,6 +1459,9 @@ export default {
         mon = d.getMonth() + 1;
         day = d.getDate();
         let s = year + "-" + (mon < 10 ? ('0' + mon) : mon) + "-" + (day < 10 ? ('0' + day) : day);
+        if(format=='yyyy-MM'){
+          return year + "-" + (mon < 10 ? ('0' + mon) : mon);
+        }
         return s;
       },