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

src/components/administrative/CommissionDetail.vue

@@ -44,7 +44,8 @@ export default {
         ParentId: 0,
         OrderStr: "RB_Branch_Id asc",
         BName:-1,
-        RB_Branch_Id:-1
+        RB_Branch_Id:-1,
+        Periods: ''
       },
       total: 0,
       currentPage: 1,
@@ -425,6 +426,7 @@ export default {
     if(this.$route.query.companyID) {
       this.companyID = this.$route.query.companyID;
       this.msg.RB_Branch_Id = this.$route.query.companyID;
+      this.msg.Periods = this.$route.query.periods;
       this.disabledCPSelect = true
     }
     let dt=new Date()

src/plug/index.js

@@ -111,7 +111,8 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
-        domainUrl = "http://192.168.2.214:8082";
+      domainUrl = "http://192.168.2.214:8082";
+      domainUrl = "http://reborn.oytour.com";
         let locationName = window.location.hostname;
 
         let javaUrldo="";