diff --git a/app.json b/app.json index ec7a665..66320ee 100644 --- a/app.json +++ b/app.json @@ -1,8 +1,8 @@ { "pages": [ + "pages/open/index", "pages/login/index", "pages/rank/index", - "pages/open/index", "pages/index/index" ], "window": { diff --git a/pages/login/index.js b/pages/login/index.js index 2662225..f307267 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -14,7 +14,20 @@ Page({ url: '' }) }, + checkFun(){ + this.setData({ + ischecked: !this.data.ischecked + }) + }, login(){ + if(!this.data.ischecked){ + wx.showToast({ + title: '请勾选协议', + icon: 'none', + duration: 2000 + }) + return; + } wx.login({ success (res) { console.log(res) @@ -31,5 +44,33 @@ Page({ } } }) + }, + // 授权手机号 + getPhoneNumber(e) { + console.log(e); + let that = this + if (e.detail.errMsg == "getPhoneNumber:ok") { + // console.log(e) + const { + iv, + encryptedData + } = e.detail; + // that.$u.api.bindMini({ + // encrypted: encryptedData, + // iv + // }).then((res) => { // 绑定手机号 + // console.log(res); + // let userinfo = that.vuex_userInfo + // userinfo.phone = res.data + // that.$u.vuex("vuex_userInfo", userinfo); + // uni.setStorageSync('userInfo', userinfo) + // that.islogin = true + // }) + } else { + uni.showToast({ + icon: "none", + title: "请授权手机号" + }) + } } }) diff --git a/pages/login/index.wxml b/pages/login/index.wxml index c9cc8fc..cddfa57 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -6,11 +6,13 @@ - - + + 勾选表示您已阅读并同意 《隐私协议》 + 微信一键登录 返回游戏 diff --git a/pages/open/index.wxml b/pages/open/index.wxml index 8f94aff..06948be 100644 --- a/pages/open/index.wxml +++ b/pages/open/index.wxml @@ -8,5 +8,6 @@ 扫码参与 + \ No newline at end of file diff --git a/pages/open/index.wxss b/pages/open/index.wxss index edc3d1f..476698a 100644 --- a/pages/open/index.wxss +++ b/pages/open/index.wxss @@ -35,14 +35,14 @@ .btn1{ color: #000000; background: #FFC700; - top: 0; + top: -12rpx; left: 0; } .btn2{ background: #2845E0; color: #FFFFFF; right: 0; - top: 12rpx; + top: 0; } .btn .row{ width: 44rpx; @@ -54,6 +54,13 @@ width: 40rpx; height: 116rpx; position: absolute; - top: 1rpx; + top: -9rpx; left: 322rpx; +} +.dot{ + width: 182rpx; + height: 6rpx; + top: 140rpx; + right: 0; + position: absolute; } \ No newline at end of file diff --git a/project.config.json b/project.config.json index 68a2f73..341b196 100644 --- a/project.config.json +++ b/project.config.json @@ -63,8 +63,16 @@ "list": [] }, "miniprogram": { - "current": -1, - "list": [] + "current": 0, + "list": [ + { + "id": -1, + "name": "pages/open/index", + "pathName": "pages/open/index", + "query": "", + "scene": null + } + ] } } } \ No newline at end of file diff --git a/static/imgs/bg.png b/static/imgs/bg.png deleted file mode 100644 index 18d8b7a..0000000 Binary files a/static/imgs/bg.png and /dev/null differ diff --git a/static/imgs/checked.png b/static/imgs/checked.png deleted file mode 100644 index 3a393f3..0000000 Binary files a/static/imgs/checked.png and /dev/null differ diff --git a/static/imgs/logo.png b/static/imgs/logo.png deleted file mode 100644 index ce1489f..0000000 Binary files a/static/imgs/logo.png and /dev/null differ diff --git a/static/imgs/name.png b/static/imgs/name.png deleted file mode 100644 index e2b0634..0000000 Binary files a/static/imgs/name.png and /dev/null differ diff --git a/static/imgs/row.png b/static/imgs/row.png deleted file mode 100644 index 08750fe..0000000 Binary files a/static/imgs/row.png and /dev/null differ diff --git a/static/imgs/sanjiao.png b/static/imgs/sanjiao.png deleted file mode 100644 index 0c34d8b..0000000 Binary files a/static/imgs/sanjiao.png and /dev/null differ diff --git a/static/imgs/title.png b/static/imgs/title.png deleted file mode 100644 index 43406cb..0000000 Binary files a/static/imgs/title.png and /dev/null differ diff --git a/static/imgs/形状结合 (1).png b/static/imgs/形状结合 (1).png deleted file mode 100644 index ebbfc46..0000000 Binary files a/static/imgs/形状结合 (1).png and /dev/null differ diff --git a/static/imgs/形状结合.png b/static/imgs/形状结合.png deleted file mode 100644 index 751a2ef..0000000 Binary files a/static/imgs/形状结合.png and /dev/null differ diff --git a/static/imgs/排行榜_slices.zip b/static/imgs/排行榜_slices.zip deleted file mode 100644 index 4ac2e20..0000000 Binary files a/static/imgs/排行榜_slices.zip and /dev/null differ diff --git a/static/imgs/排行榜_slices/位图(1).png b/static/imgs/排行榜_slices/位图(1).png deleted file mode 100644 index b1cfb98..0000000 Binary files a/static/imgs/排行榜_slices/位图(1).png and /dev/null differ diff --git a/static/imgs/排行榜_slices/位图.png b/static/imgs/排行榜_slices/位图.png deleted file mode 100644 index 18e54d7..0000000 Binary files a/static/imgs/排行榜_slices/位图.png and /dev/null differ diff --git a/static/imgs/排行榜_slices/位图备份.png b/static/imgs/排行榜_slices/位图备份.png deleted file mode 100644 index f148267..0000000 Binary files a/static/imgs/排行榜_slices/位图备份.png and /dev/null differ diff --git a/static/imgs/排行榜_slices/形状.png b/static/imgs/排行榜_slices/形状.png deleted file mode 100644 index c6b8482..0000000 Binary files a/static/imgs/排行榜_slices/形状.png and /dev/null differ diff --git a/static/imgs/排行榜_slices/编组 7.png b/static/imgs/排行榜_slices/编组 7.png deleted file mode 100644 index f42c140..0000000 Binary files a/static/imgs/排行榜_slices/编组 7.png and /dev/null differ diff --git a/static/imgs/矩形.png b/static/imgs/矩形.png deleted file mode 100644 index 7192be6..0000000 Binary files a/static/imgs/矩形.png and /dev/null differ diff --git a/static/imgs/矩形备份 8.png b/static/imgs/矩形备份 8.png deleted file mode 100644 index bfb993f..0000000 Binary files a/static/imgs/矩形备份 8.png and /dev/null differ diff --git a/static/imgs/编组 15.png b/static/imgs/编组 15.png deleted file mode 100644 index d00e130..0000000 Binary files a/static/imgs/编组 15.png and /dev/null differ