Merge branch 'dev2.0' into dev_py

@@ -9,13 +9,13 @@
       <!-- <input placeholder-class='input_placeholder_wrap'  class='input_wrap' placeholder='请输入姓名' name='name' value='{{name}}'  maxlength='18'></input> -->
       <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入姓名' name='name' value='{{name}}'></input>
     </view>
-    <view class="divide_line"></view>
+    <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <view style='height:90rpx;padding:0 30rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证照类型</text>
       <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>居民身份证</text>
     </view>
-    <view class='divide_line'></view>
+    <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <view style='height:90rpx;padding:0 30rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人证照号码</text>
@@ -24,7 +24,7 @@
         <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}' bindinput="bindinput"></input>
       </view>
     </view>
-    <view class="divide_line"></view>
+    <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <picker mode="date" value="{{date}}" start="1919-01-01" end="2017-09-01" bindchange="bindDateChange">
       <view style='height:90rpx;padding:0 30rpx'>
         <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
@@ -34,19 +34,19 @@
       </view>
     </picker>
     <!-- <template is="picker_cell_normal" data="{{...commonbirthDate}}" /> -->
-    <view class="divide_line"></view>
+    <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <view style='height:90rpx;padding:0 30rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人国籍</text>
       <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>中国</text>
     </view>
-    <view class="divide_line"></view>
+    <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <view style='height:90rpx;padding:0 30rpx'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
       <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>与纳税人关系</text>
       <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>兄、弟、姐、妹</text>
     </view>
-    <view class="divide_line"></view>
+    <view style="margin:0 30rpx;background:#e5e5e5;height:2rpx;"></view>
     <view class="btn_bottom">
       <button class="btn_bottom" formType="submit"> 保存</button>
     </view>

@@ -159,7 +159,7 @@
                 </view>
                 <view style='display:flex;flex-direction:row'>
                   <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
-                  <view class='float_right' style='font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:70rpx;max-width:500rpx'>{{item.certification_authority}}</view>
+                  <view class='float_right' style='padding-top:14rpx; font-family: PingFangSC-Regular;font-size: 28rpx;color: #333;line-height:40rpx;max-width:500rpx'>{{item.certification_authority}}</view>
                 </view>
                 <view wx:if="{{item.status=='failed'||item.status=='to_declare'}}">
                   <text class='text_blue_28 float_right' style='line-height:90rpx;margin-right:40rpx' id="{{'profession'+index}}" bindtap='goedit'>编辑</text>