no message

pages/addRules/addRules.vue

@@ -127,7 +127,9 @@
 				locations: []
 			};
 		},
-		onLoad() {},
+		onLoad() {
+			uni.removeStorageSync("flag_place")
+		},
 		onShow() {
 			let ruleName = uni.getStorageSync("ruleName")
 			if (ruleName) {
@@ -184,7 +186,13 @@
 			}
 
 			let temPlace = uni.getStorageSync("chooseList")
-			if (temPlace) {
+			let flag = uni.getStorageSync("flag_place")
+
+			if (temPlace.length == 0 && flag) {
+				this.place = "未设置"
+				uni.removeStorageSync("chooseList")
+			}
+			if (temPlace.length > 0) {
 				this.locations = temPlace
 				let temList = []
 				temPlace.forEach((ele) => {
@@ -193,6 +201,7 @@
 				this.place = temList.join("，")
 			}
 
+
 			let ruleValue = uni.getStorageSync("ruleValue")
 			if (ruleValue) {
 				this.value = ruleValue
@@ -316,13 +325,13 @@
 			// 点击规则名称跳转回调
 			goPageRuleName() {
 				uni.navigateTo({
-					url: "/pages/ruleName/ruleName"
+					url: `/pages/ruleName/ruleName?type=2`
 				})
 			},
 			// 点击考勤组跳转回调
 			goPageGroup() {
 				uni.navigateTo({
-					url: `/pages/group/group?flag=2`
+					url: `/pages/group/group?flag=2&type=2`
 				})
 			},
 			// 点击打卡时间跳转回调

pages/editRules/editRules.vue

@@ -133,6 +133,8 @@
 		},
 		onLoad(option) {
 			uni.removeStorageSync("chooseList_edit")
+			uni.removeStorageSync("ruleTime_edit")
+			uni.removeStorageSync("flag")
 			uni.$on('updateRuleName', (data) => {
 				this.ruleName = data
 			})
@@ -231,17 +233,17 @@
 			// 		this.group = temList.join("，")
 			// 	}
 
-				let ruleTime = uni.getStorageSync("ruleTime")
+				let ruleTime = uni.getStorageSync("ruleTime")||uni.getStorageSync("ruleTime_edit")
 				let flag = uni.getStorageSync("flag")
-				console.log(ruleTime);
-				console.log(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
+					// this.time = ruleTime[0].selectedWeeks
+					// this.periods = ruleTime[0].list
+					// this.time = ruleTime
 					let temList = []
 					ruleTime.forEach((ele) => {
 						temList.push({
@@ -249,32 +251,39 @@
 							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
-							}
-						})
+					// 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.periods = []
+					this.time = []
+					temList.forEach((element)=>{
+						this.time.push(element.dayOfWeeks.join("，"))
+						this.periods.push(element.periods[0])
 					})
 					this.timeGroups = temList
+					console.log(temList);
 				}
 				console.log(this.periods);
 				console.log(this.time);
@@ -372,13 +381,13 @@
 			// 点击规则名称跳转回调
 			goPageRuleName() {
 				uni.navigateTo({
-					url: `/pages/ruleName/ruleName`
+					url: `/pages/ruleName/ruleName?type=1`
 				})
 			},
 			// 点击考勤组跳转回调
 			goPageGroup() {
 				uni.navigateTo({
-					url: `/pages/group/group?flag=2`
+					url: `/pages/group/group?flag=2&type=1`
 				})
 			},
 			// 点击打卡时间跳转回调

pages/group/group.vue

@@ -153,10 +153,12 @@
 				list: [],
 				// 考勤组范围数组
 				range: [],
+				type:""
 			};
 		},
 		onLoad(options) {
 			this.flag = options.flag
+			this.type = options.type
 			if (this.flag == 1) {
 				this.checkStatus = true
 			}
@@ -324,8 +326,11 @@
 						icon: "none"
 					})
 				} else {
-					// uni.setStorageSync("ruleGroup", temList)
-					uni.$emit('updateRuleGroup', temList)
+					if (this.type == 1) {
+						uni.$emit('updateRuleGroup', temList)
+					} else {
+						uni.setStorageSync("ruleGroup", temList)
+					}
 					uni.navigateBack({
 						delta: 1
 					})
@@ -367,7 +372,7 @@
 								uni.showToast({
 									title: res.message,
 									icon: 'none',
-									duration:3000
+									duration: 3000
 								})
 							}
 						} else if (res.cancel) {}

pages/punchLocation/punchLocation.vue

@@ -66,7 +66,7 @@
 			}
 		},
 		onShow() {
-			let arr = uni.getStorageSync("chooseList")||uni.getStorageSync("chooseList_edit")
+			let arr = uni.getStorageSync("chooseList") || uni.getStorageSync("chooseList_edit")
 			if (arr) {
 				this.list = arr
 			}
@@ -89,7 +89,7 @@
 				// 获取用户位置权限
 				uni.authorize({
 					scope: 'scope.userLocation',
-					success:() => {
+					success: () => {
 						uni.navigateTo({
 							url: `/pages/addLocation/addLocation?type=${this.type}`
 						})
@@ -118,16 +118,20 @@
 					content: '确定删除该打卡位置吗？',
 					success: (res) => {
 						if (res.confirm) {
+							uni.showToast({
+								title: "删除成功",
+								icon: 'success'
+							})
 							this.list.splice(index, 1)
 							if (this.type == 1) {
 								uni.setStorageSync("chooseList_edit", this.list)
 							} else {
 								uni.setStorageSync("chooseList", this.list)
 							}
-							uni.showToast({
-								title: "删除成功",
-								icon: 'success'
-							})
+							var flag = uni.getStorageSync("chooseList")
+							if (flag == []) {
+								uni.setStorageSync("flag_place", true)
+							}
 						} else if (res.cancel) {}
 					}
 				});

pages/punchTime/punchTime.vue

@@ -103,7 +103,7 @@
 			handleEdit(item, index) {
 				let info = JSON.stringify(item)
 				uni.navigateTo({
-					url: `/pages/setPunchTime/setPunchTime?flag=2&info=${info}&index=${index}`
+					url: `/pages/setPunchTime/setPunchTime?flag=2&info=${info}&index=${index}&type=${this.type}`
 				})
 			},
 			// 点击右侧删除按钮回调

pages/ruleName/ruleName.vue

@@ -16,9 +16,13 @@
 	export default {
 		data() {
 			return {
-				name: ""
+				name: "",
+				type: ""
 			};
 		},
+		onLoad(options) {
+			this.type = options.type
+		},
 		methods: {
 			// 点击确认按钮回调
 			handleConfirm() {
@@ -28,8 +32,11 @@
 						icon: 'none'
 					})
 				} else {
-					// uni.setStorageSync("ruleName", this.name)
-					uni.$emit('updateRuleName', this.name)
+					if (this.type == 1) {
+						uni.$emit('updateRuleName', this.name)
+					} else {
+						uni.setStorageSync("ruleName", this.name)
+					}
 					uni.navigateBack({
 						delta: 1
 					})

pages/setPunchTime/setPunchTime.vue

@@ -109,7 +109,7 @@
 				flag: null,
 				// 时间列表索引
 				index: null,
-				type: ""
+				type: "",
 			}
 		},
 		onLoad(options) {
@@ -125,7 +125,7 @@
 				});
 				this.index = options.index
 				this.info = JSON.parse(options.info)
-				// console.log(this.info);
+				console.log(this.info);
 				this.list = this.info.list
 				this.holiday = this.info.holiday
 				this.selectedWeeks = this.info.selectedWeeks.map((ele) => {
@@ -179,38 +179,53 @@
 								title: "保存成功",
 								icon: 'success'
 							})
+							this.selectedWeeks = this.selectedWeeks.map((ele) => {
+								if (ele == 1) {
+									return ele = '星期一'
+								}
+								if (ele == 2) {
+									return ele = '星期二'
+								}
+								if (ele == 3) {
+									return ele = '星期三'
+								}
+								if (ele == 4) {
+									return ele = '星期四'
+								}
+								if (ele == 5) {
+									return ele = '星期五'
+								}
+								if (ele == 6) {
+									return ele = '星期六'
+								}
+								if (ele == 0) {
+									return ele = '星期天'
+								}else {
+									return ele
+								}
+							})
+
+							// 从编辑规则页面进入
 							if (this.type == 1) {
 								setTimeout(() => {
 									let temList = uni.getStorageSync("ruleTime_edit") || []
-									temList.push({
-										selectedWeeks: this.selectedWeeks,
-										list: this.list,
-										holiday: this.holiday
-									})
+									if (this.flag == 1) {
+										temList.push({
+											selectedWeeks: this.selectedWeeks,
+											list: this.list,
+											holiday: this.holiday
+										})
+									} else {
+										temList.splice(this.index, 1, {
+											selectedWeeks: this.selectedWeeks,
+											list: this.list,
+											holiday: this.holiday
+										})
+									}
 									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(() => {
@@ -261,7 +276,7 @@
 				this.selectedWeeks = value.map((ele) => {
 					return ele = arr[ele]
 				})
-				// console.log(this.selectedWeeks);
+				console.log(this.selectedWeeks);
 			},
 			// 选择时间段回调
 			bindTimeChange(e, val, item) {

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 */ 231));
+    return resolve(__webpack_require__(/*! @/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */ 232));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component("dropDown", dropDown);

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 */ 238))
+      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 */ 239))
     },
     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 */ 249))
+      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 */ 250))
     },
     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 */ 254))
+      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 */ 255))
     },
     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 */ 266))
+      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 */ 267))
     },
     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 */ 273))
+      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 */ 274))
     },
     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 */ 280))
+      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 */ 281))
     },
     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 */ 287))
+      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 */ 288))
     },
   }
 } 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 */ 287));
+    return resolve(__webpack_require__(/*! @/components/tki-tree/tki-tree.vue */ 288));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -237,11 +237,13 @@ var _default = {
       // 考勤组列表数据
       list: [],
       // 考勤组范围数组
-      range: []
+      range: [],
+      type: ""
     };
   },
   onLoad: function onLoad(options) {
     this.flag = options.flag;
+    this.type = options.type;
     if (this.flag == 1) {
       this.checkStatus = true;
     }
@@ -475,8 +477,11 @@ var _default = {
           icon: "none"
         });
       } else {
-        // uni.setStorageSync("ruleGroup", temList)
-        uni.$emit('updateRuleGroup', temList);
+        if (this.type == 1) {
+          uni.$emit('updateRuleGroup', temList);
+        } else {
+          uni.setStorageSync("ruleGroup", temList);
+        }
         uni.navigateBack({
           delta: 1
         });

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 */ 294))
+      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 */ 295))
     },
     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 */ 301))
+      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 */ 302))
     },
   }
 } 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 */ 314));
+    return resolve(__webpack_require__(/*! ../../components/chocolate-progress-bar/chocolate-progress-bar.vue */ 315));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {