diff --git a/woman/app.json b/woman/app.json index dbac73e..6b56627 100644 --- a/woman/app.json +++ b/woman/app.json @@ -1,6 +1,6 @@ { "pages": [ - "pages/home/home", + "pages/home/home", "pages/index/index", "pages/fnSubscribeDocument/fnSubscribeDocument", "pages/doctorList/doctorList", @@ -8,8 +8,9 @@ "pages/articleDetail/articleDetail", "pages/hospitalDetail/hospitalDetail", "pages/login/login", - "pages/logs/logs" - + "pages/logs/logs", + "pages/folicAcid/folicAcid", + "pages/cancerCheck/cancerCheck" ], "window": { "backgroundTextStyle": "light", @@ -20,24 +21,23 @@ "style": "v2", "sitemapLocation": "sitemap.json", "tabBar": { - "color": "#999", - "selectedColor": "#3D98FF", - "backgroundColor": "#fff", - "borderStyle": "white", - "list": [ - { - "selectedIconPath": "/source/imageSource/doctorIcon.png", - "iconPath": "/source/imageSource/doctorIcon.png", - "pagePath": "pages/home/home", - "text": "首页" - }, - { - "selectedIconPath": "/source/imageSource/doctorIcon.png", - "iconPath": "/source/imageSource/doctorIcon.png", - "pagePath": "pages/index/index", - "text": "通讯录" - } - - ] - } + "color": "#999", + "selectedColor": "#3D98FF", + "backgroundColor": "#fff", + "borderStyle": "white", + "list": [ + { + "selectedIconPath": "/source/imageSource/doctorIcon.png", + "iconPath": "/source/imageSource/doctorIcon.png", + "pagePath": "pages/home/home", + "text": "首页" + }, + { + "selectedIconPath": "/source/imageSource/doctorIcon.png", + "iconPath": "/source/imageSource/doctorIcon.png", + "pagePath": "pages/index/index", + "text": "通讯录" + } + ] + } } \ No newline at end of file diff --git a/woman/app.wxss b/woman/app.wxss index b527d54..56be7ee 100644 --- a/woman/app.wxss +++ b/woman/app.wxss @@ -19,6 +19,9 @@ .margin-t12{ margin-top: 12rpx; } +.margin-r12{ + margin-right: 12rpx; +} .margin-l5 { margin-left: 5rpx; } @@ -95,6 +98,9 @@ .margin-l32 { margin-left: 30rpx; } +.margin-l34 { + margin-left: 34rpx; +} .margin-t35 { margin-top: 35rpx; } @@ -114,7 +120,10 @@ .margin-t38 { margin-top: 38rpx; } - +.margin-tb38 { + margin-top: 38rpx; + margin-bottom: 38rpx; +} .margin-r38 { margin-right: 38rpx; } @@ -296,6 +305,9 @@ .margin-t42 { margin-top: 42rpx; } +.margin-t50 { + margin-top: 50rpx; +} .margin-t53 { margin-top: 53rpx; @@ -400,7 +412,20 @@ color: #FFFFFF; line-height: 24rpx; } - +.font-white-30 { + height: 30rpx; + font-size: 30rpx; + font-weight: 400; + color: #FFFFFF; + line-height: 30rpx; +} +.font-white-40{ + height: 40rpx; + font-size: 40rpx; + font-weight: 400; + color: #FFFFFF; + line-height: 40rpx; +} .fontb-070707-62 { height: 62rpx; font-weight: bold; diff --git a/woman/pages/cancerCheck/cancerCheck.js b/woman/pages/cancerCheck/cancerCheck.js new file mode 100644 index 0000000..0c05fd8 --- /dev/null +++ b/woman/pages/cancerCheck/cancerCheck.js @@ -0,0 +1,66 @@ +// pages/cancerCheck/cancerCheck.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/woman/pages/cancerCheck/cancerCheck.json b/woman/pages/cancerCheck/cancerCheck.json new file mode 100644 index 0000000..20252c6 --- /dev/null +++ b/woman/pages/cancerCheck/cancerCheck.json @@ -0,0 +1,6 @@ +{ + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTitleText": "两癌筛查", + "navigationBarTextStyle": "black" + +} \ No newline at end of file diff --git a/woman/pages/cancerCheck/cancerCheck.wxml b/woman/pages/cancerCheck/cancerCheck.wxml new file mode 100644 index 0000000..1f05114 --- /dev/null +++ b/woman/pages/cancerCheck/cancerCheck.wxml @@ -0,0 +1,29 @@ + + + + 宫颈癌筛查 + + 宫颈癌筛查报告 + + 未见异常 + + 详细报告 + + + + + + + 乳腺癌筛查 + + 乳腺癌筛查报告 + + 未见异常 + + 详细报告 + + + + + + diff --git a/woman/pages/cancerCheck/cancerCheck.wxss b/woman/pages/cancerCheck/cancerCheck.wxss new file mode 100644 index 0000000..0bcfa86 --- /dev/null +++ b/woman/pages/cancerCheck/cancerCheck.wxss @@ -0,0 +1,43 @@ +/* pages/cancerCheck/cancerCheck.wxss */ +/* pages/folicAcid/folicAcid.wxss */ +.menuList_title { + font-size: 34rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 600; + line-height: 34rpx; + background: linear-gradient(135deg, #FFB4B4 0%, #FF8EA9 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + +.menuList_bg{ + width: 670rpx; + height: 180rpx; + background: linear-gradient(134deg, rgba(255,150,171,0.61) 0%, rgba(255,174,178,0.07) 100%); + box-shadow: 0rpx 4rpx 8rpx 5rpx rgba(245,33,84,0.1); + border-radius: 20rpx 20rpx 20rpx 20rpx; + opacity: 1; +} + +.menuList_text { + font-size: 26rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + background: linear-gradient(135deg, #FFB4B4 0%, #FF8EA9 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + line-height: 26rpx; +} +.menuList_next{ + width: 20rpx; + height: 20rpx; + + opacity: 1; + border: 2rpx solid #FF8EA9; + display: inline-block; + width: 18rpx; + height: 18rpx; + border-bottom: none; + border-left: none; + transform: rotate(45deg); +} \ No newline at end of file diff --git a/woman/pages/folicAcid/folicAcid.js b/woman/pages/folicAcid/folicAcid.js new file mode 100644 index 0000000..b71cc07 --- /dev/null +++ b/woman/pages/folicAcid/folicAcid.js @@ -0,0 +1,66 @@ +// pages/folicAcid/folicAcid.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/woman/pages/folicAcid/folicAcid.json b/woman/pages/folicAcid/folicAcid.json new file mode 100644 index 0000000..cad0f78 --- /dev/null +++ b/woman/pages/folicAcid/folicAcid.json @@ -0,0 +1,6 @@ +{ + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTitleText": "叶酸领取", + "navigationBarTextStyle": "black" + +} \ No newline at end of file diff --git a/woman/pages/folicAcid/folicAcid.wxml b/woman/pages/folicAcid/folicAcid.wxml new file mode 100644 index 0000000..eb8ebf2 --- /dev/null +++ b/woman/pages/folicAcid/folicAcid.wxml @@ -0,0 +1,2 @@ + + diff --git a/woman/pages/folicAcid/folicAcid.wxss b/woman/pages/folicAcid/folicAcid.wxss new file mode 100644 index 0000000..0b646a4 --- /dev/null +++ b/woman/pages/folicAcid/folicAcid.wxss @@ -0,0 +1,42 @@ +/* pages/folicAcid/folicAcid.wxss */ +.menuList_title { + font-size: 34rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 600; + line-height: 34rpx; + background: linear-gradient(135deg, #FFB4B4 0%, #FF8EA9 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + +.menuList_bg{ + width: 670rpx; + height: 180rpx; + background: linear-gradient(134deg, rgba(255,150,171,0.61) 0%, rgba(255,174,178,0.07) 100%); + box-shadow: 0rpx 4rpx 8rpx 5rpx rgba(245,33,84,0.1); + border-radius: 20rpx 20rpx 20rpx 20rpx; + opacity: 1; +} + +.menuList_text { + font-size: 26rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + background: linear-gradient(135deg, #FFB4B4 0%, #FF8EA9 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + line-height: 26rpx; +} +.menuList_next{ + width: 20rpx; + height: 20rpx; + + opacity: 1; + border: 2rpx solid #FF8EA9; + display: inline-block; + width: 18rpx; + height: 18rpx; + border-bottom: none; + border-left: none; + transform: rotate(45deg); +} \ No newline at end of file diff --git a/woman/pages/home/home.js b/woman/pages/home/home.js index 173e140..589fcb5 100644 --- a/woman/pages/home/home.js +++ b/woman/pages/home/home.js @@ -945,6 +945,16 @@ Page({ index: swiperCurrent }) }, + goMenu3(e) { + wx.navigateTo({ + url: '../cancerCheck/cancerCheck', + }) + }, + goMenu4(e) { + wx.navigateTo({ + url: '../folicAcid/folicAcid', + }) + }, /* 菜单栏*/ goMenu5(e) { wx.navigateTo({ diff --git a/woman/pages/home/home.wxml b/woman/pages/home/home.wxml index c1786df..7349508 100644 --- a/woman/pages/home/home.wxml +++ b/woman/pages/home/home.wxml @@ -43,11 +43,11 @@ 孕前优生 - + 两癌筛查 - + 叶酸领取