外国人bug处理

pages/scenic/scenicCombiOrder/scenicCombiOrder.vue

@@ -204,7 +204,7 @@
 								@click="visitorChoose(index,index2)"
 								:key="index2"
 							>
-								{{ item2.name }}
+								<text class="one-txt-cut">{{item2.name}}</text>
 								<!-- contactVos为该联系人满足该产品的证件信息列表 -->
 								<text v-if="!item2.contactVos||item2.contactVos.length==0" style="font-size: 20rpx;color: #ff0000;">请补充证件</text>
 								<view v-if="item2.ifChoose" class="date-icon">

pages/scenic/scenicComponents/editContacts.vue

@@ -26,18 +26,18 @@
 						<text class="bottom-title">
 							证件类型
 						</text>
-						<!-- 0和空用全等防止为空时出现bug -->
+						<!-- 0和空用全等防止出现bug -->
 						<text style="flex: 1;" v-if="credentialType===''">请选择证件类型</text>
 						<text style="flex: 1;" v-if="credentialType===0">身份证</text>
-						<text style="flex: 1;" v-if="credentialType=='1'">护照</text>
-						<text style="flex: 1;" v-if="credentialType=='2'">港澳通行证</text>
-						<text style="flex: 1;" v-if="credentialType=='3'">台胞通行证</text>
-						<text style="flex: 1;" v-if="credentialType=='4'">台胞证</text>
-						<text style="flex: 1;" v-if="credentialType=='5'">回乡证</text>
-						<text style="flex: 1;" v-if="credentialType=='6'">外国人永久居留证</text>
-						<text style="flex: 1;" v-if="credentialType=='7'">学生证</text>
-						<text style="flex: 1;" v-if="credentialType=='8'">军官证</text>
-						<text style="flex: 1;" v-if="credentialType=='9'">残疾军人证</text>
+						<text style="flex: 1;" v-if="credentialType==1">护照</text>
+						<text style="flex: 1;" v-if="credentialType==2">港澳通行证</text>
+						<text style="flex: 1;" v-if="credentialType==3">台胞通行证</text>
+						<text style="flex: 1;" v-if="credentialType==4">台胞证</text>
+						<text style="flex: 1;" v-if="credentialType==5">回乡证</text>
+						<text style="flex: 1;" v-if="credentialType==6">外国人永久居留证</text>
+						<text style="flex: 1;" v-if="credentialType==7">学生证</text>
+						<text style="flex: 1;" v-if="credentialType==8">军官证</text>
+						<text style="flex: 1;" v-if="credentialType==9">残疾军人证</text>
 						<u-icon name="arrow-right" size='26' color='#B4B4B4'></u-icon>
 					</view>
 					
@@ -76,18 +76,18 @@
 					证件类型
 				</view>
 				<view v-for="(item,index) in credentialList" :key='index' class="idList" @click="chooseCredential(item)">
-					<!-- 0用全等防止为空时出现bug -->
-					<text v-if="item===0">身份证</text>
-					<text v-if="item=='1'">护照</text>
-					<text v-if="item=='2'">港澳通行证</text>
-					<text v-if="item=='3'">台胞通行证</text>
-					<text v-if="item=='4'">台胞证</text>
-					<text v-if="item=='5'">回乡证</text>
-					<text v-if="item=='6'">外国人永久居留证</text>
-					<text v-if="item=='7'">学生证</text>
-					<text v-if="item=='8'">军官证</text>
-					<text v-if="item=='9'">残疾军人证</text>
-					<u-icon name='checkmark' size='48' color='#3688FF' v-if="credentialType==item"></u-icon>
+					<text v-if="item==0">身份证</text>
+					<text v-if="item==1">护照</text>
+					<text v-if="item==2">港澳通行证</text>
+					<text v-if="item==3">台胞通行证</text>
+					<text v-if="item==4">台胞证</text>
+					<text v-if="item==5">回乡证</text>
+					<text v-if="item==6">外国人永久居留证</text>
+					<text v-if="item==7">学生证</text>
+					<text v-if="item==8">军官证</text>
+					<text v-if="item==9">残疾军人证</text>
+					<!--用全等防止为空时出现bug -->
+					<u-icon name='checkmark' size='48' color='#3688FF' v-if="credentialType===item"></u-icon>
 				</view>
 			</view>
 			
@@ -118,7 +118,8 @@ export default {
         this.credentialNumber = newValue.credentialNumber||''
         this.reviseContactId = newValue.id||''
         this.phone=newValue.phone||''
-        this.credentialType=newValue.credentialType||''
+        // 不加双竖线的原因是，防止是0时，变成空
+        this.credentialType=newValue.credentialType
       },
       deep: true,
       immediate: true
@@ -126,7 +127,11 @@ export default {
     credential: {//该产品对应联系人可以添加的证件类型
 		  handler(newValue, oldValue) {
 		    if(newValue){
-          this.credentialList=newValue.split(',')
+          this.credentialList=newValue.split(',')||[]
+          this.credentialList.forEach((item,index)=>{
+            //转化成数字类型，防止上面证件类型，编辑选择身份证时出现bug
+            this.credentialList[index]=parseFloat(item)
+          })
           if(this.credentialList.length==1){
             let type=this.credentialList[0]
             if(type=='0'){this.placeholderText='请输入身份证，必填'}

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -246,7 +246,7 @@
 							@click="visitorChoose(index)"
 							:key="index"
 						>
-							{{ item.name }}
+							<text class="one-txt-cut">{{ item.name}}</text> 
 							<!-- contactVos为该联系人满足该产品的证件信息列表 -->
 							<text v-if="!item.contactVos||item.contactVos.length==0" style="font-size: 20rpx;color: #ff0000;">请补充证件</text>
 							<view v-if="item.ifChoose" class="date-icon">
@@ -1626,9 +1626,6 @@ export default {
 	border-radius: 5rpx;
 	position: relative;
 	margin: 20rpx 15rpx 0 0;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
 }
 .plus-list-last {
 	color: $theme;