优化

@@ -180,7 +180,7 @@ Page({
       bindtype: 'reduce_type',
       selected: '',
       isblack: 'true',
-      values: ["月度扣除", "年度扣除"],
+      values: ["月度", "年度"],
       placeholder: '请选择扣除方式',
       onChange: 'onPickerSelect'
     },
@@ -333,11 +333,11 @@ Page({
     var reduce_typeData = this.data.reducetypeData
     var deduction_amount
     if (options.reducetype == '月度'){
-      reduce_typeData.selected = '月度扣除'
+      reduce_typeData.selected = '月度'
       deduction_amount = Deduce_amounts_month[nameKey]
     }else {
       deduction_amount = Deduce_amounts_year[nameKey]
-      reduce_typeData.selected = '年度扣除'
+      reduce_typeData.selected = '年度'
     }
 
     var title = '添加' + (options.title ? options.title : AddTypeNames[nameKey])

@@ -223,8 +223,8 @@
         <view class='divide_line_f5f5f5'></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 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>
           <!-- <input class='input_wrap01 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>

@@ -56,7 +56,7 @@
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除方式</text>
-      <text class='text_right_333'>月度扣除</text>
+      <text class='text_right_333'>月度</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除金额</text>
@@ -129,7 +129,7 @@
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除方式</text>
-      <text class='text_right_333'>月度扣除</text>
+      <text class='text_right_333'>月度</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除金额</text>
@@ -193,7 +193,7 @@
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除方式</text>
-      <text class='text_right_333'>月度扣除</text>
+      <text class='text_right_333'>月度</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除金额</text>

@@ -48,11 +48,14 @@ Page({
   lookandadd:function(e){
     console.log("lookandadd", e);
     if (this.data.additiondata.options && this.data.additiondata.options.length>0){
+      var newstatus 
+      if (this.data.additiondata.options[e.currentTarget.id].indexOf("house_fund"!=-1)){
+        newstatus = "house_fund"
+      }
       wx.navigateTo({
-        url: '../lookandupdate/lookandupdate?status=' + this.data.additiondata.options[e.currentTarget.id] + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
+        url: '../lookandupdate/lookandupdate?status=' + newstatus + "&legal_entity_id=" + this.data.additiondata.legal_entity_id + "&legal_entity=" + this.data.additiondata.legal_entity,
       })
     }
-  
   },
 
   /**

 // pages/main/addtionalreduce/childreneducate/childreneducate.js
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
-
+var format = require('../../../../utils/util.js');
 Page({
 
   /**
@@ -45,8 +45,8 @@ Page({
       "house_fund": "persontax/v1/house-funds/"
     },
     reducetype: {
-      "month": "月度扣除",
-      "year": "年度扣除"
+      "month": "月度",
+      "year": "年度"
     },
     additionInfo: [],
     reducetypeData: ["月度", "年度"],
@@ -117,7 +117,6 @@ Page({
       success: function(res) {
         if (res && res.data) {
           console.log("res", res)
-
           that.setData({
             additionInfo: res.data.items
           })

@@ -16,7 +16,10 @@
           <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text>
-              <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
+              <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
+              
             </view>
             <view style='padding-right: 30rpx'>
               <view class='divide_line_f5f5f5'></view>
@@ -30,7 +33,7 @@
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -51,7 +54,9 @@
         <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
           <view style='height:110rpx'>
             <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
-            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
+            <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
           </view>
           <view style='padding-right:30rpx'>
             <view class='divide_line_f5f5f5'></view>
@@ -77,7 +82,7 @@
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -88,7 +93,9 @@
         <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
           <view style='height:110rpx'>
             <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
-            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
+            <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
           </view>
           <view style='padding-right:right'>
             <view class='divide_line_f5f5f5'></view>
@@ -110,7 +117,7 @@
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -129,7 +136,9 @@
         <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
           <view style='height:110rpx'>
             <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
-            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
+            <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
           </view>
           <view style='padding-right:30rpx'>
             <view class='divide_line_f5f5f5'></view>
@@ -143,7 +152,7 @@
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -188,7 +197,9 @@
         <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
           <view style='height:110rpx'>
             <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
-            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
+            <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
           </view>
           <view style='padding-right:30rpx'>
             <view class='divide_line_f5f5f5'></view>
@@ -228,7 +239,9 @@
         <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
           <view style='height:110rpx'>
             <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
-            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
+            <view wx:if="{{item.status=='failed'}}" class='declare_style red_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
+              <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
           </view>
           <view style='padding-right: 30rpx'>
             <view class='divide_line_f5f5f5'></view>
@@ -239,7 +252,7 @@
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
             </view>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>

@@ -239,7 +239,6 @@
 .declare_style {
   width: 144rpx;
   height: 48rpx;
-  background: #f5a623;
   border-radius: 20px 0px 0px 20px;
   font-family: PingFangSC-Regular;
   font-size: 13px;
@@ -249,5 +248,18 @@
   justify-content: center;
   line-height: 48rpx;
   margin-top: 30rpx;
+  float:right;
+}
+
+.orange_bg{
+  background: #f5a623;
+}
+
+.red_bg{
+  background: #f56723;
+}
+
+.blue_bg{
+  background: #357AEB;
 }
 

@@ -34,6 +34,7 @@ Page({
   },
 
   bindKeyInput(e) {
+    console.log("bindKeyInput",e)
     this.setData({
       inputValue: e.detail.value
     })
@@ -47,6 +48,7 @@ Page({
       data: {
         text: that.data.inputValue
       },
+      method:"POST",
       header: {
         'content-type': 'application/json',
         "Authorization": Authorization

@@ -20,7 +20,7 @@
     </view>
   </scroll-view>
   <view class='bottom_wrap'>
-    <input class='input_wrap' confirm-type="send"></input>
+    <input class='input_wrap' confirm-type="send" bindinput="bindKeyInput"></input>
     <view class='btn_send_wrap' bindtap='sendMsg'>发送</view>
   </view>
 </view>