Merge branch 'dev-sy-11-18'
This commit is contained in:
		
						commit
						6ec9d2bedc
					
				| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
    "version" : "1.0",
 | 
			
		||||
    "configurations" : [
 | 
			
		||||
        {
 | 
			
		||||
            "playground" : "standard",
 | 
			
		||||
            "playground" : "custom",
 | 
			
		||||
            "type" : "uni-app:app-android"
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,28 +1,31 @@
 | 
			
		|||
{
 | 
			
		||||
    "name" : "material-app",
 | 
			
		||||
    "appid" : "__UNI__9349CB7",
 | 
			
		||||
    "description" : "",
 | 
			
		||||
    "versionName" : "1.0.0",
 | 
			
		||||
    "versionCode" : "100",
 | 
			
		||||
    "transformPx" : false,
 | 
			
		||||
    "name": "material-app",
 | 
			
		||||
    "appid": "__UNI__9349CB7",
 | 
			
		||||
    "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
 | 
			
		||||
    "app-plus": {
 | 
			
		||||
        "usingComponents": true,
 | 
			
		||||
        "nvueStyleCompiler": "uni-app",
 | 
			
		||||
        "compilerVersion": 3,
 | 
			
		||||
        "splashscreen": {
 | 
			
		||||
            "alwaysShowBeforeRender": true,
 | 
			
		||||
            "waiting": true,
 | 
			
		||||
            "autoclose": true,
 | 
			
		||||
            "delay": 0
 | 
			
		||||
        },
 | 
			
		||||
        "compatible": {
 | 
			
		||||
            "ignoreVersion": true
 | 
			
		||||
        },
 | 
			
		||||
        /* 模块配置 */
 | 
			
		||||
        "modules" : {},
 | 
			
		||||
        "modules": {},
 | 
			
		||||
        /* 应用发布信息 */
 | 
			
		||||
        "distribute" : {
 | 
			
		||||
        "distribute": {
 | 
			
		||||
            /* android打包配置 */
 | 
			
		||||
            "android" : {
 | 
			
		||||
                "permissions" : [
 | 
			
		||||
            "android": {
 | 
			
		||||
                "permissions": [
 | 
			
		||||
                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
 | 
			
		||||
                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
 | 
			
		||||
                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
 | 
			
		||||
| 
						 | 
				
			
			@ -41,34 +44,34 @@
 | 
			
		|||
                ]
 | 
			
		||||
            },
 | 
			
		||||
            /* ios打包配置 */
 | 
			
		||||
            "ios" : {
 | 
			
		||||
                "dSYMs" : false
 | 
			
		||||
            "ios": {
 | 
			
		||||
                "dSYMs": false
 | 
			
		||||
            },
 | 
			
		||||
            /* SDK配置 */
 | 
			
		||||
            "sdkConfigs" : {}
 | 
			
		||||
            "sdkConfigs": {}
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
    /* 快应用特有相关 */
 | 
			
		||||
    "quickapp" : {},
 | 
			
		||||
    "quickapp": {},
 | 
			
		||||
    /* 小程序特有相关 */
 | 
			
		||||
    "mp-weixin" : {
 | 
			
		||||
        "appid" : "wx780dccf027dbd110",
 | 
			
		||||
        "setting" : {
 | 
			
		||||
            "urlCheck" : false
 | 
			
		||||
    "mp-weixin": {
 | 
			
		||||
        "appid": "wx780dccf027dbd110",
 | 
			
		||||
        "setting": {
 | 
			
		||||
            "urlCheck": false
 | 
			
		||||
        },
 | 
			
		||||
        "usingComponents" : true
 | 
			
		||||
        "usingComponents": true
 | 
			
		||||
    },
 | 
			
		||||
    "mp-alipay" : {
 | 
			
		||||
        "usingComponents" : true
 | 
			
		||||
    "mp-alipay": {
 | 
			
		||||
        "usingComponents": true
 | 
			
		||||
    },
 | 
			
		||||
    "mp-baidu" : {
 | 
			
		||||
        "usingComponents" : true
 | 
			
		||||
    "mp-baidu": {
 | 
			
		||||
        "usingComponents": true
 | 
			
		||||
    },
 | 
			
		||||
    "mp-toutiao" : {
 | 
			
		||||
        "usingComponents" : true
 | 
			
		||||
    "mp-toutiao": {
 | 
			
		||||
        "usingComponents": true
 | 
			
		||||
    },
 | 
			
		||||
    "uniStatistics" : {
 | 
			
		||||
        "enable" : false
 | 
			
		||||
    "uniStatistics": {
 | 
			
		||||
        "enable": false
 | 
			
		||||
    },
 | 
			
		||||
    "vueVersion" : "3"
 | 
			
		||||
    "vueVersion": "3"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,8 +6,8 @@ import { useMemberStore } from '@/stores'
 | 
			
		|||
 *  baseURL 设置请求ip地址和端口
 | 
			
		||||
 */
 | 
			
		||||
const ENV = process.env.NODE_ENV
 | 
			
		||||
// export const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***'
 | 
			
		||||
export const baseURL = ENV === 'development' ? '/api' : '***'
 | 
			
		||||
export const baseURL = ENV === 'development' ? 'http://192.168.2.246:18080' : '***'
 | 
			
		||||
// export const baseURL = ENV === 'development' ? '/api' : '***'
 | 
			
		||||
/**
 | 
			
		||||
 * httpInterceptor 分别拦截 request 和 uploadFile 请求
 | 
			
		||||
 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue