Merge branch 'master' of http://175.178.51.79:3000/hly/pet-front-order

config.js

@@ -1,7 +1,9 @@
 // 应用全局配置
 module.exports = {
   // baseUrl: 'https://api.catmdogd.com/prod-api',
-  baseUrl: 'https://api-test.catmdogd.com/test-api',
+  // baseUrl: 'https://api-test.catmdogd.com/test-api',
+  // baseUrl: 'https://pet-admin.hhlm1688.com/api',
+  baseUrl: 'http://h5.xzaiyp.top',
   // 应用信息
   appInfo: {
     // 应用名称

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "CMDF",
-    "appid" : "__UNI__A764ECB",
+    "appid" : "__UNI__6B015BD",
     "description" : "猫妈狗爸",
     "versionName" : "1.1.0",
     "versionCode" : "100",
@@ -51,15 +51,12 @@
         "optimization" : {
             "subPackages" : true
         },
-		"permission": {
-		    "scope.userLocation": {
-		        "desc": "需要获取你当前位置信息"
-		    }
-		},
-		"requiredPrivateInfos":[
-		    "getLocation",
-			"chooseLocation"
-		],
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "需要获取你当前位置信息"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
         "plugins" : {
             "sendCoupon" : {
                 "version" : "latest",

utils/getUrl.js

@@ -1,15 +0,0 @@
-let current ="develop";
-const accountInfo = wx.getAccountInfoSync();
-
-current = accountInfo.miniProgram.envVersion;
-
-
-const api={
-	develop:"http://h5.xzaiyp.top",
-	// develop:"https://api-test.catmdogd.com/test-api",
-	trial:"https://api-test.catmdogd.com/test-api",
-	release:"https://api.catmdogd.com/prod-api",
-}
-
-const currentUrl = api[current];
-export {currentUrl};