Merge branch 'dev2.0' into dev_wy

@@ -186,13 +186,13 @@
   <view style='height:90rpx'>
     <text class='red_star_right_10'>*</text>
     <text class='text_777_30 float_left'>医疗支出总金额</text>
-    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:200rpx;color:#000;' placeholder='请输入总金额' type='digit' name='total_amount' value='{{total_amount}}'></input>
+    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:200rpx;color:#000;' placeholder='请输入总金额'  name='total_amount' value='{{total_amount}}'></input>
   </view>
   <view class='divide_line_30'></view>
   <view style='height:90rpx'>
     <text class='red_star_right_10'>*</text>
     <text class='text_777_30 float_left'>个人负担金额</text>
-    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入金额' type='digit' name='amount_by_person' value='{{total_amount}}'></input>
+    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入金额' name='amount_by_person' value='{{total_amount}}'></input>
   </view>
 </view>
 <!-- 住房 -->

@@ -122,6 +122,7 @@ Page({
       relativeData: this.data.relativeData,
       name: tax_info.name,
       // cardtypeData: this.data.cardtypeData,
+      mobile: tax_info.mobile,
       genderData: this.data.genderData,
       isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       card_number: tax_info.id_card_no