拉取代码

manifest.json

@@ -123,9 +123,9 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.3.108", //请求的目标域名
+                    // "target" : "http://192.168.3.108", //请求的目标域名
 
-                    // "target" : "http://192.168.4.163", //宋程玉本地
+                    "target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 }

pages.json

@@ -720,7 +720,15 @@
           "titleNView": false
         }
       }
-    }
+    },
+		{
+		  "path": "pages/searchFloor/searchFloor",
+		  "style": {
+		    "h5": {
+		      "titleNView": false
+		    }
+		  }
+		}
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",

pages/mypage/mypage.vue

@@ -3,7 +3,12 @@
     <view class="myTop">
 			<view class="topText">
 			  <view class="topTextHeader">
-			    <view class="text">您好,{{ userData.name }}</view>
+			    <view class="text">
+						<view>
+							您好,{{ userData.name }}
+						</view>
+						<view>{{userData.currentHospital.hosName}}</view>
+						</view>
 			  <!--  <button v-show="!userData.online" class="changeHospital" size="mini" type="default" @click="changeHospital">
 			      切换院区
 			    </button> -->
@@ -83,7 +88,13 @@
         </view>
       </view>
     </view>
-		<view class="page_item_btn" hover-class="seimin-btn-hover" @click="GoWork()">{{userData.online ? '我要下班':'我要上班'}}</view>
+		<view v-if="!userData.online" class="df-fl">
+			<view class="page_item_btn width-50" hover-class="seimin-btn-hover" @click="changeHospital">切换院区</view>
+			<view class="page_item_btn width-50" hover-class="seimin-btn-hover" @click="GoWork()">继续工作</view>
+		</view>
+		<view v-if="userData.online">
+			<view class="page_item_btn width-100" hover-class="seimin-btn-hover" @click="GoWork()">我要下班</view>
+		</view>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
@@ -171,6 +182,9 @@
             userData.user.currentHospital = result.user.user.currentHospital;
             uni.setStorageSync("userData", userData);
             this.tab("day", "今日");
+						setTimeout(_=>{
+							this.userData = uni.getStorageSync("userData").user;
+						})
           } else {
             uni.showToast({
               icon: "none",
@@ -527,6 +541,7 @@
   .mypage {
 		padding: 20rpx;
 		background: #F0F6ED;
+		position: relative;
     .charts {
       width: 625upx;
       height: 500upx;
@@ -574,6 +589,8 @@
       .topText {
         .topTextHeader {
 					.text{
+						display: flex;
+						justify-content: space-between;
 						font-size: 30rpx;
 						font-weight: bold;
 					}
@@ -617,6 +634,10 @@
       }
 
       .myCont_cont {
+				height: calc(100vh - 410rpx);
+				overflow-y: auto;
+				overflow-x: hidden;
+				margin-bottom: 20rpx;
         .myCont_cont_tab {
           height: 90rpx;
           line-height: 90rpx;
@@ -684,9 +705,6 @@
         .TB_list {
           width: 100%;
           text-align: left;
-					height: calc(100vh - 700rpx);
-					overflow-y: auto;
-					margin-bottom: 20rpx;
           view {
             height: 84rpx;
             line-height: 84rpx;
@@ -709,7 +727,12 @@
         }
       }
     }
+		.df-fl{
+			display: flex;
+			justify-content: space-between;
+		}
 		.page_item_btn {
+			// position: fixed;
 		  height: 88rpx;
 		  background-image: linear-gradient(to right, #72c172, #3bb197);
 		  border-radius: 8rpx;
@@ -719,5 +742,11 @@
 		  font-weight: 700;
 		  text-align: center;
 		}
+		.width-50{
+			width: 48%;
+		}
+		.width-100{
+			width: 100%;
+		}
   }
 </style>

pages/newDrug/detail.vue

@@ -10,19 +10,19 @@
 
     <view class="Scanning_cont">
       <view class="column head">
-				<view class="value2" v-if="queryObj.showPatientInfo==1">患者信息</view>
+				<!-- <view class="value2" v-if="queryObj.showPatientInfo==1">患者信息</view> -->
         <view class="value1">药品名称+规格<text class="red">（{{drugsList.length}}）</text></view>
         <view class="value2">数量</view>
       </view>
       <scroll-view scroll-y class="scrollContent">
         <view class="column" v-for="item in drugsList" :key="item.id">
-					<view class="value2" v-if="queryObj.showPatientInfo==1">
+					<!-- <view class="value2" v-if="queryObj.showPatientInfo==1">
 					  <view>
 							{{item.patientName }}<text v-if="item.bedNum">({{item.bedNum}})</text>
 							<view>{{item.residenceNo ? item.residenceNo : ''}}</view>
 						</view>
-					</view>
-          <view class="value1">{{item.drugsInfo}} {{item.model}}</view>
+					</view> -->
+          <view class="value1" @click="viewName(item)">{{item.drugsInfo}} {{item.model}}</view>
           <view class="value2">{{item.drugsNum}}</view>
         </view>
       </scroll-view>
@@ -33,6 +33,22 @@
         <view class="btn" @click="goBack()">返回</view>
       </view>
     </view>
+		
+		<!-- 查看患者 -->
+		<view class="showModel" v-if="infoModel">
+			<view class="showModel__wrap">
+				<view class="showModel__header">
+				  患者信息
+				</view>
+				<view class="content">
+					<view>{{itemData.patientNames}}</view>
+				</view>
+				<view class="bottom">
+					<button class="bottom-btn confirm-btn" @click="infoModel = false">知道了</button>
+				</view>
+			</view>
+		</view>
+		
   </view>
 </template>
 <script>
@@ -50,9 +66,19 @@
         queryObj: {}, //路由传递过来的数据
         drugsBag: {}, //药包信息
         config: {}, //配置
+				infoModel:false,
+				itemData:{}
       };
     },
     methods: {
+			// 查看患者
+			viewName(item){
+				console.log(222,this.queryObj)
+				if(this.queryObj.showPatientInfo==1){
+					this.itemData = item
+					this.infoModel = true
+				}
+			},
       // 返回
       goBack(){
         uni.navigateBack()
@@ -225,4 +251,61 @@
       }
     }
   }
+	
+	.showModel {
+	  position: fixed;
+	  left: 0;
+	  right: 0;
+	  top: 0;
+	  bottom: 0;
+	  background-color: rgba(0, 0, 0, 0.2);
+	  z-index: 99;
+	
+	  .showModel__wrap {
+	    width: 90%;
+	    position: absolute;
+	    left: 50%;
+	    top: 50%;
+	    transform: translate(-50%, -50%);
+	    background-color: #fff;
+	    border-radius: 12rpx;
+	
+	    .showModel__header {
+	      font-size: 36rpx;
+	      color: #000;
+				font-weight: bold;
+	      height: 84rpx;
+	      display: flex;
+	      justify-content: center;
+	      align-items: center;
+	    }
+			.content{
+				background: #fff;
+				text-align: center;
+				padding: 20rpx 0;
+			}
+			.bottom{
+				border-top: 1px solid #ccc;
+				display: flex;
+				uni-button{
+					background: #fff !important;
+				}
+				uni-button:after{
+					border: none !important;
+				}
+				.bottom-btn{
+					color: #A8A8A8;
+					font-size: 30rpx;
+					padding: 10rpx 0;
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+				.confirm-btn{
+					color: #5DAC6B;
+				}
+			}
+	  }
+	}
 </style>

pages/newDrug/list.vue

@@ -9,8 +9,7 @@
           </view>
           <view class="body">
             <view class="bodyColumn" v-if="queryObj.showPatientInfo==1">
-              <view class="name">姓名(床号)：{{item.patientName ? item.patientName : ''}} <text v-if="item.bedNum">({{item.bedNum}})</text></view>
-              <view class="value">住院号：{{item.residenceNo ? item.residenceNo : ''}}</view>
+              <view class="name">姓名：{{item.patientNames ? item.patientNames : ''}}</view>
             </view>
 						<view class="bodyColumn">
 						  <view class="name">种类数：{{item.drugsTypeCount}}</view>
@@ -55,7 +54,7 @@
       // 详情
       toDetail(drugsBagId){
         uni.navigateTo({
-          url: `/pages/newDrug/detail?drugsBagType=${this.queryObj.drugsBagType}&drugsBagId=${drugsBagId}`,
+          url: `/pages/newDrug/detail?drugsBagType=${this.queryObj.drugsBagType}&drugsBagId=${drugsBagId}&showPatientInfo=${this.queryObj.showPatientInfo}`,
         });
       },
       //获取页面信息

pages/receiptpage/receiptpage.vue

@@ -50,7 +50,7 @@
                   </image>
                   {{ item.emergencyType.name }}</text>
                 </view>
-                <view class="page_item_top_R type" :style="{color: item.taskTypeConfig.renderColors?item.taskTypeConfig.renderColors:'#333'}" style="margin-left: 16rpx;">
+                <view class="page_item_top_R type" :style="{color: item.taskType?item.taskType.renderColors:'#333'}" style="margin-left: 16rpx;">
                   {{ item.taskType.taskName }}<template v-if="item.goodsRemark">-{{item.goodsRemark}}</template>
                 </view>
                 <!-- <text class="L_time" v-if="item.overdueTime">{{ item.overdueTime }}前送达</text> -->
@@ -667,7 +667,8 @@
 				  idx: 0,
 				  sum: 9999,
 					taskType:{
-						hosIds:this.hosId
+						hosIds:this.hosId,
+						simpleQuery: true
 					}
 				};
 				
@@ -676,7 +677,6 @@
 							this.taskTypeList = res.list
 							console.log(444,this.taskTypeList)
 				    }
-						this.initList();
 				  });
 			},
 			confirmKey(data){
@@ -2699,24 +2699,21 @@
           if (res.status == 200) {
             this.triggered = false;
             this.freshing = true;
-            this.totalNum = res.data.resultCount;
-            res.data.data = res.data.data || [];
-            res.data.data.forEach(v => {
-							// for(let i of this.taskTypeList){
-							// 	if(i.associationType.id == v.taskType.associationType.id){
-							// 		v.colorStyle = i.renderColors
-							// 	}
-							// }
-							v.taskTypeConfig = this.taskTypeList.find(i=>i.associationType.id == v.taskType.associationType.id)
-							v.clinicalTaskIdsFlag = this.clinicalTaskIds.includes(v.taskType.id.toString());
-            })
-            if (idx === 0) {
-              this.zxzData = res.data.data;
-            } else {
-              this.zxzData.push(...res.data.data);
-            }
-						console.log(4444,res.data.data)
-            this.tabs[1].num = res.data.resultCount;
+						if(res.data){
+							this.totalNum = res.data.resultCount;
+							res.data.data = res.data.data || [];
+							res.data.data.forEach(v => {
+								v.taskTypeConfig = this.taskTypeList.find(i=>i.id == v.taskType.id)
+								v.clinicalTaskIdsFlag = this.clinicalTaskIds.includes(v.taskType.id.toString());
+							})
+							if (idx === 0) {
+							  this.zxzData = res.data.data;
+							} else {
+							  this.zxzData.push(...res.data.data);
+							}
+							console.log(4444,res.data.data)
+							this.tabs[1].num = res.data.resultCount;
+						}
           } else {
             uni.showToast({
               icon: "none",
@@ -2761,13 +2758,20 @@
           if (res.status == 200) {
             this.triggered = false;
             this.freshing = true;
-            this.totalNum = res.data.resultCount;
-            if (idx === 0) {
-              this.zxzData = res.data.data;
-            } else {
-              this.zxzData.push(...res.data.data);
-            }
-            this.tabs[0].num = res.data.resultCount;
+						if(res.data){
+							this.totalNum = res.data.resultCount;
+							res.data.data.forEach(v => {
+								v.taskTypeConfig = this.taskTypeList.find(i=>i.id == v.taskType.id)
+								v.clinicalTaskIdsFlag = this.clinicalTaskIds.includes(v.taskType.id.toString());
+							})
+							if (idx === 0) {
+							  this.zxzData = res.data.data;
+							} else {
+							  this.zxzData.push(...res.data.data);
+							}
+							this.tabs[0].num = res.data.resultCount;
+						}
+						
           } else {
             uni.showToast({
               icon: "none",
@@ -2832,7 +2836,7 @@
         }
         post("/workerOrder/executingOrders", data).then((res) => {
           if (res.status == 200) {
-            this.tabs[1].num = res.data.resultCount;
+            this.tabs[1].num = res.data ? res.data.resultCount : 0;
           } else {
             uni.showToast({
               icon: "none",
@@ -2849,7 +2853,7 @@
         };
         post("/workerOrder/waitingOrders", data).then((res) => {
           if (res.status == 200) {
-            this.tabs[0].num = res.data.resultCount;
+            this.tabs[0].num = res.data ? res.data.resultCount : 0;
           } else {
             uni.showToast({
               icon: "none",
@@ -2957,7 +2961,8 @@
       // });
       // #endif
       this.selectedLabelSlots = "执行中";
-			this.getTaskType();
+			// this.getTaskType();
+			this.initList();
       this.getConfig();
       // 科室二维码切换科室回显
       if (options.showDepartmentQrcodeId && options.showDepartmentQrcodeDept) {
@@ -3387,7 +3392,7 @@
 
                 &.type {
                   margin-right: 32rpx;
-                  color: red;
+                  // color: red;
                   max-width: 260rpx;
                   white-space: nowrap;
                   text-overflow: ellipsis;

pages/searchFloor/searchFloor.vue

@@ -0,0 +1,459 @@
+<template>
+  <view class="content">
+		<view class="df-fl">
+			<view class="df-all">
+				<checkbox-group @change="allCheckChange">
+					<checkbox value="all" color="#42b983" :checked="allCheck"/>
+					<text class="text">全选</text>
+				</checkbox-group>
+			</view>
+			<view class="title">{{name}}</view>
+		</view>
+    <view class="search-keyword">
+      <scroll-view class="keyword-list-box" scroll-y>
+				<checkbox-group @change="checkboxChange">
+					<view v-for="(row, index) in dataList" :key="index" class="view-box">
+							<checkbox class="top-check1" color="#42b983" :value="row.floor.id + 'parent'" :checked="row.checked" />
+							<uni-collapse ref="collapse" v-model="row.floor.collapseValue">
+								<uni-collapse-item :title="row.floor.floorName + '楼'">
+									<view v-for="(item, index) in row.children" :key="item.id">
+										<view class="keyword-entry">
+											<view class="keyword-text">
+												<checkbox class="top-check2" color="#42b983" :value="item.id" :checked="item.checked" />
+												<view class="title-2">{{item.dept}}</view>
+											</view>
+										</view>
+									</view>
+								</uni-collapse-item>
+							</uni-collapse>
+					</view>
+				</checkbox-group>
+      </scroll-view>
+    </view>
+    <view class="toolbar">
+      <view class="back" @click="back()">返回</view>
+			<view class="confirm" @click="confirm()">确定</view>
+    </view>
+    <!-- 弹窗 -->
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content" @know="know" :operate="models.operate"></showModel>
+  </view>
+</template>
+
+<script>
+  import {
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        type: "", //进入该页面的类型
+        configName: "", //快速组合名称
+        id: "", //快速组合id
+				name:"",
+        changedept: 0, //是否从列表过来的切换负责科室
+        hosId: "",
+        dataList: [],
+        //系统设置的科室类型
+        sysDeptType: 0,
+        quickCombinationDeptType: 0,
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
+				valueColl:false,
+				allCheck:false,
+				buildIds:[],
+				ids:[]
+      };
+    },
+    onLoad(options) {
+      this.hosId = uni.getStorageSync("userData").user.currentHospital.id;
+      console.log(options, 'options');
+			this.name = options.name
+			this.id = options.id;
+			this.configName = options.configName;
+			this.changedept = options.changedept;
+      this.getBuildings();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+		onShow(){
+			this.getBuildings();
+		},
+    methods: {
+			// 全选
+			allCheckChange(e){
+				if(e.detail.value.length>0){
+					this.dataList.forEach((item, index)=>{
+						item.checked = true
+						if(item.children && item.children.length>0){
+							for(let i of item.children){
+								i.checked = true
+								this.buildIds.push(i)
+							}
+						}
+					})
+				}else{
+					this.dataList.forEach((item, index)=>{
+						item.checked = false
+						if(item.children && item.children.length>0){
+							for(let i of item.children){
+								i.checked = false
+								this.buildIds = []
+							}
+						}
+					})
+				}
+				// this.buildIds = this.buildIds.filter(v => v.indexOf('parent')==-1);
+				console.log(888,this.buildIds)
+			},
+      //知道了
+      know() {
+        this.models.disjunctor = false;
+      },
+			back(){
+				uni.navigateBack({
+					delta: 1,
+				})
+			},
+      // 确认
+      confirm() {
+        // const dataList = this.buildIds.filter(v => v.indexOf('parent')==-1);
+        console.log(3333,this.buildIds);
+				if (this.buildIds.length === 0) {
+          this.models = {
+            disjunctor: true,
+            title: "提示",
+            content: "请选择至少一个楼层",
+            icon: "warn",
+            operate: {
+              know: "知道了",
+            },
+          };
+        } else {
+					uni.setStorageSync("setDepts", this.buildIds)
+          uni.navigateTo({
+            url: `../setDept/setDept?configName=${this.configName}&id=${this.id}&changedept=${this.changedept}`,
+          });
+        }
+      },
+			// 选择楼栋
+			itemClick(item){
+				console.log(3333,item)
+			},
+			changeColl(){
+				
+			},
+      // 选择楼栋
+      checkboxChange: function(e) {
+				// this.buildIds = e.detail.value
+				this.buildIds = []
+				// for (let i of dataList){
+				// 	for(let item of i.children){
+				// 		for(let x of e.detail.value){
+				// 			if(x == item.id){
+				// 				this.buildIds.push(i)
+				// 			}else{
+								
+				// 			}
+				// 		}
+				// 	}
+				// }
+				
+				if(e.detail.value.length>0){
+					this.dataList.forEach((item, index)=>{
+						if(item.children && item.children.length>0){
+							for(let i of item.children){
+								if(e.detail.value.includes(i.id)){
+									this.buildIds.push(i)
+								}
+							}
+						}
+					})
+				}
+				console.log(888,this.buildIds)
+     //    var dataList = this.dataList,
+     //        values = e.detail.value;
+     //    for (let i of dataList) {
+					// for(let item of i.children){
+					// 	if (values.includes(item.id)) {
+					// 	  this.$set(item, 'checked', true)
+					// 	} else {
+					// 	  this.$set(item, 'checked', false)
+					// 	}
+					// }
+     //    }
+      },
+      //获取楼栋列表
+      getBuildings() {
+				let data = uni.getStorageSync("floorList")
+				data.forEach((item, index)=>{
+					item.floor.collapseValue = []
+					item.floor.id = item.floor.id.toString()
+					item.floor.checked = false
+					if(item.children && item.children.length>0){
+						for(let i of item.children){
+							i.checked = false
+							i.id = i.id.toString()
+						}
+					}
+       })
+			 console.log(3232131,data)
+       this.dataList = data || [];
+      }
+    },
+  };
+</script>
+<style>
+	uni-checkbox-group{
+	/* 	display: flex;
+		align-items: center;
+		position: relative; */
+	}
+	/deep/ .uni-collapse-item__title-box{
+		margin-left: 50rpx
+	}
+</style>
+<style scoped lang="less">
+  view {
+    display: block;
+  }
+	.df-fl{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+	}
+	.df-all{
+		position: absolute;
+		left: 16rpx;
+		.text{
+			margin-left: 8rpx;
+		}
+	}
+	.view-box{
+		position: relative;
+	}
+	.top-check1{
+		position: absolute;
+		left: 0;
+		top: 20rpx;
+		z-index: 999;
+	}
+	.top-check2{
+		position: absolute;
+		left: 0;
+		top: 20rpx;
+		z-index: 999;
+	}
+	.title{
+		padding: 30rpx;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+  // 底部
+  .toolbar {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 30rpx;
+		width: 96%;
+		margin-left: 2%;
+    z-index: 9999;
+    height: 88rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+		color: #fff;
+		
+		.back{
+			width: 48%;
+			height: 88rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			box-sizing: border-box;
+			border-radius: 10rpx;
+			background-color: #8F939C;
+		}
+		.confirm{
+			width: 46%;
+			height: 88rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			box-sizing: border-box;
+			border-radius: 10rpx;
+			background-color: #49B856;
+		}
+  }
+
+  .search-box {
+    width: 95%;
+    background-color: rgb(242, 242, 242);
+    padding: 15upx 2.5%;
+    display: flex;
+    justify-content: space-between;
+    position: sticky;
+    top: 0;
+  }
+
+  .search-box .mSearch-input-box {
+    width: 100%;
+  }
+
+  .search-box .input-box {
+    width: 85%;
+    flex-shrink: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .search-box .search-btn {
+    width: 15%;
+    margin: 0 0 0 2%;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    flex-shrink: 0;
+    font-size: 28upx;
+    color: #fff;
+    background: linear-gradient(to right, #ff9801, #ff570a);
+    border-radius: 60upx;
+  }
+
+  .search-box .input-box>input {
+    width: 100%;
+    height: 60upx;
+    font-size: 32upx;
+    border: 0;
+    border-radius: 60upx;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    padding: 0 3%;
+    margin: 0;
+    background-color: #ffffff;
+  }
+
+  .placeholder-class {
+    color: #9e9e9e;
+  }
+
+  .search-keyword {
+    width: 100%;
+    background-color: rgb(242, 242, 242);
+  }
+
+  .keyword-list-box {
+    height: calc(100vh - 230rpx);
+    padding-top: 10upx;
+		// padding: 0 20rpx;
+    border-radius: 20upx 20upx 0 0;
+    background-color: #fff;
+		width: 96%;
+		padding-left: 2%;
+  }
+
+  .keyword-entry-tap {
+    background-color: #eee;
+  }
+
+  .keyword-entry {
+    width: 94%;
+    height: 80rpx;
+    margin: 0 3%;
+    font-size: 30rpx;
+    color: #333;
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    border-bottom: solid 1rpx #DEDEDE;
+  }
+
+  .keyword-entry image {
+    width: 60upx;
+    height: 60upx;
+  }
+
+  .keyword-entry .keyword-text,
+  .keyword-entry .keyword-img {
+    height: 80upx;
+    display: flex;
+    align-items: center;
+		position: relative;
+  }
+	
+	.title-2{
+		padding-left: 76rpx;
+	}
+	
+  .keyword-entry .keyword-text {
+    // width: 90%;
+  }
+
+  .keyword-entry .keyword-img {
+    width: 10%;
+    justify-content: center;
+  }
+
+  .keyword-box {
+    height: calc(100vh - 110upx);
+    border-radius: 20upx 20upx 0 0;
+    background-color: #fff;
+  }
+
+  .keyword-box .keyword-block {
+    padding: 10upx 0;
+  }
+
+  .keyword-box .keyword-block .keyword-list-header {
+    width: 94%;
+    padding: 10upx 3%;
+    font-size: 27upx;
+    color: #333;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .keyword-box .keyword-block .keyword-list-header image {
+    width: 40upx;
+    height: 40upx;
+  }
+
+  .keyword-box .keyword-block .keyword {
+    width: 94%;
+    padding: 3px 3%;
+    display: flex;
+    flex-flow: wrap;
+    justify-content: flex-start;
+  }
+
+  .keyword-box .keyword-block .hide-hot-tis {
+    display: flex;
+    justify-content: center;
+    font-size: 28upx;
+    color: #6b6b6b;
+  }
+
+  .keyword-box .keyword-block .keyword>view {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 60upx;
+    padding: 0 20upx;
+    margin: 10upx 20upx 10upx 0;
+    height: 60upx;
+    font-size: 28upx;
+    background-color: rgb(242, 242, 242);
+    color: #6b6b6b;
+  }
+</style>

pages/searchMuti/searchMuti.vue

@@ -1,8 +1,9 @@
 <template>
   <view class="content">
+		<view class="title">请选择楼栋</view>
     <view class="search-keyword">
       <scroll-view class="keyword-list-box" scroll-y>
-        <checkbox-group @change="checkboxChange">
+        <!-- <checkbox-group @change="checkboxChange">
           <label v-for="(row, index) in dataList" :key="row.id">
             <view class="keyword-entry" hover-class="keyword-entry-tap">
               <view class="keyword-text">
@@ -14,11 +15,18 @@
               </view>
             </view>
           </label>
-        </checkbox-group>
+        </checkbox-group> -->
+				<label v-for="(row, index) in dataList" :key="row.id" @click="itemClick(row)">
+				  <view class="keyword-entry" hover-class="keyword-entry-tap">
+				    <view class="keyword-text">
+				      {{row.buildingName}}
+				    </view>
+				  </view>
+				</label>
       </scroll-view>
     </view>
     <view class="toolbar" @click="determine()" hover-class="seimin-btn-hover">
-      <text class="toolbar-sao">确定</text>
+      返回
     </view>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content" @know="know" :operate="models.operate"></showModel>
@@ -103,72 +111,118 @@
       },
       // 确认
       determine() {
-        console.log(this.dataList);
-        const dataList = this.dataList.filter(v => v.checked);
-        if (dataList.length === 0) {
-          this.models = {
-            disjunctor: true,
-            title: "提示",
-            content: "请选择至少一个楼栋",
-            icon: "warn",
-            operate: {
-              know: "知道了",
-            },
-          };
-        } else {
-          let postData = {
-            "idx": 0,
-            "sum": 9999,
-            department: {
-              buildIds: dataList.map(v => v.id).toString()
-            }
-          }
+				uni.navigateBack({
+					delta: 1,
+				})
+				return
+       //  console.log(this.dataList);
+       //  const dataList = this.dataList.filter(v => v.checked);
+       //  if (dataList.length === 0) {
+       //    this.models = {
+       //      disjunctor: true,
+       //      title: "提示",
+       //      content: "请选择至少一个楼栋",
+       //      icon: "warn",
+       //      operate: {
+       //        know: "知道了",
+       //      },
+       //    };
+       //  } else {
+       //    let postData = {
+       //      "idx": 0,
+       //      "sum": 9999,
+       //      department: {
+       //        buildIds: dataList.map(v => v.id).toString(),
+							// groupByFloor: true
+       //      }
+       //    }
           
-          if(this.quickCombinationDeptType){
-            postData.department.deptTypeIds = this.quickCombinationDeptType;
-          } else if (this.sysDeptType === 0) {
-            return;
-          } else {
-            postData.department.type = {
-              id: this.sysDeptType
-            }
-          }
+       //    if(this.quickCombinationDeptType){
+       //      postData.department.deptTypeIds = this.quickCombinationDeptType;
+       //    } else if (this.sysDeptType === 0) {
+       //      return;
+       //    } else {
+       //      postData.department.type = {
+       //        id: this.sysDeptType
+       //      }
+       //    }
           
-          uni.showLoading({
-            title: "加载中",
-          });
-          post("/data/fetchDataList/department", postData).then((res) => {
-            uni.hideLoading();
-            if (res.status == 200) {
-              let obj = uni.getStorageSync("setDepts");
-              console.log(res.list,obj)
-              if (obj) {
-                let list = [...res.list, ...obj];
-                let newArr = [];
-                let obj1 = {};
-                for (let i = 0; i < list.length; i++) {
-                  if (!obj1[list[i].id]) {
-                    newArr.push(list[i]);
-                    obj1[list[i].id] = true;
-                  }
-                }
-                console.log(newArr);
-                uni.setStorageSync("setDepts", newArr);
-              } else {
-                uni.setStorageSync("setDepts", res.list);
-              }
-              uni.navigateTo({
-                url: `../setDept/setDept?configName=${this.configName}&id=${this.id}&changedept=${this.changedept}`,//不知道
-              });
-            } else {
-              uni.showToast({
-                icon: "none",
-                title: res.msg || "接口获取数据失败！",
-              });
-            }
-          })
-        }
+       //    uni.showLoading({
+       //      title: "加载中",
+       //    });
+       //    post("/data/fetchDataList/department", postData).then((res) => {
+       //      uni.hideLoading();
+       //      if (res.status == 200) {
+       //        let obj = uni.getStorageSync("setDepts");
+       //        console.log(res.otherData,obj)
+       //        if (obj) {
+       //          let list = [...res.otherData, ...obj];
+       //          let newArr = [];
+       //          let obj1 = {};
+       //          for (let i = 0; i < list.length; i++) {
+       //            if (!obj1[list[i].id]) {
+       //              newArr.push(list[i]);
+       //              obj1[list[i].id] = true;
+       //            }
+       //          }
+       //          console.log(newArr);
+       //          uni.setStorageSync("setDepts", newArr);
+       //        } else {
+       //          uni.setStorageSync("setDepts", res.otherData);
+       //        }
+       //        uni.navigateTo({
+       //          url: `../setDept/setDept?configName=${this.configName}&id=${this.id}&changedept=${this.changedept}`,//不知道
+       //        });
+       //      } else {
+       //        uni.showToast({
+       //          icon: "none",
+       //          title: res.msg || "接口获取数据失败！",
+       //        });
+       //      }
+       //    })
+       //  }
       },
+			// 选择楼栋
+			itemClick(item){
+				console.log(3333,item)
+				let postData = {
+				  "idx": 0,
+				  "sum": 9999,
+				  department: {
+				    buildIds: item.id,
+						groupByFloor: true
+				  }
+				}
+				
+				if(this.quickCombinationDeptType){
+				  postData.department.deptTypeIds = this.quickCombinationDeptType;
+				} else if (this.sysDeptType === 0) {
+				  return;
+				} else {
+				  postData.department.type = {
+				    id: this.sysDeptType
+				  }
+				}
+				
+				uni.showLoading({
+				  title: "加载中",
+				});
+				post("/data/fetchDataList/department", postData).then((res) => {
+				  uni.hideLoading();
+				  if (res.status == 200) {
+						console.log(2222,res.list)
+				    uni.setStorageSync("floorList", res.list)
+						uni.navigateTo({
+						  url: `../searchFloor/searchFloor?name=${item.buildingName}&configName=${this.configName}&id=${this.id}&changedept=${this.changedept}`
+						});
+				  } else {
+				    uni.showToast({
+				      icon: "none",
+				      title: res.msg || "接口获取数据失败！",
+				    });
+				  }
+				})
+			},
       // 选择楼栋
       checkboxChange: function(e) {
         var dataList = this.dataList,
@@ -234,26 +288,29 @@
   view {
     display: block;
   }
+	.title{
+		padding: 30rpx;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
   // 底部
   .toolbar {
     position: fixed;
     left: 0;
     right: 0;
-    bottom: 0;
+    bottom: 30rpx;
+		width: 96%;
+		margin-left: 2%;
     z-index: 9999;
     height: 88rpx;
     display: flex;
     justify-content: center;
     align-items: center;
     box-sizing: border-box;
-    border-radius: 4rpx;
-    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.24);
-    background-color: #e5e9ed;
-  
-    .toolbar-sao {
-      font-size: 36rpx;
-      color: #49b856;
-    }
+    border-radius: 10rpx;
+    background-color: #8F939C;
+		color: #fff;
   }
 
   .search-box {
@@ -315,7 +372,7 @@
   }
 
   .keyword-list-box {
-    height: calc(100vh - 110upx);
+    height: calc(100vh - 230rpx);
     padding-top: 10upx;
     border-radius: 20upx 20upx 0 0;
     background-color: #fff;
@@ -327,14 +384,14 @@
 
   .keyword-entry {
     width: 94%;
-    height: 80upx;
+    height: 80rpx;
     margin: 0 3%;
-    font-size: 30upx;
+    font-size: 30rpx;
     color: #333;
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     align-items: center;
-    border-bottom: solid 1upx #e7e7e7;
+    border-bottom: solid 1rpx #DEDEDE;
   }
 
   .keyword-entry image {
@@ -350,7 +407,7 @@
   }
 
   .keyword-entry .keyword-text {
-    width: 90%;
+    // width: 90%;
   }
 
   .keyword-entry .keyword-img {

uni_modules/uni-collapse/changelog.md

@@ -0,0 +1,38 @@
+## 1.4.4（2024-03-20）
+- 修复 titleBorder类型修正
+## 1.4.3（2022-01-25）
+- 修复 初始化的时候 ，open 属性失效的bug
+## 1.4.2（2022-01-21）
+- 修复 微信小程序resize后组件收起的bug
+## 1.4.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.4.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-collapse](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+## 1.3.3（2021-08-17）
+- 优化 show-arrow 属性默认为true
+## 1.3.2（2021-08-17）
+- 新增 show-arrow 属性，控制是否显示右侧箭头
+## 1.3.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.3.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.2（2021-07-21）
+- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
+## 1.2.1（2021-07-21）
+- 优化 组件示例
+## 1.2.0（2021-07-21）
+- 新增 组件折叠动画
+- 新增 value\v-model 属性 ，动态修改面板折叠状态
+- 新增 title 插槽 ，可定义面板标题
+- 新增 border 属性 ，显示隐藏面板内容分隔线
+- 新增 title-border 属性 ，显示隐藏面板标题分隔线
+- 修复 resize 方法失效的Bug
+- 修复 change 事件返回参数不正确的Bug
+- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.1.5（2021-02-05）
+- 调整为uni_modules目录规范

uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue

@@ -0,0 +1,402 @@
+<template>
+	<view class="uni-collapse-item">
+		<!-- onClick(!isOpen) -->
+		<view @click="onClick(!isOpen)" class="uni-collapse-item__title"
+			:class="{'is-open':isOpen &&titleBorder === 'auto' ,'uni-collapse-item-border':titleBorder !== 'none'}">
+			<view class="uni-collapse-item__title-wrap">
+				<slot name="title">
+					<view class="uni-collapse-item__title-box" :class="{'is-disabled':disabled}">
+						<image v-if="thumb" :src="thumb" class="uni-collapse-item__title-img" />
+						<text class="uni-collapse-item__title-text">{{ title }}</text>
+					</view>
+				</slot>
+			</view>
+			<view v-if="showArrow"
+				:class="{ 'uni-collapse-item__title-arrow-active': isOpen, 'uni-collapse-item--animation': showAnimation === true }"
+				class="uni-collapse-item__title-arrow">
+				<uni-icons :color="disabled?'#ddd':'#bbb'" size="14" type="bottom" />
+			</view>
+		</view>
+		<view class="uni-collapse-item__wrap" :class="{'is--transition':showAnimation}"
+			:style="{height: (isOpen?height:0) +'px'}">
+			<view :id="elId" ref="collapse--hook" class="uni-collapse-item__wrap-content"
+				:class="{open:isheight,'uni-collapse-item--border':border&&isOpen}">
+				<slot></slot>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom')
+	// #endif
+	/**
+	 * CollapseItem 折叠面板子组件
+	 * @description 折叠面板子组件
+	 * @property {String} title 标题文字
+	 * @property {String} thumb 标题左侧缩略图
+	 * @property {String} name 唯一标志符
+	 * @property {Boolean} open = [true|false] 是否展开组件
+	 * @property {Boolean} titleBorder = [true|false] 是否显示标题分隔线
+	 * @property {String} border = ['auto'|'show'|'none'] 是否显示分隔线
+	 * @property {Boolean} disabled = [true|false] 是否展开面板
+	 * @property {Boolean} showAnimation = [true|false] 开启动画
+	 * @property {Boolean} showArrow = [true|false] 是否显示右侧箭头
+	 */
+	export default {
+		name: 'uniCollapseItem',
+		props: {
+			// 列表标题
+			title: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: [Number, String],
+				default: ''
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// #ifdef APP-PLUS
+			// 是否显示动画,app 端默认不开启动画，卡顿严重
+			showAnimation: {
+				type: Boolean,
+				default: false
+			},
+			// #endif
+			// #ifndef APP-PLUS
+			// 是否显示动画
+			showAnimation: {
+				type: Boolean,
+				default: true
+			},
+			// #endif
+			// 是否展开
+			open: {
+				type: Boolean,
+				default: false
+			},
+			// 缩略图
+			thumb: {
+				type: String,
+				default: ''
+			},
+			// 标题分隔线显示类型
+			titleBorder: {
+				type: String,
+				default: 'auto'
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			showArrow: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				isOpen: false,
+				isheight: null,
+				height: 0,
+				elId,
+				nameSync: 0
+			}
+		},
+		watch: {
+			open(val) {
+				this.isOpen = val
+				this.onClick(val, 'init')
+			}
+		},
+		updated(e) {
+			this.$nextTick(() => {
+				this.init(true)
+			})
+		},
+		created() {
+			this.collapse = this.getCollapse()
+			this.oldHeight = 0
+			this.onClick(this.open, 'init')
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+		mounted() {
+			if (!this.collapse) return
+			if (this.name !== '') {
+				this.nameSync = this.name
+			} else {
+				this.nameSync = this.collapse.childrens.length + ''
+			}
+			if (this.collapse.names.indexOf(this.nameSync) === -1) {
+				this.collapse.names.push(this.nameSync)
+			} else {
+				console.warn(`name 值 ${this.nameSync} 重复`);
+			}
+			if (this.collapse.childrens.indexOf(this) === -1) {
+				this.collapse.childrens.push(this)
+			}
+			this.init()
+		},
+		methods: {
+			init(type) {
+				// #ifndef APP-NVUE
+				this.getCollapseHeight(type)
+				// #endif
+				// #ifdef APP-NVUE
+				this.getNvueHwight(type)
+				// #endif
+			},
+			uninstall() {
+				if (this.collapse) {
+					this.collapse.childrens.forEach((item, index) => {
+						if (item === this) {
+							this.collapse.childrens.splice(index, 1)
+						}
+					})
+					this.collapse.names.forEach((item, index) => {
+						if (item === this.nameSync) {
+							this.collapse.names.splice(index, 1)
+						}
+					})
+				}
+			},
+			onClick(isOpen, type) {
+				if (this.disabled) return
+				this.isOpen = isOpen
+				if (this.isOpen && this.collapse) {
+					this.collapse.setAccordion(this)
+				}
+				if (type !== 'init') {
+					this.collapse.onChange(isOpen, this)
+				}
+			},
+			getCollapseHeight(type, index = 0) {
+				const views = uni.createSelectorQuery().in(this)
+				views
+					.select(`#${this.elId}`)
+					.fields({
+						size: true
+					}, data => {
+						// TODO 百度中可能获取不到节点信息 ，需要循环获取
+						if (index >= 10) return
+						if (!data) {
+							index++
+							this.getCollapseHeight(false, index)
+							return
+						}
+						// #ifdef APP-NVUE
+						this.height = data.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = data.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.isOpen, 'init')
+					})
+					.exec()
+			},
+			getNvueHwight(type) {
+				const result = dom.getComponentRect(this.$refs['collapse--hook'], option => {
+					if (option && option.result && option.size) {
+						// #ifdef APP-NVUE
+						this.height = option.size.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = option.size.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.open, 'init')
+					}
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getCollapse(name = 'uniCollapse') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-collapse-item {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+
+		/* #endif */
+		&__title {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			width: 100%;
+			box-sizing: border-box;
+			/* #endif */
+			flex-direction: row;
+			align-items: center;
+			transition: border-bottom-color .3s;
+
+			// transition-property: border-bottom-color;
+			// transition-duration: 5s;
+			&-wrap {
+				width: 100%;
+				flex: 1;
+
+			}
+
+			&-box {
+				padding: 0 15px;
+				/* #ifndef APP-NVUE */
+				display: flex;
+				width: 100%;
+				box-sizing: border-box;
+				/* #endif */
+				flex-direction: row;
+				justify-content: space-between;
+				align-items: center;
+				height: 48px;
+				line-height: 48px;
+				background-color: #fff;
+				color: #303133;
+				font-size: 13px;
+				font-weight: 500;
+				/* #ifdef H5 */
+				cursor: pointer;
+				outline: none;
+
+				/* #endif */
+				&.is-disabled {
+					.uni-collapse-item__title-text {
+						color: #999;
+					}
+				}
+
+			}
+
+			&.uni-collapse-item-border {
+				border-bottom: 1px solid #ebeef5;
+			}
+
+			&.is-open {
+				border-bottom-color: transparent;
+			}
+
+			&-img {
+				height: 22px;
+				width: 22px;
+				margin-right: 10px;
+			}
+
+			&-text {
+				flex: 1;
+				font-size: 14px;
+				/* #ifndef APP-NVUE */
+				white-space: nowrap;
+				color: inherit;
+				/* #endif */
+				/* #ifdef APP-NVUE */
+				lines: 1;
+				/* #endif */
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+
+			&-arrow {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				box-sizing: border-box;
+				/* #endif */
+				align-items: center;
+				justify-content: center;
+				width: 20px;
+				height: 20px;
+				margin-right: 10px;
+				transform: rotate(0deg);
+
+				&-active {
+					transform: rotate(-180deg);
+				}
+			}
+
+
+		}
+
+		&__wrap {
+			/* #ifndef APP-NVUE */
+			will-change: height;
+			box-sizing: border-box;
+			/* #endif */
+			background-color: #fff;
+			overflow: hidden;
+			position: relative;
+			height: 0;
+
+			&.is--transition {
+				// transition: all 0.3s;
+				transition-property: height, border-bottom-width;
+				transition-duration: 0.3s;
+				/* #ifndef APP-NVUE */
+				will-change: height;
+				/* #endif */
+			}
+
+
+
+			&-content {
+				position: absolute;
+				font-size: 13px;
+				color: #303133;
+				// transition: height 0.3s;
+				border-bottom-color: transparent;
+				border-bottom-style: solid;
+				border-bottom-width: 0;
+
+				&.uni-collapse-item--border {
+					border-bottom-width: 1px;
+					border-bottom-color: red;
+					border-bottom-color: #ebeef5;
+				}
+
+				&.open {
+					position: relative;
+				}
+			}
+		}
+
+		&--animation {
+			transition-property: transform;
+			transition-duration: 0.3s;
+			transition-timing-function: ease;
+		}
+
+	}
+</style>

uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue

@@ -0,0 +1,147 @@
+<template>
+	<view class="uni-collapse">
+		<slot />
+	</view>
+</template>
+<script>
+	/**
+	 * Collapse 折叠面板
+	 * @description 展示可以折叠 / 展开的内容区域
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=23
+	 * @property {String|Array} value 当前激活面板改变时触发(如果是手风琴模式，参数类型为string，否则为array)
+	 * @property {Boolean} accordion = [true|false] 是否开启手风琴效果是否开启手风琴效果
+	 * @event {Function} change 切换面板时触发，如果是手风琴模式，返回类型为string，否则为array
+	 */
+	export default {
+		name: 'uniCollapse',
+		emits:['change','activeItem','input','update:modelValue'],
+		props: {
+			value: {
+				type: [String, Array],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Array],
+				default: ''
+			},
+			accordion: {
+				// 是否开启手风琴效果
+				type: [Boolean, String],
+				default: false
+			},
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			// TODO 兼容 vue2 和 vue3
+			dataValue() {
+				let value = (typeof this.value === 'string' && this.value === '') ||
+					(Array.isArray(this.value) && this.value.length === 0)
+				let modelValue = (typeof this.modelValue === 'string' && this.modelValue === '') ||
+					(Array.isArray(this.modelValue) && this.modelValue.length === 0)
+				if (value) {
+					return this.modelValue
+				}
+				if (modelValue) {
+					return this.value
+				}
+
+				return this.value
+			}
+		},
+		watch: {
+			dataValue(val) {
+				this.setOpen(val)
+			}
+		},
+		created() {
+			this.childrens = []
+			this.names = []
+		},
+		mounted() {
+			this.$nextTick(()=>{
+				this.setOpen(this.dataValue)
+			})
+		},
+		methods: {
+			setOpen(val) {
+				let str = typeof val === 'string'
+				let arr = Array.isArray(val)
+				this.childrens.forEach((vm, index) => {
+					if (str) {
+						if (val === vm.nameSync) {
+							if (!this.accordion) {
+								console.warn('accordion 属性为 false ,v-model 类型应该为 array')
+								return
+							}
+							vm.isOpen = true
+						}
+					}
+					if (arr) {
+						val.forEach(v => {
+							if (v === vm.nameSync) {
+								if (this.accordion) {
+									console.warn('accordion 属性为 true ,v-model 类型应该为 string')
+									return
+								}
+								vm.isOpen = true
+							}
+						})
+					}
+				})
+				this.emit(val)
+			},
+			setAccordion(self) {
+				if (!this.accordion) return
+				this.childrens.forEach((vm, index) => {
+					if (self !== vm) {
+						vm.isOpen = false
+					}
+				})
+			},
+			resize() {
+				this.childrens.forEach((vm, index) => {
+					// #ifndef APP-NVUE
+					vm.getCollapseHeight()
+					// #endif
+					// #ifdef APP-NVUE
+					vm.getNvueHwight()
+					// #endif
+				})
+			},
+			onChange(isOpen, self) {
+				let activeItem = []
+
+				if (this.accordion) {
+					activeItem = isOpen ? self.nameSync : ''
+				} else {
+					this.childrens.forEach((vm, index) => {
+						if (vm.isOpen) {
+							activeItem.push(vm.nameSync)
+						}
+					})
+				}
+				this.$emit('change', activeItem)
+				this.emit(activeItem)
+			},
+			emit(val){
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-collapse {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		flex-direction: column;
+		background-color: #fff;
+	}
+</style>

uni_modules/uni-collapse/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-collapse",
+  "displayName": "uni-collapse 折叠面板",
+  "version": "1.4.4",
+  "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
+  "keywords": [
+    "uni-ui",
+    "折叠",
+    "折叠面板",
+    "手风琴"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-collapse/readme.md

@@ -0,0 +1,12 @@
+
+
+## Collapse 折叠面板
+> **组件名：uni-collapse**
+> 代码块： `uCollapse`
+> 关联组件：`uni-collapse-item`、`uni-icons`。
+
+
+折叠面板用来折叠/显示过长的内容或者是列表。通常是在多内容分类项使用，折叠不重要的内容，显示重要内容。点击可以展开折叠部分。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839