基础配置

Eservice/api/http.js

@@ -1,17 +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;
-
-  console.log(baseUrl)
->>>>>>> 462eff694c7055755ed096669c0c8b22d191195c
+  // 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: "http://122.226.136.204:8082"
->>>>>>> 462eff694c7055755ed096669c0c8b22d191195c
+        host: "https://oms.idcgroup.com.cn:8079"
     }
 })

app.json

@@ -11,7 +11,9 @@
     "pages/tabbar/mine/changePassword/index",
     "pages/teams/index",
     "pages/teams/addUsers",
-    "pages/teams/addRole"
+    "pages/teams/addRole",
+    "pages/tabbar/mine/address/index",
+    "pages/tabbar/mine/address/update"
   ],
   "subpackages": [
     {

static/font-icon.wxss

@@ -2,9 +2,9 @@
 
 @font-face {
   font-family: "iconfont"; /* Project id 3830173 */
-  src: url('//at.alicdn.com/t/c/font_3830173_11m2ocmmf9gh.woff2?t=1675318503223') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3830173_11m2ocmmf9gh.woff?t=1675318503223') format('woff'),
-       url('//at.alicdn.com/t/c/font_3830173_11m2ocmmf9gh.ttf?t=1675318503223') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3830173_6rnbwvxgkvh.woff2?t=1677303238642') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3830173_6rnbwvxgkvh.woff?t=1677303238642') format('woff'),
+       url('//at.alicdn.com/t/c/font_3830173_6rnbwvxgkvh.ttf?t=1677303238642') format('truetype');
 }
 
 .iconfont {
@@ -15,6 +15,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-a-wodemendianxinxidizhi:before {
+  content: "\e64b";
+}
+
 .icon-a-biaoqianlanzhiku:before {
   content: "\e608";
 }
@@ -215,10 +219,6 @@
   content: "\e64a";
 }
 
-.icon-xiaoxigundong:before {
-  content: "\e674";
-}
-
 .icon-E-dingdanxitong:before {
   content: "\e675";
 }

utils/Http.js

@@ -1,12 +1,6 @@
-// const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
-<<<<<<< HEAD
-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";
->>>>>>> 462eff694c7055755ed096669c0c8b22d191195c
 
 class HTTP {
     request({