wangyu / naturalPersonTax · 提交

提交 08adf66b824436fc4f280ed0e8ab0a57658d5a1e

作者 wangyu
1 个父辈 f5fb092c
构建： 未知

优化

内嵌 并排对比
正在显示 10 个修改的文件 包含 340 行增加 和 159 行删除
@@ -118,8 +118,8 @@ App({ @@ -118,8 +118,8 @@ App({
118 onshow_count: 0, 118 onshow_count: 0,
119 // baseUrl: "http://47.99.47.16:20000/", 119 // baseUrl: "http://47.99.47.16:20000/",
120 // baseUrl: "http://47.96.75.229:20000/", 120 // baseUrl: "http://47.96.75.229:20000/",
121 - baseUrl: "http://192.144.144.220:20000/",  
122 - // baseUrl: "http://154.8.229.55:20000/", 121 + // baseUrl: "http://192.144.144.220:20000/",
  122 + baseUrl: "http://154.8.229.55:20000/",
123 // baseUrl: "https://api.workai.com.cn/", 123 // baseUrl: "https://api.workai.com.cn/",
124 OSSUrl: "",//"https://oss.workai.com.cn/", 124 OSSUrl: "",//"https://oss.workai.com.cn/",
125 userInfo: null, 125 userInfo: null,
@@ -6,6 +6,13 @@ Page({ @@ -6,6 +6,13 @@ Page({
6 */ 6 */
7 data: { 7 data: {
8 cur_status:"", 8 cur_status:"",
  9 + additiontitle: {
  10 + "children_education": "子女教育",
  11 + "continuing_education": "继续教育",
  12 + "support_duty": "赡养老人",
  13 + "medical_fund": "大病医疗",
  14 + "house_fund": "住房"
  15 + },
9 datas:{} 16 datas:{}
10 }, 17 },
11 18
@@ -19,6 +26,9 @@ Page({ @@ -19,6 +26,9 @@ Page({
19 cur_status: options.status, 26 cur_status: options.status,
20 datas: JSON.parse(options.data) 27 datas: JSON.parse(options.data)
21 }) 28 })
  29 + wx.setNavigationBarTitle({
  30 + title: that.data.additiontitle[options.status],
  31 + })
22 }, 32 },
23 33
24 /** 34 /**
@@ -47,9 +47,12 @@ Page({ @@ -47,9 +47,12 @@ Page({
47 47
48 lookandadd:function(e){ 48 lookandadd:function(e){
49 console.log("e", e); 49 console.log("e", e);
50 - wx.navigateTo({  
51 - url: '../lookandupdate/lookandupdate?index=' + e.currentTarget.id,  
52 - }) 50 + if (this.data.additiondata.options && this.data.additiondata.options.length>0){
  51 + wx.navigateTo({
  52 + url: '../lookandupdate/lookandupdate?status=' + this.data.additiondata.options[e.currentTarget.id] + "&legal_entity_id=" + this.data.additiondata.legal_entity_id,
  53 + })
  54 + }
  55 +
53 }, 56 },
54 57
55 /** 58 /**
1 <!--pages/main/addtionalreduce/godetail/godetail.wxml--> 1 <!--pages/main/addtionalreduce/godetail/godetail.wxml-->
2 <view class='page' style='margin-bottom:30rpx'> 2 <view class='page' style='margin-bottom:30rpx'>
3 <view class='text_gray_30' style='padding:30rpx'>您在“{{additiondata.legal_entity}}”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view> 3 <view class='text_gray_30' style='padding:30rpx'>您在“{{additiondata.legal_entity}}”申报的专项附加扣除项已添加完成，请完善各项的具体申报内容。</view>
4 - <view wx:if="true">  
5 - <!-- <view wx:for="{{datas02}}">  
6 - <view hidden='{{false}}' class='card_rectangle_bg_column' style='padding:30rpx;margin-top:30rpx'>  
7 - <text class='text_black_32' wx:if="{{datas02[index].message!='住房'}}">{{datas02[index].message}}</text>  
8 - <text class='text_black_32' wx:if="{{datas02[index].message=='住房'}}">{{datas02[index].extra_message}}</text>  
9 - <view style='margin:20rpx 0'>  
10 - <text class='text_gray_22 float_left'>累计已使用额度：4890.00</text>  
11 - <text class='text_gray_22 float_right'>本月可用额度：12810.00</text> 4 +
  5 + <view wx:if="{{additiondata.options&&additiondata.options.length>0}}">
  6 + <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="item">
  7 + <view wx:if="{{item=='children_education'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  8 + <view style='height:40rpx'>
  9 + <text class='text_333_32 float_left'>子女教育</text>
  10 + <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
  11 + <text class='text_999_28' style='float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
12 </view> 12 </view>
13 - <view class='divide_line_f5f5f5'></view>  
14 - <view style='padding:20rpx 0' bindtap='lookandadd' id='{{index}}'>  
15 - <text wx:if="{{datas02[index].message!='大病医疗'}}" class='text_blue_28'>查看并调整</text>  
16 - <text wx:else class='text_blue_28'>提交抵扣凭据</text>  
17 - <image class='arrow_img_wrap' src='/images/arrow_right.png'></image> 13 + <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
  14 + <view class='float_left' style='flex:1'>
  15 + <text class='text_999_24 '>扣除方式</text>
  16 + <text class='text_gray_28' style='margin-left:20rpx'>月度</text>
  17 + </view>
  18 + <view class='float_right' style='flex:1'>
  19 + <text class='text_999_24 '>可扣除金额</text>
  20 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥1000/月</text>
  21 + </view>
18 </view> 22 </view>
19 </view> 23 </view>
20 - </view> -->  
21 -<!-- <view wx:if="{{additiondata.options&&additiondata.options.length>0}}"> -->  
22 - <block wx:for="{{additiondata.options}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">  
23 - <view hidden="{{false}}">  
24 - <view class='divide_line' style='margin:0 50rpx'></view>  
25 - <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '>  
26 - <view style='height:40rpx'>  
27 - <text class='text_333_32 float_left'>{{additiontitle[itemData.addition_category]}}</text>  
28 - <text class='text_333_32 float_left' hidden="{{(itemData.addition_category=='continuing_education'||itemData.addition_category=='house_fund')||itemData.count<2}}">（{{itemData.count}}）</text>  
29 - <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>  
30 - <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx01}}-{{idx02}}' >查看</text> 24 + <view class='divide_line_f5f5f5' style='margin-left: 30rpx;margin-right: 30rpx'></view>
  25 + <view wx:if="{{item=='continuing_education'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  26 + <view style='height:40rpx'>
  27 + <text class='text_333_32 float_left'>继续教育</text>
  28 + <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
  29 + <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  30 + </view>
  31 + <view style='padding:20rpx'>
  32 + <view>
  33 + <text style='font-size:28rpx;color:#666'>学历教育</text>
  34 + <view style='width:100%;display:flex;flex-direction:row '>
  35 + <view class='float_left' style='flex:1'>
  36 + <text class='text_999_24 '>扣除方式</text>
  37 + <text class='text_gray_28' style='margin-left:20rpx'>按月</text>
31 </view> 38 </view>
32 - <view wx:if="{{itemData.addition_category=='continuing_education'}}" style='padding:20rpx'>  
33 - <view>  
34 - <text style='font-size:28rpx;color:#666'>学历教育</text>  
35 - <view style='width:100%;display:flex;flex-direction:row '>  
36 - <view class='float_left' style='flex:1'>  
37 - <text class='text_999_24 '>扣除方式</text>  
38 - <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>  
39 - </view>  
40 - <view class='float_right' style='flex:1'>  
41 - <text class='text_999_24 '>可扣除金额</text>  
42 - <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/年</text>  
43 - </view>  
44 - </view>  
45 - </view>  
46 - <view >  
47 - <text style='font-size:28rpx;color:#666'>非学历教育</text>  
48 - <text style='font-size:28rpx;color:#666' hidden='{{itemData.count<2}}' >（{{itemData.count}}）</text>  
49 - <view style='width:100%;display:flex;flex-direction:row '>  
50 - <view class='float_left' style='flex:1'>  
51 - <text class='text_999_24 '>扣除方式</text>  
52 - <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>  
53 - </view>  
54 - <view class='float_right' style='flex:1'>  
55 - <text class='text_999_24 '>可扣除金额</text>  
56 - <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/年</text>  
57 - </view>  
58 - </view>  
59 - </view> 39 + <view class='float_right' style='flex:1'>
  40 + <text class='text_999_24 '>可扣除金额</text>
  41 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥1000/年</text>
60 </view> 42 </view>
61 - <view wx:else style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>  
62 - <view class='float_left' style='flex:1'>  
63 - <text class='text_999_24 '>扣除方式</text>  
64 - <text class='text_gray_28' style='margin-left:20rpx'>{{reducetype[itemData.deduction_type]}}</text>  
65 - </view>  
66 - <view class='float_right' style='flex:1'>  
67 - <text class='text_999_24 '>可扣除金额</text>  
68 - <text class='text_orange_28 ' style='margin-left:20rpx'>￥{{itemData.deduction_amount}}/{{reducetypeunit[itemData.deduction_type]}}</text>  
69 - </view> 43 + </view>
  44 + </view>
  45 + <view>
  46 + <text style='font-size:28rpx;color:#666'>非学历教育</text>
  47 + <view style='width:100%;display:flex;flex-direction:row '>
  48 + <view class='float_left' style='flex:1'>
  49 + <text class='text_999_24 '>扣除方式</text>
  50 + <text class='text_gray_28' style='margin-left:20rpx'>按年</text>
  51 + </view>
  52 + <view class='float_right' style='flex:1'>
  53 + <text class='text_999_24 '>可扣除金额</text>
  54 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥3600/年</text>
70 </view> 55 </view>
71 </view> 56 </view>
72 </view> 57 </view>
73 - </block> 58 + </view>
  59 + </view>
  60 + <view wx:if="{{item=='medical_fund'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column'>
  61 + <view style='height:40rpx'>
  62 + <text class='text_333_32 float_left'>大病医疗</text>
  63 + <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
  64 + <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  65 + </view>
  66 + <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
  67 + <view class='float_left' style='flex:1'>
  68 + <text class='text_999_24 '>扣除方式</text>
  69 + <text class='text_gray_28' style='margin-left:20rpx'>年度</text>
  70 + </view>
  71 + <view class='float_right' style='flex:1'>
  72 + <text class='text_999_24 '>可扣除金额</text>
  73 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥0/月</text>
  74 + </view>
  75 + </view>
74 </view> 76 </view>
  77 + <view wx:if="{{item=='support_duty'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  78 + <view style='height:40rpx'>
  79 + <text class='text_333_32 float_left'>赡养老人</text>
  80 + <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
  81 + <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  82 + </view>
  83 + <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
  84 + <view class='float_left' style='flex:1'>
  85 + <text class='text_999_24 '>扣除方式</text>
  86 + <text class='text_gray_28' style='margin-left:20rpx'>月度</text>
  87 + </view>
  88 + <view class='float_right' style='flex:1'>
  89 + <text class='text_999_24 '>可扣除金额</text>
  90 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥24000/月</text>
  91 + </view>
  92 + </view>
  93 + </view>
  94 + <view wx:if="{{item=='house_fund_rent'||item=='house_fund_loan'}}" style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
  95 + <view style='height:40rpx'>
  96 + <text class='text_333_32 float_left'>住房</text>
  97 + <image class='arrow_img_wrap float_right' src="/images/arrow_right.png"></image>
  98 + <text class='text_999_28' style='margin-bottom:8rpx;float:right' bindtap='lookandadd' id='{{idx}}'>查看</text>
  99 + </view>
  100 + <view style='width:100%;padding:20rpx 20rpx;display:flex;flex-direction:row '>
  101 + <view class='float_left' style='flex:1'>
  102 + <text class='text_999_24 '>扣除方式</text>
  103 + <text class='text_gray_28' style='margin-left:20rpx'>月度</text>
  104 + </view>
  105 + <view class='float_right' style='flex:1'>
  106 + <text class='text_999_24 '>可扣除金额</text>
  107 + <text class='text_orange_28 ' style='margin-left:20rpx'>￥12000/月</text>
  108 + </view>
  109 + </view>
75 </view> 110 </view>
  111 + </block>
  112 + </view>
76 113
77 -<!-- </view> -->  
  114 +</view>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 color: #6C7596 ; 4 color: #6C7596 ;
5 font-weight: bold; 5 font-weight: bold;
6 } 6 }
7 - 7 +/*
8 .text_gray_32 { 8 .text_gray_32 {
9 font-size: 32rpx; 9 font-size: 32rpx;
10 color: #6C7596 ; 10 color: #6C7596 ;
@@ -34,4 +34,46 @@ @@ -34,4 +34,46 @@
34 float: right; 34 float: right;
35 margin-top:10rpx; 35 margin-top:10rpx;
36 36
  37 +} */
  38 +
  39 +.text_333_32 {
  40 + font-family: PingFangSC-Semibold;
  41 + font-size: 32rpx;
  42 + color: #333;
  43 + line-height: 40rpx;
  44 +}
  45 +
  46 +.text_999_24 {
  47 + font-size: 24rpx;
  48 + color: #999;
  49 +}
  50 +
  51 +.text_gray_28{
  52 + font-family: PingFangSC-Semibold;
  53 +font-size: 14px;
  54 +color: #2B2B2B;
  55 +line-height: 17px;
  56 +}
  57 +
  58 +.text_orange_28{
  59 +font-family: PingFangSC-Semibold;
  60 +font-size: 14px;
  61 +color: #FF9F00;
  62 +text-align: right;
  63 +line-height: 17px;
  64 +}
  65 +
  66 +.arrow_img_wrap {
  67 + width: 40rpx;
  68 + height: 40rpx;
  69 + align-items: center;
  70 + float: right;
  71 + margin-bottom: 8rpx
  72 +}
  73 +
  74 +.text_999_28 {
  75 + font-family: PingFangSC-Regular;
  76 + font-size: 28rpx;
  77 + color: #999;
  78 + line-height: 40rpx;
37 } 79 }
@@ -10,6 +10,7 @@ Page({ @@ -10,6 +10,7 @@ Page({
10 data: { 10 data: {
11 cur_status: "", 11 cur_status: "",
12 legal_entity_id: "", 12 legal_entity_id: "",
  13 + title:'',
13 declareStatus: { 14 declareStatus: {
14 "to_declare ": "待申报", 15 "to_declare ": "待申报",
15 "declaring": "申报中", 16 "declaring": "申报中",
@@ -26,7 +27,13 @@ Page({ @@ -26,7 +27,13 @@ Page({
26 title: '', 27 title: '',
27 imgpath: '', 28 imgpath: '',
28 new_data: null, 29 new_data: null,
29 - modal_images: { "children_education": "/images/childedu_declare.png", "continuing_education": "/images/continueedu_declare.png", "support_duty": "/images/support_older_declare.png", "medical_fund": "/images/health_declare.png", "house_fund":"/images/house_declare.png"}, 30 + modal_images: {
  31 + "children_education": "/images/childedu_declare.png",
  32 + "continuing_education": "/images/continueedu_declare.png",
  33 + "support_duty": "/images/support_older_declare.png",
  34 + "medical_fund": "/images/health_declare.png",
  35 + "house_fund": "/images/house_declare.png"
  36 + },
30 showModal_img: false, 37 showModal_img: false,
31 showModal_reducetype: false, 38 showModal_reducetype: false,
32 showModal_addtype: false, 39 showModal_addtype: false,
@@ -62,7 +69,8 @@ Page({ @@ -62,7 +69,8 @@ Page({
62 canceltext: "添加家庭成员并申报", 69 canceltext: "添加家庭成员并申报",
63 confirmtext: "确定为该选择的人申报", 70 confirmtext: "确定为该选择的人申报",
64 }, 71 },
65 - datas: ["", ""] 72 + selected_reduceindex:0,
  73 + selected_addindex: 0
66 }, 74 },
67 75
68 /** 76 /**
@@ -108,6 +116,7 @@ Page({ @@ -108,6 +116,7 @@ Page({
108 success: function(res) { 116 success: function(res) {
109 if (res && res.data) { 117 if (res && res.data) {
110 console.log("res", res) 118 console.log("res", res)
  119 +
111 that.setData({ 120 that.setData({
112 additionInfo: res.data.items 121 additionInfo: res.data.items
113 }) 122 })
@@ -139,6 +148,37 @@ Page({ @@ -139,6 +148,37 @@ Page({
139 } 148 }
140 }, 149 },
141 150
  151 + godelete: function(e) { //删除
  152 + var that = this;
  153 + var Authorization = getApp().globalData.Authorization;
  154 + wx.request({
  155 + url: baseUrl + 'persontax/v1/op/delete',
  156 + data: {
  157 + item_type: that.data.cur_status,
  158 + id: that.data.legal_entity_id
  159 + },
  160 + header: {
  161 + 'content-type': 'application/json',
  162 + "Authorization": Authorization
  163 + },
  164 + success: function (res) {
  165 + if (res && res.data) {
  166 + console.log("res", res)
  167 +
  168 + }
  169 + }
  170 + })
  171 + },
  172 +
  173 + goedit: function(e) { //编辑
  174 + console.log("goedit", e)
  175 + if (this.data.additionInfo && this.data.additionInfo.length > 0) {
  176 + wx.navigateTo({
  177 + url: '../additiondetail/additiondetail?data=' + JSON.stringify(this.data.additionInfo[e.currentTarget.id]) + "&status=" + this.data.cur_status,
  178 + })
  179 + }
  180 + },
  181 +
142 goadd: function(e) { //添加 182 goadd: function(e) { //添加
143 var that = this 183 var that = this
144 var modalinfo 184 var modalinfo
@@ -146,7 +186,7 @@ Page({ @@ -146,7 +186,7 @@ Page({
146 wx.navigateTo({ 186 wx.navigateTo({
147 url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title, 187 url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
148 }) 188 })
149 - }else{ 189 + } else {
150 if (this.data.cur_status == 'children_education') { //modalData 190 if (this.data.cur_status == 'children_education') { //modalData
151 modalinfo = this.data.children_modalData 191 modalinfo = this.data.children_modalData
152 } else if (this.data.cur_status == 'support_duty') { 192 } else if (this.data.cur_status == 'support_duty') {
@@ -155,14 +195,14 @@ Page({ @@ -155,14 +195,14 @@ Page({
155 modalinfo = this.data.medical_modalData 195 modalinfo = this.data.medical_modalData
156 } 196 }
157 console.log("modalinfo", modalinfo) 197 console.log("modalinfo", modalinfo)
158 - if (modalinfo.data.length < 2) { 198 + if (modalinfo.datas.length < 2) {
159 wx.navigateTo({ 199 wx.navigateTo({
160 url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title, 200 url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
161 }) 201 })
162 } else { 202 } else {
163 this.showAddtionmodal(modalinfo) 203 this.showAddtionmodal(modalinfo)
164 } 204 }
165 - } 205 + }
166 }, 206 },
167 207
168 getTaxList: function() { 208 getTaxList: function() {
@@ -250,9 +290,7 @@ Page({ @@ -250,9 +290,7 @@ Page({
250 showModalReducetype: function(e) { 290 showModalReducetype: function(e) {
251 console.log("reducetype", e) 291 console.log("reducetype", e)
252 this.setData({ 292 this.setData({
253 - showModal_img: false,  
254 showModal_reducetype: true, 293 showModal_reducetype: true,
255 - showModal_addtype: false,  
256 }) 294 })
257 }, 295 },
258 296
@@ -263,15 +301,15 @@ Page({ @@ -263,15 +301,15 @@ Page({
263 }) 301 })
264 }, 302 },
265 303
266 - reduce_modalCancel: function () { //modal取消(扣除类型) 304 + reduce_modalCancel: function() { //modal取消(扣除类型)
267 this.setData({ 305 this.setData({
268 - showModal_addtype: false 306 + showModal_reducetype: false
269 }) 307 })
270 }, 308 },
271 309
272 - reduce_modalConfirm: function () { //modal确认(扣除类型) 310 + reduce_modalConfirm: function() { //modal确认(扣除类型)
273 this.setData({ 311 this.setData({
274 - showModal_addtype: false 312 + showModal_reducetype: false
275 }) 313 })
276 }, 314 },
277 315
@@ -281,10 +319,32 @@ Page({ @@ -281,10 +319,32 @@ Page({
281 }) 319 })
282 }, 320 },
283 321
284 - modalConfirm: function () { //modal确认(添加) 322 + modalConfirm: function(e) { //modal确认(添加)
  323 + console.log("modalConfirm", e)
285 this.setData({ 324 this.setData({
286 showModal_addtype: false 325 showModal_addtype: false
287 }) 326 })
  327 + if (this.data.cur_status == 'children_education') {
  328 +
  329 + } else if (this.data.cur_status == 'support_duty') {
  330 +
  331 + } else if (this.data.cur_status == 'medical_fund') {
  332 +
  333 + }
  334 + },
  335 +
  336 + goselect: function(e) {
  337 + console.log("goselect", e)
  338 + if (this.data.showModal_reducetype) {
  339 + this.setData({
  340 + selected_reduceindex: e.currentTarget.id
  341 + })
  342 + }
  343 + if (this.data.showModal_addtype) {
  344 + this.setData({
  345 + selected_addindex: e.currentTarget.id
  346 + })
  347 + }
288 }, 348 },
289 349
290 /** 350 /**
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='showModalReducetype' hidden="{{cur_status=='continuing_education'}}"> 29 <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='showModalReducetype' hidden="{{cur_status=='continuing_education'}}">
30 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text> 30 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
31 <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image> 31 <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image>
32 - <text class='text_999_30 float_right' style='line-height:100rpx'>月度</text> 32 + <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text>
33 </view> 33 </view>
34 34
35 35
@@ -316,14 +316,14 @@ @@ -316,14 +316,14 @@
316 <view wx:for="{{additionInfo}}"> 316 <view wx:for="{{additionInfo}}">
317 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 317 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
318 <view style='height:110rpx'> 318 <view style='height:110rpx'>
319 - <text class='text_gray_36 float_left' style='line-height:110rpx'>{{C.children_name}}</text> 319 + <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text>
320 <view class='declare_style float_right'> {{declareStatus[item.status]}}</view> 320 <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
321 </view> 321 </view>
322 <view style='padding-right: 30rpx'> 322 <view style='padding-right: 30rpx'>
323 <view class='divide_line_f5f5f5'></view> 323 <view class='divide_line_f5f5f5'></view>
324 <view style='height:70rpx'> 324 <view style='height:70rpx'>
325 <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text> 325 <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
326 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>张飞</text> 326 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
327 </view> 327 </view>
328 <view style='height:70rpx'> 328 <view style='height:70rpx'>
329 <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text> 329 <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
@@ -335,13 +335,13 @@ @@ -335,13 +335,13 @@
335 </view> 335 </view>
336 <view style='height:70rpx'> 336 <view style='height:70rpx'>
337 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 337 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
338 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}元</text> 338 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
339 </view> 339 </view>
340 <view class='divide_line_f5f5f5'></view> 340 <view class='divide_line_f5f5f5'></view>
341 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> 341 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
342 <view class='float_right' wx:if="{{item.status=='failed'}}"> 342 <view class='float_right' wx:if="{{item.status=='failed'}}">
343 - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>  
344 - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text> 343 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  344 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
345 </view> 345 </view>
346 </view> 346 </view>
347 </view> 347 </view>
@@ -352,54 +352,54 @@ @@ -352,54 +352,54 @@
352 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 352 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
353 <view style='height:110rpx'> 353 <view style='height:110rpx'>
354 <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text> 354 <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
355 - <view class='declare_style float_right'> 申报中</view> 355 + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
356 </view> 356 </view>
357 <view style='padding-right:30rpx'> 357 <view style='padding-right:30rpx'>
358 <view class='divide_line_f5f5f5'></view> 358 <view class='divide_line_f5f5f5'></view>
359 <view style='height:70rpx'> 359 <view style='height:70rpx'>
360 <text class='text_999_28 ' style='line-height:70rpx'>教育类别：</text> 360 <text class='text_999_28 ' style='line-height:70rpx'>教育类别：</text>
361 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> 361 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{}}</text>
362 </view> 362 </view>
363 <view style='height:70rpx'> 363 <view style='height:70rpx'>
364 <text class='text_999_28 ' style='line-height:70rpx'>教育类型：</text> 364 <text class='text_999_28 ' style='line-height:70rpx'>教育类型：</text>
365 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 365 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
366 </view> 366 </view>
367 <view style='height:70rpx'> 367 <view style='height:70rpx'>
368 <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text> 368 <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
369 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> 369 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text>
370 </view> 370 </view>
371 <view style='height:70rpx'> 371 <view style='height:70rpx'>
372 - <text class='text_999_28 ' style='line-height:70rpx'>教育类型：</text>  
373 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 372 + <text class='text_999_28 ' style='line-height:70rpx'>证书编号：</text>
  373 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
374 </view> 374 </view>
375 <view style='height:70rpx'> 375 <view style='height:70rpx'>
376 <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text> 376 <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
377 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> 377 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
378 </view> 378 </view>
379 <view style='height:70rpx'> 379 <view style='height:70rpx'>
380 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 380 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
381 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 381 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
382 </view> 382 </view>
383 <view style='height:70rpx'> 383 <view style='height:70rpx'>
384 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 384 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
385 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text> 385 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
386 </view> 386 </view>
387 </view> 387 </view>
388 </view> 388 </view>
389 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 389 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
390 <view style='height:110rpx'> 390 <view style='height:110rpx'>
391 <text class='text_gray_36' style='line-height:110rpx'>学历教育</text> 391 <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
392 - <view class='declare_style float_right'> 待申报</view> 392 + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
393 </view> 393 </view>
394 <view style='padding-right:right'> 394 <view style='padding-right:right'>
395 <view class='divide_line_f5f5f5'></view> 395 <view class='divide_line_f5f5f5'></view>
396 <view style='height:70rpx'> 396 <view style='height:70rpx'>
397 <text class='text_999_28 ' style='line-height:70rpx'>教育类别：</text> 397 <text class='text_999_28 ' style='line-height:70rpx'>教育类别：</text>
398 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text> 398 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
399 </view> 399 </view>
400 <view style='height:70rpx'> 400 <view style='height:70rpx'>
401 <text class='text_999_28 ' style='line-height:70rpx'>受教育阶段：</text> 401 <text class='text_999_28 ' style='line-height:70rpx'>受教育阶段：</text>
402 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 402 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text>
403 </view> 403 </view>
404 <view style='height:70rpx'> 404 <view style='height:70rpx'>
405 <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起：</text> 405 <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起：</text>
@@ -411,26 +411,26 @@ @@ -411,26 +411,26 @@
411 </view> 411 </view>
412 <view style='height:70rpx'> 412 <view style='height:70rpx'>
413 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 413 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
414 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 414 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
415 </view> 415 </view>
416 <view style='height:70rpx'> 416 <view style='height:70rpx'>
417 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 417 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
418 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text> 418 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
419 </view> 419 </view>
420 </view> 420 </view>
421 421
422 </view> 422 </view>
423 <view class='float_right' wx:if="{{item.status=='failed'}}"> 423 <view class='float_right' wx:if="{{item.status=='failed'}}">
424 - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>  
425 - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>  
426 - </view> 424 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  425 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  426 + </view>
427 </view> 427 </view>
428 428
429 <view wx:if="{{cur_status=='support_duty'}}"> 429 <view wx:if="{{cur_status=='support_duty'}}">
430 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'> 430 <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
431 <view style='height:110rpx'> 431 <view style='height:110rpx'>
432 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text> 432 <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
433 - <view class='declare_style float_right'> 申报中</view> 433 + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
434 </view> 434 </view>
435 <view style='padding-right:30rpx'> 435 <view style='padding-right:30rpx'>
436 <view class='divide_line_f5f5f5'></view> 436 <view class='divide_line_f5f5f5'></view>
@@ -444,18 +444,18 @@ @@ -444,18 +444,18 @@
444 </view> 444 </view>
445 <view style='height:70rpx'> 445 <view style='height:70rpx'>
446 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 446 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
447 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 447 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
448 </view> 448 </view>
449 <view style='height:70rpx'> 449 <view style='height:70rpx'>
450 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 450 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
451 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text> 451 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
452 </view> 452 </view>
453 <view class='divide_line_f5f5f5'></view> 453 <view class='divide_line_f5f5f5'></view>
454 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> 454 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
455 <view class='float_right' wx:if="{{item.status=='failed'}}"> 455 <view class='float_right' wx:if="{{item.status=='failed'}}">
456 - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>  
457 - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>  
458 - </view> 456 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  457 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  458 + </view>
459 </view> 459 </view>
460 460
461 </view> 461 </view>
@@ -476,7 +476,7 @@ @@ -476,7 +476,7 @@
476 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 476 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
477 <view style='height:110rpx'> 477 <view style='height:110rpx'>
478 <text class='text_gray_36' style='line-height:110rpx'>支出明细</text> 478 <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
479 - <view class='declare_style float_right'> 申报中</view> 479 + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
480 </view> 480 </view>
481 <view style='padding-right:30rpx'> 481 <view style='padding-right:30rpx'>
482 <view class='divide_line_f5f5f5'></view> 482 <view class='divide_line_f5f5f5'></view>
@@ -505,9 +505,9 @@ @@ -505,9 +505,9 @@
505 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥2345元</text> 505 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥2345元</text>
506 </view> 506 </view>
507 <view class='float_right' wx:if="{{item.status!='failed'}}"> 507 <view class='float_right' wx:if="{{item.status!='failed'}}">
508 - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>  
509 - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>  
510 - </view> 508 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  509 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  510 + </view>
511 </view> 511 </view>
512 </view> 512 </view>
513 </view> 513 </view>
@@ -516,7 +516,7 @@ @@ -516,7 +516,7 @@
516 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'> 516 <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
517 <view style='height:110rpx'> 517 <view style='height:110rpx'>
518 <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text> 518 <text class='text_gray_36 float_left' style='line-height:110rpx'>住房</text>
519 - <view class='declare_style float_right'> 申报中</view> 519 + <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
520 </view> 520 </view>
521 <view style='padding-right: 30rpx'> 521 <view style='padding-right: 30rpx'>
522 <view class='divide_line_f5f5f5'></view> 522 <view class='divide_line_f5f5f5'></view>
@@ -527,24 +527,21 @@ @@ -527,24 +527,21 @@
527 </view> 527 </view>
528 <view style='height:70rpx'> 528 <view style='height:70rpx'>
529 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text> 529 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
530 - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text> 530 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
531 </view> 531 </view>
532 <view style='height:70rpx'> 532 <view style='height:70rpx'>
533 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text> 533 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
534 - <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text> 534 + <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
535 </view> 535 </view>
536 <view class='divide_line_f5f5f5'></view> 536 <view class='divide_line_f5f5f5'></view>
537 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text> 537 <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
538 <view class='float_right' wx:if="{{item.status=='failed'}}"> 538 <view class='float_right' wx:if="{{item.status=='failed'}}">
539 - <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='showdetail'>删除</text>  
540 - <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='showdetail'>编辑</text>  
541 - </view> 539 + <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
  540 + <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
  541 + </view>
542 </view> 542 </view>
543 </view> 543 </view>
544 </view> 544 </view>
545 -  
546 -  
547 -  
548 <view style='background:#FFF;padding:30rpx'> 545 <view style='background:#FFF;padding:30rpx'>
549 <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' bindtap='goadd'> 546 <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' bindtap='goadd'>
550 添加 547 添加
@@ -570,16 +567,16 @@ @@ -570,16 +567,16 @@
570 <text class='text_modal_title'>请选择扣除方式</text> 567 <text class='text_modal_title'>请选择扣除方式</text>
571 <view class='divide_line_f5f5f5'></view> 568 <view class='divide_line_f5f5f5'></view>
572 <view style='width:100%;display:flex;flex-direction:column;align-items:center;'> 569 <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
573 - <block wx:for="{{reducetypeData}}" wx:for-index="idx">  
574 - <view wx:if="{{idx!=1}}">  
575 - <text class='text_item_black float_left'>{{item}}</text>  
576 - </view>  
577 - <view wx:else> 570 + <view wx:for="{{reducetypeData}}" wx:for-index="idx">
  571 + <view wx:if="{{selected_reduceindex==idx}}">
578 <text class='text_item_blue float_left'>{{item}}</text> 572 <text class='text_item_blue float_left'>{{item}}</text>
579 <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image> 573 <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
580 </view> 574 </view>
  575 + <view wx:else bindtap='goselect' id='{{idx}}'>
  576 + <text class='text_item_black float_left'>{{item}}</text>
  577 + </view>
581 <view class='divide_line_f5f5f5'></view> 578 <view class='divide_line_f5f5f5'></view>
582 - </block> 579 + </view>
583 </view> 580 </view>
584 <view class='divide_line_f5f5f5'></view> 581 <view class='divide_line_f5f5f5'></view>
585 582
@@ -596,13 +593,13 @@ @@ -596,13 +593,13 @@
596 <view class='divide_line_f5f5f5'></view> 593 <view class='divide_line_f5f5f5'></view>
597 <view style='width:100%;display:flex;flex-direction:column;align-items:center;'> 594 <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
598 <block wx:for="{{modalData.data}}" wx:for-index="idx"> 595 <block wx:for="{{modalData.data}}" wx:for-index="idx">
599 - <view wx:if="{{idx!=1}}">  
600 - <text class='text_item_black float_left'>{{item}}</text>  
601 - </view>  
602 - <view wx:else> 596 + <view wx:if="{{idx==selected_addindex}}">
603 <text class='text_item_blue float_left'>{{item}}</text> 597 <text class='text_item_blue float_left'>{{item}}</text>
604 <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image> 598 <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
605 </view> 599 </view>
  600 + <view wx:else bindtap='goselect' id='idx'>
  601 + <text class='text_item_black float_left'>{{item}}</text>
  602 + </view>
606 <view class='divide_line_f5f5f5'></view> 603 <view class='divide_line_f5f5f5'></view>
607 </block> 604 </block>
608 </view> 605 </view>
@@ -7,77 +7,105 @@ Page({ @@ -7,77 +7,105 @@ Page({
7 * Page initial data 7 * Page initial data
8 */ 8 */
9 data: { 9 data: {
10 - showModal:true, 10 + showModal: true,
  11 + inputValue:"",
11 datas: ["", "", "", "", ""] 12 datas: ["", "", "", "", ""]
12 }, 13 },
13 14
14 /** 15 /**
15 * Lifecycle function--Called when page load 16 * Lifecycle function--Called when page load
16 */ 17 */
17 - onLoad: function (options) { 18 + onLoad: function(options) {
18 19
19 }, 20 },
20 21
21 /** 22 /**
22 * Lifecycle function--Called when page is initially rendered 23 * Lifecycle function--Called when page is initially rendered
23 */ 24 */
24 - onReady: function () { 25 + onReady: function() {
25 26
26 }, 27 },
27 28
28 /** 29 /**
29 * Lifecycle function--Called when page show 30 * Lifecycle function--Called when page show
30 */ 31 */
31 - onShow: function () { 32 + onShow: function() {
32 33
33 }, 34 },
34 35
35 - cancelhandle:function(e){ 36 + bindKeyInput(e) {
  37 + this.setData({
  38 + inputValue: e.detail.value
  39 + })
  40 + },
  41 +
  42 + sendMsg: function() {
  43 + var that = this;
  44 + var Authorization = app.globalData.Authorization;
  45 + wx.request({
  46 + url: baseUrl + 'callbot/v1/chats',
  47 + data: {
  48 + text: that.data.inputValue
  49 + },
  50 + header: {
  51 + 'content-type': 'application/json',
  52 + "Authorization": Authorization
  53 + },
  54 + success: function(res) {
  55 + if (res && res.data) {
  56 + console.log("res", res)
  57 +
  58 + }
  59 + }
  60 + })
  61 + },
  62 +
  63 + cancelhandle: function(e) {
36 console.log("cancelhandle", e) 64 console.log("cancelhandle", e)
37 - this.setData({  
38 - showModal: false  
39 - }) 65 + this.setData({
  66 + showModal: false
  67 + })
40 }, 68 },
41 69
42 - confirmhandle: function (e) {  
43 - console.log("confirmhandle",e) 70 + confirmhandle: function(e) {
  71 + console.log("confirmhandle", e)
44 this.setData({ 72 this.setData({
45 showModal: false 73 showModal: false
46 }) 74 })
47 - }, 75 + },
48 76
49 /** 77 /**
50 * Lifecycle function--Called when page hide 78 * Lifecycle function--Called when page hide
51 */ 79 */
52 - onHide: function () { 80 + onHide: function() {
53 81
54 }, 82 },
55 83
56 /** 84 /**
57 * Lifecycle function--Called when page unload 85 * Lifecycle function--Called when page unload
58 */ 86 */
59 - onUnload: function () { 87 + onUnload: function() {
60 88
61 }, 89 },
62 90
63 /** 91 /**
64 * Page event handler function--Called when user drop down 92 * Page event handler function--Called when user drop down
65 */ 93 */
66 - onPullDownRefresh: function () { 94 + onPullDownRefresh: function() {
67 95
68 }, 96 },
69 97
70 /** 98 /**
71 * Called when page reach bottom 99 * Called when page reach bottom
72 */ 100 */
73 - onReachBottom: function () { 101 + onReachBottom: function() {
74 102
75 }, 103 },
76 104
77 /** 105 /**
78 * Called when user click on the top right corner to share 106 * Called when user click on the top right corner to share
79 */ 107 */
80 - onShareAppMessage: function () { 108 + onShareAppMessage: function() {
81 109
82 } 110 }
83 }) 111 })
@@ -20,8 +20,8 @@ @@ -20,8 +20,8 @@
20 </view> 20 </view>
21 </scroll-view> 21 </scroll-view>
22 <view class='bottom_wrap'> 22 <view class='bottom_wrap'>
23 - <input class='input_wrap'></input>  
24 - <text class='btn_send_wrap '>发送</text> 23 + <input class='input_wrap' confirm-type="send"></input>
  24 + <view class='btn_send_wrap' bindtap='sendMsg'>发送</view>
25 </view> 25 </view>
26 </view> 26 </view>
27 27
1 /* pages/main/smartchat/chat.wxss */ 1 /* pages/main/smartchat/chat.wxss */
2 2
3 /* 遮罩层 */ 3 /* 遮罩层 */
  4 +
4 .mask { 5 .mask {
5 width: 100%; 6 width: 100%;
6 height: 100%; 7 height: 100%;
@@ -87,6 +88,8 @@ @@ -87,6 +88,8 @@
87 width: 100%; 88 width: 100%;
88 height: 120rpx; 89 height: 120rpx;
89 position: fixed; 90 position: fixed;
  91 + display: flex;
  92 + flex-direction: row;
90 bottom: 0rpx; 93 bottom: 0rpx;
91 background: #fcfcfc; 94 background: #fcfcfc;
92 } 95 }
@@ -96,14 +99,14 @@ @@ -96,14 +99,14 @@
96 border-radius: 4px; 99 border-radius: 4px;
97 height: auto; 100 height: auto;
98 width: 86px; 101 width: 86px;
99 - color: #fff;  
100 - font-size: 32rpx;  
101 float: right; 102 float: right;
102 - text-align: center;  
103 - line-height: 80rpx;  
104 margin-top: 20rpx; 103 margin-top: 20rpx;
105 margin-bottom: 20rpx; 104 margin-bottom: 20rpx;
106 margin-right: 30rpx; 105 margin-right: 30rpx;
  106 + color: #fff;
  107 + font-size: 32rpx;
  108 + text-align: center;
  109 + line-height: 80rpx;
107 } 110 }
108 111
109 .input_wrap { 112 .input_wrap {
@@ -112,11 +115,12 @@ @@ -112,11 +115,12 @@
112 height: 40px; 115 height: 40px;
113 float: left; 116 float: left;
114 margin: 24rpx 30rpx; 117 margin: 24rpx 30rpx;
  118 + padding: 0 20rpx;
115 border: 1px solid #e7e7e7; 119 border: 1px solid #e7e7e7;
116 border-radius: 4px; 120 border-radius: 4px;
117 } 121 }
118 122
119 -.receive_bg{ 123 +.receive_bg {
120 border: 1px solid #e7e7e7; 124 border: 1px solid #e7e7e7;
121 border-radius: 8px; 125 border-radius: 8px;
122 padding: 24rpx 28rpx; 126 padding: 24rpx 28rpx;
@@ -130,9 +134,9 @@ @@ -130,9 +134,9 @@
130 letter-spacing: 0; 134 letter-spacing: 0;
131 } 135 }
132 136
133 -.send_bg{  
134 - background: #6DB1FF;  
135 -border-radius: 8px; 137 +.send_bg {
  138 + background: #6db1ff;
  139 + border-radius: 8px;
136 padding: 24rpx 28rpx; 140 padding: 24rpx 28rpx;
137 margin-right: 28rpx; 141 margin-right: 28rpx;
138 } 142 }
请 注册 或 登录 后发表评论