diff --git a/aircraft/server/my/child_pages/login.vue b/aircraft/server/my/child_pages/login.vue index a587c04..5f64aac 100644 --- a/aircraft/server/my/child_pages/login.vue +++ b/aircraft/server/my/child_pages/login.vue @@ -3,7 +3,7 @@ - @@ -55,6 +58,7 @@ export default { StatusBar: this.StatusBar || 0, CustomBarHeight: this.Custom.height+(this.Custom.top-this.StatusBar)*2 || 0, // #endif + currentLoginType: 0,//当前登录方式-1飞行员、0用户 logo: '/static/logo.png',// logo图标 loading: true,// 加载 // 登录表单 @@ -225,6 +229,13 @@ export default { } } } + &-change{ + margin-top: 42rpx; + color: #6B7280; + font-family: Roboto; + font-size: 26rpx; + text-align: center; + } &::v-deep .u-checkbox__icon-wrap{ margin-right: 14rpx; } diff --git a/manifest.json b/manifest.json index 4d1f1bc..37ce03e 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "versionName" : "1.5.0", "versionCode" : "100", "transformPx" : false, - "sassImplementationName": "node-sass", + "sassImplementationName" : "node-sass", /* 5+App特有相关 */ "app-plus" : { "safearea" : { @@ -102,7 +102,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxb2b26092ee7ab2e0", + "appid" : "wx95b33a028ca4950b", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/static/favicon.ico b/static/favicon.ico index 528fa90..c48457f 100644 Binary files a/static/favicon.ico and b/static/favicon.ico differ diff --git a/static/logo.png b/static/logo.png index 36cf928..c48457f 100644 Binary files a/static/logo.png and b/static/logo.png differ