全局接口域名挂载位置修改

Eservice/api/http.js

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

Eservice/installConfirmBill/index.js

@@ -168,7 +168,7 @@ Page({
   createImage () {
     let token = wx.getStorageSync('userMsg').token
     let parentid = wx.getStorageSync('siteP').appfolderid
-    let url = `${getApp().globalData.host}/comfirmBill/#/htmlToImage?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
+    let url = `${getApp().globalData.http.baseUrl}/comfirmBill/#/htmlToImage?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
     this.setData({
       url:url
     })

Eservice/serviceConfirmBill/index.js

@@ -167,7 +167,7 @@ Page({
 	createImage () {
     let token = wx.getStorageSync('userMsg').token
     let parentid = wx.getStorageSync('siteP').appfolderid
-    let url = `${getApp().globalData.host}/comfirmBill/#/htmlToImageServe?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
+    let url = `${getApp().globalData.http.baseUrl}/comfirmBill/#/htmlToImageServe?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
     this.setData({
       url:url
     })

Eservice/trainConfirmBill/index.js

@@ -194,7 +194,7 @@ Page({
 	createImage () {
     let token = wx.getStorageSync('userMsg').token
     let parentid = wx.getStorageSync('siteP').appfolderid
-    let url = `${getApp().globalData.host}/comfirmBill/#/htmlToImageTrain?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
+    let url = `${getApp().globalData.http.baseUrl}/comfirmBill/#/htmlToImageTrain?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
     this.setData({
       url:url
     })

app.js

@@ -29,7 +29,7 @@ App({
     initSocket() {
         let that = this;
         this.globalData.SocketTask = wx.connectSocket({
-            url: 'wss://oms.idcgroup.com.cn:8079/yos/webSocket/' + wx.getStorageSync('userMsg').token,
+            url: (this.globalData.http.baseUrl + '/yos/webSocket/').replace("https", "wss").replace("http", "ws") + wx.getStorageSync('userMsg').token,
             complete: (res) => {
                 console.log(res)
             }
@@ -48,7 +48,7 @@ App({
         })
     },
     globalData: {
-        http: new ApiModel(), //接口文件
+        http: new ApiModel, //挂载接口文件
         queryPer: require("./utils/queryPermissions"), //权限查询
         handleSelect: null, //处理选择结果  函数
         socketEstablish: false, //是否已经建立socket
@@ -57,6 +57,5 @@ App({
             that: null, //保存this
             callback: function () {}
         },
-        host:"http://61.164.207.46:8000"
     }
 })

utils/Http.js

@@ -1,8 +1,9 @@
-// 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";
-
 class HTTP {
+    constructor() {
+        // this.baseUrl = "http://61.164.207.46:8000";
+        // this.baseUrl = "http://122.226.136.204:8082";
+        this.baseUrl = "https://oms.idcgroup.com.cn:8079";
+    }
     request({
         url,
         data = {},
@@ -22,7 +23,7 @@ class HTTP {
             mask: true
         })
         wx.request({
-            url: baseUrl + url,
+            url: this.baseUrl + '/yos/rest/index' + url,
             data: data,
             method: method,
             header: header,