diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 15dc00d..7c9ec1f 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -12,8 +12,8 @@ "type" : "uni-app:app-ios" }, { - "customPlaygroundType" : "device", - "playground" : "standard", + "customPlaygroundType" : "local", + "playground" : "custom", "type" : "uni-app:app-ios_simulator" } ] diff --git a/api/auth.js b/api/auth.js index bcf7f51..e5171d6 100644 --- a/api/auth.js +++ b/api/auth.js @@ -165,3 +165,13 @@ export function alipayLogin(params) { cha:1 }); } + +// Apple一键登录 +export function appleLogin(params) { + return request({ + url: "/auth/loginByApple", + method: "post", + data: params, + cha:1 + }); +} diff --git a/manifest.json b/manifest.json index 362f658..68d57a3 100644 --- a/manifest.json +++ b/manifest.json @@ -91,7 +91,8 @@ "weixin" : { "appid" : "wx7a5902cd556d9396", "UniversalLinks" : "https://app.tbmall.xin/uni-universallinks/__UNI__4910728/" - } + }, + "apple" : {} }, "share" : { "weixin" : { diff --git a/pages.json b/pages.json index ea1981b..7f81d55 100644 --- a/pages.json +++ b/pages.json @@ -516,7 +516,10 @@ { "path": "login/login", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "app-plus": { + "softinputMode": "adjustResize" + } } }, { diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue index b36a131..e3f32b5 100644 --- a/pages/login_package/login/login.vue +++ b/pages/login_package/login/login.vue @@ -12,23 +12,24 @@ + :adjust-position="false" @change="checkNameParam"> + :type="isShow ? 'text' : 'password'" :adjust-position="false" @change="checkParam"> - +