Merge branch 'dev_py' into dev2.0

@@ -32,12 +32,9 @@ Page({
       },
       success: function (result) {
         console.log('成功', result)
-        if (result.personal_income){
-          self.setData({
-            taxDatas: result.data
-          })
-        }
-        
+        self.setData({
+          taxDatas: result.data
+        })
       },
       fail: function (res) {
         console.log('失败', res)

@@ -62,12 +62,12 @@
         <view class='view_bg_wrap' style='margin-top: 44rpx;'>
           <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
             <text class='text_num_wrap'>{{taxDatas.accumulated_withholding_tax}}</text>
-            <text class='text_text_wrap'>累计应预扣预缴税额</text>
+            <text class='text_text_wrap'>累计应扣缴税额</text>
           </view>
           <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
           <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
             <text class='text_num_wrap'>{{taxDatas.prepay_tax}}</text>
-            <text class='text_text_wrap'>已预扣预缴税额</text>
+            <text class='text_text_wrap'>已扣缴税额</text>
           </view>
           
         </view>
@@ -75,7 +75,7 @@
         <view class='view_bg_wrap' style='margin-top: 180rpx;'>
           <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
             <text class='text_num_wrap'>{{taxDatas.refund_tax}}</text>
-            <text class='text_text_wrap'>本期应预扣预缴税额</text>
+            <text class='text_text_wrap'>本期应缴税额</text>
           </view>
           
           <!-- <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>

@@ -87,13 +87,16 @@ Page({
       var item = items[i]
       var method
       if (item.taxation_method == '0101'){
-        if (item.sub_taxation_method && Sub_taxation_method[item.sub_taxation_method]){
-          method = '工资薪金-' + Sub_taxation_method[item.sub_taxation_method]
-        }
+        method = '工资薪金'
+        // if (item.sub_taxation_method && Sub_taxation_method[item.sub_taxation_method]){
+        //   method = '工资薪金-' + Sub_taxation_method[item.sub_taxation_method]
+        // }
       } else if (item.taxation_method == '0401') {
         method = '劳务报酬'
-      }
-      item.method
+      } else if (item.taxation_method == '0103') {
+        method = '全年一次性奖金'
+      } 
+      item.method = method
     }
     return items;
   },

@@ -20,15 +20,16 @@
         <view style='width:100%; font-family: PingFang-SC-Medium;font-size: 14px;color: #999999;letter-spacing: 0;text-align: center;'>还没有企业为您申报个税哦～</view>
       </view>
       <view wx:for="{{taxDatas}}" style='margin-bottom:20rpx'>
-        <view class='card_rectangle_bg_column' style='padding:30rpx' id='{s{item.id}}' bindtap='goItemDetails'>
-          <text class='text_blue_36'>所得项目:{{item.method}}</text>          
+        <view class='card_rectangle_bg_column' style='padding:30rpx' id='{{item.id}}' bindtap='goItemDetails'>
+          <text class='text_blue_36'>扣缴义务人: {{item.declaring_unit}}</text>          
+          <text class='text_blue_36'>所得项目: {{item.method}}</text>          
           <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
           <!-- <text class='text_999_28'>累计收入额:{{item.personal_income}}</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>
+          <text class='text_999_28'>本期应缴税额:<text class='text_333_28 text_color_28 left_360'>¥{{item.refund_tax}}</text></text>
         </view>
       </view>
     </view>