From 1ed919adecf4f283ead4e6461bce695963385775 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 9 Aug 2023 10:06:24 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2,?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/archives/archives.vue       | 400 ++++++++++++++---------------
 subpkg/newArchives/newArchives.vue |   1 +
 2 files changed, 192 insertions(+), 209 deletions(-)

diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index df159ce..7b78060 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -1,230 +1,212 @@
 <template>
-	<view class="">
-		<view class="personnel_list">
-			<view class="item" v-for="(item, index) in list" :key="item.id">
-				<view class="top">
-					<image class="avatar" src="../../static/img/public/record.png"></image>
-					<view class="body">
-						<view class="t_top">
-							<view>姓名:<text class="name">{{item.name}}</text></view>
-							<view>电话:<text class="mobile">{{item.phone}}</text></view>
-						</view>
-						<view class="t_bottom">片区:<text class="address">{{item.address}}</text></view>
-					</view>
-				</view>
-				<u-line color="#cccccc"></u-line>
-				<view class="bottom">
-					<view>更新时间: {{item.create_time}}</view>
-					<view class="right" v-if="showView">
-						<view class="update" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)">
-							更新
-						</view>
-						<view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
-							查看
-						</view>
-					</view>
-				</view>
-			</view>
-			<u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="没有档案" icon="/static/img/empty/list.png">
-			</u-empty>
-			<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
-				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-		</view>
-		<mybtn text="信息登记" v-if="showView" @click="navTo('/subpkg/newArchives/newArchives')"></mybtn>
-	</view>
+  <view class="">
+    <view class="personnel_list">
+      <view class="item" v-for="(item, index) in list" :key="item.id">
+        <view class="top">
+          <image class="avatar" src="../../static/img/public/record.png"></image>
+          <view class="body">
+            <view>姓名:<text class="name">{{item.name}}</text></view>
+            <view>片区:<text class="name">{{item.address}}</text></view>
+            <view>电话:<text class="name">{{item.phone}}</text></view>
+          </view>
+        </view>
+        <u-line color="#cccccc"></u-line>
+        <view class="bottom">
+          <view>更新时间: {{item.create_time}}</view>
+          <view class="right" v-if="showView">
+            <view class="update" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)">
+              更新
+            </view>
+            <view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
+              查看
+            </view>
+          </view>
+        </view>
+      </view>
+      <u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="没有档案" icon="/static/img/empty/list.png">
+      </u-empty>
+      <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+        :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+    </view>
+    <mybtn text="信息登记" v-if="showView" @click="navTo('/subpkg/newArchives/newArchives')"></mybtn>
+  </view>
 </template>
 
 <script>
-	import {
-		informationList
-	} from "@/api/information.js"
-	import {
-		Toast
-	} from "../../libs/uniApi";
-	export default {
-		data() {
-			return {
-				user_id: -1,
-				list: [],
-				loadConfig: {
-					page: 1,
-					limit: 15,
-					loadingText: '努力加载中',
-					loadmoreText: '轻轻上拉',
-					nomoreText: '我也是有底线的~~',
-					status: 'loadmore'
-				},
-			}
-		},
-		onLoad(options) {
-			if (options.id) this.user_id = options.id;
-			else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id
-				this.user_id = this.$store.state.app.userInfo.id;
-			}
-			this.loadInformationList();
-		},
-		onShow() {
-			
-		},
-		computed: {
-			// 是否显示查看和更新按钮
-			showView() {
-				return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain;
-			}
-		},
-		onReachBottom() {
-			this.loadInformationList();
-		},
-		methods: {
-			navTo(url) {
-				if (url) {
-					uni.showLoading({
-						title: '加载中',
-						mask: true
-					})
-					uni.navigateTo({
-						url: url,
-						success() {
-							uni.hideLoading()
-						}
-					})
-				} else Toast('暂未开放');
-			},
-			async initLoad() {
-				this.loadConfig.page = 1;
-				this.loadConfig.status = "loadmore";
-				this.list = [];
-				await this.loadInformationList();
-				uni.stopPullDownRefresh();
-			},
-			async loadInformationList() {
-				let that = this;
-				if (this.loadConfig.status == "nomore") return;
-				this.loadConfig.status = "loading"
-				let res = await informationList({
-					page: this.loadConfig.page,
-					limit: this.loadConfig.limit,
-					user_id: that.user_id
-				})
-				this.loadConfig.status = "loadmore"
-				if (res.data.length < this.loadConfig.limit) {
-					this.loadConfig.status = "nomore"
-				} else {
-					this.loadConfig.page++;
-				}
-				this.list = [...this.list, ...res.data];
-			}
-		},
-		onPullDownRefresh() {
-			this.initLoad();
-		}
-	}
+  import {
+    informationList
+  } from "@/api/information.js"
+  import {
+    Toast
+  } from "../../libs/uniApi";
+  export default {
+    data() {
+      return {
+        user_id: -1,
+        list: [],
+        loadConfig: {
+          page: 1,
+          limit: 15,
+          loadingText: '努力加载中',
+          loadmoreText: '轻轻上拉',
+          nomoreText: '我也是有底线的~~',
+          status: 'loadmore'
+        },
+      }
+    },
+    onLoad(options) {
+      if (options.id) this.user_id = options.id;
+      else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id
+        this.user_id = this.$store.state.app.userInfo.id;
+      }
+      this.loadInformationList();
+      uni.$on('loadArchives', this.initLoad);
+    },
+    onShow() {
+
+    },
+    computed: {
+      // 是否显示查看和更新按钮
+      showView() {
+        return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain;
+      }
+    },
+    onReachBottom() {
+      this.loadInformationList();
+    },
+    methods: {
+      navTo(url) {
+        if (url) {
+          uni.showLoading({
+            title: '加载中',
+            mask: true
+          })
+          uni.navigateTo({
+            url: url,
+            success() {
+              uni.hideLoading()
+            }
+          })
+        } else Toast('暂未开放');
+      },
+      async initLoad() {
+        this.loadConfig.page = 1;
+        this.loadConfig.status = "loadmore";
+        this.list = [];
+        await this.loadInformationList();
+        uni.stopPullDownRefresh();
+      },
+      async loadInformationList() {
+        let that = this;
+        if (this.loadConfig.status == "nomore") return;
+        this.loadConfig.status = "loading"
+        let res = await informationList({
+          page: this.loadConfig.page,
+          limit: this.loadConfig.limit,
+          user_id: that.user_id
+        })
+        this.loadConfig.status = "loadmore"
+        if (res.data.length < this.loadConfig.limit) {
+          this.loadConfig.status = "nomore"
+        } else {
+          this.loadConfig.page++;
+        }
+        this.list = [...this.list, ...res.data];
+      }
+    },
+    onPullDownRefresh() {
+      this.initLoad();
+    }
+  }
 </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;
-	}
+  .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 {
-		padding: 28rpx 0;
-		margin-bottom: 130rpx;
+  .personnel_list {
+    padding: 28rpx 0;
+    margin-bottom: 130rpx;
 
-		.item {
-			margin: 0 auto;
-			width: 694rpx;
-			// height: 201rpx;
-			background: #FFFFFF;
-			border-radius: 14rpx 14rpx 14rpx 14rpx;
-			opacity: 1;
-			margin-bottom: 21rpx;
-			box-sizing: border-box;
-			padding: 28rpx;
-			font-size: 24.53rpx;
-			color: #999999FF;
+    .item {
+      margin: 0 auto;
+      width: 694rpx;
+      // height: 201rpx;
+      background: #FFFFFF;
+      border-radius: 14rpx 14rpx 14rpx 14rpx;
+      opacity: 1;
+      margin-bottom: 21rpx;
+      box-sizing: border-box;
+      padding: 28rpx;
+      font-size: 24.53rpx;
+      color: #999999FF;
 
-			.top {
-				display: flex;
-				align-items: center;
-				width: 100%;
+      .top {
+        display: flex;
+        align-items: center;
+        width: 100%;
 
-				.avatar {
-					width: 120rpx;
-					height: 120rpx;
-					margin-right: 18rpx;
-					margin-bottom: 12rpx;
-				}
+        .avatar {
+          width: 120rpx;
+          height: 120rpx;
+          margin-right: 18rpx;
+          margin-bottom: 12rpx;
+        }
 
-				.body {
-					flex: 1;
+        .body {
+          flex: 1;
+          font-size: 28rpx;
+          color: #333;
+          font-weight: bold;
 
-					.t_top {
-						display: flex;
-						justify-content: space-between;
-						margin-bottom: 18rpx;
+          .name {
+            font-size: 28rpx;
+            color: #333;
+            font-weight: 500;
+            display: inline-block;
+            margin-left: 18rpx;
+          }
+        }
+      }
 
-						.name {
-							font-size: 32rpx;
-							color: #333;
-						}
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 20rpx;
+        font-size: 25rpx;
 
-						.mobile {
-							font-size: 28rpx;
-							color: #333;
-						}
-					}
+        .right {
+          font-size: 28rpx;
+          display: flex;
 
-					.t_bottom {
-						width: 500rpx;
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
+          .look {
+            color: $theme-oa-color;
+          }
 
-						.address {
-							font-size: 28rpx;
-							color: #333;
-						}
-					}
-				}
-			}
+          .update {
+            color: #34A853;
+            margin-right: 38rpx;
+          }
+        }
 
-			.bottom {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-top: 20rpx;
-				font-size: 25rpx;
-
-				.right {
-					font-size: 28rpx;
-					display: flex;
-
-					.look {
-						color: $theme-oa-color;
-					}
-
-					.update {
-						color: #34A853;
-						margin-right: 38rpx;
-					}
-				}
-
-			}
+      }
 
 
-		}
+    }
 
-	}
-</style>
+  }
+</style>
\ No newline at end of file
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index 61b6800..33965d1 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -279,6 +279,7 @@
 		    title: "添加成功",
 		    success: () => {
 		      setTimeout(() => {
+            uni.$emit('loadArchives');
 		        uni.navigateBack()
 		      }, 1000)
 		    }

From 1f07efe6245da28f402174f42a49e9d014daae28 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 9 Aug 2023 10:31:02 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/logistics/index.vue | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pages/logistics/index.vue b/pages/logistics/index.vue
index dbfbff9..a64ccd6 100644
--- a/pages/logistics/index.vue
+++ b/pages/logistics/index.vue
@@ -1,17 +1,18 @@
 <template>
 	<view class="content">
-		<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='white'
-			v-model="keywords"></u-search>
-		<view style="margin: 10rpx 0 0 0;">
-		</view>
-		<u-sticky bgColor="#F5F5F5">
-			<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection>
+		<view style="background-color: #fff;padding: 18rpx 28rpx 0 18rpx;">
+      <u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='#f5f5f5'
+      	v-model="keywords"></u-search>
+    </view>
+		<!-- <view style="margin: 10rpx 0 0 0;"></view> -->
+		<u-sticky bgColor="#fff">
+			<u-tabs :list="list" :current="curNow" @change="sectionChange" :scrollable="false"></u-tabs>
 		</u-sticky>
 		<view v-if="!orderlist.length">
 			<u-empty mode="data" icon="../../static/img/empty/data.png">
 			</u-empty>
 		</view>
-		<view v-else>
+		<view v-else style="padding: 28rpx;">
 			<logistiCard v-for='(item,index) in orderlist' @getlist="getOrderList" :goodsInfo="item" :key="index">
 			</logistiCard>
 		</view>
@@ -33,14 +34,14 @@
 		data() {
 			return {
 				keywords: "",
-				list: ['待取货', '已取货', '已送达'],
+				list: [{name:'待取货'}, {name:'已取货'}, {name:'已送达'}],
 				curNow: 0,
 				orderlist: []
 			}
 		},
 		methods: {
-			sectionChange(index) {
-				this.curNow = index;
+			sectionChange(e) {
+				this.curNow = e.index;
 				this.getOrderList()
 				// console.log(this.curNow)
 			},
@@ -71,8 +72,4 @@
 </script>
 
 <style lang='scss'>
-	.content {
-		background-color: #F5F5F5;
-		padding: 1vh 2vw;
-	}
 </style>
\ No newline at end of file

From ca4d6ffd8334f04002b1eee7f61069e68ac34af7 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 9 Aug 2023 10:43:00 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/logistics/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/logistics/index.vue b/pages/logistics/index.vue
index a64ccd6..5c616cc 100644
--- a/pages/logistics/index.vue
+++ b/pages/logistics/index.vue
@@ -6,7 +6,7 @@
     </view>
 		<!-- <view style="margin: 10rpx 0 0 0;"></view> -->
 		<u-sticky bgColor="#fff">
-			<u-tabs :list="list" :current="curNow" @change="sectionChange" :scrollable="false"></u-tabs>
+			<u-tabs :list="list" lineColor='#3274F9' inactiveStyle='color:#666' activeStyle="color:#3274F9" :current="curNow" @change="sectionChange" :scrollable="false"></u-tabs>
 		</u-sticky>
 		<view v-if="!orderlist.length">
 			<u-empty mode="data" icon="../../static/img/empty/data.png">

From dfbb94c0298403ab7c1ec8981df6a16762ea9f41 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 9 Aug 2023 11:18:45 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=85=E5=80=BC,?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=8F=90=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/companyFinance/companyFinance.vue | 6 +++---
 subpkg/companyInfo/companyInfo.vue           | 3 +++
 subpkg/topUp/topUp.vue                       | 5 +++++
 subpkg/withdrawDeposit/withdrawDeposit.vue   | 9 +++++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index b8271b4..098a5b8 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -1,12 +1,12 @@
 <template>
   <view class="c_card">
-    <view class="f_card" @click="naviTo('/subpkg/topUp/topUp')">
-      <view class="item">
+    <view class="f_card">
+      <view class="item" @click="naviTo('/subpkg/topUp/topUp')">
         <view>公司账户余额(元)</view>
         <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
         <view class="price" v-else>0.00</view>
       </view>
-      <view class="item">
+      <view class="item" @click="naviTo('/subpkg/withdrawDeposit/withdrawDeposit')">
         <view>公司收益金额(元)</view>
         <view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view>
         <view class="price" v-else>0.00</view>
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 69ff0bd..8628aea 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -145,6 +145,9 @@
 </script>
 
 <style lang="scss">
+  page{
+    
+  }
   .fixed_box {
     width: 100%;
     position: fixed;
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index 392d1f2..066cb18 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -213,6 +213,10 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 18rpx;
+        }
       }
     }
   }
@@ -221,6 +225,7 @@
     display: flex;
     flex-direction: column;
     padding: 0 28rpx;
+    margin-top: 50rpx;
 
     .title {
       font-size: 32rpx;
diff --git a/subpkg/withdrawDeposit/withdrawDeposit.vue b/subpkg/withdrawDeposit/withdrawDeposit.vue
index 40dfb43..93374d0 100644
--- a/subpkg/withdrawDeposit/withdrawDeposit.vue
+++ b/subpkg/withdrawDeposit/withdrawDeposit.vue
@@ -6,7 +6,8 @@
         <view class="title">提现信息</view>
         <view class="item">
           <text>提现账户</text>
-          <text>{{$store.state.app.userInfo.account||''}}</text>
+          <text v-if="$store.state.app.userInfo.admin_id">{{$store.state.app.userInfo.company.company_name||''}}</text>
+          <text v-else>{{$store.state.app.userInfo.account||''}}</text>
         </view>
         <view class="item">
           <text>可用余额</text>
@@ -141,7 +142,7 @@
 
     .card {
       width: 694rpx;
-      height: 180rpx;
+      min-height: 180rpx;
       background: #FFFFFF;
       margin-top: 38.55rpx;
       box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
@@ -167,6 +168,10 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 18rpx;
+        }
       }
     }
   }

From e50e2f51f056251eac300a1f6e190ef8c876e016 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 9 Aug 2023 15:22:40 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/company/company.vue                |   2 +-
 .../districtSelector/districtSelectorTow.vue  | 189 ++++++++++++++----
 subpkg/captain/captain.vue                    |  20 +-
 subpkg/newArchives/newArchives.vue            |   9 +-
 subpkg/newPersonnel/newPersonnel.vue          |  22 +-
 5 files changed, 179 insertions(+), 63 deletions(-)

diff --git a/components/company/company.vue b/components/company/company.vue
index 90824d4..96c0338 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -17,7 +17,7 @@
           </view>
           <view class="bottom">
             <view class="left">
-              <uni-icons type="location" color="#666666" size="13"></uni-icons>
+              <uni-icons type="location" color="#666666" size="14"></uni-icons>
               <view class="location">区域:</view>
             </view>
             <view style="flex: 1;">{{company.address}}</view>
diff --git a/components/districtSelector/districtSelectorTow.vue b/components/districtSelector/districtSelectorTow.vue
index d9a9830..b2caa71 100644
--- a/components/districtSelector/districtSelectorTow.vue
+++ b/components/districtSelector/districtSelectorTow.vue
@@ -1,14 +1,30 @@
 <template>
   <view class="component">
     <view class="title">地区信息</view>
+    
     <u--form labelPosition="left" :model="formData" :rules="rules" ref="districtForm">
-      <u-form-item v-if="datas && datas.street" label="村社" :required="!readonly" prop="village" @click="changeCity()" borderBottom>
+      <u-form-item label="地址" :required="!readonly" prop="street" @click="changeCity('street')" borderBottom>
+        <u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
+      </u-form-item>
+      <u-form-item v-if="!formDataRead.street" label="乡镇" :required="!readonly" prop="street" @click="changeCity('street')" borderBottom>
+        <u--input :value="formDataText.street" disabled disabledColor="#fff" placeholder="请选择镇"></u--input>
+        <u-icon slot="right" name="arrow-right"></u-icon>
+      </u-form-item>
+      <u-form-item v-if="!formDataRead.village" label="村社" :required="!readonly" prop="village" @click="changeCity('village')" borderBottom>
         <u--input :value="formDataText.village" type="text" disabled disabledColor="#fff" placeholder="请选择村"></u--input>
         <u-icon slot="right" name="arrow-right"></u-icon>
       </u-form-item>
-      <u-form-item label="小队" :required="!readonly" prop="brigade" @click="changeCity('brigade')" borderBottom>
-        <u--input :value="formDataText.brigade" disabled disabledColor="#fff" placeholder="请选择小队"></u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
+      <u-form-item v-if="!formDataRead.brigade" label="小队" :required="!readonly" prop="brigade" borderBottom>
+        <u-checkbox-group 
+            placement="row"
+            @change="changeBrigade"
+            >
+        	<view class="box">
+            <view class="box_item" v-for="item in brigadeList" :key="item.id">
+              <u-checkbox style="checkbox" :customStyle="{marginBottom: '12px',marginRight: '12px'}" activeColor="#3175f9" :label="item.brigade_name" :name="item.id"></u-checkbox>
+            </view>
+          </view>
+        </u-checkbox-group>
       </u-form-item>
     </u--form>
     <u-picker :show="showProvince" :columns="[changeList()]" :keyName="changeType+'_name'" @confirm="confirm"
@@ -20,13 +36,13 @@
   import { commonProvince, commonCity, commonArea, commonStreet, commonVillage, commonBrigade } from "@/api/oaPbulic.js"
   import { Toast } from "../../libs/uniApi"
   export default {
-    name:"districtSelector",
-    props:{
+    name: "districtSelector",
+    props: {
       readonly: {
         type: Boolean,
         default: false
       },
-      datas:{
+      datas: {
         type: Object,
         default: null
       }
@@ -35,78 +51,150 @@
       return {
         showProvince: false,
         formData: {
+          province: '',
+          city: '',
+          area: '',
+          street: '',
           village: '',
           brigade: '',
         },
         formDataText: {
+          province: '',
+          city: '',
+          area: '',
+          street: '',
           village: '',
           brigade: '',
         },
-        rules:{
+        formDataRead: {
+          province: false,
+          city: false,
+          area: false,
+          street: false,
+          village: false,
+          brigade: false,
+        },
+        rules: {
+          street: {
+            required: true,
+            message: '不能为空',
+            trigger: ['change', 'blur']
+          },
           village: {
             required: true,
             message: '不能为空',
             trigger: ['change', 'blur']
           },
           brigade: {
-            validator: (rule, value, callback )=>{
-              value?callback():callback('不能为空')
+            validator: (rule, value, callback) => {
+              value ? callback() : callback('不能为空')
             },
             trigger: ['change', 'blur']
           },
         },
+        streetList: [],
         villageList: [],
         brigadeList: [],
         changeType: '', //当前选择的城市类型
       };
     },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formDataText.street = this.$props.datas.street_name;
+          this.formDataText.village = this.$props.datas.village_name;
+          this.formDataText.brigade = this.$props.datas.brigade_name;
+
+          this.formData.street = this.$props.datas.street_id;
+          this.formData.village = this.$props.datas.village_id;
+          this.formData.brigade = this.$props.datas.brigade_id;
+        }
+      }
+    },
     created() {
-      if(!this.$props.readonly) {
+      if (!this.$props.readonly) {
         this.initProvinceAndCity();
-      }else{
+      } else {
         this.rules = {};
       }
     },
-    methods:{
-      async validate(){
+    computed:{
+    	nowAddress(){
+    		let address = this.$store.state.app.userInfo;
+        let str = '';
+        address.province_name?str+=address.province_name:null;
+        address.city_name?str+=address.city_name:null;
+        address.area_name?str+=address.area_name:null;
+        address.street_name?str+=address.street_name:null;
+        address.village_name?str+=address.village_name:null;
+    		return str;
+    	}
+    },
+    methods: {
+      async validate() {
         return await this.$refs.districtForm.validate();
       },
       // 初始化
       async initProvinceAndCity() {
-        if(this.$store.state.app.userInfo.village)this.loadBrigade(this.$store.state.app.userInfo.village);
-        else if(this.$store.state.app.userInfo?.street)this.loadVillage(this.$store.state.app.userInfo.street);
+        let user = this.$store.state.app.userInfo;
+        Object.keys(this.formData).forEach(key => {
+          this.formData[key] = user[key];
+          this.formDataText[key] = user[key + '_name'];
+          if (user[key]&&key!='brigade') {
+            this.formDataRead[key] = true;
+            // 获取选择的列表
+            switch (key) {
+              case 'street':
+                this.loadVillage(this.formData['street']);
+                break;
+              case 'village':
+                this.loadBrigade(this.formData['village']);
+                break;
+            }
+          }
+        })
       },
       // 选择城市
       changeCity(type) {
-        if(this.$props.readonly)return ;
-        if (type&&this[type + 'List'].length == 0) return Toast('请先选择上一级地区');
+        if (this.$props.readonly) return;
+        if (this[type + 'List'].length == 0) return Toast('请先选择上一级地区');
         this.changeType = type;
         this.showProvince = true;
       },
+      // 多选小队
+      changeBrigade(e){
+        this.formData.brigade = e;
+      },
       // 选择列表
       changeList() {
         return this[this.changeType + 'List'];
       },
       // 选中城市
       confirm(e) {
-        let flag = false;//清空所选标记
-        if(this.formData[this.changeType] != e.value[0][this.changeType + '_code'])flag = true;
+        let flag = false; //清空所选标记
+        if (this.formData[this.changeType] != e.value[0][this.changeType + '_code']) flag = true;
         if (this.changeType == 'brigade') {
           this.formData.brigade = e.value[0].id;
           this.formDataText.brigade = e.value[0].brigade_name;
           this.showProvince = false;
-          return ;
+          return;
         }
         this.formData[this.changeType] = e.value[0][this.changeType + '_code'];
         this.formDataText[this.changeType] = e.value[0][this.changeType + '_name'];
+        // 加载下一级城市信息
+        switch (this.changeType) {
+          case 'area':
+            this.loadStreet(this.formData['area']);
+            break;
+          case 'street':
+            this.loadVillage(this.formData['street']);
+            break;
+          case 'village':
+            this.loadBrigade(this.formData['village']);
+            break;
+        }
         // 清空之前所选信息
-        if(flag) switch (this.changeType) {
-          case 'province':
-            this.formData.city = '';
-            this.formDataText.city = ''
-          case 'city':
-            this.formData.area = '';
-            this.formDataText.area = ''
+        if (flag) switch (this.changeType) {
           case 'area':
             this.formData.street = '';
             this.formDataText.street = ''
@@ -119,6 +207,13 @@
         }
         this.showProvince = false;
       },
+      loadStreet(code) {
+        commonStreet({
+          street: code
+        }).then(res => {
+          this.streetList = res.data;
+        })
+      },
       loadVillage(code) {
         commonVillage({
           village: code
@@ -138,20 +233,30 @@
 </script>
 
 <style lang="scss">
-.component{
-  .title {
-    font-weight: 500;
-    font-size: 34rpx;
-  
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
+  .component {
+    .title {
+      font-weight: 500;
+      font-size: 34rpx;
+
+      &::before {
+        width: 8rpx;
+        height: 26rpx;
+        border-radius: 4rpx;
+        background-color: #3175f9;
+        content: "";
+        display: inline-block;
+        margin-right: 8rpx;
+      }
+    }
+    // .checkbox{
+    //   margin: 28rpx;
+    // }
+    .box{
+      display: flex;
+      flex-wrap: wrap;
     }
   }
-}
+  .u-checkbox-group--row[data-v-2ef8bac9]{
+    flex: 1;
+  }
 </style>
\ No newline at end of file
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index dfd02b8..b309a53 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -46,7 +46,10 @@
                   分管片区:
                 </text>
                 <view class="item">
-                  <view class="location">{{ item.city_name+item.area_name+item.street_name }}</view>
+                  <view class="location">
+                    <text>{{ item.street_name+item.village_name }}</text>
+                    <text v-for="brigade in item.brigade_name">{{ brigade.brigade_name }}</text>
+                  </view>
                 </view>
               </view>
               <view class="company">
@@ -337,17 +340,18 @@
 
             text {
               margin-right: 30rpx;
+              flex-shrink: 0;
             }
 
             .itm {
               width: 320rpx;
-              white-space: nowrap;
-              /* 不换行 */
-              overflow: hidden;
-              /* 将超出文本隐藏 */
-              text-overflow: ellipsis;
-              /* 使用省略号表示被隐藏的文本 */
-              color: #000;
+              // white-space: nowrap;
+              // /* 不换行 */
+              // overflow: hidden;
+              // /* 将超出文本隐藏 */
+              // text-overflow: ellipsis;
+              // /* 使用省略号表示被隐藏的文本 */
+              // color: #000;
             }
           }
         }
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index 33965d1..f357b93 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -229,7 +229,14 @@
 	computed:{
 		nowAddress(){
 			let address = this.$store.state.app.userInfo;
-			return address.province_name+address.city_name+address.area_name+address.street_name+address.village_name+address.brigade_name;
+      let str = '';
+      address.province_name?str+=address.province_name:null;
+      address.city_name?str+=address.city_name:null;
+      address.area_name?str+=address.area_name:null;
+      address.street_name?str+=address.street_name:null;
+      address.village_name?str+=address.village_name:null;
+      address.brigade_name?str+=address.brigade_name:null;
+      return str;
 		}
 	},
     methods: {
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index ed2aa23..160fd90 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -103,23 +103,23 @@
     data() {
       return {
         formData: {
-          account: '', //账号
+          account: '17685151643', //账号
           password: '123456', //密码
           password_confirm: '', //确认密码
           // channel: 6, //注册渠道[1-微信小程序 2-微信公众号 3-手机H5 4-电脑PC 5-苹果APP 6-安卓APP]
-          id_card: '',
+          id_card: '522636199812121212',
           is_captain: '',// 队长标识
           sex: '',
-          avatar: '',
-          nickname: '',
+          avatar: 'sdgdgxgxfxxxfg',
+          nickname: 'dddd',
           address: '测试地址',
           qualification: {
-            id_card: "",
-            id_card_b: "",
-            car_card: "",
-            car_card_b: "",
-            bank_account: "",
-            bank_account_b: ""
+            id_card: "sdgsdgds",
+            id_card_b: "sdgdsgdsg",
+            car_card: "sdgsd",
+            car_card_b: "gsdgds",
+            bank_account: "sdgdsgsd",
+            bank_account_b: "sdgsdgdg"
           },
         },
         rules: {
@@ -228,7 +228,7 @@
               title: "添加成功",
               success: () => {
                 setTimeout(() => {
-                  uni.navigateBack()
+                  // uni.navigateBack()
                 }, 1000)
               }
             })

From f45c45a76cc004a9ddfe6ddd9d69cf822b7b399e Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 9 Aug 2023 16:07:24 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaTask/oaTask.vue                      |  4 +--
 subpkg/archives/archives.vue                 |  5 +++-
 subpkg/archivesDetail/archivesDetail.vue     |  9 +++++--
 subpkg/captain/captain.vue                   | 28 +++++++++++---------
 subpkg/newArchives/newArchives.vue           |  1 -
 subpkg/newPersonnel/newPersonnel.vue         | 24 ++++++++---------
 subpkg/personnel/personnel.vue               | 26 ++++++++++--------
 subpkg/personnelDetails/personnelDetails.vue |  3 ++-
 8 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index 3dd2e3c..1074f33 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="all_box">
-    <view class="task_list">
+    <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> -->
       <view v-for="item in list" :key="item.id">
         <task-item :datas="item"></task-item>
       </view>
-      <!-- <u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty> -->
     </view>
     <!-- <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
         :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 7b78060..844e82e 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -6,7 +6,10 @@
           <image class="avatar" src="../../static/img/public/record.png"></image>
           <view class="body">
             <view>姓名:<text class="name">{{item.name}}</text></view>
-            <view>片区:<text class="name">{{item.address}}</text></view>
+            <view>
+              片区:<text class="name">{{item.village_name}}</text>
+              <text class="name" style="margin-left: 0;" v-for="brigade_name in item.brigade_name">{{brigade_name.brigade_name}}</text>
+            </view>
             <view>电话:<text class="name">{{item.phone}}</text></view>
           </view>
         </view>
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index 2c843dd..2405f46 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -182,8 +182,13 @@
     computed: {
       nowAddress() {
         let address = this.$store.state.app.userInfo;
-        return address.province_name + address.city_name + address.area_name + address.street_name + address
-          .village_name + address.brigade_name;
+        let str = '';
+        address.province_name?str+=address.province_name:null;
+        address.city_name?str+=address.city_name:null;
+        address.area_name?str+=address.area_name:null;
+        address.street_name?str+=address.street_name:null;
+        address.village_name?str+=address.village_name:null;
+        return str;
       }
     },
     methods: {
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index b309a53..3391f11 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -47,16 +47,20 @@
                 </text>
                 <view class="item">
                   <view class="location">
-                    <text>{{ item.street_name+item.village_name }}</text>
+                    <text>{{ (item.street_name||'')+(item.village_name||'') }}</text>
                     <text v-for="brigade in item.brigade_name">{{ brigade.brigade_name }}</text>
                   </view>
                 </view>
               </view>
-              <view class="company">
-                <text>
+              <view class="info_bottom">
+                <text class="item phone">
                   所属公司:
                 </text>
-                <view class="itm" v-if="item.company">{{item.company.company_name}}</view>
+                <view class="item" v-if="item.company">
+                  <view class="location">
+                    {{item.company.company_name}}
+                  </view>
+                </view>
               </view>
             </view>
           </view>
@@ -316,7 +320,7 @@
 
             .item {
               display: flex;
-              align-items: center;
+              align-items: flex-start;
             }
 
             .phone {
@@ -325,12 +329,12 @@
 
             .location {
               width: 320rpx;
-              white-space: nowrap;
-              /* 不换行 */
-              overflow: hidden;
-              /* 将超出文本隐藏 */
-              text-overflow: ellipsis;
-              /* 使用省略号表示被隐藏的文本 */
+              // white-space: nowrap;
+              // /* 不换行 */
+              // overflow: hidden;
+              // /* 将超出文本隐藏 */
+              // text-overflow: ellipsis;
+              // /* 使用省略号表示被隐藏的文本 */
               color: #000;
             }
           }
@@ -351,7 +355,7 @@
               // /* 将超出文本隐藏 */
               // text-overflow: ellipsis;
               // /* 使用省略号表示被隐藏的文本 */
-              // color: #000;
+              color: #000;
             }
           }
         }
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index f357b93..6fb1662 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -235,7 +235,6 @@
       address.area_name?str+=address.area_name:null;
       address.street_name?str+=address.street_name:null;
       address.village_name?str+=address.village_name:null;
-      address.brigade_name?str+=address.brigade_name:null;
       return str;
 		}
 	},
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 160fd90..d600184 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -103,23 +103,23 @@
     data() {
       return {
         formData: {
-          account: '17685151643', //账号
+          account: '', //账号
           password: '123456', //密码
           password_confirm: '', //确认密码
           // channel: 6, //注册渠道[1-微信小程序 2-微信公众号 3-手机H5 4-电脑PC 5-苹果APP 6-安卓APP]
-          id_card: '522636199812121212',
+          id_card: '',
           is_captain: '',// 队长标识
           sex: '',
-          avatar: 'sdgdgxgxfxxxfg',
-          nickname: 'dddd',
-          address: '测试地址',
+          avatar: '',
+          nickname: '',
+          address: '',
           qualification: {
-            id_card: "sdgsdgds",
-            id_card_b: "sdgdsgdsg",
-            car_card: "sdgsd",
-            car_card_b: "gsdgds",
-            bank_account: "sdgdsgsd",
-            bank_account_b: "sdgsdgdg"
+            id_card: "",
+            id_card_b: "",
+            car_card: "",
+            car_card_b: "",
+            bank_account: "",
+            bank_account_b: ""
           },
         },
         rules: {
@@ -228,7 +228,7 @@
               title: "添加成功",
               success: () => {
                 setTimeout(() => {
-                  // uni.navigateBack()
+                  uni.navigateBack()
                 }, 1000)
               }
             })
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index eca2eb6..3b33aa6 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -23,14 +23,18 @@
                   分管片区:
                 </text>
                 <view class="item">
-                  <view class="location">{{ item.city_name+item.area_name+item.street_name }}</view>
+                  <view class="location">{{ (item.street_name||'')+(item.village_name||'') }}</view>
                 </view>
               </view>
-              <view class="company">
-                <text>
+              <view class="info_bottom">
+                <text class="item phone">
                   所属公司:
                 </text>
-                <view class="itm" v-if="item.company">{{item.company.company_name}}</view>
+                <view class="item" v-if="item.company">
+                  <view class="location">
+                    {{item.company.company_name}}
+                  </view>
+                </view>
               </view>
             </view>
           </view>
@@ -223,7 +227,7 @@
 
               .item {
                 display: flex;
-                align-items: center;
+                align-items: flex-start;
               }
 
               .phone {
@@ -232,12 +236,12 @@
 
               .location {
                 width: 350rpx;
-                white-space: nowrap;
-                /* 不换行 */
-                overflow: hidden;
-                /* 将超出文本隐藏 */
-                text-overflow: ellipsis;
-                /* 使用省略号表示被隐藏的文本 */
+                // white-space: nowrap;
+                // /* 不换行 */
+                // overflow: hidden;
+                // /* 将超出文本隐藏 */
+                // text-overflow: ellipsis;
+                // /* 使用省略号表示被隐藏的文本 */
                 color: #000;
               }
             }
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index dd9df62..93a577f 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -37,7 +37,8 @@
 						</view>
 					</view>
 					<view class="bottom">
-						负责区域:{{userInfo.street_name+(userInfo.village_name||'')+(userInfo.brigade_name||'')}}
+						负责区域:<text>{{userInfo.street_name+(userInfo.village_name||'')}}</text>
+            <text v-for="(item, index) in userInfo.brigade_name">{{item.brigade_name}}</text>
 					</view>
 					<u-popup :show="show" :round="10" mode="center">
 						<view class="popup">