From 0c0aaede94c33996d39c18be30b5fd7409b46329 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Fri, 3 Nov 2023 15:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 10 ++ pages.json | 12 ++ pages/login/login.css | 62 ++++---- pages/plugins/scanpay/index/index.css | 2 +- pages/plugins/scanpay/index/index.vue | 11 +- pages/plugins/thirdpartylogin/index/index.css | 7 + pages/plugins/thirdpartylogin/index/index.vue | 142 ++++++++++++++++++ 7 files changed, 209 insertions(+), 37 deletions(-) create mode 100644 pages/plugins/thirdpartylogin/index/index.css create mode 100644 pages/plugins/thirdpartylogin/index/index.vue diff --git a/App.vue b/App.vue index dc722102..0ffaee0b 100644 --- a/App.vue +++ b/App.vue @@ -2031,6 +2031,16 @@ }); return; } + + // 是否为扫码登录 + var thirdpartylogin_arr = ['/thirdpartylogin-scan-index-', 'plugins/index/pluginsname/thirdpartylogin/pluginscontrol/scan/pluginsaction/index']; + var thirdpartylogin_ret = self.web_url_value_mate(value, thirdpartylogin_arr); + if(thirdpartylogin_ret.status == 1 && thirdpartylogin_ret.value != null) { + uni.navigateTo({ + url: '/pages/plugins/thirdpartylogin/index/index?id='+thirdpartylogin_ret.value, + }); + return; + } // 默认打开url self.open_web_view(value); diff --git a/pages.json b/pages.json index 2284b71c..6fce3581 100644 --- a/pages.json +++ b/pages.json @@ -1057,6 +1057,18 @@ } } ] + }, + { + "root": "pages/plugins/thirdpartylogin", + "pages": [{ + "path": "index/index", + "style": { + "disableScroll": true, + "enablePullDownRefresh": false, + "navigationBarTitleText": "授权登录" + } + } + ] } ], "globalStyle": { diff --git a/pages/login/login.css b/pages/login/login.css index bd22378e..99ccb3d3 100644 --- a/pages/login/login.css +++ b/pages/login/login.css @@ -1,55 +1,55 @@ -page { +page { background: #fff; - } -/** - * 基础 - */ + +/** + * 基础 + */ .content { - padding-top: 8%; + padding-top: 8%; } -.content .icon { - width: 150rpx; - height: 150rpx !important; +.content .icon { + width: 150rpx; + height: 150rpx !important; } /** * 表单内容 - */ -.form-content { - padding: 2% 40rpx 0 40rpx; + */ +.form-content { + padding: 2% 40rpx 0 40rpx; } .form-content .form-item, .form-content .code, .form-content .verify { border-bottom: solid 1px #f7f7f7; -} +} .form-content .form-item, .form-content .code input, -.form-content .verify input { - font-size: 28rpx; - color: #4e4e4e; - height: 40px; +.form-content .verify input { + font-size: 28rpx; + color: #4e4e4e; + height: 40px; line-height: 40px; - border-radius: 0; + border-radius: 0; } .form-content .code input, .form-content .verify input { width: 63%; -} -.form-content .code .verify-submit { - width: 35%; - height: 35px; - line-height: 35px; - top: 0; - right: 0; } -.form-content .verify .verify-image { - width: 35%; - height: 35px; - line-height: 35px; - top: 0; - right: 0; +.form-content .code .verify-submit { + width: 35%; + height: 35px; + line-height: 35px; + top: 0; + right: 0; +} +.form-content .verify .verify-image { + width: 35%; + height: 35px; + line-height: 35px; + top: 0; + right: 0; } .opt-type-list text:not(:last-child) { margin-right: 50rpx; diff --git a/pages/plugins/scanpay/index/index.css b/pages/plugins/scanpay/index/index.css index 05f23db5..152283a8 100644 --- a/pages/plugins/scanpay/index/index.css +++ b/pages/plugins/scanpay/index/index.css @@ -1,4 +1,4 @@ -.img-user { +.scanpay-logo { width: 92rpx; height: 92rpx !important; } diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue index 067d7fa1..acb67145 100644 --- a/pages/plugins/scanpay/index/index.vue +++ b/pages/plugins/scanpay/index/index.vue @@ -4,7 +4,7 @@ - +
{{ data.scanpay_info.name }} {{ data.scanpay_info.alias }} @@ -175,14 +175,15 @@ this.setData({ params: params || {}, }); + }, + + onShow() { this.init(); }, - onShow() {}, - // 下拉刷新 onPullDownRefresh() { - this.get_data(); + this.init();; }, methods: { @@ -430,4 +431,4 @@ + \ No newline at end of file diff --git a/pages/plugins/thirdpartylogin/index/index.css b/pages/plugins/thirdpartylogin/index/index.css new file mode 100644 index 00000000..4055207a --- /dev/null +++ b/pages/plugins/thirdpartylogin/index/index.css @@ -0,0 +1,7 @@ +page { + background: #fff; +} +.user-avatar { + width: 180rpx; + height: 180rpx !important; +} \ No newline at end of file diff --git a/pages/plugins/thirdpartylogin/index/index.vue b/pages/plugins/thirdpartylogin/index/index.vue new file mode 100644 index 00000000..1ffecd88 --- /dev/null +++ b/pages/plugins/thirdpartylogin/index/index.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file