diff --git a/pages.json b/pages.json
index 2275960..54d9c0e 100644
--- a/pages.json
+++ b/pages.json
@@ -300,7 +300,12 @@
 				{
 					"path": "treePage/treeInfo",
 					"style": {
-						"navigationBarTitleText": "树木详情"
+						"navigationBarTitleText": "树木详情",
+						"mp-weixin": {
+							"navigationBarTitleText": "树木详情",
+							"enablePullDownRefresh": false,
+							"reLaunchTime": 0
+						}
 					}
 				},
 				{
diff --git a/stores/counter.js b/stores/counter.js
index c453f10..c29e07d 100644
--- a/stores/counter.js
+++ b/stores/counter.js
@@ -13,9 +13,14 @@ export const useCounterStore = defineStore('useCounter', {
 		// 系统配置
 		config: Cache.get(CONFIG) || {},
 		// 系统消息数量
-		noticeNum: 0
+		noticeNum: 0,
+		treeData:{}
 	}),
 	actions: {
+// 设置用户信息
+		setTreeInfo(info) {
+			this.treeData = info
+		},
 		// 登录
 		login(data) {
 			// 用户登录状态
@@ -33,6 +38,7 @@ export const useCounterStore = defineStore('useCounter', {
 			Cache.remove(TOKEN)
 			// 设置用户信息
 			this.userInfo = {}
+			this.treeData = {}
 			Cache.remove(USER_INFO)
 		},
 		// 设置用户信息
diff --git a/subPackages/treePage/addTree.vue b/subPackages/treePage/addTree.vue
index 1bd6177..8afb841 100644
--- a/subPackages/treePage/addTree.vue
+++ b/subPackages/treePage/addTree.vue
@@ -12,7 +12,7 @@
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                        v-model="formData.treeheight"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size:14px;">米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -21,7 +21,7 @@
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                        v-model="formData.dbh"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size:14px">厘米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -47,16 +47,16 @@
             label="经度"
             class="location-form-item"
             prop="latitude"
+            :bottomBorder="false"
         >
           {{ formData.longitude }}
         </tui-form-item>
       </tui-col>
       <tui-col :span="12">
         <tui-form-item
-
+            :bottomBorder="false"
             label="纬度"
             class="location-form-item"
-
             prop="latitude"
         >
           {{ formData.latitude }}
@@ -134,7 +134,7 @@
               <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                          v-model="formData.estimationtreeage"></tui-input>
               <template v-slot:right>
-                <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">年</text>
+                <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">年</text>
               </template>
             </tui-form-item>
           </tui-col>
@@ -143,7 +143,7 @@
               <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                          v-model="formData.weekday"></tui-input>
               <template v-slot:right>
-                <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">厘米</text>
+                <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">厘米</text>
               </template>
             </tui-form-item>
           </tui-col>
@@ -156,7 +156,7 @@
               <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                          v-model="formData.canopyeastwest"></tui-input>
               <template v-slot:right>
-                <text style="padding-left: 12rpx;color:#aaa">米</text>
+                <text style="padding-left: 12rpx;color:#ccc">米</text>
               </template>
             </tui-form-item>
           </tui-col>
@@ -165,7 +165,7 @@
               <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10"
                          v-model="formData.canopysouthnorth"></tui-input>
               <template v-slot:right>
-                <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">米</text>
+                <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">米</text>
               </template>
             </tui-form-item>
           </tui-col>
@@ -211,7 +211,7 @@ const rules = [{
 }, {
   name: "treeheight",
   rule: ["required", "maxLength:10", "isAmount"],
-  msg: ["请输入数高", "数高不能超过10个字符", "请输入正确"]
+  msg: ["请输入树高", "数高不能超过10个字符", "请输入正确"]
 }, {
   name: "dbh",
   rule: ["required", "maxLength:10", "isAmount"],
@@ -242,7 +242,7 @@ const rules = [{
   }, {
     name: "managedutyunit",
     rule: ["required"],
-    msg: ["请选择权属单位"]
+    msg: ["请输入管护单位"]
   }, {
     name: "oldtreeownershipText",
     rule: ["required"],
@@ -442,13 +442,8 @@ export default {
 </script>
 
 <style>
-.tui-title {
-  width: 100%;
-  font-size: 28rpx;
-  color: #888;
-  padding: 30rpx;
-  box-sizing: border-box;
-}
+
+
 
 .tui-btn__box {
   width: 100%;
@@ -456,10 +451,6 @@ export default {
   bottom: 0;
 }
 
-.location-content {
-  font-size: 14px;
-}
-
 /* 动画区域样式 */
 .animated-area {
   height: 200rpx;
diff --git a/subPackages/treePage/editTree.vue b/subPackages/treePage/editTree.vue
index 8e27f91..db86ac0 100644
--- a/subPackages/treePage/editTree.vue
+++ b/subPackages/treePage/editTree.vue
@@ -51,7 +51,6 @@ export default {
 
 <style scoped>
 .content-container{
-  padding-top: 20rpx;
 }
 
 </style>
\ No newline at end of file
diff --git a/subPackages/treePage/treeFiles.vue b/subPackages/treePage/treeFiles.vue
index 872fb63..112acd7 100644
--- a/subPackages/treePage/treeFiles.vue
+++ b/subPackages/treePage/treeFiles.vue
@@ -18,8 +18,9 @@
 <!--          </template>-->
         </tui-input>
         <template v-slot:right>
-          <tui-form-button width="188rpx" height="64rpx" background="#f2f2f2" color="#5677fc" size="24"
-                           bold radius="12rpx">获取验证码</tui-form-button>
+          <tui-icon name="search" :size="20" @click="searchChange"></tui-icon>
+<!--          <tui-form-button width="188rpx" height="64rpx" background="#f2f2f2" color="#5677fc" size="24"-->
+<!--                           bold radius="12rpx">获取验证码</tui-form-button>-->
         </template>
 
       </tui-form-item>
@@ -39,7 +40,7 @@
     <view class="full-height-row">
       <view class="full-height-col left-con">
         <view v-for="(i,index) in depts" class="teamsItem" :key="index"
-              @click="teamsChange(i)"
+              @click="teamsChange(index)"
               :class="{teamsActive:index==currentIndex}"
         >
           <view class="fs-ellipsis fs-pt16 fs-pb16  fs-pl8 fs-pr8">{{ i.deptName }}</view>
@@ -85,8 +86,7 @@ export default {
   name: "treeFiles",
   data() {
     return {
-      cardList: [],
-      belongCompanyData: [],
+      belongCompanyData: [],  // 归属公司
       show: false,
       currentIndex: 0,
       formData: {
@@ -98,18 +98,7 @@ export default {
       companyId: '',// 归属公司
       depts: [],// 归属班组
       roads: [], // 道路树
-      card: {
-        title: {
-          text: '白菜湾四街'
-        },
-        tag: {
-          text: '153颗'
-        },
-        header: {
-          bgcolor: '#F7F7F7',
-          line: true
-        }
-      }
+
     }
   },
   onLoad() {
@@ -117,17 +106,18 @@ export default {
     belongCompanyreq().then(res => {
       this.belongCompanyData = res.data
       if (this.belongCompanyData.length > 0) {
-        this.formData.area = this.belongCompanyData[0].dictLabel
+        this.formData.companyId = this.belongCompanyData[0].dictLabel
         this.companyId = (this.belongCompanyData[0].dictValue).toString()
         this.deptListQuery()
       }
     })
   },
   methods: {
+    // 前往历史页面
     toNewPage(params) {
-      console.log('123312')
       uni.$tui.href(`/subPackages/treePage/treeRecord?roadId=${params}`)
     },
+    // 搜索
     searchChange() {
       this.deptListQuery()
     },
@@ -139,21 +129,17 @@ export default {
           this.roads = []
         } else {
           this.depts = res.data[0].depts
-          this.roads = this.depts[0].roads
+          this.roads = this.depts[this.currentIndex].roads
         }
         // this.treeRoadQuery()
       })
     },
-    // 树列表
-    treeRoadQuery() {
-      treeRoadReq({data: {road: ''}}).then(res => {
-        console.log(res)
-      })
-    },
-    // 归属公司
+
+    // 班组切换
     teamsChange(i) {
       console.log(i)
       this.currentIndex = i
+      this.roads = this.depts[this.currentIndex].roads
     },
     pickerShow() {
       this.show = true
@@ -163,7 +149,7 @@ export default {
     },
     pickerChange(e) {
       console.log(e)
-      this.formData.area = e.text
+      this.formData.companyId = e.text
     },
   }
 }
@@ -171,6 +157,13 @@ export default {
 
 
 <style scoped lang="scss">
+::v-deep .tui-form__item-wrap {
+  padding-top: 8px !important; /* 原可能是 12px/16px，按需减小 */
+  padding-bottom: 8px !important;
+  min-height: auto !important; /* 清除默认最小高度限制 */
+}
+
+
 .container {
   height: 100%;
   display: flex;
@@ -201,7 +194,6 @@ export default {
   flex: 1;
   height: 100%;
   background: #fff;
-  padding-top: 20rpx;
   overflow: hidden;
 }
 
@@ -213,11 +205,9 @@ export default {
 }
 
 .card-wrap {
-  //height: 200rpx;
-  margin: 0 20rpx 20rpx 20rpx;
+  margin: 20px 10px 0;
   padding: 20rpx;
-
-  border-radius: 10rpx;
+  border-radius: 14rpx;
 }
 
 .nodata-wrap {
diff --git a/subPackages/treePage/treeInfo.vue b/subPackages/treePage/treeInfo.vue
index 16285ab..ec44aab 100644
--- a/subPackages/treePage/treeInfo.vue
+++ b/subPackages/treePage/treeInfo.vue
@@ -12,7 +12,7 @@
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
                        v-model="formData.treeheight"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size:14px;">米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -21,7 +21,7 @@
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
                        v-model="formData.dbh"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size:14px">厘米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -64,7 +64,6 @@
       </tui-col>
 
 
-
       <tui-form-item asterisk label="管护单位" prop="managedutyunit">
 
         <tui-input padding="0" :borderBottom="false" placeholder="请输入" maxlength="30" :disabled="true"
@@ -86,7 +85,7 @@
         <tui-image-group
             :imageList="formData.treeImgList"
             radius="0"
-            @click="handleImageClick"
+            @click="previewImage"
         >
         </tui-image-group>
 
@@ -148,7 +147,7 @@
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
                        v-model="formData.estimationtreeage"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">年</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">年</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -157,7 +156,7 @@
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
                        v-model="formData.weekday"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">厘米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">厘米</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -170,7 +169,7 @@
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
                        v-model="formData.canopyeastwest"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa">米</text>
+              <text style="padding-left: 12rpx;color:#ccc">米</text>
             </template>
           </tui-form-item>
         </tui-col>
@@ -179,20 +178,20 @@
             <tui-input padding="0" :borderBottom="false" placeholder="请输入" textRight maxlength="10" :disabled="true"
                        v-model="formData.canopysouthnorth"></tui-input>
             <template v-slot:right>
-              <text style="padding-left: 12rpx;color:#aaa;font-size: 14px">米</text>
+              <text style="padding-left: 12rpx;color:#ccc;font-size: 14px">米</text>
             </template>
           </tui-form-item>
         </tui-col>
       </tui-row>
 
     </tui-form>
-    <tui-gallery :urls="urls" :show="show"  @hide="hide"></tui-gallery>
   </view>
 </template>
 
 <script>
 import { uploadURL, OSSURL } from '@/config/app'
 import { treeOwnership, treeLevelReq } from "@/api/tree";
+import { useCounterStore } from '@/stores/counter'
 const rules = [{
   name: "treetype",
   rule: ["required"],
@@ -248,7 +247,7 @@ const rules = [{
 export default {
   data() {
     return {
-// 当前预览索引
+      // 当前预览索引
       currentIndex: 0,
       // 是否显示预览弹窗
       show: false,
@@ -287,19 +286,39 @@ export default {
       },
     }
   },
+  computed: {
+    // 获取共享store实例
+    useCounterStore() {
+      return useCounterStore()
+    }
+  },
   onReady() {
     //开启即时校验，开启后输入即校验【参数必传】，第一参数：是否开启；第二参数：校验规则
     // 开启即时校验，参数：是否开启、校验规则
-    this.$refs.form && this.$refs.form.immediateValidate(true, rules);
+    // this.$refs.form && this.$refs.form.immediateValidate(true, rules);
+  },
+  onUnload() {
+
   },
   onLoad(options) {
-    const eventChannel = this.getOpenerEventChannel();
-    // eventChannel.on监听，获取上一页面通过eventChannel事件传送的数据
-    eventChannel.on('pageDataTreeInfo', data=> {
-      console.log(data) // {data: 123, title: "A页面"，source: 1, content: "点个赞点个赞，求求了"}
-      console.log('4123')
-      this.formData =data
-    })
+    // this.formData = this.useCounterStore.treeData
+    const treeData = this.useCounterStore.treeData;
+
+    this.formData = {
+      ...treeData,
+      // 仅在当前组件中临时转换为对象数组，不修改Pinia源数据
+      treeImgList: treeData.treeImgList.map((item, index) => {
+        return { id: index*Math.random()*10, src: item };
+      })
+    };
+
+    this.urls = treeData.treeImgList
+    // this.formData.treeImgList = this.formData.treeImgList.map((item, index) => {
+    //   return {
+    //     id: index*Math.random()*10,
+    //     src: item
+    //   }
+    // });
 
     treeLevelReq().then(res => {
       this.treeLevelData = res.data
@@ -317,55 +336,33 @@ export default {
         this.formData.oldtreeownershipText = option.dictLabel;
       }
     })
-    this.urls = this.formData.treeImgList.map((item, index) => {
-      return {
-        src: item
-      }
-    });
-    this.formData.treeImgList = this.formData.treeImgList.map((item, index) => {
-      return {
-        id: index,
-        src: item
-      }
-    });
   },
   methods: {
-// 图片点击事件
-    handleImageClick(e) {
-      console.log(e.id)
-      // 如果组件自带预览功能，可能不需要手动控制显示
-      // 否则手动显示预览弹窗
-      this.show = true;
+    // 图片预览
+    previewImage(e) {
+      // 获取当前点击的图片索引（不同版本组件可能参数不同）
+      const index = e.index || 0;
+      // 使用uni-app自带的图片预览API
+      uni.previewImage({
+        // 预览的图片地址列表
+        urls: this.urls,
+        // 初始显示的图片索引
+        current: index,
+        // 预览窗口关闭时的回调
+        success: function(res) {
+          console.log('预览图片成功');
+        },
+        // 预览失败的回调
+        fail: function(err) {
+          console.error('预览图片失败：', err);
+        }
+      });
     },
-    hide(){
-      this.show = false
-    }
+
   }
 }
 </script>
 
 <style>
-.tui-title {
-  width: 100%;
-  font-size: 28rpx;
-  color: #888;
-  padding: 30rpx;
-  box-sizing: border-box;
-}
-
-.tui-btn__box {
-  width: 100%;
-  position: fixed;
-  bottom: 0;
-}
-
-.location-content {
-  font-size: 14px;
-}
 
-/* 动画区域样式 */
-.animated-area {
-  height: 200rpx;
-  transition: all 0.3s ease-out; /* 动画过渡效果 */
-}
 </style>
\ No newline at end of file
diff --git a/subPackages/treePage/treeLog.vue b/subPackages/treePage/treeLog.vue
index 2d67fc7..6dd83db 100644
--- a/subPackages/treePage/treeLog.vue
+++ b/subPackages/treePage/treeLog.vue
@@ -8,15 +8,15 @@
           <view class="record-list-left" :style="`background-image: url(${i.treephotoone});`"></view>
           <view class="record-list-right">
             <view class="record-list-right-title">
-              <view class="fs-ellipsis">{{ i.treetype }}</view>
-              <view style="min-width: 100px">{{ i.updatetime.substring(0, 10) }}</view>
+              <view class="fs-ellipsis treetypeName">{{ i.treetype }}</view>
+              <view style="text-align: right">{{ i.updatetime.substring(0, 10) }}</view>
             </view>
             <view class="fs-mt8 fs-align__center">
-              <img src="/static/images/tree/tree-high.png" style="width: 16px;height: 16px;margin-right: 6px;"
+              <img src="/static/images/tree/tree-high.png" style="width: 14px;height: 14px;margin-right: 6px;"
                    alt=""> 高度：{{ i.treeheight }} 米
             </view>
             <view class="fs-mt8 fs-align__center">
-              <img src="/static/images/tree/treearound.png" style="width: 16px;height: 16px;margin-right: 6px;"
+              <img src="/static/images/tree/treearound.png" style="width: 14px;height: 14px;margin-right: 6px;"
                    alt="">胸径：{{ i.dbh }} 厘米
             </view>
           </view>
@@ -32,6 +32,7 @@
 </template>
 
 <script>
+import { useCounterStore } from '@/stores/counter'
 import { treeLogReq } from "@/api/tree";
 export default {
   name: "treeLog",
@@ -70,13 +71,10 @@ export default {
       })
     },
     todetailPage(i) {
-     console.log(i)
-      console.log(i)
+      const shareStore = useCounterStore()
+      shareStore.setTreeInfo(i)
       uni.navigateTo({
         url: `/subPackages/treePage/treeInfo`,
-        success: function(res) {
-          res.eventChannel.emit('pageDataTreeInfo',i)
-        }
       })
     }
   }
@@ -86,11 +84,16 @@ export default {
 
 <style scoped>
 .record-list-wrap {
-  margin: 20rpx 20rpx 0 20rpx;
-  padding: 20rpx;
-  border-radius: 10rpx;
+  margin: 20px 10px 0 ;
+  padding:10px;
+  border-radius: 6px;
+  font-size: 14px;
+}
+.treetypeName{
+  flex:1;
+  font-size: 16px;
+  font-weight: bold;
 }
-
 .record-list-left {
   height: 70px;
   width: 70px;
diff --git a/subPackages/treePage/treeRecord.vue b/subPackages/treePage/treeRecord.vue
index 8dbeea3..a1dc28d 100644
--- a/subPackages/treePage/treeRecord.vue
+++ b/subPackages/treePage/treeRecord.vue
@@ -8,14 +8,14 @@
           <view class="record-list-left" :style="`background-image: url(${i.treephoto});`"></view>
           <view class="record-list-right">
             <view class="record-list-right-title">
-              <view class="fs-ellipsis">{{ i.treetype }}</view>
-              <view style="min-width: 100px">{{ i.updatetime.substring(0, 10) }}</view>
+              <view class="fs-ellipsis treetypeName">{{ i.treetype }}</view>
+              <view style="text-align: right">{{ i.updatetime.substring(0, 10) }}</view>
             </view>
             <view class="fs-mt8 fs-align__center">
-              <img src="../../static/images/tree/tree-high.png" style="width: 16px;height: 16px;margin-right: 6px;" alt=""> 高度：{{ i.treeheight }} 米
+              <img src="../../static/images/tree/tree-high.png" style="width: 14px;height: 14px;margin-right: 6px;" alt=""> 高度：{{ i.treeheight }} 米
             </view>
             <view class="fs-mt8 fs-align__center">
-              <img src="../../static/images/tree/treearound.png" style="width: 16px;height: 16px;margin-right: 6px;" alt="">胸径：{{ i.dbh }} 厘米
+              <img src="../../static/images/tree/treearound.png" style="width: 14px;height: 14px;margin-right: 6px;" alt="">胸径：{{ i.dbh }} 厘米
             </view>
           </view>
         </view>
@@ -65,9 +65,15 @@ export default {
 
 <style scoped>
 .record-list-wrap {
-  margin: 20rpx 20rpx 0 20rpx;
-  padding: 20rpx;
-  border-radius: 10rpx;
+  margin: 20px 10px 0 ;
+  padding:10px;
+  border-radius: 6px;
+  font-size: 14px;
+}
+.treetypeName{
+  flex:1;
+  font-size: 16px;
+  font-weight: bold;
 }
 
 .record-list-left {