From 7fba2e1e73106a6cd68597d42e64deda0aca93c9 Mon Sep 17 00:00:00 2001 From: xiayt Date: Sat, 10 Sep 2022 16:15:50 +0800 Subject: [PATCH] feat:添加页面 --- README.md | 2 ++ app.json | 1 + img/_check_in4.jpg | Bin 108351 -> 0 bytes img/_check_in4.png | Bin 0 -> 108351 bytes img/_check_in5.png | Bin 0 -> 80887 bytes img/_index2.jpg | Bin 132396 -> 0 bytes img/_index2.png | Bin 0 -> 132396 bytes pages/index/achievement/achievement.js | 26 ++++++++++++++++++++++++++ pages/index/achievement/achievement.json | 6 ++++++ pages/index/achievement/achievement.wxml | 9 +++++++++ pages/index/achievement/achievement.wxss | 1 + pages/index/index.js | 22 ++++++++++++++++++++++ pages/index/index.wxml | 15 +++++++++++---- pages/index/punchDetail/punchDetail.js | 13 +++++++++++++ pages/index/punchDetail/punchDetail.wxml | 10 ++++++++++ pages/login/codeLogin/codeLogin.js | 66 +++++++++--------------------------------------------------------- pages/login/codeLogin/codeLogin.wxml | 3 +-- pages/mine/index.js | 6 ++++++ pages/mine/index.wxml | 2 ++ pages/mine/record/record.js | 12 ++++++++++++ pages/mine/record/record.wxml | 6 ++++++ project.config.json | 4 ++-- 22 files changed, 139 insertions(+), 65 deletions(-) delete mode 100644 img/_check_in4.jpg create mode 100644 img/_check_in4.png create mode 100644 img/_check_in5.png delete mode 100644 img/_index2.jpg create mode 100644 img/_index2.png create mode 100644 pages/index/achievement/achievement.js create mode 100644 pages/index/achievement/achievement.json create mode 100644 pages/index/achievement/achievement.wxml create mode 100644 pages/index/achievement/achievement.wxss diff --git a/README.md b/README.md index a7e8542..a7cc042 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # 计划管家sxhClockIn 已引入vant weapp https://vant-contrib.gitee.io/vant-weapp/#/home 完成开发步骤后可直接使用 +- AppID：wx186236fdcd93edcc +- AppSecret：45e0877c1844a1a33ec393c60cf64b3f ## 开发步骤 - 克隆 - 打开微信开发者工具 diff --git a/app.json b/app.json index 4a1021b..3c02d55 100644 --- a/app.json +++ b/app.json @@ -2,6 +2,7 @@ "pages": [ "pages/index/index", "pages/index/rank/rank", + "pages/index/achievement/achievement", "pages/index/punchDetail/punchDetail", "pages/index/newPunch/newPunch", "pages/login/codeLogin/codeLogin", diff --git a/img/_check_in4.jpg b/img/_check_in4.jpg deleted file mode 100644 index 7363f9a..0000000 Binary files a/img/_check_in4.jpg and /dev/null differ diff --git a/img/_check_in4.png b/img/_check_in4.png new file mode 100644 index 0000000..7363f9a Binary files /dev/null and b/img/_check_in4.png differ diff --git a/img/_check_in5.png b/img/_check_in5.png new file mode 100644 index 0000000..70af109 Binary files /dev/null and b/img/_check_in5.png differ diff --git a/img/_index2.jpg b/img/_index2.jpg deleted file mode 100644 index 5438015..0000000 Binary files a/img/_index2.jpg and /dev/null differ diff --git a/img/_index2.png b/img/_index2.png new file mode 100644 index 0000000..5438015 Binary files /dev/null and b/img/_index2.png differ diff --git a/pages/index/achievement/achievement.js b/pages/index/achievement/achievement.js new file mode 100644 index 0000000..36f5a59 --- /dev/null +++ b/pages/index/achievement/achievement.js @@ -0,0 +1,26 @@ +// pages/index/achievement/achievement.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + // 统一返回 + handleBack() { + wx.navigateBack() + }, + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/index/achievement/achievement.json b/pages/index/achievement/achievement.json new file mode 100644 index 0000000..e15d6dd --- /dev/null +++ b/pages/index/achievement/achievement.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "van-icon": "@vant/weapp/icon/index" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/index/achievement/achievement.wxml b/pages/index/achievement/achievement.wxml new file mode 100644 index 0000000..4b4fe4b --- /dev/null +++ b/pages/index/achievement/achievement.wxml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/pages/index/achievement/achievement.wxss b/pages/index/achievement/achievement.wxss new file mode 100644 index 0000000..136dcdb --- /dev/null +++ b/pages/index/achievement/achievement.wxss @@ -0,0 +1 @@ +/* pages/index/achievement/achievement.wxss */ diff --git a/pages/index/index.js b/pages/index/index.js index eee402d..0cc9351 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -5,6 +5,7 @@ import request from '../../api/request.js' Page({ data: { showAdd: false, //新建打卡 + tabindex: 1, // bannerList: [], // 轮播图 }, /** @@ -13,12 +14,27 @@ Page({ onLoad: function (options) { // this.getBannerList() //获取banner }, + onShow:function (options) { + this.setData({ + showAdd:false + }) + }, // 排行榜 handleRank(){ wx.navigateTo({ url: '/pages/index/rank/rank', }) }, + handleTab1() { + this.setData({ + tabindex: 1 + }) + }, + handleTab2() { + this.setData({ + tabindex: 2 + }) + }, handleAdd() { this.setData({ showAdd: true @@ -29,6 +45,12 @@ Page({ showAdd: false }) }, + // 打卡成果 + handleAchievement(){ + wx.navigateTo({ + url: '/pages/index/achievement/achievement', + }) + }, // 去打卡 handleDetail(){ wx.navigateTo({ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index b84c8c0..7858405 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,14 +1,21 @@ - + + + + + + + - + - + - + + \ No newline at end of file diff --git a/pages/index/punchDetail/punchDetail.js b/pages/index/punchDetail/punchDetail.js index d732f6d..d37b646 100644 --- a/pages/index/punchDetail/punchDetail.js +++ b/pages/index/punchDetail/punchDetail.js @@ -7,6 +7,7 @@ Page({ data: { showEdit: false, //确认打卡 Clocked: false, //已打卡状态，只是为了演示用 + showSuccess:false }, /** @@ -15,6 +16,12 @@ Page({ onLoad(options) { }, + // 打卡成果 + handleAchievement(){ + wx.navigateTo({ + url: '/pages/index/achievement/achievement', + }) + }, // 打开打卡信息填写 handleEdit() { console.log(111) @@ -33,6 +40,12 @@ Page({ this.setData({ Clocked: true, showEdit: false, + showSuccess:true + }) + }, + colseSuccess(){ + this.setData({ + showSuccess:false }) }, handleBack() { diff --git a/pages/index/punchDetail/punchDetail.wxml b/pages/index/punchDetail/punchDetail.wxml index 6ca15a3..a364e46 100644 --- a/pages/index/punchDetail/punchDetail.wxml +++ b/pages/index/punchDetail/punchDetail.wxml @@ -8,9 +8,19 @@ + + + + + + + + + + \ No newline at end of file diff --git a/pages/login/codeLogin/codeLogin.js b/pages/login/codeLogin/codeLogin.js index 1b8d42f..400f904 100644 --- a/pages/login/codeLogin/codeLogin.js +++ b/pages/login/codeLogin/codeLogin.js @@ -76,7 +76,7 @@ Page({ "session_key": this.data.session_key, "iv": this.data.iv, }, - }).then(res => { + }).then(res => { if (res.success) { if (res.data) { this.setData({ @@ -97,50 +97,9 @@ Page({ loginSuccess() { if (this.data.path) { // 获取三位一体的数据 - if (this.data.path == 'trinity') { - let userInfo = wx.getStorageSync('userInfo'); - wx.showLoading({ - title: '加载中...', - mask: true - }) - wx.request({ - url: api + 'h5/MyVoluntary/GetTrinity', - data: { - userId: userInfo.id - }, - method: "GET", - header: { - 'content-type': 'application/json' - }, - success: function (res) { - wx.hideLoading() - if (res.data.success) { - if (res.data.data) { - wx.setStorageSync('trinity_id', res.data.data.id) - wx.redirectTo({ - url: '/pages/trinity/recommend/recommend?id=' + res.data.data.id - }) - } else { - wx.setStorageSync('trinity_id', null) - wx.redirectTo({ - url: '/pages/trinity/trinity' - }) - } - } - } - }) - - } else if (this.data.path == 'riskSetting') { - wx.redirectTo({ - url: '/pages/OrdinaryVolunteer/riskSetting/riskSetting' - }) - - } else { - wx.redirectTo({ - url: this.data.path, - }) - } - + wx.redirectTo({ + url: this.data.path, + }) } else { wx.switchTab({ url: '/pages/index/index' @@ -156,19 +115,12 @@ Page({ // PhoneName: '13355752969' PhoneName: this.data.phone }, - }).then((res) => { + }).then((res) => { if (res.success) { if (res.data) { - if (res.data.userName && res.data.graduateSchool) { - wx.setStorageSync('userInfo', res.data) - wx.setStorageSync('showModal', '') - app.globalData.userInfo = res.data; - } else { - wx.setStorageSync('userInfo', res.data) - that.setData({ - modelShow: true - }) - } + wx.setStorageSync('userInfo', res.data) + wx.setStorageSync('showModal', '') + } } }) @@ -180,7 +132,7 @@ Page({ data: { code: this.data.loginCode }, - }).then(res2 => { + }).then(res2 => { // console.log(res2.data); this.setData({ session_key: JSON.parse(res2.data).session_key diff --git a/pages/login/codeLogin/codeLogin.wxml b/pages/login/codeLogin/codeLogin.wxml index fcd252e..0594c9e 100644 --- a/pages/login/codeLogin/codeLogin.wxml +++ b/pages/login/codeLogin/codeLogin.wxml @@ -34,5 +34,4 @@ 《升学汇隐私政策》 - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/mine/index.js b/pages/mine/index.js index 838fde0..1c375ff 100644 --- a/pages/mine/index.js +++ b/pages/mine/index.js @@ -14,6 +14,12 @@ Page({ url: '/pages/mine/record/record', }) }, +// 退出登录 + handleLoginOut(){ + wx.navigateTo({ + url: '/pages/login/codeLogin/codeLogin', + }) + }, /** * 用户点击右上角分享 */ diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index 34b0d25..28d20e6 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -2,5 +2,7 @@ + + diff --git a/pages/mine/record/record.js b/pages/mine/record/record.js index fe96eb1..eb5d7f7 100644 --- a/pages/mine/record/record.js +++ b/pages/mine/record/record.js @@ -24,6 +24,18 @@ Page({ tabindex: 2 }) }, + // 打卡成果 + handleAchievement(){ + wx.navigateTo({ + url: '/pages/index/achievement/achievement', + }) + }, + // 去打卡 + handleDetail(){ + wx.navigateTo({ + url: '/pages/index/punchDetail/punchDetail', + }) + }, // 统一返回 handleBack() { wx.navigateBack() diff --git a/pages/mine/record/record.wxml b/pages/mine/record/record.wxml index fcb9424..e37988d 100644 --- a/pages/mine/record/record.wxml +++ b/pages/mine/record/record.wxml @@ -7,6 +7,12 @@ + + + + + + diff --git a/project.config.json b/project.config.json index ce18141..2da84be 100644 --- a/project.config.json +++ b/project.config.json @@ -50,8 +50,8 @@ }, "compileType": "miniprogram", "libVersion": "2.23.2", - "appid": "wxd055a716238e1bd7", - "projectname": "%E5%8D%87%E5%AD%A6%E6%B1%87", + "appid": "wx186236fdcd93edcc", + "projectname": "计划管家", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, "condition": {}, -- libgit2 0.21.0