优化

wangyu
app.wxss
pages/common/picker_cell.wxml
pages/main/editinfo/editinfo.js
pages/main/editinfo/editinfo.wxml
--- a/app.wxss
查看文件 @d28925d
+++ b/app.wxss
查看文件 @d28925d
@@ -41,7 +41,7 @@
 .text_333_28 {
   font-family: PingFangSC-Regular;
-  font-size: 28rpx;
+  font-size: 26rpx;
   color: #333;
   text-align: right;
   line-height: 80rpx;
@@ -49,7 +49,7 @@
 .text_999_28 {
   font-family: PingFangSC-Regular;
-  font-size: 28rpx;
+  font-size: 26rpx;
   color: #999;
   text-align: right;
   line-height: 80rpx;
--- a/pages/common/picker_cell.wxml
查看文件 @d28925d
+++ b/pages/common/picker_cell.wxml
查看文件 @d28925d
@@ -11,9 +11,14 @@
     <view class="weui-cell__bd">
       <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}}'>
-        <view wx:if="{{selected&&disabled&&disabled=='true'}}" class="text_999_28 float_right">{{selected}}</view>
+        <!-- <view wx:if="{{selected&&disabled}}" class="text_999_28 float_right">{{selected}}</view>
         <view wx:elif="{{selected}}" class="text_333_28 float_right ">{{selected}}</view>
-        <view wx:else class="text_999_28 float_right ">{{placeholder}}</view>
+        <view wx:else class="text_999_28 float_right ">{{placeholder}}</view> -->
+
+         <text wx:if="{{selected&&disabled}}" class="text_999_28 float_right">{{selected}}</text>
+        <text wx:elif="{{selected}}" class="text_333_28 float_right ">{{selected}}</text>
+        <text wx:else class="text_999_28 float_right ">{{placeholder}}</text>
+
       </picker>
     </view>
   </view>
--- a/pages/main/editinfo/editinfo.js
查看文件 @d28925d
+++ b/pages/main/editinfo/editinfo.js
查看文件 @d28925d
@@ -295,6 +295,7 @@ Page({
     this.data.personstatusData.selected = tax_info.taxpayer_status
     this.data.cardtypeData.selected = tax_info.id_card_type
+    console.log('cardtypeData', this.data.cardtypeData)
     this.data.card_number = tax_info.id_card_no
     this.data.mobile = tax_info.mobile
     this.data.investInfo.selected = tax_info.is_investor
@@ -593,18 +594,23 @@ Page({
         })
         break;
       case 'cardtype':
-        var is_idcard = this.data.isIdCard
         var cardtype_data = this.data.cardtypeData
-        cardtype_data.selected = cardtype_data.values[e.detail.value]
-        if (0 == e.detail.value) {
-          is_idcard = true
-        } else {
-          is_idcard = false
+        var new_type = cardtype_data.values[e.detail.value]
+        console.log('cardtype', cardtype_data.values[e.detail.value])
+        if (new_type != this.data.cardtypeData.selected) {
+          var is_idcard = this.data.isIdCard
+          cardtype_data.selected = cardtype_data.values[e.detail.value]
+          if (0 == e.detail.value) {
+            is_idcard = true
+          } else {
+            is_idcard = false
+          }
+          this.setData({
+            card_number:"",
+            isIdCard: is_idcard,
+            cardtypeData: cardtype_data
+          })
         }
-        this.setData({
-          isIdCard: is_idcard,
-          cardtypeData: cardtype_data
-        })
         break;
       case 'forigner':
         var forigner_data = this.data.forignerInfo
@@ -808,7 +814,7 @@ Page({
     var formdata = e.detail.value;
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
-    if (this.data.name.length < 1 ) {
+    if (this.data.name.length < 1) {
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.name.length > 0 && !regname.test(this.data.name)) {
@@ -834,7 +840,7 @@ Page({
     //   this.showtoast('有必填项未填写');
     //   return
     // } 
-    else if (this.data.mobile.length < 1 ) {
+    else if (this.data.mobile.length < 1) {
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
@@ -889,7 +895,7 @@ Page({
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
         "id_card_type": that.data.cardtypeData.selected,
-        "id_card_no":  that.data.card_number,
+        "id_card_no": that.data.card_number,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
         "profession": request_profession,
--- a/pages/main/editinfo/editinfo.wxml
查看文件 @d28925d
+++ b/pages/main/editinfo/editinfo.wxml
查看文件 @d28925d
@@ -51,7 +51,7 @@
           <text class='text_black_28 float_left'>姓名</text>
           <!-- <input class='input_wrap float_right' placeholder-class='text_999_28' placeholder="{{taxInfo.certification_status=='active'&&name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}"></input> -->
-          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname'></input>
+          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname'></input>
           <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}" bindblur='bindinputname'></input>
         </view>
         <view class="divide_line"></view>
@@ -85,7 +85,7 @@
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>证照号码</text>
           <view wx:if="{{isIdCard}}">
-            <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
+            <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
             <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&card_number?card_number:'请输入证件号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
             <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>