提交

Eservice/api/http.js

@@ -1,14 +1,9 @@
 var app = getApp(); //引入全局app.js，我们可以在globalData中定义一些公用的数据，比如baseUrl、token
 
 const request = function (url = "", options) {
-<<<<<<< HEAD
-  const baseUrl = "http://61.164.207.46:8000/yos/rest/index" + url;
-  // const baseUrl = "http://122.226.136.204:8082/yos/rest/index" + url;
-=======
   // const baseUrl = "http://61.164.207.46:8000/yos/rest/index" + url;
-  const baseUrl = "http://122.226.136.204:8082/yos/rest/index" + url;
-  // const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index" + url;
->>>>>>> 6d50bfc48456f82407384374f3ff23da1be150a5
+  // const baseUrl = "http://122.226.136.204:8082/yos/rest/index" + url;
+  const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index" + url;
   options.data.accesstoken = wx.getStorageSync('userMsg').token
   return new Promise((resolve, reject) => {
     wx.request({

app.js

@@ -57,10 +57,6 @@ App({
             that: null, //保存this
             callback: function () {}
         },
-<<<<<<< HEAD
-        host:"http://61.164.207.46:8000"
-=======
         host: "https://oms.idcgroup.com.cn:8079"
->>>>>>> 6d50bfc48456f82407384374f3ff23da1be150a5
     }
 })

project.private.config.json

@@ -3,7 +3,7 @@
   "projectname": "E_WeChat",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "libVersion": "2.18.1",
   "condition": {

utils/Http.js

@@ -1,12 +1,6 @@
-<<<<<<< HEAD
-// const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
-const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
-// const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
-=======
 // const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
-const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
-// const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index";
->>>>>>> 6d50bfc48456f82407384374f3ff23da1be150a5
+// const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
+const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index";
 
 class HTTP {
     request({