修改后端地址+升级

manifest.json

@@ -2,12 +2,8 @@
     "name" : "好萌友",
     "appid" : "__UNI__F19BBAD",
     "description" : "宠物服务商家端",
-<<<<<<< HEAD
-    "versionName" : "1.2.0t",
-=======
-    "versionName" : "1.1.6",
->>>>>>> 49e5e7f680d609897b8de3461bd25f27da126ccb
-    "versionCode" : 43,
+    "versionName" : "1.2.0",
+    "versionCode" : 44,
     "transformPx" : false,
     "app-plus" : {
         "privacy" : {

utils/config.js

@@ -2,8 +2,8 @@
 
 // 接口基础地址
 // export const BASE_URL = 'http://192.168.1.118:8080'
-// export const BASE_URL = 'http://www.hoomeng.pet/api'
-export const BASE_URL = 'http://111.228.46.254/api'
+export const BASE_URL = 'http://www.hoomeng.pet/api'
+// export const BASE_URL = 'http://111.228.46.254/api'
 // export const BASE_URL = 'http://192.168.1.205:8080'
 
 // 请求超时时间（毫秒）