wangyu / naturalPersonTax · 提交

提交 5f1bc0817329d6a257a38bb43295e62537e64f1c

作者 wangyu
1 个父辈 4cb22f54

优化

内嵌 并排对比
正在显示 12 个修改的文件 包含 196 行增加 和 107 行删除
... ... @@ -61,8 +61,8 @@ App({
61 61 } else if (user && user.type == "1") {//注册用户
62 62 if (relaunch) {
63 63 wx.reLaunch({ //重新加载
64   - url: '../main/home/home'
65   - // url: '../../getPhone/getPhone'
  64 + // url: '../main/home/home'
  65 + url: '../../getPhone/getPhone'
66 66 })
67 67 }
68 68 }
... ...
... ... @@ -39,6 +39,14 @@
39 39 line-height: 80rpx;
40 40 }
41 41
  42 +.text_999_28 {
  43 + font-family: PingFangSC-Regular;
  44 + font-size: 28rpx;
  45 + color: #999;
  46 + text-align: right;
  47 + line-height: 80rpx;
  48 +}
  49 +
42 50 .arrow_wrap {
43 51 width: 40rpx;
44 52 height: 40rpx;
... ... @@ -57,6 +65,7 @@
57 65
58 66 .btn_bottom {
59 67 width: 100%;
  68 + z-index: 10000;
60 69 height: 84rpx;
61 70 background: #357aeb;
62 71 text-align: center;
... ...
... ... @@ -12,11 +12,9 @@
12 12 <view class="weui-cell__bd">
13 13 <picker mode="{{mode?mode:'selector'}}" range-key="{{range_key}}" range="{{values}}" fields="{{fields}}" start="{{start}}" end="{{end}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'>
14 14 <view wx:if="{{selected}}" class="text_333_28 float_right">{{selected}}</view>
15   - <view wx:elif="{{placeholder}}" class="text_333_28 float_right">{{placeholder}}</view>
  15 + <view wx:elif="{{placeholder}}" class="text_999_28 float_right">{{placeholder}}</view>
16 16 </picker>
17 17 </view>
18   -
19   - <!-- <text class='text_333_28 float_right'>请选择关系</text> -->
20 18 </view>
21 19 </template>
22 20
... ...
... ... @@ -14,7 +14,10 @@
14 14
15 15 <view class='input-wrap' style='height:100rpx;right:0'>
16 16 <input class="text-area float_left" bindinput="verifyInputEvent" name="verify_code" placeholder='短信验证码' placeholder-class='text-area' style='width:320rpx'></input>
17   - <button class="code-btn float_right" bindtap="verifyCodeEvent" disabled="{{buttonDisable}}">{{verifyCodeTime}}</button>
  17 + <!-- <button class="code-btn float_right" bindtap="verifyCodeEvent" disabled="{{buttonDisable}}">{{verifyCodeTime}}</button> -->
  18 + <view class="code-bg float_right" bindtap="verifyCodeEvent" disabled="{{buttonDisable}}">
  19 + {{verifyCodeTime}}
  20 + </view>
18 21 </view>
19 22 <view class="divide_line"></view>
20 23 </view>
... ...
... ... @@ -34,3 +34,19 @@
34 34 box-shadow: 0 4px 14px 0 rgba(127, 190, 252, 0.30);
35 35 border-radius: 100px;
36 36 }
  37 +
  38 +.code-bg {
  39 + relative:absolute;
  40 + float: right;
  41 + right: 0;
  42 + color: #fff;
  43 + font-size: 24rpx;
  44 + height: 64rpx;
  45 + width: 180rpx;
  46 + line-height: 64rpx;
  47 + text-align: center;
  48 + margin-top: 20rpx;
  49 + background: #7fbefc;
  50 + box-shadow: 0 4px 14px 0 rgba(127, 190, 252, 0.30);
  51 + border-radius: 100px;
  52 +}
\ No newline at end of file
... ...
... ... @@ -19,7 +19,7 @@ Page({
19 19 card_number: '',
20 20 birthday: '',
21 21 requestBody: {},
22   - disabledName:false,
  22 + disabledName: false,
23 23
24 24 relativeData: {
25 25 isrequre: true,
... ... @@ -79,7 +79,6 @@ Page({
79 79 mode: 'multiSelector',
80 80 label: '职业',
81 81 bindtype: 'profession',
82   - multiIndex: [0, 0, 0],
83 82 selected: '',
84 83 placeholder: '请选择职业',
85 84 onChange: 'onPickerSelect'
... ... @@ -191,8 +190,8 @@ Page({
191 190 currentaddressInfo: {
192 191 label: '居住地',
193 192 mode: 'region',
194   - address_code:['','',''],
195   - address_value:['','',''],
  193 + address_code: ['', '', ''],
  194 + address_value: ['', '', ''],
196 195 selected: '',
197 196 placeholder: '请选择居住地',
198 197 onChange: 'currentAddressSelect'
... ... @@ -275,58 +274,106 @@ Page({
275 274 console.log('proffessionData--', that.data.professionData)
276 275 },
277 276
278   - handleProfession: function(data) {
279   - var newdata = []
280   - var one = []
281   - var two = []
282   - var three = []
283   - var oneObj = {},
284   - twoObj = {},
285   - threeObj = {}
286   - if (data && data.length > 0) {
287   - console.log('one', one)
288   - data.map((d, i) => {
289   - one.push(d.one_level_code) //三级联动中 第一级所有的code
290   - two.push(d.two_level_code) //三级联动中 第二级所有的code
291   - three.push(d.three_level_code) //三级联动中 第三级所有的code
292   - oneObj[d.one_level_code] = {
  277 + handleProfession: function(items) {
  278 + // var newdata = []
  279 + // var one = []
  280 + // var two = []
  281 + // var three = []
  282 + // var oneObj = {},
  283 + // twoObj = {},
  284 + // threeObj = {}
  285 + // if (data && data.length > 0) {
  286 + // console.log('one', one)
  287 + // data.map((d, i) => {
  288 + // one.push(d.one_level_code) //三级联动中 第一级所有的code
  289 + // two.push(d.two_level_code) //三级联动中 第二级所有的code
  290 + // three.push(d.three_level_code) //三级联动中 第三级所有的code
  291 + // oneObj[d.one_level_code] = {
  292 + // "value": d.one_level_code,
  293 + // "label": d.one_level_name,
  294 + // "children": []
  295 + // } //三级联动中 第一级所有的code + name
  296 + // twoObj[d.two_level_code] = {
  297 + // "value": d.two_level_code,
  298 + // "label": d.two_level_name,
  299 + // "children": []
  300 + // } //三级联动中 第一级所有的code + name
  301 + // threeObj[d.three_level_code] = {
  302 + // "value": d.three_level_code,
  303 + // "label": d.three_level_name
  304 + // } //三级联动中 第一级所有的code + name
  305 + // for (let b in twoObj) { //把第三级的数据的Code和第二级数据的code做判断 相等的 放到第二级的children数组中
  306 + // for (let c in threeObj) {
  307 + // if (b == c.slice(0, c.length - 1)) {
  308 + // twoObj[b].children.push(threeObj[c])
  309 + // }
  310 + // }
  311 + // }
  312 + // for (let a in oneObj) { //把第二级的数据的Code和第二级数据的code做判断 相等的 放到第一级的children数组中
  313 + // for (let b in twoObj) {
  314 + // if (a == b.slice(0, b.length - 1)) {
  315 + // oneObj[a].children.push(twoObj[b])
  316 + // }
  317 + // }
  318 + // }
  319 + // one = [...new Set(one)] //一级code去重
  320 + // one.map((da, ind) => { //遍历 得到最终的三级联动数据
  321 + // // console.log('oneObj', newdata)
  322 + // newdata.push(oneObj[da])
  323 + // })
  324 + // })
  325 + // }
  326 + // return newdata
  327 +
  328 + var list = [],
  329 + tempTwo = {},
  330 + tempOne = {},
  331 + tempThree = {};
  332 + items.map((d) => {
  333 + if (!tempOne[d.one_level_code]) {
  334 + tempOne[d.one_level_code] = {
293 335 "value": d.one_level_code,
294 336 "label": d.one_level_name,
295 337 "children": []
296   - } //三级联动中 第一级所有的code + name
297   - twoObj[d.two_level_code] = {
  338 + };
  339 + }
  340 + if (!tempTwo[d.two_level_code]) {
  341 + var districtArray = [];
  342 + districtArray.push({
  343 + "value": d.three_level_code,
  344 + "label": d.three_level_name,
  345 + "children": []
  346 + });
  347 +
  348 + tempTwo[d.two_level_code] = {
298 349 "value": d.two_level_code,
299 350 "label": d.two_level_name,
300   - "children": []
301   - } //三级联动中 第一级所有的code + name
302   - threeObj[d.three_level_code] = {
303   - "value": d.three_level_code,
304   - "label": d.three_level_name
305   - } //三级联动中 第一级所有的code + name
306   - for (let b in twoObj) { //把第三级的数据的Code和第二级数据的code做判断 相等的 放到第二级的children数组中
307   - for (let c in threeObj) {
308   - if (b == c.slice(0, c.length - 1)) {
309   - twoObj[b].children.push(threeObj[c])
310   - }
311   - }
  351 + "children": districtArray
  352 + };
  353 +
  354 + } else {
  355 + if (!tempThree[d.three_level_code]) {
  356 + tempTwo[d.two_level_code].children.push({
  357 + "value": d.three_level_code,
  358 + "label": d.three_level_name,
  359 + "children": []
  360 + });
  361 + tempThree[d.three_level_code] = "y"
312 362 }
313   - for (let a in oneObj) { //把第二级的数据的Code和第二级数据的code做判断 相等的 放到第一级的children数组中
314   - for (let b in twoObj) {
315   - if (a == b.slice(0, b.length - 1)) {
316   - oneObj[a].children.push(twoObj[b])
317   - }
318   - }
319   - }
320   - one = [...new Set(one)] //一级code去重
321   - one.map((da, ind) => { //遍历 得到最终的三级联动数据
322   - // console.log('oneObj', newdata)
323   - newdata.push(oneObj[da])
324   - })
325   - })
  363 + }
  364 + });
  365 + items.map((d) => {
  366 + if (tempTwo[d.two_level_code]) {
  367 + tempOne[d.one_level_code].children.push(tempTwo[d.two_level_code]);
  368 + tempTwo[d.two_level_code] = null;
  369 + }
  370 + });
  371 + for (var key in tempOne) {
  372 + list.push(tempOne[key]);
326 373 }
327   - console.log('newdata', newdata)
328   -
329   - return newdata
  374 + console.log('newdata', list)
  375 + return list;
  376 +
330 377 },
331 378
332 379 getbanklist: function() {
... ... @@ -342,7 +389,7 @@ Page({
342 389 },
343 390 success: function(res) {
344 391 console.log(res)
345   - if (res.data&&res.data.items&&res.data.items.length>0){
  392 + if (res.data && res.data.items && res.data.items.length > 0) {
346 393 bank_info.values = that.handleBankinfo(res.data.items)
347 394
348 395 that.setData({
... ... @@ -382,7 +429,7 @@ Page({
382 429 key: 'id_info',
383 430 success: function(res) {
384 431 console.log('id_info', res.data)
385   - if (res.data && res.data.id_card_number){
  432 + if (res.data && res.data.id_card_number) {
386 433 var id_info = JSON.parse(res.data)
387 434
388 435 var birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
... ... @@ -403,7 +450,7 @@ Page({
403 450 wx.removeStorage({
404 451 key: 'id_info',
405 452 success: function(res) {
406   - console.log('remove_idinfo',res)
  453 + console.log('remove_idinfo', res)
407 454 },
408 455 })
409 456 },
... ... @@ -534,6 +581,13 @@ Page({
534 581 employeeInfo: employee_data
535 582 })
536 583 break;
  584 + case 'investpersonal':
  585 + var investpersonal_data = this.data.investpersonalInfo
  586 + investpersonal_data.selected = investpersonal_data.values[e.detail.value]
  587 + this.setData({
  588 + investpersonalInfo: investpersonal_data
  589 + })
  590 + break;
537 591 }
538 592
539 593 },
... ... @@ -624,10 +678,10 @@ Page({
624 678 } else if (this.data.cardtypeData.selected.length < 1) {
625 679 this.showtoast('请选择证照类型');
626 680 return
627   - } else if (this.data.isIdCard && this.data.card_number.length < 1 ) {
  681 + } else if (this.data.isIdCard && this.data.card_number.length < 1) {
628 682 this.showtoast('请上传有效证件照片');
629 683 return
630   - } else if (!this.data.isIdCard&&(!formdata.id_card_no || formdata.id_card_no.length < 1)) {
  684 + } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
631 685 this.showtoast('请输入证件号码');
632 686 return
633 687 } else if (formdata.mobile.length < 1) {
... ... @@ -644,7 +698,7 @@ Page({
644 698 if (this.data.isIdCard && this.data.card_number.length > 0) {
645 699 new_ard_num = this.data.card_number
646 700 }
647   - if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length >0) {
  701 + if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length > 0) {
648 702 new_ard_num = formdata.id_card_no
649 703 }
650 704 this.setData({
... ... @@ -662,7 +716,7 @@ Page({
662 716 url: baseUrl + 'persontax/v1/personal-taxes',
663 717 method: "POST",
664 718 data: {
665   - "name": that.data.name.length > 0 ? that.data.name : form_data.name,
  719 + "name": that.data.name.length > 0 ? that.data.name : formdata.name,
666 720 "family_ties": that.data.relativeData.selected,
667 721 "native": "中国",
668 722 "id_card_type": that.data.relativeData.selected,
... ... @@ -678,7 +732,7 @@ Page({
678 732 "three_level_name": "哲学研究人员"
679 733 },
680 734 "education": that.data.degreeData.selected,
681   - "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no:'',
  735 + "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',
682 736 "taxpayer_status": that.data.personstatusData.selected,
683 737 "is_martyr_family": that.data.lieshuInfo.selected,
684 738 "martyr_family_no": formdata.martyr_family_no,
... ... @@ -718,8 +772,8 @@ Page({
718 772 "email": formdata.email,
719 773 "bank": that.data.bankInfo.selected,
720 774 "bank_account": formdata.bank_account,
721   - "join_date": that.data.startDate.selected.length>0? Date.parse(new Date(that.data.startDate.selected)) / 1000:0,
722   - "separate_date": that.data.endDate.selected.length>0?Date.parse(new Date(that.data.endDate.selected)) / 1000:0,
  775 + "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : 0,
  776 + "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : 0,
723 777 "is_employee": that.data.employeeInfo.selected,
724 778 "is_specific_profession": that.data.specificIndustryInfo.selected,
725 779 "is_investor": that.data.investInfo.selected,
... ...
... ... @@ -13,7 +13,7 @@
13 13 <view class='item_body'>
14 14 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
15 15 <text class='text_black_28 float_left'>姓名</text>
16   - <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}'></input>
  16 + <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' placeholder-class='text_999_28' ></input>
17 17 </view>
18 18 <view class="divide_line"></view>
19 19 <!-- <view class='item_body' bindtap='openpicker'>
... ... @@ -45,7 +45,7 @@
45 45 <view class='item_body' hidden="{{!isself}}">
46 46 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
47 47 <text class='text_black_28 float_left'>姓名</text>
48   - <input class='input_wrap float_right' placeholder='请填写姓名' value='{{taxInfo.name}}' disabled='{{disabledName}}'></input>
  48 + <input class='input_wrap float_right' placeholder='请填写姓名' value='{{taxInfo.name}}' disabled='{{disabledName}}' placeholder-class='text_999_28'></input>
49 49 </view>
50 50 <view class="divide_line"></view>
51 51
... ... @@ -82,7 +82,7 @@
82 82 <text class='text_333_28 float_right'>{{card_number}}</text>
83 83 </view>
84 84 <view wx:else>
85   - <input class='input_wrap float_right' placeholder='请输入证件号码' name='id_card_no'></input>
  85 + <input class='input_wrap float_right' placeholder='请输入证件号码' placeholder-class='text_999_28' name='id_card_no'></input>
86 86 </view>
87 87 </view>
88 88 <view class="divide_line"></view>
... ... @@ -117,7 +117,7 @@
117 117 <image class='arrow_wrap' src='/images/arrow_right.png'></image>
118 118 <text class='text_333_28 float_right'></text>
119 119 </view> -->
120   - <template is="picker_cell_muti" data="{{...professionData}}" />
  120 + <template is="picker_cell_normal" data="{{...professionData}}" />
121 121 <view class="divide_line"></view>
122 122 <!-- <view class='item_body'>
123 123 <text class='text_666_28 float_left'>学历</text>
... ... @@ -128,7 +128,7 @@
128 128 <view class="divide_line"></view>
129 129 <view class='item_body'>
130 130 <text class='text_666_28 float_left'>纳税人识别号</text>
131   - <input class='input_wrap float_right' name='taxpayer_no' type='number'></input>
  131 + <input class='input_wrap float_right' name='taxpayer_no' type='number' placeholder-class='text_999_28' placeholder='请输入纳税人识别号'></input>
132 132 </view>
133 133 <view class="divide_line"></view>
134 134 <!-- <view class='item_body'>
... ... @@ -140,7 +140,7 @@
140 140 <view class="divide_line"></view>
141 141 <view class='item_body'>
142 142 <text class='text_666_28 float_left'>残疾证号</text>
143   - <input class='input_wrap float_right' name='disability_no' type='number'></input>
  143 + <input class='input_wrap float_right' name='disability_no' type='number' placeholder-class='text_999_28' placeholder='请输入残疾证号'></input>
144 144 </view>
145 145 <view class="divide_line"></view>
146 146 <!-- <view class='item_body'>
... ... @@ -152,7 +152,7 @@
152 152 <view class="divide_line"></view>
153 153 <view class='item_body'>
154 154 <text class='text_666_28 float_left'>烈属证号</text>
155   - <input class='input_wrap float_right' name='martyr_family_no' type='number'></input>
  155 + <input class='input_wrap float_right' name='martyr_family_no' type='number' placeholder-class='text_999_28' placeholder='请输入烈属证号'></input>
156 156 </view>
157 157 <view class="divide_line"></view>
158 158 <!-- <view class='item_body'>
... ... @@ -182,7 +182,7 @@
182 182 <view class='item_body'>
183 183 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
184 184 <text class='text_black_28 float_left'>联系电话</text>
185   - <input class='input_wrap float_right' placeholder='请填写电话' value='{{taxInfo.mobile}}' name='mobile' type='number'></input>
  185 + <input class='input_wrap float_right' placeholder='请填写电话' value='{{taxInfo.mobile}}' name='mobile' type='number' placeholder-class='text_999_28'></input>
186 186 </view>
187 187 <!-- 非必填部分02 -->
188 188 <view hidden='{{!isshow02}}'>
... ... @@ -196,7 +196,7 @@
196 196 <view class="divide_line"></view>
197 197 <view class='item_body'>
198 198 <text class='text_666_28 float_left'>详细地址</text>
199   - <input class='input_wrap float_right' name='contact_address_detail'></input>
  199 + <input class='input_wrap float_right' name='contact_address_detail' placeholder-class='text_999_28' placeholder='请输入详细联系地址'></input>
200 200 </view>
201 201 <view class="divide_line"></view>
202 202 <!-- <view class='item_body'>
... ... @@ -208,12 +208,12 @@
208 208 <view class="divide_line"></view>
209 209 <view class='item_body'>
210 210 <text class='text_666_28 float_left'>银行账号</text>
211   - <input class='input_wrap float_right' name='bank_account'></input>
  211 + <input class='input_wrap float_right' name='bank_account' placeholder-class='text_999_28' placeholder='请输入银行账号'></input>
212 212 </view>
213 213 <view class="divide_line"></view>
214 214 <view class='item_body'>
215 215 <text class='text_666_28 float_left'>电子邮箱</text>
216   - <input class='input_wrap float_right' name='email'></input>
  216 + <input class='input_wrap float_right' name='email' placeholder-class='text_999_28' placeholder='请输入电子邮箱'></input>
217 217 </view>
218 218 <view class="divide_line"></view>
219 219 <!-- <view class='item_body'>
... ... @@ -225,7 +225,7 @@
225 225 <view class="divide_line"></view>
226 226 <view class='item_body'>
227 227 <text class='text_666_28 float_left'>详细地址</text>
228   - <input class='input_wrap float_right' name='current_address_detail'></input>
  228 + <input class='input_wrap float_right' name='current_address_detail' placeholder-class='text_999_28' placeholder='请输入详细居住地址'></input>
229 229 </view>
230 230 <view class="divide_line"></view>
231 231 <!-- <view class='item_body'>
... ... @@ -237,7 +237,7 @@
237 237 <view class="divide_line"></view>
238 238 <view class='item_body'>
239 239 <text class='text_666_28 float_left'>详细地址</text>
240   - <input class='input_wrap float_right' name='huji_address_detail'></input>
  240 + <input class='input_wrap float_right' name='huji_address_detail' placeholder-class='text_999_28' placeholder='请输入详细户籍地址'></input>
241 241 </view>
242 242 <view class="divide_line"></view>
243 243 </view>
... ... @@ -285,7 +285,7 @@
285 285 <view class="divide_line"></view>
286 286 <view class='item_body'>
287 287 <text class='text_666_28 float_left'>公司股本总额</text>
288   - <input class='input_wrap float_right' name='company_equity_total' type='digit'></input>
  288 + <input class='input_wrap float_right' name='company_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入公司股本总额'></input>
289 289 </view>
290 290 <view class="divide_line"></view>
291 291 <!-- <view class='item_body'>
... ... @@ -305,7 +305,7 @@
305 305 <view class="divide_line"></view>
306 306 <view class='item_body'>
307 307 <text class='text_666_28 float_left'>工号</text>
308   - <input class='input_wrap float_right' name='employee_no' type='number'></input>
  308 + <input class='input_wrap float_right' name='employee_no' type='number' placeholder-class='text_999_28' placeholder='请输入工号'></input>
309 309 </view>
310 310 <view class="divide_line"></view>
311 311 <!-- <view class='item_body'>
... ... @@ -317,7 +317,7 @@
317 317 <view class="divide_line"></view>
318 318 <view class='item_body'>
319 319 <text class='text_666_28 float_left'>个人投资总额</text>
320   - <input class='input_wrap float_right' name='personal_equity_total' type='digit'></input>
  320 + <input class='input_wrap float_right' name='personal_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入个人投资总额'></input>
321 321 </view>
322 322 <view class="divide_line"></view>
323 323 </view>
... ... @@ -333,7 +333,9 @@
333 333
334 334 <view style='background:#e8e8e8;height:150rpx'></view>
335 335
336   - <button class="btn_bottom" formType="submit"> 保存</button>
  336 + <view class="btn_bottom">
  337 + <button class="btn_bottom" formType="submit"> 保存</button>
  338 + </view>
337 339 </form>
338 340 </view>
339 341
... ...
... ... @@ -23,6 +23,7 @@
23 23 font-family: PingFangSC-Regular;
24 24 font-size: 12px;
25 25 color: #999;
  26 + line-height: 70rpx;
26 27 }
27 28
28 29 .head_text_wrap2 {
... ...
... ... @@ -292,8 +292,8 @@ Page({
292 292 lieshuInfo: this.data.lieshuInfo,
293 293 lonelyolderInfo: this.data.lonelyolderInfo,
294 294 contactaddressInfo: this.data.contactaddressInfo,
295   - contactaddressInfo: this.data.contactaddressInfo,
296   - contactaddressInfo: this.data.contactaddressInfo,
  295 + currentaddressInfo: this.data.currentaddressInfo,
  296 + birthaddressInfo: this.data.birthaddressInfo,
297 297 employeeInfo:this.data.employeeInfo,
298 298 investpersonalInfo: this.data.investpersonalInfo,
299 299
... ... @@ -614,18 +614,21 @@ Page({
614 614 // =============地区picker选中处理==============
615 615
616 616 contactAddressSelect: function (e) {
617   - console.log('contactAddressSelect', e)
  617 + // console.log('contactAddressSelect', e)
618 618 var contact_address = this.data.contactaddressInfo;
  619 + contact_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
619 620 contact_address.address_value = e.detail.value
620 621 contact_address.address_code = e.detail.code
621 622 this.setData({
622 623 contactaddressInfo: contact_address
623 624 })
  625 + console.log('contactaddressInfo', this.data.contactaddressInfo)
624 626 },
625 627
626 628 currentAddressSelect: function (e) {
627   - console.log('currentAddressSelect', e)
  629 + // console.log('currentAddressSelect', e)
628 630 var current_address = this.data.currentaddressInfo;
  631 + current_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
629 632 current_address.address_value = e.detail.value
630 633 current_address.address_code = e.detail.code
631 634 this.setData({
... ... @@ -634,8 +637,9 @@ Page({
634 637 },
635 638
636 639 birthAddressSelect: function (e) {
637   - console.log('birthAddressSelect', e)
  640 + // console.log('birthAddressSelect', e)
638 641 var birth_address = this.data.birthaddressInfo;
  642 + birth_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
639 643 birth_address.address_value = e.detail.value
640 644 birth_address.address_code = e.detail.code
641 645 this.setData({
... ...
... ... @@ -13,7 +13,7 @@
13 13 <view class='item_body'>
14 14 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
15 15 <text class='text_black_28 float_left'>姓名</text>
16   - <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}'></input>
  16 + <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' disabled='{{disabled}}'></input>
17 17 </view>
18 18 <view class="divide_line"></view>
19 19 <!-- <view class='item_body' bindtap='openpicker'>
... ... @@ -45,7 +45,7 @@
45 45 <view class='item_body' hidden="{{!isself}}">
46 46 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
47 47 <text class='text_black_28 float_left'>姓名</text>
48   - <input class='input_wrap float_right' placeholder='请填写姓名' value='{{taxInfo.name}}'></input>
  48 + <input class='input_wrap float_right' placeholder='请填写姓名' value='{{taxInfo.name}}' disabled='{{disabled}}'></input>
49 49 </view>
50 50 <view class="divide_line"></view>
51 51
... ... @@ -128,7 +128,7 @@
128 128 <view class="divide_line"></view>
129 129 <view class='item_body'>
130 130 <text class='text_666_28 float_left'>纳税人识别号</text>
131   - <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}'></input>
  131 + <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}' placeholder-class='text_999_28' placeholder='请输入纳税人识别号'></input>
132 132 </view>
133 133 <view class="divide_line"></view>
134 134 <!-- <view class='item_body'>
... ... @@ -140,7 +140,7 @@
140 140 <view class="divide_line"></view>
141 141 <view class='item_body'>
142 142 <text class='text_666_28 float_left'>残疾证号</text>
143   - <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}'></input>
  143 + <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_28' placeholder='请输入残疾证号'></input>
144 144 </view>
145 145 <view class="divide_line"></view>
146 146 <!-- <view class='item_body'>
... ... @@ -152,7 +152,7 @@
152 152 <view class="divide_line"></view>
153 153 <view class='item_body'>
154 154 <text class='text_666_28 float_left'>烈属证号</text>
155   - <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}'></input>
  155 + <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_28' placeholder='请输入烈属证号'></input>
156 156 </view>
157 157 <view class="divide_line"></view>
158 158 <!-- <view class='item_body'>
... ... @@ -182,7 +182,7 @@
182 182 <view class='item_body'>
183 183 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
184 184 <text class='text_black_28 float_left'>联系电话</text>
185   - <input class='input_wrap float_right' placeholder='请填写电话' value='{{mobile}}' name='mobile' type='number'></input>
  185 + <input class='input_wrap float_right' placeholder='请填写电话' value='{{mobile}}' name='mobile' type='number' disabled='{{disabled}}'></input>
186 186 </view>
187 187 <!-- 非必填部分02 -->
188 188 <view hidden='{{!isshow02}}'>
... ... @@ -196,7 +196,7 @@
196 196 <view class="divide_line"></view>
197 197 <view class='item_body'>
198 198 <text class='text_666_28 float_left'>详细地址</text>
199   - <input class='input_wrap float_right' name='contact_address_detail' value='{{taxInfo.contact_address_detail}}'></input>
  199 + <input class='input_wrap float_right' name='contact_address_detail' value='{{taxInfo.contact_address_detail}}' placeholder-class='text_999_28' placeholder='请输入详细联系地址'></input>
200 200 </view>
201 201 <view class="divide_line"></view>
202 202 <!-- <view class='item_body'>
... ... @@ -208,12 +208,12 @@
208 208 <view class="divide_line"></view>
209 209 <view class='item_body'>
210 210 <text class='text_666_28 float_left'>银行账号</text>
211   - <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}'></input>
  211 + <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_28' placeholder='请输入银行账号'></input>
212 212 </view>
213 213 <view class="divide_line"></view>
214 214 <view class='item_body'>
215 215 <text class='text_666_28 float_left'>电子邮箱</text>
216   - <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}'></input>
  216 + <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}' placeholder='请输入电子邮箱' placeholder-class='text_999_28'></input>
217 217 </view>
218 218 <view class="divide_line"></view>
219 219 <!-- <view class=' item_body '>
... ... @@ -225,7 +225,7 @@
225 225 <view class="divide_line"></view>
226 226 <view class='item_body '>
227 227 <text class='text_666_28 float_left '>详细地址</text>
228   - <input class='input_wrap float_right ' name='current_address_detail ' value='{{taxInfo.current_address_detail}} '></input>
  228 + <input class='input_wrap float_right ' name='current_address_detail ' value='{{taxInfo.current_address_detail}}' placeholder-class='text_999_28' placeholder='请输入详细居住地址'></input>
229 229 </view>
230 230 <view class="divide_line"></view>
231 231 <!-- <view class='item_body '>
... ... @@ -237,7 +237,7 @@
237 237 <view class="divide_line"></view>
238 238 <view class='item_body '>
239 239 <text class='text_666_28 float_left '>详细地址</text>
240   - <input class='input_wrap float_right ' name='huji_address_detail ' value='{{taxInfo.huji_address_detail}} '></input>
  240 + <input class='input_wrap float_right ' name='huji_address_detail ' value='{{taxInfo.huji_address_detail}} ' placeholder-class='text_999_28' placeholder='请输入详细户籍地址'></input>
241 241 </view>
242 242 <view class="divide_line"></view>
243 243 </view>
... ... @@ -276,7 +276,6 @@
276 276 <template is="picker_cell_normal" data="{{...specificIndustryInfo}}" />
277 277 <view class="divide_line"></view>
278 278 <view hidden='{{!isshow03}}'>
279   - <view class="divide_line"></view>
280 279 <!-- <view class='item_body '>
281 280 <text class='text_666_28 float_left '>是否雇员</text>
282 281 <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
... ... @@ -286,7 +285,7 @@
286 285 <view class="divide_line"></view>
287 286 <view class='item_body '>
288 287 <text class='text_666_28 float_left'>公司股本总额</text>
289   - <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}'></input>
  288 + <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}' placeholder-class='text_999_28' placeholder='请输入股本总额'></input>
290 289 </view>
291 290 <view class="divide_line"></view>
292 291 <!-- <view class='item_body '>
... ... @@ -307,7 +306,7 @@
307 306 <view class="divide_line"></view>
308 307 <view class='item_body '>
309 308 <text class='text_666_28 float_left '>工号</text>
310   - <input class='input_wrap float_right ' name='employee_no' type='number' value='{{taxInfo.employee_no}}'></input>
  309 + <input class='input_wrap float_right ' name='employee_no' type='number' value='{{taxInfo.employee_no}}' placeholder-class='text_999_28' placeholder='请输入工号'></input>
311 310 </view>
312 311 <view class="divide_line"></view>
313 312 <!-- <view class='item_body '>
... ... @@ -319,7 +318,7 @@
319 318 <view class="divide_line"></view>
320 319 <view class='item_body '>
321 320 <text class='text_666_28 float_left '>个人投资总额</text>
322   - <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}'></input>
  321 + <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_28' placeholder='请输入个人投资总额'></input>
323 322 </view>
324 323 <view class="divide_line"></view>
325 324 </view>
... ... @@ -327,15 +326,17 @@
327 326
328 327 <view style='width:100% '>
329 328 <text class='text_666_28 float_left '>备注</text>
330   - <input class='extra_input ' value='{{taxInfo.comment}}' name='comment '></input>
  329 + <input class='extra_input' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注'></input>
331 330 </view>
332 331 </view>
333 332
334 333 </view>
335 334
336   - <view style='background:#e8e8e8;height:150rpx '></view>
337   -
338   - <button class="btn_bottom" formType="submit"> 保存</button>
  335 + <view style='background:#f8f8f8;height:150rpx '></view>
  336 + <view class="btn_bottom">
  337 + <button class="btn_bottom" formType="submit"> 保存</button>
  338 + </view>
  339 +
339 340 </form>
340 341 </view>
341 342
... ...
... ... @@ -21,6 +21,7 @@
21 21 font-family: PingFangSC-Regular;
22 22 font-size: 12px;
23 23 color: #999;
  24 + line-height: 70rpx;
24 25 }
25 26
26 27 .head_text_wrap2 {
... ...
... ... @@ -26,7 +26,7 @@
26 26 <view style='padding:0 15px'>
27 27 <image class='phone_image_wrap' src='/images/phone.png'></image>
28 28 <text class='text_white_22'>{{item.mobile}}</text>
29   - <text style='margin:0rpx 20rpx;color:#fff;height:14rpx'>|</text>
  29 + <text style='margin:0rpx 20rpx;color:#fff;font-size: 20rpx;'>|</text>
30 30 <image class='id_image_wrap' src='/images/id.png'></image>
31 31 <text class='text_white_22'>{{item.id_card_no}}</text>
32 32 </view>
... ...
请 注册 或 登录 后发表评论