diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxml b/littleApp_child/pages/CheckReport/CheckReport.wxml index 198fd2c..6915305 100644 --- a/littleApp_child/pages/CheckReport/CheckReport.wxml +++ b/littleApp_child/pages/CheckReport/CheckReport.wxml @@ -82,12 +82,21 @@ + + + 高危因素: + 高危 + 高危 + 高危高危高危 + 高危 + 高危 + 高危 + 高危 - - + - + diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxss b/littleApp_child/pages/CheckReport/CheckReport.wxss index 8f0bb91..95a7091 100644 --- a/littleApp_child/pages/CheckReport/CheckReport.wxss +++ b/littleApp_child/pages/CheckReport/CheckReport.wxss @@ -274,6 +274,8 @@ page { .check_diagnosis_bg { margin-right: 55px; min-height: 25px; + margin-top: 5px; + width: 100%; } .check_diagnosis_content_1_line { @@ -291,8 +293,7 @@ page { -webkit-box-orient: vertical; } -.check_diagnosis_content_lines{ - font-family: PingFangSC-Regular; +.check_diagnosis_content_lines { font-size: 12px; color: #666; margin-left: 10px; @@ -300,6 +301,12 @@ page { width: calc(100% - 20px); } +.check_diagnosis_high_risk { + font-size: 12px; + color: #666; + margin-left: 10px; +} + .high_risk_bg { background: #e36767; border-radius: 4px; @@ -308,9 +315,10 @@ page { color: #fff; text-align: center; margin-right: 10px; - width: 40px; height: 20px; - float: right; + padding: 2px 4px 2px 4px; + display: inline-block; + margin-top: 2px; } diff --git a/littleApp_child/pages/PersonalInfo/PersonalInfo.js b/littleApp_child/pages/PersonalInfo/PersonalInfo.js index 0fe82f0..19623c0 100644 --- a/littleApp_child/pages/PersonalInfo/PersonalInfo.js +++ b/littleApp_child/pages/PersonalInfo/PersonalInfo.js @@ -15,11 +15,11 @@ var hasMore = true Page({ data: { - list:[] + list:[], + userData:'' }, /*---------生命周期--------*/ onLoad: function () { - - + this.setData({ userData: getApp().globalData.userInfo }) } }) diff --git a/littleApp_child/pages/PersonalInfo/PersonalInfo.json b/littleApp_child/pages/PersonalInfo/PersonalInfo.json index 0768c91..68b18db 100644 --- a/littleApp_child/pages/PersonalInfo/PersonalInfo.json +++ b/littleApp_child/pages/PersonalInfo/PersonalInfo.json @@ -2,6 +2,5 @@ "navigationBarBackgroundColor": "#48C17B", "navigationBarTitleText": "儿童档案", "navigationBarTextStyle": "white", - "backgroundColor": "#d8dbd4", - "enablePullDownRefresh": true + "backgroundColor": "#d8dbd4" } \ No newline at end of file diff --git a/littleApp_child/pages/PersonalInfo/PersonalInfo.wxml b/littleApp_child/pages/PersonalInfo/PersonalInfo.wxml index 1b7362d..7b5209b 100644 --- a/littleApp_child/pages/PersonalInfo/PersonalInfo.wxml +++ b/littleApp_child/pages/PersonalInfo/PersonalInfo.wxml @@ -3,7 +3,7 @@ - {{userData.username}}么么么 + {{userData.username}} 分娩信息 diff --git a/littleApp_child/pages/Setting/Setting.js b/littleApp_child/pages/Setting/Setting.js index 1e95d89..d2992ad 100644 --- a/littleApp_child/pages/Setting/Setting.js +++ b/littleApp_child/pages/Setting/Setting.js @@ -17,9 +17,10 @@ Page({ isShowOne: false, isShowTwo: false, isShowThree: false, + userData:'' }, onLoad: function (option) { - + this.setData({ userData: getApp().globalData.userInfo}) }, selectPhoto(){ var that = this @@ -38,7 +39,7 @@ Page({ sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有 sourceType: [imgType], // 可以指定来源是相册还是相机,默认二者都有 success: function (res) { - // 返回选定照片的本地文件路径列表,tempFilePath可以作为img标签的src属性显示图片 + // 返回选定照片的本地文件路径列表,tempFilePath可以作为img标签的src属性显示图片 console.log('图片',res) that.qiniuToken(res.tempFilePaths[0]) } @@ -67,10 +68,10 @@ Page({ url = '../PersonalInfo/PersonalInfo' break case 4: - url = '../PersonalInfo/PersonalInfo' + url = '../mySaved/mySaved' break case 5: - url = '../PersonalInfo/PersonalInfo' + url = '../feedback/feedback' break case 6: @@ -142,6 +143,7 @@ Page({ networkUtil.showErrorToast(res.errormsg) }) }, + // 成功上传头像后 上传服务器 changeUserInfo(image){ var that = this; networkUtil._put(api.kApiModifyMyInfo, {}, function (res) { diff --git a/littleApp_child/pages/Setting/Setting.wxml b/littleApp_child/pages/Setting/Setting.wxml index af3a2cb..22729ee 100644 --- a/littleApp_child/pages/Setting/Setting.wxml +++ b/littleApp_child/pages/Setting/Setting.wxml @@ -4,8 +4,8 @@ - {{userData.username}}胡子涵 - {{userData.username}}18787231231 + {{userData.username}} + {{userData.id}} @@ -13,19 +13,19 @@ 月龄 - {{userData.birth}}122 + {{userData.monthage}} 出生日期 - {{userData.birth}}122 + {{userData.birth}} 出生时间 - {{userData.birth}}122 + {{userData.birth}} 分娩方式 - {{userData.birth}}122 + {{userData.birth}} @@ -39,4 +39,4 @@ -退出登录 \ No newline at end of file +退出登录 \ No newline at end of file diff --git a/littleApp_child/pages/home/home.js b/littleApp_child/pages/home/home.js index 58d468c..6c578fd 100644 --- a/littleApp_child/pages/home/home.js +++ b/littleApp_child/pages/home/home.js @@ -29,6 +29,7 @@ Page({ list:[], userInfo:'', inputFocus: { nameInput: false, phoneInput: false, codeInput: false }, + currentBabyIndex:0 }, /*---------生命周期--------*/ onLoad: function () { @@ -139,6 +140,13 @@ Page({ inputFocus: inputFocus }) }, + // 改变baby + changeBaby(e){ + + this.setData({ + currentBabyIndex: e.currentTarget.dataset.index + }) + }, /*---------自定义函数--------*/ homePage() { var that = this @@ -230,6 +238,13 @@ Page({ console.log(res) }) }, + // 标签页面 + clickLabel(e){ + console.log(e) + wx.navigateTo({ + url: '../articleLists/articleLists?category=' + e.currentTarget.dataset.categary, + }) + }, /*---------------欢迎介绍页面---------------*/ // 获取验证码 getVerifyCode: function (e) { @@ -258,10 +273,6 @@ Page({ networkUtil.showErrorToast('请输入正确手机号码和姓名') return } - - - - }, // 计时器 keepTime: function () { diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml index 4e71f67..dd55239 100644 --- a/littleApp_child/pages/home/home.wxml +++ b/littleApp_child/pages/home/home.wxml @@ -12,9 +12,9 @@ - {{userData.username}} + {{userData.username}} - {{userData.username}} + {{userData.username}} @@ -79,11 +79,15 @@ + + + + - + @@ -154,7 +158,6 @@ - diff --git a/littleApp_child/pages/home/home.wxss b/littleApp_child/pages/home/home.wxss index a4a414b..702768a 100644 --- a/littleApp_child/pages/home/home.wxss +++ b/littleApp_child/pages/home/home.wxss @@ -214,7 +214,9 @@ } /* 文章ne内容背景 */ .article_content { - height: 135px; + height: 133px; + position: relative; + width: 100%; } /* 内容标题 */ .article_content_title { @@ -247,11 +249,11 @@ } /* 内容图 */ .article_content_image { - float: right; - margin-right: 11px; + position: absolute; + right: 11px; width: 74px; height: 74px; - transform: translateY(-74px); + top: 11px; } /* 点赞 */ .article_content_bottomBar { @@ -261,9 +263,9 @@ } .article_content_bottomBar_labels { - float: right; + position: absolute; + right: 0px; height: 100%; - transform: translateX(85px); } .article_content_bottomBar_likes { diff --git a/littleApp_child/pages/mySaved/mySaved.json b/littleApp_child/pages/mySaved/mySaved.json index d548fd9..4448f4b 100644 --- a/littleApp_child/pages/mySaved/mySaved.json +++ b/littleApp_child/pages/mySaved/mySaved.json @@ -2,6 +2,5 @@ "navigationBarBackgroundColor": "#48C17B", "navigationBarTitleText": "我的收藏", "navigationBarTextStyle": "white", - "backgroundColor": "#d8dbd4", - "enablePullDownRefresh": true + "backgroundColor": "#d8dbd4" } \ No newline at end of file diff --git a/littleApp_child/pages/mySaved/mySaved.wxml b/littleApp_child/pages/mySaved/mySaved.wxml index 9ef22a0..d76e9f9 100644 --- a/littleApp_child/pages/mySaved/mySaved.wxml +++ b/littleApp_child/pages/mySaved/mySaved.wxml @@ -6,7 +6,7 @@ - + {{item.title}} diff --git a/littleApp_child/source/checkBox_no.png b/littleApp_child/source/checkBox_no.png new file mode 100644 index 0000000000000000000000000000000000000000..ca6f3a514ae8fec43049d8038cb28793a7afec20 GIT binary patch literal 1672 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 Hu0mjf^HAnT literal 0 HcmV?d00001