no message

pages/addLocation/addLocation.vue

@@ -74,15 +74,17 @@
 				placeList: [],
 				// 范围数值
 				rangeValue: 300,
-				chooseList: []
+				chooseList: [],
+				type: ""
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			// 实例化API核心类
 			qqmapsdk = new QQMapWX({
 				// 申请的key
 				key: 'R43BZ-2XROX-L7T45-T5OQI-IBDFT-GNBOI'
 			});
+			this.type = options.type
 			this.getLocationData()
 		},
 		methods: {
@@ -146,18 +148,33 @@
 			// 选择单个地址时的回调
 			handleChoose(item) {
 				// console.log(item);
-				let arr = uni.getStorageSync("chooseList")
-				if (arr) {
-					this.chooseList = uni.getStorageSync("chooseList")
+				if (this.type == 1) {
+					let arr = uni.getStorageSync("chooseList_edit")
+					if (arr.length) {
+						this.chooseList = arr
+					}
+					this.chooseList.push({
+						name: item.title,
+						address: item.address,
+						radius: this.rangeValue,
+						lat: item.location.lat,
+						lng: item.location.lng,
+					})
+					uni.setStorageSync("chooseList_edit", this.chooseList)
+				} else {
+					let arr = uni.getStorageSync("chooseList")
+					if (arr.length) {
+						this.chooseList = arr
+					}
+					this.chooseList.push({
+						name: item.title,
+						address: item.address,
+						radius: this.rangeValue,
+						lat: item.location.lat,
+						lng: item.location.lng,
+					})
+					uni.setStorageSync("chooseList", this.chooseList)
 				}
-				this.chooseList.push({
-					name: item.title,
-					address: item.address,
-					radius: this.rangeValue,
-					lat: item.location.lat,
-					lng: item.location.lng,
-				})
-				uni.setStorageSync("chooseList", this.chooseList)
 				uni.navigateBack({
 					delta: 1
 				})

pages/addRules/addRules.vue

@@ -328,13 +328,13 @@
 			// 点击打卡时间跳转回调
 			goPagePunchTime() {
 				uni.navigateTo({
-					url: "/pages/punchTime/punchTime"
+					url: "/pages/punchTime/punchTime?&type=2"
 				})
 			},
 			// 点击打卡地点跳转回调
 			goPagePunchLocation() {
 				uni.navigateTo({
-					url: "/pages/punchLocation/punchLocation"
+					url: "/pages/punchLocation/punchLocation?type=2"
 				})
 			},
 			// 格式化时间

pages/cardRecord/cardRecord.vue

@@ -209,7 +209,7 @@
 				// console.log(res);
 				if (res.code == 200) {
 					this.total = res.data.total
-					this.list = res.data.list
+					this.list = [...res.data.list, ...this.list]
 				}
 			},
 

pages/editRules/editRules.vue

@@ -132,6 +132,21 @@
 			};
 		},
 		onLoad(option) {
+			uni.removeStorageSync("chooseList_edit")
+			uni.$on('updateRuleName', (data) => {
+				this.ruleName = data
+			})
+
+			uni.$on('updateRuleGroup', (data) => {
+				let temList = []
+				data.forEach((ele) => {
+					temList.push(
+						ele.name
+					)
+				})
+				this.group = temList.join("，")
+			})
+
 			this.info = JSON.parse(option.info)
 			console.log(this.info);
 			if (this.info) {
@@ -153,71 +168,159 @@
 			}
 		},
 		onShow() {
-			let ruleName = uni.getStorageSync("ruleName")
-			if (ruleName) {
-				this.ruleName = ruleName
-			}
-
-			let ruleGroup = uni.getStorageSync("ruleGroup")
-			if (ruleGroup) {
+			let rulePlace = uni.getStorageSync("chooseList") || uni.getStorageSync("chooseList_edit")
+			if (rulePlace) {
 				let temList = []
-				this.groupIds = []
-				ruleGroup.forEach((ele) => {
+				rulePlace.forEach((ele) => {
 					temList.push(ele.name)
-					this.groupIds.push(ele.id)
 				})
-				this.group = temList.join("，")
+				this.place = temList.join("，")
 			}
+			
+			// let ruleTime = uni.getStorageSync("ruleTime_edit")
+			// console.log(ruleTime);
+			// if (ruleTime) {
+			// 	this.time = ruleTime
+			// 	let temList = []
+			// 	ruleTime.forEach((ele) => {
+			// 		temList.push({
+			// 			dayOfWeeks: ele.selectedWeeks,
+			// 			periods: ele.list
+			// 		})
+			// 	})
+			// 	temList.forEach((item) => {
+			// 		item.dayOfWeeks = item.dayOfWeeks.map((element) => {
+			// 			if (element == '星期一') {
+			// 				return element = 1
+			// 			}
+			// 			if (element == '星期二') {
+			// 				return element = 2
+			// 			}
+			// 			if (element == '星期三') {
+			// 				return element = 3
+			// 			}
+			// 			if (element == '星期四') {
+			// 				return element = 4
+			// 			}
+			// 			if (element == '星期五') {
+			// 				return element = 5
+			// 			}
+			// 			if (element == '星期六') {
+			// 				return element = 6
+			// 			}
+			// 			if (element == '星期天') {
+			// 				return element = 7
+			// 			}
+			// 		})
+			// 	})
+			// 	this.timeGroups = temList
+			// }
+			// 	let ruleName = uni.getStorageSync("ruleName")
+			// 	if (ruleName) {
+			// 		this.ruleName = ruleName
+			// 	}
 
-			let ruleTime = uni.getStorageSync("ruleTime")
-			let flag = uni.getStorageSync("flag")
-			console.log(ruleTime);
-			console.log(flag);
-			if (ruleTime.length == 0 && flag) {
-				this.time = "未设置"
-			}
-			if (ruleTime.length > 0) {
-				this.time = ruleTime[0].selectedWeeks
-				this.periods = ruleTime[0].list
-				// this.time = ruleTime
-				// let temList = []
-				// ruleTime.forEach((ele) => {
-				// 	temList.push({
-				// 		dayOfWeeks: ele.selectedWeeks,
-				// 		periods: ele.list
-				// 	})
-				// })
-				// temList.forEach((item) => {
-				// 	item.dayOfWeeks = item.dayOfWeeks.map((element) => {
-				// 		if (element == '星期一') {
-				// 			return element = 1
-				// 		}
-				// 		if (element == '星期二') {
-				// 			return element = 2
-				// 		}
-				// 		if (element == '星期三') {
-				// 			return element = 3
-				// 		}
-				// 		if (element == '星期四') {
-				// 			return element = 4
-				// 		}
-				// 		if (element == '星期五') {
-				// 			return element = 5
-				// 		}
-				// 		if (element == '星期六') {
-				// 			return element = 6
-				// 		}
-				// 		if (element == '星期天') {
-				// 			return element = 7
-				// 		}
-				// 	})
-				// })
-				// this.timeGroups = temList
-			}
+			// 	let ruleGroup = uni.getStorageSync("ruleGroup")
+			// 	if (ruleGroup) {
+			// 		let temList = []
+			// 		this.groupIds = []
+			// 		ruleGroup.forEach((ele) => {
+			// 			temList.push(ele.name)
+			// 			this.groupIds.push(ele.id)
+			// 		})
+			// 		this.group = temList.join("，")
+			// 	}
+
+				let ruleTime = uni.getStorageSync("ruleTime")
+				let flag = uni.getStorageSync("flag")
+				console.log(ruleTime);
+				console.log(flag);
+				if (ruleTime.length == 0 && flag) {
+					this.time = "未设置"
+				}
+				if (ruleTime.length > 0) {
+					this.time = ruleTime[0].selectedWeeks
+					this.periods = ruleTime[0].list
+					this.time = ruleTime
+					let temList = []
+					ruleTime.forEach((ele) => {
+						temList.push({
+							dayOfWeeks: ele.selectedWeeks,
+							periods: ele.list
+						})
+					})
+					temList.forEach((item) => {
+						item.dayOfWeeks = item.dayOfWeeks.map((element) => {
+							if (element == '星期一') {
+								return element = 1
+							}
+							if (element == '星期二') {
+								return element = 2
+							}
+							if (element == '星期三') {
+								return element = 3
+							}
+							if (element == '星期四') {
+								return element = 4
+							}
+							if (element == '星期五') {
+								return element = 5
+							}
+							if (element == '星期六') {
+								return element = 6
+							}
+							if (element == '星期天') {
+								return element = 7
+							}
+						})
+					})
+					this.timeGroups = temList
+				}
+				console.log(this.periods);
+				console.log(this.time);
 		},
 		methods: {
 			// 点击确认按钮回调
 			handleConfirm() {
+				if (this.ruleName == '未设置') {
+					uni.showToast({
+						title: "请设置规则名称",
+						icon: 'none'
+					})
+					return
+				}
+
+				if (this.group == '未设置') {
+					uni.showToast({
+						title: "请设置考勤组",
+						icon: 'none'
+					})
+					return
+				}
+
+				if (this.time == '未设置') {
+					uni.showToast({
+						title: "请设置打卡时间",
+						icon: 'none'
+					})
+					return
+				}
+
+				if (this.place == '未设置' || this.place == "") {
+					uni.showToast({
+						title: "请设置打卡地点",
+						icon: 'none'
+					})
+					return
+				}
+
+				if (this.value == '未设置') {
+					uni.showToast({
+						title: "请设置提前通知时间",
+						icon: 'none'
+					})
+					return
+				}
 				uni.showModal({
 					title: '提示',
 					content: '确定修改吗？',
@@ -265,7 +368,6 @@
 				this.value = this.array[index]
 				let index2 = this.value.indexOf("分", 0)
 				this.value = this.value.substring(0, index2);
-				uni.setStorageSync("ruleValue", this.value)
 			},
 			// 点击规则名称跳转回调
 			goPageRuleName() {
@@ -285,20 +387,20 @@
 					let periods = []
 					let time = []
 					uni.navigateTo({
-						url: `/pages/punchTime/punchTime?time=${time}&periods=${periods}`
+						url: `/pages/punchTime/punchTime?time=${time}&periods=${periods}&type=1`
 					})
 				} else {
 					let periods = JSON.stringify(this.periods)
 					let time = JSON.stringify(this.time)
 					uni.navigateTo({
-						url: `/pages/punchTime/punchTime?time=${time}&periods=${periods}`
+						url: `/pages/punchTime/punchTime?time=${time}&periods=${periods}&type=1`
 					})
 				}
 			},
 			// 点击打卡地点跳转回调
 			goPagePunchLocation() {
 				uni.navigateTo({
-					url: "/pages/punchLocation/punchLocation"
+					url: `/pages/punchLocation/punchLocation?id=${this.id}&type=1`
 				})
 			},
 			// 格式化时间

pages/group/group.vue

@@ -324,7 +324,8 @@
 						icon: "none"
 					})
 				} else {
-					uni.setStorageSync("ruleGroup", temList)
+					// uni.setStorageSync("ruleGroup", temList)
+					uni.$emit('updateRuleGroup', temList)
 					uni.navigateBack({
 						delta: 1
 					})

pages/home/home.vue

@@ -19,7 +19,7 @@
 		<!-- 主体打卡区域 -->
 		<view class="body">
 			<!-- 卡片区域 -->
-			<view class="card">
+			<view class="card" v-if="list.length">
 				<!-- 每一个卡片区域 -->
 				<view class="item" v-for="item in list" :key="item.id">
 					<view class="item_box">
@@ -38,6 +38,8 @@
 				</view>
 
 			</view>
+			<!-- list数组为空时的占位盒子 -->
+			<view class="card" v-else></view>
 
 			<!-- 打卡区域 -->
 			<view :class="{clock:flags,active:!flags}" @click="handlePunch">
@@ -85,25 +87,7 @@
 				// 用户信息
 				userInfo: {},
 				// 打卡规则列表
-				list: [{
-						id: 1,
-						title: "课间操打卡规则",
-						time: "08:00-9:00",
-						type: "已打卡"
-					},
-					{
-						id: 2,
-						title: "课间操打卡规则2",
-						time: "08:00-10:00",
-						type: "未打卡"
-					},
-					{
-						id: 3,
-						title: "课间操打卡规则3",
-						time: "08:00-19:00",
-						type: "已打卡"
-					},
-				],
+				list: [],
 				flags: true,
 				addressFlags: false,
 				timeFlags: false,
@@ -116,6 +100,8 @@
 			};
 		},
 		onLoad() {
+			uni.removeStorageSync("manager")
+			uni.removeStorageSync("sub-administrator")
 			// 实例化API核心类
 			qqmapsdk = new QQMapWX({
 				// 申请的key
@@ -156,6 +142,21 @@
 				// console.log(res);
 				if (res.code == 200) {
 					this.userInfo = res.data
+
+					if (this.userInfo.roles) {
+						let temList = []
+						this.userInfo.roles.forEach((ele) => {
+							temList.push(ele.id)
+						})
+						let flag = temList.includes(2)
+						let flag2 = temList.includes(3)
+						if (flag) {
+							uni.setStorageSync("manager", flag)
+						}
+						if (flag2) {
+							uni.setStorageSync("sub-administrator", flag2)
+						}
+					}
 				}
 			},
 			// 获取当前定位位置信息

pages/my/my.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view class="container" v-if="flag">
 		<!-- 每一个选项 -->
 		<view class="box" v-for="item in list" :key="item.id" @click="handleClick(item)">
 			<view class="icon">
@@ -14,12 +14,22 @@
 		</view>
 
 	</view>
+
+	<view class="container2" v-else>
+		<view class="img">
+			<img src="../../static/noPower.png">
+		</view>
+		<view class="info">
+			暂无权限
+		</view>
+	</view>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
+				flag: false,
 				list: [{
 						id: 1,
 						icon: "../../static/my1.png",
@@ -47,6 +57,13 @@
 				]
 			};
 		},
+		onLoad() {
+			let flag = uni.getStorageSync("manager")
+			let flag2 = uni.getStorageSync("sub-administrator")
+			if(flag||flag2){
+				this.flag = true
+			}
+		},
 		methods: {
 			handleClick(item) {
 				// console.log(item.url);
@@ -98,4 +115,27 @@
 			}
 		}
 	}
+
+	.container2 {
+		width: 100vw;
+		height: 100vh;
+		text-align: center;
+		background-color: #fff;
+
+		.img {
+			margin: 0 auto;
+			padding-top: 288rpx;
+			width: 480rpx;
+			height: 508rpx;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.info {
+			color: #5792F0;
+		}
+	}
 </style>

pages/powerSet/powerSet.vue

@@ -6,26 +6,34 @@
 				activeColor="#0082FC"></uni-segmented-control>
 		</view>
 
-		<!-- 选中人物区域 -->
-		<view class="choose">
+		<!-- 搜索栏区域 -->
+		<view class="search">
+			<uni-search-bar bgColor="#fff" placeholder="请输入姓名" cancelButton="none" v-model="searchValue" @clear="clear"
+				@input="getSearchData">
+			</uni-search-bar>
+		</view>
+
+		<!-- 权限人物区域 -->
+		<view class="choose" v-if="chooseList.length">
 
 			<view class="box" v-for="item in chooseList" :key="item.id">
 				<view class="name">
 					{{item.name}}
 				</view>
-				<view class="icon" @click="handleDelete(item.id)">
+				<view class="icon" @click="handleDelete(item)">
 					<img src="../../static/close.png">
 				</view>
 			</view>
 		</view>
 
-		<!-- 人员展示区域 -->
-		<view class="list">
+		<!-- 搜索人员展示区域 -->
+		<view class="list" v-if="list.length">
 			<!-- 每一个人员区域 -->
-			<view class="item" v-for="item in list" :key="item.id">
-				{{item.name}} - {{item.type}} - {{item.number}}
+			<view class="item" v-for="item in list" :key="item.id" @click="handleAdd(item)">
+				{{item.name}} -- {{item.identityType}} -- {{item.idCard}}
 			</view>
 		</view>
+
 	</view>
 </template>
 
@@ -35,67 +43,166 @@
 			return {
 				items: ['管理员', '子管理员'],
 				current: 0,
-				list: [{
-						id: 1,
-						name: "张三",
-						number: 360730199525462589,
-						type: "学生"
-					},
-					{
-						id: 2,
-						name: "李四",
-						number: 360730199525462589,
-						type: "老师"
-					},
-					{
-						id: 3,
-						name: "王五",
-						number: 360730199525462589,
-						type: "教职工"
-					},
-				],
-				chooseList: [{
-						id: 1,
-						name: "张三",
-					},
-					{
-						id: 2,
-						name: "李四",
-					},
-					{
-						id: 3,
-						name: "王五",
-					},
-					{
-						id: 4,
-						name: "李四",
-					},
-					{
-						id: 5,
-						name: "王五",
-					},
-					{
-						id: 6,
-						name: "李四",
-					},
-					{
-						id: 7,
-						name: "王五",
-					},
-				]
+				searchValue: "",
+				roleId: 2,
+				list: [],
+				chooseList: [],
+				typeValue: "管理员"
 			};
 		},
+		onLoad() {
+			this.getData()
+		},
 		methods: {
+			// 获取权限列表数据
+			async getData() {
+				let res = await this.$myRequest({
+					url: "/attendance/api/system/user/list",
+					data: {
+						roleId: this.roleId,
+						size: 9999
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.chooseList = res.data.list
+				}
+			},
+			// 获取搜索列表的数据
+			async getSearchData() {
+				if (this.searchValue) {
+					let res = await this.$myRequest({
+						url: "/attendance/api/system/user/list",
+						data: {
+							name: this.searchValue,
+							size: 9999
+						}
+					})
+					// console.log(res);
+					if (res.code == 200) {
+						this.list = res.data.list
+						this.list.forEach((ele) => {
+							if (ele.identityType == 0) {
+								ele.identityType = "其他"
+							} else if (ele.identityType == 1) {
+								ele.identityType = "学生"
+							} else if (ele.identityType == 4) {
+								ele.identityType = "教职工"
+							} else if (ele.identityType == 5) {
+								ele.identityType = "校友"
+							} else if (ele.identityType == 6) {
+								ele.identityType = "访客"
+							} else if (ele.identityType == 7) {
+								ele.identityType = "临时人员"
+							}
+						})
+					}
+				}
+			},
+			// 清空搜索框回调
+			clear() {
+				this.list = []
+			},
+			// 分段器点击回调
 			onClickItem(e) {
-				console.log(e.currentIndex);
-				// if (e.currentIndex == 0) {
-				// 	this.list = this.list2
-				// } else {
-				// 	this.list = this.list3
-				// }
+				this.list = []
+				this.searchValue = ""
+				// console.log(e.currentIndex);
+				if (e.currentIndex == 0) {
+					this.roleId = 2
+					this.typeValue = "管理员"
+				} else {
+					this.roleId = 3
+					this.typeValue = "子管理员"
+				}
+				this.getData()
 			},
-			handleDelete(id){
-				console.log(id);
+			// × 图标点击回调
+			handleDelete(item) {
+				uni.showModal({
+					title: '提示',
+					content: `确定将 ${item.name} 从${this.typeValue}列表中删除吗？`,
+					success: async (res) => {
+						if (res.confirm) {
+							let res = await this.$myRequest({
+								url: "/attendance/api/system/role/update/user",
+								method: "put",
+								header: {
+									'Authorization': uni.getStorageSync("token") ||
+										'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjo1MDQ2LCJ1c2VyX3V1aWQiOjEzNDc3NzE0NzM1NTY5NzE1MiwibmJmIjoxNjcxMTU1ODQzfQ.u4-N762Ijfb9RkuuFOFkeMiJQI9uCi0IaheJlGwi5Ms'
+								},
+								data: {
+									id: this.roleId,
+									addIds: [],
+									removeIds: [item.id]
+								}
+							})
+							// console.log(res);
+							if (res.code == 200 && res.data) {
+								uni.showToast({
+									title: "删除成功",
+									icon: 'success'
+								})
+								setTimeout(() => {
+									this.searchValue = ""
+									this.list = []
+									this.getData()
+								}, 1500)
+							}
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			// 点击添加回调
+			handleAdd(item) {
+				// 判断当前用户是否已经拥有该权限
+				let temList = []
+				this.chooseList.forEach((ele) => {
+					temList.push(ele.id)
+				})
+				let flag = temList.includes(item.id)
+
+				if (flag) {
+					uni.showModal({
+						title: '提示',
+						content: `当前用户已经是${this.typeValue}，请勿重复设置`,
+						showCancel: false
+					});
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: `确定将 ${item.name} 设置成${this.typeValue}吗？`,
+						success: async (res) => {
+							if (res.confirm) {
+								let res = await this.$myRequest({
+									url: "/attendance/api/system/role/update/user",
+									method: "put",
+									header: {
+										'Authorization': uni.getStorageSync("token") ||
+											'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjo1MDQ2LCJ1c2VyX3V1aWQiOjEzNDc3NzE0NzM1NTY5NzE1MiwibmJmIjoxNjcxMTU1ODQzfQ.u4-N762Ijfb9RkuuFOFkeMiJQI9uCi0IaheJlGwi5Ms'
+									},
+									data: {
+										id: this.roleId,
+										addIds: [item.id],
+										removeIds: []
+									}
+								})
+								// console.log(res);
+								if (res.code == 200 && res.data) {
+									uni.showToast({
+										title: "添加成功",
+										icon: 'success'
+									})
+									setTimeout(() => {
+										this.searchValue = ""
+										this.list = []
+										this.getData()
+									}, 1500)
+								}
+							} else if (res.cancel) {}
+						}
+					});
+				}
 			}
 		}
 	}
@@ -114,6 +221,16 @@
 			background-color: #fff;
 		}
 
+		.search {
+			box-sizing: border-box;
+			margin-top: 20rpx;
+			padding: 0 30rpx;
+			width: 750rpx;
+			height: 90rpx;
+			border-radius: 170rpx;
+			background-color: #fff;
+		}
+
 		.choose {
 			display: flex;
 			flex-wrap: wrap;
@@ -161,11 +278,16 @@
 			background-color: #fff;
 
 			.item {
-				margin-bottom: 22rpx;
+				margin-bottom: 30rpx;
 				margin-left: 65rpx;
 				height: 41rpx;
 				font-size: 28rpx;
 			}
 		}
 	}
+
+	// 解决输入框不居中问题
+	::v-deep .uni-searchbar {
+		padding: 10rpx;
+	}
 </style>

pages/punchLocation/punchLocation.vue

@@ -27,7 +27,7 @@
 								{{item.name}}
 							</view>
 							<view class="center">
-								地址：{{item.address}}
+								地址：{{item.name}}
 							</view>
 							<view class="bottom">
 								范围：{{item.radius}}米
@@ -48,6 +48,8 @@
 		data() {
 			return {
 				list: [],
+				id: "",
+				type: "",
 				options: [{
 					text: '删除',
 					style: {
@@ -56,23 +58,40 @@
 				}],
 			}
 		},
-		onLoad() {
-
+		onLoad(options) {
+			this.type = options.type
+			if (options.id) {
+				this.id = options.id
+				this.getRuleDetail()
+			}
 		},
 		onShow() {
-			let arr = uni.getStorageSync("chooseList")
+			let arr = uni.getStorageSync("chooseList")||uni.getStorageSync("chooseList_edit")
 			if (arr) {
 				this.list = arr
 			}
 		},
 		methods: {
+			// 获取打卡规则的详细信息
+			async getRuleDetail() {
+				let res = await this.$myRequest({
+					url: `/attendance/api/settings/rule/detail/${this.id}`
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.list = res.data.locations
+					uni.setStorageSync("chooseList_edit", this.list)
+				}
+			},
+
+			// 点击添加打卡位置回调
 			handleAdd() {
 				// 获取用户位置权限
 				uni.authorize({
 					scope: 'scope.userLocation',
-					success() {
+					success:() => {
 						uni.navigateTo({
-							url: "/pages/addLocation/addLocation"
+							url: `/pages/addLocation/addLocation?type=${this.type}`
 						})
 					},
 					fail() {
@@ -94,14 +113,17 @@
 			},
 			// 点击右侧删除按钮回调
 			onClick(index) {
-				console.log(index);
 				uni.showModal({
 					title: '提示',
 					content: '确定删除该打卡位置吗？',
 					success: (res) => {
 						if (res.confirm) {
 							this.list.splice(index, 1)
-							uni.setStorageSync("chooseList", this.list)
+							if (this.type == 1) {
+								uni.setStorageSync("chooseList_edit", this.list)
+							} else {
+								uni.setStorageSync("chooseList", this.list)
+							}
 							uni.showToast({
 								title: "删除成功",
 								icon: 'success'

pages/punchTime/punchTime.vue

@@ -53,6 +53,7 @@
 		data() {
 			return {
 				list: [],
+				type: "",
 				options: [{
 					text: '删除',
 					style: {
@@ -62,7 +63,8 @@
 			}
 		},
 		onLoad(options) {
-			if(options.time){
+			this.type = options.type
+			if (options.time) {
 				let time = JSON.parse(options.time)
 				let periods = JSON.parse(options.periods)
 				console.log(time);
@@ -81,11 +83,11 @@
 					list: periods
 				})
 				this.list = temList
-				uni.setStorageSync("ruleTime", this.list)
+				uni.setStorageSync("ruleTime_edit", this.list)
 			}
 		},
 		onShow() {
-			let ruleTime = uni.getStorageSync("ruleTime")
+			let ruleTime = uni.getStorageSync("ruleTime_edit")
 			if (ruleTime) {
 				this.list = ruleTime
 			}
@@ -94,7 +96,7 @@
 			// 点击添加打卡时间回调 跳转到添加页面
 			handleAdd() {
 				uni.navigateTo({
-					url: `/pages/setPunchTime/setPunchTime?flag=1`
+					url: `/pages/setPunchTime/setPunchTime?flag=1&type=${this.type}`
 				})
 			},
 			// 点击每一个时间段回调 跳转到编辑页面
@@ -117,7 +119,11 @@
 								icon: 'success'
 							})
 							this.list.splice(index, 1)
-							uni.setStorageSync("ruleTime", this.list)
+							if (this.type == 1) {
+								uni.setStorageSync("ruleTime_edit", this.list)
+							} else {
+								uni.setStorageSync("ruleTime", this.list)
+							}
 							var flag = uni.getStorageSync("ruleTime")
 							if (flag == []) {
 								uni.setStorageSync("flag", true)
@@ -187,12 +193,13 @@
 				height: 132rpx;
 				border-radius: 14rpx;
 				background-color: #fff;
+				overflow: hidden;
 
 				.left {
-					flex: 5;
 					display: flex;
 					flex-direction: column;
 					margin-left: 17rpx;
+					width: 492rpx;
 
 					.week {
 						flex: 1;
@@ -220,10 +227,10 @@
 				}
 
 				.right {
-					flex: 2;
 					display: flex;
 					justify-content: flex-end;
 					align-items: center;
+					width: 198rpx;
 
 					img {
 						margin-right: 20rpx;

pages/ruleName/ruleName.vue

@@ -28,7 +28,8 @@
 						icon: 'none'
 					})
 				} else {
-					uni.setStorageSync("ruleName", this.name)
+					// uni.setStorageSync("ruleName", this.name)
+					uni.$emit('updateRuleName', this.name)
 					uni.navigateBack({
 						delta: 1
 					})

pages/setPunchTime/setPunchTime.vue

@@ -108,11 +108,13 @@
 				// 添加时间 编辑时间 标识
 				flag: null,
 				// 时间列表索引
-				index: null
+				index: null,
+				type: ""
 			}
 		},
 		onLoad(options) {
 			this.flag = options.flag
+			this.type = options.type
 			if (this.flag == 1) {
 				uni.setNavigationBarTitle({
 					title: '添加打卡时间'
@@ -177,28 +179,64 @@
 								title: "保存成功",
 								icon: 'success'
 							})
-							setTimeout(() => {
-								let temList = uni.getStorageSync("ruleTime") || []
-								// 编辑时间
-								if (this.flag == 2) {
-									temList.splice(this.index, 1, {
-										selectedWeeks: this.selectedWeeks,
-										list: this.list,
-										holiday: this.holiday
-									})
-								} else {
-									// 添加时间
+							if (this.type == 1) {
+								setTimeout(() => {
+									let temList = uni.getStorageSync("ruleTime_edit") || []
 									temList.push({
 										selectedWeeks: this.selectedWeeks,
 										list: this.list,
 										holiday: this.holiday
 									})
-								}
-								uni.setStorageSync("ruleTime", temList)
-								uni.navigateBack({
-									delta: 1
-								})
-							}, 1500)
+									uni.setStorageSync("ruleTime_edit", temList)
+									uni.navigateBack({
+										delta: 1
+									})
+									// 	let temList = uni.getStorageSync("ruleTime_edit") || []
+									// 	// 编辑时间
+									// 	if (this.flag == 2) {
+									// 		temList.splice(this.index, 1, {
+									// 			selectedWeeks: this.selectedWeeks,
+									// 			list: this.list,
+									// 			holiday: this.holiday
+									// 		})
+									// 	} else {
+									// 		// 添加时间
+									// 		temList.push({
+									// 			selectedWeeks: this.selectedWeeks,
+									// 			list: this.list,
+									// 			holiday: this.holiday
+									// 		})
+									// 	}
+									// 	uni.setStorageSync("ruleTime", temList)
+									// 	uni.navigateBack({
+									// 		delta: 1
+									// 	})
+								}, 1500)
+							} else {
+								setTimeout(() => {
+									let temList = uni.getStorageSync("ruleTime") || []
+									// 编辑时间
+									if (this.flag == 2) {
+										temList.splice(this.index, 1, {
+											selectedWeeks: this.selectedWeeks,
+											list: this.list,
+											holiday: this.holiday
+										})
+									} else {
+										// 添加时间
+										temList.push({
+											selectedWeeks: this.selectedWeeks,
+											list: this.list,
+											holiday: this.holiday
+										})
+									}
+									uni.setStorageSync("ruleTime", temList)
+									uni.navigateBack({
+										delta: 1
+									})
+								}, 1500)
+							}
+
 						} else if (res.cancel) {}
 					}
 				});
@@ -247,7 +285,6 @@
 			},
 			// 点击右侧删除按钮回调
 			onClick(index) {
-				// console.log(index);
 				uni.showModal({
 					title: '提示',
 					content: '确定删除该打卡时间段吗？',

pages/statDetail/statDetail.vue

@@ -210,7 +210,7 @@
 				// console.log(res);
 				if (res.code == 200) {
 					this.total = res.data.total
-					this.list = res.data.list
+					this.list = [...res.data.list, ...this.list]
 					if (this.status == 4) {
 						this.items[0] = `打卡成功（${this.total}次）`
 						this.items[1] = `打卡失败`

unpackage/dist/dev/mp-weixin/common/main.js

@@ -22,7 +22,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 var dropDown = function dropDown() {
   Promise.all(/*! require.ensure | uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown")]).then((function () {
-    return resolve(__webpack_require__(/*! @/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */ 230));
+    return resolve(__webpack_require__(/*! @/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */ 231));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component("dropDown", dropDown);

unpackage/dist/dev/mp-weixin/pages/addLocation/addLocation.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniSearchBar: function () {
-      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 237))
+      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 238))
     },
   }
 } catch (e) {
@@ -251,15 +251,17 @@ var _default = {
       placeList: [],
       // 范围数值
       rangeValue: 300,
-      chooseList: []
+      chooseList: [],
+      type: ""
     };
   },
-  onLoad: function onLoad() {
+  onLoad: function onLoad(options) {
     // 实例化API核心类
     qqmapsdk = new QQMapWX({
       // 申请的key
       key: 'R43BZ-2XROX-L7T45-T5OQI-IBDFT-GNBOI'
     });
+    this.type = options.type;
     this.getLocationData();
   },
   methods: {
@@ -321,18 +323,33 @@ var _default = {
     // 选择单个地址时的回调
     handleChoose: function handleChoose(item) {
       // console.log(item);
-      var arr = uni.getStorageSync("chooseList");
-      if (arr) {
-        this.chooseList = uni.getStorageSync("chooseList");
+      if (this.type == 1) {
+        var arr = uni.getStorageSync("chooseList_edit");
+        if (arr.length) {
+          this.chooseList = arr;
+        }
+        this.chooseList.push({
+          name: item.title,
+          address: item.address,
+          radius: this.rangeValue,
+          lat: item.location.lat,
+          lng: item.location.lng
+        });
+        uni.setStorageSync("chooseList_edit", this.chooseList);
+      } else {
+        var _arr = uni.getStorageSync("chooseList");
+        if (_arr.length) {
+          this.chooseList = _arr;
+        }
+        this.chooseList.push({
+          name: item.title,
+          address: item.address,
+          radius: this.rangeValue,
+          lat: item.location.lat,
+          lng: item.location.lng
+        });
+        uni.setStorageSync("chooseList", this.chooseList);
       }
-      this.chooseList.push({
-        name: item.title,
-        address: item.address,
-        radius: this.rangeValue,
-        lat: item.location.lat,
-        lng: item.location.lng
-      });
-      uni.setStorageSync("chooseList", this.chooseList);
       uni.navigateBack({
         delta: 1
       });

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

@@ -101,25 +101,25 @@ var components
 try {
   components = {
     uniSearchBar: function () {
-      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 237))
+      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 238))
     },
     uniSwipeAction: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 248))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 249))
     },
     uniSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 253))
+      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 254))
     },
     uniCollapse: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 265))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 266))
     },
     uniCollapseItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 272))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 273))
     },
     uniPopup: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 279))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 280))
     },
     tkiTree: function () {
-      return __webpack_require__.e(/*! import() | components/tki-tree/tki-tree */ "components/tki-tree/tki-tree").then(__webpack_require__.bind(null, /*! @/components/tki-tree/tki-tree.vue */ 286))
+      return __webpack_require__.e(/*! import() | components/tki-tree/tki-tree */ "components/tki-tree/tki-tree").then(__webpack_require__.bind(null, /*! @/components/tki-tree/tki-tree.vue */ 287))
     },
   }
 } catch (e) {
@@ -202,7 +202,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 var tkiTree = function tkiTree() {
   __webpack_require__.e(/*! require.ensure | components/tki-tree/tki-tree */ "components/tki-tree/tki-tree").then((function () {
-    return resolve(__webpack_require__(/*! @/components/tki-tree/tki-tree.vue */ 286));
+    return resolve(__webpack_require__(/*! @/components/tki-tree/tki-tree.vue */ 287));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -475,7 +475,8 @@ var _default = {
           icon: "none"
         });
       } else {
-        uni.setStorageSync("ruleGroup", temList);
+        // uni.setStorageSync("ruleGroup", temList)
+        uni.$emit('updateRuleGroup', temList);
         uni.navigateBack({
           delta: 1
         });

unpackage/dist/dev/mp-weixin/pages/home/home.js

@@ -102,14 +102,16 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var l0 = _vm.__map(_vm.list, function (item, __i0__) {
-    var $orig = _vm.__get_orig(item)
-    var m0 = item.finish ? __webpack_require__(/*! ./imgs/success.png */ 46) : null
-    return {
-      $orig: $orig,
-      m0: m0,
-    }
-  })
+  var l0 = _vm.list.length
+    ? _vm.__map(_vm.list, function (item, __i0__) {
+        var $orig = _vm.__get_orig(item)
+        var m0 = item.finish ? __webpack_require__(/*! ./imgs/success.png */ 46) : null
+        return {
+          $orig: $orig,
+          m0: m0,
+        }
+      })
+    : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -238,6 +240,8 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
 
 var QQMapWX = __webpack_require__(/*! ../../util/qqmap-wx-jssdk1.1/qqmap-wx-jssdk */ 49);
 var qqmapsdk;
@@ -247,22 +251,7 @@ var _default = {
       // 用户信息
       userInfo: {},
       // 打卡规则列表
-      list: [{
-        id: 1,
-        title: "课间操打卡规则",
-        time: "08:00-9:00",
-        type: "已打卡"
-      }, {
-        id: 2,
-        title: "课间操打卡规则2",
-        time: "08:00-10:00",
-        type: "未打卡"
-      }, {
-        id: 3,
-        title: "课间操打卡规则3",
-        time: "08:00-19:00",
-        type: "已打卡"
-      }],
+      list: [],
       flags: true,
       addressFlags: false,
       timeFlags: false,
@@ -275,6 +264,8 @@ var _default = {
     };
   },
   onLoad: function onLoad() {
+    uni.removeStorageSync("manager");
+    uni.removeStorageSync("sub-administrator");
     // 实例化API核心类
     qqmapsdk = new QQMapWX({
       // 申请的key
@@ -311,7 +302,7 @@ var _default = {
     getUserInfo: function getUserInfo() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var userId, res;
+        var userId, res, temList, flag, flag2;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -326,6 +317,20 @@ var _default = {
                 // console.log(res);
                 if (res.code == 200) {
                   _this2.userInfo = res.data;
+                  if (_this2.userInfo.roles) {
+                    temList = [];
+                    _this2.userInfo.roles.forEach(function (ele) {
+                      temList.push(ele.id);
+                    });
+                    flag = temList.includes(2);
+                    flag2 = temList.includes(3);
+                    if (flag) {
+                      uni.setStorageSync("manager", flag);
+                    }
+                    if (flag2) {
+                      uni.setStorageSync("sub-administrator", flag2);
+                    }
+                  }
                 }
               case 5:
               case "end":

unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -103,11 +103,13 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var m0 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var m1 = !_vm.flag ? __webpack_require__(/*! ../../static/noPower.png */ 395) : null
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         m0: m0,
+        m1: m1,
       },
     }
   )
@@ -168,9 +170,19 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
+      flag: false,
       list: [{
         id: 1,
         icon: "../../static/my1.png",
@@ -194,6 +206,13 @@ var _default = {
       }]
     };
   },
+  onLoad: function onLoad() {
+    var flag = uni.getStorageSync("manager");
+    var flag2 = uni.getStorageSync("sub-administrator");
+    if (flag || flag2) {
+      this.flag = true;
+    }
+  },
   methods: {
     handleClick: function handleClick(item) {
       // console.log(item.url);

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

@@ -33,4 +33,23 @@
   width: 24rpx;
   height: 32rpx;
 }
+.container2.data-v-0be17cc6 {
+  width: 100vw;
+  height: 100vh;
+  text-align: center;
+  background-color: #fff;
+}
+.container2 .img.data-v-0be17cc6 {
+  margin: 0 auto;
+  padding-top: 288rpx;
+  width: 480rpx;
+  height: 508rpx;
+}
+.container2 .img ._img.data-v-0be17cc6 {
+  width: 100%;
+  height: 100%;
+}
+.container2 .info.data-v-0be17cc6 {
+  color: #5792F0;
+}
 

unpackage/dist/dev/mp-weixin/pages/particulars/particulars.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniSearchBar: function () {
-      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 237))
+      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 238))
     },
   }
 } catch (e) {

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

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "权限设置",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "uni-segmented-control": "/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control"
+    "uni-segmented-control": "/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control",
+    "uni-search-bar": "/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar"
   }
 }

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

@@ -12,6 +12,15 @@
   height: 86rpx;
   background-color: #fff;
 }
+.container .search.data-v-51d37726 {
+  box-sizing: border-box;
+  margin-top: 20rpx;
+  padding: 0 30rpx;
+  width: 750rpx;
+  height: 90rpx;
+  border-radius: 170rpx;
+  background-color: #fff;
+}
 .container .choose.data-v-51d37726 {
   display: flex;
   flex-wrap: wrap;
@@ -54,9 +63,12 @@
   background-color: #fff;
 }
 .container .list .item.data-v-51d37726 {
-  margin-bottom: 22rpx;
+  margin-bottom: 30rpx;
   margin-left: 65rpx;
   height: 41rpx;
   font-size: 28rpx;
 }
+.data-v-51d37726 .uni-searchbar {
+  padding: 10rpx;
+}
 

unpackage/dist/dev/mp-weixin/pages/punchLocation/punchLocation.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uniSwipeAction: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 248))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 249))
     },
     uniSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 253))
+      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 254))
     },
   }
 } catch (e) {
@@ -176,10 +176,13 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 3);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 //
 //
 //
@@ -229,6 +232,8 @@ var _default = {
   data: function data() {
     return {
       list: [],
+      id: "",
+      type: "",
       options: [{
         text: '删除',
         style: {
@@ -237,21 +242,57 @@ var _default = {
       }]
     };
   },
-  onLoad: function onLoad() {},
+  onLoad: function onLoad(options) {
+    this.type = options.type;
+    if (options.id) {
+      this.id = options.id;
+      this.getRuleDetail();
+    }
+  },
   onShow: function onShow() {
-    var arr = uni.getStorageSync("chooseList");
+    var arr = uni.getStorageSync("chooseList") || uni.getStorageSync("chooseList_edit");
     if (arr) {
       this.list = arr;
     }
   },
   methods: {
+    // 获取打卡规则的详细信息
+    getRuleDetail: function getRuleDetail() {
+      var _this = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var res;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this.$myRequest({
+                  url: "/attendance/api/settings/rule/detail/".concat(_this.id)
+                });
+              case 2:
+                res = _context.sent;
+                // console.log(res);
+                if (res.code == 200) {
+                  _this.list = res.data.locations;
+                  uni.setStorageSync("chooseList_edit", _this.list);
+                }
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    // 点击添加打卡位置回调
     handleAdd: function handleAdd() {
+      var _this2 = this;
       // 获取用户位置权限
       uni.authorize({
         scope: 'scope.userLocation',
         success: function success() {
           uni.navigateTo({
-            url: "/pages/addLocation/addLocation"
+            url: "/pages/addLocation/addLocation?type=".concat(_this2.type)
           });
         },
         fail: function fail() {
@@ -273,15 +314,18 @@ var _default = {
     },
     // 点击右侧删除按钮回调
     onClick: function onClick(index) {
-      var _this = this;
-      console.log(index);
+      var _this3 = this;
       uni.showModal({
         title: '提示',
         content: '确定删除该打卡位置吗？',
         success: function success(res) {
           if (res.confirm) {
-            _this.list.splice(index, 1);
-            uni.setStorageSync("chooseList", _this.list);
+            _this3.list.splice(index, 1);
+            if (_this3.type == 1) {
+              uni.setStorageSync("chooseList_edit", _this3.list);
+            } else {
+              uni.setStorageSync("chooseList", _this3.list);
+            }
             uni.showToast({
               title: "删除成功",
               icon: 'success'

unpackage/dist/dev/mp-weixin/pages/punchTime/punchTime.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uniSwipeAction: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 248))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 249))
     },
     uniSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 253))
+      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 254))
     },
   }
 } catch (e) {
@@ -241,6 +241,7 @@ var _default = {
   data: function data() {
     return {
       list: [],
+      type: "",
       options: [{
         text: '删除',
         style: {
@@ -250,6 +251,7 @@ var _default = {
     };
   },
   onLoad: function onLoad(options) {
+    this.type = options.type;
     if (options.time) {
       var time = JSON.parse(options.time);
       var periods = JSON.parse(options.periods);
@@ -269,11 +271,11 @@ var _default = {
         list: periods
       });
       this.list = temList;
-      uni.setStorageSync("ruleTime", this.list);
+      uni.setStorageSync("ruleTime_edit", this.list);
     }
   },
   onShow: function onShow() {
-    var ruleTime = uni.getStorageSync("ruleTime");
+    var ruleTime = uni.getStorageSync("ruleTime_edit");
     if (ruleTime) {
       this.list = ruleTime;
     }
@@ -282,7 +284,7 @@ var _default = {
     // 点击添加打卡时间回调 跳转到添加页面
     handleAdd: function handleAdd() {
       uni.navigateTo({
-        url: "/pages/setPunchTime/setPunchTime?flag=1"
+        url: "/pages/setPunchTime/setPunchTime?flag=1&type=".concat(this.type)
       });
     },
     // 点击每一个时间段回调 跳转到编辑页面
@@ -306,7 +308,11 @@ var _default = {
               icon: 'success'
             });
             _this.list.splice(index, 1);
-            uni.setStorageSync("ruleTime", _this.list);
+            if (_this.type == 1) {
+              uni.setStorageSync("ruleTime_edit", _this.list);
+            } else {
+              uni.setStorageSync("ruleTime", _this.list);
+            }
             var flag = uni.getStorageSync("ruleTime");
             if (flag == []) {
               uni.setStorageSync("flag", true);

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

@@ -43,12 +43,13 @@
   height: 132rpx;
   border-radius: 14rpx;
   background-color: #fff;
+  overflow: hidden;
 }
 .container .list .box .left.data-v-9a207284 {
-  flex: 5;
   display: flex;
   flex-direction: column;
   margin-left: 17rpx;
+  width: 492rpx;
 }
 .container .list .box .left .week.data-v-9a207284 {
   flex: 1;
@@ -71,10 +72,10 @@
   margin-right: 10rpx;
 }
 .container .list .box .right.data-v-9a207284 {
-  flex: 2;
   display: flex;
   justify-content: flex-end;
   align-items: center;
+  width: 198rpx;
 }
 .container .list .box .right ._img.data-v-9a207284 {
   margin-right: 20rpx;

unpackage/dist/dev/mp-weixin/pages/rulesDetail/rulesDetail.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uniSearchBar: function () {
-      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 237))
+      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 238))
     },
     uniSegmentedControl: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control */ "uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue */ 293))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control */ "uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue */ 294))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/setPunchTime/setPunchTime.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     jlkWeek: function () {
-      return Promise.all(/*! import() | uni_modules/jlk-week/components/jlk-week/jlk-week */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/jlk-week/components/jlk-week/jlk-week")]).then(__webpack_require__.bind(null, /*! @/uni_modules/jlk-week/components/jlk-week/jlk-week.vue */ 320))
+      return Promise.all(/*! import() | uni_modules/jlk-week/components/jlk-week/jlk-week */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/jlk-week/components/jlk-week/jlk-week")]).then(__webpack_require__.bind(null, /*! @/uni_modules/jlk-week/components/jlk-week/jlk-week.vue */ 321))
     },
     uniSwipeAction: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 248))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 249))
     },
     uniSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 253))
+      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 254))
     },
   }
 } catch (e) {
@@ -183,7 +183,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var JlkWeek = function JlkWeek() {
   Promise.all(/*! require.ensure | uni_modules/jlk-week/components/jlk-week/jlk-week */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/jlk-week/components/jlk-week/jlk-week")]).then((function () {
-    return resolve(__webpack_require__(/*! @/uni_modules/jlk-week/components/jlk-week/jlk-week.vue */ 320));
+    return resolve(__webpack_require__(/*! @/uni_modules/jlk-week/components/jlk-week/jlk-week.vue */ 321));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -213,11 +213,13 @@ var _default = {
       // 添加时间 编辑时间 标识
       flag: null,
       // 时间列表索引
-      index: null
+      index: null,
+      type: ""
     };
   },
   onLoad: function onLoad(options) {
     this.flag = options.flag;
+    this.type = options.type;
     if (this.flag == 1) {
       uni.setNavigationBarTitle({
         title: '添加打卡时间'
@@ -283,28 +285,63 @@ var _default = {
               title: "保存成功",
               icon: 'success'
             });
-            setTimeout(function () {
-              var temList = uni.getStorageSync("ruleTime") || [];
-              // 编辑时间
-              if (_this.flag == 2) {
-                temList.splice(_this.index, 1, {
-                  selectedWeeks: _this.selectedWeeks,
-                  list: _this.list,
-                  holiday: _this.holiday
-                });
-              } else {
-                // 添加时间
+            if (_this.type == 1) {
+              setTimeout(function () {
+                var temList = uni.getStorageSync("ruleTime_edit") || [];
                 temList.push({
                   selectedWeeks: _this.selectedWeeks,
                   list: _this.list,
                   holiday: _this.holiday
                 });
-              }
-              uni.setStorageSync("ruleTime", temList);
-              uni.navigateBack({
-                delta: 1
-              });
-            }, 1500);
+                uni.setStorageSync("ruleTime_edit", temList);
+                uni.navigateBack({
+                  delta: 1
+                });
+                // 	let temList = uni.getStorageSync("ruleTime_edit") || []
+                // 	// 编辑时间
+                // 	if (this.flag == 2) {
+                // 		temList.splice(this.index, 1, {
+                // 			selectedWeeks: this.selectedWeeks,
+                // 			list: this.list,
+                // 			holiday: this.holiday
+                // 		})
+                // 	} else {
+                // 		// 添加时间
+                // 		temList.push({
+                // 			selectedWeeks: this.selectedWeeks,
+                // 			list: this.list,
+                // 			holiday: this.holiday
+                // 		})
+                // 	}
+                // 	uni.setStorageSync("ruleTime", temList)
+                // 	uni.navigateBack({
+                // 		delta: 1
+                // 	})
+              }, 1500);
+            } else {
+              setTimeout(function () {
+                var temList = uni.getStorageSync("ruleTime") || [];
+                // 编辑时间
+                if (_this.flag == 2) {
+                  temList.splice(_this.index, 1, {
+                    selectedWeeks: _this.selectedWeeks,
+                    list: _this.list,
+                    holiday: _this.holiday
+                  });
+                } else {
+                  // 添加时间
+                  temList.push({
+                    selectedWeeks: _this.selectedWeeks,
+                    list: _this.list,
+                    holiday: _this.holiday
+                  });
+                }
+                uni.setStorageSync("ruleTime", temList);
+                uni.navigateBack({
+                  delta: 1
+                });
+              }, 1500);
+            }
           } else if (res.cancel) {}
         }
       });
@@ -353,7 +390,6 @@ var _default = {
     // 点击右侧删除按钮回调
     onClick: function onClick(index) {
       var _this2 = this;
-      // console.log(index);
       uni.showModal({
         title: '提示',
         content: '确定删除该打卡时间段吗？',

unpackage/dist/dev/mp-weixin/pages/stat/stat.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uniSegmentedControl: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control */ "uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue */ 293))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control */ "uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue */ 294))
     },
     uniCalendar: function () {
-      return Promise.all(/*! import() | uni_modules/uni-calendar/components/uni-calendar/uni-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-calendar/components/uni-calendar/uni-calendar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue */ 300))
+      return Promise.all(/*! import() | uni_modules/uni-calendar/components/uni-calendar/uni-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-calendar/components/uni-calendar/uni-calendar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue */ 301))
     },
   }
 } catch (e) {
@@ -194,7 +194,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 10));
 var progressBar = function progressBar() {
   __webpack_require__.e(/*! require.ensure | components/chocolate-progress-bar/chocolate-progress-bar */ "components/chocolate-progress-bar/chocolate-progress-bar").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/chocolate-progress-bar/chocolate-progress-bar.vue */ 313));
+    return resolve(__webpack_require__(/*! ../../components/chocolate-progress-bar/chocolate-progress-bar.vue */ 314));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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

@@ -56,6 +56,13 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/powerSet/powerSet",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }