Merge branch 'master' of http://git.xiaodongai.com/WechatMiniProgram/XAMJW-Hospita

pages/info1/info1.js

@@ -58,6 +58,7 @@ Page({
     mage: '', // 母亲年龄
     mage: '', // 母亲年龄
     moccupation: '', //母亲职业
     moccupation: '', //母亲职业
     mdegree: '', //母亲文化程度
     mdegree: '', //母亲文化程度
+    idCard:''
   },
   },
   onLoad: function(options) {
   onLoad: function(options) {
     var that = this;
     var that = this;
@@ -176,6 +177,7 @@ Page({
           that.setData({
           that.setData({
             username: res.info.name,
             username: res.info.name,
             index: res.info.cultural,
             index: res.info.cultural,
+            idCard:res.info.idCard,
             date: res.info.birthday,
             date: res.info.birthday,
             sex: res.info.xingbie,
             sex: res.info.xingbie,
             home: res.info.house, // 家庭类型
             home: res.info.house, // 家庭类型
@@ -195,6 +197,7 @@ Page({
             sex: res.info.xingbie ? res.info.xingbie : res.info.sex,
             sex: res.info.xingbie ? res.info.xingbie : res.info.sex,
             select: res.info.hunfou,
             select: res.info.hunfou,
             username1: res.info.ask_department,
             username1: res.info.ask_department,
+            idCard:res.info.idCard,
           });
           });
         }
         }
       }
       }
@@ -205,6 +208,11 @@ Page({
       username: e.detail.value,
       username: e.detail.value,
     })
     })
   },
   },
+  inputIdCard(e){
+    this.setData({
+      idCard: e.detail.value,
+    })
+  },
   people: function(e) {
   people: function(e) {
     this.setData({
     this.setData({
       multiIndex: e.detail.value
       multiIndex: e.detail.value
@@ -251,6 +259,7 @@ Page({
       data.name = this.data.username;
       data.name = this.data.username;
       data.sex = this.data.sex;
       data.sex = this.data.sex;
       data.birthday = this.data.date;
       data.birthday = this.data.date;
+      data.idCard=this.data.idCard,
       // 新添加学历功能
       // 新添加学历功能
       data.edu = this.data.index;
       data.edu = this.data.index;
       if (that.data.hosiptiaFlag) { // 非池州市人民医院
       if (that.data.hosiptiaFlag) { // 非池州市人民医院

pages/info1/info1.wxml

@@ -42,7 +42,7 @@
         <view class="section">
         <view class="section">
           <view class="section__title"></view>
           <view class="section__title"></view>
           <picker bindchange="bindPickerChange1" value="{{select}}" range="{{array1}}">
           <picker bindchange="bindPickerChange1" value="{{select}}" range="{{array1}}">
-          <view class="picker" mode = "selector">
+            <view class="picker" mode="selector">
               {{array1[select]}}
               {{array1[select]}}
             </view>
             </view>
           </picker>
           </picker>
@@ -51,6 +51,11 @@
       <view class="partyone">编号
       <view class="partyone">编号
         <input type='text' placeholder='请输入编号' bindinput="inputChange2" value='{{usernumber}}'></input>
         <input type='text' placeholder='请输入编号' bindinput="inputChange2" value='{{usernumber}}'></input>
       </view>
       </view>
+      <view class="partyone">
+        身份证号
+        <input type='text' placeholder='请输入身份证号' bindinput="inputIdCard" maxlength="18" value='{{idCard}}'>
+        </input>
+      </view>
       <view class="partyone">单位名称
       <view class="partyone">单位名称
         <input type='text' placeholder='请输入您的单位名称' bindinput="inputChange1" value='{{username1}}'></input>
         <input type='text' placeholder='请输入您的单位名称' bindinput="inputChange1" value='{{username1}}'></input>
       </view>
       </view>