Merge branch '海峡' into 机器人_py

# Conflicts:
#	pages/main/taxperson/editinfo/editinfo.js

@@ -140,7 +140,7 @@ Page({
         "id": that.data.supporter_id,
         "id": that.data.supporter_id,
         "legal_entity_id": that.data.legal_entity_id,
         "legal_entity_id": that.data.legal_entity_id,
         "co_supporter": formdata.name,
         "co_supporter": formdata.name,
-        "id_card_type": "1",
+        "id_card_type": "居民身份证",
         "id_card_no": formdata.id_card_no,
         "id_card_no": formdata.id_card_no,
         "birthday": that.data.birthday_datelong,
         "birthday": that.data.birthday_datelong,
         "nation": "中国",
         "nation": "中国",

@@ -325,7 +325,7 @@
         </view>
         </view>
         <view style='height:90rpx;width:100%;clear:both;'>
         <view style='height:90rpx;width:100%;clear:both;'>
           <text class='text_left'>配偶证照类型</text>
           <text class='text_left'>配偶证照类型</text>
-          <text class='text_right_333'>{{datas.id_card_type=='1'?"居民身份证":datas.spouse_id_card_type}}</text>
+          <text class='text_right_333'>{{datas.id_card_type=='1'?"居民身份证":datas.id_card_type}}</text>
         </view>
         </view>
         <view style='height:90rpx;width:100%;clear:both;'>
         <view style='height:90rpx;width:100%;clear:both;'>
           <text class='text_left'>配偶身份证照号码</text>
           <text class='text_left'>配偶身份证照号码</text>

@@ -142,7 +142,7 @@
                 <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
                 <view style="background:#f5f5f5;height:2rpx;width:94%;"></view>
                 <view>
                 <view>
                   <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='profession'}}">技能人员职业资格</text>
                   <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='profession'}}">技能人员职业资格</text>
-                  <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='major'}}">专业人员职业资格</text>
+                  <text style='font-family: PingFangSC-Semibold;font-size: 14px;color: #333;line-height:80rpx;' wx:if="{{item.education_type=='major'}}">专业技术人员职业资格</text>
 
 
                 </view>
                 </view>
                 <view>
                 <view>

@@ -513,6 +513,9 @@ Page({
         "Authorization": Authorization
         "Authorization": Authorization
       },
       },
       success: function(res) {
       success: function(res) {
+        if (res.data.items.length<1){
+          return
+        }
         proffession_info.values = that.handleProfession(res.data.items)
         proffession_info.values = that.handleProfession(res.data.items)
         console.log('proffession_info------', proffession_info)
         console.log('proffession_info------', proffession_info)
         that.setData({
         that.setData({