修改部分页

src/components/ut-navbar/ut-navbar.vue

@@ -2,8 +2,8 @@
     <up-navbar :fixed="fixed" :border="border">
         <template #left>
             <slot name="left">
-                <up-icon v-if="showBack" name="arrow-left" size="40rpx" color="#333" @click="handleBackClick" ></up-icon>
-                <up-icon v-else name="home" size="40rpx" color="#333" @click="handleHomeClick" ></up-icon>
+                <up-icon v-if="showBack" name="arrow-left" size="40rpx" color="#333" @click="handleBackClick"></up-icon>
+                <up-icon v-else name="home" size="40rpx" color="#333" @click="handleHomeClick"></up-icon>
             </slot>
         </template>
         <template #center>
@@ -15,17 +15,20 @@
 </template>
 <script lang="ts" setup>
 import { ref, onMounted } from 'vue';
-const props = withDefaults(defineProps<{
-    title?: string;
-    border?: boolean;
-    fixed?: boolean;
-    homeUrl?: string;
-}>(), {
-    title: '',
-    border: true,
-    fixed: true,
-    homeUrl: '/pages/index/index'
-});
+const props = withDefaults(
+    defineProps<{
+        title?: string;
+        border?: boolean;
+        fixed?: boolean;
+        homeUrl?: string;
+    }>(),
+    {
+        title: '',
+        border: true,
+        fixed: true,
+        homeUrl: '/pages/index/index',
+    }
+);
 
 const emit = defineEmits<{
     (e: 'back'): void;
@@ -52,4 +55,8 @@ function handleHomeClick() {
     emit('home');
     uni.switchTab({ url: props.homeUrl });
 }
-</script>
+onLoad(() => {
+    const currentPage = getCurrentPages().pop();
+    console.log(currentPage, 'currentPage');
+});
+</script>

src/pages/plant/base/index.vue

@@ -147,9 +147,9 @@
             </view>
         </view>
     </ut-confirm-dialog>
-    <ut-suspension v-if="sus?.left" :imageWidth="60" :imageHeight="60" :x="sus?.left" :y="sus?.bottom" :inertia="false" :snap-threshold="40">
+    <!-- <ut-suspension v-if="sus?.left" :imageWidth="60" :imageHeight="60" :x="sus?.left" :y="sus?.bottom" :inertia="false" :snap-threshold="40">
         <image src="/static/images/plant/addBase.png" mode="widthFix" class="w-120 h-120" @click="showDeleteDialog = true"></image>
-    </ut-suspension>
+    </ut-suspension> -->
 </template>
 <script setup lang="ts">
 import { useClientRequest } from '@/utils/request';

src/pages/plant/port/index.vue

@@ -1,13 +1,13 @@
 <template>
     <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" safe-area-inset-bottom>
         <template #top>
-            <up-navbar title="种养殖任务" :fixed="false">
+            <ut-navbar title="种养殖任务" :fixed="false">
                 <template #left><view class=""></view></template>
-            </up-navbar>
+            </ut-navbar>
         </template>
         <view class="b-radius pt-0 bg-#f7f7f7">
             <up-sticky :offset-top="10">
-                <view class="d-flex a-c pd-16 bg-#f7f7f7">
+                <view class="d-flex a-c pd-26 bg-#f7f7f7">
                     <view class="min-w-170 flex1">
                         <ut-action-sheet v-model="form.queryType" :tabs="[{ label: '全部', value: '' }]" @change="onRefresh" title="选择原料类型">
                             <view class="d-flex search-select-item a-c">
@@ -17,16 +17,59 @@
                         </ut-action-sheet>
                     </view>
                     <view class="h-86 pl-20 w-100%">
-                        <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜基地名称、编号、地址、负责人" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
+                        <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜批次号、品种名、基地名" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
                     </view>
                 </view>
+                <view class="pl-26 pr-26">
+                    <up-subsection :list="subList" :current="subCurrent" @change="sectionChange" style="width: 100%; height: 100rpx; background-color: #fff" active-color="#37A954" mode="subsection"></up-subsection>
+                </view>
             </up-sticky>
-            <view class="pd-16"></view>
         </view>
+        <view class="pd-26">
+            <view class="b-radius bg-#fff pd-10">
+                <view class="d-flex j-ed f-s-22 c-#666"> 2025-12-25 </view>
+                <view class="d-flex a-ed pd-16 pt-8 pb-8">
+                    <view class="c-#333 f-s-34 f-w-5 mr-6"> 美洲大蠊</view>
+                    <view class="c-#666 f-s-26">虫卵属蓝棵</view>
+                </view>
+                <view class="d-flex a-c f-s-28 pd-16 pt-8 pb-8">
+                    <view class="c-#666 w-s-no">养殖批号:</view>
+                    <view class="c-#333 f-w-5">1231231231232</view>
+                </view>
+                <view class="d-flex a-c f-s-28 pd-16 pt-8 pb-8">
+                    <view class="c-#666 w-s-no">种源批号:</view>
+                    <view class="c-#333 f-w-5">1231231231232</view>
+                </view>
+                <view class="d-flex a-c f-s-28 pd-16 pt-8 pb-8">
+                    <view class="c-#666 w-s-no">基地:</view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">123112312312312312312312312312312312312312312323</view>
+                    <view class="flex1 d-flex j-ed"><up-icon name="arrow-right" size="34rpx"></up-icon></view>
+                </view>
+                <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
+                    <view class="d-flex a-c w-50%">
+                        <view class="c-#666 w-s-no">养殖区域:</view>
+                        <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">20亩</view>
+                    </view>
+                    <view class="d-flex a-c w-50%">
+                        <view class="c-#666 w-s-no">养殖量:</view>
+                        <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">120000</view>
+                    </view>
+                </view>
+                <view class="pd-16 pt-8 pb-8">
+                    <up-line color="#f7f7f7"></up-line>
+                </view>
+                <view class="pd-16 pt-8 pb-8 d-flex j-sb gap-20">
+                    <up-button :customStyle="customStyle1">种源信息</up-button>
+                    <up-button :customStyle="customStyle2">饲养管理</up-button>
+                    <up-button :customStyle="customStyle3">采收管理</up-button>
+                </view>
+            </view>
+        </view>
+
         <view class="h-210" v-if="list?.length"></view>
         <view v-if="list?.length" :style="{ height: `${safeAreaBottom}px` }"></view>
         <template #bottom>
-            <ut-tabar activeTab="base"></ut-tabar>
+            <ut-tabar activeTab="planting"></ut-tabar>
         </template>
     </z-paging>
 </template>
@@ -36,9 +79,38 @@ const form = ref({ queryType: '', keyword: '' });
 const paging = ref();
 const windowInfo = uni.getWindowInfo();
 const safeAreaBottom = windowInfo.safeAreaInsets.bottom;
+//分段器的配置
+const subList = ref(['进行中', '已结束']);
+const subCurrent = ref(0);
+const sectionChange = (index: number) => {
+    subCurrent.value = index;
+    paging.value.reload();
+};
 const changeSeach = () => {
     paging.value.reload();
 };
+//按钮样式
+const customStyle1 = reactive({
+    color: '#37A954',
+    boxShadow: 'inset 0 0 10px #D7F5DF',
+    background: '#ECFFF1',
+    border: '2rpx solid #9BD4A9',
+    borderRadius: '10rpx',
+});
+const customStyle2 = reactive({
+    color: '#18BECA',
+    boxShadow: 'inset 0 0 10px #C7F5F8',
+    background: '#E5FDFF',
+    border: '2rpx solid #93E8EE',
+    borderRadius: '10rpx',
+});
+const customStyle3 = reactive({
+    color: '#FC8834',
+    boxShadow: 'inset 0 0 10px #FFEED7',
+    background: '#FFFAF3',
+    border: '2rpx solid #FFD499',
+    borderRadius: '10rpx',
+});
 const onRefresh = () => {
     paging.value.reload();
 };
@@ -55,4 +127,7 @@ const onRefresh = () => {
     padding-top: 14rpx;
     padding-bottom: 14rpx;
 }
+:deep(.u-subsection__item) {
+    border: 1px solid transparent !important;
+}
 </style>

src/plant/base/gap-base-info/index.vue

@@ -51,7 +51,7 @@
                 </view>
             </template>
             <!-- 空数据处理 -->
-          
+
             <template #empty v-if="address">
                 <ut-empty class="mg-at" size="28rpx" color="#999" padding="10rpx" image="/static/images/plant/noEmptyBase.png">暂无获评GAP基地信息~</ut-empty>
                 <view class="d-flex j-c f-s-28 c-#ccc">如需认定GAP基地，可前往数字云药官网进行申报</view>
@@ -59,10 +59,10 @@
                 <up-button type="primary" class="b-radius" style="width: 340rpx" @click="copyText('https://www.shuziyunyao.com/')">复制网址</up-button>
             </template>
         </template>
-          <template #empty v-if="!address">
-                <ut-empty class="mg-at" size="28rpx" color="#999" padding="10rpx" image="/static/images/plant/noEmptyBase.png">非云南省内企业，无法获取已获评的GAP基地信息~</ut-empty>
-                <view class="d-flex j-c f-s-28 c-#ccc">可点击底部按钮上传佐证材料添加获评信息</view>
-            </template>
+        <template #empty v-if="!address">
+            <ut-empty class="mg-at" size="28rpx" color="#999" padding="10rpx" image="/static/images/plant/noEmptyBase.png">非云南省内企业，无法获取已获评的GAP基地信息~</ut-empty>
+            <view class="d-flex j-c f-s-28 c-#ccc">可点击底部按钮上传佐证材料添加获评信息</view>
+        </template>
         <template #bottom v-if="!address">
             <view class="base-bottom-wrap pd-20 pb-0">
                 <up-button type="primary" @click="$u.route({ url: '/plant/base/gap-base-info-edit/index' })">
@@ -72,7 +72,6 @@
             </view>
         </template>
     </z-paging>
-
 </template>
 <script setup lang="ts">
 import { copyText } from '@/utils/public';