diff --git a/androidPrivacy.json b/androidPrivacy.json index 2664df59..264d6324 100755 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -1,14 +1,14 @@ { - "version": "1", + "version": "4", "prompt": "template", "title": "用户协议和隐私政策", - "message": "  请你务必审慎阅读、充分理解“用户协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
  你可阅读《用户协议》《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。", + "message": "  请你务必审慎阅读、充分理解“用户协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
  你可阅读《用户协议》《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。", "buttonAccept": "同意并接受", "buttonRefuse": "暂不同意", "hrefLoader": "system|default", "second": { "title": "确认提示", - "message": "  进入应用前,你需先同意《用户协议》《隐私政策》,否则将退出应用。", + "message": "  进入应用前,你需先同意《用户协议》《隐私政策》,否则将退出应用。", "buttonAccept": "同意并继续", "buttonRefuse": "退出应用" }, diff --git a/config/api.js b/config/api.js index 6e191b91..e71437f8 100644 --- a/config/api.js +++ b/config/api.js @@ -12,19 +12,17 @@ const dev = { common: "http://43.143.227.203:8890", buyer: "http://43.143.227.203:8888", vlog: "http://43.143.227.203:8099", - // vlog: "http://192.168.1.86:8099", web: "http://43.143.227.203:8099", seller: "http://43.143.227.203:8889", }; // 生产环境 const prod = { - // common: "https://common-api.pickmall.cn", - // buyer: "https://buyer-api.pickmall.cn", + // common: "http://192.168.1.211:8890", + // buyer: "http://192.168.1.211:8888", common: "http://43.143.227.203:8890", buyer: "http://43.143.227.203:8888", vlog: "http://43.143.227.203:8099", - // vlog: "http://192.168.1.86:8099", web: "http://43.143.227.203:8099", seller: "http://43.143.227.203:8889", }; diff --git a/manifest.json b/manifest.json index d027e88d..15a9d2b5 100644 --- a/manifest.json +++ b/manifest.json @@ -1,239 +1,243 @@ -{ - "name": "无终街", - "appid": "__UNI__6DB512D", - "description": "admin", - "versionName": "4.0.0", - "versionCode": 4000049, - "transformPx": false, - "app-plus": { - "compatible": { - "ignoreVersion": true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 - }, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - /* 5+App特有相关 */ - "usingComponents": true, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "screenOrientation": ["portrait-primary"], - "modules": { - "Payment": {}, - "Share": {}, - "Geolocation": {}, - "Maps": {}, - "OAuth": {}, - "Camera": {}, - "Barcode": {}, - "VideoPlayer": {}, - "Push": {} - }, - "error": { - /* 404错误页面*/ - "url": "hybrid/html/error.html" - }, - /* 模块配置 */ - "distribute": { - /* 应用发布信息 */ - "android": { - /* android打包配置 */ - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"], - "schemes": "wuzhongjie", - "minSdkVersion": 21 - }, - "ios": { - "idfa": false, - "privacyDescription": { - "NSPhotoLibraryUsageDescription": "需要用与评论上传,头像上传功能", - "NSPhotoLibraryAddUsageDescription": "保存商品图片到本地", - "NSFaceIDUsageDescription": "使用面部识别进行登录", - "NSCameraUsageDescription": "需要用与扫描二维码和商品评论图片拍摄", - "NSLocationAlwaysAndWhenInUseUsageDescription": "位置信息将用于高德地图的效果展示", - "NSMicrophoneUsageDescription": "用户上传视频时需使用音频信息" - }, - "urltypes": "wuzhongjie", - "dSYMs": false - }, - /* ios打包配置 */ - "sdkConfigs": { - "payment": { - "weixin": { - "__platform__": ["ios", "android"], - "appid": "wxebcdaea31881caab", - "UniversalLinks": "https://m-b2b2c.pickmall.cn/app/" - }, - "alipay": { - "__platform__": ["ios", "android"] - } - }, - "ad": {}, - "share": { - "weixin": { - "appid": "wxebcdaea31881caab", - "UniversalLinks": "https://m-b2b2c.pickmall.cn/app/" - } - }, - "oauth": { - "weixin": { - "appid": "wxebcdaea31881caab", - "appsecret": "71826d76bad096ec5407897c6ed1391f", - "UniversalLinks": "https://m-b2b2c.pickmall.cn/app/" - }, - "apple": {}, - "qq": { - "appid": "101918503" - } - }, - "geolocation": { - "amap": { - "__platform__": ["ios", "android"], - "appkey_ios": "f463d3350efe63f8be5d9a62f24d0aab", - "appkey_android": "fb3f1ccb34616c70f068aa950f3e27df" - }, - "system": { - "__platform__": ["ios", "android"] - } - }, - "maps": { - "amap": { - "appkey_ios": "f463d3350efe63f8be5d9a62f24d0aab", - "appkey_android": "fb3f1ccb34616c70f068aa950f3e27df" - } - }, - "push": {} - }, - "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" - } - } - }, - "splashscreen": { - "iosStyle": "common", - "ios": { - "storyboard": "CustomStoryboard.zip" - }, - "androidStyle": "default", - "android": { - "hdpi": "CustomStartPage/start-page.9.png", - "xhdpi": "CustomStartPage/start-page.9.png", - "xxhdpi": "CustomStartPage/start-page.9.png" - }, - "useOriginalMsgbox": true - } - }, - "nativePlugins": {} - }, - "permission": { - "scope.userLocation": { - "desc": "你的位置信息将用于高德地图的效果展示" - } - }, - /* SDK配置 */ - "quickapp": {}, - /* 快应用特有相关 */ - "mp-weixin": { - /* 小程序特有相关 */ - "usingComponents": true, - "appid": "wx6f10f29075dc1b0b", - "optimization": { - "subPackages": true - }, - "setting": { - "urlCheck": false, - "minified": true, - "postcss": false, - "es6": true - }, - "permission": { - "scope.userLocation": { - "desc": "位置信息将用于高德地图的效果展示" - } - }, - "plugins": { - "myPlugin": { - "version": "1.1.0", - "provider": "wx738958e0f4c894f9" - }, - "live-player-plugin": { - "version": "1.3.0", - "provider": "wx2b03c6e691cd7370" - } - } - }, - "h5": { - "devServer": { - "disableHostCheck": true - }, - "router": { - "mode": "history", - "base": "" - }, - "sdkConfigs": { - "maps": {} - }, - "optimization": { - "treeShaking": { - "enable": true - } - }, - "title": "lilishop", - "template": "" - } -} \ No newline at end of file +{ + "name" : "无终街", + "appid" : "__UNI__6DB512D", + "description" : "admin", + "versionName" : "4.0.0", + "versionCode" : 4000049, + "transformPx" : false, + "app-plus" : { + "android" : { + "versionCode" : 4000049, // Android 版本号 + "versionName" : "4.0.0" // 用户看到的版本号 + }, + "compatible" : { + "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 + }, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + /* 5+App特有相关 */ + "usingComponents" : true, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "screenOrientation" : [ "portrait-primary" ], + "modules" : { + "Payment" : {}, + "Share" : {}, + "Geolocation" : {}, + "Maps" : {}, + "OAuth" : {}, + "Camera" : {}, + "Barcode" : {}, + "VideoPlayer" : {}, + "Push" : {} + }, + "error" : { + /* 404错误页面*/ + "url" : "hybrid/html/error.html" + }, + /* 模块配置 */ + "distribute" : { + /* 应用发布信息 */ + "android" : { + /* android打包配置 */ + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], + "schemes" : "wuzhongjie", + "minSdkVersion" : 21 + }, + "ios" : { + "idfa" : false, + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "需要用与评论上传,头像上传功能", + "NSPhotoLibraryAddUsageDescription" : "保存商品图片到本地", + "NSFaceIDUsageDescription" : "使用面部识别进行登录", + "NSCameraUsageDescription" : "需要用与扫描二维码和商品评论图片拍摄", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "位置信息将用于高德地图的效果展示", + "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息" + }, + "urltypes" : "wuzhongjie", + "dSYMs" : false + }, + /* ios打包配置 */ + "sdkConfigs" : { + "payment" : { + "weixin" : { + "__platform__" : [ "ios", "android" ], + "appid" : "wxebcdaea31881caab", + "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/" + }, + "alipay" : { + "__platform__" : [ "ios", "android" ] + } + }, + "ad" : {}, + "share" : { + "weixin" : { + "appid" : "wxebcdaea31881caab", + "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/" + } + }, + "oauth" : { + "weixin" : { + "appid" : "wxebcdaea31881caab", + "appsecret" : "71826d76bad096ec5407897c6ed1391f", + "UniversalLinks" : "https://m-b2b2c.pickmall.cn/app/" + }, + "apple" : {}, + "qq" : { + "appid" : "101918503" + } + }, + "geolocation" : { + "amap" : { + "__platform__" : [ "ios", "android" ], + "appkey_ios" : "f463d3350efe63f8be5d9a62f24d0aab", + "appkey_android" : "fb3f1ccb34616c70f068aa950f3e27df" + }, + "system" : { + "__platform__" : [ "ios", "android" ] + } + }, + "maps" : { + "amap" : { + "appkey_ios" : "f463d3350efe63f8be5d9a62f24d0aab", + "appkey_android" : "fb3f1ccb34616c70f068aa950f3e27df" + } + }, + "push" : {} + }, + "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" + } + } + }, + "splashscreen" : { + "iosStyle" : "common", + "ios" : { + "storyboard" : "CustomStoryboard.zip" + }, + "androidStyle" : "default", + "android" : { + "hdpi" : "CustomStartPage/start-page.9.png", + "xhdpi" : "CustomStartPage/start-page.9.png", + "xxhdpi" : "CustomStartPage/start-page.9.png" + }, + "useOriginalMsgbox" : true + } + }, + "nativePlugins" : {} + }, + "permission" : { + "scope.userLocation" : { + "desc" : "你的位置信息将用于高德地图的效果展示" + } + }, + /* SDK配置 */ + "quickapp" : {}, + /* 快应用特有相关 */ + "mp-weixin" : { + /* 小程序特有相关 */ + "usingComponents" : true, + "appid" : "wx6f10f29075dc1b0b", + "optimization" : { + "subPackages" : true + }, + "setting" : { + "urlCheck" : false, + "minified" : true, + "postcss" : false, + "es6" : true + }, + "permission" : { + "scope.userLocation" : { + "desc" : "位置信息将用于高德地图的效果展示" + } + }, + "plugins" : { + "myPlugin" : { + "version" : "1.1.0", + "provider" : "wx738958e0f4c894f9" + }, + "live-player-plugin" : { + "version" : "1.3.0", + "provider" : "wx2b03c6e691cd7370" + } + } + }, + "h5" : { + "devServer" : { + "disableHostCheck" : true + }, + "router" : { + "mode" : "history", + "base" : "" + }, + "sdkConfigs" : { + "maps" : {} + }, + "optimization" : { + "treeShaking" : { + "enable" : true + } + }, + "title" : "lilishop", + "template" : "" + } +} diff --git a/utils/request.js b/utils/request.js index 3b8cba57..00ac548e 100644 --- a/utils/request.js +++ b/utils/request.js @@ -3,6 +3,9 @@ import { refreshTokenFn } from "@/api/login.js"; import storage from "@/utils/storage.js"; +import { + logout +} from '@/api/login'; import { md5 } from "@/utils/md5.js"; @@ -146,9 +149,7 @@ http.interceptors.response.use( // } let token = storage.getAccessToken(); - if(response.statusCode === 408){ - cleanStorage(); - } + if ( (token && response.statusCode === 403) || (token && response.data.status === 403) @@ -208,12 +209,29 @@ http.interceptors.response.use( response.statusCode == 400 ) { if (response.data.message) { - uni.showToast({ - // title: response.data.message, - title: "请重试", - icon: "none", - duration: 1500, - }); + if (response.data.code == 408) { + uni.showModal({ + title: '提示', + content: response.data.message, + showCancel: false, + success() { + logout().then(() => { + cleanStorage(); + }); + } + }) + uni.showToast({ + title: response.data.message, + icon: "none", + duration: 1500, + }); + } else { + uni.showToast({ + title: response.data.message, + icon: "none", + duration: 1500, + }); + } } } else if (response.data.code == 502) { cleanStorage();