no message

components/tki-tree/style.css

@@ -0,0 +1,151 @@
+.tki-tree-mask {
+  position: fixed;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  z-index: 9998;
+  background-color: rgba(0, 0, 0, 0.6);
+  opacity: 0;
+  transition: all 0.3s ease;
+  visibility: hidden;
+}
+.tki-tree-mask.show {
+  visibility: visible;
+  opacity: 1;
+}
+.tki-tree-cnt {
+  position: fixed;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  z-index: 9999;
+  top: 160rpx;
+  transition: all 0.3s ease;
+  transform: translateY(100%);
+}
+.tki-tree-cnt.show {
+  transform: translateY(0);
+}
+.tki-tree-bar {
+  background-color: #fff;
+  height: 72rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+  border-bottom-width: 1rpx !important;
+  border-bottom-style: solid;
+  border-bottom-color: #f5f5f5;
+  font-size: 32rpx;
+  color: #757575;
+  line-height: 1;
+}
+.tki-tree-bar-confirm {
+  color: #07bb07;
+}
+.tki-tree-view {
+  position: absolute;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  top: 72rpx;
+  background-color: #fff;
+  padding-top: 20rpx;
+  padding-right: 20rpx;
+  padding-bottom: 20rpx;
+  padding-left: 20rpx;
+}
+.tki-tree-view-sc {
+  height: 100%;
+  overflow: hidden;
+}
+.tki-tree-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 26rpx;
+  color: #757575;
+  line-height: 1;
+  height: 0;
+  opacity: 0;
+  transition: 0.2s;
+  position: relative;
+  overflow: hidden;
+}
+.tki-tree-item.show {
+  height: 80rpx;
+  opacity: 1;
+}
+.tki-tree-item.showchild:before {
+  transform: rotate(90deg);
+}
+.tki-tree-item.last:before {
+  opacity: 0;
+}
+.tki-tree-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-right: 8rpx;
+}
+.tki-tree-label {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  height: 100%;
+  line-height: 1.2;
+}
+.tki-tree-check {
+  width: 40px;
+  height: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.tki-tree-check-yes,
+.tki-tree-check-no {
+  width: 20px;
+  height: 20px;
+  border-top-left-radius: 20%;
+  border-top-right-radius: 20%;
+  border-bottom-right-radius: 20%;
+  border-bottom-left-radius: 20%;
+  border-top-width: 1rpx;
+  border-left-width: 1rpx;
+  border-bottom-width: 1rpx;
+  border-right-width: 1rpx;
+  border-style: solid;
+  border-color: #07bb07;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+}
+.tki-tree-check-yes-b {
+  width: 12px;
+  height: 12px;
+  border-top-left-radius: 20%;
+  border-top-right-radius: 20%;
+  border-bottom-right-radius: 20%;
+  border-bottom-left-radius: 20%;
+  background-color: #07bb07;
+}
+.tki-tree-check .radio {
+  border-top-left-radius: 50%;
+  border-top-right-radius: 50%;
+  border-bottom-right-radius: 50%;
+  border-bottom-left-radius: 50%;
+}
+.tki-tree-check .radio .tki-tree-check-yes-b {
+  border-top-left-radius: 50%;
+  border-top-right-radius: 50%;
+  border-bottom-right-radius: 50%;
+  border-bottom-left-radius: 50%;
+}
+.hover-c {
+  opacity: 0.6;
+}

pages/authentication/authentication.vue

@@ -29,7 +29,7 @@
 					</view>
 				</view>
 				<view class="time">
-					15:25:25
+					{{nowTime}}
 				</view>
 				<view class="popup_button" @click="handleGoHome">
 					我知道了
@@ -51,12 +51,13 @@
 				cameraEngine: null,
 				// 是否拥有相机权限
 				isAuthCamera: true,
+				// 当前时间
+				nowTime: "",
 			};
 		},
 		onLoad(options) {
 			this.initData()
 		},
-
 		methods: {
 			// 初始化相机引擎
 			initData() {
@@ -132,7 +133,7 @@
 							uni.openSetting({
 								success: (res) => {
 									if (res.authSetting['scope.camera']) {
-											this.isAuthCamera = true;
+										this.isAuthCamera = true;
 									}
 								}
 							})
@@ -162,7 +163,7 @@
 				});
 				setTimeout(() => {
 					uni.hideLoading();
-
+					this.getNowTime()
 					this.$refs.popup.open()
 				}, 2000)
 				//  然后这里imgPath 传过来的是 要上传的临时本地图片的路径
@@ -175,7 +176,16 @@
 					url: "/pages/home/home"
 				})
 			},
-		}
+			// 获取当前时间
+			getNowTime() {
+				let date = new Date()
+				let hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+				let minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+				let seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+				this.nowTime = hours + ':' + minutes + ':' + seconds
+				// console.log(this.nowTime);
+			}
+		},
 	}
 </script>
 

pages/group/group.vue

@@ -68,13 +68,16 @@
 				</view>
 				<view class="body">
 					<view class="name">
-						<input type="text" placeholder="请输入考勤组名称">
+						<input type="text" placeholder="请输入考勤组名称" v-model="group_name">
 					</view>
 
-					<view class="scope">
-						<view class="notes">
+					<view class="scope" @click="handleChoose">
+						<view class="notes" v-if="!group_scope">
 							请选择考勤组范围
 						</view>
+						<view class="notes2" v-else>
+							{{group_scope}}
+						</view>
 						<view class="icon">
 							<img src="./imgs/bottom.png">
 						</view>
@@ -90,7 +93,7 @@
 							</view>
 						</view>
 						<view class="input">
-							<input type="text" placeholder="请输入打卡人数">
+							<input type="number" placeholder="请输入打卡人数" v-model="group_num">
 						</view>
 					</view>
 				</view>
@@ -105,13 +108,24 @@
 			</view>
 		</uni-popup>
 
+		<!-- 选择考勤组范围区域 -->
+		<tki-tree ref="tkitree" multiple :range="range" rangeKey="name" confirmColor="#3396FB" @confirm="treeConfirm"
+			@cancel="treeCancel" />
+
 	</view>
 </template>
 
 <script>
+	import tkiTree from "@/components/tki-tree/tki-tree.vue"
 	export default {
+		components: {
+			tkiTree
+		},
 		data() {
 			return {
+				group_name: "",
+				group_scope: "",
+				group_num: "",
 				flag: null,
 				checkStatus: false,
 				searchValue: "",
@@ -240,6 +254,165 @@
 							]
 						}, ],
 					},
+				],
+				range: [{
+						id: 1,
+						name: '北京市',
+						children: [{
+							id: 11,
+							name: '市辖区',
+							children: [{
+									id: 111,
+									name: '西城区',
+									children: [{
+										id: 1111,
+										name: '南河沿大街',
+										children: [{
+											id: 11111,
+											name: '紫金宫饭店',
+											// checked: true
+										}, ]
+									}, ]
+								},
+								{
+									id: 112,
+									name: '东城区',
+								},
+								{
+									id: 113,
+									name: '朝阳区',
+								},
+								{
+									id: 114,
+									name: '丰台区',
+								}
+							]
+						}, ]
+					},
+					{
+						id: 2,
+						name: '河北省',
+						children: [{
+								id: 21,
+								name: '石家庄市',
+							},
+							{
+								id: 22,
+								name: '唐山市',
+							},
+							{
+								id: 23,
+								name: '秦皇岛市',
+							},
+						]
+					},
+					{
+						id: 3,
+						name: '山东省',
+						children: [{
+								id: 31,
+								name: '济南市',
+								children: [{
+										id: 311,
+										name: '历下区',
+										children: [{
+											id: 3131,
+											name: '解放路街道办事处',
+										}, ]
+									},
+									{
+										id: 312,
+										name: '槐荫区',
+									},
+									{
+										id: 313,
+										name: '天桥区',
+									},
+									{
+										id: 314,
+										name: '历城区',
+									},
+									{
+										id: 315,
+										name: '长清区',
+									}
+								]
+							},
+							{
+								id: 32,
+								name: '青岛市',
+							},
+							{
+								id: 33,
+								name: '临沂市',
+								children: [{
+										id: 331,
+										name: '兰山区',
+										children: [{
+											id: 3331,
+											name: '金雀山街道',
+										}, ]
+									},
+									{
+										id: 332,
+										name: '河东区',
+									},
+									{
+										id: 333,
+										name: '罗庄区',
+										children: [{
+											id: 3331,
+											name: '盛庄街道',
+										}, ]
+									}
+								]
+							},
+							{
+								id: 34,
+								name: '日照市',
+							},
+							{
+								id: 35,
+								name: '淄博市',
+							},
+							{
+								id: 36,
+								name: '枣庄市',
+							},
+							{
+								id: 37,
+								name: '东营市',
+							},
+							{
+								id: 38,
+								name: '潍坊市',
+							},
+							{
+								id: 39,
+								name: '烟台市',
+							},
+							{
+								id: 40,
+								name: '济宁市',
+							},
+							{
+								id: 41,
+								name: '泰安市',
+							},
+							{
+								id: 42,
+								name: '威海市',
+							},
+							{
+								id: 43,
+								name: '滨州市',
+							},
+							{
+								id: 44,
+								name: '菏泽市',
+							},
+						]
+					}
 				]
 			};
 		},
@@ -250,12 +423,51 @@
 			}
 		},
 		methods: {
+			// 考勤组选择框确定回调事件
+			treeConfirm(e) {
+				// console.log(e)
+				let temList = []
+				e.forEach((ele) => {
+					temList.push(ele.name)
+				})
+				this.group_scope = temList.join(",")
+			},
+			// 考勤组选择框取消回调事件
+			treeCancel(e) {
+				console.log(e)
+				console.log("取消");
+			},
+			// 点击选择考勤组选择框回调
+			handleChoose() {
+				this.$refs.tkitree._show()
+			},
 			handleChange(item) {
 				console.log(item);
 				item.checked = !item.checked
 			},
 			// 点击弹窗保存按钮回调
 			handleSave() {
+				if (!this.group_name) {
+					uni.showToast({
+						title: "请输入考勤组名称",
+						icon: "none"
+					})
+					return
+				}
+				if (!this.group_scope) {
+					uni.showToast({
+						title: "请选择考勤组范围",
+						icon: "none"
+					})
+					return
+				}
+				if (!this.group_num) {
+					uni.showToast({
+						title: "请输入打卡人数",
+						icon: "none"
+					})
+					return
+				}
 				this.$refs.popup.close()
 			},
 			// 点击弹窗取消按钮回调
@@ -433,7 +645,6 @@
 						width: 90%;
 						height: 100%;
 						font-size: 28rpx;
-						color: #B3B3B3;
 					}
 				}
 
@@ -452,6 +663,12 @@
 						font-size: 28rpx;
 						color: #808080;
 					}
+					
+					.notes2 {
+						padding-left: 24rpx;
+						flex: 5;
+						font-size: 28rpx;
+					}
 
 					.icon {
 						flex: 1;
@@ -506,7 +723,6 @@
 						input {
 							padding: 0 45rpx;
 							width: 80%;
-							height: 100%;
 							font-size: 28rpx;
 						}
 					}
@@ -516,9 +732,9 @@
 			.foot {
 				display: flex;
 				justify-content: space-evenly;
-				align-items: center;
 				width: 630rpx;
 				height: 99rpx;
+				line-height: 99rpx;
 				font-size: 28rpx;
 
 				.left {

pages/home/home.vue

@@ -132,6 +132,21 @@
 			}
 		},
 		methods: {
+			// 获取当前时间
+			getNowTime() {
+				if (this.timer) {
+					clearInterval(this.timer)
+				} else {
+					this.timer = setInterval(() => {
+						let date = new Date()
+						let hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+						let minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+						let seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+						this.nowTime = hours + ':' + minutes + ':' + seconds
+						// console.log(this.nowTime);
+					}, 1000)
+				}
+			},
 			// 从缓存中获取用户信息
 			getUserInfo() {
 				try {
@@ -143,6 +158,7 @@
 					console.log(e);
 				}
 			},
+			// 获取当前定位位置信息
 			getLocationData() {
 				qqmapsdk.reverseGeocoder({
 					success: (res) => {
@@ -194,21 +210,6 @@
 					}
 				})
 			},
-			// 获取当前时间
-			getNowTime() {
-				if (this.timer) {
-					clearInterval(this.timer)
-				} else {
-					this.timer = setInterval(() => {
-						let date = new Date()
-						let hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-						let minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-						let seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
-						this.nowTime = hours + ':' + minutes + ':' + seconds
-						// console.log(this.nowTime);
-					}, 1000)
-				}
-			},
 		}
 	}
 </script>

pages/index/index.vue

@@ -14,7 +14,8 @@
 				// 获取用户信息
 				ocode: '1015730314',
 				// 商户appkey
-				appkey: '3183DC96A6DABA8D',
+				// appkey: '3183DC96A6DABA8D',
+				appkey: '9D6ACFE8CF9AFD07',
 				// 是否授权可见
 				visible: false,
 				// 是否启动授权

pages/location/location.vue

@@ -18,7 +18,7 @@
 						{{address}}
 					</view>
 				</view>
-				<view class="right" @click="getLocationData">
+				<view class="right" @click="handleRefresh">
 					<img src="./imgs/refresh.png">
 				</view>
 			</view>
@@ -98,6 +98,17 @@
 					}
 				})
 			},
+			// 点击刷新按钮回调
+			handleRefresh() {
+				uni.showLoading({
+					title: '刷新中',
+					mask: true
+				});
+				this.getLocationData()
+				setTimeout(() => {
+					uni.hideLoading();
+				}, 1500)
+			},
 			// 点击拍照图标回调
 			handlePhoto() {
 				// 获取用户摄像头权限

unpackage/dist/dev/mp-weixin/components/tki-tree/tki-tree.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/tki-tree/tki-tree.wxss

@@ -0,0 +1,155 @@
+.tki-tree-mask.data-v-a8274bb8 {
+  position: fixed;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  z-index: 9998;
+  background-color: rgba(0, 0, 0, 0.6);
+  opacity: 0;
+  transition: all 0.3s ease;
+  visibility: hidden;
+}
+.tki-tree-mask.show.data-v-a8274bb8 {
+  visibility: visible;
+  opacity: 1;
+}
+.tki-tree-cnt.data-v-a8274bb8 {
+  position: fixed;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  z-index: 9999;
+  top: 160rpx;
+  transition: all 0.3s ease;
+  -webkit-transform: translateY(100%);
+          transform: translateY(100%);
+}
+.tki-tree-cnt.show.data-v-a8274bb8 {
+  -webkit-transform: translateY(0);
+          transform: translateY(0);
+}
+.tki-tree-bar.data-v-a8274bb8 {
+  background-color: #fff;
+  height: 72rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+  border-bottom-width: 1rpx !important;
+  border-bottom-style: solid;
+  border-bottom-color: #f5f5f5;
+  font-size: 32rpx;
+  color: #757575;
+  line-height: 1;
+}
+.tki-tree-bar-confirm.data-v-a8274bb8 {
+  color: #07bb07;
+}
+.tki-tree-view.data-v-a8274bb8 {
+  position: absolute;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  top: 72rpx;
+  background-color: #fff;
+  padding-top: 20rpx;
+  padding-right: 20rpx;
+  padding-bottom: 20rpx;
+  padding-left: 20rpx;
+}
+.tki-tree-view-sc.data-v-a8274bb8 {
+  height: 100%;
+  overflow: hidden;
+}
+.tki-tree-item.data-v-a8274bb8 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 26rpx;
+  color: #757575;
+  line-height: 1;
+  height: 0;
+  opacity: 0;
+  transition: 0.2s;
+  position: relative;
+  overflow: hidden;
+}
+.tki-tree-item.show.data-v-a8274bb8 {
+  height: 80rpx;
+  opacity: 1;
+}
+.tki-tree-item.showchild.data-v-a8274bb8:before {
+  -webkit-transform: rotate(90deg);
+          transform: rotate(90deg);
+}
+.tki-tree-item.last.data-v-a8274bb8:before {
+  opacity: 0;
+}
+.tki-tree-icon.data-v-a8274bb8 {
+  width: 26rpx;
+  height: 26rpx;
+  margin-right: 8rpx;
+}
+.tki-tree-label.data-v-a8274bb8 {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  height: 100%;
+  line-height: 1.2;
+}
+.tki-tree-check.data-v-a8274bb8 {
+  width: 40px;
+  height: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.tki-tree-check-yes.data-v-a8274bb8,
+.tki-tree-check-no.data-v-a8274bb8 {
+  width: 20px;
+  height: 20px;
+  border-top-left-radius: 20%;
+  border-top-right-radius: 20%;
+  border-bottom-right-radius: 20%;
+  border-bottom-left-radius: 20%;
+  border-top-width: 1rpx;
+  border-left-width: 1rpx;
+  border-bottom-width: 1rpx;
+  border-right-width: 1rpx;
+  border-style: solid;
+  border-color: #07bb07;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+}
+.tki-tree-check-yes-b.data-v-a8274bb8 {
+  width: 12px;
+  height: 12px;
+  border-top-left-radius: 20%;
+  border-top-right-radius: 20%;
+  border-bottom-right-radius: 20%;
+  border-bottom-left-radius: 20%;
+  background-color: #07bb07;
+}
+.tki-tree-check .radio.data-v-a8274bb8 {
+  border-top-left-radius: 50%;
+  border-top-right-radius: 50%;
+  border-bottom-right-radius: 50%;
+  border-bottom-left-radius: 50%;
+}
+.tki-tree-check .radio .tki-tree-check-yes-b.data-v-a8274bb8 {
+  border-top-left-radius: 50%;
+  border-top-right-radius: 50%;
+  border-bottom-right-radius: 50%;
+  border-bottom-left-radius: 50%;
+}
+.hover-c.data-v-a8274bb8 {
+  opacity: 0.6;
+}
+

unpackage/dist/dev/mp-weixin/pages/group/group.json

@@ -7,6 +7,7 @@
     "uni-swipe-action-item": "/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item",
     "uni-collapse": "/uni_modules/uni-collapse/components/uni-collapse/uni-collapse",
     "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item",
-    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "tki-tree": "/components/tki-tree/tki-tree"
   }
 }

unpackage/dist/dev/mp-weixin/pages/group/group.wxss

@@ -99,7 +99,6 @@
   width: 90%;
   height: 100%;
   font-size: 28rpx;
-  color: #B3B3B3;
 }
 .container .popup_box .body .scope.data-v-d900f0f4 {
   display: flex;
@@ -116,6 +115,11 @@
   font-size: 28rpx;
   color: #808080;
 }
+.container .popup_box .body .scope .notes2.data-v-d900f0f4 {
+  padding-left: 24rpx;
+  flex: 5;
+  font-size: 28rpx;
+}
 .container .popup_box .body .scope .icon.data-v-d900f0f4 {
   flex: 1;
   display: flex;
@@ -162,15 +166,14 @@
 .container .popup_box .body .num .input input.data-v-d900f0f4 {
   padding: 0 45rpx;
   width: 80%;
-  height: 100%;
   font-size: 28rpx;
 }
 .container .popup_box .foot.data-v-d900f0f4 {
   display: flex;
   justify-content: space-evenly;
-  align-items: center;
   width: 630rpx;
   height: 99rpx;
+  line-height: 99rpx;
   font-size: 28rpx;
 }
 .container .popup_box .foot .left.data-v-d900f0f4 {

unpackage/dist/dev/mp-weixin/project.config.json

@@ -6,7 +6,7 @@
     },
     "setting": {
         "urlCheck": false,
-        "es6": false,
+        "es6": true,
         "postcss": false,
         "minified": false,
         "newFeature": true,
@@ -15,7 +15,8 @@
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
-        }
+        },
+        "enhance": true
     },
     "compileType": "miniprogram",
     "libVersion": "2.28.1",