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

src/components/chatWindow.vue

@@ -11,7 +11,7 @@
                         :size="40"
                         :src="
                             msg.receiverIcon ||
-                            'https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png'
+                            'https://birdseye-img.sysuimars.com/dinggou-mini/defalut-icon.png'
                         "
                     />
                     <img src="" alt="" />
@@ -119,7 +119,7 @@
                         :size="40"
                         :src="
                             msg.senderIcon ||
-                            'https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png'
+                            'https://birdseye-img.sysuimars.com/dinggou-mini/defalut-icon.png'
                         "
                     />
                 </template>

src/components/detailDialog.vue

@@ -186,8 +186,11 @@ function toPage() {
 }
 
 const handleNoPopupBtn = () => {
-    noShow.value = false;
-    emit("noPopupBtn");
+    if(curRole == 0){
+        noShow.value = false;
+    }else{
+        emit("noPopupBtn");
+    }
 };
 </script>
 

src/views/old_mini/agri_services/components/farmDynamics.vue

@@ -220,7 +220,7 @@ const contentData = ref([]);
 const getContentData = async () => {
     const res = await VE_API.z_farm_work_record.getSimpleList({
         role: localStorage.getItem("SET_USER_CUR_ROLE"),
-        flowStatus: activePlanIndex.value === 4 ? "3,4" : activePlanIndex.value,
+        flowStatus:activePlanIndex.value,
     });
     contentData.value = res.data;
 

src/views/old_mini/home/components/problemReminder.vue

@@ -223,24 +223,22 @@ function triggerFarmWork() {
 
 // 获取触发图片
 const triggerImg = ref([]);
-// const getTriggerImg = async () => {
-//     const { data } = await VE_API.z_farm_work_record.getTriggerImg({ farmWorkRecordId: currentSection.value.id });
-//     triggerImg.value = data || [];
-// }
+const getTriggerImg = async () => {
+    const { data } = await VE_API.z_farm_work_record.getTriggerImg({ farmWorkRecordId: questPopupData.value.id });
+    triggerImg.value = data || [];
+}
 const noPopupBtn = async () => {
-    if(curRole == 2){
-        // await getTriggerImg();
-        // const query = {
-        //     askInfo: { title: "农事需求", content: "是否分享该农事需求给好友" },
-        //     shareText: `发起了 ${currentSection.value.farmWorkName} 的接单需求 请查看！`,
-        //     id: currentSection.value.id,
-        //     farmWorkOrderId: currentSection.value.orderId,
-        //     postImg: triggerImg.value.length ? base_img_url2 + triggerImg.value[triggerImg.value.length - 1].cloudFilename : ''
-        // };
-        // wx.miniProgram.navigateTo({
-        //     url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
-        // });
-    }
+    // await getTriggerImg();
+    // const query = {
+    //     askInfo: { title: "分享农事", content: "是否分享该农事给好友" },
+    //     shareText: `您的农事要做${questPopupData.value.farm}了 请查看！`,
+    //     id: questPopupData.value?.farmWorkLibId,
+    //     farmWorkOrderId: questPopupData.value?.farm?.orderId,
+    //     postImg: triggerImg.value.length ? base_img_url2 + triggerImg.value[triggerImg.value.length - 1].cloudFilename : ''
+    // };
+    // wx.miniProgram.navigateTo({
+    //     url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
+    // });
 };
 </script>
 <style lang="scss" scoped>

src/views/old_mini/mine/pages/messageList.vue

@@ -4,10 +4,8 @@
         <div class="message-list">
             <div class="message-item" v-for="(item, index) in messageList" :key="index" @click="handleItem(item)">
                 <div class="message">
-                    <!-- <img class="img" v-if="item.senderId===userId&&item.type==='message'" :src="item.targetUserAvatar || 'https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png'" alt=""> -->
-                    <img class="img" :src="item.targetUserAvatar || 'https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png'" alt="">
+                    <img class="img" :src="item.targetUserAvatar || 'https://birdseye-img.sysuimars.com/dinggou-mini/defalut-icon.png'" alt="">
                     <div class="info">
-                        <!-- <span class="name" v-if="item.senderId===userId">{{item.receiverName}}</span> -->
                         <span class="name">{{item.targetUserName || '飞鸟种植助手'}}</span>
                         <div class="van-ellipsis" v-if="item.newMessageType==='image'">[图片]</div>
                         <div class="van-ellipsis" v-else>{{item.newContent}}</div>
@@ -121,6 +119,7 @@ onMounted(()=>{
                     height: 48px;
                     margin-right: 10px;
                     border-radius: 10px;
+                    border-radius: 50%;
                 }
                 .info {
                     width: 100%;

src/views/old_mini/report_detail/index.vue

@@ -11,7 +11,7 @@
                 </el-select>
             </div>
             <tabs v-model:active="active" class="tabs" scrollspy sticky offset-top="40" background="#f5f7fb">
-                <tab title="果园总览" class="tab-item">
+                <!-- <tab title="果园总览" class="tab-item">
                     <div class="item-title">果园总览</div>
                     <div class="item-content">
                         <div class="item-text">果园面积共XX亩，共有XX棵生产树。</div>
@@ -34,8 +34,8 @@
                         </div>
                         <div class="list-text" @click="handleSeeMore">点击查看更多</div>
                     </div>
-                </tab>
-                <tab title="整体园相" class="tab-item">
+                </tab> -->
+                <!-- <tab title="整体园相" class="tab-item">
                     <div class="item-title">整体园相</div>
                     <div class="item-content">
                         <div class="item-name">透光率</div>
@@ -53,7 +53,7 @@
                             <div class="map-text">剪枝农事地图</div>
                         </div>
                     </div>
-                </tab>
+                </tab> -->
                 <tab title="营养管理" class="tab-item">
                     <div class="item-title">营养管理</div>
                     <div class="item-content">
@@ -62,8 +62,8 @@
                             透光率体现树体自身郁闭程度，当前XX%的树体透光性较差，可能造成整体减产XX%，需立即执行剪枝农事；XX%的树体透光正常，建议继续保持现有管理措施并及时巡园。
                         </div>
                         <div class="map-wrap">
-                            <img class="map-img" src="@/assets/img/home/map.png" alt="" />
-                            <div class="map-text">根肥农事地图</div>
+                            <!-- <img class="map-img" src="@/assets/img/home/map.png" alt="" /> -->
+                            <!-- <div class="map-text">根肥农事地图</div> -->
                         </div>
                     </div>
                 </tab>
@@ -74,8 +74,8 @@
                             透光率体现树体自身郁闭程度，当前XX%的树体透光性较差，可能造成整体减产XX%，需立即执行剪枝农事；XX%的树体透光正常，建议继续保持现有管理措施并及时巡园。
                         </div>
                         <div class="map-wrap">
-                            <img class="map-img" src="@/assets/img/home/map.png" alt="" />
-                            <div class="map-text">防虫农事地图</div>
+                            <!-- <img class="map-img" src="@/assets/img/home/map.png" alt="" /> -->
+                            <!-- <div class="map-text">防虫农事地图</div> -->
                         </div>
                     </div>
                 </tab>