api

common/api.js

@@ -1,31 +1,48 @@
 import config from '../config.js';
 const getDomain = (uri, method, type) => {
-	let wx_env = config.wx_miniProgram;
-	let system = config.system;
+	// let system = config.system;
 	let url = config.serverUrl;
 	if (type && type == 'file') return url + `/files` + uri;
 	if (type && type == 'integral') {
-		let integral_1 = `/point/zr/v1/api` + uri;
-		if (config.wx_dev) return url + `${config.wx_dev}` + integral_1;
-		else return url + integral_1;
+		let integral = `/point/zr/v1/api` + uri;
+		if (config.wx_dev) integral = url + `${config.wx_dev}` + integral;
+		else integral = url + integral;
+		return integral
 	}
 	if (type && type == 'group') {
-		let group_1 = `/point/group/v1/api` + uri;
-		if (config.wx_dev) return url + `${config.wx_dev}` + group_1;
-		else return url + group_1;
+		let group = `/point/group/v1/api` + uri;
+		if (config.wx_dev) group = url + `${config.wx_dev}` + group;
+		else group = url + group;
+		return group
 	}
 	if (uri.startsWith('/wechat/api')) return url + uri;
-	else {
-		if (system.uniPlatform == 'app') {
-			return url + `/point/v1/api` + uri;
-		} else if (system.uniPlatform == 'mp-weixin') {
-			if (wx_env.envVersion == 'develop' || wx_env.envVersion == 'trial') {
-				return url + `${config.wx_dev}/point/v1/api` + uri;
-			} else if (wx_env.envVersion == 'release') {
-				return url + '/point/v1/api' + uri;
-			}
-		}
-	}
+	let general = `/point/v1/api` + uri;
+	if (config.wx_dev) general = url + `${config.wx_dev}` + general;
+	else general = url + general;
+	return general;
+	// if (type && type == 'file') return url + `/files` + uri;
+	// if (type && type == 'integral') {
+	// 	let integral_1 = `/point/zr/v1/api` + uri;
+	// 	if (config.wx_dev) return url + `${config.wx_dev}` + integral_1;
+	// 	else return url + integral_1;
+	// }
+	// if (type && type == 'group') {
+	// 	let group_1 = `/point/group/v1/api` + uri;
+	// 	if (config.wx_dev) return url + `${config.wx_dev}` + group_1;
+	// 	else return url + group_1;
+	// }
+	// if (uri.startsWith('/wechat/api')) return url + uri;
+	// else {
+	// 	if (system.uniPlatform == 'app') {
+	// 		return url + `/point/v1/api` + uri;
+	// 	} else if (system.uniPlatform == 'mp-weixin') {
+	// 		// if (wx_env.envVersion == 'develop' || wx_env.envVersion == 'trial') {
+	// 		// 	return url + `${config.wx_dev}/point/v1/api` + uri;
+	// 		// } else if (wx_env.envVersion == 'release') {
+	// 		// 	return url + '/point/v1/api' + uri;
+	// 		// }
+	// 	}
+	// }
 };
 // 获取token
 const getToken = () => {

config.js

@@ -1,20 +1,19 @@
-// 微信版本
-const wx_min = uni.getAccountInfoSync();
 // 设备信息
 const system = uni.getSystemInfoSync();
-let wx_projectkey = 'tehqApp'; //tehqApp   pointApp
-
-if (system.uniPlatform == 'mp-weixin') {
-	let envV = wx_min.miniProgram.envVersion;
-	// if (envV == 'develop' || envV == 'trial') wx_projectkey = 'pointApp';
-}
+// 项目微信key
+// 测试环境：pointApp
+// 生产环境：tehqApp
+const wx_projectkey = 'pointApp';
+// 请求地址
+const wx_dev = '/dev';
+// 测试环境：/dev
+// 生产环境：''
 export default {
 	serverUrl: 'https://broadcast.waityou24.cn',
 	// serverUrl: 'http://192.168.223.1:12211',
-	wx_projectkey: wx_projectkey,
-	wx_miniProgram: wx_min.miniProgram,
-	wx_dev: '', // /dev
 	system: system,
+	wx_projectkey: wx_projectkey,
+	wx_dev: wx_dev,
 	share: {},
 	my_menu: [ //
 		{

manifest.json

@@ -1,167 +1,166 @@
 {
-	"name": "天恩活泉",
-	"appid": "__UNI__B379F0E",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"Messaging": {},
-			"Payment": {},
-			"Share": {},
-			"OAuth": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"ad": {},
-				"geolocation": {
-					"system": {
-						"__platform__": ["ios", "android"]
-					}
-				},
-				"oauth": {
-					"univerify": {},
-					"weixin": {
-						"appid": "wx928648edf0df1882",
-						"UniversalLinks": ""
-					}
-				},
-				"maps": {
-					"amap": {
-						"appkey_ios": "68af4192b5156af8c0100dd9c10b4365",
-						"appkey_android": "68af4192b5156af8c0100dd9c10b4365"
-					}
-				},
-				"payment": {
-					"alipay": {
-						"__platform__": ["ios", "android"]
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wx928648edf0df1882",
-						"UniversalLinks": ""
-					}
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx928648edf0df1882",
-		"setting": {
-			"urlCheck": true,
-			"postcss": true,
-			"minified": true
-		},
-		"usingComponents": true,
-		"optimization": {
-			"subPackages": true
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "定位当前位置，选在收获地址"
-			}
-		},
-		"requiredPrivateInfos": ["chooseAddress", "chooseLocation"], //getLocatio__UNI__B379F0E__UNI__B379F0E__UNI__B379F0E__UNI__B379F0En
-		"plugins": {},
-		"lazyCodeLoading": "requiredComponents"
-	},
-	// "chooseLocation" : {
-	//     "version" : "1.0.9",
-	//     "provider" : "wx76a9a06e5b4e693e"
-	// }
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2"
+    "name" : "天恩活泉",
+    "appid" : "__UNI__B379F0E",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Messaging" : {},
+            "Payment" : {},
+            "Share" : {},
+            "OAuth" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {},
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx8cdd28824dfcdf19",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "68af4192b5156af8c0100dd9c10b4365",
+                        "appkey_android" : "68af4192b5156af8c0100dd9c10b4365"
+                    }
+                },
+                "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx8cdd28824dfcdf19",
+                        "UniversalLinks" : ""
+                    }
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx8cdd28824dfcdf19",
+        "setting" : {
+            "urlCheck" : true,
+            "postcss" : true,
+            "minified" : true
+        },
+        "usingComponents" : true,
+        "optimization" : {
+            "subPackages" : true
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "定位当前位置，选在收获地址"
+            }
+        },
+        "requiredPrivateInfos" : [ "chooseAddress", "chooseLocation" ], //getLocatio__UNI__B379F0E__UNI__B379F0E__UNI__B379F0E__UNI__B379F0En
+        "plugins" : {},
+        "lazyCodeLoading" : "requiredComponents"
+    },
+    // "chooseLocation" : {
+    //     "version" : "1.0.9",
+    //     "provider" : "wx76a9a06e5b4e693e"
+    // }
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
 }