Merge branch 'hou' of http://git.cc-lotus.info/ssfg/OnlineTraining0622 into hou

pages/Identity/Identity.js

@@ -261,5 +261,13 @@ Page({
 
     // 创建实例对象
     this.WxValidate = new WxValidate(rules, messages)
+  },
+  formItemInput(e) {
+    let fieldVal = e.detail.value.replace(/\s+/g, '');
+    let fieldName = e.currentTarget.dataset.field;
+    fieldVal = fieldName === 'card'? fieldVal.toUpperCase() : fieldVal;
+    this.setData({
+      [fieldName]: fieldVal
+    });
   }
 })

pages/Identity/Identity.wxml

@@ -2,7 +2,7 @@
 	<form bindsubmit="formSubmit">
 		<view class="form_item">
 			<image src='/images/shenfen1.png' mode="aspectFit" class="icon1"></image>
-			<input style='display:inline-block;height:60%;' placeholder-style='font-size:30rpx;' placeholder='请输入姓名' name='userName' value="{{userName}}"></input>
+			<input style='display:inline-block;height:60%;' placeholder-style='font-size:30rpx;' placeholder='请输入姓名' name='userName' value="{{userName}}" bindinput="formItemInput" data-field="userName"></input>
 		</view>
 		<!-- <view class="form_item">
 			<image src='/images/shenfen2.png' mode="aspectFit" class="icon1"></image>
@@ -10,7 +10,7 @@
 		</view> -->
 		<view class="form_item">
 			<image src='/images/shenfen4.png' mode="aspectFit" class="icon1"></image>
-			<input style='width:80%;display:inline-block;height:60%;' placeholder-style='font-size:30rpx;' placeholder='请输入身份证号' name="card" value="{{card}}"></input>
+			<input style='width:80%;display:inline-block;height:60%;' placeholder-style='font-size:30rpx;' placeholder='请输入身份证号' name="card" value="{{card}}" bindinput="formItemInput" data-field="card"></input>
 		</view>
 		<view class="pyp_box1">
 			<view class="add_text" wx:if="{{carWin_img==''}}">上传本人照片</view>

pages/studentRegistration/studentRegistration.js

@@ -229,7 +229,7 @@ Page({
   },
   formSubmit(e) {
     e.detail.value.culture = this.data.kaihuList[this.data.kaihuindex].name;
-    e.detail.value.studentDuty = this.data.jobArr[this.data.zwIndex].dictValue
+    e.detail.value.studentDuty = isNaN(this.data.zwIndex) ? '' : this.data.jobArr[this.data.zwIndex].dictValue
     e.detail.value.tenure = this.data.tenure;
     e.detail.value.sessionKey = this.data.sessionKey;
     let aa = e.detail.value