样式修改

app.wxss

@@ -238,3 +238,9 @@ page{
 .p-24{
   padding: 24rpx;
 }
+.pl-36{
+  padding-left: 36rpx;
+}
+.flex-center-i{
+  align-items: center;
+}

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){

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=>{

subpages/index/checkOutConfirm/index/index.wxml

@@ -56,6 +56,17 @@
                     </van-cell>
                 </van-cell-group>
             </view>
+            <view class="m-top-16 " id="item4">
+                <van-cell-group inset>
+                    <van-cell title="水表数/电表数" border="{{false}}" title-style="color:#404040;font-size: 15px;font-weight: bold;" />
+                    <van-cell title-style="color:#68758B;font-size: 15px;">
+                        <view slot="title" class="flex ">
+                            <view class="mr-30">水表数：{{info.waterMeterValue ||''}}</view>  
+                        <view>电表数：{{info.energyMeterValue||''}}</view>
+                        </view>
+                    </van-cell>
+                </van-cell-group>
+            </view>
             <view class="m-top-16" id="item5">
                 <van-cell-group inset>
                     <van-cell title="图片/视频" border="{{false}}" title-style="color:#404040;font-size: 15px;font-weight: bold;" />

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()
     },
 
     /**

subpages/mine/checkInEvaluate/checkInEvaluate.wxml

@@ -13,12 +13,8 @@
         </view>
         <van-divider dashed />
         <view class="flex flex-sb px-20">
-            <!-- <view class="doc" wx:if="{{item.contractUrl}}">
+            <van-rate wx:if="{{item.evaluateLevel}}" value="{{ item.evaluateLevel }}" readonly size="{{ 25 }}"    color="#13c2c2" void-icon="star" void-color="#eee" bind:change="onChange" />
-                青岛免租金租房合同.docx
+            <van-button round plain size="small"   bind:click="toEvaluate" wx:if="{{(item.status === '1' || item.status === '5' ) && item.evaluateLevel === null}}" data-item="{{item}}" >去评价</van-button>
-            </view> -->
-            <view></view>
-            <van-button round plain size="small"   bind:click="toEvaluate" wx:if="{{(item.status === '1' || item.status === '5' ) && item.evaluateLevel === null}}" data-item="{{item}}">去评价</van-button>
-            <van-rate wx:if="{{item.evaluateLevel}}" value="{{ item.evaluateLevel }}"  readonly size="{{ 25 }}" color="#13c2c2" void-icon="star" void-color="#13c2c2"/>
         </view>
     </view>
 

subpages/mine/checkInEvaluate/checkInEvaluate.wxss

@@ -10,3 +10,9 @@
     color: #08b3b3;
     font-size: 20rpx;
 }
+.scroll-view{
+    padding:20rpx;
+    background-color: #eff0f3;
+    box-sizing: border-box;
+    min-height: 100vh;
+}

subpages/mine/checkInRecord/checkInRecord.wxml

@@ -13,10 +13,12 @@
         </view>
         <van-divider dashed />
         <view class="flex flex-sb px-20">
-            <!-- <van-button round type="info" plain size="small" color="#f0a652" wx:if="{{item.status === '1' && item.paymentStatus === '0'}}">待支付</van-button> -->
+            <view class="flex flex-center-i">
-            <view></view>
+            <!-- todo需要返回合同类型 -->
-            <van-button round plain size="small"   bind:click="toEvaluate" wx:if="{{(item.status === '1' || item.status === '5' ) && item.evaluateLevel === null}}" data-item="{{item}}">去评价</van-button>
+                <text style="color: #1b89fa;" wx:if="{{item.contractUrl}}">住房租赁合同></text>
-            <van-rate wx:if="{{item.evaluateLevel}}" value="{{ item.evaluateLevel }}" readonly size="{{ 25 }}"    color="#13c2c2" void-icon="star" void-color="#eee" bind:change="onChange" />
+          </view>
+          <van-rate wx:if="{{item.evaluateLevel}}" value="{{ item.evaluateLevel }}" readonly size="{{ 25 }}"    color="#13c2c2" void-icon="star" void-color="#eee" bind:change="onChange" />
+            <van-button round  size="small"   bind:click="toEvaluate"  wx:if="{{(item.status === '1' || item.status === '5' ) && item.evaluateLevel === null}}"   data-item="{{item}}"  color="#fa9e0a" plain>去评价</van-button>
         </view>
     </view>
 

subpages/mine/checkInRecord/checkInRecord.wxss

@@ -10,3 +10,9 @@
     color: #08b3b3;
     font-size: 20rpx;
 }
+.scroll-view{
+    padding: 20rpx;
+    box-sizing: border-box;
+    background: #eff0f3;
+    min-height: 100vh;
+}

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){

utils/config.js

@@ -13,8 +13,8 @@ module.exports = {
   };
   
   function BASEURL() {
-    return 'https://zsbz.qdcfy.com/mz-api'
+    // return 'https://zsbz.qdcfy.com/mz-api'
-    // return 'http://219.146.91.110:30801/mz-api'
+    return 'http://219.146.91.110:30801/mz-api'
     // return 'https://epmet-test.elinkservice.cn/api/'
   }