wangyu / naturalPersonTax · 提交

提交 aaf62e0d6f981a1bd61d898d3b4838f39bf70365

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

优化

内嵌 并排对比
正在显示 11 个修改的文件 包含 485 行增加 和 62 行删除
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 "pages/main/addtionalreduce/godetail/godetail", 15 "pages/main/addtionalreduce/godetail/godetail",
16 "pages/main/addtionalreduce/lookandupdate/lookandupdate", 16 "pages/main/addtionalreduce/lookandupdate/lookandupdate",
17 "pages/main/addtionalreduce/addextrainfo/addextrainfo", 17 "pages/main/addtionalreduce/addextrainfo/addextrainfo",
  18 + "pages/main/addtionalreduce/additiondetail/additiondetail",
18 19
19 "pages/main/advancepayment/home", 20 "pages/main/advancepayment/home",
20 21
  1 +// pages/main/addtionalreduce/additiondetail/additiondetail.js
  2 +Page({
  3 +
  4 + /**
  5 + * Page initial data
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * Lifecycle function--Called when page load
  13 + */
  14 + onLoad: function (options) {
  15 + var that = this
  16 + console.log("options", options);
  17 + this.setData({
  18 + cur_index: options.index
  19 + })
  20 + },
  21 +
  22 + /**
  23 + * Lifecycle function--Called when page is initially rendered
  24 + */
  25 + onReady: function () {
  26 +
  27 + },
  28 +
  29 + /**
  30 + * Lifecycle function--Called when page show
  31 + */
  32 + onShow: function () {
  33 +
  34 + },
  35 +
  36 + /**
  37 + * Lifecycle function--Called when page hide
  38 + */
  39 + onHide: function () {
  40 +
  41 + },
  42 +
  43 + /**
  44 + * Lifecycle function--Called when page unload
  45 + */
  46 + onUnload: function () {
  47 +
  48 + },
  49 +
  50 + /**
  51 + * Page event handler function--Called when user drop down
  52 + */
  53 + onPullDownRefresh: function () {
  54 +
  55 + },
  56 +
  57 + /**
  58 + * Called when page reach bottom
  59 + */
  60 + onReachBottom: function () {
  61 +
  62 + },
  63 +
  64 + /**
  65 + * Called when user click on the top right corner to share
  66 + */
  67 + onShareAppMessage: function () {
  68 +
  69 + }
  70 +})
  1 +<!--pages/main/addtionalreduce/additiondetail/additiondetail.wxml-->
  2 +<scroll-view class='page'>
  3 +
  4 +<!-- 子女教育 -->
  5 + <view style='padding:30rpx'>
  6 + <view style='height:90rpx;width:100%'>
  7 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  8 + <text class='text_left'>子女身份证件类型：</text>
  9 + <text class='text_right_333'>身份证</text>
  10 + </view>
  11 + <view style='height:90rpx;width:100%'>
  12 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  13 + <text class='text_left'>子女身份证件号码：</text>
  14 + <text class='text_right_333'>92589038539251</text>
  15 + </view>
  16 + <view style='height:90rpx;width:100%'>
  17 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  18 + <text class='text_left'>子女姓名</text>
  19 + <text class='text_right_333'>哈哈</text>
  20 + </view>
  21 + <view style='height:90rpx;width:100%'>
  22 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  23 + <text class='text_left'>出生日期</text>
  24 + <text class='text_right_333'>2019-01-01</text>
  25 + </view>
  26 + <view style='height:90rpx;width:100%'>
  27 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  28 + <text class='text_left'>国籍</text>
  29 + <text class='text_right_333'>中国</text>
  30 + </view>
  31 + <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
  32 + <view style='height:90rpx;width:100%'>
  33 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  34 + <text class='text_left'>分配比例</text>
  35 + <text class='text_right_333'>10%</text>
  36 + </view>
  37 + <view style='height:90rpx;width:100%'>
  38 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  39 + <text class='text_left'>子女学籍号</text>
  40 + <text class='text_right_333'>902482958937583</text>
  41 + </view>
  42 + <view style='height:90rpx;width:100%'>
  43 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  44 + <text class='text_left'>子女受教育阶段</text>
  45 + <text class='text_right_333'>大学</text>
  46 + </view>
  47 + <view style='height:90rpx;width:100%'>
  48 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  49 + <text class='text_left'>受教育日期起</text>
  50 + <text class='text_right_333'>2016-09</text>
  51 + </view>
  52 + <view style='height:90rpx;width:100%'>
  53 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  54 + <text class='text_left'>受教育日期止</text>
  55 + <text class='text_right_333'>2022-06</text>
  56 + </view>
  57 + <view style='height:90rpx;width:100%'>
  58 + <text class='text_left'>扣除方式</text>
  59 + <text class='text_right_333'>月度扣除</text>
  60 + </view>
  61 + <view style='height:90rpx;width:100%'>
  62 + <text class='text_left'>扣除金额</text>
  63 + <text class='text_right_orange'>￥1200/月</text>
  64 + </view>
  65 + <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
  66 + <view style='height:90rpx;width:100%'>
  67 + <text class='text_left'>配偶姓名</text>
  68 + <text class='text_right_333'>西施</text>
  69 + </view>
  70 + <view style='height:90rpx;width:100%'>
  71 + <text class='text_left'>配偶证件类型</text>
  72 + <text class='text_right_333'>结婚证</text>
  73 + </view>
  74 + <view style='height:90rpx;width:100%'>
  75 + <text class='text_left'>配偶身份证件号码</text>
  76 + <text class='text_right_333'>1101101010110</text>
  77 + </view>
  78 + <view style='height:90rpx;width:100%'>
  79 + <text class='text_left'>出生日期</text>
  80 + <text class='text_right_333'>2000年10月1日</text>
  81 + </view>
  82 + <view style='height:90rpx;width:100%'>
  83 + <text class='text_left'>国籍</text>
  84 + <text class='text_right_333'>中国</text>
  85 + </view>
  86 + </view>
  87 +
  88 +<!-- 赡养老人 -->
  89 +<view style='padding:30rpx' hidden='true'>
  90 +<view style='height:90rpx;width:100%'>
  91 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  92 + <text class='text_left'>赡养类型：</text>
  93 + <text class='text_right_333'>独立赡养</text>
  94 + </view>
  95 + <view style='height:90rpx;width:100%'>
  96 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  97 + <text class='text_left'>被赡养人姓名：</text>
  98 + <text class='text_right_333'>实发</text>
  99 + </view>
  100 + <view style='height:90rpx;width:100%'>
  101 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  102 + <text class='text_left'>被赡养人证件类型：</text>
  103 + <text class='text_right_333'>身份证</text>
  104 + </view>
  105 + <view style='height:90rpx;width:100%'>
  106 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  107 + <text class='text_left'>被赡养人证件号码：</text>
  108 + <text class='text_right_333'>92497239127583265721</text>
  109 + </view>
  110 + <view style='height:90rpx;width:100%'>
  111 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  112 + <text class='text_left'>被赡养人出生日期：</text>
  113 + <text class='text_right_333'>2010-09-09</text>
  114 + </view>
  115 + <view style='height:90rpx;width:100%'>
  116 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  117 + <text class='text_left'>被赡养人国籍：</text>
  118 + <text class='text_right_333'>中国</text>
  119 + </view>
  120 + <view style='height:90rpx;width:100%'>
  121 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  122 + <text class='text_left'>与纳税人关系：</text>
  123 + <text class='text_right_333'>配偶</text>
  124 + </view>
  125 + <view style='height:90rpx;width:100%'>
  126 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  127 + <text class='text_left'>分摊比例：</text>
  128 + <text class='text_right_333'>100%</text>
  129 + </view>
  130 + <view style='height:90rpx;width:100%'>
  131 + <text class='text_left'>扣除方式</text>
  132 + <text class='text_right_333'>月度扣除</text>
  133 + </view>
  134 + <view style='height:90rpx;width:100%'>
  135 + <text class='text_left'>扣除金额</text>
  136 + <text class='text_right_orange'>￥1200/月</text>
  137 + </view>
  138 +</view>
  139 +
  140 +<!-- 住房 -->
  141 + <view style='padding:30rpx' hidden='true'>
  142 + <view style='height:90rpx;width:100%' >
  143 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  144 + <text class='text_left'>租赁房屋坐落地址：</text>
  145 + <text class='text_right_333'>北京市 市辖区 朝阳区</text>
  146 + </view>
  147 + <view style='height:90rpx'>
  148 + <text class='text_right_333'>瑞创国际1101大厦</text>
  149 + </view>
  150 + <view style='height:90rpx;width:100%'>
  151 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  152 + <text class='text_left'>出租方类型：</text>
  153 + <text class='text_right_333'>个人</text>
  154 + </view>
  155 + <view style='height:90rpx;width:100%'>
  156 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  157 + <text class='text_left'>出租方名称：</text>
  158 + <text class='text_right_333'>自如</text>
  159 + </view>
  160 + <view style='height:90rpx;width:100%'>
  161 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  162 + <view style='height:90rpx;float:left;display:flex;flex-direction:column'>
  163 + <text style='font-size: 15px;color: #777777;line-height:90rpx;'>出租方纳税人识别号：</text>
  164 + <!-- <text style='line-height:24rpx;font-size:24rpx;color:#AEAEAE;'>统一社会信用代码</text> -->
  165 + </view>
  166 + <text class='text_right_333'>89712839990102</text>
  167 + </view>
  168 + <view style='height:90rpx;width:100%'>
  169 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  170 + <text class='text_left'>证书类型：</text>
  171 + <text class='text_right_333'>产权证号</text>
  172 + </view>
  173 + <view style='height:90rpx;width:100%'>
  174 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  175 + <text class='text_left'>证书号码：</text>
  176 + <text class='text_right_333'>902482958937583427252376</text>
  177 + </view>
  178 + <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
  179 + <view style='height:90rpx;width:100%'>
  180 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  181 + <text class='text_left'>租赁合同编号</text>
  182 + <text class='text_right_333'>yu9348935743757385</text>
  183 + </view>
  184 + <view style='height:90rpx;width:100%'>
  185 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  186 + <text class='text_left'>租赁期起</text>
  187 + <text class='text_right_333'>902482958937583427252376</text>
  188 + </view>
  189 + <view style='height:90rpx;width:100%'>
  190 + <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
  191 + <text class='text_left'>租赁期止</text>
  192 + <text class='text_right_333'>yu9348935743757385</text>
  193 + </view>
  194 + <view style='height:90rpx;width:100%'>
  195 + <text class='text_left'>扣除方式</text>
  196 + <text class='text_right_333'>月度扣除</text>
  197 + </view>
  198 + <view style='height:90rpx;width:100%'>
  199 + <text class='text_left'>扣除金额</text>
  200 + <text class='text_right_orange'>￥1200/月</text>
  201 + </view>
  202 + <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
  203 + <view style='height:90rpx;width:100%'>
  204 + <text class='text_left'>配偶姓名</text>
  205 + <text class='text_right_333'>西施</text>
  206 + </view>
  207 + <view style='height:90rpx;width:100%'>
  208 + <text class='text_left'>配偶证件类型</text>
  209 + <text class='text_right_333'>结婚证</text>
  210 + </view>
  211 + <view style='height:90rpx;width:100%'>
  212 + <text class='text_left'>配偶身份证件号码</text>
  213 + <text class='text_right_333'>1101101010110</text>
  214 + </view>
  215 + <view style='height:90rpx;width:100%'>
  216 + <text class='text_left'>出生日期</text>
  217 + <text class='text_right_333'>2000年10月1日</text>
  218 + </view>
  219 + <view style='height:90rpx;width:100%'>
  220 + <text class='text_left'>国籍</text>
  221 + <text class='text_right_333'>中国</text>
  222 + </view>
  223 + </view>
  224 +
  225 +
  226 +
  227 +</scroll-view>
  1 +/* pages/main/addtionalreduce/additiondetail/additiondetail.wxss */
  2 +.text_left{
  3 +font-family: PingFangSC-Regular;
  4 +font-size: 15px;
  5 +color: #777777;
  6 +line-height: 45px;
  7 +float:left;
  8 +}
  9 +
  10 +.text_right_333{
  11 +font-family: PingFangSC-Regular;
  12 +font-size: 15px;
  13 +color: #333333;
  14 +text-align: right;
  15 +line-height: 45px;
  16 +float: right;
  17 +}
  18 +
  19 +.text_right_orange{
  20 +font-family: PingFangSC-Regular;
  21 +font-size: 15px;
  22 +color: #FF9F00;
  23 +text-align: right;
  24 +line-height: 45px;
  25 +float: right;
  26 +}
@@ -9,6 +9,13 @@ Page({ @@ -9,6 +9,13 @@ Page({
9 data: { 9 data: {
10 datas: ["",""], 10 datas: ["",""],
11 is_declared: false, 11 is_declared: false,
  12 + additionlist:[],
  13 + declareStatus: {
  14 + "to_declare ": "待申报",
  15 + "declaring": "申报中",
  16 + "success": "审核成功",
  17 + "failed": "审核失败"
  18 + },
12 datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗", "住房贷款利息"] 19 datas02: ["子女教育", "继续教育", "赡养老人", "大病医疗", "住房贷款利息"]
13 }, 20 },
14 21
@@ -68,7 +75,12 @@ Page({ @@ -68,7 +75,12 @@ Page({
68 "Authorization": Authorization 75 "Authorization": Authorization
69 }, 76 },
70 success: function(res) { 77 success: function(res) {
71 - 78 + if(res&&res.data){
  79 + console.log("res",res)
  80 + that.setData({
  81 + additionlist:res.data.items
  82 + })
  83 + }
72 } 84 }
73 }) 85 })
74 }, 86 },
@@ -2,14 +2,14 @@ @@ -2,14 +2,14 @@
2 <view class='page'> 2 <view class='page'>
3 3
4 <view style='margin-bottom:30rpxbackground:#fff'> 4 <view style='margin-bottom:30rpxbackground:#fff'>
5 - <view wx:for="{{datas}}" wx:key="" style='display:flex;flex-direction:column'> 5 + <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column'>
6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'> 6 <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
7 - <text class=' text_333_40 float_left'>北京小爱智能科技</text>  
8 - <view wx:if="{{!true}}" class='view_godeclare_wrap '> 7 + <text class=' text_333_40 float_left'>{{item.legal_entity}}</text>
  8 + <view wx:if="{{item.status=='to_declare'}}" class='view_godeclare_wrap '>
9 <text class='text_godeclare_wrap '>立即申报</text> 9 <text class='text_godeclare_wrap '>立即申报</text>
10 </view> 10 </view>
11 </view> 11 </view>
12 - <view wx:if="{{true}}"> 12 + <view wx:if="{{item.addition_items&&item.addition_items.length>0}}">
13 <block wx:for="{{datas02}}" wx:key=""> 13 <block wx:for="{{datas02}}" wx:key="">
14 <view hidden="{{false}}"> 14 <view hidden="{{false}}">
15 <view class='divide_line' style='margin:0 50rpx'></view> 15 <view class='divide_line' style='margin:0 50rpx'></view>
@@ -15,6 +15,27 @@ Page({ @@ -15,6 +15,27 @@ Page({
15 new_data: null, 15 new_data: null,
16 modal_images: ["/images/childedu_declare.png", "/images/continueedu_declare.png", "/images/support_older_declare.png", "/images/health_declare.png", "/images/house_declare.png"], 16 modal_images: ["/images/childedu_declare.png", "/images/continueedu_declare.png", "/images/support_older_declare.png", "/images/health_declare.png", "/images/house_declare.png"],
17 showModal: false, 17 showModal: false,
  18 + modalData:{
  19 + // title:"请选择父母或祖父母进行申报",
  20 + // datas:["哈哈","嘎嘎","哒哒","啦啦"],
  21 + // canceltext:"添加被赡养人并申报",
  22 + // confirmtext: "确定为该被赡养人申报",
  23 +
  24 + // title: "请选择扣除方式",
  25 + // datas: ["月度", "年度"],
  26 + // canceltext: "取消",
  27 + // confirmtext: "确认",
  28 +
  29 + // title: "请选择本人、配偶或子女进行大病支出申报",
  30 + // datas: ["周先生", "安女士","小淘气"],
  31 + // canceltext: "添加家庭成员并申报",
  32 + // confirmtext: "确定为该选择的人申报",
  33 +
  34 + title: "请选择子女进行申报",
  35 + datas: ["熊大", "熊二"],
  36 + canceltext: "添加新子女并申报",
  37 + confirmtext: "确定为该子女申报",
  38 + },
18 datas: ["",""] 39 datas: ["",""]
19 }, 40 },
20 41
@@ -60,9 +81,17 @@ Page({ @@ -60,9 +81,17 @@ Page({
60 81
61 }, 82 },
62 83
  84 + showdetail:function(e){
  85 + wx.navigateTo({
  86 + url: '../additiondetail/additiondetail?index=' + this.data.cur_index,
  87 + })
  88 + },
  89 +
63 goadd: function(e) { //添加 90 goadd: function(e) { //添加
64 var that = this 91 var that = this
65 - if(true){} 92 + if(true){
  93 +
  94 + }
66 wx.navigateTo({ 95 wx.navigateTo({
67 url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title, 96 url: '../addextrainfo/addextrainfo?index=' + this.data.cur_index + '&title=' + that.data.title,
68 }) 97 })
@@ -338,7 +338,7 @@ @@ -338,7 +338,7 @@
338 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text> 338 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</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'>查看</text> 341 + <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
342 </view> 342 </view>
343 </view> 343 </view>
344 </view> 344 </view>
@@ -443,7 +443,7 @@ @@ -443,7 +443,7 @@
443 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text> 443 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
444 </view> 444 </view>
445 <view class='divide_line_f5f5f5'></view> 445 <view class='divide_line_f5f5f5'></view>
446 - <text class='text_blue_28 float_right' style='line-height:90rpx'>查看</text> 446 + <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
447 </view> 447 </view>
448 448
449 </view> 449 </view>
@@ -518,7 +518,7 @@ @@ -518,7 +518,7 @@
518 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text> 518 <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
519 </view> 519 </view>
520 <view class='divide_line_f5f5f5'></view> 520 <view class='divide_line_f5f5f5'></view>
521 - <text class='text_blue_28 float_right' style='line-height:90rpx'>查看</text> 521 + <text class='text_blue_28 float_right' style='line-height:90rpx' bindtap='showdetail'>查看</text>
522 </view> 522 </view>
523 </view> 523 </view>
524 </view> 524 </view>
@@ -539,29 +539,35 @@ @@ -539,29 +539,35 @@
539 </view> 539 </view>
540 540
541 <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view> 541 <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
542 -<view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal}}"> 542 +<!-- <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal}}">
543 <image class='modal_img' src="{{modal_images[cur_index]}}" bindtap='closeModal'></image> 543 <image class='modal_img' src="{{modal_images[cur_index]}}" bindtap='closeModal'></image>
544 - <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModal'>x</text> -->  
545 -</view>  
546 -<!-- <view class='modal_lg' style='' hidden="{{!showModal}}">  
547 - <text class='text_modal_title' >请选择子女进行申报</text> 544 + <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModal'>x</text>
  545 +</view> -->
  546 +<view class='modal_lg' style='' hidden="{{!showModal}}">
  547 + <text class='text_modal_title' >{{modalData.title}}</text>
548 <view class='divide_line_f5f5f5'></view> 548 <view class='divide_line_f5f5f5'></view>
549 <view style='width:100%;display:flex;flex-direction:column;align-items:center;'> 549 <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
550 - <block wx:for="{{datas}}" wx:for-index="idx"> 550 + <block wx:for="{{modalData.datas}}" wx:for-index="idx">
551 <view wx:if="{{idx!=1}}"> 551 <view wx:if="{{idx!=1}}">
552 - <text class='text_item_black float_left'>月度</text> 552 + <text class='text_item_black float_left'>{{item}}</text>
553 </view> 553 </view>
554 <view wx:else> 554 <view wx:else>
555 - <text class='text_item_blue float_left'>年度</text> 555 + <text class='text_item_blue float_left'>{{item}}</text>
556 <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image> 556 <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
557 </view> 557 </view>
558 <view class='divide_line_f5f5f5'></view> 558 <view class='divide_line_f5f5f5'></view>
559 </block> 559 </block>
560 </view> 560 </view>
561 <view class='divide_line_f5f5f5'></view> 561 <view class='divide_line_f5f5f5'></view>
  562 + <!-- <view style='width:100%;display: flex;'>
  563 + <text class='text_cancel' bindtap='showdeclare'>{{modalData.canceltext}}</text>
  564 + <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
  565 + <text class='text_confirm' bindtap='closeModal'>{{modalData.confirmtext}}</text>
  566 + </view> -->
  567 +
562 <view style='width:100%;display: flex;'> 568 <view style='width:100%;display: flex;'>
563 - <text class='text_cancel' bindtap='cancelhandle'>取消</text> 569 + <text class='text_cancel01' bindtap='cancelhandle'>{{modalData.canceltext}}</text>
564 <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view> 570 <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
565 - <text class='text_confirm' bindtap='confirmhandle'>确定</text> 571 + <text class='text_confirm01' bindtap='confirmhandle'>{{modalData.confirmtext}}</text>
566 </view> 572 </view>
567 -</view> -->  
  573 +</view>
@@ -151,8 +151,8 @@ @@ -151,8 +151,8 @@
151 color: #999; 151 color: #999;
152 letter-spacing: 0; 152 letter-spacing: 0;
153 text-align: center; 153 text-align: center;
154 - line-height: 100rpx;  
155 flex: 1; 154 flex: 1;
  155 + padding: 30rpx
156 } 156 }
157 157
158 .text_confirm { 158 .text_confirm {
@@ -161,8 +161,28 @@ @@ -161,8 +161,28 @@
161 color: #108ee9; 161 color: #108ee9;
162 letter-spacing: 0; 162 letter-spacing: 0;
163 text-align: center; 163 text-align: center;
164 - line-height: 100rpx;  
165 flex: 1; 164 flex: 1;
  165 + padding: 30rpx
  166 +}
  167 +
  168 +.text_cancel01 {
  169 + font-family: PingFangSC-Regular;
  170 + font-size: 28rpx;
  171 + color: #999;
  172 + letter-spacing: 0;
  173 + text-align: center;
  174 + flex: 1;
  175 + padding: 30rpx
  176 +}
  177 +
  178 +.text_confirm01 {
  179 + font-family: PingFangSC-Regular;
  180 + font-size: 28rpx;
  181 + color: #108ee9;
  182 + letter-spacing: 0;
  183 + text-align: center;
  184 + flex: 1;
  185 + padding: 30rpx
166 } 186 }
167 187
168 .icon_choosed { 188 .icon_choosed {
1 // pages/main/guide/guide.js 1 // pages/main/guide/guide.js
2 - 2 +var baseUrl = getApp().globalData.baseUrl;
3 Page({ 3 Page({
4 4
5 /** 5 /**
6 * 页面的初始数据 6 * 页面的初始数据
7 */ 7 */
8 data: { 8 data: {
9 - 9 +
10 }, 10 },
11 11
12 /** 12 /**
13 * 生命周期函数--监听页面加载 13 * 生命周期函数--监听页面加载
14 */ 14 */
15 - onLoad: function (options) {  
16 - if(false){  
17 - wx.showModal({  
18 - title: '温馨提示',  
19 - content: '您的自然人基础信息尚未完善，请先完善基础信息',  
20 - confirmText:'立即完善',  
21 - showCancel: false,  
22 - confirmColor:'#357aeb',  
23 - success(res){  
24 - wx.navigateTo({  
25 - url: '../taxperson/editinfo/editinfo',  
26 - })  
27 - }  
28 - })  
29 - } 15 + onLoad: function(options) {
  16 +
30 }, 17 },
31 18
32 /** 19 /**
33 * 生命周期函数--监听页面初次渲染完成 20 * 生命周期函数--监听页面初次渲染完成
34 */ 21 */
35 - onReady: function () {  
36 - 22 + onReady: function() {
  23 +
37 }, 24 },
38 25
39 /** 26 /**
40 * 生命周期函数--监听页面显示 27 * 生命周期函数--监听页面显示
41 */ 28 */
42 - onShow: function () {  
43 - 29 + onShow: function() {
  30 + this.taxconfirm();
44 }, 31 },
45 32
46 -/** 33 + taxconfirm: function() {
  34 + var that = this;
  35 + var Authorization = getApp().globalData.Authorization;
  36 + console.log("Authorization", Authorization)
  37 + if (Authorization && Authorization.length > 10) {
  38 + wx.request({
  39 + url: baseUrl + 'persontax/v1/personal-taxes-confirm',
  40 + header: {
  41 + 'content-type': 'application/json',
  42 + "Authorization": Authorization
  43 + },
  44 + success: function(res) {
  45 + console.log("taxconfirm", res)
  46 + if (res.data && (res.data.status == '1' || res.data.status == '2')) { //未完善
  47 + that.showModal(res.data)
  48 + }
  49 + }
  50 + })
  51 + }
  52 + },
  53 +
  54 + showModal: function(data) {
  55 + wx.showModal({
  56 + title: '温馨提示',
  57 + content: '您的自然人基础信息尚未完善，请先完善基础信息',
  58 + confirmText: '立即完善',
  59 + showCancel: false,
  60 + confirmColor: '#357aeb',
  61 + success(res) {
  62 + if(res.confirm){
  63 + if (data.status == '1' && data.id) {
  64 + wx.navigateTo({
  65 + url: '../taxperson/editinfo/editinfo?id=' + data.id,
  66 + })
  67 + } else if (data.status == '1') {
  68 + wx.navigateTo({
  69 + url: '../taxperson/taxperson/addinfo/addinfo',
  70 + })
  71 + }
  72 + }
  73 + }
  74 + })
  75 + },
  76 +
  77 + /**
47 * 自然人信息采集 78 * 自然人信息采集
48 */ 79 */
49 - gotaxPerson:function(){  
50 - wx.navigateTo({  
51 - url: '../taxperson/home',  
52 - }) 80 + gotaxPerson: function() {
  81 + wx.navigateTo({
  82 + url: '../taxperson/home',
  83 + })
53 }, 84 },
54 85
55 /** 86 /**
56 * 专项附加扣除 87 * 专项附加扣除
57 */ 88 */
58 - goAdditionalDiduction: function () { 89 + goAdditionalDiduction: function() {
59 wx.navigateTo({ 90 wx.navigateTo({
60 url: '../addtionalreduce/home', 91 url: '../addtionalreduce/home',
61 }) 92 })
@@ -64,7 +95,7 @@ Page({ @@ -64,7 +95,7 @@ Page({
64 /** 95 /**
65 * 预扣预缴 96 * 预扣预缴
66 */ 97 */
67 - goAdvancePayment: function () { 98 + goAdvancePayment: function() {
68 wx.navigateTo({ 99 wx.navigateTo({
69 url: '../advancepayment/home', 100 url: '../advancepayment/home',
70 }) 101 })
@@ -73,13 +104,13 @@ Page({ @@ -73,13 +104,13 @@ Page({
73 /** 104 /**
74 * 汇算清缴 105 * 汇算清缴
75 */ 106 */
76 - goFinalPayment: function () { 107 + goFinalPayment: function() {
77 wx.navigateTo({ 108 wx.navigateTo({
78 url: '../finalpayment/home', 109 url: '../finalpayment/home',
79 }) 110 })
80 }, 111 },
81 112
82 - gochat: function () { 113 + gochat: function() {
83 wx.navigateTo({ 114 wx.navigateTo({
84 url: '../smartchat/chat', 115 url: '../smartchat/chat',
85 }) 116 })
@@ -88,35 +119,35 @@ Page({ @@ -88,35 +119,35 @@ Page({
88 /** 119 /**
89 * 生命周期函数--监听页面隐藏 120 * 生命周期函数--监听页面隐藏
90 */ 121 */
91 - onHide: function () {  
92 - 122 + onHide: function() {
  123 +
93 }, 124 },
94 125
95 /** 126 /**
96 * 生命周期函数--监听页面卸载 127 * 生命周期函数--监听页面卸载
97 */ 128 */
98 - onUnload: function () {  
99 - 129 + onUnload: function() {
  130 +
100 }, 131 },
101 132
102 /** 133 /**
103 * 页面相关事件处理函数--监听用户下拉动作 134 * 页面相关事件处理函数--监听用户下拉动作
104 */ 135 */
105 - onPullDownRefresh: function () {  
106 - 136 + onPullDownRefresh: function() {
  137 +
107 }, 138 },
108 139
109 /** 140 /**
110 * 页面上拉触底事件的处理函数 141 * 页面上拉触底事件的处理函数
111 */ 142 */
112 - onReachBottom: function () {  
113 - 143 + onReachBottom: function() {
  144 +
114 }, 145 },
115 146
116 /** 147 /**
117 * 用户点击右上角分享 148 * 用户点击右上角分享
118 */ 149 */
119 - onShareAppMessage: function () {  
120 - 150 + onShareAppMessage: function() {
  151 +
121 } 152 }
122 }) 153 })
请 注册 或 登录 后发表评论