Skip to content

W
wx-program
Commit c771d7af by 陈玉桐
Options

fix

parent 89878266
Showing with 154 additions and 71 deletions
app.json
{ {
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/trainReport/trainReport", "pages/user/user",
"pages/historyDetail/historyDetail",
"pages/updatePlan/updatePlan",
"pages/eyesight/eyesight", "pages/eyesight/eyesight",
"pages/childInfo/childInfo", "pages/childInfo/childInfo",
"pages/setting/setting", "pages/setting/setting",
"pages/trainReport/trainReport",
"pages/historyDetail/historyDetail",
"pages/updatePlan/updatePlan",
"pages/plan/plan", "pages/plan/plan",
"pages/message/message", "pages/message/message",
"pages/trainSort/trainSort", "pages/trainSort/trainSort",
"pages/starSort/starSort", "pages/starSort/starSort",
"pages/user/user",
"pages/mine/mine", "pages/mine/mine",
"pages/idea/idea", "pages/idea/idea",
"pages/whiteList/whiteList", "pages/whiteList/whiteList",
......
pages/childInfo/childInfo.js
...@@ -14,37 +14,61 @@ Page({ ...@@ -14,37 +14,61 @@ Page({
me.setData({ me.setData({
ednDate: myDate.getFullYear()+'-'+(myDate.getMonth()+1)+'-'+myDate.getDate() ednDate: myDate.getFullYear()+'-'+(myDate.getMonth()+1)+'-'+myDate.getDate()
}) })
// 请求前加Loading wx.getStorage({
wx.showLoading({ key: 'name',
title: '加载中', success(res){
mask: true
})
wx.request({
url: app.globalData.apiUrl + 'Teenages/profile',
method: 'POST',
data: {
token: wx.getStorageSync('token'),
},
success: function (res) {
// 请求成功后关闭Loading
wx.hideLoading();
if(res.data.errno==200){
if(res.data.data){
me.setData({ me.setData({
date: res.data.data.birthday, name: res.data
name: res.data.data.name,
sex: res.data.data.gender
}) })
} }
}else{ })
wx.showModal({ wx.getStorage({
title: '提示', key: 'birthday',
showCancel: false, success(res){
content: res.data.msg me.setData({
date: res.data
}) })
} }
})
wx.getStorage({
key: 'gender',
success(res){
me.setData({
sex: res.data
})
} }
}) })
// // 请求前加Loading
// wx.showLoading({
// title: '加载中',
// mask: true
// })
// wx.request({
// url: app.globalData.apiUrl + 'Teenages/profile',
// method: 'POST',
// data: {
// token: wx.getStorageSync('token'),
// },
// success: function (res) {
// // 请求成功后关闭Loading
// wx.hideLoading();
// if(res.data.errno==200){
// if(res.data.data){
// me.setData({
// date: res.data.data.birthday,
// name: res.data.data.name,
// sex: res.data.data.gender
// })
// }
// }else{
// wx.showModal({
// title: '提示',
// showCancel: false,
// content: res.data.msg
// })
// }
// }
// })
}, },
bindDateChange: function(e) { bindDateChange: function(e) {
if(Number(new Date(e.detail.value))>Number(new Date())){ if(Number(new Date(e.detail.value))>Number(new Date())){
...@@ -77,9 +101,6 @@ Page({ ...@@ -77,9 +101,6 @@ Page({
}, },
// 下一步 // 下一步
childInfoNext: function (e) { childInfoNext: function (e) {
console.log(this.data.name)
console.log(this.data.date)
console.log(this.data.sex)
// 授权 // 授权
if(e.detail.errMsg!='getUserInfo:ok'){ if(e.detail.errMsg!='getUserInfo:ok'){
//拒绝授权 //拒绝授权
...@@ -136,38 +157,56 @@ Page({ ...@@ -136,38 +157,56 @@ Page({
title: '加载中', title: '加载中',
mask: true mask: true
}) })
wx.request({
url: app.globalData.apiUrl + 'teenages/info', wx.setStorage({
method: 'POST', key: "name",
data: { data: me.data.name
token: wx.getStorageSync('token'),
name: me.data.name,
birthday: me.data.date,
gender: me.data.sex,//性别
},
success: function (res) {
// 请求成功后关闭Loading
wx.hideLoading();
if(res.data.errno==200){
// 绑定成功
wx.showToast({
title: '填写成功',
mask: true,
// icon: 'none',
duration: 2000
});
wx.navigateTo({
url: '/pages/eyesight/eyesight'
}) })
}else{ wx.setStorage({
wx.showModal({ key: "birthday",
title: '提示', data: me.data.date
showCancel: false,
content: res.data.msg
}) })
} wx.setStorage({
} key: "gender",
data: me.data.sex
}) })
// 跳转第二步视力
wx.navigateTo({
url: '/pages/eyesight/eyesight'
})
// wx.request({
// url: app.globalData.apiUrl + 'teenages/info',
// method: 'POST',
// data: {
// token: wx.getStorageSync('token'),
// name: me.data.name,
// birthday: me.data.date,
// gender: me.data.sex,//性别
// },
// success: function (res) {
// // 请求成功后关闭Loading
// wx.hideLoading();
// if(res.data.errno==200){
// // 绑定成功
// wx.showToast({
// title: '填写成功',
// mask: true,
// // icon: 'none',
// duration: 2000
// });
// wx.navigateTo({
// url: '/pages/eyesight/eyesight'
// })
// }else{
// wx.showModal({
// title: '提示',
// showCancel: false,
// content: res.data.msg
// })
// }
// }
// })
} }
}, },
}) })
\ No newline at end of file
pages/childInfo/childInfo.wxml
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<text class="tabSelected">完善信息</text> <text class="tabSelected">完善信息</text>
<image src="../../assets/arrow_right.png" /> <image src="../../assets/arrow_right.png" />
<text>初始视力</text> <text>初始视力</text>
<image src="../../assets/arrow_right.png" /> <!-- <image src="../../assets/arrow_right.png" />
<text>训练设置</text> <text>训练设置</text> -->
</view> </view>
</view> </view>
<!-- 背景 --> <!-- 背景 -->
......
pages/eyesight/eyesight.js
...@@ -50,7 +50,11 @@ Page({ ...@@ -50,7 +50,11 @@ Page({
isClass: 0, //是否配镜 isClass: 0, //是否配镜
date: '2012-01-01',// 配镜日期 date: '2012-01-01',// 配镜日期
currentDate: '' currentDate: '',
name: '',
birthday: '',
gender: '',
}, },
onLoad: function (options) { onLoad: function (options) {
let me = this; let me = this;
...@@ -188,11 +192,38 @@ Page({ ...@@ -188,11 +192,38 @@ Page({
}else{ }else{
nearsightedTime = me.data.date nearsightedTime = me.data.date
} }
// 获取缓存的孩子信息
wx.getStorage({
key: 'name',
success(res){
me.setData({
name: res.data
})
}
})
wx.getStorage({
key: 'birthday',
success(res){
me.setData({
birthday: res.data
})
}
})
wx.getStorage({
key: 'gender',
success(res){
me.setData({
gender: res.data
})
wx.request({ wx.request({
url: app.globalData.apiUrl + 'teenages/vision', url: app.globalData.apiUrl + 'teenages/addTeenage',
method: 'POST', method: 'POST',
data: { data: {
token: wx.getStorageSync('token'), token: wx.getStorageSync('token'),
name: me.data.name,
birthday: me.data.birthday,
gender: me.data.gender,//性别
leftEye: me.data.luoData.left,// 左眼裸眼视力 leftEye: me.data.luoData.left,// 左眼裸眼视力
rightEye: me.data.luoData.right,// 右眼裸眼视力 rightEye: me.data.luoData.right,// 右眼裸眼视力
leftCorrectedEye: me.data.jiaoData.left,// 左眼矫正视力 leftCorrectedEye: me.data.jiaoData.left,// 左眼矫正视力
...@@ -221,9 +252,13 @@ Page({ ...@@ -221,9 +252,13 @@ Page({
// icon: 'none', // icon: 'none',
duration: 2000 duration: 2000
}); });
wx.navigateTo({ wx.removeStorage({ key: 'name' })
url: '/pages/setting/setting' wx.removeStorage({ key: 'birthday' })
}); wx.removeStorage({ key: 'gender' })
// 跳转首页
wx.reLaunch({
url: '/pages/index/index'
})
}else{ }else{
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
...@@ -264,6 +299,9 @@ Page({ ...@@ -264,6 +299,9 @@ Page({
} }
} }
}) })
}
})
}, },
showList: function () { showList: function () {
this.setData({ this.setData({
......
pages/eyesight/eyesight.wxml
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<text>完善信息</text> <text>完善信息</text>
<image src="../../assets/arrow_right.png" /> <image src="../../assets/arrow_right.png" />
<text class="tabSelected">初始视力</text> <text class="tabSelected">初始视力</text>
<image src="../../assets/arrow_right.png" /> <!-- <image src="../../assets/arrow_right.png" />
<text>训练设置</text> <text>训练设置</text> -->
</view> </view>
</view> </view>
<view id="eyesightConWrap"> <view id="eyesightConWrap">
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<view class="eyesightPos"> <view class="eyesightPos">
<view id="eyesightBox"> <view id="eyesightBox">
<!-- <button id="eyesightBack" bindtap='eyesightBack'>上一步</button> --> <!-- <button id="eyesightBack" bindtap='eyesightBack'>上一步</button> -->
<button id="eyesightNext" bindtap='eyesightNext'>下一步</button> <button id="eyesightNext" bindtap='eyesightNext'>保存</button>
</view> </view>
</view> </view>
<view id="eyesightPopup" hidden="{{flag}}"> <view id="eyesightPopup" hidden="{{flag}}">
......
pages/user/user.wxml
...@@ -8,9 +8,14 @@ ...@@ -8,9 +8,14 @@
</view> </view>
<view class="userItemTopDes"> <view class="userItemTopDes">
<view><text>{{item.gender}}生 </text><text>{{item.age}}岁</text></view> <view><text>{{item.gender}}生 </text><text>{{item.age}}岁</text></view>
<view>视力情况：右眼 {{item.rightEye}} | 左眼 {{item.leftEye}}</view> <view>裸眼视力：右眼 {{item.rightEye}} | 左眼 {{item.leftEye}}</view>
<!-- <view wx:if="{{(item.leftCorrectedEye!=''&&item.leftCorrectedEye!='0.0')||(item.rightCorrectedEye!=''&&item.rightCorrectedEye!='0.0')}}">矫正视力：右眼 {{item.leftCorrectedEye}} | 左眼 {{item.rightCorrectedEye}}</view>
<view wx:if="{{(item.leftWeekEye!=''&&item.leftWeekEye!='无')||(item.rightWeekEye!=''&&item.rightWeekEye!='无')}}">弱视程度：右眼 {{item.leftWeekEye}} | 左眼 {{item.rightWeekEye}}</view>
<view>斜视情况：右眼 {{item.leftLeerEye}} | 左眼 {{item.rightLeerEye}}</view>
<view>散光度数：右眼 {{item.leftCylEye}} | 左眼 {{item.rightCylEye}}</view> -->
<view>配镜情况：<text wx:if="{{item.nearsightedStatus==1}}">已配镜</text><text wx:else>未配镜</text></view> <view>配镜情况：<text wx:if="{{item.nearsightedStatus==1}}">已配镜</text><text wx:else>未配镜</text></view>
<view wx:if="{{item.nearsightedStatus==1}}">配镜日期：{{item.nearsightedTime}}</view> <view wx:if="{{item.nearsightedStatus==1}}">配镜日期：{{item.nearsightedTime}}</view>
<!-- <view>眼镜度数：右眼 {{item.leftGlassesDegree}} | 左眼 {{item.rightGlassesDegree}}</view> -->
</view> </view>
</view> </view>
<view class="userItemBom"> <view class="userItemBom">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment