diff --git a/miniprogram/pages/baby/detail.js b/miniprogram/pages/baby/detail.js index 26d2014e6cff7566a1aae8cba0bc596dff72f3f4..ed43a33793a117ff7a210041859244c5ed65faf1 100644 --- a/miniprogram/pages/baby/detail.js +++ b/miniprogram/pages/baby/detail.js @@ -19,7 +19,7 @@ Page({ }) var that = this; const db = wx.cloud.database() - db.collection('test').where({ + db.collection('babyList').where({ _id: options.id }).get({ success: function (res) { @@ -52,14 +52,12 @@ Page({ }, handleTap:function(){ + var that = this; wx.cloud.callFunction({ - // 需调用的云函数名 name: 'setMyWatch', - // 传给云函数的参数 data: { id: this.data.id }, - // 成功回调 complete: function(data){ if(data.result.isChange!==false){ wx.showToast({ @@ -67,6 +65,10 @@ Page({ icon: 'success', duration: 2000 }) + + that.setData({ + isFocused:1 + }) } } }) diff --git a/miniprogram/pages/baby/index.js b/miniprogram/pages/baby/index.js index 6339989bb2f41064b6519ca246e3605b8eb1796a..e79141837ac1704310331713d5e59ce65be47e6e 100644 --- a/miniprogram/pages/baby/index.js +++ b/miniprogram/pages/baby/index.js @@ -15,7 +15,7 @@ Page({ var that = this; const db = wx.cloud.database() - db.collection('test').where({ + db.collection('babyList').where({ type: options.type }).get({ success: function (res) { diff --git a/miniprogram/pages/baby/index.wxss b/miniprogram/pages/baby/index.wxss index d133b3b148123441cc4296752801f2df78102788..59e281fa94683b1f85b64908141da824a9fc8629 100644 --- a/miniprogram/pages/baby/index.wxss +++ b/miniprogram/pages/baby/index.wxss @@ -1,10 +1,5 @@ /* miniprogram/pages/home/index.wxss */ -.findbaby{ - - -} - .findbaby_content{ display: inline-block; diff --git a/miniprogram/pages/benefit/detail.js b/miniprogram/pages/benefit/detail.js index 6b26c0a90ca35e5edda9ca7a3259811dbd6d6c50..5b88b482615fde576c6230828883973ceac0bf37 100644 --- a/miniprogram/pages/benefit/detail.js +++ b/miniprogram/pages/benefit/detail.js @@ -1,18 +1,77 @@ -// miniprogram/pages/benefit/detail.js +// miniprogram/pages/home/detail.js Page({ /** * 页面的初始数据 */ data: { - + id:'', + isFocused:false, + benefitInfo:{} }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { + this.setData({ + id: options.id + }) + var that = this; + const db = wx.cloud.database() + db.collection('benefitList').where({ + _id: options.id + }).get({ + success: function (res) { + that.setData({ benefitInfo: res.data&&res.data[0]||{} }) + } + }) + + + wx.cloud.callFunction({ + // 需调用的云函数名 + name: 'getMyWatch', + // 传给云函数的参数 + data: { + }, + // 成功回调 + complete: function(data){ + let res = data.result; + let myWatch = res.data[0]&&res.data[0].watch || [] + let isFocused; + if([].indexOf.call(myWatch,options.id)!==-1){ + isFocused = 1 + }else{ + isFocused = 0 + } + that.setData({ + isFocused:isFocused + }) + } + }) + }, + handleTap:function(){ + var that = this; + wx.cloud.callFunction({ + name: 'setMyWatch', + data: { + id: this.data.id + }, + complete: function(data){ + if(data.result.isChange!==false){ + wx.showToast({ + title: '关注成功', + icon: 'success', + duration: 2000 + }) + + that.setData({ + isFocused:1 + }) + } + } + }) }, /** diff --git a/miniprogram/pages/benefit/detail.wxml b/miniprogram/pages/benefit/detail.wxml index c6dc8636d80835f6afd93e69df99a30d2fcb19eb..81873d45ffa183f3eacb3213b06a44c936a7f93e 100644 --- a/miniprogram/pages/benefit/detail.wxml +++ b/miniprogram/pages/benefit/detail.wxml @@ -1,2 +1,28 @@ -miniprogram/pages/benefit/detail.wxml + + + + + + + {{benefitInfo.name}} + + {{benefitInfo.description}} + + + 项目筹款情况 + 已筹集公众捐款:{{benefitInfo.contribution.total}}元 + {{benefitInfo.contribution.num}}份公众捐款记录 + + + 执行情况 + 立项时间:{{benefitInfo.project.time}} + 募捐编号:{{benefitInfo.project.no}} + 收款机构:{{benefitInfo.project.payee}} + 执行机构:{{benefitInfo.project.agency}} + + + + 关注 + 已关注 + diff --git a/miniprogram/pages/benefit/detail.wxss b/miniprogram/pages/benefit/detail.wxss index f855bbadfa6f9727e46dd2b6c4b3eccbc1e70c3e..0c501a6199665412cd2db65ac40887d282806153 100644 --- a/miniprogram/pages/benefit/detail.wxss +++ b/miniprogram/pages/benefit/detail.wxss @@ -1 +1,46 @@ -/* miniprogram/pages/benefit/detail.wxss */ \ No newline at end of file +/* miniprogram/pages/benefit/detail.wxss *//* miniprogram/pages/home/detail.wxss */ + +.top{ + width:100%; + height: 600rpx; +} + +.baby_img{ + width: 100%; + height: 600rpx; +} + + +.info_cell{ + font-size: 36rpx; + background-color:#fff; + padding: 10rpx 30rpx; + border-top: 1px solid #e6e6e6; + line-height:64rpx; +} + +.baby_name{ + font-weight: bold; + font-size: 48rpx; + margin: 30rpx; +} + +.title{ + margin:0 30rpx; + line-height:64rpx; +} + +.watch_btn{ + position: fixed; + right:0; + top: 800rpx; + width:160rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; + background-color:red; + color: white; + z-index: 111; + border-top-left-radius: 50rpx; + border-bottom-left-radius: 50rpx; +} \ No newline at end of file diff --git a/miniprogram/pages/benefit/index.js b/miniprogram/pages/benefit/index.js index 587b0ed5ccfb76f73edfe85c0da9c3e0309a528b..52ec7a88d6d62a16543251baf19582c423dfdf5c 100644 --- a/miniprogram/pages/benefit/index.js +++ b/miniprogram/pages/benefit/index.js @@ -5,14 +5,20 @@ Page({ * 页面的初始数据 */ data: { - + benefitList:[] }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + var that = this; + const db = wx.cloud.database() + db.collection('benefitList').get({ + success: function (res) { + that.setData({ benefitList: res.data }) + } + }) }, /** diff --git a/miniprogram/pages/benefit/index.wxml b/miniprogram/pages/benefit/index.wxml index 0c11d5046036cb7e3a3ffcb71e94dfd4e286f875..8446825c0206a684fcf433d23a09cd2cd977eedd 100644 --- a/miniprogram/pages/benefit/index.wxml +++ b/miniprogram/pages/benefit/index.wxml @@ -1,2 +1,18 @@ -miniprogram/pages/benefit/index.wxml + + + + + + + + + + {{item.name}} + {{item.description}} + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/benefit/index.wxss b/miniprogram/pages/benefit/index.wxss index e2bbc6aa351cf35ceeb192abbf285cfaf1c73c54..d81fb297abbe54f2d14ab268bdb237b5446d99db 100644 --- a/miniprogram/pages/benefit/index.wxss +++ b/miniprogram/pages/benefit/index.wxss @@ -1 +1,33 @@ -/* miniprogram/pages/benefit/index.wxss */ \ No newline at end of file +/* miniprogram/pages/benefit/index.wxss */ + +.gongyiCard{ + width: 100%; + height: 200rpx; + background:#fff; + padding:0 20rpx; + margin-top: 20rpx; +} + +.left_part{ + width: 160rpx; + height: 160rpx; + display:inline-block; + vertical-align:middle; + margin: 20rpx; +} + +.baby_img{ + width: 100%; + height: 100%; +} + +.right_part{ + width: 540rpx; + vertical-align:middle; + display:inline-block; + font-size: 28rpx; +} + +.name{ + font-size: 36rpx; +} \ No newline at end of file diff --git a/miniprogram/pages/find/index.js b/miniprogram/pages/find/index.js index 39420d621528d4bccff2c51ffcc60e29616a0c65..cc0c8affa73c84299e8922a236df01a87dc4c2ec 100644 --- a/miniprogram/pages/find/index.js +++ b/miniprogram/pages/find/index.js @@ -13,22 +13,21 @@ Page({ */ onLoad: function (options) { - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { var that = this; const db = wx.cloud.database() - db.collection('test').get({ + db.collection('babyList').get({ success: function (res) { - console.log(res.data); that.setData({ babyList: res.data }) } }) }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + }, + /** * 生命周期函数--监听页面显示 */ diff --git a/miniprogram/pages/find/index.wxss b/miniprogram/pages/find/index.wxss index d133b3b148123441cc4296752801f2df78102788..2124fcd1cb99b9a05b9a1eef3bb6ad39a4201655 100644 --- a/miniprogram/pages/find/index.wxss +++ b/miniprogram/pages/find/index.wxss @@ -1,9 +1,6 @@ /* miniprogram/pages/home/index.wxss */ -.findbaby{ - -} .findbaby_content{ display: inline-block; diff --git a/project.config.json b/project.config.json index 40d73e3ea709a8708e48c2a70c5fb0931c9ebcd8..c8cda21c535440f9121640849e6d1622cfaa8431 100644 --- a/project.config.json +++ b/project.config.json @@ -94,6 +94,20 @@ "pathName": "pages/baby/index", "query": "type=missing", "scene": null + }, + { + "id": -1, + "name": "pages/benefit/index", + "pathName": "pages/benefit/index", + "query": "type=missing", + "scene": null + }, + { + "id": 6, + "name": "pages/benefit/detail", + "pathName": "pages/benefit/detail", + "query": "id=4e1e2ad55f6607270046a35746f5b560", + "scene": null } ] }