修改bug

src/assets/styles/public.scss

@@ -152,7 +152,6 @@ $colors: (
     width: 40rpx;
     height: 40rpx;
 }
-<<<<<<< HEAD
 .startline-title {
     line-height: 1;
     padding-left: 30rpx;
@@ -161,9 +160,7 @@ $colors: (
     font-weight: 600;
     border-left: 4rpx solid $u-primary;
 }
-=======
 .small-icon {
     width: 38rpx;
     height: 38rpx;
 }
->>>>>>> 3db11cc1713a57d781f7396310d9529d33bd6b0c

src/components/ut-upload/ut-upload.vue

@@ -328,9 +328,10 @@ watch(
     .card-item {
         width: 210rpx;
         height: 210rpx;
+        background-color: #FAFAFA;
         border-radius: 8rpx;
         overflow: hidden;
-        border: 1rpx solid #f8f8f8;
+        border: 1rpx solid #ccc;
         position: relative;
     }
     .file-box {
@@ -339,6 +340,9 @@ watch(
         box-sizing: border-box;
         padding: 20rpx;
     }
+    .btn-select {
+        border-style: dashed;
+    }
 }
 .del-btn {
     position: absolute;

src/plant/base/base-edit/index.vue

@@ -12,7 +12,7 @@
             <view class="pd-24" id="base12345">
                 <view class="startline-title">基本信息</view>
             </view>
-            <view class="pd-24 bg-#fff">
+            <view class="pd-24 bg-#fff mb-10">
                 <up-alert type="primary" fontSize="24rpx" description="注意：基地不强制与品种挂钩！基地地址以行政村为界，可成片集中或相对集中，跨村则视为另一基地（连片跨村除外）。"></up-alert>
                 <view class="pd-10"></view>
                 <view class="h-1" id="baseTypepppp"></view>
@@ -113,99 +113,249 @@
                 <view class="h-1" id="lnglatpppp"></view>
                 <up-form-item required label="基地经纬度" prop="lnglat">
                     <view class="flex1 d-flex a-c">
-                        <up-input v-model="form.baseInfo.gapInfo.lng" border="none" placeholder="70-150内的经度数值" clearable></up-input>
+                        <up-input v-model="form.baseInfo.gapInfo.lng" border="bottom" placeholder="70-150内的经度数值" clearable></up-input>
                         <view class="pd-5"></view>
-                        <up-input v-model="form.baseInfo.gapInfo.lat" placeholder="4-53内的纬度数值" border="none" clearable></up-input>
+                        <up-input v-model="form.baseInfo.gapInfo.lat" placeholder="4-53内的纬度数值" border="bottom" clearable></up-input>
                     </view>
                 </up-form-item>
             </view>
             <!-- 地块/圈舍/组培架信息 -->
-            <view class="pd-24" id="plot12345">
-                <view class="startline-title">地块/圈舍/组培架信息</view>
-            </view>
+            <view class="h-1" id="plot12345"></view>
+            <template v-if="form.baseInfo.baseType == '1'">
+                <view class="pd-24">
+                    <view class="startline-title">地块信息</view>
+                </view>
+                <view class="pd-24 bg-#fff">
+                    <up-button type="primary" text="确定" plain>
+                        <up-icon class="mr-10" name="plus" color="#37A954"></up-icon>
+                        <span>添加地块信息</span>
+                    </up-button>
+                </view>
+            </template>
+            <template v-if="form.baseInfo.baseType == '2'">
+                <view class="pd-24">
+                    <view class="startline-title">圈舍信息</view>
+                </view>
+                <view class="pd-24 bg-#fff">
+                    <up-button type="primary" text="确定" plain>
+                        <up-icon class="mr-10" name="plus" color="#37A954"></up-icon>
+                        <span>添加圈舍信息</span>
+                    </up-button>
+                </view>
+            </template>
+            <template v-if="form.baseInfo.baseType == '3'">
+                <view class="pd-24">
+                    <view class="startline-title">组培架信息</view>
+                </view>
+                <view class="pd-24 bg-#fff">
+                    <up-button type="primary" text="确定" plain>
+                        <up-icon class="mr-10" name="plus" color="#37A954"></up-icon>
+                        <span>添加组培架信息</span>
+                    </up-button>
+                </view>
+            </template>
+
             <view class="pd-24" id="environment12345">
                 <view class="startline-title">选址依据及环境信息</view>
             </view>
-            <view class="pd-24 bg-#fff mb-10">
-                <view class="f-s-32 c-#333 f-w-600">选址依据</view>
-                <up-form-item label="是否道地产区">
-                    <up-radio-group v-model="form.environmentInfo.daoStatus">
-                        <up-radio :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in yes_no" :key="index" :label="item.label" :name="item.value"></up-radio>
-                    </up-radio-group>
-                </up-form-item>
-            </view>
-            <view class="pd-24 bg-#fff mb-10">
-                <view class="f-s-32 c-#333 f-w-600">环境信息</view>
-                <up-form-item label="土壤类型" prop="environmentInfo.soilType" borderBottom>
-                    <up-input v-model="form.environmentInfo.soilType" placeholder="请输入土壤类型" border="none" clearable></up-input>
-                </up-form-item>
-                <up-form-item label="土壤质地" prop="environmentInfo.soilTexture" borderBottom>
-                    <up-input v-model="form.environmentInfo.soilTexture" placeholder="请输入土壤质地" border="none" clearable></up-input>
-                </up-form-item>
-                <up-form-item label="有机质含量" prop="environmentInfo.organic" borderBottom>
-                    <up-input v-model="form.environmentInfo.organic" placeholder="请输入有机质含量" border="none" clearable></up-input>
-                </up-form-item>
-                <up-form-item label="土壤PH值" prop="environmentInfo.soilPh" borderBottom>
-                    <up-input v-model="form.environmentInfo.soilPh" placeholder="请输入土壤PH值" border="none" clearable></up-input>
-                </up-form-item>
-                <up-form-item label="水源类型" prop="environmentInfo.waterType" borderBottom>
-                    <up-input v-model="form.environmentInfo.waterType" placeholder="请输入水源类型" border="none" clearable></up-input>
-                </up-form-item>
-                <up-form-item label="无霜期" prop="environmentInfo.notFrost" borderBottom>
-                    <up-input v-model="form.environmentInfo.notFrost" placeholder="请输入无霜期" border="none" clearable></up-input>
-                    <template #right>
-                        <span>天</span>
-                    </template>
-                </up-form-item>
-                <up-form-item label="年降水量" prop="environmentInfo.precipitation" borderBottom>
-                    <up-input v-model="form.environmentInfo.precipitation" placeholder="请输入年降水量" border="none" clearable></up-input>
-                    <template #right>
-                        <span>mm</span>
-                    </template>
-                </up-form-item>
-                <up-form-item label="年平均气温" prop="environmentInfo.avgTem" borderBottom>
-                    <up-input v-model="form.environmentInfo.avgTem" placeholder="请输入年平均气温" border="none" clearable></up-input>
-                    <template #right>
-                        <span>℃</span>
-                    </template>
-                </up-form-item>
-                <up-form-item label="年绝对最高气温" prop="environmentInfo.maxTem" borderBottom>
-                    <up-input v-model="form.environmentInfo.maxTem" placeholder="请输入年绝对最高气温" border="none" clearable></up-input>
-                    <template #right>
-                        <span>℃</span>
-                    </template>
-                </up-form-item>
-                <up-form-item label="年绝对最低气温" prop="environmentInfo.minTem" borderBottom>
-                    <up-input v-model="form.environmentInfo.minTem" placeholder="请输入年绝对最低气温" border="none" clearable></up-input>
-                    <template #right>
-                        <span>℃</span>
-                    </template>
-                </up-form-item>
-                 <up-form-item label="年日照时数" prop="environmentInfo.sunshineHours" borderBottom>
-                    <up-input v-model="form.environmentInfo.sunshineHours" placeholder="请输入年日照时数" border="none" clearable></up-input>
-                    <template #right>
-                        <span>小时</span>
-                    </template>
-                </up-form-item>
-                 <up-form-item label="海拔" prop="environmentInfo.altitude" borderBottom>
-                    <up-input v-model="form.environmentInfo.altitude" placeholder="请输入海拔" border="none" clearable></up-input>
-                    <template #right>
-                        <span>米</span>
-                    </template>
-                </up-form-item>
-                <!-- 基地图片 -->
-                <up-form-item label="水、土壤、大气等环评报告" prop="environmentInfo.report" borderBottom>
-                    <ut-upload v-model="form.environmentInfo.report" :max-count="9" valueType="array" accept="file"></ut-upload>
-                </up-form-item>
-                <!-- 基地图片 -->
-                <up-form-item label="基地图片" prop="environmentInfo.basePic" borderBottom>
-                    <ut-upload v-model="form.environmentInfo.basePic" :max-count="9"></ut-upload>
-                </up-form-item>
-                <!-- 基地视频 -->
-                <up-form-item label="基地视频" prop="environmentInfo.baseVideo" borderBottom>
-                    <ut-upload v-model="form.environmentInfo.baseVideo" :max-count="1" valueType="array" accept="video"></ut-upload>
-                </up-form-item>
-            </view>
+            <template v-if="form.baseInfo.baseType == '1'">
+                <view class="pd-24 bg-#fff mb-10">
+                    <view class="f-s-32 c-#333 f-w-600">选址依据</view>
+                    <up-form-item label="是否道地产区">
+                        <up-radio-group v-model="form.environmentInfo.daoStatus">
+                            <up-radio :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in yes_no" :key="index" :label="item.label" :name="item.value"></up-radio>
+                        </up-radio-group>
+                    </up-form-item>
+                    <up-form-item label="基地选址依据/标准" prop="environmentInfo.accordFile" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.accordFile" :max-count="9" valueType="array" accept="file"></ut-upload>
+                    </up-form-item>
+                    <up-form-item label="文献或科学数据等选址适应性证明材料" prop="environmentInfo.adaptFile" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.adaptFile" :max-count="9" valueType="array" accept="file"></ut-upload>
+                    </up-form-item>
+                </view>
+                <view class="pd-24 bg-#fff mb-10">
+                    <view class="f-s-32 c-#333 f-w-600">环境信息</view>
+                    <up-form-item label="土壤类型" prop="environmentInfo.soilType" borderBottom>
+                        <up-input v-model="form.environmentInfo.soilType" placeholder="请输入土壤类型" border="none" clearable></up-input>
+                    </up-form-item>
+                    <up-form-item label="土壤质地" prop="environmentInfo.soilTexture" borderBottom>
+                        <up-input v-model="form.environmentInfo.soilTexture" placeholder="请输入土壤质地" border="none" clearable></up-input>
+                    </up-form-item>
+                    <up-form-item label="有机质含量" prop="environmentInfo.organic" borderBottom>
+                        <up-input v-model="form.environmentInfo.organic" placeholder="请输入有机质含量" border="none" clearable></up-input>
+                    </up-form-item>
+                    <up-form-item label="土壤PH值" prop="environmentInfo.soilPh" borderBottom>
+                        <up-input v-model="form.environmentInfo.soilPh" placeholder="请输入土壤PH值" border="none" clearable></up-input>
+                    </up-form-item>
+                    <up-form-item label="水源类型" prop="environmentInfo.waterType" borderBottom>
+                        <up-input v-model="form.environmentInfo.waterType" placeholder="请输入水源类型" border="none" clearable></up-input>
+                    </up-form-item>
+                    <up-form-item label="无霜期" prop="environmentInfo.notFrost" borderBottom>
+                        <up-input v-model="form.environmentInfo.notFrost" placeholder="请输入无霜期" border="none" clearable></up-input>
+                        <template #right>
+                            <span>天</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年降水量" prop="environmentInfo.precipitation" borderBottom>
+                        <up-input v-model="form.environmentInfo.precipitation" placeholder="请输入年降水量" border="none" clearable></up-input>
+                        <template #right>
+                            <span>mm</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年平均气温" prop="environmentInfo.avgTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.avgTem" placeholder="请输入年平均气温" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年绝对最高气温" prop="environmentInfo.maxTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.maxTem" placeholder="请输入年绝对最高气温" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年绝对最低气温" prop="environmentInfo.minTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.minTem" placeholder="请输入年绝对最低气温" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年日照时数" prop="environmentInfo.sunshineHours" borderBottom>
+                        <up-input v-model="form.environmentInfo.sunshineHours" placeholder="请输入年日照时数" border="none" clearable></up-input>
+                        <template #right>
+                            <span>小时</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="海拔" prop="environmentInfo.altitude" borderBottom>
+                        <up-input v-model="form.environmentInfo.altitude" placeholder="请输入海拔" border="none" clearable></up-input>
+                        <template #right>
+                            <span>米</span>
+                        </template>
+                    </up-form-item>
+                    <!-- 水、土壤、大气等环评报告 -->
+                    <up-form-item label="水、土壤、大气等环评报告" prop="environmentInfo.report" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.report" :max-count="9" valueType="array" accept="file"></ut-upload>
+                    </up-form-item>
+                    <!-- 基地图片 -->
+                    <up-form-item label="基地图片" prop="environmentInfo.basePic" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.basePic" :max-count="9"></ut-upload>
+                    </up-form-item>
+                    <!-- 基地视频 -->
+                    <up-form-item label="基地视频" prop="environmentInfo.baseVideo" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.baseVideo" :max-count="1" valueType="array" accept="video"></ut-upload>
+                    </up-form-item>
+                </view>
+            </template>
+            <template v-if="form.baseInfo.baseType == '2'">
+                <view class="pd-24 bg-#fff mb-10">
+                    <view class="f-s-32 c-#333 f-w-600">选址依据</view>
+                    <up-form-item label="是否道地产区">
+                        <up-radio-group v-model="form.environmentInfo.daoStatus">
+                            <up-radio :customStyle="{ marginRight: '60rpx' }" v-for="(item, index) in yes_no" :key="index" :label="item.label" :name="item.value"></up-radio>
+                        </up-radio-group>
+                    </up-form-item>
+                    <up-form-item label="基地选址依据/标准" prop="environmentInfo.accordFile" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.accordFile" :max-count="9" valueType="array" accept="file"></ut-upload>
+                    </up-form-item>
+                    <up-form-item label="文献或科学数据等选址适应性证明材料" prop="environmentInfo.adaptFile" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.adaptFile" :max-count="9" valueType="array" accept="file"></ut-upload>
+                    </up-form-item>
+                </view>
+                <view class="pd-24 bg-#fff mb-10">
+                    <view class="f-s-32 c-#333 f-w-600">环境信息</view>
+                    <up-form-item label="水源类型" prop="environmentInfo.waterType" borderBottom>
+                        <up-input v-model="form.environmentInfo.waterType" placeholder="请输入水源类型" border="none" clearable></up-input>
+                    </up-form-item>
+                    <up-form-item label="无霜期" prop="environmentInfo.notFrost" borderBottom>
+                        <up-input v-model="form.environmentInfo.notFrost" placeholder="请输入无霜期" border="none" clearable></up-input>
+                        <template #right>
+                            <span>天</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年降水量" prop="environmentInfo.precipitation" borderBottom>
+                        <up-input v-model="form.environmentInfo.precipitation" placeholder="请输入年降水量" border="none" clearable></up-input>
+                        <template #right>
+                            <span>mm</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年平均气温" prop="environmentInfo.avgTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.avgTem" placeholder="请输入年平均气温" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年绝对最高气温" prop="environmentInfo.maxTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.maxTem" placeholder="请输入年绝对最高气温" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年绝对最低气温" prop="environmentInfo.minTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.minTem" placeholder="请输入年绝对最低气温" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="年日照时数" prop="environmentInfo.sunshineHours" borderBottom>
+                        <up-input v-model="form.environmentInfo.sunshineHours" placeholder="请输入年日照时数" border="none" clearable></up-input>
+                        <template #right>
+                            <span>小时</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="海拔" prop="environmentInfo.altitude" borderBottom>
+                        <up-input v-model="form.environmentInfo.altitude" placeholder="请输入海拔" border="none" clearable></up-input>
+                        <template #right>
+                            <span>米</span>
+                        </template>
+                    </up-form-item>
+                    <!-- 水、土壤、大气等环评报告 -->
+                    <up-form-item label="水、大气等环评报告" prop="environmentInfo.report" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.report" :max-count="9" valueType="array" accept="file"></ut-upload>
+                    </up-form-item>
+                    <!-- 基地图片 -->
+                    <up-form-item label="基地图片" prop="environmentInfo.basePic" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.basePic" :max-count="9"></ut-upload>
+                    </up-form-item>
+                    <!-- 基地视频 -->
+                    <up-form-item label="基地视频" prop="environmentInfo.baseVideo" borderBottom>
+                        <ut-upload v-model="form.environmentInfo.baseVideo" :max-count="1" valueType="array" accept="video"></ut-upload>
+                    </up-form-item>
+                </view>
+            </template>
+            <template v-if="form.baseInfo.baseType == '3'">
+                <view class="pd-24 bg-#fff mb-10">
+                    <up-form-item label="温度" prop="environmentInfo.avgTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.avgTem" placeholder="请输入温度" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="湿度" prop="environmentInfo.avgTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.avgTem" placeholder="请输入湿度" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="洁净度" prop="environmentInfo.avgTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.avgTem" placeholder="请输入洁净度" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="光照" prop="environmentInfo.avgTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.avgTem" placeholder="请输入光照" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                    <up-form-item label="光照周期" prop="environmentInfo.avgTem" borderBottom>
+                        <up-input v-model="form.environmentInfo.avgTem" placeholder="请输入光照周期" border="none" clearable></up-input>
+                        <template #right>
+                            <span>℃</span>
+                        </template>
+                    </up-form-item>
+                </view>
+            </template>
         </up-form>
         <template #bottom>
             <view class="pd-20 d-flex">
@@ -214,6 +364,7 @@
             </view>
         </template>
     </z-paging>
+    <ut-picker-area v-model:show="showArea" v-model="form.baseInfo.gapInfo.adcode" @confirm="confirmArea"></ut-picker-area>
 </template>
 <script setup lang="ts">
 import { useUserStore } from '@/store';
@@ -405,16 +556,7 @@ const getLocationByAddress = async () => {
         lat: location.latitude,
     };
 };
-const openVideo = () => {
-    uni.previewMedia({
-        sources: [{
-            url: 'https://fileserver.yujin.shuziyunyao.com/oss-file/smart-trace/2026/01/05/18e8bf8161874f938826905fa2034e06.mp4',
-            type: 'video',
 
-        }],
-        current: 0
-    })
-}
 </script>
 <style lang="scss" scoped>
 .z-paging-wrap {