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

src/components/myOrdersAllType/components/OrderList.vue

@@ -529,9 +529,10 @@
               <span>{{ changePriceMsg.ApplyForMoney }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="4" v-if="false">
             <el-form-item :label="$t('objFill.yinshouzje')" prop="Money">
               <!-- :disabled="userInfo.EmployeeId!=1" -->
+              <!-- :readonly="changePriceMsg.DialogType == 1||userInfo.EmployeeId!=ExamineBy||titleType == 3 ? true : false" -->
               <el-input type="number"
                 :readonly="changePriceMsg.DialogType == 1||userInfo.EmployeeId!=ExamineBy||titleType == 3 ? true : false"
                 v-model="changePriceMsg.Money" rows="6"></el-input>

src/plug/index.js

@@ -122,11 +122,11 @@ export default {
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
-        // 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";
+        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"
+ 
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";