diff --git a/pages/login/index.js b/pages/login/index.js index 2ae1865..df316e9 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -21,6 +21,10 @@ Page({ this.setData({ ischecked: !this.data.ischecked }) + }, + // 协议 + toxieyi(){ + }, //登录-获取token loginGettoken(){ @@ -52,7 +56,6 @@ Page({ } }) }, - // 绑定用户头像信息 bindNickname(obj) { let that = this diff --git a/pages/login/index.json b/pages/login/index.json index a38ebaa..986c90e 100644 --- a/pages/login/index.json +++ b/pages/login/index.json @@ -1,4 +1,4 @@ { "usingComponents": {}, - "navigationBarTitleText": "登录" + "navigationBarTitleText": "授权登录" } \ No newline at end of file diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 1365410..8ab95ac 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,19 +1,19 @@ - - - - + + + + + wx:if="{{ischecked}}" src="https://static.quhouse.com/4024a0e92b0245a7b14cc5c78cab90f7.png"> - 勾选表示您已阅读并同意 - 《隐私协议》 + 勾选表示您已阅读并同意 + 《隐私协议》 - 微信一键授权 + 微信一键登录 返回游戏 \ No newline at end of file diff --git a/pages/login/index.wxss b/pages/login/index.wxss index 28dba15..0292245 100644 --- a/pages/login/index.wxss +++ b/pages/login/index.wxss @@ -1,6 +1,6 @@ /**index.wxss**/ .container{ - background: url('https://static.quhouse.com/11cb7c5d4d4242e29636e96f9bb20fa1.png') no-repeat; + background: url('https://static.quhouse.com/26af356fe053431e8bd56f8ea07734a5.png') no-repeat; width: 750rpx; height: 1464rpx; background-size: 750rpx 1464rpx; @@ -28,9 +28,9 @@ height: 44rpx; } .title{ - width: 547rpx; - height: 200rpx; - margin-bottom: 38rpx; + width: 554rpx; + height: 228rpx; + margin-bottom: 24rpx; } .logo{ width: 542rpx; @@ -38,7 +38,7 @@ margin-bottom: 60rpx; } .search{ - width: 538rpx; + width: 536rpx; height: 58rpx; margin-bottom: 42rpx; } @@ -51,15 +51,13 @@ .checked{ width: 28rpx; height: 28rpx; - padding: 2rpx 5rpx; margin-right: 8rpx; } .nocheck{ - width: 22rpx; - height: 22rpx; - padding: 2rpx; + width: 24rpx; + height: 24rpx; margin-right: 8rpx; - border: 2rpx #55A28E solid; + border: 2rpx #CE592E solid; border-radius: 5rpx; } .text{ @@ -71,25 +69,25 @@ line-height: 32rpx; } .text1{ - color: #55A28E; + color: #CE592E; } .btn{ width: 510rpx; height: 96rpx; -background: #55A28E; +background: #CE592E; border-radius: 48rpx; line-height: 96rpx; font-size: 32rpx; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #FFFFFF; -border: 2rpx solid #55A28E; +border: 2rpx solid #CE592E; text-align: center; } .btn1{ -color: #55A28E; +color: #CE592E; background:#FFFFFF; -border: 2rpx solid #55A28E; +border: 2rpx solid #CE592E; margin-top: 30rpx; } \ No newline at end of file diff --git a/project.config.json b/project.config.json index 57f9d05..403d36d 100644 --- a/project.config.json +++ b/project.config.json @@ -9,37 +9,35 @@ "es6": true, "enhance": false, "postcss": true, + "preloadBackgroundData": false, "minified": true, "newFeature": false, "coverView": true, "nodeModules": false, "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, "uglifyFileName": false, "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, + "compileHotReLoad": false, + "lazyloadPlaceholderEnable": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, - "preloadBackgroundData": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "compileHotReLoad": false, + "enableEngineNative": false, "useIsolateContext": true, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": false, - "lazyloadPlaceholderEnable": false, - "useMultiFrameRuntime": true, + "userConfirmedBundleSwitch": false, "packNpmManually": false, "packNpmRelationList": [], "minifyWXSS": true, - "useStaticServer": true, - "showES6CompileOption": false, - "disableUseStrict": false, - "useCompilerPlugins": false, - "minifyWXML": true + "showES6CompileOption": false }, "compileType": "miniprogram", "libVersion": "2.23.4", @@ -47,6 +45,10 @@ "projectname": "biguiyuan", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + }, "condition": { "miniprogram": { "list": [ @@ -58,9 +60,5 @@ } ] } - }, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 2 } } \ No newline at end of file