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

src/components/popup/restorePlantingPopup.vue

@@ -5,7 +5,7 @@
         teleport="body"
         :z-index="20000"
         class="restore-planting-popup"
-        :close-on-click-overlay="true"
+        :close-on-click-overlay="false"
     >
         <div class="popup-content">
             <img
@@ -317,9 +317,11 @@ const adjustAndRefreshQuestion = async (action) => {
         // 调整后只替换问题二（及配图），停留在问题二
         const phenoQuestion = data.phenophase_question || "";
         const pic = resolveImageUrl(data.phenophase_pic_url);
+        const guidePic = resolveImageUrl(data.interact_pic_url);
         phenologyQuestion.value = phenoQuestion;
         phenologyHighlight.value = extractPhenologyHighlight(phenoQuestion);
         phenologyImage.value = pic || DEFAULT_PHENOLOGY_IMAGE;
+        phenologyGuideImage.value = guidePic || "";
         if (pic) sampleImage.value = pic;
         phenologyAnswer.value = "";
     } catch (err) {

src/views/old_mini/growth_report/components/CropAlertPanel.vue

@@ -13,7 +13,7 @@
                 <div class="panel-shell" ref="panelShellRef">
                     <div class="crop-header">
                         <div class="crop-info">
-                            <el-avatar class="crop-avatar" :size="24" :src="cropAvatar" />
+                            <!-- <el-avatar class="crop-avatar" :size="24" :src="cropAvatar" /> -->
                             <span class="crop-name">{{ currentCropName }}</span>
                             <span class="crop-badge">当前作物</span>
                         </div>