Merge branch 'dev2.0' into dev_wy

@@ -17,14 +17,14 @@
     <view wx:if="{{currentTab==0}}">
     <view wx:if="{{currentTab==0}}">
       <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
       <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
         <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
         <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
-          <text style='text-align:left;font-size: 28rpx;color: #333;font-family: PingFangSC-Semibold;'>所得项目:{{item.method}}</text>          
+          <text class='text_blue_36'>所得项目:{{item.method}}</text>          
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
           <!-- <text class='text_999_28'>累计收入额:{{item.personal_income}}</text> -->
           <!-- <text class='text_999_28'>累计收入额:{{item.personal_income}}</text> -->
-          <text class='text_999_28'>当期收入额:{{item.personal_income}}</text>
-          <text class='text_999_28'>累计应缴纳所得额:{{item.accumulated_taxable_income}}</text>
-          <text class='text_999_28'>累计应扣缴税额:{{item.accumulated_withholding_tax}}</text>
-          <text class='text_999_28'>已预交税额:{{item.prepay_tax}}</text>
-          <text class='text_999_28'>本期应缴税额:{{item.personal_tax}}</text>
+          <text class='text_999_28'>当期收入额:<text class='text_333_28 left_360'>¥{{item.personal_income}}</text></text>
+          <text class='text_999_28'>累计应缴纳所得额:<text class='text_333_28 left_360'>¥{{item.accumulated_taxable_income}}</text></text>
+          <text class='text_999_28'>累计应扣缴税额:<text class='text_333_28 left_360'>¥{{item.accumulated_withholding_tax}}</text></text>
+          <text class='text_999_28'>已预交税额:<text class='text_333_28 left_360'>¥{{item.prepay_tax}}</text></text>
+          <text class='text_999_28'>本期应缴税额:<text class='text_333_28 text_color_28 left_360'>¥{{item.personal_tax}}</text></text>
         </view>
         </view>
       </view>
       </view>
     </view>
     </view>
@@ -45,11 +45,12 @@
           <view wx:if="{{isshow}}" bindtap='gospan'>
           <view wx:if="{{isshow}}" bindtap='gospan'>
             <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text>
             <text style='font-size:28rpx;color:#4e8fe7;text-align:left'>收起</text>
             <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image>
             <image class='head_image_wrap_up' src='/images/arrow_blue_up.png'></image>
+            <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
           </view>
           </view>
           <view wx:if="{{isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
           <view wx:if="{{isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
             <view>
             <view>
-              <text class='text_wrap_left' style='font-size:28rpx;color:#999;text-align:left'>{{detal.title}}</text>
-              <text class='text_wrap_right' style='font-size:28rpx;color:#999;text-align:right'>{{detal.value}}</text>
+              <text class='text_999_28'>{{detal.title}}</text>
+              <text class='text_999_28' style='color:#333;text-align:right;float: right'>{{detal.value}}</text>
             </view>
             </view>
           </view>
           </view>
         </view>
         </view>

@@ -23,6 +23,9 @@
   font-family: PingFangSC-Semibold;
   font-family: PingFangSC-Semibold;
   color: #FF9F00;
   color: #FF9F00;
 }
 }
+.left_360 {
+  left: 360rpx;
+}
 .arrow_wrap {
 .arrow_wrap {
   position: relative;
   position: relative;
   width: 20rpx;
   width: 20rpx;