From 6f72ffa93bb3141b22d1c22c3458c04a57e58156 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 27 六月 2024 10:36:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
sub_pages/farmer/farmer-info/farmer-info.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sub_pages/farmer/farmer-info/farmer-info.vue b/sub_pages/farmer/farmer-info/farmer-info.vue
index 0f54ae3..0bab6cd 100644
--- a/sub_pages/farmer/farmer-info/farmer-info.vue
+++ b/sub_pages/farmer/farmer-info/farmer-info.vue
@@ -106,19 +106,19 @@
</u-radio-group>
</view>
</view>
- <view class="form-item before-line m-t-20 p-b-20" v-if="dto.idcardType=='身份证'">
+ <view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='身份证'">
<view class="label required">身份证正反面</view>
<view class="m-l-a m-r-0 flex">
- <view class="component-button-upload m-r-15" @click="uploadIcon('idCards')">
+<!-- <view class="component-button-upload m-r-15" @click="uploadIcon('idCards')">
- </view>
+ </view> -->
<view class="component-button-upload" @click="uploadIcon('idCards')">
</view>
</view>
</view>
<view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
- v-if="dto.idCards&&dto.idCards.length>0">
+ v-if="dto.idcardType=='身份证'&&dto.idCards&&dto.idCards.length>0">
<view class="m-t-12 m-r-10 " v-for="(tBanner,index) of dto.idCards" :key="index">
<image class="banner-img" :src="tBanner.url" @click.stop="previewImg(tBanner.url)">
@@ -126,7 +126,7 @@
<view class="t-red text-center" @click.stop="deleteImg('idCards',index)">删除</view>
</view>
</view>
- <view class="form-item before-line m-t-20 p-b-20" v-if="dto.idcardType=='营业执照'">
+ <view class="form-item bottom-border-no before-line m-t-20 p-b-20" v-if="dto.idcardType=='营业执照'">
<view class="label required">营业执照</view>
<view class="m-l-a m-r-0 flex">
<view class="component-button-upload m-r-15" @click="uploadIcon('pictures')">
@@ -136,7 +136,7 @@
</view>
</view>
<view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
- v-if="dto.pictures&&dto.pictures.length>0">
+ v-if="dto.idcardType=='营业执照'&&dto.pictures&&dto.pictures.length>0">
<view class="m-t-12 m-r-10 " v-for="(tBanner,index) of dto.pictures" :key="index">
<image class="banner-img" :src="tBanner.url" @click.stop="previewImg(tBanner.url)">
--
Gitblit v1.9.3