From 66570b7db3e6c425479ad502086757bc82fe2cfe Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Fri, 22 Mar 2024 19:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=97=A5=E5=8E=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/mixins.js                                |  4 ++
 config/api.js                                      |  6 +++
 config/utils.js                                    |  9 +++-
 pages/carEntry/evaluate/evaluate.vue               |  6 ++-
 pages/carEntry/signature/signature.vue             |  7 +--
 pages/indexEntry/enroll/registInfo/registInfo.vue  |  9 ++++
 .../findShcool/coachComment/coachInfo.vue          |  1 +
 .../findShcool/shcoolDetail/comp/tab1.vue          |  1 +
 .../findShcool/shcoolDetail/comp/tab3.vue          |  1 +
 pages/indexEntry/signIn/signIn.vue                 | 53 ++++++++++++----------
 pages/mineEntry/myAppointment/comp/comp.scss       |  4 ++
 pages/mineEntry/myAppointment/comp/opera.vue       |  7 +--
 pages/mineEntry/myAppointment/myAppointment.vue    |  2 +-
 pages/tabbar/index/index.vue                       |  3 +-
 pages/tabbar/learnCar/comp/topInfo.vue             |  3 +-
 store/modules/school.js                            |  9 ++--
 .../components/zeng-calen/zeng-calen.vue           |  6 +++
 17 files changed, 88 insertions(+), 43 deletions(-)

diff --git a/common/js/mixins.js b/common/js/mixins.js
index da2da5e..592ccec 100644
--- a/common/js/mixins.js
+++ b/common/js/mixins.js
@@ -20,6 +20,10 @@ export default {
 		setTimeout(()=>{
 			uni.stopPullDownRefresh()
 		},1500)
+		let token = this.$store.state.user.vuex_loginInfo.accessToken
+		if(token) {
+			this.$store.dispatch('getCity')
+		}
 	},
 	
 }
\ No newline at end of file
diff --git a/config/api.js b/config/api.js
index ba4da0c..ffd418e 100644
--- a/config/api.js
+++ b/config/api.js
@@ -208,6 +208,12 @@ export const signOut = (data) => http.post('business/student/sign/out', data)
 export const getStudentByPayment = (params={}) => http.get('app/student-record/getStudentByPayment', {params})
 // 补签
 export const reSignOut = (data) => http.post('business/student/sign/reSignOut', data) 
+// 学员扫码签到记录 -- 按月查询
+export const monthSignRecord = (data) => http.post('business/student/sign/monthSignRecord', data) 
+// 学员扫码签到记录 -- 按天查询
+export const signDetail = (data) => http.post('business/student/sign/signDetail', data) 
+
+
 
 
 
diff --git a/config/utils.js b/config/utils.js
index 361f01f..a0a2039 100644
--- a/config/utils.js
+++ b/config/utils.js
@@ -186,8 +186,15 @@ export function	uploadImgApi(filePath, imgName) {
 					console.log('***********')
 					console.log(item)
 					_this.$store.commit('upDateSchoolClass', {})
-					_this.$store.commit('upDateSchoolCoach', item)
 					if(obj.QrType==1) {
+						// 判断是扫教练码来的还是驾校码来的
+						if(item.id) {
+							_this.$store.commit('updateSchool', {})
+							_this.$store.commit('upDateSchoolCoach', item)
+						}else {
+							_this.$store.commit('upDateSchoolCoach', {})
+							_this.$store.commit('updateSchool', item)
+						}
 						_this.$u.utils.clickSignUp()
 					}else {
 						// 签到的
diff --git a/pages/carEntry/evaluate/evaluate.vue b/pages/carEntry/evaluate/evaluate.vue
index 7548c06..284bb4c 100644
--- a/pages/carEntry/evaluate/evaluate.vue
+++ b/pages/carEntry/evaluate/evaluate.vue
@@ -82,7 +82,8 @@ import school from '../../../store/modules/school'
 					"anonymity": 2,
 					"userId": 0,
 					imgArr: [],
-					coachType: this.coachType
+					photoPath: this.vuex_userInfo.schoolPhoto,
+					coachType: 1
 				}
 				this.coachInfo = {
 					tit: '您对教练满意吗？',
@@ -104,7 +105,8 @@ import school from '../../../store/modules/school'
 					"userId": 0,
 					coachName: '',
 					imgArr: [],
-					coachType: this.coachType
+					photoPath: this.vuex_userInfo.coachPhoto,
+					coachType: 1
 				}
 				if(this.tit=='模拟器老师') {
 					this.coachInfo.tit = '您对模拟器老师满意吗？'
diff --git a/pages/carEntry/signature/signature.vue b/pages/carEntry/signature/signature.vue
index 9ba0692..ab32802 100644
--- a/pages/carEntry/signature/signature.vue
+++ b/pages/carEntry/signature/signature.vue
@@ -26,6 +26,7 @@
 </template>
 <script>
 	// import { pathToBase64 } from '@/common/js/jssdk_image_tools.js'
+	import { uploadImgApi } from '@/config/utils.js'
 	var x = 20;
 	var y = 20;
 	export default {
@@ -140,7 +141,7 @@
 				uni.canvasToTempFilePath({
 					canvasId: 'mycanvas',
 					destWidth:160,
-					success: function(res) {
+					success:  async function (res) {
 						console.log('图片上传结果')
 						console.log(res)
 						if(!res || !res.tempFilePath) {
@@ -151,8 +152,8 @@
 						}else{
 							that.$emit('closeCanvas', res.tempFilePath);
 							console.log('这是临时路径？')
-							console.log(res.tempFilePath)
-							console.log(that.SignatureImg)
+							const imgLink = await uploadImgApi(res.tempFilePath, 'signatureImg')
+							console.log(imgLink)
 							// //用来解决安卓真机获取到的是canvas图片的临时路径，转成base64格式
 							// pathToBase64(res.tempFilePath).then(re => {
 							// 	that.SignatureImg = re;
diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue
index 2795d54..e21b6fe 100644
--- a/pages/indexEntry/enroll/registInfo/registInfo.vue
+++ b/pages/indexEntry/enroll/registInfo/registInfo.vue
@@ -331,6 +331,15 @@
 				this.form.schoolId = schoolCoach.schoolId
 				if(schoolCoach.teachCarType) this.form.trainType = schoolCoach.teachCarType.slice(0,2)
 			}
+			// 如果是扫驾校的二维码来的
+			let schoolCode = this.$store.state.school.schoolCode
+			if(schoolCode.schoolId) {
+				console.log('schoolCode')
+				console.log(schoolCode)
+				this.form.school = schoolCode.schoolName
+				this.form.schoolId = schoolCode.schoolId
+			}
+			
 			if(this.form.schoolId) {
 				this.getSchoolDetailFn()
 			}
diff --git a/pages/indexEntry/findShcool/coachComment/coachInfo.vue b/pages/indexEntry/findShcool/coachComment/coachInfo.vue
index 15fa117..d62490c 100644
--- a/pages/indexEntry/findShcool/coachComment/coachInfo.vue
+++ b/pages/indexEntry/findShcool/coachComment/coachInfo.vue
@@ -35,6 +35,7 @@
 				console.log(this.item)
 				this.$store.commit('upDateSchoolCoach', this.item)
 				this.$store.commit('upDateSchoolClass', {})
+				this.$store.commit('updateSchool', {})
 				this.$u.utils.clickSignUp()
 			}
 		},
diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
index b3d3b45..74c77a0 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab1.vue
@@ -20,6 +20,7 @@
 		methods: {
 			async goSign(item) {
 				this.$store.commit('upDateSchoolCoach', {})
+				this.$store.commit('updateSchool', {})
 				this.$store.commit('upDateSchoolClass', item)
 				this.$u.utils.clickSignUp()
 			}
diff --git a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
index b1fe607..9921e4e 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/comp/tab3.vue
@@ -43,6 +43,7 @@
 			// 去报名
 			goPageSign(item) {
 				this.$store.commit('upDateSchoolClass', {})
+				this.$store.commit('updateSchool', {})
 				this.$store.commit('upDateSchoolCoach', item)
 				this.$u.utils.clickSignUp()
 			},
diff --git a/pages/indexEntry/signIn/signIn.vue b/pages/indexEntry/signIn/signIn.vue
index 774097c..62089c2 100644
--- a/pages/indexEntry/signIn/signIn.vue
+++ b/pages/indexEntry/signIn/signIn.vue
@@ -1,13 +1,13 @@
 <template>
     <view class="pageBg pad">
-        <zeng-calen  :actDay="actDay" :chooseDayLack="chooseDayLack" @onDayClick='onDayClick' :chooseDay="chooseDay"></zeng-calen>
+        <zeng-calen  :actDay="actDay" :chooseDayLack="chooseDayLack" @onDayClick='onDayClick' @changeMonth="changeMonth" :chooseDay="chooseDay"></zeng-calen>
 		<view class="btnBg" style="margin: 20rpx 0;" @click="scanCodeClick">去签到/去签退</view>
-		<view class="card">
+		<view class="card" v-if="list.length">
 			<view class="h1"><text class="active">签到记录</text></view>
 			<view class="ul">
-				<view class="li" v-for="(item,index) in 4" :key="index">
-					<view class="lab">{{ index%2==0? '签退成功':'签到成功'}}</view>
-					<view class="date">2024-01-29  11:29</view>
+				<view class="li" v-for="(item,index) in list" :key="index">
+					<view class="lab">{{ item.loginStatus==1? '签退成功':'签到成功'}}</view>
+					<view class="date">{{item.signDate}}  <text style="margin-left: 10rpx;">{{ item.time }}</text></view>
 				</view>
 			</view>
 		</view>
@@ -17,6 +17,7 @@
 <script>
 	import zengCalen from '@/uni_modules/zeng-calen/components/zeng-calen/zeng-calen'
 	import { scanCodeFn } from '@/config/utils.js'
+	import { monthSignRecord, signDetail } from '@/config/api.js'
     export default {
 		components: {zengCalen},
         data() {
@@ -24,31 +25,37 @@
                 actDay: [], //用户选择的日期
                 chooseDay: ["2024-01-29", "2024-01-27", "2024-01-19", "2024-01-10"], //已被投标的数据
                 chooseDayLack: ["2024-01-29", ], //已被投标的数据
+				list: [],
+				signMonth: ''
             }
         },
         onLoad() {
-
+			this.signMonth = this.$u.timeFormat(Date.now(), 'yyyy-mm')
+			this.monthSignRecordFn()
         },
         methods: {
+			// 按月查询签到天数
+			async monthSignRecordFn() {
+				const {data: res} = await monthSignRecord({signMonth: this.signMonth})
+				this.chooseDay = res
+				if(res&&res.length) {
+					let day = res[res.length-1]
+					this.actDay = [day]
+					this.onDayClick(day)
+				}
+			},
+			changeMonth(ym) {
+				console.log(ym)
+				this.signMonth = ym
+				this.monthSignRecordFn(ym)
+				this.list = []
+			},
             // 展开日历
-            onDayClick(data) {
+            async onDayClick(data) {
 				this.actDay = [data]
-				return
-                // let choose = data.date //用户点中的数据
-                // if (this.actDay.includes(choose)) { //如果用户点击的日期已经存在
-                //     // 移除元素下标
-                //     const index = this.actDay.indexOf(choose);
-                //     //删除用户点击的日期
-                //     this.actDay.splice(index, 1)
-                // } else if (this.chooseDay.includes(choose)) { //判断是否已经被投标
-                //     uni.showToast({
-                //         title: "这个日期已经被投标了",
-                //         icon: "none"
-                //     })
-                // } else {
-                //     //添加用户点击的日期
-                //     this.actDay.push(choose)
-                // }
+				const {data: res} = await signDetail({signDate: data})
+				this.list = res || []
+				
             },
 			// 扫码
 			scanCodeClick() {
diff --git a/pages/mineEntry/myAppointment/comp/comp.scss b/pages/mineEntry/myAppointment/comp/comp.scss
index fa16d06..7e21f67 100644
--- a/pages/mineEntry/myAppointment/comp/comp.scss
+++ b/pages/mineEntry/myAppointment/comp/comp.scss
@@ -23,6 +23,10 @@
 				margin-right: 24rpx;
 				white-space: nowrap;
 				padding: 10rpx 18rpx;
+				&.tag2 {
+					background: rgba(144,12,64,0.1) !important;
+					color: #F158B9 !important;
+				}
 				
 			}
 
diff --git a/pages/mineEntry/myAppointment/comp/opera.vue b/pages/mineEntry/myAppointment/comp/opera.vue
index 61390bf..fe36cbc 100644
--- a/pages/mineEntry/myAppointment/comp/opera.vue
+++ b/pages/mineEntry/myAppointment/comp/opera.vue
@@ -3,7 +3,7 @@
 	<view class="consultItem">
 		<view class="top_row">
 			<view class="flex">
-				<view class="tag">{{item.subject==2?'科目二实操':item.subject==3?'科目三实操':'不限科目'}}</view>
+				<view class="tag" :class="{tag2: item.subject==2}">{{item.subject==2?'科目二实操':item.subject==3?'科目三实操':'不限科目'}}</view>
 				<view class="schoolName oneRowText">{{item.siteName}}</view>
 			</view>
 			<view class="status">
@@ -56,8 +56,5 @@
 
 <style lang="scss" scoped>
 	@import './comp.scss';
-	.tag {
-		background: rgba(144,12,64,0.1) !important;
-		color: #F158B9 !important;
-	}
+	
 </style>
\ No newline at end of file
diff --git a/pages/mineEntry/myAppointment/myAppointment.vue b/pages/mineEntry/myAppointment/myAppointment.vue
index 38b22c9..ef6e990 100644
--- a/pages/mineEntry/myAppointment/myAppointment.vue
+++ b/pages/mineEntry/myAppointment/myAppointment.vue
@@ -36,7 +36,7 @@
 				navList: [
 					{text: '全部', id: -1},
 					{text: '已签到', id: 1},
-					{text: '待完成', id: 0},
+					{text: '已签退', id: 2},
 					{text: '已取消', id: 9},
 					{text: '已过期', id: 3},
 				],
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 2504167..d3366e0 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -206,7 +206,7 @@
 						
 		},
 		onPullDownRefresh() {
-			 this.$store.dispatch('getCity')
+			 
 			this.initApi()
 		},
 		onShow() {
@@ -263,6 +263,7 @@
 				if(item.text=='学车报名') {
 					this.$store.commit('upDateSchoolCoach', {})
 					this.$store.commit('upDateSchoolClass', {})
+					this.$store.commit('updateSchool', {})
 				   return this.$u.utils.clickSignUp()
 				}
 				this.$goPage(item.url)
diff --git a/pages/tabbar/learnCar/comp/topInfo.vue b/pages/tabbar/learnCar/comp/topInfo.vue
index 6ea6212..7f7e50c 100644
--- a/pages/tabbar/learnCar/comp/topInfo.vue
+++ b/pages/tabbar/learnCar/comp/topInfo.vue
@@ -52,7 +52,8 @@
 					</view>
 				</view> -->
 			</view>
-			<view class="timerFlex" v-if="dynamics.classHourReachStatus">
+			 <!-- v-if="dynamics.classHourReachStatus" -->
+			<view class="timerFlex"> 
 				<view class="link-arrow" @click="$goPage('/pages/carEntry/signature/signature')">
 					<view class="txt">确认学时</view>
 					<u-icon name="arrow-right" color="#3776FF" :size="16"></u-icon>
diff --git a/store/modules/school.js b/store/modules/school.js
index dd7f534..094ac96 100644
--- a/store/modules/school.js
+++ b/store/modules/school.js
@@ -4,7 +4,7 @@ const school = {
 	state: {
 		schoolCoach: {},
 		schoolClass: {},
-		BizToken:  uni.getStorageSync('BizToken') ? uni.getStorageSync('BizToken') : ''
+		schoolCode:  {}
 		
 	},
 	mutations: {
@@ -15,11 +15,8 @@ const school = {
 		upDateSchoolClass(state, obj) {
 			state.schoolClass = obj
 		},
-		updateBizToken(state, val) {
-			uni.setStorageSync('BizToken', val)
-			state.BizToken = val
-			console.log('保存到store里了')
-			console.log(state.BizToken)
+		updateSchool(state, obj) {
+			state.schoolCode = obj
 		},
 		
 	},
diff --git a/uni_modules/zeng-calen/components/zeng-calen/zeng-calen.vue b/uni_modules/zeng-calen/components/zeng-calen/zeng-calen.vue
index b1cc673..4881856 100644
--- a/uni_modules/zeng-calen/components/zeng-calen/zeng-calen.vue
+++ b/uni_modules/zeng-calen/components/zeng-calen/zeng-calen.vue
@@ -275,11 +275,15 @@
 			},
 			//改变年月
 			changYearMonth(y, m) {
+				console.log('this.dates')
+				console.log(y,m)
 				this.dates = this.monthDay(y, m);
 				this.y = y;
 				this.m = m;
 			},
 			changeMonth(type) {
+				console.log(this.m)
+				console.log(this.y)
 				if (type == 'pre') {
 					if (this.m + 1 == 2) {
 						this.m = 12;
@@ -295,6 +299,8 @@
 						this.m = this.m + 1;
 					}
 				}
+				let ym = (this.y.toString().padStart(2, 0))+'-'+(this.m.toString().padStart(2, 0))
+				this.$emit('changeMonth', ym)
 				this.dates = this.monthDay(this.y, this.m);
 			}
 		}