diff --git a/App.vue b/App.vue
index 153ff36..7d92df4 100644
--- a/App.vue
+++ b/App.vue
@@ -37,7 +37,7 @@
 						shop_token: info.referrerInfo?.extraData?.token
 					});
 					this.$store.commit('SET_USERINFO', {
-						user: data,
+						user: {},
 						token: res.data.token
 					})
 					this.$store.dispatch('initConfig');
diff --git a/api/task.js b/api/task.js
index 284cf17..a113762 100644
--- a/api/task.js
+++ b/api/task.js
@@ -65,3 +65,14 @@ export const marketTask10Commit = (data) => oahttp.post('/task/commit_town_task_
  * 任务:提交村公司任务-信息平台铺设任务接口
  */
 export const villageTask6Commit = (data) => oahttp.post('/task/commit_village_task_type_6', data)
+
+
+/**
+ * 任务:提交村镇公司收集任务列表
+ */
+export const townMasterTask3List = (data) => oahttp.get('/task/service_task_detail', data)
+
+/**
+ * 任务:提交村镇公司收集任务提交
+ */
+export const townMasterTask3Commit = (data) => oahttp.post('/task/commit_town_master_task_type_3', data)
\ No newline at end of file
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 2812b14..3bdd7e8 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -1,30 +1,30 @@
 <template>
-  <view class="c_task_item" @click="clickTask">
-    <view class="personnel_list">
-      <view class="cards">
-        <view class="cards_head">
-          <view style="font-size: 32rpx; display: flex;padding-right: 16rpx;">
-            <view style="flex-shrink: 0;margin-right: 10rpx;">任务名称: </view>
-            <view>{{ datas.title }}</view>
-          </view>
-          <view style="flex-shrink: 0;">点击查看</view>
-        </view>
-        <view class="cards_content">
-          <view class="right" style="width: 100%">
-            <view class="" style="display: flex">
-              <view>任务状态 :</view>
-              <view class="text" style="color: #ff7c32">
-                <text v-if="datas.status == 3" style="color: #488f00">已完成</text>
-                <text v-else-if="datas.status == 5" style="color: #ccc">已关闭</text>
-                <block v-else-if="
+	<view class="c_task_item" @click="clickTask">
+		<view class="personnel_list">
+			<view class="cards">
+				<view class="cards_head">
+					<view style="font-size: 32rpx; display: flex;padding-right: 16rpx;">
+						<view style="flex-shrink: 0;margin-right: 10rpx;">任务名称: </view>
+						<view>{{ datas.title }}</view>
+					</view>
+					<view style="flex-shrink: 0;">点击查看</view>
+				</view>
+				<view class="cards_content">
+					<view class="right" style="width: 100%">
+						<view class="" style="display: flex">
+							<view>任务状态 :</view>
+							<view class="text" style="color: #ff7c32">
+								<text v-if="datas.status == 3" style="color: #488f00">已完成</text>
+								<text v-else-if="datas.status == 5" style="color: #ccc">已关闭</text>
+								<block v-else-if="
                     datas.type == 31 ||
                     datas.type == 32 ||
                     datas.type == 33 ||
                     datas.type == 34 ||
                     datas.type == 35
                   ">
-                  <block v-if="datas.extend && datas.extend.informationg">
-                    {{
+									<block v-if="datas.extend && datas.extend.informationg">
+										{{
                       (datas.extend.informationg.update
                         ? datas.extend.informationg.update
                         : 0) +
@@ -33,13 +33,13 @@
                         ? datas.extend.informationg.count
                         : 0)
                     }}
-                  </block>
-                  <block v-else-if="
+									</block>
+									<block v-else-if="
                       datas.extend &&
                       datas.extend.transaction &&
                       datas.extend.transaction.arr
                     ">
-                    {{
+										{{
                       (datas.extend.transaction.arr.transaction_pool
                         ? datas.extend.transaction.arr.transaction_pool
                         : 0) +
@@ -49,339 +49,351 @@
                         : 0) +
                       "元"
                     }}
-                    <!-- <text style="color: #488F00;margin-left: 26rpx;">{{(datas.extend.transaction.arr.transaction_pool?datas.extend.transaction.arr.transaction_pool:1)+'元'}}</text> -->
-                  </block>
-                  <block v-else-if="datas.extend && datas.extend.update">
-                    <text v-if="
+										<!-- <text style="color: #488F00;margin-left: 26rpx;">{{(datas.extend.transaction.arr.transaction_pool?datas.extend.transaction.arr.transaction_pool:1)+'元'}}</text> -->
+									</block>
+									<block v-else-if="datas.extend && datas.extend.update">
+										<text v-if="
                         (datas.extend.update.transfer &&
                           datas.extend.update.transfer.lnglat[0]) ||
                         datas.status == 3
                       " style="color: #488f00">抵达终点</text>
-                    <text v-else-if="
+										<text v-else-if="
                         datas.extend.update.terminus &&
                         datas.extend.update.terminus.lnglat[0]
                       ">抵达中转点</text>
-                    <text v-else>进行中</text>
-                  </block>
-                  <block v-else>进行中</block>
-                </block>
-                <block
-                  v-else-if="townService(datas.type)">
-                  <block v-if="datas.type == 44">
-                    {{extend.total-extend.not_done_count||0}}/{{extend.total||0}}
-                  </block>
-                  <block v-else-if="datas.type == 45">
-                    {{extend.done_count||0}}/{{extend.total||0}}
-                  </block>
-                  <block v-else>进行中</block>
-                </block>
-                <block v-else>进行中</block>
-              </view>
-            </view>
-            <view style="
+										<text v-else>进行中</text>
+									</block>
+									<block v-else>进行中</block>
+								</block>
+								<block v-else-if="townService(datas.type)">
+									<block v-if="datas.type == 44">
+										{{extend.total-extend.not_done_count||0}}/{{extend.total||0}}
+									</block>
+									<block v-else-if="datas.type == 45">
+										{{extend.done_count||0}}/{{extend.total||0}}
+									</block>
+									<block v-else>进行中</block>
+								</block>
+								<block v-else>进行中</block>
+							</view>
+						</view>
+						<view style="
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
               ">
-              <view>
-                <text>完成时间 :</text>
-                <text>{{ datas.end_time }}</text>
-              </view>
-              <text v-if="datas.status == 2 || datas.status == 1" style="background-color: #ff7c32"
-                class="status">进行中</text>
-              <text v-if="datas.status == 3" style="background-color: #488f00" class="status">已完成</text>
-              <text v-if="datas.status == 5" style="background-color: #ccc" class="status">已关闭</text>
-            </view>
-            <view class="">
-              <text>任务金额 :</text>
-              <text> {{ datas.money + "元" || "0.00" }} </text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+							<view>
+								<text>完成时间 :</text>
+								<text>{{ datas.end_time }}</text>
+							</view>
+							<text v-if="datas.status == 2 || datas.status == 1" style="background-color: #ff7c32"
+								class="status">进行中</text>
+							<text v-if="datas.status == 3" style="background-color: #488f00" class="status">已完成</text>
+							<text v-if="datas.status == 5" style="background-color: #ccc" class="status">已关闭</text>
+						</view>
+						<view class="">
+							<text>任务金额 :</text>
+							<text> {{ datas.money + "元" || "0.00" }} </text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  import {
-    Toast
-  } from '../../libs/uniApi';
-  export default {
-    name: "task",
-    props: {
-      datas: {
-        type: Object,
-        default: function() {
-          return {}
-        }
-      }
-    },
-    data() {
-      return {
-        extend: {},
-        // 以下从左至右分别为: 服务部长,市场部长,负责人
-        taskRoleTypeList: ['town_task_type', 'town_task_type_marketing_director', 'town_task_type_master'],
-        townServiceList: [44,45,46,47,48,49,50], // 镇农科服务部长任务
-        navToTownServiceList: [44,45,46,48,49,50], // 镇农科服务部长跳转/subpkg/townTask/townTask的任务  0
-        navToTownMarketList: [51,52,53,54,55,57,58,59], // 镇农科市场部长跳转/subpkg/townTask/townTask的任务  1
-        navToVillageList: [62,63,64,65,66,68] // 村管理跳转/subpkg/townTask/townTask的任务  1
-      };
-    },
-    mounted() {
-      this.$props.datas.extend ? this.extend = this.$props.datas.extend : null;
-    },
-    methods: {
-      navTo(url) {
-        if (url) {
-          uni.showLoading({
-            title: '加载中',
-            mask: true
-          });
-          uni.navigateTo({
-            url: url,
-            success() {
-              uni.hideLoading()
-            }
-          })
-        } else Toast('暂未开放')
-      },
-      clickTask() {
-        if (this.isTimeInRange()) return Toast('任务正在结算中');
-        // if ((this.$props.datas.type != 31) && this.$props.datas.status !== 2 && this.$props.datas.status !== 1) {
-        // 	return this.$props.datas.status == 3 ? Toast('任务已完成!') : Toast('任务已结束!');
-        // }
-        if(this.navToTownServiceList.includes(this.$props.datas.type)) 
-          return this.navTo(`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[0]}`);
-        if(this.navToTownMarketList.includes(this.$props.datas.type)) 
-          return this.navTo(`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[1]}`);
-        if(this.navToVillageList.includes(this.$props.datas.type))
-          return this.navTo(`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[1]}`);
-        switch (this.$props.datas.type) {
-          case 31:
-            if (this.$store.state.app.userInfo.admin_id) this.navTo(
-              `/subpkg/captain/captain?task_id=${this.$props.datas?.id}`);
-            else this.navTo(`/subpkg/archives/archives?task_id=${this.$props.datas?.id}`);
-            break;
-          case 32:
-            this.navTo(`/subpkg/property/vehicle?task_id=${this.$props.datas?.id}`);
-            break;
-          case 33:
-            let is_show = true;
-            if (uni.$u.timeFormat(Date.now(), 'yyyy-mm-dd') != this.$props.datas?.end_time) is_show = false;
-            this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}&is_show=${is_show}`);
-            break;
-          case 34:
-            this.navTo(`/subpkg/otherTask/otherTask?task_id=${this.$props.datas?.id}`);
-            break;
-          case 35:
-            this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`);
-            break;
-          case 47:
-            this.navTo(`/subpkg/townTask/serviceTask4?task_id=${this.$props.datas?.id}`);
-            break;
-          case 60:
-            this.navTo(`/subpkg/townTask/marketTask10?task_id=${this.$props.datas?.id}&stage=${this.$props.datas?.stage}`);
-            break;
-          case 67:
-            this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`);
-            break;
-          case 69:
-            this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`);
-            break;
-          default:
-            this.navTo('');
-            break;
-        }
-      },
-      // 服务部长任务
-      townService(type){
-        return this.townServiceList.includes(type);
-      },
-      isTimeInRange() {
-        const now = new Date();
-        const startTime = new Date(now.getTime());
-        const endTime = new Date(now.getTime());
+	import {
+		Toast
+	} from '../../libs/uniApi';
+	export default {
+		name: "task",
+		props: {
+			datas: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				extend: {},
+				// 以下从左至右分别为: 服务部长,市场部长,负责人
+				taskRoleTypeList: ['town_task_type', 'town_task_type_marketing_director', 'town_task_type_master'],
+				townServiceList: [44, 45, 46, 47, 48, 49, 50], // 镇农科服务部长任务
+				navToTownServiceList: [44, 45, 46, 48, 49, 50], // 镇农科服务部长跳转/subpkg/townTask/townTask的任务  0
+				navToTownMarketList: [51, 52, 53, 54, 55, 57, 58, 59], // 镇农科市场部长跳转/subpkg/townTask/townTask的任务  1
+				navToVillageList: [62, 63, 64, 65, 66, 68] // 村管理跳转/subpkg/townTask/townTask的任务  1
+			};
+		},
+		mounted() {
+			this.$props.datas.extend ? this.extend = this.$props.datas.extend : null;
+		},
+		methods: {
+			navTo(url) {
+				if (url) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
+					uni.navigateTo({
+						url: url,
+						success() {
+							uni.hideLoading()
+						}
+					})
+				} else Toast('暂未开放')
+			},
+			clickTask() {
+				if (this.isTimeInRange()) return Toast('任务正在结算中');
+				// if ((this.$props.datas.type != 31) && this.$props.datas.status !== 2 && this.$props.datas.status !== 1) {
+				// 	return this.$props.datas.status == 3 ? Toast('任务已完成!') : Toast('任务已结束!');
+				// }
+				if (this.navToTownServiceList.includes(this.$props.datas.type))
+					return this.navTo(
+						`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[0]}`
+					);
+				if (this.navToTownMarketList.includes(this.$props.datas.type))
+					return this.navTo(
+						`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[1]}`
+					);
+				if (this.navToVillageList.includes(this.$props.datas.type))
+					return this.navTo(
+						`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[1]}`
+					);
+				switch (this.$props.datas.type) {
+					case 31:
+						if (this.$store.state.app.userInfo.admin_id) this.navTo(
+							`/subpkg/captain/captain?task_id=${this.$props.datas?.id}`);
+						else this.navTo(`/subpkg/archives/archives?task_id=${this.$props.datas?.id}`);
+						break;
+					case 32:
+						this.navTo(`/subpkg/property/vehicle?task_id=${this.$props.datas?.id}`);
+						break;
+					case 33:
+						let is_show = true;
+						if (uni.$u.timeFormat(Date.now(), 'yyyy-mm-dd') != this.$props.datas?.end_time) is_show = false;
+						this.navTo(
+							`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}&is_show=${is_show}`
+						);
+						break;
+					case 34:
+						this.navTo(`/subpkg/otherTask/otherTask?task_id=${this.$props.datas?.id}`);
+						break;
+					case 35:
+						this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`);
+						break;
+					case 47:
+						this.navTo(`/subpkg/townTask/serviceTask4?task_id=${this.$props.datas?.id}`);
+						break;
+					case 60:
+						this.navTo(
+							`/subpkg/townTask/marketTask10?task_id=${this.$props.datas?.id}&stage=${this.$props.datas?.stage}`
+						);
+						break;
+					case 67:
+						this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`);
+						break;
+					case 69:
+						this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`);
+						break;
+					case 76:
+						this.navTo(`/subpkg/townTask/gatherRecords?task_id=${this.$props.datas?.id}`);
+						break;
+					default:
+						this.navTo('');
+						break;
+				}
+			},
+			// 服务部长任务
+			townService(type) {
+				return this.townServiceList.includes(type);
+			},
+			isTimeInRange() {
+				const now = new Date();
+				const startTime = new Date(now.getTime());
+				const endTime = new Date(now.getTime());
 
-        // 设置开始时间为当天的 22:55:00
-        startTime.setHours(22);
-        startTime.setMinutes(55);
-        startTime.setSeconds(0);
+				// 设置开始时间为当天的 22:55:00
+				startTime.setHours(22);
+				startTime.setMinutes(55);
+				startTime.setSeconds(0);
 
-        // 设置结束时间为当天的 23:59:59
-        endTime.setHours(23);
-        endTime.setMinutes(59);
-        endTime.setSeconds(59);
+				// 设置结束时间为当天的 23:59:59
+				endTime.setHours(23);
+				endTime.setMinutes(59);
+				endTime.setSeconds(59);
 
-        // 判断当前时间是否在时间范围内
-        return now >= startTime && now <= endTime;
-      }
-    }
-  }
+				// 判断当前时间是否在时间范围内
+				return now >= startTime && now <= endTime;
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-  .c_task_item {
-    margin: 0 auto;
-    // margin-bottom: 28rpx;
-    width: 694rpx;
-    // background: #FFFFFF;
-    border-radius: 14rpx 14rpx 14rpx 14rpx;
-    opacity: 1;
-    font-size: 25rpx;
-    font-weight: 400;
-    color: #999999;
-    line-height: 39rpx;
+	.c_task_item {
+		margin: 0 auto;
+		// margin-bottom: 28rpx;
+		width: 694rpx;
+		// background: #FFFFFF;
+		border-radius: 14rpx 14rpx 14rpx 14rpx;
+		opacity: 1;
+		font-size: 25rpx;
+		font-weight: 400;
+		color: #999999;
+		line-height: 39rpx;
 
-    .text {
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #333333;
-      line-height: 39rpx;
-      margin-left: 18rpx;
-    }
+		.text {
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #333333;
+			line-height: 39rpx;
+			margin-left: 18rpx;
+		}
 
-    .top {
-      display: flex;
-      justify-content: space-between;
-      padding: 28rpx;
-      border-bottom: 1rpx solid #f5f5f5ff;
+		.top {
+			display: flex;
+			justify-content: space-between;
+			padding: 28rpx;
+			border-bottom: 1rpx solid #f5f5f5ff;
 
-      .left {
-        display: flex;
-        justify-content: left;
-        align-items: center;
-      }
+			.left {
+				display: flex;
+				justify-content: left;
+				align-items: center;
+			}
 
-      .right {
-        .icon {
-          width: 43rpx;
-          height: 43rpx;
-        }
-      }
-    }
+			.right {
+				.icon {
+					width: 43rpx;
+					height: 43rpx;
+				}
+			}
+		}
 
-    .bottom {
-      padding: 28rpx;
-      display: flex;
+		.bottom {
+			padding: 28rpx;
+			display: flex;
 
-      .b_left {
-        width: 103.39rpx;
-        height: 94.63rpx;
-        margin-right: 18rpx;
-      }
+			.b_left {
+				width: 103.39rpx;
+				height: 94.63rpx;
+				margin-right: 18rpx;
+			}
 
-      .b_right {
-        flex: 1;
-        display: flex;
-        justify-content: space-around;
-        flex-direction: column;
+			.b_right {
+				flex: 1;
+				display: flex;
+				justify-content: space-around;
+				flex-direction: column;
 
-        .item {
-          display: flex;
-          justify-content: space-between;
-          // margin: 18rpx 28rpx 0 28rpx;
+				.item {
+					display: flex;
+					justify-content: space-between;
+					// margin: 18rpx 28rpx 0 28rpx;
 
-          // &:last-child {
-          //   padding-bottom: 18rpx;
-          // }
+					// &:last-child {
+					//   padding-bottom: 18rpx;
+					// }
 
-          .left {
-            display: flex;
-          }
+					.left {
+						display: flex;
+					}
 
-          .right {
-            font-size: 32rpx;
-            font-weight: 400;
-            color: #3274f9;
-            line-height: 39rpx;
+					.right {
+						font-size: 32rpx;
+						font-weight: 400;
+						color: #3274f9;
+						line-height: 39rpx;
 
-            .price {
-              font-size: 25rpx;
-            }
-          }
-        }
-      }
-    }
-  }
+						.price {
+							font-size: 25rpx;
+						}
+					}
+				}
+			}
+		}
+	}
 
-  .personnel_list {
-    // padding: 28rpx 0;
-    padding-bottom: 28rpx;
+	.personnel_list {
+		// padding: 28rpx 0;
+		padding-bottom: 28rpx;
 
-    .cards {
-      margin: 0 auto;
-      // margin-bottom: 28rpx;
-      width: 694rpx;
-      background: #ffffff;
-      border-radius: 30rpx;
-      opacity: 1;
-      overflow: hidden;
-      // box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+		.cards {
+			margin: 0 auto;
+			// margin-bottom: 28rpx;
+			width: 694rpx;
+			background: #ffffff;
+			border-radius: 30rpx;
+			opacity: 1;
+			overflow: hidden;
+			// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
 
-      .cards_head {
-        padding: 28rpx;
-        background-color: $theme-oa-color;
-        color: white;
-        min-height: 100rpx;
-        display: flex;
-        justify-content: space-between;
-      }
+			.cards_head {
+				padding: 28rpx;
+				background-color: $theme-oa-color;
+				color: white;
+				min-height: 100rpx;
+				display: flex;
+				justify-content: space-between;
+			}
 
-      .cards_content {
-        padding: 28rpx;
-        display: flex;
-        justify-content: space-between;
+			.cards_content {
+				padding: 28rpx;
+				display: flex;
+				justify-content: space-between;
 
-        .left {
-          text-align: center;
-          // padding: 15rpx 25rpx;
-          padding-top: 20rpx;
+				.left {
+					text-align: center;
+					// padding: 15rpx 25rpx;
+					padding-top: 20rpx;
 
-          width: 160rpx;
-          background-color: $theme-oa-color;
-          color: white;
-          border-radius: 40rpx;
+					width: 160rpx;
+					background-color: $theme-oa-color;
+					color: white;
+					border-radius: 40rpx;
 
-          .cir {
-            width: 120rpx;
-            height: 120rpx;
-            background-color: #ffffff;
-            margin-left: 25rpx;
-            border-radius: 120rpx;
-            position: relative;
-          }
-        }
+					.cir {
+						width: 120rpx;
+						height: 120rpx;
+						background-color: #ffffff;
+						margin-left: 25rpx;
+						border-radius: 120rpx;
+						position: relative;
+					}
+				}
 
-        .right {
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
+				.right {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
 
-          view {
-            text:nth-child(2) {
-              margin-left: 20rpx;
-            }
+					view {
+						text:nth-child(2) {
+							margin-left: 20rpx;
+						}
 
-            .status {
-              display: inline-block;
-              float: right;
-              color: white;
-              text-align: center;
-              padding: 10rpx 30rpx;
-              border-radius: 30rpx;
-            }
-          }
-        }
-      }
+						.status {
+							display: inline-block;
+							float: right;
+							color: white;
+							text-align: center;
+							padding: 10rpx 30rpx;
+							border-radius: 30rpx;
+						}
+					}
+				}
+			}
 
-      .u_avatar {
-        position: absolute;
-        top: 50%;
-        left: 50%;
+			.u_avatar {
+				position: absolute;
+				top: 50%;
+				left: 50%;
 
-        transform: translate(-50%, -50%);
-      }
-    }
-  }
+				transform: translate(-50%, -50%);
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 1f489ac..80f514f 100644
--- a/pages.json
+++ b/pages.json
@@ -886,6 +886,24 @@
 					"navigationBarTextStyle": "white"
 				}
 
+			}, {
+				"path": "townTask/townGather",
+				"style": {
+					"navigationBarTitleText": "养殖信息收集",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#0122C7",
+					"navigationBarTextStyle": "white"
+				}
+
+			}, {
+				"path": "townTask/gatherRecords",
+				"style": {
+					"navigationBarTitleText": "养殖信息收集",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#0122C7",
+					"navigationBarTextStyle": "white"
+				}
+
 			}, {
 				"path": "complaint/complaint",
 				"style": {
diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue
index 2a8d537..747817c 100644
--- a/pages/logistics/deliveryDetil.vue
+++ b/pages/logistics/deliveryDetil.vue
@@ -62,12 +62,16 @@
 								通知时间:&nbsp;&nbsp;{{goodsDetil.logistics.create_time}}
 							</view>
 							<view class="pro_list">
-								<text>
-									商品信息
-								</text>
+
 								<view class="goods">
-									<view class="goods_tit" v-for="(item,index) in goodsDetil.product">
-										<text style="flex: 8;">{{item.goods_name}}</text>
+									<text>
+										商品信息
+									</text>
+									<view class="goods-tit" style="align-items: center;"
+										v-for="(item,index) in goodsDetil.product" :key="index">
+										<text style="flex: 6;">{{item.goods_name}}</text>
+										<u--image style="flex: 2;" :showLoading="true" :src="item.goods_pic" width="100rpx"
+											height="100rpx" @click="click"></u--image>
 										<text style="flex: 2;">X{{item.product_num}}{{item.goods_unit}}</text>
 									</view>
 								</view>
@@ -78,6 +82,8 @@
 							<text>请详细核对订单信息</text>
 							<text style="color: #0122C7;">共计{{goodsDetil.product_count}}件商品</text>
 						</view>
+					</view>
+					<view class="">
 
 					</view>
 
@@ -443,9 +449,10 @@
 					flex: 8;
 					margin: 0;
 
-					.goods_tit {
+					.goods-tit {
 						margin: 0;
 						display: flex;
+						justify-content: space-around;
 
 					}
 
diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue
index b97bd63..8a34fe6 100644
--- a/pages/logistics/logisticDetil.vue
+++ b/pages/logistics/logisticDetil.vue
@@ -79,6 +79,9 @@
 							<view>
 								<view class="goods_tit" v-for="(item,index) in goodsDetil.product">
 									<text style="width: 60vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
+									<!-- <u--image style="flex: 2;" :showLoading="true" :src="item.goods_pic" width="100rpx"
+										height="100rpx" @click="click"></u--image> -->
+
 									<text>X{{item.product_num}}{{item.goods_unit}}</text>
 								</view>
 							</view>
@@ -204,12 +207,16 @@
 
 						</view>
 						<view class="pro_list">
-							<text style="color: #999;width: 15vw;">
-								商品信息
-							</text>
+
 							<view>
-								<view class="goods_tit" v-for="(item,index) in goodsDetil.product">
+								<text style="color: #999;width: 15vw;">
+									商品信息
+								</text>
+								<view class="goods_tit" style="align-items: center;"
+									v-for="(item,index) in goodsDetil.product">
 									<text style="width: 60vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
+									<u--image style="flex: 2;" :showLoading="true" :src="item.goods_pic" width="100rpx"
+										height="100rpx" @click="click"></u--image>
 									<text>X{{item.product_num}}{{item.goods_unit}}</text>
 								</view>
 							</view>
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 2053cfe..f5ecb88 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -1,189 +1,145 @@
 <template>
-  <view class="oa_home" style="oaColor">
-    <!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
-    <!-- <u-navbar @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
+	<view class="oa_home" style="oaColor">
+		<!-- <image class="header_bg" src="../../static/img/home/head-bg.png"></image> -->
+		<!-- <u-navbar @leftClick="leftClick" bgColor="rgba(0,0,0,0)"
         leftIconColor=" #fff" :autoBack="false">
     </u-navbar> -->
-    <view
-      class="home_header"
-      :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''"
-    >
-      <view
-        style="
+		<view class="home_header" :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''">
+			<view style="
           position: absolute;
           bottom: 0;
           left: 0;
           overflow: hidden;
           border-radius: 0 0 30rpx 30rpx;
-        "
-      >
-        <hx-lottie
-          :options="options"
-          ref="lottie"
-          style="
+        ">
+				<hx-lottie :options="options" ref="lottie" style="
             width: 100vw;
             height: 440rpx;
             transform: scale(1.2);
             background-color: #0122c7;
-          "
-        />
-      </view>
-      <!-- #ifdef APP-PLUS||H5 -->
-      <view style="height: var(--status-bar-height)"></view>
-      <view v-if="uniMP" style="height: 44px">
-        <u-icon
-          name="arrow-left"
-          color="#fff"
-          size="20"
-          @click="leftClick"
-        ></u-icon>
-      </view>
-      <view v-else style="height: 30rpx"></view>
-      <!-- <view v-if="uniMP" style="height: 44px;"></view> -->
-      <!-- #endif -->
-      <view class="my_info">
-        <view v-if="!$store.state.app.token" @click="login" class="mesg_box">
-          <view class="name">
-            <text class="nickname">立即登录</text>
-          </view>
-          <view class="duty"> 登录后可查看更多 </view>
-        </view>
-        <view class="head_img">
-          <view class="img_box">
-            <u--image
-              :showLoading="true"
-              width="131.43rpx"
-              height="131.43rpx"
-              class="img_box_img"
-              :src="myOaInfo.avatar || '../../static/img/public/avatar.png'"
-              shape="circle"
-            ></u--image>
-          </view>
+          " />
+			</view>
+			<!-- #ifdef APP-PLUS||H5 -->
+			<view style="height: var(--status-bar-height)"></view>
+			<view v-if="uniMP" style="height: 44px">
+				<u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon>
+			</view>
+			<view v-else style="height: 30rpx"></view>
+			<!-- <view v-if="uniMP" style="height: 44px;"></view> -->
+			<!-- #endif -->
+			<view class="my_info">
+				<view v-if="!$store.state.app.token" @click="login" class="mesg_box">
+					<view class="name">
+						<text class="nickname">立即登录</text>
+					</view>
+					<view class="duty"> 登录后可查看更多 </view>
+				</view>
+				<view class="head_img">
+					<view class="img_box">
+						<u--image :showLoading="true" width="131.43rpx" height="131.43rpx" class="img_box_img"
+							:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
+					</view>
 
-          <text class="head_text">工作证: {{ myOaInfo.nickname }}</text>
-          <text class="head_text" style="flex-shrink: 0"
-            >身份: {{ myOaInfo.admin_id ? "管理员" : "普通用户" }}</text
-          >
-        </view>
-      </view>
+					<text class="head_text">工作证: {{ myOaInfo.nickname }}</text>
+					<text class="head_text" style="flex-shrink: 0">身份: {{ myOaInfo.admin_id ? "管理员" : "普通用户" }}</text>
+				</view>
+			</view>
 
-      <!-- 占位 -->
-      <view style="height: 150rpx"></view>
+			<!-- 占位 -->
+			<view style="height: 150rpx"></view>
 
-      <view
-        class="backlog"
-        :class="!ApproveList.length > 0 ? 'backlog_no_data' : ''"
-      >
-        <view class="head_title flex_a_c_j_sb">
-          <view class="title">公告列表</view>
-          <view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')"
-            >更多
-            <view class="iconfont icon-you">
-              <uni-icons type="forward"></uni-icons>
-            </view>
-          </view>
-        </view>
-        <block v-if="ApproveList.length > 0">
-          <view
-            class="backlog_item flex_a_c_j_sb"
-            v-for="(item, index) in ApproveList.slice(0, 2)"
-            :key="index"
-            @click="clickNotice(item.id)"
-          >
-            <view class="text">
-              <text class="text_time">{{
+			<view class="backlog" :class="!ApproveList.length > 0 ? 'backlog_no_data' : ''">
+				<view class="head_title flex_a_c_j_sb">
+					<view class="title">公告列表</view>
+					<view class="flex_a_c" @click="navTo('/subpkg/noticeList/noticeList')">更多
+						<view class="iconfont icon-you">
+							<uni-icons type="forward"></uni-icons>
+						</view>
+					</view>
+				</view>
+				<block v-if="ApproveList.length > 0">
+					<view class="backlog_item flex_a_c_j_sb" v-for="(item, index) in ApproveList.slice(0, 2)"
+						:key="index" @click="clickNotice(item.id)">
+						<view class="text">
+							<text class="text_time">{{
                 item.create_time.substring(0, 10).replace(/-/g, ".")
               }}</text>
-              {{ item.title }}
-            </view>
+							{{ item.title }}
+						</view>
 
-            <i class="iconfont icon-you"
-              ><uni-icons type="forward"></uni-icons
-            ></i>
-          </view>
-        </block>
-        <view v-else class="backlog_no flex_a_c_j_sb">
-          <view class="text">暂无更多消息</view>
-          <i class="iconfont icon-you"
-            ><uni-icons type="forward"></uni-icons
-          ></i>
-        </view>
-      </view>
-    </view>
-	<!-- 片区经理聊天 -->
-	<view class="chat" @click="navTo('/subpkg/chatMang/index')" style="margin-top: 130rpx;">
-		<view class="chat-l">
-			<u--image shape="circle" :showLoading="true" :src="managerInfo.manager_avatar" width="91rpx" height="91rpx"></u--image>
-			<view class="" style="margin-left: 40rpx;">
-			{{managerInfo.manager_name}}
+						<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+					</view>
+				</block>
+				<view v-else class="backlog_no flex_a_c_j_sb">
+					<view class="text">暂无更多消息</view>
+					<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
+				</view>
 			</view>
 		</view>
-		<view class="" style="display: flex;">
-			<view class="brange" v-if="managerInfo.msg_num">
-			{{managerInfo.msg_num}}	
+		<!-- 片区经理聊天 -->
+		<view class="chat" @click="navTo('/subpkg/chatMang/index')" style="margin-top: 130rpx;">
+			<view class="chat-l">
+				<u--image shape="circle" :showLoading="true" :src="managerInfo.manager_avatar" width="91rpx"
+					height="91rpx"></u--image>
+				<view class="" style="margin-left: 40rpx;">
+					{{managerInfo.manager_name}}
+				</view>
 			</view>
-			<view class="iconfont icon-you">
-			  <uni-icons type="forward"></uni-icons>
+			<view class="" style="display: flex;">
+				<view class="brange" v-if="managerInfo.msg_num">
+					{{managerInfo.msg_num}}
+				</view>
+				<view class="iconfont icon-you">
+					<uni-icons type="forward"></uni-icons>
+				</view>
 			</view>
+
 		</view>
-	 
-	</view>
-	
-    <view class="my_task">
-      <view class="task_title flex_a_c_j_sb">
-        <view class="title" @click="leftClick">工作管理</view>
-        <!-- <view class="flex_a_c"
+
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title" @click="leftClick">工作管理</view>
+				<!-- <view class="flex_a_c"
           >更多
           <view class="iconfont icon-you">
             <uni-icons type="forward"></uni-icons>
           </view>
         </view> -->
-      </view>
-    </view>
+			</view>
+		</view>
 
-    <view class="fast_track">
-      <block v-for="(item, index) in oaHomeData" :key="item.id">
-        <view class="track_item" @click="navTwo(item.paths, index)">
-          <image
-            :src="item.icon"
-            mode="aspectFit"
-            style="width: 77rpx;height: 77rpx;"
-          >
-          </image>
-          <view class="title">{{ item.name }}</view>
-        </view>
-      </block>
-    </view>
+		<view class="fast_track">
+			<block v-for="(item, index) in oaHomeData" :key="item.id">
+				<view class="track_item" @click="navTwo(item.paths, index)">
+					<image :src="item.icon" mode="aspectFit" style="width: 77rpx;height: 77rpx;">
+					</image>
+					<view class="title">{{ item.name }}</view>
+				</view>
+			</block>
+		</view>
 
-    <view class="my_task">
-      <view class="task_title flex_a_c_j_sb">
-        <view class="title">配送信息</view>
-        <view class="flex_a_c" @click="goOrderList"
-          >更多
-          <view class="iconfont icon-you">
-            <uni-icons type="forward"></uni-icons>
-          </view>
-        </view>
-      </view>
-      
-      <view v-if="orderList.length > 0">
-        <globalPopup ref="globalPopup"></globalPopup>
-        <logistiBriefCard
-          v-for="(item, index) in orderList"
-          :key="index"
-          :goodsInfo="item"
-        >
-        </logistiBriefCard>
-        <u-loadmore :status="status" />
-      </view>
+		<view class="my_task">
+			<view class="task_title flex_a_c_j_sb">
+				<view class="title">配送信息</view>
+				<view class="flex_a_c" @click="goOrderList">更多
+					<view class="iconfont icon-you">
+						<uni-icons type="forward"></uni-icons>
+					</view>
+				</view>
+			</view>
 
-      <view v-else class="no_task">
-        <view class="title">暂无配送信息</view>
-        <view class="tips" v-if="!$store.state.app.token"
-          >登录后查看配送信息详情</view
-        >
-      </view>
-      <!-- <view class="head_title flex_a_c_j_sb">
+			<view v-if="orderList.length > 0">
+				<globalPopup ref="globalPopup"></globalPopup>
+				<logistiBriefCard v-for="(item, index) in orderList" :key="index" :goodsInfo="item">
+				</logistiBriefCard>
+				<u-loadmore :status="status" />
+			</view>
+
+			<view v-else class="no_task">
+				<view class="title">暂无配送信息</view>
+				<view class="tips" v-if="!$store.state.app.token">登录后查看配送信息详情</view>
+			</view>
+			<!-- <view class="head_title flex_a_c_j_sb">
         <view class="">我的任务</view>
         <view class="flex_a_c" @click="test">更多 <view class="iconfont icon-you"></view>
         </view>
@@ -207,826 +163,831 @@
           </view>
         </view>
       </block> -->
-    </view>
+		</view>
 
-    <view class="no_login" @click="login" v-if="!$store.state.app.token">
-      <view class="view">
-        <view class="text">登录里海OA,开启线上便捷办公</view>
-        <button class="btn">立即登录</button>
-      </view>
-    </view>
-    <!-- <tabbar></tabbar> -->
-  </view>
+		<view class="no_login" @click="login" v-if="!$store.state.app.token">
+			<view class="view">
+				<view class="text">登录里海OA,开启线上便捷办公</view>
+				<button class="btn">立即登录</button>
+			</view>
+		</view>
+		<!-- <tabbar></tabbar> -->
+	</view>
 </template>
 
 <script>
-import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue";
-import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue";
-import {
-  getList
-} from "@/api/logistics.js";
-import {
-  Toast
-} from "@/libs/uniApi.js";
-import {
-  oaHomeData
-} from "@/static/server/server.js";
-import {
-  noticeList
-} from "@/api/notice.js";
-import {
+	import logistiBriefCard from "@/components/logistiComptent/logistiCard/logistiBriefCard.vue";
+	import globalPopup from "@/components/GlobalPopup/GlobalPopup.vue";
+	import {
+		getList
+	} from "@/api/logistics.js";
+	import {
+		Toast
+	} from "@/libs/uniApi.js";
+	import {
+		oaHomeData
+	} from "@/static/server/server.js";
+	import {
+		noticeList
+	} from "@/api/notice.js";
+	import {
 		getAreaManagerApi
 	} from "@/api/bussness.js"
-// import tabbar from '../components/tabbar'
-import {
-  getIndexListAPI,
-  getTaskListAPI,
-  getMyTaskListAPI,
-  getApproveListAPI,
-  getUserIndexAPI,
-} from "@/api/oaApi.js";
-import {
-  mapState
-} from 'vuex';
-import bj from "@/static/animation/home.json"
-import {
-  userInfo
-} from "@/api/oaUser.js"
-//#ifdef APP-PLUS
-var jpushModule = uni.requireNativePlugin("JG-JPush");
-// #endif
-export default {
-  components: {
-    // tabbar
-    logistiBriefCard,
-    globalPopup,
-  },
-  data () {
-    return {
-	
-		brange:0,
-      options: {
-        data: '',
-      },
-      status: "loadmore",
-      page_num: 1,
-      flag: false,
-      uniMP: false,
-	  managerInfo:{},
-      id: "",
-      is_captain: 0,
-      notArr: [],
-      orderList: [],
-      oaHomeData: [],
-      src: "https://cdn.uviewui.com/uview/album/1.jpg",
-      assessData: [{
-        num: "0",
-        name: "任务",
-      },
-      {
-        num: "0",
-        name: "已完成",
-      },
-      {
-        num: "0",
-        name: "未完成",
-      },
-      {
-        num: "0%",
-        name: "完成率",
-      },
-      ],
-      project: {},
-      task: {},
-      page: 1,
-      myTaskList: [],
-      flowState: "#47B347", // 任务状态
-      priority: "", // 任务紧急度
-      myOaInfo: {
-        avatar: "",
-        nickname: "",
-        mobile: "",
-        did_name: "",
-        label_name: "",
-      },
-      ApproveList: [],
-      showOaHomeData: false, //更新首页计算的值
-    };
-  },
-  async onLoad () {
-	  
-    await this.$onLaunched;
-    this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")||'{}')?.is_captain
-    this.options.data = bj;
-	
-    //#ifdef APP-PLUS
-    let that = this;
-    jpushModule.addNotificationListener(function (result) {
-      if (!that.notArr.includes(result.messageID)) {
-        // that.$refs.globalPopup.showPopu();
-        that.getOrderList();
-        console.log("idnex的");
-        that.notArr.push(result.messageID);
-      }
-    });
-    // #endif
-  },
-  onReachBottom () {
-    if (this.flag) return
-    let that = this
-    this.status = "loading"
-    this.page_num += 1
-    this.flag = true
-    getList({
-      status: this.curNow,
-      user_id: this.id,
-      keywords: this.keywords,
-      user_type: this.is_captain,
-      page_num: this.page_num
-    }).then(res => {
-      that.orderList = that.orderList.concat(res.data.data)
-      this.flag = false
-      if (!res.data.data.length) {
-        this.status = "nomore"
-        this.flag = true
-      }
-    })
-  },
-  async onShow () {
-	  // uni.navigateTo({
-	  // 	url:'/subpkg/chatMang/index'
-	  // }
-    // this.getUserIndex()
-    // this.getIndexList()
-	let user_id= JSON.parse( uni.getStorageSync("USER_INFO")).id
-	getAreaManagerApi({user_id}).then(res=>{
-		console.log(res.data)
-		this.managerInfo=res.data
-	})
-    await this.$onLaunched;
-    if (uni.getStorageSync('uniMP')) this.uniMP = true;
-    userInfo().then(({
-      data
-    }) => {
-      this.$store.commit('setUserInfo', data);
-      this.initUserInfo(data);
-      this.$store.dispatch('initConfig');
-      // console.log('更新信息', data);
-    });
-    this.getApproveList();
-    this.initUserInfo();
-    this.showToask();
-    // this.initOaHomeDada();
-    this.getOrderList();
-    //#ifdef APP-PLUS
-    this.noticeFn();
-    // #endif
-    // console.log(this.oaHomeData, this.oaHomeData.length==0);
-    if (this.oaHomeData.length == 0) {
-      this.$nextTick(() => {
-        this.$store.dispatch('initConfig');
-      })
-    }
-  },
-  computed: {
-    // oaHomeData() {
-    //   const route = '/pages/oaHome/oaHome';
-    //   let arr = [];
-    //   this.$store.state.config?.config?.menu?.forEach((item) => {
-    //     if (item.paths.includes(route)) {
-    //       arr = item.children;
-    //     }
-    //   })
-    //   if (arr.length >= 8) {
-    //     arr = arr.slice(0, 7);
-    //     let obj = this.$store.state.config?.config?.menu?.find(item => item.paths.includes(
-    //       '/pages/moreFun/moreFun'));
-    //     arr.push(obj);
-    //   }
-    //   return arr;
-    // },
-  },
-  watch: {
-    '$store.state.app.token': {
-      handler: function (n, o) {
-        userInfo().then(({
-          data
-        }) => {
-          // console.log(data);
-          this.$store.commit('setUserInfo', data);
-          this.initUserInfo(data);
-          this.$store.dispatch('initConfig');
-        });
-      }
-    },
-    '$store.state.config.config.menu': {
-      immediate: true,
-      deep: true,
-      handler: function (n, o) {
-        const route = '/pages/oaHome/oaHome';
-        let arr = [];
-        n.forEach((item) => {
-          if (item.paths.includes(route)) {
-            arr = item.children;
-          }
-        })
-        if (arr.length >= 8) {
-          arr = arr.slice(0, 7);
-          let obj = n.find(item => item.paths.includes(
-            '/pages/moreFun/moreFun'));
-          arr.push(obj);
-        }
-        this.oaHomeData = arr;
-      }
-    }
-  },
-  methods: {
-    // 通知
-    noticeFn () {
-      jpushModule.addNotificationListener(res => {  
-		  const audioContext = uni.createInnerAudioContext()
-		 if(res.content.includes('：')){
-			audioContext.src = '/static/mp3/im.wav'
-			audioContext.play()
-			uni.vibrateLong();
-			 console.log("im")
-			 return
-		 }
-        if (res.notificationEventType == 'notificationOpened') return
-		audioContext.src = '/static/mp3/order.mp3'
-        audioContext.play()
-        uni.vibrateLong();
-        this.getOrderList()
-        // this.$refs.globalPopup.showPopu();
-        console.log("index的监听")
-      })
-    },
-    leftClick (e) {
-		console.log("发送给宿主")
-      uni.sendHostEvent('closeApp', e, (ret) => {
-        //发送消息成功回调
-        console.log('关闭应用' + JSON.stringify(ret));
-      });
-    },
-    async getOrderList () {
-      this.id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
-      let res = await getList({
-        user_id: this.id,
-        user_type: this.is_captain
-        // courier_id: 167
-      });
-      this.orderList = res.data.data;
-    },
-    goOrderList () {
-      uni.navigateTo({
-        url: "/pages/logistics/index",
-      });
-    },
-    initUserInfo (data = null) {
-      if (data) return this.myOaInfo = data;
-      this.$store.state.app.userInfo ?
-        (this.myOaInfo = this.$store.state.app.userInfo) :
-        (this.myOaInfo.avatar = "");
-    },
-    initOaHomeDada () {
-      if (this.$store.state.app.userInfo.admin_id == 0) {
-        // 如果用户不是管理员
-        let arr = oaHomeData.filter((item) => !item.admin); //过滤掉管理员专属页面
-        this.oaHomeData = arr;
-      } else {
-        // this.oaHomeData = oaHomeData;
-        let arr = oaHomeData.filter((item) => !item.captain); //过滤掉普通用户专属页面
-        this.oaHomeData = arr;
-      }
-      if (
-        this.$store.state.app.userInfo?.company?.company_type_name == "平台公司"
-      ) {
-        this.oaHomeData = this.oaHomeData.filter((item) => {
-          return item.text == "人员管理" ? false : true;
-        });
-      }
-      // 判断是否需要显示更多按钮
-      if (this.oaHomeData >= 8) {
-        this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1];
-      } else {
-        this.oaHomeData.splice(this.oaHomeData.length - 1, 1);
-      }
-    },
-    async getApproveList () {
-      const res = await noticeList({
-        keyword: "",
-        page_no: 1,
-        page_size: 2,
-      });
-      this.ApproveList = res.data.lists;
-    },
-    async getIndexList () {
-      const {
-        project,
-        task
-      } = await getIndexListAPI();
-      console.log(task, "222");
-      this.assessData[0].num = project.count;
-      this.assessData[1].num = project.count_ok;
-      this.assessData[2].num = project.count_no;
-      this.assessData[3].num = project.count_lv + "%";
-      this.assessData[4].num = task.count;
-      this.assessData[5].num = task.count_ok;
-      this.assessData[6].num = task.count_no;
-      this.assessData[7].num = task.count_lv + "%";
-      this.myTaskList = task.list;
-    },
-    async getMyTask () {
-      let data = {
-        page: this.page,
-        limit: 10,
-      };
-      const res = getMyTaskListAPI(data);
-    },
-    naviTaskDetails (id) {
-      uni.navigateTo({
-        url: `/pages/views/task_details?id=${id}`,
-      });
-    },
-    navTo (url) {
-      if (url) {
-        uni.showLoading({
-          title: '加载中',
-          mask: true
-        });
-        uni.navigateTo({
-          url: url,
-          success () {
-            uni.hideLoading()
-          },
-          fail () {
-            uni.switchTab({
-              url: url,
-              success () {
-                uni.hideLoading()
-              },
-              fail () {
-                uni.hideLoading()
-              }
-            });
-          },
-        })
-      } else Toast('暂未开放')
-    },
-    navTwo (url, key) {
-      // let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
-      // var arr = [3, 6];
+	// import tabbar from '../components/tabbar'
+	import {
+		getIndexListAPI,
+		getTaskListAPI,
+		getMyTaskListAPI,
+		getApproveListAPI,
+		getUserIndexAPI,
+	} from "@/api/oaApi.js";
+	import {
+		mapState
+	} from 'vuex';
+	import bj from "@/static/animation/home.json"
+	import {
+		userInfo
+	} from "@/api/oaUser.js"
+	//#ifdef APP-PLUS
+	var jpushModule = uni.requireNativePlugin("JG-JPush");
+	// #endif
+	export default {
+		components: {
+			// tabbar
+			logistiBriefCard,
+			globalPopup,
+		},
+		data() {
+			return {
 
-      // if (role_id && role_id[0] == 9) {
-      //   if (arr.indexOf(key) == -1) {
-      //     Toast("请先成立公司后开放");
-      //     return false;
-      //   }
-      // }
-      this.navTo(url);
-    },
-    // 点击公告
-    clickNotice (e) {
-      uni.navigateTo({
-        url: `/pages/oaNews/oaNews?id=${e}`,
-      });
-    },
-    // 判断当前是否登录,显示任务及完成率
-    showToask () {
-      if (!this.$store.state.app.token) {
-        this.assessData = this.assessData.map((item) => {
-          item.num = "*";
-          return item;
-        });
-      } else {
-        // 新增接口后要替换为接口
-        this.assessData = this.assessData.map((item) => {
-          item.num = "0";
-          return item;
-        });
-      }
-    },
-    login () {
-      uni.navigateTo({
-        url: "/pages/oaLogin/oaLogin",
-      });
-    },
-    async getUserIndex () {
-      const res = await getUserIndexAPI();
-      this.myOaInfo = res;
-    },
-  },
-  async onPullDownRefresh () {
-    uni.sendHostEvent('test', '测试', (ret) => {
-      // uni.showModal({
-      //   title:'内容',
-      //   content:JSON.stringify(ret)
-      // })
-    });
-    await this.getOrderList();
-    await this.$store.dispatch('initConfig');
-    await this.getApproveList();
-    // this.getIndexList()
-    uni.stopPullDownRefresh();
-  },
-};
+				brange: 0,
+				options: {
+					data: '',
+				},
+				status: "loadmore",
+				page_num: 1,
+				flag: false,
+				uniMP: false,
+				managerInfo: {},
+				id: "",
+				is_captain: 0,
+				notArr: [],
+				orderList: [],
+				oaHomeData: [],
+				src: "https://cdn.uviewui.com/uview/album/1.jpg",
+				assessData: [{
+						num: "0",
+						name: "任务",
+					},
+					{
+						num: "0",
+						name: "已完成",
+					},
+					{
+						num: "0",
+						name: "未完成",
+					},
+					{
+						num: "0%",
+						name: "完成率",
+					},
+				],
+				project: {},
+				task: {},
+				page: 1,
+				myTaskList: [],
+				flowState: "#47B347", // 任务状态
+				priority: "", // 任务紧急度
+				myOaInfo: {
+					avatar: "",
+					nickname: "",
+					mobile: "",
+					did_name: "",
+					label_name: "",
+				},
+				ApproveList: [],
+				showOaHomeData: false, //更新首页计算的值
+			};
+		},
+		async onLoad() {
+
+			await this.$onLaunched;
+			this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain
+			this.options.data = bj;
+
+			//#ifdef APP-PLUS
+			let that = this;
+			jpushModule.addNotificationListener(function(result) {
+				if (!that.notArr.includes(result.messageID)) {
+					// that.$refs.globalPopup.showPopu();
+					that.getOrderList();
+					console.log("idnex的");
+					that.notArr.push(result.messageID);
+				}
+			});
+			// #endif
+		},
+		onReachBottom() {
+			if (this.flag) return
+			let that = this
+			this.status = "loading"
+			this.page_num += 1
+			this.flag = true
+			getList({
+				status: this.curNow,
+				user_id: this.id,
+				keywords: this.keywords,
+				user_type: this.is_captain,
+				page_num: this.page_num
+			}).then(res => {
+				that.orderList = that.orderList.concat(res.data.data)
+				this.flag = false
+				if (!res.data.data.length) {
+					this.status = "nomore"
+					this.flag = true
+				}
+			})
+		},
+		async onShow() {
+			// uni.navigateTo({
+			// 	url:'/subpkg/chatMang/index'
+			// }
+			// this.getUserIndex()
+			// this.getIndexList()
+			let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id
+			getAreaManagerApi({
+				user_id
+			}).then(res => {
+				// console.log(res.data)
+				this.managerInfo = res.data
+			})
+			await this.$onLaunched;
+			if (uni.getStorageSync('uniMP')) this.uniMP = true;
+			userInfo().then(({
+				data
+			}) => {
+				this.$store.commit('setUserInfo', data);
+				this.initUserInfo(data);
+				this.$store.dispatch('initConfig');
+				// console.log('更新信息', data);
+			});
+			this.getApproveList();
+			this.initUserInfo();
+			this.showToask();
+			// this.initOaHomeDada();
+			this.getOrderList();
+			//#ifdef APP-PLUS
+			this.noticeFn();
+			// #endif
+			// console.log(this.oaHomeData, this.oaHomeData.length==0);
+			if (this.oaHomeData.length == 0) {
+				this.$nextTick(() => {
+					this.$store.dispatch('initConfig');
+				})
+			}
+		},
+		computed: {
+			// oaHomeData() {
+			//   const route = '/pages/oaHome/oaHome';
+			//   let arr = [];
+			//   this.$store.state.config?.config?.menu?.forEach((item) => {
+			//     if (item.paths.includes(route)) {
+			//       arr = item.children;
+			//     }
+			//   })
+			//   if (arr.length >= 8) {
+			//     arr = arr.slice(0, 7);
+			//     let obj = this.$store.state.config?.config?.menu?.find(item => item.paths.includes(
+			//       '/pages/moreFun/moreFun'));
+			//     arr.push(obj);
+			//   }
+			//   return arr;
+			// },
+		},
+		watch: {
+			'$store.state.app.token': {
+				handler: function(n, o) {
+					userInfo().then(({
+						data
+					}) => {
+						// console.log(data);
+						this.$store.commit('setUserInfo', data);
+						this.initUserInfo(data);
+						this.$store.dispatch('initConfig');
+					});
+				}
+			},
+			'$store.state.config.config.menu': {
+				immediate: true,
+				deep: true,
+				handler: function(n, o) {
+					const route = '/pages/oaHome/oaHome';
+					let arr = [];
+					n.forEach((item) => {
+						if (item.paths.includes(route)) {
+							arr = item.children;
+						}
+					})
+					if (arr.length >= 8) {
+						arr = arr.slice(0, 7);
+						let obj = n.find(item => item.paths.includes(
+							'/pages/moreFun/moreFun'));
+						arr.push(obj);
+					}
+					this.oaHomeData = arr;
+				}
+			}
+		},
+		methods: {
+			// 通知
+			noticeFn() {
+				jpushModule.addNotificationListener(res => {
+					const audioContext = uni.createInnerAudioContext()
+					if (res.content.includes('：')) {
+						audioContext.src = '/static/mp3/im.wav'
+						audioContext.play()
+						uni.vibrateLong();
+						console.log("im")
+						return
+					}
+					if (res.notificationEventType == 'notificationOpened') return
+					audioContext.src = '/static/mp3/order.mp3'
+					audioContext.play()
+					uni.vibrateLong();
+					this.getOrderList()
+					// this.$refs.globalPopup.showPopu();
+					console.log("index的监听")
+				})
+			},
+			leftClick(e) {
+				console.log("发送给宿主")
+				uni.sendHostEvent('closeApp', e, (ret) => {
+					//发送消息成功回调
+					console.log('关闭应用' + JSON.stringify(ret));
+				});
+			},
+			async getOrderList() {
+				this.id = JSON.parse(uni.getStorageSync("USER_INFO")).id || "";
+				let res = await getList({
+					user_id: this.id,
+					user_type: this.is_captain
+					// courier_id: 167
+				});
+				this.orderList = res.data.data;
+			},
+			goOrderList() {
+				uni.navigateTo({
+					url: "/pages/logistics/index",
+				});
+			},
+			initUserInfo(data = null) {
+				if (data) return this.myOaInfo = data;
+				this.$store.state.app.userInfo ?
+					(this.myOaInfo = this.$store.state.app.userInfo) :
+					(this.myOaInfo.avatar = "");
+			},
+			initOaHomeDada() {
+				if (this.$store.state.app.userInfo.admin_id == 0) {
+					// 如果用户不是管理员
+					let arr = oaHomeData.filter((item) => !item.admin); //过滤掉管理员专属页面
+					this.oaHomeData = arr;
+				} else {
+					// this.oaHomeData = oaHomeData;
+					let arr = oaHomeData.filter((item) => !item.captain); //过滤掉普通用户专属页面
+					this.oaHomeData = arr;
+				}
+				if (
+					this.$store.state.app.userInfo?.company?.company_type_name == "平台公司"
+				) {
+					this.oaHomeData = this.oaHomeData.filter((item) => {
+						return item.text == "人员管理" ? false : true;
+					});
+				}
+				// 判断是否需要显示更多按钮
+				if (this.oaHomeData >= 8) {
+					this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1];
+				} else {
+					this.oaHomeData.splice(this.oaHomeData.length - 1, 1);
+				}
+			},
+			async getApproveList() {
+				const res = await noticeList({
+					keyword: "",
+					page_no: 1,
+					page_size: 2,
+				});
+				this.ApproveList = res.data.lists;
+			},
+			async getIndexList() {
+				const {
+					project,
+					task
+				} = await getIndexListAPI();
+				console.log(task, "222");
+				this.assessData[0].num = project.count;
+				this.assessData[1].num = project.count_ok;
+				this.assessData[2].num = project.count_no;
+				this.assessData[3].num = project.count_lv + "%";
+				this.assessData[4].num = task.count;
+				this.assessData[5].num = task.count_ok;
+				this.assessData[6].num = task.count_no;
+				this.assessData[7].num = task.count_lv + "%";
+				this.myTaskList = task.list;
+			},
+			async getMyTask() {
+				let data = {
+					page: this.page,
+					limit: 10,
+				};
+				const res = getMyTaskListAPI(data);
+			},
+			naviTaskDetails(id) {
+				uni.navigateTo({
+					url: `/pages/views/task_details?id=${id}`,
+				});
+			},
+			navTo(url) {
+				if (url) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
+					uni.navigateTo({
+						url: url,
+						success() {
+							uni.hideLoading()
+						},
+						fail() {
+							uni.switchTab({
+								url: url,
+								success() {
+									uni.hideLoading()
+								},
+								fail() {
+									uni.hideLoading()
+								}
+							});
+						},
+					})
+				} else Toast('暂未开放')
+			},
+			navTwo(url, key) {
+				// let role_id = this.$store.state.app?.userInfo?.admin?.role_id || null;
+				// var arr = [3, 6];
+
+				// if (role_id && role_id[0] == 9) {
+				//   if (arr.indexOf(key) == -1) {
+				//     Toast("请先成立公司后开放");
+				//     return false;
+				//   }
+				// }
+				this.navTo(url);
+			},
+			// 点击公告
+			clickNotice(e) {
+				uni.navigateTo({
+					url: `/pages/oaNews/oaNews?id=${e}`,
+				});
+			},
+			// 判断当前是否登录,显示任务及完成率
+			showToask() {
+				if (!this.$store.state.app.token) {
+					this.assessData = this.assessData.map((item) => {
+						item.num = "*";
+						return item;
+					});
+				} else {
+					// 新增接口后要替换为接口
+					this.assessData = this.assessData.map((item) => {
+						item.num = "0";
+						return item;
+					});
+				}
+			},
+			login() {
+				uni.navigateTo({
+					url: "/pages/oaLogin/oaLogin",
+				});
+			},
+			async getUserIndex() {
+				const res = await getUserIndexAPI();
+				this.myOaInfo = res;
+			},
+		},
+		async onPullDownRefresh() {
+			uni.sendHostEvent('test', '测试', (ret) => {
+				// uni.showModal({
+				//   title:'内容',
+				//   content:JSON.stringify(ret)
+				// })
+			});
+			await this.getOrderList();
+			await this.$store.dispatch('initConfig');
+			await this.getApproveList();
+			// this.getIndexList()
+			uni.stopPullDownRefresh();
+		},
+	};
 </script>
 
 <style lang="scss">
-.oa_home {
-  padding-bottom: 100rpx;
-}
-
-.header_bg {
-  position: absolute;
-  width: 100%;
-  // z-index: -1;
-}
-
-.home_header {
-  position: relative;
-  padding: 28rpx;
-  // height: 607.02rpx;
-  // height: 480.02rpx;
-  width: 100%;
-  // background-color: $theme-oa-color;
-  margin-bottom: 110rpx;
-  background-color: $theme-oa-color;
-  border-radius: 0 0 30rpx 30rpx;
-
-  .head_img {
-    position: relative;
-    background-color: #ff7c32;
-    width: 100%;
-    height: 105.14rpx;
-    line-height: 105.14rpx;
-    border-radius: 35.05rpx 35.05rpx 35.05rpx 35.05rpx;
-    display: flex;
-    justify-content: space-between;
-    padding-right: 28rpx;
-    color: white;
-    font-size: 34rpx;
-    padding-left: 150rpx;
-    box-sizing: border-box;
-
-    .img_box {
-      position: absolute;
-
-      left: -10rpx;
-      top: -15rpx;
-      width: 140rpx;
-      height: 140rpx;
-      background-color: white;
-      border-radius: 140rpx;
-
-      .img_box_img {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-      }
-    }
-
-    .head_text {
-      font-size: 33rpx;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-    }
-
-    // font-we
-  }
-
-  .my_info {
-    .mesg_box {
-      color: #fff;
-      margin-left: 31.58rpx;
-
-      .nickname {
-        font-size: 32rpx;
-        font-weight: 500;
-        margin-right: 30rpx;
-      }
-
-      .duty {
-        margin-top: 10.53rpx;
-      }
-    }
-  }
-
-  .task_panel {
-    color: #fff;
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    align-content: space-between;
-    text-align: center;
-    padding-bottom: 110rpx;
-
-    .task_item {
-      margin-top: 42.11rpx;
-
-      .plan {
-        width: 173.68rpx;
-        font-size: 38.6rpx;
-        margin-bottom: 21.05rpx;
-      }
-    }
-  }
-
-  .backlog {
-    position: absolute;
-    left: 50%;
-    bottom: -101.75rpx;
-    transform: translate(-50%);
-    width: 694.74rpx;
-    background: #ffffff;
-    border-radius: 12px;
-    padding: 28.07rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    font-size: 25rpx;
-    font-weight: 400;
-
-    .title {
-      font-size: 32rpx;
-      font-weight: 500;
-    }
-
-    &_item {
-      margin-top: 19.3rpx;
-      color: #666666;
-
-      .text {
-        font-size: 28.04rpx;
-        white-space: nowrap;
-        /* 禁止换行 */
-        overflow: hidden;
-        /* 溢出隐藏 */
-        text-overflow: ellipsis;
-        /* 使用省略号代表被截断的文本 */
-        width: 580rpx;
-
-        /* 设置元素宽度，根据需要进行调整 */
-        .text_time {
-          display: inline-block;
-          background-color: #ff7c32;
-          color: white;
-          padding: 5rpx 10rpx;
-          margin-right: 10rpx;
-          border-radius: 15rpx;
-        }
-
-        // &::before {
-        // 	content: "公告";
-        // 	display: inline-block;
-        // 	color: #ff8c1a;
-        // 	padding: 2px 8px;
-        // 	border-radius: 4px;
-        // 	border: 1px solid #ff8c1a;
-        // 	margin-right: 14.04rpx;
-        // }
-      }
-    }
-
-    &_no {
-      margin-top: 19.3rpx;
-      color: #666666;
-
-      .text {
-        font-size: 28.04rpx;
-        white-space: nowrap;
-        /* 禁止换行 */
-        overflow: hidden;
-        /* 溢出隐藏 */
-        text-overflow: ellipsis;
-        /* 使用省略号代表被截断的文本 */
-        width: 580rpx;
-        /* 设置元素宽度，根据需要进行调整 */
-
-        &::before {
-          content: none;
-        }
-      }
-    }
-  }
-
-  .backlog_no_data {
-    bottom: -70rpx;
-  }
-}
-
-.home_header_no_data {
-  margin-bottom: 93.33rpx;
-}
-
-.fast_track {
-  width: 694rpx;
-  // height: 331rpx;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: left;
-  align-content: space-between;
-  margin: 0 auto;
-  padding: 15rpx 38.6rpx;
-  background-color: #fff;
-  border-radius: 12px;
-
-  .track_item {
-    width: 154.39rpx;
-    font-size: 24.56rpx;
-    margin: 25rpx 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    .title {
-      margin-top: 14.04rpx;
-    }
-  }
-}
-
-.my_task {
-  width: 694.74rpx;
-  margin: 0 auto;
-  // margin-top: 31.58rpx;
-  // background-color: #fff;
-  border-radius: 12px;
-  // padding: 28.07rpx;
-
-  .no_task {
-    width: 694rpx;
-    height: 140rpx;
-    padding: 28rpx;
-    background: #ffffff;
-    border-radius: 21rpx 21rpx 21rpx 21rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-evenly;
-
-    .title {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #000000cc;
-      line-height: 35rpx;
-    }
-
-    .tips {
-      font-size: 25rpx;
-      font-weight: 400;
-      color: #333333ff;
-      line-height: 35rpx;
-    }
-  }
-
-  .task_title {
-    font-size: 25rpx;
-    font-weight: 400;
-    padding: 28rpx;
-
-    .title {
-      font-size: 32rpx;
-      font-weight: 500;
-    }
-  }
-
-  .task_list {
-    height: 196.49rpx;
-    border-bottom: 1px solid #cccccc;
-    padding: 21.05rpx 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-
-    .title {
-      .tag {
-        color: #f24848;
-        font-size: 24.56rpx;
-        padding: 0 7.02rpx;
-        margin-right: 14.04rpx;
-        background: #ffe4e4;
-        border-radius: 4px;
-      }
-
-      .tag1 {
-        color: #3274f9;
-        font-size: 24.56rpx;
-        padding: 0 7.02rpx;
-        margin-right: 14.04rpx;
-        background: #e4edff;
-        border-radius: 4px;
-      }
-
-      .text {
-        font-size: 28.07rpx;
-        width: 403.51rpx;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .if_take {
-        font-size: 28.07rpx;
-        text-align: center;
-        line-height: 49.12rpx;
-        width: 115.79rpx;
-        height: 49.12rpx;
-        border-radius: 100px;
-      }
-
-      .take1 {
-        color: #47b347;
-        background: #dffcdf;
-      }
-
-      .take2 {
-        color: #3274f9;
-        background: #e4edff;
-      }
-
-      .take3 {
-        color: #999999;
-        background: #f5f5f5;
-      }
-    }
-
-    .describe {
-      font-size: 24.56rpx;
-    }
-
-    .task_deta {
-      color: #999;
-      font-size: 24.56rpx;
-    }
-  }
-}
-
-.no_login {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  width: 100vw;
-  height: 112rpx;
-  /* #ifdef H5 */
-  height: 212rpx;
-  /* #endif */
-  background: rgba(#333333, 0.4);
-  border-radius: 14rpx 14rpx 0rpx 0rpx;
-  padding: 28rpx 28rpx;
-
-  .view {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .text {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #ffffff;
-    }
-
-    .btn {
-      width: 158rpx;
-      height: 60rpx;
-      background: #3274f9;
-      border-radius: 30rpx 30rpx 30rpx 30rpx;
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #ffffff;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-  }
-}
-.chat{
-	margin-top: 1000px;
-	// margin-top: 2000rpx;
-	width: 694.74rpx;
-	margin: 0 auto;
-	background-color: white;
-	border-radius: 12px;
-	padding:20rpx;
-	// padding-top: 10rpx;
-	padding-right: 24rpx;
-	display: flex;
-	justify-content: space-between;
-		align-items: center;
-	.chat-l{
-		display: flex;
-		align-items: center;
+	.oa_home {
+		padding-bottom: 100rpx;
+	}
+
+	.header_bg {
+		position: absolute;
+		width: 100%;
+		// z-index: -1;
+	}
+
+	.home_header {
+		position: relative;
+		padding: 28rpx;
+		// height: 607.02rpx;
+		// height: 480.02rpx;
+		width: 100%;
+		// background-color: $theme-oa-color;
+		margin-bottom: 110rpx;
+		background-color: $theme-oa-color;
+		border-radius: 0 0 30rpx 30rpx;
+
+		.head_img {
+			position: relative;
+			background-color: #ff7c32;
+			width: 100%;
+			height: 105.14rpx;
+			line-height: 105.14rpx;
+			border-radius: 35.05rpx 35.05rpx 35.05rpx 35.05rpx;
+			display: flex;
+			justify-content: space-between;
+			padding-right: 28rpx;
+			color: white;
+			font-size: 34rpx;
+			padding-left: 150rpx;
+			box-sizing: border-box;
+
+			.img_box {
+				position: absolute;
+
+				left: -10rpx;
+				top: -15rpx;
+				width: 140rpx;
+				height: 140rpx;
+				background-color: white;
+				border-radius: 140rpx;
+
+				.img_box_img {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					transform: translate(-50%, -50%);
+				}
+			}
+
+			.head_text {
+				font-size: 33rpx;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+
+			// font-we
+		}
+
+		.my_info {
+			.mesg_box {
+				color: #fff;
+				margin-left: 31.58rpx;
+
+				.nickname {
+					font-size: 32rpx;
+					font-weight: 500;
+					margin-right: 30rpx;
+				}
+
+				.duty {
+					margin-top: 10.53rpx;
+				}
+			}
+		}
+
+		.task_panel {
+			color: #fff;
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			align-content: space-between;
+			text-align: center;
+			padding-bottom: 110rpx;
+
+			.task_item {
+				margin-top: 42.11rpx;
+
+				.plan {
+					width: 173.68rpx;
+					font-size: 38.6rpx;
+					margin-bottom: 21.05rpx;
+				}
+			}
+		}
+
+		.backlog {
+			position: absolute;
+			left: 50%;
+			bottom: -101.75rpx;
+			transform: translate(-50%);
+			width: 694.74rpx;
+			background: #ffffff;
+			border-radius: 12px;
+			padding: 28.07rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			font-size: 25rpx;
+			font-weight: 400;
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+
+			&_item {
+				margin-top: 19.3rpx;
+				color: #666666;
+
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
+
+					/* 设置元素宽度，根据需要进行调整 */
+					.text_time {
+						display: inline-block;
+						background-color: #ff7c32;
+						color: white;
+						padding: 5rpx 10rpx;
+						margin-right: 10rpx;
+						border-radius: 15rpx;
+					}
+
+					// &::before {
+					// 	content: "公告";
+					// 	display: inline-block;
+					// 	color: #ff8c1a;
+					// 	padding: 2px 8px;
+					// 	border-radius: 4px;
+					// 	border: 1px solid #ff8c1a;
+					// 	margin-right: 14.04rpx;
+					// }
+				}
+			}
+
+			&_no {
+				margin-top: 19.3rpx;
+				color: #666666;
+
+				.text {
+					font-size: 28.04rpx;
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 溢出隐藏 */
+					text-overflow: ellipsis;
+					/* 使用省略号代表被截断的文本 */
+					width: 580rpx;
+					/* 设置元素宽度，根据需要进行调整 */
+
+					&::before {
+						content: none;
+					}
+				}
+			}
+		}
+
+		.backlog_no_data {
+			bottom: -70rpx;
+		}
+	}
+
+	.home_header_no_data {
+		margin-bottom: 93.33rpx;
+	}
+
+	.fast_track {
+		width: 694rpx;
+		// height: 331rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: left;
+		align-content: space-between;
+		margin: 0 auto;
+		padding: 15rpx 38.6rpx;
+		background-color: #fff;
+		border-radius: 12px;
+
+		.track_item {
+			width: 154.39rpx;
+			font-size: 24.56rpx;
+			margin: 25rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.title {
+				margin-top: 14.04rpx;
+			}
+		}
+	}
+
+	.my_task {
+		width: 694.74rpx;
+		margin: 0 auto;
+		// margin-top: 31.58rpx;
+		// background-color: #fff;
+		border-radius: 12px;
+		// padding: 28.07rpx;
+
+		.no_task {
+			width: 694rpx;
+			height: 140rpx;
+			padding: 28rpx;
+			background: #ffffff;
+			border-radius: 21rpx 21rpx 21rpx 21rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
+
+			.title {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #000000cc;
+				line-height: 35rpx;
+			}
+
+			.tips {
+				font-size: 25rpx;
+				font-weight: 400;
+				color: #333333ff;
+				line-height: 35rpx;
+			}
+		}
+
+		.task_title {
+			font-size: 25rpx;
+			font-weight: 400;
+			padding: 28rpx;
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 500;
+			}
+		}
+
+		.task_list {
+			height: 196.49rpx;
+			border-bottom: 1px solid #cccccc;
+			padding: 21.05rpx 0;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.title {
+				.tag {
+					color: #f24848;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #ffe4e4;
+					border-radius: 4px;
+				}
+
+				.tag1 {
+					color: #3274f9;
+					font-size: 24.56rpx;
+					padding: 0 7.02rpx;
+					margin-right: 14.04rpx;
+					background: #e4edff;
+					border-radius: 4px;
+				}
+
+				.text {
+					font-size: 28.07rpx;
+					width: 403.51rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+
+				.if_take {
+					font-size: 28.07rpx;
+					text-align: center;
+					line-height: 49.12rpx;
+					width: 115.79rpx;
+					height: 49.12rpx;
+					border-radius: 100px;
+				}
+
+				.take1 {
+					color: #47b347;
+					background: #dffcdf;
+				}
+
+				.take2 {
+					color: #3274f9;
+					background: #e4edff;
+				}
+
+				.take3 {
+					color: #999999;
+					background: #f5f5f5;
+				}
+			}
+
+			.describe {
+				font-size: 24.56rpx;
+			}
+
+			.task_deta {
+				color: #999;
+				font-size: 24.56rpx;
+			}
+		}
+	}
+
+	.no_login {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100vw;
+		height: 112rpx;
+		/* #ifdef H5 */
+		height: 212rpx;
+		/* #endif */
+		background: rgba(#333333, 0.4);
+		border-radius: 14rpx 14rpx 0rpx 0rpx;
+		padding: 28rpx 28rpx;
+
+		.view {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.text {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+			}
+
+			.btn {
+				width: 158rpx;
+				height: 60rpx;
+				background: #3274f9;
+				border-radius: 30rpx 30rpx 30rpx 30rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+
+	.chat {
+		margin-top: 1000px;
+		// margin-top: 2000rpx;
+		width: 694.74rpx;
+		margin: 0 auto;
+		background-color: white;
+		border-radius: 12px;
+		padding: 20rpx;
+		// padding-top: 10rpx;
+		padding-right: 24rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.chat-l {
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.brange {
+		color: white;
+		background-color: red;
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 40rpx;
+		font-size: 12px;
+		text-align: center;
+		lighting-color: 40rpx;
 	}
-}
-.brange{
-	color: white;
-	background-color: red;
-	width: 40rpx;
-	height: 40rpx;
-	border-radius: 40rpx;
-	font-size: 12px;
-	text-align: center;
-	lighting-color: 40rpx;
-}
 </style>
\ No newline at end of file
diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index a26c769..964f6bb 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -1,77 +1,89 @@
 <template>
-  <view class="all_box">
-    <block v-if="skeleton">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
-      		rowsHeight="40" v-for="i in 3" :key="i" style="padding: 28rpx;">
-      </u-skeleton>
-    </block>
-    <block v-else>
-      <u-empty v-if="list.length==0" icon="/static/img/empty/data.png" text="没有任务"></u-empty>
-      <view v-else class="task_list">
-        <!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
-        <task-item :datas="item" v-for="item in list" :key="item.id"></task-item>
-      </view>
-    </block>
-    <!-- <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+	<view class="all_box">
+		<block v-if="skeleton">
+			<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="40"
+				v-for="i in 3" :key="i" style="padding: 28rpx;">
+			</u-skeleton>
+		</block>
+		<block v-else>
+			<u-empty v-if="list.length==0" icon="/static/img/empty/data.png" text="没有任务"></u-empty>
+			<view v-else class="task_list">
+				<!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
+				<task-item :datas="item" v-for="item in list" :key="item.id"></task-item>
+
+			</view>
+		</block>
+		<!-- <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
         :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->
-  </view>
+	</view>
 </template>
 
 <script>
-  import { getTaskListApi } from '@/api/oa'
-  import { Toast } from '@/libs/uniApi.js'
-  import taskItem from "@/components/task/taskItem.vue"
-  import { taskLists } from "@/api/task.js"
-  export default {
-    components:{
-      taskItem
-    },
-    data() {
-      return {
-        skeleton: false,
-        loadConfig:{
-          page: 1,
-          limit: 15,
-          lastpage: '',
-          loadingText: '努力加载中',
-          loadmoreText: '轻轻上拉',
-          nomoreText: '我也是有底线的~~',
-          status: 'loadmore'
-        },
-        list: []
-      }
-    },
-    onLoad() {
-      this.skeleton = true;
-    },
-    onShow() {
-      this.loadList();
-    },
-    onReady() {
-      uni.$on('initOaTask', this.loadList);
-    },
-    methods: {
-      async loadList(){
-        let res = await taskLists({limit: 15, page: 1});
-        this.list = res.data;
-        this.skeleton = false;
-      }
-    },
-    onPullDownRefresh() {
-      this.loadList();
-      this.$u.sleep(500).then(()=>{uni.stopPullDownRefresh()});
-    },
-    onReachBottom() {
-    },
-  }
+	import {
+		getTaskListApi
+	} from '@/api/oa'
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	import taskItem from "@/components/task/taskItem.vue"
+	import {
+		taskLists
+	} from "@/api/task.js"
+	export default {
+		components: {
+			taskItem
+		},
+		data() {
+			return {
+				skeleton: false,
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					lastpage: '',
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '我也是有底线的~~',
+					status: 'loadmore'
+				},
+				list: []
+			}
+		},
+		onLoad() {
+			this.skeleton = true;
+		},
+		onShow() {
+			this.loadList();
+		},
+		onReady() {
+			uni.$on('initOaTask', this.loadList);
+		},
+		methods: {
+			async loadList() {
+				let res = await taskLists({
+					limit: 15,
+					page: 1
+				});
+				this.list = res.data;
+				this.skeleton = false;
+			}
+		},
+		onPullDownRefresh() {
+			this.loadList();
+			this.$u.sleep(500).then(() => {
+				uni.stopPullDownRefresh()
+			});
+		},
+		onReachBottom() {},
+	}
 </script>
 
 <style lang="scss" scoped>
- .task_list{
-   padding-top: 28rpx;
- }
- .loading{
-   padding: 28rpx;
-   margin-top: 28rpx;
- }
-</style>
+	.task_list {
+		padding-top: 28rpx;
+	}
+
+	.loading {
+		padding: 28rpx;
+		margin-top: 28rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue
index d3b5f19..dc9adc1 100644
--- a/subpkg/property/index.vue
+++ b/subpkg/property/index.vue
@@ -172,7 +172,7 @@
 				</view>
 			</view>
 			<!-- 镇街公司 -->
-			<view v-if='company_type==16'>
+			<view v-if='company_type==41'>
 
 				<view class="info">
 					<text>可监管车辆数量 {{datas.monitor_num}}</text>
@@ -397,6 +397,8 @@
 						res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList =
 							res.data.apply.slice(0, 2)
 						this.dataList = res.data.car_list
+
+
 						this.showLoading = false
 					})
 				}
diff --git a/subpkg/topUpDeposit/topUpDeposit.vue b/subpkg/topUpDeposit/topUpDeposit.vue
index 69c4d8d..a104dd3 100644
--- a/subpkg/topUpDeposit/topUpDeposit.vue
+++ b/subpkg/topUpDeposit/topUpDeposit.vue
@@ -1,259 +1,276 @@
 <template>
-  <view class="">
-    <view class="info">
-      <view class="bg"></view>
-      <view class="card">
-        <view class="title">充值信息</view>
-        <view class="item">
-          <text>充值账户</text>
-          <text>{{$store.state.app.userInfo.company.company_name||''}}</text>
-        </view>
-        <u-line style="margin: 20rpx 0;"></u-line>
-        <view class="item">
-          <text>收款公司</text>
-          <text>{{partyA.company_name}}</text>
-        </view>
-        <view class="item" @click="copyPhone(partyA.qualification.corporate_account, '对公账号')">
-          <text>对公账号</text>
-          <text>{{partyA.qualification.corporate_account||'暂无信息'}}</text>
-        </view>
-      </view>
-    </view>
-    <view class="deposit-list">
-      <view class="card" v-for="(item, index) in list">
-        <view class="item"><view>创建时间:</view><view class="text">{{item.create_time}}</view></view>
-        <view class="item"><view>充值金额:</view><view class="text green">{{item.deposit}}</view>元</view>
-        <view class="item" @click="previewVoucher(item.voucher)"><view>充值凭证:</view><view class="text blue">查看凭证</view></view>
-      </view>
-    </view>
-    <u-empty v-if="list.length==0&&loadConfig.status=='nomore'" icon="/static/img/empty/data.png" text="没有数据"></u-empty>
-    <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-    	:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-  </view>
+	<view class="">
+		<view class="info">
+			<view class="bg"></view>
+			<view class="card">
+				<view class="title">充值信息</view>
+				<view class="item">
+					<text>充值账户</text>
+					<text>{{$store.state.app.userInfo.company.company_name||''}}</text>
+				</view>
+				<u-line style="margin: 20rpx 0;"></u-line>
+				<view class="item">
+					<text>收款公司</text>
+					<text>{{partyA.company_name}}</text>
+				</view>
+				<view class="item" @click="copyPhone(partyA.qualification.corporate_account, '对公账号')">
+					<text>对公账号</text>
+					<text>{{partyA.qualification.corporate_account||'暂无信息'}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="deposit-list" style="padding-top: 30px;">
+			<view class="card" v-for="(item, index) in list">
+				<view class="item">
+					<view>创建时间:</view>
+					<view class="text" style="color: red;">{{item.create_time}}</view>
+				</view>
+				<view class="item">
+					<view>充值金额:</view>
+					<view class="text " style="color: red;">{{item.deposit}}</view>元
+				</view>
+				<view class="item" @click="previewVoucher(item.voucher)">
+					<view>充值凭证:</view>
+					<view class="text blue">查看凭证</view>
+				</view>
+			</view>
+		</view>
+		<u-empty v-if="list.length==0&&loadConfig.status=='nomore'" icon="/static/img/empty/data.png"
+			text="没有数据"></u-empty>
+		<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+			:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+	</view>
 </template>
 
 <script>
-  import { Toast } from '@/libs/uniApi.js'
-  import { getPartyACompany, getDepositRechargeTransferVoucherList } from "@/api/company.js"
-  export default {
-    data() {
-      return {
-        partyA: {
-          id:"",
-          company_name:"",
-          qualification:{
-            corporate_account: ""
-          }
-        },
-        list: [],
-        loadConfig: {
-        	page: 1,
-        	limit: 15,
-        	lastpage: '',
-        	loadingText: '努力加载中',
-        	loadmoreText: '轻轻上拉',
-        	nomoreText: '我也是有底线的~~',
-        	status: 'loadmore'
-        },
-      }
-    },
-    // 点击充值记录
-    onNavigationBarButtonTap(res){
-      if (res.index === 0) {
-        uni.navigateTo({
-          url: '/subpkg/topUpList/topUpList'
-        })
-      }
-    },
-    onLoad(options) {
-      this.loadPartyACompany();
-      this.initLoad();
-    },
-    onReachBottom() {
-      this.loadList()
-    },
-    methods: {
-      async loadPartyACompany(){
-        let res = await getPartyACompany();
-        if(res.data.qualification){
-          try{
-            res.data.qualification = JSON.parse(res.data.qualification);
-          }catch(e){
-            console.log(e);
-          }
-        }
-        this.partyA = res.data;
-        if(!this.partyA.qualification.corporate_account)this.partyA.qualification.corporate_account="";
-      },
-      async initLoad() {
-      	this.loadConfig.page = 1;
-      	this.loadConfig.status = "loadmore";
-      	this.list = [];
-      	await this.loadList();
-      },
-      async loadList(){
-        if (this.loadConfig.status == "nomore") return;
-        this.loadConfig.status = "loading";
-        let res = await getDepositRechargeTransferVoucherList({
-        	page: this.loadConfig.page,
-        	limit: this.loadConfig.limit
-        })
-        this.loadConfig.status = "loadmore"
-        if (res.data.data.length < this.loadConfig.limit) {
-        	this.loadConfig.status = "nomore"
-        } else {
-        	this.loadConfig.page++;
-        }
-        this.list = [...this.list, ...res.data?.data]
-      },
-      previewVoucher(str=""){
-        if(str.substring(str.length-4, str.length)=='.pdf'){ // 凭证为PDF时查看PDF
-          uni.navigateTo({
-          	url: `/subpkg/pdfView/pdfView?url=${str}`
-          })
-        }else {
-          uni.previewImage({
-          	urls: [str],
-          	longPressActions: {
-          		itemList: ['保存图片'],
-          		success: function(data) {
-          			if (data.tapIndex === 0) {
-          				uni.saveImageToPhotosAlbum({
-          					filePath: url,
-          					success: function() {
-          						uni.showToast({
-          							title: '保存成功',
-          							icon: 'success'
-          						})
-          					},
-          					fail: function() {
-          						uni.showToast({
-          							title: '保存失败',
-          							icon: 'none'
-          						})
-          					}
-          				})
-          			}
-          		}
-          	}
-          })
-        }
-      },
-      copyPhone(str = "", type = "号码") {
-      	if (str) uni.setClipboardData({
-      		data: str + "",
-      		success: (e) => {
-      			Toast(type + '已复制')
-      		},
-      		fail: (e) => {
-      			Toast('复制失败')
-      		}
-      	})
-      }
-    },
-    onPullDownRefresh() {
-      this.initLoad().then(()=>{
-        setTimeout(()=>{
-          uni.stopPullDownRefresh()
-        }, 500)
-      })
-    }
-  }
+	import {
+		Toast
+	} from '@/libs/uniApi.js'
+	import {
+		getPartyACompany,
+		getDepositRechargeTransferVoucherList
+	} from "@/api/company.js"
+	export default {
+		data() {
+			return {
+				partyA: {
+					id: "",
+					company_name: "",
+					qualification: {
+						corporate_account: ""
+					}
+				},
+				list: [],
+				loadConfig: {
+					page: 1,
+					limit: 15,
+					lastpage: '',
+					loadingText: '努力加载中',
+					loadmoreText: '轻轻上拉',
+					nomoreText: '我也是有底线的~~',
+					status: 'loadmore'
+				},
+			}
+		},
+		// 点击充值记录
+		onNavigationBarButtonTap(res) {
+			if (res.index === 0) {
+				uni.navigateTo({
+					url: '/subpkg/topUpList/topUpList'
+				})
+			}
+		},
+		onLoad(options) {
+			this.loadPartyACompany();
+			this.initLoad();
+		},
+		onReachBottom() {
+			this.loadList()
+		},
+		methods: {
+			async loadPartyACompany() {
+				let res = await getPartyACompany();
+				if (res.data.qualification) {
+					try {
+						res.data.qualification = JSON.parse(res.data.qualification);
+					} catch (e) {
+						console.log(e);
+					}
+				}
+				this.partyA = res.data;
+				if (!this.partyA.qualification.corporate_account) this.partyA.qualification.corporate_account = "";
+			},
+			async initLoad() {
+				this.loadConfig.page = 1;
+				this.loadConfig.status = "loadmore";
+				this.list = [];
+				await this.loadList();
+			},
+			async loadList() {
+				if (this.loadConfig.status == "nomore") return;
+				this.loadConfig.status = "loading";
+				let res = await getDepositRechargeTransferVoucherList({
+					page: this.loadConfig.page,
+					limit: this.loadConfig.limit
+				})
+				this.loadConfig.status = "loadmore"
+				if (res.data.data.length < this.loadConfig.limit) {
+					this.loadConfig.status = "nomore"
+				} else {
+					this.loadConfig.page++;
+				}
+				this.list = [...this.list, ...res.data?.data]
+			},
+			previewVoucher(str = "") {
+				if (str.substring(str.length - 4, str.length) == '.pdf') { // 凭证为PDF时查看PDF
+					uni.navigateTo({
+						url: `/subpkg/pdfView/pdfView?url=${str}`
+					})
+				} else {
+					uni.previewImage({
+						urls: [str],
+						longPressActions: {
+							itemList: ['保存图片'],
+							success: function(data) {
+								if (data.tapIndex === 0) {
+									uni.saveImageToPhotosAlbum({
+										filePath: url,
+										success: function() {
+											uni.showToast({
+												title: '保存成功',
+												icon: 'success'
+											})
+										},
+										fail: function() {
+											uni.showToast({
+												title: '保存失败',
+												icon: 'none'
+											})
+										}
+									})
+								}
+							}
+						}
+					})
+				}
+			},
+			copyPhone(str = "", type = "号码") {
+				if (str) uni.setClipboardData({
+					data: str + "",
+					success: (e) => {
+						Toast(type + '已复制')
+					},
+					fail: (e) => {
+						Toast('复制失败')
+					}
+				})
+			}
+		},
+		onPullDownRefresh() {
+			this.initLoad().then(() => {
+				setTimeout(() => {
+					uni.stopPullDownRefresh()
+				}, 500)
+			})
+		}
+	}
 </script>
 
 <style lang="scss">
-  page {
-    background-color: #fff;
-  }
+	page {
+		background-color: #fff;
+	}
 
-  .info {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    position: relative;
-    height: 350rpx;
+	.info {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		position: relative;
+		height: 350rpx;
 
-    .bg {
-      background-color: $theme-oa-color;
-      height: 200rpx;
-      width: 100vw;
-      border-radius: 0rpx 0rpx 28rpx 28rpx;
-      position: absolute;
-      top: 0;
-      left: 0;
-    }
+		.bg {
+			background-color: $theme-oa-color;
+			height: 200rpx;
+			width: 100vw;
+			border-radius: 0rpx 0rpx 28rpx 28rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
 
-    .card {
-      width: 694rpx;
-      min-height: 180rpx;
-      background: #FFFFFF;
-      margin-top: 38.55rpx;
-      box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      opacity: 1;
-      padding: 31.5rpx 28rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-around;
-      position: absolute;
-      top: 0;
+		.card {
+			width: 694rpx;
+			min-height: 180rpx;
+			background: #FFFFFF;
+			margin-top: 38.55rpx;
+			box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			opacity: 1;
+			padding: 31.5rpx 28rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			position: absolute;
+			top: 0;
 
-      .title {
-        font-size: 32rpx;
-        font-weight: 600;
-        color: #333333;
-        padding-bottom: 10rpx;
-      }
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+				padding-bottom: 10rpx;
+			}
 
-      .item {
-        display: flex;
-        justify-content: space-between;
-        font-size: 32rpx;
-        font-weight: 400;
-        color: #333333;
-        text:nth-child(1){
-          flex-shrink: 0;
-          margin-right: 18rpx;
-        }
-      }
-    }
-  }
+			.item {
+				display: flex;
+				justify-content: space-between;
+				font-size: 32rpx;
+				font-weight: 400;
+				color: #333333;
 
-  .deposit-list{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    .card {
-      width: 694rpx;
-      min-height: 180rpx;
-      background: #FFFFFF;
-      margin-bottom: 28rpx;
-      box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
-      border-radius: 14rpx 14rpx 14rpx 14rpx;
-      opacity: 1;
-      padding: 31.5rpx 28rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-around;
-    
-      .item{
-        font-size: 28rpx;
-        display: flex;
-        justify-content: left;
-        
-        .text{
-          margin-left: 12rpx;
-          color: #999;
-        }
-        
-        .green{
-          color: #4cd964;
-        }
-        
-        .blue{
-          color: #0122c7;
-        }
-      }
-    }
-  }
+				text:nth-child(1) {
+					flex-shrink: 0;
+					margin-right: 18rpx;
+				}
+			}
+		}
+	}
+
+	.deposit-list {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.card {
+			width: 694rpx;
+			min-height: 180rpx;
+			background: #FFFFFF;
+			margin-bottom: 28rpx;
+			box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			opacity: 1;
+			padding: 31.5rpx 28rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+
+			.item {
+				font-size: 28rpx;
+				display: flex;
+				justify-content: left;
+
+				.text {
+					margin-left: 12rpx;
+					color: #999;
+				}
+
+				.green {
+					color: #4cd964;
+				}
+
+				.blue {
+					color: #0122c7;
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/subpkg/townTask/gatherRecords.vue b/subpkg/townTask/gatherRecords.vue
new file mode 100644
index 0000000..a0a6815
--- /dev/null
+++ b/subpkg/townTask/gatherRecords.vue
@@ -0,0 +1,230 @@
+<template>
+	<view class="personnel_list">
+
+		<u-tabs style="background-color: #0022C7;" :list="tabLists" @click="changeTypeCurrent" lineColor='white'
+			lineWidth='100' inactiveStyle='color:white' activeStyle="color:white"></u-tabs>
+		<view class="" style="height: 20rpx;">
+		</view>
+		<view class="card" v-for="(item,index) in gatherList" :key="item.id" v-if="page==1&&item.planting"
+			@click="navgo(`/subpkg/townTask/townGather?type=plant&task_id=${task_id}&index=${index}`)">
+
+			<view class="card_head">
+				<view class="">
+					养植信息
+				</view>
+				<view class="">
+					点击查看
+				</view>
+			</view>
+			<view class="card_content">
+				<view class="" style="margin-bottom: 20rpx;">
+					法人姓名: {{item.planting[0].entityName}}
+				</view>
+				<view class="">
+					联系电话: {{item.planting[0].phone}}
+				</view>
+			</view>
+		</view>
+		<view class="card" v-for="(item,index) in gatherList" :key="index" v-if="page==2&&item.supply"
+			@click="navgo(`/subpkg/townTask/townGather?type=supply&task_id=${task_id}&index=${index}`)">
+			<view class="card_head">
+				<view class="">
+					批发商信息
+				</view>
+				<view class="">
+					点击查看
+				</view>
+			</view>
+			<view class="card_content">
+				<view class="" style="margin-bottom: 20rpx;">
+					店主姓名: {{item.supply[0].storeName}}
+				</view>
+				<view class="">
+					联系电话: {{item.supply[0].shopkeeperPhone}}
+				</view>
+			</view>
+		</view>
+		<!-- <u-popup :show="show" @close="close" :round="10" mode="center" @open="open">
+			<view style="padding: 20rpx;">
+				<u-button type="primary" @click="navgo(`/subpkg/townTask/townGather?type=plant&task_id=${task_id}`)"
+					style="margin-bottom: 20rpx;" color="#0122C7" text="养殖基地信息"></u-button>
+				<u-button type="primary" @click="navgo(`/subpkg/townTask/townGather?type=supply&task_id=${task_id}`)"
+					text="批发商信息" color="#0122C7"></u-button>
+
+
+			</view>
+		</u-popup> -->
+		<mybtn text="新建信息收集" @click="creatFn">
+		</mybtn>
+
+	</view>
+</template>
+
+<script>
+	import mybtn from "@/components/mybtn/mybtn.vue"
+	import {
+		townMasterTask3List
+	} from "@/api/task.js"
+
+	export default {
+
+
+		data() {
+			return {
+				show: false,
+				gatherList: [],
+				page: 1,
+				task_id: "",
+				tabLists: [{
+					name: '镇种养殖基地信息收集表',
+					id: 1
+				}, {
+					name: '镇批发商信息收集表',
+					id: 2
+				}, ],
+
+			}
+		},
+		onShow() {
+			townMasterTask3List({
+				id: this.task_id
+			}).then(res => {
+				this.gatherList = res.data.template_info.extend.purchase_sales_info
+			})
+		},
+		onLoad(option) {
+			this.task_id = option.task_id
+			townMasterTask3List({
+				id: option.task_id
+			}).then(res => {
+				this.gatherList = res.data.template_info.extend.purchase_sales_info
+			})
+			// townTask3List()
+		},
+		methods: {
+			// open() {
+			// 	this.show = true
+			// },
+			// close() {
+			// 	this.show = false
+			// },
+			creatFn() {
+				if (this.page == 1) {
+					this.navgo(`/subpkg/townTask/townGather?type=plant&task_id=${this.task_id}`)
+				} else {
+					this.navgo(`/subpkg/townTask/townGather?type=supply&task_id=${this.task_id}`)
+				}
+
+			},
+			navgo(url) {
+				this.show = false
+				uni.navigateTo({
+					url
+				})
+			},
+			changeTypeCurrent(e) {
+				this.page = e.id
+				// if(e.)
+
+			}
+		}
+
+
+	}
+</script>
+
+
+<style lang="scss">
+	.new_btn {
+		position: fixed;
+		bottom: 28rpx;
+		left: 50%;
+		transform: translate(-50%);
+		margin-top: 32rpx;
+		// margin-bottom: 40rpx;
+		width: 694rpx;
+		height: 84rpx;
+		background: $theme-oa-color;
+		border-radius: 42rpx 42rpx 42rpx 42rpx;
+		color: #fff;
+		line-height: 80rpx;
+		text-align: center;
+	}
+
+	.personnel_list {
+		margin-bottom: 130rpx;
+
+		.card {
+			margin: 0 auto;
+			margin-bottom: 28rpx;
+			width: 694rpx;
+			background: #ffffff;
+			border-radius: 30rpx;
+			opacity: 1;
+			overflow: hidden;
+			// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+
+			.card_head {
+				padding: 28rpx;
+				background-color: $theme-oa-color;
+				color: white;
+				height: 100rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
+
+			.card_content {
+				padding: 28rpx;
+
+
+				.left {
+					text-align: center;
+					// padding: 15rpx 25rpx;
+					padding-top: 20rpx;
+
+
+					width: 160rpx;
+					// background-color: $theme-oa-color;
+					color: white;
+					// border-radius: 40rpx;
+
+					.cir {
+						width: 120rpx;
+						height: 120rpx;
+						background-color: #ffffff;
+						margin-left: 25rpx;
+						// border-radius: 120rpx;
+						position: relative;
+					}
+				}
+
+				.right {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					view {
+						text:nth-child(2) {
+							margin-left: 20rpx;
+						}
+					}
+				}
+			}
+
+			.u_avatar {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+
+				transform: translate(-50%, -50%);
+			}
+
+
+
+		}
+
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/subpkg/townTask/serviceTask4.vue b/subpkg/townTask/serviceTask4.vue
index dd59cc5..f8857a3 100644
--- a/subpkg/townTask/serviceTask4.vue
+++ b/subpkg/townTask/serviceTask4.vue
@@ -1,275 +1,286 @@
 <template>
-  <view class="task_page">
-    <u-skeleton v-if="skeleton" :class="{'loading': skeleton}" :animate="true" title rows="5" rows-width="92%"
-    	rowsHeight="56">
-    </u-skeleton>
-    <block v-else>
-      <view class="card">
-        <view class="c_title">{{`任务名称: ${taskInfo.title||''}`}}</view>
-        <view>{{taskInfo.content||''}}</view>
-      </view>
-      <view class="card">
-        <view class="c_title">{{`学习照片 ( ${study_photo.length}/5 ) 张`}}</view>
-        <view class="file">
-          <view class="file_item" v-for="(item, index) in study_photo" :key="'file'+index">
-            <image class="image" :src="item" @click="priview(index)"></image>
-            <image v-if="taskInfo.status==2" class="del" src="/static/icons/delete.png" @click.stop="deleteFile(index)">
-            </image>
-          </view>
-          <view v-if="taskInfo.status==2" class="file_btn" @click="chooseFile">
-            <image src="/static/icons/plus.png"></image>
-          </view>
-          <view class="file_empty" v-for="k in placeholderLength" :key="'empty'+k"></view>
-        </view>
-      </view>
-      <view class="card">
-        <view class="c_title">{{`签到表照片 ( ${sign_in_table?1:0}/1 ) 张`}}</view>
-        <view class="file">
-          <view v-if="sign_in_table" class="file_item">
-            <image class="image" :src="sign_in_table" @click="priviewOne(index)"></image>
-            <image v-if="taskInfo.status==2 && other.is_commit==0" class="del" src="/static/icons/delete.png"
-              @click.stop="deleteFile(index, 'sign_in_table')">
-            </image>
-          </view>
-          <view v-if="taskInfo.status==2 && other.is_commit==0 && !sign_in_table" class="file_btn" @click="chooseOneFile">
-            <image src="/static/icons/plus.png"></image>
-          </view>
-          <view class="file_empty"></view>
-          <view class="file_empty"></view>
-        </view>
-      </view>
-      <view class="card" style="margin-bottom: 160rpx;">
-        <view class="c_title">培训内容大纲 (50字以上)</view>
-        <u--textarea :disabled="taskInfo.status!=2" v-model="study_content" placeholder="请输入内容"
-          placeholderStyle="font-size: 22rpx;" count maxlength="500" autoHeight
-          style="font-size: 28rpx;background-color: #eee;min-height: 100px;padding-bottom: 50rpx;"></u--textarea>
-      </view>
-      <mybtn v-if="taskInfo.status==2" text="确认提交" @click="$u.throttle(submit, 1500)"></mybtn>
-      <mybtn v-else-if="taskInfo.status==3" text="已完成" :my_btn_disabled="true" @click="showToast('任务已完成')"></mybtn>
-      <mybtn v-else-if="taskInfo.status==5" text="已关闭" :my_btn_disabled="true" @click="showToast('任务已关闭!')"></mybtn>
-      <!-- <mybtn v-else-if="approve_status==3" text="已驳回,请重新提交" @click="toUpdate"></mybtn> -->
-      <mybtn v-else text="已提交,请等待审核" :my_btn_disabled="true" @click="showToast('请耐心等待审核结果')"></mybtn>
-    </block>
-  </view>
+	<view class="task_page">
+		<u-skeleton v-if="skeleton" :class="{'loading': skeleton}" :animate="true" title rows="5" rows-width="92%"
+			rowsHeight="56">
+		</u-skeleton>
+		<block v-else>
+			<view class="card">
+				<view class="c_title">{{`任务名称: ${taskInfo.title||''}`}}</view>
+				<view>{{taskInfo.content||''}}</view>
+			</view>
+			<view class="card">
+				<view class="c_title">{{`学习照片 ( ${study_photo.length}/5 ) 张`}}</view>
+				<view class="file">
+					<view class="file_item" v-for="(item, index) in study_photo" :key="'file'+index">
+						<image class="image" :src="item" @click="priview(index)"></image>
+						<image v-if="taskInfo.status==2" class="del" src="/static/icons/delete.png"
+							@click.stop="deleteFile(index)">
+						</image>
+					</view>
+					<view v-if="taskInfo.status==2" class="file_btn" @click="chooseFile">
+						<image src="/static/icons/plus.png"></image>
+					</view>
+					<view class="file_empty" v-for="k in placeholderLength" :key="'empty'+k"></view>
+				</view>
+			</view>
+			<view class="card">
+				<view class="c_title">{{`签到表照片 ( ${sign_in_table?1:0}/1 ) 张`}}</view>
+				<view class="file">
+					<view v-if="sign_in_table" class="file_item">
+						<image class="image" :src="sign_in_table" @click="priviewOne(index)"></image>
+						<image v-if="taskInfo.status==2 && other.is_commit==0" class="del"
+							src="/static/icons/delete.png" @click.stop="deleteFile(index, 'sign_in_table')">
+						</image>
+					</view>
+					<view v-if="taskInfo.status==2 && other.is_commit==0 && !sign_in_table" class="file_btn"
+						@click="chooseOneFile">
+						<image src="/static/icons/plus.png"></image>
+					</view>
+					<view class="file_empty"></view>
+					<view class="file_empty"></view>
+				</view>
+			</view>
+			<view class="card" style="margin-bottom: 160rpx;">
+				<view class="c_title">培训内容大纲 (50字以上)</view>
+				<u--textarea :disabled="taskInfo.status!=2" v-model="study_content" placeholder="请输入内容"
+					placeholderStyle="font-size: 22rpx;" count maxlength="500" autoHeight
+					style="font-size: 28rpx;background-color: #eee;min-height: 100px;padding-bottom: 50rpx;"></u--textarea>
+			</view>
+			<mybtn v-if="taskInfo.status==2" text="确认提交" @click="$u.throttle(submit, 1500)"></mybtn>
+			<mybtn v-else-if="taskInfo.status==3" text="已完成" :my_btn_disabled="true" @click="showToast('任务已完成')">
+			</mybtn>
+			<mybtn v-else-if="taskInfo.status==5" text="已关闭" :my_btn_disabled="true" @click="showToast('任务已关闭!')">
+			</mybtn>
+			<!-- <mybtn v-else-if="approve_status==3" text="已驳回,请重新提交" @click="toUpdate"></mybtn> -->
+			<mybtn v-else text="已提交,请等待审核" :my_btn_disabled="true" @click="showToast('请耐心等待审核结果')"></mybtn>
+		</block>
+	</view>
 </template>
 
 <script>
-  import {
-    upLoadImage,
-  } from "@/api/file.js";
-  import { Toast } from "../../libs/uniApi";
-  import { townTaskDetails, serviceTask4Commit } from "@/api/task.js"
-  export default {
-    data() {
-      return {
-        skeleton: true,
-        other: {
-          annex: [], // 图片列表
-          is_commit: 0, // 是否提交
-          note: "", // 详情描述
-          video_annex: [] // 视频列表
-        },
-        taskInfo: {
-          id: '',
-          title: '',
-          content: '',
-          extend: {},
-          status: 0
-        },
-        study_photo: [],
-        sign_in_table: '',
-        study_content: ''
-      }
-    },
-    onLoad(options) {
-      options.task_id ? this.taskInfo.id = options.task_id : null;
-      this.initTask();
-    },
-    onShow() {},
-    computed: {
-      // 占位长度
-      placeholderLength() {
-        if (this.taskInfo.status!=2) return this.study_photo.length % 3 == 0 ? 0 : 3 - this.study_photo.length % 3;
-        return (this.study_photo.length + 1) % 3 == 0 ? 0 : 3 - (this.study_photo.length + 1) % 3;
-      },
-    },
-    methods: {
-      async initTask() {
-        this.skeleton = true;
-        let res = await townTaskDetails({
-          id: this.taskInfo.id
-        });
-        this.taskInfo = res.data;
-        this.sign_in_table = this.taskInfo?.extend?.town_task_type_4?.sign_in_table;
-        this.study_content = this.taskInfo?.extend?.town_task_type_4?.study_content;
-        this.study_photo = JSON.parse(JSON.stringify(this.taskInfo?.extend?.town_task_type_4?.study_photo || []));
-        this.skeleton = false;
-      },
-      // 提交
-      async submit() {
-        if (this.study_photo.length < 5) return Toast('学习照片不能低于5张');
-        if (!this.sign_in_table) return Toast('签到表照片不能为空');
-        if (this.study_content.trim().length < 50) return Toast('培训内容不得低于50字');
-        await serviceTask4Commit({
-          id: this.taskInfo.id,
-          study_photo: this.study_photo,
-          sign_in_table: this.sign_in_table,
-          study_content: this.study_content
-        });
-        this.other.is_commit = 1;
-        // this.taskInfo.approve_status = 1;
-        Toast('提交成功');
-        this.$u.sleep(500).then(()=>{
-          uni.navigateBack()
-        })
-      },
-      showToast(str) {
-        Toast(str)
-      },
-      chooseFile() {
-        uni.chooseImage({
-          count: 5,
-          sizeType: ['compressed'],
-          success: async (res) => {
-            for (let item of res.tempFiles) {
-              let ul = await upLoadImage({
-                filePath: item.path,
-                name: 'file'
-              });
-              this.study_photo.push(ul.data.uri);
-            }
-          }
-        });
-      },
-      priview(index) {
-        uni.previewImage({
-          urls: this.study_photo,
-          current: index,
-          longPressActions: {
-            itemList: ['删除'],
-            itemColor: '#ff0000',
-            success(e) {
-              if (e.tapIndex == 0) this.deleteFile(e.index);
-            }
-          },
-        })
-      },
-      chooseOneFile() {
-        uni.chooseImage({
-          count: 1,
-          sizeType: ['compressed'],
-          success: async (res) => {
-            let ul = await upLoadImage({
-              filePath: res.tempFilePaths[0],
-              name: 'file'
-            });
-            this.sign_in_table = ul.data.uri;
-          }
-        });
-      },
-      priviewOne(index) {
-        uni.previewImage({
-          urls: [this.sign_in_table],
-          current: index,
-          longPressActions: {
-            itemList: ['删除'],
-            itemColor: '#ff0000',
-            success(e) {
-              if (e.tapIndex == 0) this.sign_in_table = '';
-            }
-          },
-        })
-      },
-      // 删除已上传文件
-      deleteFile(index, type = 'image') {
-        if (type == 'image') this.study_photo.splice(index, 1);
-        else if (type == 'sign_in_table') this.sign_in_table = '';
-      },
-    },
-  }
+	import {
+		upLoadImage,
+	} from "@/api/file.js";
+	import {
+		Toast
+	} from "../../libs/uniApi";
+	import {
+		townTaskDetails,
+		serviceTask4Commit
+	} from "@/api/task.js"
+	export default {
+		data() {
+			return {
+				skeleton: true,
+				other: {
+					annex: [], // 图片列表
+					is_commit: 0, // 是否提交
+					note: "", // 详情描述
+					video_annex: [] // 视频列表
+				},
+				taskInfo: {
+					id: '',
+					title: '',
+					content: '',
+					extend: {},
+					status: 0
+				},
+				study_photo: [],
+				sign_in_table: '',
+				study_content: ''
+			}
+		},
+		onLoad(options) {
+			options.task_id ? this.taskInfo.id = options.task_id : null;
+			this.initTask();
+		},
+		onShow() {},
+		computed: {
+			// 占位长度
+			placeholderLength() {
+				if (this.taskInfo.status != 2) return this.study_photo.length % 3 == 0 ? 0 : 3 - this.study_photo.length %
+					3;
+				return (this.study_photo.length + 1) % 3 == 0 ? 0 : 3 - (this.study_photo.length + 1) % 3;
+			},
+		},
+		methods: {
+			async initTask() {
+				this.skeleton = true;
+				let res = await townTaskDetails({
+					id: this.taskInfo.id
+				});
+				this.taskInfo = res.data;
+				this.sign_in_table = this.taskInfo?.extend?.town_task_type_4?.sign_in_table;
+				this.study_content = this.taskInfo?.extend?.town_task_type_4?.study_content;
+				this.study_photo = JSON.parse(JSON.stringify(this.taskInfo?.extend?.town_task_type_4?.study_photo ||
+				[]));
+				this.skeleton = false;
+			},
+			// 提交
+			async submit() {
+				if (this.study_photo.length < 5) return Toast('学习照片不能低于5张');
+				if (!this.sign_in_table) return Toast('签到表照片不能为空');
+				if (this.study_content.trim().length < 50) return Toast('培训内容不得低于50字');
+				await serviceTask4Commit({
+					id: this.taskInfo.id,
+					study_photo: this.study_photo,
+					sign_in_table: this.sign_in_table,
+					study_content: this.study_content
+				});
+				this.other.is_commit = 1;
+				// this.taskInfo.approve_status = 1;
+				Toast('提交成功');
+				this.$u.sleep(500).then(() => {
+					uni.navigateBack()
+				})
+			},
+			showToast(str) {
+				Toast(str)
+			},
+			chooseFile() {
+				uni.chooseImage({
+					count: 5,
+					sizeType: ['compressed'],
+					success: async (res) => {
+						for (let item of res.tempFiles) {
+							let ul = await upLoadImage({
+								filePath: item.path,
+								name: 'file'
+							});
+							this.study_photo.push(ul.data.uri);
+						}
+					}
+				});
+			},
+			priview(index) {
+				uni.previewImage({
+					urls: this.study_photo,
+					current: index,
+					longPressActions: {
+						itemList: ['删除'],
+						itemColor: '#ff0000',
+						success(e) {
+							if (e.tapIndex == 0) this.deleteFile(e.index);
+						}
+					},
+				})
+			},
+			chooseOneFile() {
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed'],
+					success: async (res) => {
+						let ul = await upLoadImage({
+							filePath: res.tempFilePaths[0],
+							name: 'file'
+						});
+						this.sign_in_table = ul.data.uri;
+					}
+				});
+			},
+			priviewOne(index) {
+				uni.previewImage({
+					urls: [this.sign_in_table],
+					current: index,
+					longPressActions: {
+						itemList: ['删除'],
+						itemColor: '#ff0000',
+						success(e) {
+							if (e.tapIndex == 0) this.sign_in_table = '';
+						}
+					},
+				})
+			},
+			// 删除已上传文件
+			deleteFile(index, type = 'image') {
+				if (type == 'image') this.study_photo.splice(index, 1);
+				else if (type == 'sign_in_table') this.sign_in_table = '';
+			},
+		},
+	}
 </script>
 
 <style lang="scss">
-  .task_page {
-    padding-top: 30rpx;
+	.task_page {
+		padding-top: 30rpx;
 
-    .card {
-      margin: 0 auto;
-      margin-bottom: 28rpx;
-      width: 694rpx;
-      background-color: #fff;
-      border-radius: 26rpx;
-      padding: 28rpx;
+		.card {
+			margin: 0 auto;
+			margin-bottom: 28rpx;
+			width: 694rpx;
+			background-color: #fff;
+			border-radius: 26rpx;
+			padding: 28rpx;
 
-      .c_title {
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #333333;
-        margin-bottom: 20rpx;
-      }
+			.c_title {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #333333;
+				margin-bottom: 20rpx;
+			}
 
-      .file {
-        display: flex;
-        justify-content: left;
-        flex-wrap: wrap;
+			.file {
+				display: flex;
+				justify-content: left;
+				flex-wrap: wrap;
 
-        &_item {
-          flex-shrink: 0;
-          width: 200rpx;
-          height: 200rpx;
-          margin: 0 auto;
-          margin-bottom: 16rpx;
-          border: 2px solid #ccc;
-          border-radius: 10rpx;
-          overflow: hidden;
-          position: relative;
+				&_item {
+					flex-shrink: 0;
+					width: 200rpx;
+					height: 200rpx;
+					margin: 0 auto;
+					margin-bottom: 16rpx;
+					border: 2px solid #ccc;
+					border-radius: 10rpx;
+					overflow: hidden;
+					position: relative;
 
-          .image {
-            width: 100%;
-            height: 100%;
-          }
+					.image {
+						width: 100%;
+						height: 100%;
+					}
 
-          .del {
-            position: absolute;
-            height: 40rpx;
-            width: 40rpx;
-            top: 10rpx;
-            right: 10rpx;
-          }
-        }
+					.del {
+						position: absolute;
+						height: 40rpx;
+						width: 40rpx;
+						top: 10rpx;
+						right: 10rpx;
+					}
+				}
 
-        &_btn {
-          flex-shrink: 0;
-          width: 200rpx;
-          height: 200rpx;
-          margin: 0 auto;
-          margin-bottom: 16rpx;
-          border: 2px solid #ccc;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          flex-direction: column;
-          border-radius: 10rpx;
+				&_btn {
+					flex-shrink: 0;
+					width: 200rpx;
+					height: 200rpx;
+					margin: 0 auto;
+					margin-bottom: 16rpx;
+					border: 2px solid #ccc;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					border-radius: 10rpx;
 
-          image {
-            width: 100rpx;
-            height: 100rpx;
-          }
-        }
+					image {
+						width: 100rpx;
+						height: 100rpx;
+					}
+				}
 
-        &_empty {
-          flex-shrink: 0;
-          width: 200rpx;
-          height: 200rpx;
-          margin: 0 auto;
-          margin-bottom: 16rpx;
-          border: 2px solid transparent;
-        }
-      }
-    }
-    
-    .loading{
-      padding: 28rpx;
-    }
-  }
+				&_empty {
+					flex-shrink: 0;
+					width: 200rpx;
+					height: 200rpx;
+					margin: 0 auto;
+					margin-bottom: 16rpx;
+					border: 2px solid transparent;
+				}
+			}
+		}
+
+		.loading {
+			padding: 28rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/subpkg/townTask/townGather.vue b/subpkg/townTask/townGather.vue
new file mode 100644
index 0000000..00fc0b5
--- /dev/null
+++ b/subpkg/townTask/townGather.vue
@@ -0,0 +1,689 @@
+<template>
+	<view class="content" v-if="flag">
+		<view class="tit">
+			<text v-if="page">养殖信息</text>
+			<text v-else>镇批发商信息收集表</text>
+		</view>
+
+		<!-- 镇种养殖基地信息收集表 -->
+		<view class="card" v-if="page">
+			<u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+				<u-form-item labelWidth="auto" label="法人姓名" required prop="entityName" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.entityName" placeholder="请输入法人姓名"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="联系方式" required prop="phone" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.phone" placeholder="请输入联系方式"
+						type="number"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="员工人数" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.employee" placeholder="请输入员工人数"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="耕地总面积" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.arableLand" placeholder="请输入员工人数"></u--input>
+				</u-form-item>
+				<view class="">
+					<u-form-item labelWidth="auto" labelPosition="top" label="土地规划" borderBottom>
+						<u-radio-group :disabled="readonly" v-model="formData.breeding_company" style="margin: 16rpx;">
+							<view class="" style="display: flex;justify-content: space-between;flex-wrap: wrap;">
+								<u-radio :customStyle="{marginRight: '16px',overflow: 'auto',marginBottom:'16rpx'}"
+									v-for="(item, index) in [{value:'0',label:'自己种'},{value:'1',label:'出租'},{value:'2',label:'代种养'},{value:'3',label:'租更多地扩大种殖'}]"
+									:key="index" :label="item.label" :name="item.value">
+								</u-radio>
+							</view>
+
+						</u-radio-group>
+					</u-form-item>
+				</view>
+				<u-form-item labelWidth="auto" label="有无养殖培训" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.breeding_training" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="现代化程度(%)" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.modernization" placeholder="请输入现代化程度(%)"
+						type="number" maxlength="3"></u--input>
+				</u-form-item>
+				<picker :range="breedingTypeList" range-key="name" :disabled="readonly" mode="selector"
+					@change="changeBreeding">
+					<u-form-item labelWidth="auto" label="种养殖类型" borderBottom>
+						<u--input :value="breedingName" style="pointer-events: none;" placeholder="请选择养殖类型" disabled
+							disabledColor="#fff"></u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+				</picker>
+				<u-form-item labelWidth="auto" label="面积" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.area" placeholder="请输入面积"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="农资农具使用情况" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.farm_tools" placeholder="请输入面积"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="是否生态养殖" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.ecological_farming" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'是'},{value:'0',label:'否'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'breeding_begin_time'">
+					<u-form-item labelWidth="auto" label="种植开始时间" borderBottom>
+						<u--input :value="formData.breeding_begin_time" style="pointer-events: none;"
+							placeholder="请选择养殖开始时间" disabled disabledColor="#fff"></u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+				</picker>
+				<picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'breeding_time'">
+					<u-form-item labelWidth="auto" label="成熟时间" borderBottom>
+						<u--input :value="formData.breeding_time" style="pointer-events: none;" placeholder="请选择养殖开始时间"
+							disabled disabledColor="#fff"></u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+				</picker>
+				<picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'mature_time'">
+					<u-form-item labelWidth="auto" label="上市时间" borderBottom>
+						<u--input :value="formData.mature_time" style="pointer-events: none;" placeholder="请选择上市时间"
+							disabled disabledColor="#fff"></u--input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+				</picker>
+				<u-form-item labelWidth="auto" label="产量(斤)" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.yield" placeholder="请输入产量(斤)"
+						type="number"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="预售卖价格(元/500g)" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.pre_price" placeholder="请输入预售卖价格"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="预计收益(元)" borderBottom>
+					<u--input :readonly="readonly" v-model="formData.estimated_income" placeholder="请输入预计收益(元)"
+						type="number"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="销售渠道" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.salesChannels" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'自销'},{value:'0',label:'定点'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="有无加工仓储" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.processing_storage" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="有无宣传推广" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.promote" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="有无运输" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.transportation" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+
+				<u-form-item labelWidth="auto" label="是否有扩大经营需求" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.isExpandOperations" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'是'},{value:'0',label:'否'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" labelPosition="top" label="种养殖述求" borderBottom>
+					<u--textarea :disabled="readonly" v-model="formData.request" autoHeight placeholder="请输入您的述求"
+						border="surround" count></u--textarea>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="是否有政策补贴" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.isPolicySubsidies" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+
+				<u-form-item labelWidth="auto" label="有无公益拍卖品" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.isLots" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+
+				<u-form-item labelWidth="auto" label="有无需求的公益拍卖品" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData.isNeedLots" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" labelPosition="top" label="家庭情况说明" borderBottom>
+					<u--textarea :disabled="readonly" v-model="formData.family" autoHeight placeholder="请输入"
+						border="surround" count></u--textarea>
+				</u-form-item>
+				<u-form-item labelWidth="auto" labelPosition="top" label="家庭总述求" borderBottom>
+					<u--textarea :disabled="readonly" v-model="formData.familyNotes" autoHeight placeholder="请输入"
+						border="surround" count></u--textarea>
+				</u-form-item>
+				<u-button v-if="!readonly" type="primary" text="提交" @click="confirm1" color="#0122C7"></u-button>
+			</u--form>
+		</view>
+		<!-- 镇批发商信息收集表 -->
+		<view class="card" v-show='!page'>
+
+			<u--form labelPosition="left" :model="formData1" :rules="rules1" ref="breedingForm1">
+				<u-form-item labelWidth="auto" label="店铺名称" required prop="storeName" borderBottom>
+					<u--input :readonly="readonly" v-model="formData1.storeName" placeholder="请输入店铺名称"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="经营类型" required prop="type" borderBottom>
+					<u--input :readonly="readonly" v-model="formData1.type" placeholder="请输入经营类型"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店主姓名" required prop="shopkeeperName" borderBottom>
+					<u--input :readonly="readonly" v-model="formData1.shopkeeperName" placeholder="请输入店主姓名"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店主性别" required prop="arableLand" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.shopkeeperSex" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'男'},{value:'0',label:'女'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店主年龄" required prop="shopkeeperAge" borderBottom>
+					<u--input :readonly="readonly" type='number' v-model="formData1.shopkeeperAge"
+						placeholder="请输入店主姓名"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="联系方式" required prop="shopkeeperPhone" borderBottom>
+					<u--input :readonly="readonly" type='number' v-model="formData1.shopkeeperPhone"
+						placeholder="请输入联系方式"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店铺地址" borderBottom>
+					<u--input :readonly="readonly" v-model="formData1.address" placeholder="请输入地址"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="面积" borderBottom>
+					<u--input :readonly="readonly" type='number' v-model="formData1.area"
+						placeholder="请输入地址"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="经营年限" borderBottom>
+					<u--input :readonly="readonly" type='number' v-model="formData1.storeAge"
+						placeholder="请输入经营年限"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="人数" borderBottom>
+					<u--input :readonly="readonly" type='number' v-model="formData1.Number"
+						placeholder="请输入人数"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店铺规模" required prop="storeScale" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.storeScale" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'0',label:'批发'},{value:'1',label:'零售'},{value:'2',label:'独家经营'}]"
+							:key="index" :label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店铺规模排名" required prop="storeRanking" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.storeRanking" style="margin: 16rpx;">
+
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'0',label:'前3'},{value:'1',label:'居中'},{value:'2',label:'小规模'}]"
+							:key="index" :label="item.label" :name="item.value">
+						</u-radio>
+
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店铺影响力" required prop="Influence" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.Influence" style="margin: 16rpx;">
+
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'0',label:'大'},{value:'1',label:'中'},{value:'2',label:'小'}]"
+							:key="index" :label="item.label" :name="item.value">
+						</u-radio>
+
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" labelPosition="top" label="店铺年营收" required prop="revenue" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.revenue" style="margin: 16rpx;">
+
+						<u-radio :customStyle="{marginRight: '16px',}"
+							v-for="(item, index) in [{value:'0',label:'10万以下'},{value:'1',label:'10-30万'},{value:'2',label:'30万以上'}]"
+							:key="index" :label="item.label" :name="item.value">
+						</u-radio>
+
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店铺产权" required prop="propertyRights" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.propertyRights" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'0',label:'自有'},{value:'1',label:'租赁'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店铺归属" required prop="ascription" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.ascription" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px',}"
+							v-for="(item, index) in [{value:'0',label:'私有'},{value:'1',label:'合伙'},{value:'2',label:'加盟'},{value:'3',label:'国有'},]"
+							:key="index" :label="item.label" :name="item.value">
+						</u-radio>
+
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="店铺进货渠道" borderBottom>
+					<u--input :readonly="readonly" type='number' v-model="formData1.incomingChannels"
+						placeholder="请输入进货渠道"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="有无仓储" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.isWarehousing" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="有无冻库" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.isColdStorage" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="有无入驻其他平台" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.isSettled" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="现代文化程度" borderBottom>
+					<u--input :readonly="readonly" v-model="formData1.Education" placeholder="请输入文化程度"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="有无宣传推广" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.isPublicize" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="有无运输" borderBottom>
+					<u-radio-group :disabled="readonly" v-model="formData1.isTransport" style="margin: 16rpx;">
+						<u-radio :customStyle="{marginRight: '16px'}"
+							v-for="(item, index) in [{value:'1',label:'有'},{value:'0',label:'无'}]" :key="index"
+							:label="item.label" :name="item.value">
+						</u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item labelWidth="auto" label="主要供给明细" borderBottom>
+					<u--input :readonly="readonly" v-model="formData1.supply" placeholder="请输入供给明细"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="auto" labelPosition="top" label="店铺述求" required prop="notes" borderBottom>
+					<u--textarea :disabled="readonly" v-model="formData1.notes" autoHeight placeholder="请输入"
+						border="surround" count></u--textarea>
+				</u-form-item>
+				<u-form-item labelWidth="auto" labelPosition="top" label="综合描述与分析" required prop="description"
+					borderBottom>
+					<u--textarea :disabled="readonly" v-model="formData1.description" autoHeight placeholder="请输入"
+						border="surround" count></u--textarea>
+				</u-form-item>
+				<view class="" style="height: 20rpx;">
+
+				</view>
+				<u-button v-if="!readonly" type="primary" text="提交" @click="confirm" color="#0122C7"></u-button>
+			</u--form>
+
+		</view>
+	</view>
+
+	<view class="" v-else>
+		<u-loading-page></u-loading-page>
+	</view>
+
+</template>
+
+<script>
+	import {
+		townMasterTask3Commit,
+		townMasterTask3List
+	} from "@/api/task.js"
+	export default {
+		props: {
+			datas: {
+				type: Object,
+				default: null
+			},
+			update_time: {
+				type: String,
+				default: null
+			}
+		},
+		data() {
+			return {
+				flag: false,
+				page: 1,
+				taskId: "",
+				readonly: false,
+				landPlanList: ['自己养', '出租', '代养', '租更多地扩大养殖'],
+				breedingTypeList: [{
+						id: 1,
+						name: "水产"
+					},
+					{
+						id: 2,
+						name: "禽类"
+					},
+					{
+						id: 3,
+						name: "大型动物"
+					},
+				],
+				formData: {
+					"entityName": "",
+					phone: "",
+					employee: "",
+					arableLand: "",
+					"breeding_training": 1, //有无养殖培训
+
+					"breeding_type": "", //养殖类型
+					"area": "", //面积
+					breeding_begin_time: "",
+					"breeding_time": "", //养殖开始时间
+					"mature_time": "", //上市时间
+					"yield": "", //产量
+					salesChannels: "",
+					isExpandOperations: "", //扩大经营
+					request: "", //述求
+					isPolicySubsidies: "", //政策补贴
+					isLots: "", //公仪平
+					isNeedLots: "", //公仪平
+					family: "",
+					familyNotes: "",
+					"farm_tools": "", //农资农具使用情况
+					"ecological_farming": "", //是否生态养殖
+					"modernization": "", //现代化程度
+					"processing_storage": "", //有无加工仓储
+					"promote": "", //有无宣传推广
+					"transportation": "", //有无运输
+				},
+
+				formData1: {
+					storeName: "",
+					type: "",
+					shopkeeperName: "",
+					shopkeeperSex: "",
+					shopkeeperAge: "",
+					shopkeeperPhone: "",
+					address: "",
+					area: "",
+					storeAge: "",
+					Number: "",
+					storeScale: "",
+					storeRanking: "",
+					Influence: "",
+					revenue: "",
+					propertyRights: "",
+					ascription: "",
+					incomingChannels: "",
+					isWarehousing: "",
+					isColdStorage: "",
+					isSettled: "",
+					Education: "",
+					isPublicize: "",
+					isTransport: "",
+					supply: "",
+					notes: "",
+					description: ""
+				},
+				rules: {
+
+				},
+				rules1: {
+
+				}
+			}
+		},
+		onLoad(option) {
+			this.taskId = option.task_id
+			if (option.type == 'supply') this.page = 0
+			if (option.index) {
+				townMasterTask3List({
+					id: option.task_id
+				}).then(res => {
+					this.readonly = true
+					this.flag = true
+					if (option.type == 'supply') {
+						this.formData1 = res.data.template_info.extend.purchase_sales_info[option.index]?.supply[0]
+					} else {
+						this.formData = res.data.template_info.extend.purchase_sales_info[option.index]?.planting[
+							0]
+					}
+
+				})
+			}
+
+			// }
+			this.flag = true
+
+		},
+		created() {
+			this.initRules();
+
+		},
+
+		computed: {
+			breedingName() {
+				return this.breedingTypeList.find((item) => item.id == this.formData.breeding_type)?.name;
+			}
+		},
+		methods: {
+			// 初始化校验
+			initRules() {
+				let arr = Object.keys(this.formData);
+				let arr1 = Object.keys(this.formData1);
+				let white = ['demand', 'policy_subsidies'];
+				arr = arr.filter(item => {
+					return !white.includes(item);
+				})
+				arr1 = arr1.filter(item => {
+					return !white.includes(item);
+				})
+				arr.forEach(key => {
+
+					this.rules[key] = {
+						validator: (rule, value, callback) => {
+							this.$refs.breedingForm.clearValidate(rule.field);
+							value.trim() !== '' ? callback() : callback('不能为空');
+						},
+						trigger: ['change', 'blur']
+					}
+					if (key == 'phone') {
+						console.log("phone")
+						this.rules[key] = [{
+								required: true,
+								message: '请输入手机号',
+								trigger: ['change', 'blur'],
+							},
+							{
+
+								validator: (rule, value, callback) => {
+
+									return uni.$u.test.mobile(value);
+								},
+								message: '手机号码不正确',
+
+								trigger: ['blur'],
+							}
+						]
+					}
+				})
+				arr1.forEach(key => {
+					this.rules1[key] = {
+						validator: (rule, value, callback) => {
+							this.$refs.breedingForm1.clearValidate(rule.field);
+							value.trim() !== '' ? callback() : callback('不能为空');
+						},
+						trigger: ['change', 'blur']
+					}
+					if (key == 'shopkeeperPhone') {
+
+						this.rules1[key] = [{
+								required: true,
+								message: '请输入手机号',
+								trigger: ['change', 'blur'],
+							},
+							{
+
+								validator: (rule, value, callback) => {
+
+									return uni.$u.test.mobile(value);
+								},
+								message: '手机号码不正确',
+
+								trigger: ['blur'],
+							}
+						]
+					}
+				})
+			},
+			// 校验
+			async validate() {
+				return await this.$refs.breedingForm.validate();
+			},
+			async validate1() {
+				return await this.$refs.breedingForm1.validate();
+			},
+			// 选择养殖类型
+			changeBreeding(e) {
+				// let index = e.currentTarget.dataset.index;
+				this.formData.breeding_type = this.breedingTypeList[e.detail.value].id;
+			},
+			// 选择时间
+			changeDate(e) {
+				let data = e.currentTarget.dataset;
+				this.formData[data.value] = e.detail.value;
+			},
+			async commit() {
+				if (this.page) {
+					await townMasterTask3Commit({
+						id: Number(this.taskId),
+						purchase_sales_info: {
+							planting: [{
+								...this.formData
+							}],
+
+						}
+					})
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1000)
+
+				} else {
+					await townMasterTask3Commit({
+						id: Number(this.taskId),
+						purchase_sales_info: {
+							supply: [{
+								...this.formData1
+							}],
+
+						}
+					})
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1000)
+
+				}
+
+
+			},
+			async nextFormFn() {
+				await this.validate()
+				this.page = 0
+			},
+			async confirm1() {
+				await this.validate()
+				this.commit()
+			},
+			async confirm() {
+				await this.validate1()
+				this.commit()
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.card {
+		background-color: #fff;
+		margin: 28rpx;
+		padding: 28rpx;
+		margin-top: 0;
+		padding-top: 0;
+		border-radius: 0 0 14rpx 14rpx;
+	}
+
+	.tit {
+		margin: 28rpx 28rpx 0 28rpx;
+		padding: 28rpx 28rpx 0 28rpx;
+		border-radius: 14rpx 14rpx 0 0;
+		background-color: $theme-oa-color;
+		color: white;
+		height: 100rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.title {
+		font-weight: 500;
+		font-size: 34rpx;
+
+		&::before {
+			width: 8rpx;
+			height: 26rpx;
+			border-radius: 4rpx;
+			background-color: #0122c7;
+			content: "";
+			display: inline-block;
+			margin-right: 8rpx;
+		}
+	}
+
+	.delete {
+		margin: 22rpx 0;
+		// margin-bottom: 40rpx;
+		width: 100%;
+		height: 64rpx;
+		line-height: 64rpx;
+		background: #f56c6c;
+		border-radius: 14rpx;
+		font-size: 28rpx;
+		color: #fff;
+		text-align: center;
+	}
+
+	.plus {
+		margin: 22rpx 0;
+		// margin-bottom: 40rpx;
+		width: 100%;
+		height: 64rpx;
+		line-height: 64rpx;
+		background: $theme-oa-color;
+		border-radius: 14rpx;
+		font-size: 28rpx;
+		color: #fff;
+		text-align: center;
+	}
+</style>
\ No newline at end of file