Merge branch 'farmer' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5 into farmer

src/views/old_mini/growth_report/index.vue

@@ -7,12 +7,12 @@
             @changeGarden="changeGarden" :isGarden="true"></weather-info>
         <div class="report-content-wrap" v-if="hasReport" v-loading="loading"
             element-loading-background="rgba(0, 0, 0, 0.1)">
-            <div class="history-risk-report-btn" @click="handleHistoryRiskReportClick">
+            <!-- <div class="history-risk-report-btn" @click="handleHistoryRiskReportClick">
                 <span class="risk-report-icon">
                     <i></i>
                 </span>
                 <span class="risk-report-text">历史风险报告</span>
-            </div>
+            </div> -->
 
             <swipe ref="swipeRef" class="my-swipe" :loop="false" indicator-color="white" @change="handleSwipeChange">
                 <swipe-item v-for="(item, index) in regionsData" :key="index">

src/views/old_mini/interaction/index.vue

@@ -275,7 +275,6 @@ const getFirstSelectedVariety = () => {
 };
 
 const handleConfirm = async () => {
-    loading.value = true;
     // INIT / 新增品种：initFarmData；CONFIRM_REPRODUCTIVE：confirmReproductivePhenology（regionPhenologyItems，每条一个区域）
     const status = farmData.value.status;
     const isInitOrAddVariety = status === "INIT" || isAddVariety.value;
@@ -337,6 +336,7 @@ const handleConfirm = async () => {
         return;
     }
 
+    loading.value = true;
     const params = {
         expertMiniUserId: 81881,
         farmDataList,

src/views/old_mini/work_detail/components/executePopup.vue

@@ -17,7 +17,7 @@
                 
                 <uploader class="uploader" v-model="fileList" multiple :max-count="5" :after-read="afterRead" @delete="handleDelete"
                     @click="handleClick('rg')">
-                    <img class="img" v-show="!fileList.length" src="@/assets/img/home/example-4.png" alt="" />
+                    <!-- <img class="img" v-show="!fileList.length" src="@/assets/img/home/example-4.png" alt="" /> -->
                     <img class="plus" src="@/assets/img/home/plus.png" alt="" />
                 </uploader>
                 <div class="service-input">

src/views/old_mini/youwei_trace/index.vue

@@ -1,5 +1,4 @@
 <template>
-    <!--
     <div class="youwei-trace-page" :style="{ height: `calc(100vh - ${tabBarHeight}px)` }">
         <empty
             image="https://birdseye-img.sysuimars.com/birdseye-look-mini/custom-empty-image.png"
@@ -7,32 +6,18 @@
             description="该页面正在升级，敬请期待..."
         />
     </div>
-    -->
-    <div class="youwei-trace-page" :style="{ height: `calc(100vh - ${tabBarHeight}px)` }">
-        <img
-            class="trace-long-img"
-            src="https://birdseye-img.sysuimars.com/birdseye-look-vue/zj/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20260407220906_3750_42.png"
-            alt="有味溯源"
-        />
-    </div>
 </template>
 
 <script setup>
-// import { computed } from "vue";
-// import { useStore } from "vuex";
-// import { Empty } from "vant";
-//
-// const store = useStore();
-// const tabBarHeight = computed(() => store.state.home.tabBarHeight);
 import { computed } from "vue";
 import { useStore } from "vuex";
+import { Empty } from "vant";
 
 const store = useStore();
 const tabBarHeight = computed(() => store.state.home.tabBarHeight);
 </script>
 
 <style scoped lang="scss">
-/*
 .youwei-trace-page {
     width: 100%;
     height: 100%;
@@ -41,19 +26,4 @@ const tabBarHeight = computed(() => store.state.home.tabBarHeight);
     justify-content: center;
     box-sizing: border-box;
 }
-*/
-
-.youwei-trace-page {
-    width: 100%;
-    height: 100%;
-    overflow-y: auto;
-    -webkit-overflow-scrolling: touch;
-    background: #ffffff;
-}
-
-.trace-long-img {
-    width: 100%;
-    height: auto;
-    display: block;
-}
 </style>