wangyu / naturalPersonTax · 提交

提交 eb405de906cd49b18a0d3b08c20aacad44e52acd

作者 pangy
2 个父辈 885726a2 30e56ed1
构建： 未知

Merge branch 'dev2.0' into dev_py

内嵌 并排对比
正在显示 5 个修改的文件 包含 29 行增加 和 13 行删除
1 1 <!--pages/main/addtionalreduce/home.wxml-->
2 2 <view class='page'>
3 3
4   - <view style='margin-bottom:30rpxbackground:#fff'>
5   - <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01" wx:for-item="item">
  4 + <view wx:if="{{additionlist.length>0}}" style='margin-bottom:30rpx;background:#fff'>
  5 + <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01" wx:for-item="item">
6 6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
7 7 <text class=' text_333_40 float_left'>{{item.legal_entity}}</text>
8 8 <view wx:if="{{item.status=='to_declare'&&item.addition_items.length<1}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'>
... ... @@ -12,7 +12,7 @@
12 12 </view>
13 13 <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
14 14 <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
15   - <view >
  15 + <view>
16 16 <view class='divide_line' style='margin:0 50rpx'></view>
17 17 <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '>
18 18 <view style='height:40rpx'>
... ... @@ -23,7 +23,7 @@
23 23 </view>
24 24 <view wx:if="{{itemData.addition_category=='continuing_education'&&itemData.detail_items.length>0}}" style='padding:20rpx'>
25 25 <view wx:for="{{itemData.detail_items}}" wx:key="" wx:for-item="itemtypedetail">
26   - <view wx:if="{{itemtypedetail.continue_education_type=='title'}}">
  26 + <view wx:if="{{itemtypedetail.continue_education_type=='major'}}">
27 27 <text style='font-size:28rpx;color:#666'>学历教育</text>
28 28 <view style='width:100%;display:flex;flex-direction:row '>
29 29 <view class='float_left' style='flex:1'>
... ... @@ -36,7 +36,7 @@
36 36 </view>
37 37 </view>
38 38 </view>
39   - <view wx:if="{{itemtypedetail.continue_education_type=='major'||itemdetail.continue_education_type=='profession'}}">
  39 + <view wx:else>
40 40 <text style='font-size:28rpx;color:#666'>非学历教育</text>
41 41 <text style='font-size:28rpx;color:#666' hidden='{{itemtypedetail.detail_count<2}}'>（{{itemtypedetail.detail_count}}）</text>
42 42 <view style='width:100%;display:flex;flex-direction:row '>
... ... @@ -69,5 +69,12 @@
69 69 </view>
70 70 <view style='width:100%;height:20rpx;background:#F5F5F5'></view>
71 71 </view>
  72 + <!-- <view wx:else>
  73 + <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
  74 + </view> -->
  75 +
72 76 </view>
  77 + <view wx:else>
  78 + <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
  79 + </view>
73 80 </view>
\ No newline at end of file
... ...
... ... @@ -146,6 +146,9 @@ Page({
146 146 if (newdata[i].education_end && newdata[i].education_end > 0) {
147 147 newdata[i].education_end = format.formatTime_date(newdata[i].education_end)
148 148 }
  149 + if (newdata[i].approval_date && newdata[i].approval_date > 0) {
  150 + newdata[i].approval_date = format.formatTime_date(newdata[i].approval_date)
  151 + }
149 152 if (newdata[i].patient_birthday && newdata[i].patient_birthday > 0) {
150 153 newdata[i].patient_birthday = format.formatTime_date(newdata[i].patient_birthday)
151 154 }
... ...
... ... @@ -71,11 +71,11 @@
71 71 </view>
72 72 <view style='height:70rpx'>
73 73 <text class='text_999_28 ' style='line-height:70rpx'>入学时间起：</text>
74   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
  74 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_start}}</text>
75 75 </view>
76 76 <view style='height:70rpx'>
77 77 <text class='text_999_28 ' style='line-height:70rpx'>(预计)毕业时间</text>
78   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
  78 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_end}}</text>
79 79 </view>
80 80 <view style='height:70rpx'>
81 81 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
... ... @@ -107,7 +107,7 @@
107 107 </view>
108 108 <view style='height:70rpx'>
109 109 <text class='text_999_28 ' style='line-height:70rpx'>发证(批准)日期</text>
110   - <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{2018-09-09}}</text>
  110 + <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.approval_date}}</text>
111 111 </view>
112 112 <view style='height:70rpx'>
113 113 <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
... ... @@ -244,7 +244,7 @@
244 244 <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
245 245 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.amount_by_person}}元</text>
246 246 </view>
247   - <view class='float_right' wx:if="{{item.status!='failed'}}">
  247 + <view class='float_right' wx:if="{{item.status=='failed'}}">
248 248 <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
249 249 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
250 250 </view>
... ...
... ... @@ -88,10 +88,16 @@ Page({
88 88 success: function(res) {
89 89 if (res && res.data) {
90 90 console.log("res", res)
  91 + var databean = {}
  92 + databean.type = "1"
  93 + databean.text = that.data.inputValue
  94 + that.data.chatlist.push(databean)
  95 + that.data.chatlist.push(res.data)
91 96 that.setData({
92   - inputValue:""
  97 + inputValue:"",
  98 + chatlist: that.data.chatlist
93 99 })
94   - that.getChatinfo()
  100 + // that.getChatinfo()
95 101 }
96 102 }
97 103 })
... ... @@ -168,7 +174,7 @@ Page({
168 174 },
169 175 success: function (res) {
170 176 if (res && res.data) {
171   - console.log("res", res)
  177 + console.log("getChatinfo", res)
172 178 that.setData({
173 179 chatlist: res.data.items.reverse()
174 180 })
... ...
... ... @@ -27,7 +27,7 @@
27 27 <!-- 自定义弹窗 -->
28 28 <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
29 29 <view class='modal_lg' hidden="{{!showModal}}">
30   - <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位资讯问题。</text>
  30 + <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
31 31 <view class='divide_line_f5f5f5'></view>
32 32 <view style='width:100%;display:flex;flex-direction:column;align-items:center;max-height:450rpx'>
33 33 <block wx:for="{{comlist}}" wx:for-index="idx">
... ...
请 注册 或 登录 后发表评论