优化

@@ -40,6 +40,7 @@ Page({
   edit_id:null,
   data: {
     hasLover:false,
+    hasGetLover:false,
     house_type: "",
     deduction_amount: '',
     lable: 0,
@@ -640,7 +641,7 @@ Page({
           var hasLoverData = that.data.hasLoverData
           hasLoverData.selected = '是'
           hasLoverData.disabled = true
-          var data = res.data.items[0], setData = { hasLover: true, hasLoverData: hasLoverData}
+          var data = res.data.items[0], setData = { hasGetLover:true, hasLover: true, hasLoverData: hasLoverData}
           if (data.name && data.name.length) {
             setData.spouse_name = data.name
           }
@@ -689,11 +690,11 @@ Page({
         childrenpercentData.selected = data.percent + '%'
         setData.childrenpercentData = childrenpercentData
         var studystartdate = this.data.studystartdate
-        studystartdate.selected = format.formatTime_date(data.education_start)
+        studystartdate.selected = format.formatTime_month(data.education_start)
         studystartdate.datelong = data.education_start
         setData.studystartdate = studystartdate
         var studyenddate = this.data.studyenddate
-        studyenddate.selected = format.formatTime_date(data.education_end)
+        studyenddate.selected = format.formatTime_month(data.education_end)
         studyenddate.datelong = data.education_end
         setData.studyenddate = studyenddate
         setData.deduction_amount = data.deduction_amount
@@ -725,6 +726,7 @@ Page({
         hasLoverData.selected = data.has_spouse == 'y' ? '是' : '否'
         hasLoverData.disabled = data.has_spouse == 'y' ? true : false
         setData.hasLover = data.has_spouse == 'y' ? true : false
+        setData.hasGetLover = data.has_spouse == 'y' ? true : false
         setData.hasLoverData = hasLoverData
         if (data.spouse_name && data.spouse_name.length) {
           setData.spouse_name = data.spouse_name
@@ -750,11 +752,11 @@ Page({
               setData.edulevelData = edulevelData
             }
             var studystartdate = this.data.studystartdate
-            studystartdate.selected = format.formatTime_date(data.education_start)
+            studystartdate.selected = format.formatTime_month(data.education_start)
             studystartdate.datelong = data.education_start
             setData.studystartdate = studystartdate
             var studyenddate = this.data.studyenddate
-            studyenddate.selected = format.formatTime_date(data.education_end)
+            studyenddate.selected = format.formatTime_month(data.education_end)
             studyenddate.datelong = data.education_end
             setData.studyenddate = studyenddate
 
@@ -837,6 +839,7 @@ Page({
         var hasLoverData = this.data.hasLoverData
         hasLoverData.selected = data.has_spouse == 'y'?'是':'否'
         setData.hasLover = data.has_spouse=='y'?true:false
+        setData.hasGetLover = data.has_spouse == 'y' ? true : false
         setData.hasLoverData = hasLoverData
         if (data.spouse_name && data.spouse_name.length) {
           setData.spouse_name = data.spouse_name

@@ -340,7 +340,7 @@
     <view class='divide_line_30'></view>
     <view style='height:90rpx'>
       <text class='text_777_30 float_left head_in'>配偶姓名</text>
-      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}' disabled='{{hasLover}}'></input>
+      <input class='input_wrap' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}' disabled='{{hasGetLover}}'></input>
     </view>
     <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
@@ -348,8 +348,8 @@
     <view style='height:90rpx'>
       <text class='text_777_30 float_left head_in'>配偶证照号码</text>
       <view wx:if="{{isIdCard}}">
-        <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden='{{hasLover}}' id="spouse_id_card_no"></image>
-        <input class='input_wrap' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input' disabled='{{hasLover}}'></input>
+        <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden='{{hasGetLover}}' id="spouse_id_card_no"></image>
+        <input class='input_wrap' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input' disabled='{{hasGetLover}}'></input>
       </view>
     </view>
     <view class='divide_line_30'></view>

@@ -16,6 +16,11 @@ function formatTime_date(date) {
   var day = dayFormString(date)
   return [year, month, day].map(formatNumber).join('-') 
 }
+function formatTime_month(date) {
+  var year = yearFormString(date)
+  var month = monthFormString(date)
+  return [year, month].map(formatNumber).join('-')
+}
 
 function formatDate_min(date) {
   var year = yearFormString(date)
@@ -235,6 +240,7 @@ function checkEmail(email){
 module.exports = {
   formatTime: formatTime,
   formatTime_date: formatTime_date,  
+  formatTime_month: formatTime_month,
   formatDate_min: formatDate_min,
   formatDateString: formatDateString,
   yearFormString: yearFormString,