no message

components/progress/progress.vue

@@ -29,7 +29,7 @@ export default {
 		},
 		progress_time: {
 			type: Number,
-			default: 1500
+			default: 0
 		},
 		progress_width: {
 			type: Number,

pages/addRules/addRules.vue

@@ -65,15 +65,10 @@
 			<view class="val2"><switch style="transform:scale(0.8)" color="#3396FB" :checked="takePicture" @change="switchChange_takePicture" /></view>
 		</view>
 
-		<!-- <view class="box">
-			<view class="name">
-				是否需要人脸识别：
-			</view>
-			<view class="val2">
-				<switch style="transform:scale(0.8)" color="#3396FB" :checked="faceRecognition"
-					@change="switchChange_faceRecognition" />
-			</view>
-		</view> -->
+		<view class="box">
+			<view class="name">是否需要人脸识别：</view>
+			<view class="val2"><switch style="transform:scale(0.8)" color="#3396FB" :checked="faceRecognition" @change="switchChange_faceRecognition" /></view>
+		</view>
 
 		<view class="box">
 			<view class="name">是否提前通知全部人员：</view>
@@ -272,7 +267,6 @@ export default {
 		// switch的值改变回调
 		switchChange(e) {
 			this.holiday = e.detail.value
-			// console.log(this.holiday);
 		},
 		switchChange_takePicture(e) {
 			this.takePicture = e.detail.value

pages/authentication/authentication.vue

@@ -39,8 +39,10 @@ export default {
 			id: '',
 			// 姓名
 			name: '',
-			// 身份证号
+			// 学号
 			cardNumber: '',
+			// 身份证号
+			idCard: '',
 			// 是否需要场景照片,值为1时是不需要
 			flag: ''
 		}
@@ -50,6 +52,7 @@ export default {
 		if (userInfo) {
 			this.name = userInfo.name
 			this.cardNumber = userInfo.cardNumber
+			this.idCard = userInfo.idCard
 		}
 		this.id = options.id
 		this.lat = options.latitude
@@ -105,7 +108,7 @@ export default {
 								url: imgUrl,
 								name: this.name,
 								// name: '周祥',
-								idCard: this.cardNumber,
+								idCard: this.idCard,
 								category: '校园打卡',
 								studentNumber: this.cardNumber
 							})

pages/cardRecord/cardRecord.vue

@@ -37,26 +37,18 @@
 				</view>
 				<!-- 图片区域 -->
 				<view class="imgs" v-if="item.status == 4">
-					<!-- <view class="imgs_item">
-						<view class="image" @click="handleBigImg(item.faceImage||'../../static/imgs/headImage.png')">
-							<img :src="item.faceImage||'../../static/imgs/headImage.png'">
-						</view>
-						<view class="title">
-							匹对照片
-						</view>
-					</view> -->
-
-					<!-- <view class="imgs_item">
-						<view class="image" @click="handleBigImg(item.matchFaceImage)">
-							<img :src="item.matchFaceImage||'../../static/imgs/headImage.png'">
-						</view>
-						<view class="title">
-							被匹对照片
-						</view>
-					</view> -->
-
-					<view class="imgs_item">
-						<view class="image" @click="handleBigImg(item.sceneImage)"><img :src="item.sceneImage || '../../static/imgs/headImage.png'" /></view>
+					<view class="imgs_item" v-if="item.faceImage">
+						<view class="image" @click="handleBigImg(item.faceImage)"><img :src="item.faceImage" /></view>
+						<view class="title">匹对照片</view>
+					</view>
+
+					<view class="imgs_item" v-if="item.matchFaceImage">
+						<view class="image" @click="handleBigImg(item.matchFaceImage)"><img :src="item.matchFaceImage" /></view>
+						<view class="title">被匹对照片</view>
+					</view>
+
+					<view class="imgs_item" v-if="item.sceneImage">
+						<view class="image" @click="handleBigImg(item.sceneImage)"><img :src="item.sceneImage" /></view>
 						<view class="title">场景照片</view>
 					</view>
 				</view>

pages/location/location.vue

@@ -50,9 +50,9 @@ export default {
 					id: 1,
 					latitude: null,
 					longitude: null,
-					iconPath: '../static/imgs/location.png',
-					width: 20,
-					height: 20
+					iconPath: '../../static/imgs/location.png',
+					width: 30,
+					height: 30
 				}
 			],
 			// 照片信息

pages/particulars/particulars.vue

@@ -110,7 +110,7 @@ export default {
 			// console.log(item);
 			let info = JSON.stringify(item)
 			uni.navigateTo({
-				url: `/pagesClockIn/rulesDetail/rulesDetail?info=${info}`
+				url: `/pages/rulesDetail/rulesDetail?info=${info}`
 			})
 		},
 		// 搜索框输入时的回调

pages/stat/stat.vue

@@ -181,7 +181,9 @@ export default {
 			// 当前页面的路由地址
 			pageUrl: '',
 			showTabBar: true,
-			timer: null
+			timer: null,
+			timer2: null,
+			currentYear: ''
 		}
 	},
 	onLoad() {
@@ -259,6 +261,7 @@ export default {
 		this.timer = setTimeout(() => {
 			this.showTabBar = false
 			this.showTabBar = true
+			this.timer = null
 		}, 500)
 	},
 	methods: {
@@ -285,6 +288,7 @@ export default {
 			this.month = month
 			this.day = day
 			this.nowTime = year + '-' + this.comMonth + '-' + day + ' ' + '00:00:00'
+			this.currentYear = year
 		},
 
 		// 获取我的月打卡次数
@@ -369,14 +373,18 @@ export default {
 		// 点击日历日期回调
 		change(e) {
 			// console.log('change 返回:', e.fulldate)
-			this.nowTime = e.fulldate + ' ' + '00:00:00'
-			if (this.current == 0) {
-				this.getProportion()
-			} else {
-				// this.list2 = []
-				// this.page_my = 1
-				this.getRulesList()
+			if (this.timer2) {
+				clearTimeout(this.timer2)
 			}
+			this.timer2 = setTimeout(() => {
+				this.nowTime = e.fulldate + ' ' + '00:00:00'
+				if (this.current == 0) {
+					this.getProportion()
+				} else {
+					this.getRulesList()
+				}
+				this.timer2 = null
+			}, 100)
 		},
 		// 分段器点击回调
 		onClickItem(e) {
@@ -452,9 +460,9 @@ export default {
 
 		// 往后选择年份回调
 		handleDoubleLeft() {
-			if (this.year <= 2000) {
+			if (this.year <= this.currentYear - 3) {
 				uni.showToast({
-					title: '不能选择2000年之前',
+					title: `不能选择${this.currentYear - 3}年之前`,
 					icon: 'none'
 				})
 			} else {
@@ -467,9 +475,9 @@ export default {
 		},
 		// 往前选择年份回调
 		handleDoubleRight() {
-			if (this.year >= 2025) {
+			if (this.year >= this.currentYear - 0 + 3) {
 				uni.showToast({
-					title: '不能选择2025年之后',
+					title: `不能选择${this.currentYear - 0 + 3}年之后`,
 					icon: 'none'
 				})
 			} else {
@@ -483,9 +491,9 @@ export default {
 		// 往后选择月份回调
 		handleLeft() {
 			if (this.month <= 1) {
-				if (this.year <= 2000) {
+				if (this.year <= this.currentYear - 3) {
 					uni.showToast({
-						title: '不能选择2000年之前',
+						title: `不能选择${this.currentYear - 3}年之前`,
 						icon: 'none'
 					})
 				} else {
@@ -507,9 +515,9 @@ export default {
 		// 往前选择月份回调
 		handleRight() {
 			if (this.month >= 12) {
-				if (this.year >= 2025) {
+				if (this.year >= this.currentYear - 0 + 3) {
 					uni.showToast({
-						title: '不能选择2025年之后',
+						title: `不能选择${this.currentYear - 0 + 3}年之后`,
 						icon: 'none'
 					})
 				} else {

pages/statDetail/statDetail.vue

@@ -29,7 +29,7 @@
 			<view class="box" v-for="(item, index) in list" :key="index">
 				<!-- 人物信息区域 -->
 				<view class="person">
-					<view class="img"><img :src="item.headImage || '../../static/imgs/headImage.png'" /></view>
+					<view class="img"><img :src="item.headImage || headImage" /></view>
 					<view class="info">
 						<view class="name">{{ item.name }}</view>
 						<view class="college">{{ item.college ? item.college : '南昌交通学院' }}</view>
@@ -37,25 +37,17 @@
 				</view>
 				<!-- 图片区域 -->
 				<view class="imgs" v-if="item.status == 4">
-					<!-- <view class="imgs_item">
-						<view class="image" @click="handleBigImg(item.faceImage||'../../static/imgs/headImage.png')">
-							<img :src="item.faceImage||'../../static/imgs/headImage.png'">
-						</view>
-						<view class="title">
-							匹对照片
-						</view>
-					</view> -->
-
-					<!-- <view class="imgs_item">
-						<view class="image" @click="handleBigImg(item.matchFaceImage)">
-							<img :src="item.matchFaceImage||'../../static/imgs/headImage.png'">
-						</view>
-						<view class="title">
-							被匹对照片
-						</view>
-					</view> -->
-					<view class="imgs_item">
-						<view class="image" @click="handleBigImg(item.sceneImage)"><img :src="item.sceneImage || '../../static/imgs/headImage.png'" /></view>
+					<view class="imgs_item" v-if="item.faceImage">
+						<view class="image" @click="handleBigImg(item.faceImage)"><img :src="item.faceImage" /></view>
+						<view class="title">匹对照片</view>
+					</view>
+
+					<view class="imgs_item" v-if="item.matchFaceImage">
+						<view class="image" @click="handleBigImg(item.matchFaceImage)"><img :src="item.matchFaceImage" /></view>
+						<view class="title">被匹对照片</view>
+					</view>
+					<view class="imgs_item" v-if="item.sceneImage">
+						<view class="image" @click="handleBigImg(item.sceneImage)"><img :src="item.sceneImage" /></view>
 						<view class="title">场景照片</view>
 					</view>
 				</view>
@@ -118,13 +110,16 @@ export default {
 			list: [],
 			// 弹窗图片路径
 			popupImg: '',
-			peopleId: ''
+			peopleId: '',
+			currentYear: ''
 		}
 	},
 	onLoad(options) {
 		if (options.id) {
 			this.peopleId = options.id
 		}
+		// let userInfo = uni.getStorageSync('clockIn_userInfo')
+		// console.log(userInfo)
 		this.getTime()
 		this.getListData()
 	},
@@ -156,6 +151,7 @@ export default {
 			let month = date.getMonth() + 1
 			this.month = month
 			this.year = year
+			this.currentYear = year
 		},
 
 		// 点击放大图片
@@ -182,11 +178,9 @@ export default {
 				this.total = res.data.total
 				this.list = [...this.list, ...res.data.list]
 				if (this.status == 4) {
-					this.items[0] = `打卡成功（${this.total}次）`
-					this.items[1] = `打卡失败`
+					this.items = [`打卡成功（${this.total}次）`, `打卡失败`]
 				} else {
-					this.items[0] = `打卡成功`
-					this.items[1] = `打卡失败（${this.total}次）`
+					this.items = [`打卡成功`, `打卡失败${this.total}次）`]
 				}
 			}
 		},
@@ -206,9 +200,9 @@ export default {
 
 		// 往后选择年份回调
 		handleDoubleLeft() {
-			if (this.year <= 2000) {
+			if (this.year <= this.currentYear - 3) {
 				uni.showToast({
-					title: '不能选择2000年之前',
+					title: `不能选择${this.currentYear - 3}年之前`,
 					icon: 'none'
 				})
 			} else {
@@ -220,9 +214,9 @@ export default {
 		},
 		// 往前选择年份回调
 		handleDoubleRight() {
-			if (this.year >= 2025) {
+			if (this.year >= this.currentYear - 0 + 3) {
 				uni.showToast({
-					title: '不能选择2025年之后',
+					title: `不能选择${this.currentYear - 0 + 3}年之后`,
 					icon: 'none'
 				})
 			} else {
@@ -235,9 +229,9 @@ export default {
 		// 往后选择月份回调
 		handleLeft() {
 			if (this.month <= 1) {
-				if (this.year <= 2000) {
+				if (this.year <= this.currentYear - 3) {
 					uni.showToast({
-						title: '不能选择2000年之前',
+						title: `不能选择${this.currentYear - 3}年之前`,
 						icon: 'none'
 					})
 				} else {
@@ -258,9 +252,9 @@ export default {
 		// 往前选择月份回调
 		handleRight() {
 			if (this.month >= 12) {
-				if (this.year >= 2025) {
+				if (this.year >= this.currentYear - 0 + 3) {
 					uni.showToast({
-						title: '不能选择2025年之后',
+						title: `不能选择${this.currentYear - 0 + 3}年之后`,
 						icon: 'none'
 					})
 				} else {

util/api.js

@@ -15,7 +15,6 @@ export const myRequest_clockIn = (options) => {
 			header: Object.assign({
 				'content-type': 'application/x-www-form-urlencoded',
 				'Authorization': uni.getStorageSync("clockIn_token"),
-				// 'Authorization': 'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjozNzMxLCJ1c2VyX3V1aWQiOjE4OTEyMjIzODg0MTIwMDY0MCwidXNlcl90eXBlIjowLCJuYmYiOjE2ODQxMTI3MjN9.ogWc3ynPNW_y2HM7iHCGKQC7KEKl_G6IeX5kx8d3czY',
 				'platform': 2,
 				'Accept-Language': 'zh-CN,zh;q=0.9'
 			}, options.header),