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

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;
       },