diff --git a/components/tabbar/VNavigationBar.vue b/components/tabbar/VNavigationBar.vue index 28b6f92..b3c68e9 100644 --- a/components/tabbar/VNavigationBar.vue +++ b/components/tabbar/VNavigationBar.vue @@ -8,22 +8,21 @@ - + @@ -85,9 +84,9 @@ back() { uni.navigateBack() }, - clearNoReadFun(){ - this.$emit('clearNoRead') - } + clearNoReadFun() { + this.$emit('clearNoRead') + } } } @@ -106,7 +105,7 @@ .navigationBarBack { position: absolute; - left: 20rpx; + left: 30rpx; } .navigationBarBackExtra { @@ -118,13 +117,15 @@ font-size: 36rpx; font-weight: bold; } + .navigationBarIcon { - display: flex; + display: flex; + } + + .clear-icon { + width: 40rpx; + height: 40rpx; + border-radius: 50%; } - .clear-icon{ - width: 40rpx; - height: 40rpx; - border-radius: 50%; - } } - + \ No newline at end of file diff --git a/config.js b/config.js index 66bf81f..1dc490e 100644 --- a/config.js +++ b/config.js @@ -5,8 +5,8 @@ module.exports = { imagesUrl: 'http://122.51.230.86:9000', // baseUrl: 'https://www.nuoyunr.com', baseUrl: 'http://192.168.1.27:48080', - appId:'wx684fc832e96cee65', - appSecret:'d1fecac806c5f3cd9aca9f3d5c3759c7', + appId: 'wx684fc832e96cee65', + appSecret: 'd1fecac806c5f3cd9aca9f3d5c3759c7', // baseUrl: 'http://192.168.31.54:8016/jx', // imagesUrl: 'http://192.168.31.54:8016/jx', // 应用信息 @@ -30,4 +30,4 @@ module.exports = { } ] } -} +} \ No newline at end of file diff --git a/newPages/my/index.vue b/newPages/my/index.vue index f7af5ab..e8e84fc 100644 --- a/newPages/my/index.vue +++ b/newPages/my/index.vue @@ -276,9 +276,9 @@ getUserInfo() { - if (!getToken()) { + /* if (!getToken()) { return; - } + } */ request({ url: '/app-api/small/dl-drive-school-student/getUsersInfo', method: 'GET', @@ -372,6 +372,9 @@ await request({ url: "/app-api/system/notify-message/get-unread-count", method: "GET", + params: { + systemCode: 'jiaxiao' + }, tenantIdFlag: false }).then((res) => { if (res.code == 0) { diff --git a/newPages/newIndex/index.vue b/newPages/newIndex/index.vue index 4301937..895c1b0 100644 --- a/newPages/newIndex/index.vue +++ b/newPages/newIndex/index.vue @@ -89,6 +89,10 @@ url: '/static/lanhu_shouye2gai/pj.png', text: '评价' }, + { + url: '/static/lanhu_shouye2gai/pj.png', + text: '业务办理指南' + }, ], swiperList: [], msg: "1", @@ -340,6 +344,7 @@ case '学车报名': uni.navigateTo({ url: '/newPages/schoolList/index' + // url: '/pagesA/guideContent/index' }); break; case '预约训练': diff --git a/newPages/orderList/assets/style/index.rpx.scss b/newPages/orderList/assets/style/index.rpx.scss index 083f63a..ffbfa18 100644 --- a/newPages/orderList/assets/style/index.rpx.scss +++ b/newPages/orderList/assets/style/index.rpx.scss @@ -2,7 +2,7 @@ background-color: rgba(242, 244, 248, 1); position: relative; width: 750rpx; - height: 1624rpx; + height: 100vh; overflow: hidden; .block_1 { background-color: rgba(255, 255, 255, 1); diff --git a/newPages/schoolDetail/index.vue b/newPages/schoolDetail/index.vue index 9e479e4..0f68d9b 100644 --- a/newPages/schoolDetail/index.vue +++ b/newPages/schoolDetail/index.vue @@ -26,7 +26,7 @@ - + {{ schoolInfo.address }} 距离 {{ distance }} @@ -376,7 +376,8 @@ params: { tenantId: this.tenantId, pageNo: 1, - pageSize: 100000 + pageSize: 100000, + type: 'jl' }, tenantIdFlag: false }).then(res => { diff --git a/pagesA/guideContent/index.vue b/pagesA/guideContent/index.vue new file mode 100644 index 0000000..6194f1f --- /dev/null +++ b/pagesA/guideContent/index.vue @@ -0,0 +1,186 @@ + + + + + \ No newline at end of file diff --git a/pagesA/information/assets/style/index.rpx.scss b/pagesA/information/assets/style/index.rpx.scss index 63aeef4..99b60c7 100644 --- a/pagesA/information/assets/style/index.rpx.scss +++ b/pagesA/information/assets/style/index.rpx.scss @@ -223,12 +223,12 @@ } } .group_6 { - background-color: rgba(255, 255, 255, 1); + background-color: rgba(255, 255, 255, 1); border-radius: 8px; width: 686rpx; - height: 278rpx; + // height: 278rpx; justify-content: flex-center; - margin: 20rpx 0 342rpx 32rpx; + margin: 20rpx 0 20rpx 32rpx; .text_8 { width: 112rpx; height: 28rpx; diff --git a/pagesA/information/index.vue b/pagesA/information/index.vue index 67ff5b6..e93cdee 100644 --- a/pagesA/information/index.vue +++ b/pagesA/information/index.vue @@ -7,8 +7,9 @@ - - + + + - - + 生活照片 - - - + + + + 体检报告 + + + + + + 保存 @@ -134,6 +115,7 @@ // idCardList: [], // lifePhotoList: [], lifePhotoFileList: [], + examinationReportList: [], // 体检报告图片列表 imageUrl: this.$imagesUrl, userDetails: { userId: null, @@ -194,6 +176,7 @@ userId: this.userId }, }).then(res => { + console.log('userDetails', res.data) if (!res.data) { this.noN = false; this.userDetails = { @@ -242,8 +225,7 @@ response: { url: `${this.imageUrl}/${url.trim()}` } - })) : - []; + })) : []; // 生活照初始化 this.lifePhotoFileList = res.data.lifePhoto ? @@ -256,8 +238,15 @@ response: { url: `${this.imageUrl}/${url.trim()}` } - })) : - []; + })) : []; + + this.examinationReportList = res.data.examinationReport ? + res.data.examinationReport.split(',') + .filter(url => url.trim()) + .map(url => ({ + url: `${this.imageUrl}/${url.trim()}`, + fileName: url.trim() + })) : []; }); }, @@ -383,7 +372,7 @@ // 获取屏幕高度 const screenHeight = uni.getSystemInfoSync().windowHeight; // 获取顶部区域高度 - const topHeight = 145; + const topHeight = 150; // 计算滚动区域高度 this.scrollHeight = screenHeight - topHeight; }, @@ -434,4 +423,40 @@ \ No newline at end of file diff --git a/pagesA/register/index.vue b/pagesA/register/index.vue index 2625e4d..6bf5e53 100644 --- a/pagesA/register/index.vue +++ b/pagesA/register/index.vue @@ -263,13 +263,9 @@ this.userId = this.userDetails.id, this.userinfo = getLocalUserInfo() this.localStaffType = getStaffType() - console.log('localCoachId', this.localCoachId); - console.log('userId', this.userId); - console.log('this.localStaffType', this.localStaffType); if (this.localStaffType === '02') { this.localCoachId = getCoachId() } - console.log('localCoachId', this.localCoachId); }, onShow() { this.getListAll() @@ -347,8 +343,6 @@ }, tenantIdFlag: false }) - console.log('data', res.data) - // 1. 先过滤数据，只保留subject为2或3的教练 const filteredData = res.data.filter(coach => coach.subject === '2' || coach.subject === '3' @@ -373,13 +367,9 @@ ]; if (this.localStaffType === '02' && this.localCoachId) { - console.log('123123', this.localStaffType) - console.log('321321', this.localCoachId) - console.log('coach', uniqueCoaches) // 这里改为使用去重后的数据 const defaultCoach = uniqueCoaches.find(coach => String(coach.coachId) === String(this.localCoachId) ); - console.log('111222333', defaultCoach) if (defaultCoach) { this.jlName = defaultCoach.coachName; this.jlId = defaultCoach.coachId; @@ -458,13 +448,13 @@ // 表单校验 async validateForm() { - if (!this.isDisabled && !this.sfzimg) { + /* if (!this.isDisabled && !this.sfzimg) { uni.showToast({ title: '请上传身份证照片', icon: 'error' }); return false; - } + } */ if (!this.phone || !this.name || !this.identity) { uni.showToast({ title: '请输入完整信息', @@ -923,11 +913,14 @@ if (this.localCoachId && this.localStaffType == '01') { studentData.source = '01'; studentData.sourceUserId = getCoachId(); // 设置来源用户ID为员工ID + this.sendMessages(this.name, this.rightInfoList.name, this.jlId) } else if (this.localCoachId && this.localStaffType == '02') { studentData.source = '02'; studentData.sourceUserId = getCoachId(); // 设置来源用户ID为教练ID + this.sendMessages(this.name, this.rightInfoList.name, getCoachId()) } else { studentData.source = '03'; // 自来客户 + this.sendMessages(this.name, this.rightInfoList.name, this.jlId) } request({ @@ -1041,6 +1034,19 @@ return res.data.paymentStatus; }, + // 发送站内信 + sendMessages(studentName, courseName, coachId) { + request({ + url: '/app-api/small/drive/school-course-order/sendMessage', + method: 'GET', + params: { + studentName: studentName, + courseName: courseName, + coachId: coachId, + } + }) + }, + } } @@ -1304,4 +1310,4 @@ .size-lv { margin-right: 35px; } - \ No newline at end of file + diff --git a/static/imgs/mapBackground-1.png b/static/imgs/mapBackground-1.png new file mode 100644 index 0000000..8e323e0 Binary files /dev/null and b/static/imgs/mapBackground-1.png differ