Merge branch 'dev_py' into dev2.0

pangy
app.wxss
pages/common/picker_cell.wxml
pages/main/addtionalreduce/addextrainfo/addextrainfo.js
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
pages/main/addtionalreduce/addextrainfo/addextrainfo.wxss
pages/main/taxperson/addinfo/addinfo.js
pages/main/taxperson/addinfo/addinfo.wxml
pages/main/taxperson/addinfo/addinfo.wxss
pages/main/taxperson/editinfo/editinfo.wxml
pages/main/taxperson/editinfo/editinfo.wxss
--- a/app.wxss
查看文件 @f47a552
+++ b/app.wxss
查看文件 @f47a552
@@ -19,6 +19,12 @@
   height: 2rpx;
 }
+.divide_line_30{
+  background: #f5f5f5;
+  /* width: 100%; */
+  height: 2rpx;
+  margin-left: 30rpx;
+}
 .divide_line_f5f5f5{
   background: #f5f5f5;
   width: 100%;
@@ -162,3 +168,6 @@
   box-shadow: 0 4px 14px 0 rgba(208, 208, 208, 0.50);
   border-radius: 8px;
 }
+.head_in{
+  margin-left: 26rpx;
+}
--- a/pages/common/picker_cell.wxml
查看文件 @f47a552
+++ b/pages/common/picker_cell.wxml
查看文件 @f47a552
 <template name="picker_cell_normal">
   <view class='item_body' hidden='{{hidden}}'>
-    <text hidden='{{!isrequre}}' style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <view wx:if='{{isrequre||isblack}}'>
-      <text class='text_black_30 float_left' style='line-height: 90rpx;'>{{label}}</text>
+    <text hidden='{{!isrequre}}' style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;  margin-right: 10rpx'>*</text>
+    <view wx:if='{{isrequre}}'>
+      <text class='text_777_30 float_left' style='line-height: 90rpx;'>{{label}}</text>
+    </view>
+    <view wx:elif='{{isblack}}'>
+      <text class='text_black_30 float_left head_in' style='line-height: 90rpx;'>{{label}}</text>
     </view>
     <view wx:else>
-      <text class='text_666_30 float_left' style='line-height: 90rpx;'>{{label}}</text>
+      <text class='text_777_30 float_left head_in' style='line-height: 90rpx;'>{{label}}</text>
     </view>
     <image wx:if='{{!disabled}}' class='arrow_wrap' src='/images/arrow_right.png'></image>
     <view class="weui-cell__bd">
       <picker mode="{{mode?mode:'selector'}}" range-key="{{range_key}}" range="{{values}}" fields="{{fields}}" start="{{start}}" end="{{end}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'>
-        <!-- <view wx:if="{{selected&&disabled}}" class="text_999_30 float_right">{{selected}}</view>
-        <view wx:elif="{{selected}}" class="text_333_30 float_right ">{{selected}}</view>
-        <view wx:else class="text_999_30 float_right ">{{placeholder}}</view> -->
-
-        <text wx:if="{{selected&&disabled}}" class="text_777_30 float_right" style='line-height: 90rpx;'>{{selected}}</text>
-        <text wx:elif="{{selected}}" class="text_333_30 float_right " style='line-height: 90rpx;'>{{selected}}</text>
+        <text wx:if="{{selected&&disabled}}" class="text_black_30 float_right" style='line-height: 90rpx;'>{{selected}}</text>
+        <text wx:elif="{{selected}}" class="text_black_30 float_right " style='line-height: 90rpx;'>{{selected}}</text>
         <text wx:else class="text_999_30 float_right " style='line-height: 90rpx;'>{{placeholder}}</text>
       </picker>
     </view>
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @f47a552
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.js
查看文件 @f47a552
@@ -64,7 +64,6 @@ Page({
       bindtype: 'lovercardtype',
       selected: '居民身份证',
       disabled: true,
-      isblack: 'true',
       placeholder: '请选择证照类型',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往内地通行证', '外交官证', '中国护照',
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '台湾居民来往大陆通行证', '外国人永久居留证'
@@ -75,7 +74,6 @@ Page({
       label: '出生日期',
       bindtype: 'loverbirthday',
       selected: '',
-      isblack: 'true',
       placeholder: '请选择出生日期',
       mode: "date",
       fields: "day",
@@ -272,7 +270,6 @@ Page({
       isrequre: false,
       bindtype: 'reduce_type',
       selected: '',
-      isblack: 'true',
       values: ["月度", "年度"],
       placeholder: '请选择扣除方式',
       onChange: 'onPickerSelect'
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @f47a552
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxml
查看文件 @f47a552
@@ -7,30 +7,31 @@
     <view wx:if="{{cur_index=='children_education'}}">
       <view style='padding:0 30rpx;'>
         <template is="picker_cell_normal" data="{{...childrencardtypeData}}" />
-        <view class='divide_line_f5f5f5'></view>
+        <view class='divide_line_30'></view>
         <view style='height:90rpx'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>子女证照号码</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>子女证照号码</text>
           <view wx:if="{{isIdCard}}">
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
-            <input class='input_wrap01 float_right' placeholder='请输入证照号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}' bindinput="idChange" id='children_id_card_no_input'></input>
+            <input class='input_wrap01 float_right' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}' bindinput="idChange" id='children_id_card_no_input'></input>
           </view>
           <!-- <view wx:else>
               <input class='input_wrap float_right' placeholder='请输入证照号码' placeholder-class='text_999_30' name='children_id_card_no' maxlength='18' type='idcard' value='{{children_id_card_no}}'></input>
             </view> -->
         </view>
-        <view class='divide_line_f5f5f5'></view>
+        <view class='divide_line_30'></view>
         <view style='height:90rpx'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left'>子女姓名</text>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女姓名' name='children_name' value='{{children_name}}'></input>
+          <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='请输入子女姓名' name='children_name' value='{{children_name}}'></input>
         </view>
+        <view class='divide_line_30'></view>
         <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
-        <view class='divide_line_f5f5f5'></view>
+        <view class='divide_line_30'></view>
         <view style='height:90rpx'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left'>国籍</text>
-          <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left'>国籍</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
         </view>
       </view>
@@ -38,78 +39,77 @@
       <view style='padding:0 30rpx;'>
         <!-- <view style='height:90rpx;'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left'>分配比例</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left'>分配比例</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
           <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分配比例' type='number' name='percent' value='{{percent}}'></input>
         </view> -->
       <template is="picker_cell_normal" data="{{...childrenpercentData}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>子女学籍号</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入子女学籍号' name='children_student_no' value='{{children_student_no}}'></input>
+        <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='请输入子女学籍号' name='children_student_no' value='{{children_student_no}}'></input>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...childedudegreeData}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...studystartdate}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...studyenddate}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...schoolCountryData}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>就读学校名称</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入就读学校' name='school_name' value='{{school_name}}'></input>
+        <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='请输入就读学校' name='school_name' value='{{school_name}}'></input>
       </view>
-      <view class='divide_line_f5f5f5'></view>
     </view>
 </view>
 <!-- 继续教育 -->
 <view wx:if="{{cur_index=='continuing_education'}}" style='padding:0 30rpx;'>
   <template is="picker_cell_normal" data="{{...edutypeData}}" />
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view wx:if="{{edu_lable=='school'}}">
     <!-- <view style='height:90rpx'>
-            <text class='text_black_30 float_left'>学历教育阶段</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' placeholder='请输入学历教育阶段' name='education_period'></input>
           </view> -->
     <template is="picker_cell_normal" data="{{...edulevelData}}" />
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...studystartdate}}" />
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...studyenddate}}" />
   </view>
   <view wx:elif="{{edu_lable=='tech'}}">
     <template is="picker_cell_normal" data="{{...edustyleData}}" />
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...applydate}}" />
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <view style='height:90rpx'>
-      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-      <text class='text_black_30 float_left'>证书名称</text>
-      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书名称' name='certification_name'></input>
+      <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='请输入证书名称' name='certification_name'></input>
     </view>
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <view style='height:90rpx'>
-      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-      <text class='text_black_30 float_left'>证书编号</text>
-      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书编号' name='certification_no'></input>
+      <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='请输入证书编号' name='certification_no'></input>
     </view>
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <view style='height:90rpx'>
-      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-      <text class='text_black_30 float_left'>发证机关</text>
-      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入发证机关' name='certification_authority'></input>
+      <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='请输入发证机关' name='certification_authority'></input>
     </view>
   </view>
@@ -118,39 +118,37 @@
 <view wx:if="{{cur_index=='support_duty'}}" style='padding:0 30rpx;'>
   <!-- <template is="picker_cell_normal" data="{{...supporttypeData}}" />
   <template is="picker_cell_normal" data="{{...shareMethodData}}" /> -->
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view style='height:90rpx'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>被赡养人姓名</text>
-    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入被赡养人姓名' name='supported_name' value='{{supported_name}}'></input>
+    <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='请输入被赡养人姓名' name='supported_name' value='{{supported_name}}'></input>
   </view>
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...oldercardtypeData}}" />
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view style='height:90rpx'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>被赡养人证照号码</text>
+    <text class='red_star_right_10'>*</text>
+    <text class='text_777_30 float_left'>被赡养人证照号码</text>
     <view wx:if="{{isIdCard}}">
       <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="older_id_card_no"></image>
-      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证照号码' maxlength='18' type='idcard' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" id="older_id_card_no_input"></input>
+      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:350rpx;color:#000;' placeholder='请输入或拍摄身份证' maxlength='18' type='idcard' name='id_card_no' value='{{id_card_no}}' bindinput="idChange" id="older_id_card_no_input"></input>
     </view>
   </view>
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...olderbirthDate}}" />
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view style='height:90rpx'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>被赡养人国籍(地区)</text>
-    <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='country'>中国</text>
+    <text class='red_star_right_10'>*</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_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...older_relativeData}}" />
-
-  <view class='divide_line_f5f5f5'></view>
   <!-- <view style='height:90rpx;'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>分摊比例</text>
+    <text class='red_star_right_10'>*</text>
+    <text class='text_777_30 float_left'>分摊比例</text>
     <text class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right'>%</text>
     <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入分摊比例' type='number' name='percentage' value='{{percentage}}'></input>
   </view> -->
@@ -158,43 +156,43 @@
 <!-- 大病医疗 -->
 <view wx:if="{{cur_index=='medical_fund'}}" style='padding:0 30rpx;'>
   <view style='height:90rpx'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>病人姓名</text>
-    <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>
+    <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='请输入姓名' name='name' value='{{name}}'></input>
   </view>
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...cardtypeData}}" />
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view style='height:90rpx'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>病人证照号码</text>
+    <text class='red_star_right_10'>*</text>
+    <text class='text_777_30 float_left'>病人证照号码</text>
     <view wx:if="{{isIdCard}}">
       <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="medical_id_card_no"></image>
-      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证照号码' name='id_card_no' type='idcard' value='{{id_card_no}}' bindinput="idChange" id="medical_id_card_no_input"></input>
+      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;color:#000;' placeholder='请输入或拍摄身份证' name='id_card_no' type='idcard' value='{{id_card_no}}' bindinput="idChange" id="medical_id_card_no_input"></input>
     </view>
   </view>
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...commonbirthDate}}" />
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view style='height:90rpx'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>病人国籍</text>
-    <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
+    <text class='red_star_right_10'>*</text>
+    <text class='text_777_30 float_left'>病人国籍</text>
+    <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right' name='children_country'>中国</text>
   </view>
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...taxperson_relativeData}}" />
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view style='height:90rpx'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>医疗支出总金额</text>
-    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入总金额' type='digit' name='total_amount' value='{{total_amount}}'></input>
+    <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>
   </view>
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view style='height:90rpx'>
-    <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-    <text class='text_black_30 float_left'>个人负担金额</text>
-    <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入金额' type='digit' name='amount_by_person' value='{{total_amount}}'></input>
+    <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>
   </view>
 </view>
 <!-- 住房 -->
@@ -203,18 +201,18 @@
   <view wx:if="{{house_type=='house_fund_loan'}}">
     <view style='padding:0 30rpx;'>
       <template is="picker_cell_normal" data="{{...houseLocateInfo}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...identifytypeData}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>证书号码</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入证书号码' name='certification_no'></input>
+        <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='请输入证书号码' name='certification_no'></input>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...beforemarryData}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...isselfData}}" />
     </view>
@@ -222,22 +220,22 @@
     <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
     <view style='padding:0 30rpx;'>
       <template is="picker_cell_normal" data="{{...loantypeData}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>贷款合同编号</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款合同编号' name='loan_contract_no'></input>
+        <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='请输入贷款合同编号' name='loan_contract_no'></input>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...bankInfo}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...firstpaybackDate}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <!-- <template is="picker_cell_normal" data="{{...loandatelongData}}" /> -->
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>贷款期限(月数)</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入贷款月数' name='loan_months' type='number'></input>
+        <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='请输入贷款月数' name='loan_months' type='number'></input>
       </view>
     </view>
@@ -246,48 +244,48 @@
     <view style='padding:0 30rpx;'>
       <template is="picker_cell_normal" data="{{...workingcityInfo}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...leasetypeData}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>出租方名称</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入出租方名称' name='owner_name'></input>
+        <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='请输入出租方名称' name='owner_name'></input>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>出租方纳税人识别号</text>
-        <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='统一社会信用代码' name='owner_credit_no'></input>
+        <text class='red_star_right_10'>*</text>
+        <text class='text_777_30 float_left'>出租方纳税人识别号</text>
+        <input class='input_wrap01 float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:350rpx;color:#000;' placeholder='统一社会信用代码' name='owner_credit_no'></input>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...cardtypeData}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>证照号码</text>
+        <text class='red_star_right_10'>*</text>
+        <text class='text_777_30 float_left'>证照号码</text>
         <view wx:if="{{isIdCard}}">
           <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="owner_id_card_no"></image>
-          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;' placeholder='请输入证照号码' maxlength='18' type='idcard'  name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" id='owner_id_card_no_input'></input>
+          <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;width:380rpx;color:#000;' placeholder='请输入或拍摄身份证' maxlength='18' type='idcard'  name='owner_id_card_no' value='{{owner_id_card_no}}' bindinput="idChange" id='owner_id_card_no_input'></input>
         </view>
       </view>
     </view>
     <view style='height:20rpx;width:100%;background:#F8F8F8;'></view>
     <view style='padding:0 30rpx;'>
       <template is="picker_cell_normal" data="{{...rentLocateInfo}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入详细地址，精确到楼牌号' name='house_detail_address'></input>
+        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: rightcolor:#000;' placeholder='请输入详细地址，精确到楼牌号' name='house_detail_address'></input>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <view style='height:90rpx'>
-        <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-        <text class='text_black_30 float_left'>租赁合同编号</text>
-        <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输合同编号' name='rent_contract_no'></input>
+        <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: rightcolor:#000;' placeholder='请输合同编号' name='rent_contract_no'></input>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...leasestartDate}}" />
-      <view class='divide_line_f5f5f5'></view>
+      <view class='divide_line_30'></view>
       <template is="picker_cell_normal" data="{{...leaseendDate}}" />
     </view>
@@ -295,16 +293,16 @@
 </view>
 <view style='padding:0 30rpx;' wx:if="{{cur_index!='medical_fund'}}">
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <template is="picker_cell_normal" data="{{...reducetypeData}}" />
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
   <view style='height:90rpx'>
-    <text class='text_black_30 float_left'>扣除金额</text>
-    <text wx:if="{{reducetypeData.selected=='月度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/月</text>
-    <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;'>¥{{deduction_amount}}/年</text>
+    <text class='text_777_30 float_left head_in'>扣除金额</text>
+    <text wx:if="{{reducetypeData.selected=='月度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;font-family: PingFangSC-Semibold;'>¥{{deduction_amount}}/月</text>
+    <text wx:if="{{reducetypeData.selected=='年度'}}" class='text_black_30 float_right' style='line-height: 90rpx;margin-left:20rpx;text-align: right;color:#FF9F00;font-family: PingFangSC-Semibold;'>¥{{deduction_amount}}/年</text>
     <!-- <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#FF9F00;' placeholder='请输入扣除金额' type='digit' name='reduce_money'></input> -->
   </view>
-  <view class='divide_line_f5f5f5'></view>
+  <view class='divide_line_30'></view>
 </view>
@@ -314,35 +312,35 @@
   <view wx:if="{{cur_index=='children_education' || cur_index=='house_fund'}}">
     <template is="picker_cell_normal" data="{{...hasLoverData}}" />
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
   </view>
   <view wx:if="{{hasLover}}">
     <view style='height:90rpx'>
-      <text class='text_black_30 float_left'>配偶姓名</text>
-      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
+      <text class='text_777_30 float_left head_in'>配偶姓名</text>
+      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right;color:#000;' placeholder='请输入配偶姓名' name='spouse_name' value='{{spouse_name}}'></input>
     </view>
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...lovercardtypeData}}" />
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <view style='height:90rpx'>
-      <text class='text_black_30 float_left'>配偶证照号码</text>
+      <text class='text_777_30 float_left head_in'>配偶证照号码</text>
       <view wx:if="{{isIdCard}}">
         <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="spouse_id_card_no"></image>
-        <input class='input_wrap01 float_right' placeholder='请输入证照号码' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input'></input>
+        <input class='input_wrap01 float_right' style='color:#000;' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='spouse_id_card_no' maxlength='18' type='idcard' value='{{spouse_id_card_no}}' bindinput="idChange" id='spouse_id_card_no_input'></input>
       </view>
     </view>
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <template is="picker_cell_normal" data="{{...loverbirthDate}}" />
-    <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_30'></view>
     <view style='height:90rpx'>
-      <text class='text_black_30 float_left'>国籍</text>
-      <text class='text_777_30 float_right' style='line-height: 90rpx;text-align:right' name='lover_country'>中国</text>
+      <text class='text_777_30 float_left head_in'>国籍</text>
+      <text class='text_black_30 float_right' style='line-height: 90rpx;text-align:right;' name='lover_country'>中国</text>
     </view>
   </view>
 </view>
-<!-- <view class='divide_line_f5f5f5'></view>
+<!-- <view class='divide_line_30'></view>
       <view class='text_black_30 float_left'>上传材料</view> -->
 <view style='width:100%;height:180rpx;background:#f8f8f8'></view>
 <!-- <view style='margin-bottom:140rpx'>
--- a/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxss
查看文件 @f47a552
+++ b/pages/main/addtionalreduce/addextrainfo/addextrainfo.wxss
查看文件 @f47a552
 /* pages/main/addtionalreduce/addextrainfo/addextrainfo.wxss */
+@import "../../taxperson/addinfo/addinfo.wxss";
+
 .text_black_30 {
   font-family: PingFangSC-Regular;
   font-size: 30rpx;
--- a/pages/main/taxperson/addinfo/addinfo.js
查看文件 @f47a552
+++ b/pages/main/taxperson/addinfo/addinfo.js
查看文件 @f47a552
@@ -54,7 +54,6 @@ Page({
       onChange: 'onPickerSelect'
     },
     genderData: {
-      isblack:true,
       label: '性别',
       bindtype: 'gender',
       selected: '',
--- a/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @f47a552
+++ b/pages/main/taxperson/addinfo/addinfo.wxml
查看文件 @f47a552
@@ -2,59 +2,64 @@
 <import src="../../../common/picker_cell" />
 <view class='page__'>
+  <view class="divide_line"></view>
   <form bindsubmit='formSubmit'>
     <view class='data_list' hidden="{{isself}}">
       <view class='data_item'>
         <template is="picker_cell_normal" data="{{...relativeData}}" />
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
-          <text class='text_black_28 float_left'>证照类型</text>
-          <text class='text_777_30 float_right'>居民身份证</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left'>证照类型</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx'>居民身份证</text>
         </view>
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left'style='line-height: 90rpx'>证照号码</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left'style='line-height: 90rpx'>证照号码</text>
           <view wx:if="{{isIdCard}}"   >
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
-             <input class='input_wrap float_right' placeholder='请输入证照号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
+             <input class='input_wrap float_right' placeholder='请输入或拍摄身份证'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
           </view>
           <view wx:else>
             <input class='input_wrap float_right' placeholder='请输入证照号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
           </view>
         </view>
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
           <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_777_30' maxlength='15' disabled='{{isDisable}}'></input>
         </view>
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <template is="picker_cell_normal" data="{{...genderData}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body'>
-            <text class='text_black_30 float_left'style='line-height: 90rpx'>年龄</text>
+            <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>年龄</text>
             <input class='input_wrap float_right' name='age' type='number'  placeholder-class='text_777_30' placeholder='请输入年龄' maxlength='2' value='{{age}}' disabled='{{isDisable}}'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>国籍</text>
-         <text class='text_777_30 float_right' >中国</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx' >中国</text>
         </view>
-        <view class="divide_line"></view>
-        <template is="picker_cell_normal" data="{{...forignerInfo}}" />
+        <view class="divide_line_30"></view>
+        <view class='item_body'>
+          <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>是否境外人员</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx' >否</text>
+        </view>
+        <!-- <template is="picker_cell_normal" data="{{...forignerInfo}}" /> -->
       </view>
     </view>
--- a/pages/main/taxperson/addinfo/addinfo.wxss
查看文件 @f47a552
+++ b/pages/main/taxperson/addinfo/addinfo.wxss
查看文件 @f47a552
 /* pages/main/addinfo/addinfo.wxss */
-/* pages/main//editinfo/editinfo.wxss */
 page{
   background: #f8f8f8;
 }
@@ -9,10 +8,12 @@ page{
 }
 .head_wrap {
-  height: 90rpx;
-  background: #f7f9fd;
+  height: 96rpx;
+  /* background: #f7f9fd; */
+  background: #fff;
   padding-right: 20rpx;
   padding-left: 32rpx;
+  /* line-height: 96rpx; */
 }
 .head_red_star {
@@ -66,10 +67,10 @@ page{
 }
 .input_wrap {
-  width: 500rpx;
+  width: 480rpx;
   height: 90rpx;
-  font-size: 30rpx;
-  color: #333;
+  font-size: 28rpx;
+  color: #000;
   text-align: right;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -102,13 +103,6 @@ page{
   word-wrap: break-word;
 }
-.divide_line {
-  background: #e5e5e5;
-  width: 100%;
-  height: 2rpx;
-}
-
-
 .text_999_30 {
   font-size: 30rpx;
   color: #999;
@@ -117,4 +111,17 @@ page{
 }
 input[disabled]{
   color: #777;
+}
+.red_star_right_10{
+  color:red;
+  font-size: 30rpx;
+  line-height: 90rpx;
+  float:left;
+  margin-right: 10rpx;
+}
+.arrow_wrap {
+  width: 40rpx;
+  height: 40rpx;
+  float: right;
+  margin-top:24rpx;
 }
--- a/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @f47a552
+++ b/pages/main/taxperson/editinfo/editinfo.wxml
查看文件 @f47a552
@@ -16,52 +16,55 @@
         <image class='head_image_wrap_down' src='/images/arrow_down.png'></image>
       </view>
     </view>
-
+    <view style='background:#fff;'>
+        <view class="divide_line_30"></view>         
+    </view>
     <view class='data_list'>
       <view class='data_item'>
-        <view class="divide_line"></view>
         <view class='item_body' hidden="{{!isself}}">
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>姓名</text>
-          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname' style='line-height: 90rpx'></input>
-          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname' style='line-height: 90rpx'></input>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>姓名</text>
+          <input class='input_wrap float_right' placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname' style='line-height: 90rpx'></input>
+          <!-- <input hidden="{{taxInfo.certification_status=='active'}}" class='input_wrap float_right' placeholder="请输入姓名" value='{{name}}' bindblur='bindinputname' style='line-height: 90rpx'></input>
+          <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{name}}" disabled="true" bindblur='bindinputname' style='line-height: 90rpx'></input> -->
         </view>
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>国籍（地区）</text>
-          <text class='text_999_30 float_right' style='line-height: 90rpx'>中国</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍（地区）</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx'>中国</text>
         </view>
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>纳税人类型</text>
-          <text class='text_999_30 float_right' style='line-height: 90rpx'>居民</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>纳税人类型</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx'>居民</text>
         </view>
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>是否境外人员</text>
-          <text class='text_999_30 float_right' style='line-height: 90rpx'>否</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>是否境外人员</text>
+          <text class='text_black_30 float_right' style='line-height: 90rpx'>否</text>
         </view>
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <template is="picker_cell_normal" data="{{...cardtypeData}}" />
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>证照号码</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
           <view>
             <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
-            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
-            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input>
+            <input class='input_wrap float_right' disabled="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
+            <!-- <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
+            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input> -->
           </view>
         </view>
         <view hidden='{{!isshow01}}'>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...genderData}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...birthDate}}" />          
         </view>
       </view>
@@ -79,36 +82,37 @@
         <image class='head_image_wrap_down' src='/images/arrow_down.png'></image>
       </view>
     </view>
-
+    <view style='background:#fff;'>
+        <view class="divide_line_30"></view>         
+    </view>
     <view class='data_list'>
       <view class='data_item'>
-        <view class="divide_line"></view>
         <view class='item_body'>
-          <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
-          <text class='text_black_30 float_left' style='line-height: 90rpx'>手机号码</text>
+          <text class='red_star_right_10'>*</text>
+          <text class='text_777_30 float_left' style='line-height: 90rpx'>手机号码</text>
           <input class='input_wrap float_right' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile'></input>
         </view>
         <!-- 非必填部分02 -->
         <view hidden='{{!isshow02}}'>          
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...currentaddressInfo}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body'>
-            <text class='text_666_30 float_left ' style='line-height: 90rpx'>详细地址</text>
+            <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>详细地址</text>
             <input class='input_wrap float_right ' name='current_address_detail' value="{{taxInfo.current_address_detail}}" placeholder-class='text_999_30' placeholder='请输入详细居住地址'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...birthaddressInfo}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body '>
-            <text class='text_666_30 float_left ' style='line-height: 90rpx'>详细地址</text>
+            <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>详细地址</text>
             <input class='input_wrap float_right ' name='huji_address_detail' placeholder-class='text_999_30' placeholder='请输入详细户籍地址' value='{{huji_address_detail}}'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>电子邮箱</text>
+            <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>电子邮箱</text>
             <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_30' maxlength='20'></input>
           </view>
         </view>
@@ -129,41 +133,43 @@
         <image class='head_image_wrap_down' src='/images/arrow_down.png'></image>
       </view>
     </view>
+    <view style='background:#fff;'>
+        <view class="divide_line_30" hidden='{{!isshow03}}'></view>         
+    </view>
     <view class='data_list'>
       <view class='data_item'>
         <view hidden='{{!isshow03}}'> 
-          <view class="divide_line"></view>         
           <template is="picker_cell_normal" data="{{...degreeData}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...professionData}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...bankInfo}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>银行账号</text>
+            <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>银行账号</text>
             <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='24'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
-          <view class="divide_line" hidden="{{disabilityInfo.selected!='是'}}"></view>
+          <view class="divide_line_30" hidden="{{disabilityInfo.selected!='是'}}"></view>
           <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
             <text class='text_666_30 float_left'>残疾证号</text>
             <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...lieshuInfo}}" />
-          <view class="divide_line" hidden="{{lieshuInfo.selected!='是'}}"></view>
+          <view class="divide_line_30" hidden="{{lieshuInfo.selected!='是'}}"></view>
           <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
             <text class='text_666_30 float_left'>烈属证号</text>
             <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_30' placeholder='请输入烈属证号' maxlength='24'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...lonelyolderInfo}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body'>
-            <text class='text_666_30 float_left' style='line-height: 90rpx'>备注</text>
+            <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>备注</text>
             <input class='input_wrap float_right' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_30' placeholder='请输入备注'></input>
           </view>
@@ -178,40 +184,40 @@
       <view class='data_item '>
         <template is="picker_cell_normal" data="{{...investInfo}}" />
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <template is="picker_cell_normal" data="{{...specificIndustryInfo}}" />
-        <view class="divide_line"></view>
+        <view class="divide_line_30"></view>
         <template is="picker_cell_normal" data="{{...employeeInfo}}" />
         <view hidden='{{!isshow03}}'>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body '>
             <text class='text_666_30 float_left' style='line-height: 90rpx'>公司股本总额</text>
             <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}' placeholder-class='text_999_30' placeholder='请输入股本总额(保留两位小数)' maxlength='13' bindblur='companymoney'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...startDate}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...endDate}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body '>
             <text class='text_666_30 float_left ' style='line-height: 90rpx'>工号</text>
             <input class='input_wrap float_right ' name='employee_no' value='{{taxInfo.employee_no}}' placeholder-class='text_999_30' placeholder='请输入工号' maxlength='20'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
           <view class='item_body'>
             <text class='text_666_30 float_left ' style='line-height: 90rpx'>个人投资总额</text>
             <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_30' placeholder='请输入个人投资总额(保留两位小数)' maxlength='13' bindblur='personalmoney'></input>
           </view>
-          <view class="divide_line"></view>
+          <view class="divide_line_30"></view>
         </view>
--- a/pages/main/taxperson/editinfo/editinfo.wxss
查看文件 @f47a552
+++ b/pages/main/taxperson/editinfo/editinfo.wxss
查看文件 @f47a552
-/* pages/main//editinfo/editinfo.wxss */
-
+@import "../addinfo/addinfo.wxss";
 .page {
   background: #f8f8f8;
 }
-
-.head_wrap {
-  height: 96rpx;
-  /* background: #f7f9fd; */
-  background: #fff;
-  padding-right: 20rpx;
-  padding-left: 32rpx;
-  /* line-height: 96rpx; */
-}
-
-.head_red_star {
-  color: red;
-  font-size: 30rpx;
-  line-height: 90rpx;
-}
-
-.head_text_wrap1 {
-  line-height: 90rpx;
-  font-family: PingFangSC-Semibold;
-  font-size: 16px;
-  color: #333;
-  letter-spacing: 0;
-  text-align: left;
-}
-
-.head_text_wrap2 {
-  font-family: PingFang-SC-Medium;
-  font-size: 12px;
-  color: #999;
-  letter-spacing: 0;
-  text-align: left;
-}
-
-.head_image_wrap_down {
-  width: 28rpx;
-  height: 16rpx;
-  margin-top: 40rpx
-}
-
-.head_image_wrap_up {
-  width: 40rpx;
-  height: 40rpx;
-  margin-top: 24rpx;
-}
-
-.data_list {
-  display: flex;
-  font-family: PingFangSC-Regular;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-  background: #fff;
-}
-
-.data_item {
-  width: 100%;
-  height: auto;
-  flex-direction: column;
-  display: flex;
-}
-
-.input_wrap {
-  width: 480rpx;
-  height: 90rpx;
-  font-size: 28rpx;
-  color: #333;
-  text-align: right;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.text_666_28 {
-  font-family: PingFangSC-Regular;
-  font-size: 26rpx;
-  color: #666;
-  text-align: right;
-  line-height: 90rpx;
-}
-
-.image_camera {
-  width: 42rpx;
-  height: 42rpx;
-  margin-left: 10rpx;
-  margin-top: 22rpx;
-}
-
-.extra_input {
-  width: 600rpx;
-  font-size: 28rpx;
-  color: #333;
-  float: right;
-  line-height: 40rpx;
-  padding: 16rpx 0;
-  word-wrap: break-word;
-}
-
-.divide_line {
-  background: #e5e5e5;
-  width: 100%;
-  height: 2rpx;
-}