Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshop-uniapp

manifest.json

@@ -92,7 +92,8 @@
                     "hdpi" : "unpackage/res/splash/480+762.png",
                     "xhdpi" : "unpackage/res/splash/720+1242.png",
                     "xxhdpi" : "unpackage/res/splash/1080+1882.png"
-                }
+                },
+                "iosStyle" : "common"
             },
             "icons" : {
                 "android" : {

unpackage/debug/.ios.ins

@@ -1 +1 @@
-forceInstall
+installed

utils/index.js

@@ -240,6 +240,11 @@ export const login = () => {
 			reject('当前运行环境为H5')
 			return
 		}
+		if (Vue.prototype.$deviceType == 'app') {
+			console.log('当前运行环境为app')
+			reject('当前运行环境为app')
+			return
+		}
 		console.log('————————————————————')
 		console.log('开始登录')
 		console.log('————————————————————')