diff --git a/project.config.json b/project.config.json index 66413fb..a327c9a 100644 --- a/project.config.json +++ b/project.config.json @@ -4,6 +4,10 @@ "libVersion": "3.7.7", "packOptions": { "ignore": [ + { + "type": "folder", + "value": "static/scan-login" + }, { "type": "file", "value": "static/common/dialog-light.png" diff --git a/src/apis.js b/src/apis.js index ae037b4..6b483ae 100644 --- a/src/apis.js +++ b/src/apis.js @@ -264,6 +264,14 @@ export const tempBindOrgAPI = (scene) => { }); }; +// 小程序确认个人账号登录 Pad,未登录时可携带微信登录 code。 +export const confirmScanLoginAPI = (scene, code) => { + return request("POST", "/index/scanLogin/confirm", { + scene, + ...(code ? {code} : {}), + }, BASE_URL, [0], {showErrorToast: false}); +}; + export const bindDeviceAPI = (device) => { return request("POST", "/user/device/bindDevice", { device, diff --git a/src/manifest.json b/src/manifest.json index 20955d1..07e8965 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -55,6 +55,10 @@ "appid" : "wxa8f5989dcd45cc23", "packOptions" : { "ignore" : [ + { + "type" : "folder", + "value" : "static/scan-login" + }, { "type" : "file", "value" : "static/common/dialog-light.png" diff --git a/src/pages.json b/src/pages.json index a4b8ea4..167f822 100644 --- a/src/pages.json +++ b/src/pages.json @@ -118,6 +118,14 @@ } }, "subPackages": [ + { + "root": "pages/scan-login", + "pages": [ + { + "path": "index" + } + ] + }, { "root": "pages/coin", "pages": [ diff --git a/src/pages/scan-login/index.vue b/src/pages/scan-login/index.vue new file mode 100644 index 0000000..33f8c16 --- /dev/null +++ b/src/pages/scan-login/index.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/static/scan-login/scan-login-app-icon.png b/src/static/scan-login/scan-login-app-icon.png new file mode 100644 index 0000000..fde0489 Binary files /dev/null and b/src/static/scan-login/scan-login-app-icon.png differ diff --git a/src/static/scan-login/scan-login-required-ip.png b/src/static/scan-login/scan-login-required-ip.png new file mode 100644 index 0000000..cab3b6e Binary files /dev/null and b/src/static/scan-login/scan-login-required-ip.png differ diff --git a/src/static/scan-login/scan-login-transfer-arrow.png b/src/static/scan-login/scan-login-transfer-arrow.png new file mode 100644 index 0000000..8b232a0 Binary files /dev/null and b/src/static/scan-login/scan-login-transfer-arrow.png differ