Merge branch 'dev_wy' into dev2.0

@@ -140,7 +140,7 @@
   <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>
+    <text class='text_777_30 float_left'>被赡养人国籍</text>
     <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text>
   </view>
   <view class='divide_line_30'></view>

@@ -126,7 +126,7 @@
       <text class='text_right_333'>{{datas.birthday}}</text>
     </view>
     <view style='height:90rpx;width:100%;clear:both;'>
-      <text class='text_left'>被赡养人国籍(地区)</text>
+      <text class='text_left'>被赡养人国籍</text>
       <text class='text_right_333'>中国</text>
     </view>
     <view style='height:90rpx;width:100%;clear:both;'>

@@ -19,8 +19,9 @@
         </view>
       </view>
     </view>
+  <view id="flag"></view>
+
   </scroll-view>
-  <!-- <view id="flag"></view> -->
   <view class='bottom_wrap' id='bottom'>
     <input class='input_wrap' placeholder-class='input_placeholder_wrap' bindinput="bindKeyInput" placeholder='请输入您要咨询的问题' value='{{inputValue}}'></input>
     <view class='btn_send_wrap' bindtap='sendMsg'>发送</view>