Merge branch 'dev_wy' into dev_无非居民

@@ -146,8 +146,8 @@ App({
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
-    // baseUrl: "http://47.110.250.177:20000/",
-    baseUrl: "http://47.110.158.110:20000/",
+    baseUrl: "http://47.110.250.177:20000/",
+    // baseUrl: "http://47.110.158.110:20000/",
     // baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,

@@ -37,7 +37,7 @@ Page({
         name: curdata.co_supporter,
         id_card_no: curdata.id_card_no,
         birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "",
-        birthday_datelong: Date.parse(new Date(curdata.birthday)) / 1000
+        birthday_datelong: curdata.birthday
       })
     }
 

@@ -32,10 +32,10 @@
         <text class='text_left'>分配比例</text>
         <text class='text_right_333'>{{datas.percent}}%</text>
       </view>
-      <view style='height:90rpx;width:100%;clear:both;'>
+      <!-- <view style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>子女学籍号</text>
         <text class='text_right_333'>{{datas.student_no}}</text>
-      </view>
+      </view> -->
       <view style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>子女受教育阶段</text>
         <text class='text_right_333'>{{datas.education_period}}</text>

@@ -20,7 +20,7 @@
       <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text>
     </view> -->
     <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
-      <template is="picker_cell_normal" data="{{...issinglechildData}}" />
+      <template wx:if="{{employee_status!='inactive'}}" is="picker_cell_normal" data="{{...issinglechildData}}" />
       <view wx:if="{{issinglechildData.selected=='否'}}">
         <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view>
         <template is="picker_cell_normal" data="{{...shareMethodData}}" />
@@ -376,7 +376,7 @@
         </view>
       </view>
     </view>
-    <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)}}">
+    <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)||(!additionInfo[0].support_duties||additionInfo[0].support_duties.length<1)}}">
       <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
     </view>
   </view>