提交 783b536268587aaecc903a2234baf3c7cbfe7713
Merge branch '机器人dev' into 苏州英格玛
# Conflicts: # pages/main/advancepayment/adPayHome.js # project.config.json
正在显示
2 个修改的文件
包含
14 行增加
和
7 行删除
@@ -194,11 +194,19 @@ Page({ | @@ -194,11 +194,19 @@ Page({ | ||
194 | // }) | 194 | // }) |
195 | }, | 195 | }, |
196 | 196 | ||
197 | + | ||
197 | handleDetailsData: function (data) { | 198 | handleDetailsData: function (data) { |
198 | - let titles = JSON.parse(data['slip_titles']) | 199 | + |
200 | + // let titles = JSON.parse(data['slip_titles']) | ||
201 | + let titles = JSON.parse(data['salary_columns']) | ||
199 | let detail = JSON.parse(data['detail']) | 202 | let detail = JSON.parse(data['detail']) |
200 | - let mapping_keys = data["mapping_keys"] ? data["mapping_keys"]:[] | ||
201 | - console.log(titles,detail,mapping_keys) | 203 | + let mapping_keys = data["mapping_keys"] ? data["mapping_keys"] : [] |
204 | + console.log(titles, detail, mapping_keys) | ||
205 | + // var obj = {} | ||
206 | + // let titles = titles01.concat(titles02).reduce(function (item, next) { | ||
207 | + // obj[next.key] ? '' : obj[next.key] = true && item.push(next); | ||
208 | + // return item; | ||
209 | + // }, []); | ||
202 | var details = [] | 210 | var details = [] |
203 | for (var i = 0; i < titles.length; ++i) { | 211 | for (var i = 0; i < titles.length; ++i) { |
204 | var titleData = titles[i] | 212 | var titleData = titles[i] |
@@ -214,7 +222,7 @@ Page({ | @@ -214,7 +222,7 @@ Page({ | ||
214 | } | 222 | } |
215 | } | 223 | } |
216 | if (!title) continue; | 224 | if (!title) continue; |
217 | - // if (!title || (value != 0 && !value)) continue; | 225 | + // if (!title || (value!=0&&!value)) continue; |
218 | // if (mapping_keys.indexOf(titleData['key']) == -1 && (value == '0' || value == 0)) continue; | 226 | // if (mapping_keys.indexOf(titleData['key']) == -1 && (value == '0' || value == 0)) continue; |
219 | details.push({ | 227 | details.push({ |
220 | title: title, | 228 | title: title, |
@@ -224,7 +232,6 @@ Page({ | @@ -224,7 +232,6 @@ Page({ | ||
224 | console.log('details', details) | 232 | console.log('details', details) |
225 | return details | 233 | return details |
226 | }, | 234 | }, |
227 | - | ||
228 | goItemDetails: function (e) { | 235 | goItemDetails: function (e) { |
229 | var item = this.data.taxDatas[e.currentTarget.id] | 236 | var item = this.data.taxDatas[e.currentTarget.id] |
230 | wx.navigateTo({ | 237 | wx.navigateTo({ |
@@ -8,7 +8,7 @@ Page({ | @@ -8,7 +8,7 @@ Page({ | ||
8 | data: { | 8 | data: { |
9 | verify_img: "/images/verify_succ.png", | 9 | verify_img: "/images/verify_succ.png", |
10 | verify_status: "succ", | 10 | verify_status: "succ", |
11 | - verify_tip: "", | 11 | + verify_tip: "恭喜您!认证成功", |
12 | btn_text: "完成" | 12 | btn_text: "完成" |
13 | }, | 13 | }, |
14 | 14 | ||
@@ -28,7 +28,7 @@ Page({ | @@ -28,7 +28,7 @@ Page({ | ||
28 | this.setData({ | 28 | this.setData({ |
29 | verify_img: "/images/verify_fail.png", | 29 | verify_img: "/images/verify_fail.png", |
30 | verify_status: "fail", | 30 | verify_status: "fail", |
31 | - verify_tip: options.msg?options.msg:"对不起!认证失败", | 31 | + verify_tip: options.msg ? "对不起!认证失败 \n "+options.msg:"对不起!认证失败", |
32 | btn_text: "重新认证" | 32 | btn_text: "重新认证" |
33 | }) | 33 | }) |
34 | } | 34 | } |
请
注册
或
登录
后发表评论