diff --git a/app.wxss b/app.wxss index 705b4ee..689ec17 100644 --- a/app.wxss +++ b/app.wxss @@ -237,4 +237,10 @@ page{ } .p-24{ padding: 24rpx; +} +.pl-36{ + padding-left: 36rpx; +} +.flex-center-i{ + align-items: center; } \ No newline at end of file diff --git a/images/star.png b/images/star.png new file mode 100644 index 0000000..3f065cd Binary files /dev/null and b/images/star.png differ diff --git a/subpages/index/checkInUser/checkInUser.js b/subpages/index/checkInUser/checkInUser.js index 436cdba..be993ee 100644 --- a/subpages/index/checkInUser/checkInUser.js +++ b/subpages/index/checkInUser/checkInUser.js @@ -94,6 +94,7 @@ Page({ }) }, submit(){ + // this.bindIdCard() selectMzGraduateInfo({idCard:this.data.form.idCard}).then(res=>{ console.log(res,'毕业生信息'); if(res.code === 200){ diff --git a/subpages/index/checkOutConfirm/index/index.js b/subpages/index/checkOutConfirm/index/index.js index 2507255..e528f68 100644 --- a/subpages/index/checkOutConfirm/index/index.js +++ b/subpages/index/checkOutConfirm/index/index.js @@ -122,10 +122,20 @@ console.log('area',scrollArea.node); }, }); } + const date = new Date(); + const year = date.getFullYear(); + const month = (date.getMonth() + 1).toString().padStart(2, '0'); + const day = date.getDate().toString().padStart(2, '0'); this.setData({ statusHeight: app.globalData.deviceInfo.statusHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight, + checkOutDate: `${year}-${month}-${day}` }) + + this.setData({ + + }) + }, getProcessingCheckOutInfo(){ getProcessingCheckOutInfo().then(res=>{ diff --git a/subpages/index/checkOutConfirm/index/index.wxml b/subpages/index/checkOutConfirm/index/index.wxml index 47bc84a..3eb0485 100644 --- a/subpages/index/checkOutConfirm/index/index.wxml +++ b/subpages/index/checkOutConfirm/index/index.wxml @@ -56,6 +56,17 @@ + + + + + + 水表数：{{info.waterMeterValue ||''}} + 电表数：{{info.energyMeterValue||''}} + + + + diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.js b/subpages/mine/checkInEvaluate/checkInEvaluate.js index fe0036e..43068a8 100644 --- a/subpages/mine/checkInEvaluate/checkInEvaluate.js +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.js @@ -5,14 +5,15 @@ Page({ * 页面的初始数据 */ data: { - list:[] + list:[], + rateValue:2 }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - this.getList() + }, /** @@ -26,7 +27,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.getList() }, /** diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.wxml b/subpages/mine/checkInEvaluate/checkInEvaluate.wxml index a6fc746..8b0b28e 100644 --- a/subpages/mine/checkInEvaluate/checkInEvaluate.wxml +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.wxml @@ -13,12 +13,8 @@ - - - 去评价 - + + 去评价 diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.wxss b/subpages/mine/checkInEvaluate/checkInEvaluate.wxss index 33b58e0..6e00ad8 100644 --- a/subpages/mine/checkInEvaluate/checkInEvaluate.wxss +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.wxss @@ -9,4 +9,10 @@ .doc{ color: #08b3b3; font-size: 20rpx; +} +.scroll-view{ + padding:20rpx; + background-color: #eff0f3; + box-sizing: border-box; + min-height: 100vh; } \ No newline at end of file diff --git a/subpages/mine/checkInRecord/checkInRecord.wxml b/subpages/mine/checkInRecord/checkInRecord.wxml index 377ab1a..087f0c0 100644 --- a/subpages/mine/checkInRecord/checkInRecord.wxml +++ b/subpages/mine/checkInRecord/checkInRecord.wxml @@ -13,10 +13,12 @@ - - - 去评价 - + + + 住房租赁合同> + + + 去评价 diff --git a/subpages/mine/checkInRecord/checkInRecord.wxss b/subpages/mine/checkInRecord/checkInRecord.wxss index 33b58e0..caa5e19 100644 --- a/subpages/mine/checkInRecord/checkInRecord.wxss +++ b/subpages/mine/checkInRecord/checkInRecord.wxss @@ -9,4 +9,10 @@ .doc{ color: #08b3b3; font-size: 20rpx; +} +.scroll-view{ + padding: 20rpx; + box-sizing: border-box; + background: #eff0f3; + min-height: 100vh; } \ No newline at end of file diff --git a/subpages/mine/evaluate/evaluate.js b/subpages/mine/evaluate/evaluate.js index 6c6f285..99321f3 100644 --- a/subpages/mine/evaluate/evaluate.js +++ b/subpages/mine/evaluate/evaluate.js @@ -99,7 +99,43 @@ Page({ }) }, onButtonTap(){ - const {evaluateContent,releaseMethod,satisfiedZt,satisfiedHj,satisfiedFw,satisfiedTy,fileList} = this.data + const {evaluateContent,releaseMethod,satisfiedZt,satisfiedHj,satisfiedFw,satisfiedTy,fileList} = this.data; + + if(!satisfiedZt ){ + wx.showToast({ + title: '请选择总体评价', + icon:'none' + }) + return false + } + if(!satisfiedHj){ + wx.showToast({ + title: '请选择环境方面评价', + icon:'none' + }) + return false + } + if(!satisfiedFw){ + wx.showToast({ + title: '请选择服务方面评价', + icon:'none' + }) + return false + } + if(!satisfiedTy){ + wx.showToast({ + title: '请填写体验方面评价', + icon:'none' + }) + return false + } + if(!evaluateContent){ + wx.showToast({ + title: '请填写评价内容', + icon:'none' + }) + return false + } evaluateAdd({evaluateContent,releaseMethod,satisfiedZt,satisfiedHj,satisfiedFw,satisfiedTy,checkInRecId:this.data.info.checkInRecId,images:fileList}).then(res=>{ console.log(res); if(res.code === 200){ diff --git a/utils/config.js b/utils/config.js index 62064f1..02ccc2c 100644 --- a/utils/config.js +++ b/utils/config.js @@ -13,8 +13,8 @@ module.exports = { }; function BASEURL() { - return 'https://zsbz.qdcfy.com/mz-api' - // return 'http://219.146.91.110:30801/mz-api' + // return 'https://zsbz.qdcfy.com/mz-api' + return 'http://219.146.91.110:30801/mz-api' // return 'https://epmet-test.elinkservice.cn/api/' }