diff --git a/components/vant/calendar/calendar.wxml b/components/vant/calendar/calendar.wxml
index 09a60b3..be285ea 100644
--- a/components/vant/calendar/calendar.wxml
+++ b/components/vant/calendar/calendar.wxml
@@ -31,6 +31,7 @@
         allowSameDay="{{ allowSameDay }}"
         showMonthTitle="{{ index !== 0 || !showSubtitle }}"
         bind:click="onClickDay"
+        holiday="{{ holiday }}"
       />
     </scroll-view>
 
diff --git a/components/vant/calendar/components/month/index.js b/components/vant/calendar/components/month/index.js
index 0c88643..b86bc5c 100644
--- a/components/vant/calendar/components/month/index.js
+++ b/components/vant/calendar/components/month/index.js
@@ -19,6 +19,7 @@ VantComponent({
             type: null,
             observer: 'setDays'
         },
+        holiday:Array,
         showMark: Boolean,
         rowHeight: [Number, String],
         formatter: {
@@ -53,7 +54,8 @@ VantComponent({
             const totalDay = getMonthEndDay(startDate.getFullYear(), startDate.getMonth() + 1);
             for (let day = 1; day <= totalDay; day++) {
                 const date = new Date(year, month, day);
-                const type = this.getDayType(date);
+                const dateFormat = year.toString() + '-' + (month + 1).toString() + '-' + day.toString()
+                const type = this.getDayType(date,dateFormat);
                 let config = {
                     date,
                     type,
@@ -65,6 +67,8 @@ VantComponent({
                 }
                 days.push(config);
             }
+
+            // console.log('days',days)
             this.setData({ days });
         },
         getMultipleDayType(day) {
@@ -115,11 +119,15 @@ VantComponent({
                 return 'middle';
             }
         },
-        getDayType(day) {
-            const { type, minDate, maxDate, currentDate } = this.data;
+        getDayType(day,dateFormat) {
+            const { type, minDate, maxDate, currentDate, holiday} = this.data;
             if (compareDay(day, minDate) < 0 || compareDay(day, maxDate) > 0) {
                 return 'disabled';
             }
+            if(holiday.includes(dateFormat)){
+                return 'disabled';
+            }
+
             if (type === 'single') {
                 return compareDay(day, currentDate) === 0 ? 'selected' : '';
             }
diff --git a/components/vant/calendar/index.js b/components/vant/calendar/index.js
index e9a4614..f67166b 100644
--- a/components/vant/calendar/index.js
+++ b/components/vant/calendar/index.js
@@ -45,6 +45,10 @@ VantComponent({
             type: null,
             value: new Date(new Date().getFullYear(), new Date().getMonth() + 6, new Date().getDate()).getTime()
         },
+        holiday:{
+            type: Array,
+            value:[]
+        },
         position: {
             type: String,
             value: 'bottom'
diff --git a/components/vant/calendar/index.wxml b/components/vant/calendar/index.wxml
index 1a4f59c..9068aef 100644
--- a/components/vant/calendar/index.wxml
+++ b/components/vant/calendar/index.wxml
@@ -18,12 +18,12 @@
 >
   <template
     is="calendar"
-    data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
+    data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, holiday ,type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
   />
 </van-popup>
 
 <template
   wx:else
   is="calendar"
-  data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
+  data="{{ title, subtitle, showTitle, showSubtitle, minDate, maxDate, holiday, type, color, showMark, formatter, rowHeight, currentDate, safeAreaInsetBottom, showConfirm, confirmDisabledText, confirmText, scrollIntoView, allowSameDay }}"
 />
diff --git a/config.js b/config.js
index 49b1f9f..3f84a2e 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
 const config = {
-  // api_url: 'http://192.168.42.44:7101/fqsb', // 服务器地址
-  api_url: 'https://shibeirencai.elinkit.com.cn:7101/fqsb' // 正式环境
+  api_url: 'http://192.168.52.42:8080/fqsb', // 服务器地址
+  // api_url: 'https://shibeirencai.elinkit.com.cn:7101/fqsb' // 正式环境
   // api_url: 'https://dingoa.elinkit.com.cn/fqsb', // 测试环境
 }
 export { config }
\ No newline at end of file
diff --git a/pages/service/myService/myService.js b/pages/service/myService/myService.js
new file mode 100644
index 0000000..9d66210
--- /dev/null
+++ b/pages/service/myService/myService.js
@@ -0,0 +1,103 @@
+// pages/service/myService/myService.js
+import { UserModel } from '../../../models/user.js'
+let userModel = new UserModel()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    detail:{},
+    img:[],
+    commentList:[],
+    score:false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var id = options.id;
+    userModel.getWhistleDetail(id,res=>{
+      var img = res.result.picList.split(";");
+      img.pop();
+      this.setData({
+        detail:res.result,
+        img:img,
+        commentList:res.result.commentList
+      });
+
+      if(res.result.commentList[0]['score']){
+        this.setData({
+          score:true
+        })
+      }
+    });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  previewImage:function(e){
+    var current = e.target.dataset.src;
+    var th = this;
+    wx.previewImage({
+      current: current, // 当前显示图片的http链接  
+      urls: th.data.img // 需要预览的图片http链接列表  
+    })
+  },
+  evaluation:function(){
+    var th = this;
+    console.log(th.data.detail.id);
+    if (!th.data.detail.id) {
+      return;
+    }
+    // console.log(JSON.stringify(th.data.commentList))
+    wx.navigateTo({
+      url: '../evaluate/index?id=' + th.data.detail.id + '&list=' + JSON.stringify(th.data.commentList)
+    })
+
+  }
+})
\ No newline at end of file
diff --git a/pages/service/myService/myService.json b/pages/service/myService/myService.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/service/myService/myService.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/service/myService/myService.wxml b/pages/service/myService/myService.wxml
new file mode 100644
index 0000000..2eebaaa
--- /dev/null
+++ b/pages/service/myService/myService.wxml
@@ -0,0 +1,103 @@
+<!--pages/service/myService/myService.wxml-->
+<wxs module="myService" src="myService.wxs"></wxs>
+
+<view class="title">
+  <!-- <view>
+    <view>{{detail.createTime}}</view>
+    <view>{{detail.departName}}</view>
+  </view> -->
+  <view style="color:{{myService.getColor(detail.status)}}">{{myService.getStatus(detail.status)}}</view>
+</view>
+
+<view class="content">
+  <view class="date">提交时间:{{detail.createTime}}</view>
+  <view class="con">{{detail.content}}</view>
+
+  <block wx:if="{{detail.picList}}">
+    <view class="image-show">
+      <block wx:for="{{img}}">
+        <!-- <view class="img-box"> -->
+        <block wx:if="{{item}}">
+          <image class="img-box" src="{{item}}" data-src="{{item}}" bindtap="previewImage"></image>
+        </block>
+        <!-- </view> -->
+      </block>
+    </view>
+  </block>
+  <view class="info">
+    <view>
+      <block wx:if="{{detail.questionType == 0}}"><text style="color:#737373;">资源类型：</text>{{detail.typeName}}</block>
+      <block wx:if="{{detail.questionType == 1}}"><text style="color:#737373;">租房类型：</text>{{detail.typeName}}</block>
+      <block wx:if="{{detail.questionType == 2}}"><text style="color:#737373;">需求类型：</text>{{detail.typeName}}</block>
+    </view>
+    <block  wx:if="{{detail.departName}}">
+      <view><text style="color:#737373;">所在街道：</text>{{detail.departName}}</view>
+    </block>
+    <block  wx:if="{{detail.company}}">
+      <view><text style="color:#737373;">工作单位：</text>{{detail.company}}</view>
+    </block>
+    
+  </view>
+</view>
+
+<view class="process">
+
+  <view class="text-title">处理进度</view>
+  <view class="table">
+    <block wx:for="{{detail.list}}">
+      <view class="tb">
+        
+        <view class="timeline">
+          <view class="line"></view>
+          <view class="circle">
+            <!-- <text class="fa fa-dot-circle-o fa-lg"></text> -->
+            
+            <text class="fa fa-dot-circle-o fa-lg"></text>
+          </view>
+          <view class="line"></view>
+        </view>
+        <view class="content-1">
+          <view class="process-tit"><text style="font-size:16px">{{item.handleType}}</text><text style="font-size:13px;color:#737373;">{{item.handleDate}}</text></view>
+          <text style="font-size:13px;color:#737373;">{{item.handleSuggestions}}</text>
+          <block wx:if="{{item.handleDepartName}}">
+            <text style="font-size:13px">处理部门：{{item.handleDepartName}}</text>
+          </block>
+        </view>
+        <!-- <view class="time">{{item.handleDate}}</view> -->
+
+      </view>
+    </block>
+
+  </view>
+
+</view>
+
+
+
+<block wx:if="{{detail.status ==  1}}">
+  <button class="btn1" bindtap="evaluation">我要评价</button>
+</block>
+
+<block wx:if="{{score}}">
+  <view class="score">
+    <view class="text-title">
+      评价反馈
+    </view>
+    <block wx:for="{{commentList}}">
+      <view class="comment">
+        <view style="font-weight:800;">
+          {{item.departName}}
+        </view>
+        <view class="com-top">
+          <view>
+              <van-rate readonly value="{{ item.score }}" color="#ee0a24"/> <text> {{myService.getEvaluate(item.score)}}</text>
+          </view>
+          <view>{{item.commentDate}}</view>
+        </view>
+        <view class="com-bottom">{{item.comment}}</view>
+      </view>
+    </block>
+
+  </view>
+  
+</block>
diff --git a/pages/service/myService/myService.wxs b/pages/service/myService/myService.wxs
new file mode 100644
index 0000000..9174cd9
--- /dev/null
+++ b/pages/service/myService/myService.wxs
@@ -0,0 +1,67 @@
+var myService = {
+
+  getImage: function (str) {
+    var images = str.split(";");
+    return images;
+  },
+
+  getEvaluate:function(score){
+    var evaluate = '';
+    switch(score) {
+      case 1:
+        evaluate = '非常不满意';
+         break;
+      case 2:
+        evaluate = '不满意';
+         break;
+      case 3:
+        evaluate = '一般';
+        break;
+      case 4:
+        evaluate = '满意';
+        break;
+      case 5: 
+        evaluate = '非常满意'; 
+        break;   
+      default:
+        evaluate = '';
+    } 
+    return evaluate;
+  },
+
+  getStatus: function(status){
+    if (status == '0'){
+      status = '处理中';
+    } else if (status == '1'){
+      status = '已答复';
+    } else if (status == '2'){
+      status = '已驳回';
+    } else if (status == '3') {
+      status = '已结束';
+    }
+    return status;
+  },
+
+  getColor:function(status){
+
+    if (status == '0') {
+      var color = '#ff8a0e';
+    } else if (status == '1') {
+      var color = '#f41414';
+    } else if (status == '2') {
+      var color = '#1131e4';
+    } else if (status == '3') {
+      var color = '#463c59';
+    }
+
+    return color;
+  }
+
+}
+// 导出对外暴露的属性
+module.exports = {
+  getImage:myService.getImage,
+  getEvaluate:myService.getEvaluate,
+  getStatus: myService.getStatus,
+  getColor: myService.getColor
+}
\ No newline at end of file
diff --git a/pages/service/myService/myService.wxss b/pages/service/myService/myService.wxss
new file mode 100644
index 0000000..dfbf466
--- /dev/null
+++ b/pages/service/myService/myService.wxss
@@ -0,0 +1,180 @@
+/* pages/service/myService/myService.wxss */
+page{
+    width:100%;
+    font-size: 28rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  
+  .title{
+    width: 90%;
+    height: 60px;
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.116);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 13px;
+  }
+  
+  .content{
+    width: 95%;
+    /* height: 200px; */
+    margin-top: 5px;
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.116);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+  
+  .con{
+    width:95%;
+    margin-top:20rpx;
+    margin-bottom: 20rpx;
+    font-size: 15px;
+    display: flex;
+    align-items: center;
+  }
+  
+  .date{
+    width:95%;
+    font-size: 13px;
+    color:#737373;
+  }
+  
+  .info{
+    width:95%;
+    font-size: 13px;
+    margin-bottom: 5px;
+  }
+  
+  .image-show{
+    height: 220rpx;
+    width:95%;
+    overflow-x:scroll;
+    white-space:nowrap;
+    margin-top:30rpx;
+  }
+  
+  .img-box{
+    margin-right:15rpx;
+    width:220rpx;
+    height:180rpx;
+    display: inline-flex;
+    position: relative;
+  }
+  
+  .process{
+    width: 95%;
+    /* margin-top:20px; */
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    font-size: 27rpx;
+  }
+  
+  .table{
+    /* background-color: #efeff4; */
+    /* height: 100%; */
+    width:100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  
+  .tb{
+    width:100%;
+    /* height:150rpx; */
+    min-height: 100px;
+    display: flex;
+    /* border: 1px solid #000; */
+  }
+  
+  /* .time{
+    width: 30%;
+    display: flex;
+    justify-content:right;
+    font-size:13px;
+  } */
+  .timeline{
+    width: 15%;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .content-1{
+    width:85%;
+    /* height: 100%; */
+    display: flex;
+    flex-direction: column;
+    justify-content:center;
+    /* align-items: center; */
+    /* word-wrap:break-word;
+    word-break:break-all; */
+  }
+  
+  
+  .line{
+    width:49%;
+    height: 40%;
+    border-right: 1px solid #cecdcb;
+  }
+  .circle{
+    width:100%;
+    height: 20%;
+    display: flex;
+    align-items: center;
+    justify-content:center;
+    color:#5677fc;
+  }
+  
+  .process-tit{
+    display: flex;
+    justify-content: space-between;
+  }
+  text{
+    margin-bottom: 5px;
+  }
+  
+  
+  .btn1{
+    width:90%;
+    background-color: #fc6351;
+    color: white;
+    margin-top: 30px;
+    margin-bottom: 30px;
+  }
+  
+  .score{
+    width: 90%;
+    border-top: 1rpx solid rgba(0, 0, 0, 0.116);
+  }
+  
+  .comment{
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin-bottom: 10px;
+  }
+  
+  .com-top{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  
+  .com-bottom{
+    width: 100%;
+    margin-top: 10px;
+  }
+  
+  .text-title{
+    width: 100%;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    font-size: 17px;
+  }
\ No newline at end of file
diff --git a/pages/service/settle/settle.js b/pages/service/settle/settle.js
index 68e4a74..6bb1842 100644
--- a/pages/service/settle/settle.js
+++ b/pages/service/settle/settle.js
@@ -9,19 +9,29 @@ Page({
      */
     data: {
         info:'',
-        text:true,
-        imgUrl:[],
-        img:[],
-        message:0,
-        save:true,
-        code:1,
+        code:'',
         tp:'',
         array: ['融创', '时代国际'],
         index:'',
         departIndex:'',
         department:[],
         departArray:[],
+        hospitalIndex:'',
+        hospitalArray:[],
+        doctorIndex:'',
+        doctorArray:[],
         demand:'', // 服务需求
+        start:'',
+        calendar:false,
+        holiday:[
+            '2021-8-1',
+            '2021-8-7',
+            '2021-8-8',
+            '2021-8-14',
+            '2021-8-15',
+            '2021-8-21',
+            '2021-8-22',
+        ]
     },
 
     /**
@@ -30,6 +40,23 @@ Page({
     onLoad: function (options) {
         console.log(options.code)
         console.log(options.tp)
+        // var date = new Date();
+        // console.log(nowTime)
+        // var year = date.getFullYear();
+        // var month = date.getMonth() + 1;
+        // var day = date.getDate();
+        // if(month < 10){
+        //     month = '0'+ month.toString()
+        // }
+        // if(day < 10){
+        //     day = '0'+ month.toString()
+        // }
+        // var start = year + '-' + month + '-' + day
+        // this.setData({
+        //     start:start
+        // })
+        // console.log(start)
+
         this.setData({
             code:options.code,
             tp:options.tp
@@ -41,7 +68,7 @@ Page({
             })
         })
 
-        if(this.data.code == 'zwfw'){
+        if(this.data.code == 'zwfw' || this.data.code == 'whly' || this.data.code == 'tycg' || this.data.code == 'cjkf' || this.data.code == 'jgtc'){
             serviceModel.getDepartList(this.data.code,res=>{
                 var departArray = []
                 for(let i = 0;i < res.result.length; i++){
@@ -56,6 +83,14 @@ Page({
 
             })
         }
+
+        if(this.data.code == 'ylbj'){
+            serviceModel.getHosptialList(res=>{
+                this.setData({
+                    hospitalArray:res.result
+                })
+            })
+        }
         
     },
 
@@ -163,6 +198,52 @@ Page({
           this.setData({
             departIndex:e.detail.value
           })
+      },
+      bindHospitalChange:function(e){
+        if(e.detail.value != this.data.hospitalIndex){
+            this.setData({
+                hospitalIndex:e.detail.value,
+                doctorIndex:'',
+                doctorArray:[]
+            })
+            this.getDoctorList()
+        }
+        
+      },
+      bindDoctorChange:function(e){
+        this.setData({
+            doctorIndex:e.detail.value
+        })
+      },
+      calendar:function(e){
+          this.setData({
+            calendar:true
+          })
+      },
+      onClose:function(){
+          this.setData({
+            calendar:false
+          })
+      },
+      onConfirm:function(e){
+        console.log(e)
+        this.setData({
+            calendar:false
+          })
+      },
+
+      getDoctorList:function(){
+        var hospital = this.data.hospitalArray[this.data.hospitalIndex]
+        serviceModel.getDoctorList(hospital,res=>{
+            var doctorArray = []
+            for(var i = 0;i < res.result.length;i++){
+                doctorArray.push(res.result[i]['deptType'] + ' '+ res.result[i]['doctor_name'])
+            }
+
+            this.setData({
+                doctorArray:doctorArray
+            })
+        })
       }
 
 })
\ No newline at end of file
diff --git a/pages/service/settle/settle.json b/pages/service/settle/settle.json
index a2bd8bd..9b13905 100644
--- a/pages/service/settle/settle.json
+++ b/pages/service/settle/settle.json
@@ -4,7 +4,8 @@
     "mp-cells": "/components/weui/cells/cells",
     "mp-cell": "/components/weui/cell/cell",
     "mp-uploader": "/components/weui/uploader/uploader",
-    "e-ibutton": "/components/image-button/index"
+    "e-ibutton": "/components/image-button/index",
+    "van-calendar": "/components/vant/calendar/index"
   },
   "navigationBarTitleText": "预约"
 }
\ No newline at end of file
diff --git a/pages/service/settle/settle.wxml b/pages/service/settle/settle.wxml
index 3509668..d78a1d9 100644
--- a/pages/service/settle/settle.wxml
+++ b/pages/service/settle/settle.wxml
@@ -47,22 +47,38 @@
                 </view>
                 
                 <view class="column">
-                    <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}" style="width:100%;">
+                    <picker bindchange="bindHospitalChange" value="{{hospitalIndex}}" range="{{hospitalArray}}" style="width:100%;">
                         <view class="picker-box">
                             <view class="cell">
                                 <view class="tit">医疗机构</view>
-                                <view class="con"><text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></view> 
+                                <view class="con">
+                                    <block wx:if="{{hospitalIndex === ''}}">
+                                        <text style="color:rgb(202,202,202)">请选择</text>
+                                    </block>
+                                    <block wx:else>
+                                        {{hospitalArray[hospitalIndex]}}
+                                    </block>
+                                    <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
+                                </view> 
                             </view>
                         </view>
 
                     </picker>
                 </view>
                 <view class="column">
-                    <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}" style="width:100%;">
+                    <picker bindchange="bindDoctorChange" value="{{doctorIndex}}" range="{{doctorArray}}" style="width:100%;">
                         <view class="picker-box">
                             <view class="cell">
                                 <view class="tit">预约专家</view>
-                                <view class="con"><text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></view> 
+                                <view class="con">
+                                    <block wx:if="{{doctorIndex === ''}}">
+                                        <text style="color:rgb(202,202,202)">请选择</text>
+                                    </block>
+                                    <block wx:else>
+                                        {{doctorArray[doctorIndex]}}
+                                    </block>
+                                    <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
+                                </view> 
                             </view>
                         </view>
                     </picker>
@@ -173,11 +189,19 @@
         </view>
 
         <view class="column">
-            <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}" style="width:100%;">
+            <picker bindchange="bindDepartChange" value="{{departIndex}}" range="{{departArray}}" style="width:100%;">
                 <view class="picker-box">
                     <view class="cell">
                         <view class="tit">参观景点</view>
-                        <view class="con"><text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></view> 
+                        <view class="con"> 
+                            <block wx:if="{{departIndex === ''}}">
+                                <text style="color:rgb(202,202,202)">请选择</text>
+                            </block>
+                            <block wx:else>
+                                {{departArray[departIndex]}}
+                            </block>
+                            <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
+                        </view>
                     </view>
                 </view>
             </picker>
@@ -222,11 +246,19 @@
             </view>
         </view>
         <view class="column">
-            <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}" style="width:100%;">
+            <picker bindchange="bindDepartChange" value="{{departIndex}}" range="{{departArray}}" style="width:100%;">
                 <view class="picker-box">
                     <view class="cell">
                         <view class="tit">体育场馆</view>
-                        <view class="con"><text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></view> 
+                        <view class="con"> 
+                            <block wx:if="{{departIndex === ''}}">
+                                <text style="color:rgb(202,202,202)">请选择</text>
+                            </block>
+                            <block wx:else>
+                                {{departArray[departIndex]}}
+                            </block>
+                            <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
+                        </view>
                     </view>
                 </view>
             </picker>
@@ -393,11 +425,19 @@
         </view>
 
         <view class="column">
-            <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}" style="width:100%;">
+            <picker bindchange="bindDepartChange" value="{{departIndex}}" range="{{departArray}}" style="width:100%;">
                 <view class="picker-box">
                     <view class="cell">
                         <view class="tit">预约场馆</view>
-                        <view class="con"><text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></view> 
+                        <view class="con"> 
+                            <block wx:if="{{departIndex === ''}}">
+                                <text style="color:rgb(202,202,202)">请选择</text>
+                            </block>
+                            <block wx:else>
+                                {{departArray[departIndex]}}
+                            </block>
+                            <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
+                        </view>
                     </view>
                 </view>
             </picker>
@@ -612,39 +652,29 @@
                 <view class="con"><input placeholder="请填写您的车牌号码" style="text-align:right" placeholder-style='text-align:right;color:rgb(202,202,202)'/></view> 
             </view>
         </view>
-        <view class="column">
-            <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}" style="width:100%;">
-                <view class="picker-box">
-                    <view class="cell">
-                        <view class="tit">停车时间</view>
-                        <view class="con">
-                            <block wx:if="{{index === ''}}">
-                                <text style="color:rgb(202,202,202)">请选择</text>
-                            </block>
-                            <block wx:else>
-                                {{array[index]}}
-                            </block>
-                            <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
-                        </view> 
-                    </view>
-                </view>
-            </picker>
+        <view class="column" bindtap="calendar">
+            <view class="cell">
+                <view class="tit">停车时间</view>
+                <view class="con">
+                    <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
+                </view> 
+            </view>
         </view>
 
         <view class="column">
-            <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}" style="width:100%;">
+            <picker bindchange="bindDepartChange" value="{{departIndex}}" range="{{departArray}}" style="width:100%;">
                 <view class="picker-box">
                     <view class="cell">
                         <view class="tit">停车地点</view>
-                        <view class="con">
-                            <block wx:if="{{index === ''}}">
+                        <view class="con"> 
+                            <block wx:if="{{departIndex === ''}}">
                                 <text style="color:rgb(202,202,202)">请选择</text>
                             </block>
                             <block wx:else>
-                                {{array[index]}}
+                                {{departArray[departIndex]}}
                             </block>
                             <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
-                        </view> 
+                        </view>
                     </view>
                 </view>
             </picker>
@@ -723,3 +753,11 @@
 <view class="btnView">
   <e-ibutton title="提交" bind:onTap="submit"/>
 </view>
+
+<van-calendar
+  show="{{ calendar }}"
+  bind:close="onClose"
+  bind:confirm="onConfirm"
+  max-date="2021-8-23"
+  holiday="{{ holiday }}"
+/>
\ No newline at end of file
diff --git a/pages/service/vipCard/vipCard.js b/pages/service/vipCard/vipCard.js
new file mode 100644
index 0000000..bd353e8
--- /dev/null
+++ b/pages/service/vipCard/vipCard.js
@@ -0,0 +1,72 @@
+// pages/service/vipCard/vipCard.js
+import { ServiceModel } from '../../../models/service.js'
+let serviceModel = new ServiceModel()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        detail:{}
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        serviceModel.vipCard(res=>{
+            this.setData({
+                detail:res.result
+            })
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})
\ No newline at end of file
diff --git a/pages/service/vipCard/vipCard.json b/pages/service/vipCard/vipCard.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/service/vipCard/vipCard.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/service/vipCard/vipCard.wxml b/pages/service/vipCard/vipCard.wxml
new file mode 100644
index 0000000..69fc32a
--- /dev/null
+++ b/pages/service/vipCard/vipCard.wxml
@@ -0,0 +1,14 @@
+<!--pages/service/vipCard/vipCard.wxml-->
+<view class="card" style="background:url(../../../../../images/card.png) center no-repeat;background-size:100% 100%;">
+    <view class="title">{{detail.cardName}}</view>
+    <view class="name">{{detail.name}}</view>
+    <view class="type">{{detail.talentsType}}</view>
+    <view class="number">NO: {{detail.idCard}}</view>
+</view>
+
+<view class="explain-tit">权益说明</view>
+
+<view class="explain">
+为市北区高层次人才发放电子服务绿卡，围绕人才成长发展“全生命周期”，整合人才公共服务和社会化服务两大体系，提供人才落户、子女入学、政务服务、医疗保障、交通出行、家政服务、法律服务等20项服务。
+<!-- {{detail.cardExplain}} -->
+</view>
diff --git a/pages/service/vipCard/vipCard.wxss b/pages/service/vipCard/vipCard.wxss
new file mode 100644
index 0000000..ce50da3
--- /dev/null
+++ b/pages/service/vipCard/vipCard.wxss
@@ -0,0 +1,56 @@
+/* pages/service/vipCard/vipCard.wxss */
+
+page{
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.card{
+    /* width:650rpx; */
+    width:85%;
+    height:350rpx;
+    border-radius: 4px;
+    margin-top: 20px;
+}
+
+.title{
+    color:white;
+    margin: 30rpx 0 50rpx 40rpx;
+    font-size: 40rpx;
+    font-weight: bold;
+}
+
+.name{
+    color: white;
+    margin: 0 0 2rpx 40rpx;
+    font-size: 50rpx;
+    font-weight: bold;
+}
+
+.type{
+    color: white;
+    margin: 0 0 2rpx 40rpx;
+    font-size: 36rpx;
+    font-weight: bold;
+}
+
+.number{
+    color: white;
+    margin: 0 0 0 40rpx;
+    font-size: 24rpx;
+}
+
+.explain-tit{
+    width: 85%;
+    margin: 20px 0;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.explain{
+    width: 85%;
+    font-size: 12px;
+}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 437e489..bd8969c 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,172 +1,178 @@
 {
-	"description": "项目配置文件",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"enhance": false,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"nodeModules": true,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.8.1",
-	"appid": "wx8f4ebf5537cf4962",
-	"projectname": "fqsb_wx",
-	"debugOptions": {
-		"hidedInDevtools": []
-	},
-	"isGameTourist": false,
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"gamePlugin": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": 7,
-			"list": [
-				{
-					"id": -1,
-					"name": "Boillboard",
-					"pathName": "pages/billboards/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "Park",
-					"pathName": "pages/billboards/park/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "Policy",
-					"pathName": "pages/billboards/policy/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "Artice",
-					"pathName": "pages/article/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "policy-list",
-					"pathName": "pages/billboards/policy/policy-list/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "Register",
-					"pathName": "pages/register/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "User",
-					"pathName": "pages/user/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "Topics",
-					"pathName": "pages/topics/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/weChatAuth/index",
-					"pathName": "pages/weChatAuth/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/topics/message/index",
-					"pathName": "pages/topics/message/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/user/myWhistle/evaluate/index",
-					"pathName": "pages/user/myWhistle/evaluate/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/user/myInfo/index",
-					"pathName": "pages/user/myInfo/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/user/myInfo/register/index",
-					"pathName": "pages/user/myInfo/register/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/resource/index",
-					"pathName": "pages/resource/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 14,
-					"name": "pages/resource/detail/index",
-					"pathName": "pages/resource/detail/index",
-					"query": "",
-					"scene": null
-				}
-			]
-		}
-	}
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": []
+    },
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": false,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": true,
+        "coverView": true,
+        "nodeModules": true,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": false,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "enableEngineNative": false,
+        "useIsolateContext": true,
+        "useCompilerModule": true,
+        "userConfirmedUseCompilerModuleSwitch": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true
+    },
+    "compileType": "miniprogram",
+    "libVersion": "2.8.1",
+    "appid": "wx8f4ebf5537cf4962",
+    "projectname": "fqsb_wx",
+    "debugOptions": {
+        "hidedInDevtools": []
+    },
+    "isGameTourist": false,
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "game": {
+            "currentL": -1,
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": [
+                {
+                    "id": -1,
+                    "name": "Boillboard",
+                    "pathName": "pages/billboards/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "Park",
+                    "pathName": "pages/billboards/park/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "Policy",
+                    "pathName": "pages/billboards/policy/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "Artice",
+                    "pathName": "pages/article/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "policy-list",
+                    "pathName": "pages/billboards/policy/policy-list/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "Register",
+                    "pathName": "pages/register/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "User",
+                    "pathName": "pages/user/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "Topics",
+                    "pathName": "pages/topics/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/weChatAuth/index",
+                    "pathName": "pages/weChatAuth/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/topics/message/index",
+                    "pathName": "pages/topics/message/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/user/myWhistle/evaluate/index",
+                    "pathName": "pages/user/myWhistle/evaluate/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/user/myInfo/index",
+                    "pathName": "pages/user/myInfo/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/user/myInfo/register/index",
+                    "pathName": "pages/user/myInfo/register/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/resource/index",
+                    "pathName": "pages/resource/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": 14,
+                    "name": "pages/resource/detail/index",
+                    "pathName": "pages/resource/detail/index",
+                    "query": "",
+                    "scene": null
+                }
+            ]
+        }
+    }
 }
\ No newline at end of file