版本更新

App.vue

@@ -36,7 +36,7 @@
 						success: (res) => {
 							if (res.confirm) {
 								const urlAndorid = 'https://www.pgyer.com/9B4d'
-								if (window.plus) window.plus.runtime.openURL(urlAndorid)
+								if (plus) plus.runtime.openURL(urlAndorid)
 								// 更新版本
 								else window.open(urlAndorid)
 							}

components/BottomBtn/index.vue

@@ -1,46 +1,42 @@
 <template>
-	<view class="bottom-btn">
-		<u-button :type="type" @click="handlerClick()">{{title}}</u-button>
-		
-	</view>
+  <view class="bottom-btn">
+    <u-button :type="type" @click="handlerClick()">{{ title }}</u-button>
+  </view>
 </template>
 
 <script>
-	export default {
-		props: {
-			title: {
-				type: String,
-				default: ''
-			},
-			type: {
-				type: String,
-				default: 'success'
-			},
-		},
-		name: "bottomBtn",
-		data() {
-			return {
-
-			};
-		},
-		methods: {
-			handlerClick() {
-				this.$emit('handlerClick')
-			}
-		}
-	}
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "",
+    },
+    type: {
+      type: String,
+      default: "success",
+    },
+  },
+  name: "bottomBtn",
+  data() {
+    return {};
+  },
+  methods: {
+    handlerClick() {
+      this.$emit("handlerClick");
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.bottom-btn {
-		border-top: 1px solid #e4e7ed;
-		box-sizing: border-box;
-		padding: 20rpx 20rpx;
-		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
-		background: #fff;
-		position: fixed;
-		bottom: 0%;
-		left: 0%;
-		width: 100%;
-	}
-</style>
+.bottom-btn {
+  border-top: 1px solid #e4e7ed;
+  box-sizing: border-box;
+  padding: 20rpx 20rpx;
+  background: #fff;
+  position: fixed;
+  bottom: 0%;
+  left: 0%;
+  width: 100%;
+}
+</style>

components/xycoder-threeStageSlidingPanel/index.vue

@@ -0,0 +1,206 @@
+<template>
+  <view
+    class="panel"
+    @touchmove.stop="touchmoveHandle"
+    @touchstart.stop="touchstartHandle"
+    @touchend.stop="touchendHandle"
+    ref="panel"
+    :style="{
+      height: `${height}px`,
+      transform: `translateY(${currentY})`,
+      '--translate-end': animationStyles['--translate-end'],
+      '--translate-start': animationStyles['--translate-start']
+    }"
+    :class="[{ 'box-radius': !isScroll }, { translate: animationType }]"
+  >
+    <view class="panel-content"> 
+      <scroll-view
+        ref="scroll"
+        id="scroll"
+        :scroll-y="isScroll"
+        style="height: 100vh"
+      >
+        <slot></slot>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "OneExpansionPanel",
+  props: {
+    levelArray: {
+      type: Array,
+      default: () => ["0%", "20%", "70%"]
+    },
+    firstLevel: {
+      type: String,
+      default: "70%"
+    }
+  },
+  data() {
+    const fastMoveDelay = 200;
+    return {
+      fastMoveDelay,
+      animationStyles: {},
+      animationType: "",
+      maxHeight: 1000,
+      height: 0,
+      currentY: this.firstLevel,
+      lastY: 0,
+      startY: 0,
+      startTime: 0
+    };
+  },
+  computed: {
+    isScroll() {
+      const maxLevel = this.levelArray[0];
+
+      return (
+        Number(this.currentY.replace("%", "")) <= maxLevel.replace("%", "")
+      );
+    }
+  },
+  created() {
+    const info = uni.getSystemInfoSync();
+    this.maxHeight = info.screenHeight - info.windowTop;
+    this.height = this.maxHeight;
+  },
+  methods: {
+    foldPanel() {
+      const styles = {
+        "--translate-start": this.currentY,
+        "--translate-end": this.firstLevel
+      };
+
+      this.animationStyles = styles;
+      this.animationType = "start";
+      setTimeout(() => {
+        this.currentY = styles["--translate-end"];
+      }, 300);
+    },
+    touchstartHandle(event) {
+      this.startTime = Date.now();
+      this.animationType = "";
+      this.lastY = event.touches[0].pageY;
+      this.startY = this.currentY;
+    },
+    touchmoveHandle(event) {
+      const { lastY, currentY, maxHeight, isScroll } = this;
+      const { pageY } = event.touches[0];
+      const { lastScrollTop = 0 } = this.$refs.scroll || {};
+      // 如果是滚动状态，则不执行
+      if (isScroll && lastScrollTop) return;
+      const curPos = Number(currentY.replace("%", ""));
+      let curNum = curPos - ((lastY - pageY) / maxHeight) * 100;
+      if (curNum > 100) curNum = 100; // 限制最大值
+      if (curNum < 0) curNum = 0; // 限制最小值
+      this.currentY = curNum + "%";
+
+      this.lastY = pageY;
+    },
+    touchendHandle(e) {
+      const { fastMoveDelay, startTime, startY, isScroll } = this;
+      const { lastScrollTop = 0 } = this.$refs.scroll || {};
+
+      if (isScroll && lastScrollTop) return;
+
+      const styles = {
+        "--translate-start": this.currentY,
+        "--translate-end": null
+      };
+      const percent = Number(this.currentY.replace("%", ""));
+      //   判断是否快速上下滑动
+      const now = Date.now();
+
+      const levelArrayNumber = this.levelArray.map(o =>
+        Number(o.replace("%", ""))
+      );
+      if (now - startTime <= fastMoveDelay) {
+        const startPercent = Number(startY.replace("%", ""));
+        if (percent == startPercent) {
+          return;
+        }
+        const levelIndex = levelArrayNumber.findIndex(o => o == startPercent);
+        // 快速滑动 上升或降低一个等级
+        // 上滑
+        if (startPercent - percent >= 0) {
+          if (levelIndex !== 0) {
+            styles["--translate-end"] = this.levelArray[levelIndex - 1];
+          } else {
+            styles["--translate-end"] = this.levelArray[0];
+          }
+        } else {
+          // 下滑
+          if (levelIndex !== this.levelArray.length - 1) {
+            styles["--translate-end"] = this.levelArray[levelIndex + 1];
+          } else {
+            styles["--translate-end"] =
+              this.levelArray[this.levelArray.length - 1];
+          }
+        }
+      } else {
+        if (percent <= levelArrayNumber[0]) {
+          styles["--translate-end"] = this.levelArray[0];
+        } else if (percent >= levelArrayNumber[levelArrayNumber.length - 1]) {
+          styles["--translate-end"] =
+            this.levelArray[this.levelArray.length - 1];
+        } else {
+          levelArrayNumber.reduce((pre, cur) => {
+            if (percent > pre && percent < cur) {
+              styles["--translate-end"] =
+                (Math.abs(pre - percent) > Math.abs(cur - percent)
+                  ? cur
+                  : pre) + "%";
+            }
+            return cur;
+          }, levelArrayNumber[0]);
+        }
+      }
+
+      this.animationType = "start";
+      this.animationStyles = styles;
+      setTimeout(() => {
+        this.currentY = styles["--translate-end"];
+      }, 300);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.translate {
+  animation: translate 0.3s ease-in-out forwards;
+}
+@keyframes translate {
+  0% {
+    transform: translateY(var(--translate-start));
+  }
+  100% {
+    transform: translateY(var(--translate-end));
+  }
+}
+.panel {
+  z-index: 999;
+  position: absolute;
+  bottom: 0;
+  top: 0;
+  width: 100vw;
+  background-color: #ffffff;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  height: 100vh;
+}
+.panel-content {
+  width: 100%;
+  height: 100%;
+}
+.box-radius {
+  border-radius: 20rpx 20rpx 0 0;
+  box-shadow: 0 -8rpx 30rpx rgba(0, 0, 0, 0.1);
+}
+</style>

package.json

@@ -0,0 +1,18 @@
+{
+    "id": "xycoder-threeStageSlidingPanel",
+    "name": "高性能三段式滑动面板",
+    "displayName": "高性能三段式滑动面板",
+    "version": "2.0",
+    "description": "仿高德三段式滑动操作面板",
+    "keywords": [
+        "滑动面板",
+        "滑动",
+        "操作面板"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}

pages/house/addAndEdit.vue

@@ -14,14 +14,15 @@
 			<u-form-item label="户籍" prop="color">
 				<u-radio-group v-model="form.color">
 					<u-radio v-for="(item, index) in hujiList" :key="index" :name="item.dictLabel">
-						{{item.dictLabel}}
+						{{item.dictLabel}}{{item.dictLabel == "HZ" ? "（有户口自住）" : "（有户口不住）"}}
+
 					</u-radio>
 				</u-radio-group>
 			</u-form-item>
 			<u-form-item label="流动" prop="color">
 				<u-radio-group v-model="form.color">
 					<u-radio v-for="(item, index) in liudList" :key="index" :name="item.dictLabel">
-						{{item.dictLabel}}
+						{{item.dictLabel}}{{item.dictLabel == "NZ" ? "（没户口自住）" : "（没户口租客）"}}
 					</u-radio>
 				</u-radio-group>
 			</u-form-item>

pages/index.vue

@@ -16,6 +16,7 @@
 			</div>
 			<u-loadmore :status="status" :load-text="loadText" />
 		</scroll-view>
+
 	</navigation-general>
 </template>
 
@@ -29,6 +30,7 @@
 
 	} from '@/api/taicangpop/building.js'
 	export default {
+
 		data() {
 			return {
 				status: 'loadmore',
@@ -85,25 +87,25 @@
 		methods: {
 			//跳转楼栋页面
 			handlerBuilding(item) {
-				if(this.queryParams.xiaoquId == 267){
+				if (this.queryParams.xiaoquId == 267) {
 					this.$u.route({
 						url: 'pages/building/map',
 						params: {
 							buildingId: item.id,
 							deptname: item.deptname,
-							name:item.name
+							name: item.name
+						}
+					})
+				} else {
+					this.$u.route({
+						url: 'pages/building/building',
+						params: {
+							buildingId: item.id,
+							deptname: item.name
 						}
 					})
-				}else{
-						this.$u.route({
-							url: 'pages/building/building',
-							params: {
-								buildingId: item.id,
-								deptname: item.name
-							}
-						})
 				}
-				
+
 			},
 
 			//更新tabar
@@ -140,14 +142,14 @@
 				this.buildingList = [...this.buildingList, ...res.rows]
 				this.total = res.total
 				this.queryParams.pageNum = this.queryParams.pageNum + 1
-				
+
 				if (this.buildingList.length >= this.total) {
 					this.status = 'nomore';
-					
-				}else{
+
+				} else {
 					this.status = 'loadmore';
 				}
-				
+
 			},
 
 			//下拉框变化

pages/login.vue

@@ -52,8 +52,8 @@
 				register: false,
 				globalConfig: getApp().globalData.config,
 				loginForm: {
-					username: "景瑞网格1",
-					password: "Tc123@456***",
+					username: "",
+					password: "",
 					code: "",
 					uuid: ''
 				}

pages/mine/index.vue

@@ -23,8 +23,6 @@
 			</view>
 		</view>
 
-
-
 		<view class="menu-list">
 			<view class="list-cell list-cell-arrow" @click="handleToEditInfo">
 				<view class="menu-item-box">
@@ -96,13 +94,18 @@
 						success: (res) => {
 							if (res.confirm) {
 								const urlAndorid = 'https://www.pgyer.com/9B4d'
-								if (window.plus) window.plus.runtime.openURL(urlAndorid)
+								if (plus) plus.runtime.openURL(urlAndorid)
 								// 更新版本
 								else window.open(urlAndorid)
 							}
 
 						}
 					})
+				} else {
+					uni.showToast({
+						title: '已是最新版本',
+						icon: 'none'
+					})
 				}
 			},
 			async getVersion() {