diff --git a/config.js b/config.js index 8fcce58..730c376 100644 --- a/config.js +++ b/config.js @@ -41,8 +41,8 @@ module.exports = { // baseUrl:'/prod-api', // http://192.168.0.14:19999 - loginBaseUrl: 'http://112.29.103.165:1616', - // loginBaseUrl: 'http://192.168.0.14:27018', + // loginBaseUrl: 'http://112.29.103.165:1616', + loginBaseUrl: 'http://192.168.0.14:27018', // loginBaseUrl:'http://192.168.0.14:19999', // baseUrl:'http://192.168.0.14:2900', baseUrl: 'http://192.168.0.14:19999', diff --git a/manifest.json b/manifest.json index 826128a..46aa6eb 100644 --- a/manifest.json +++ b/manifest.json @@ -1,258 +1,262 @@ { - "name": "作业管控智慧平台", - "appid": "__UNI__5A28908", - "description": "作业管控智慧平台", - "versionName": "1.0.11", - "versionCode": 111, - "transformPx": false, - "app-plus": { - "runmode": "liberate", - "compatible": { - "ignoreVersion": true - }, - "popGesture": "none", - "useragent": { - "value": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app", - "concatenate": true //true则为在默认基础上追加 false则为替换默认 - }, - "usingComponents": true, - "nvueCompiler": "uni-app", - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "nvueLaunchMode": "fast", - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": { - "Camera": {}, - "VideoPlayer": {}, - "Barcode": {}, - "FaceID": {}, - "Geolocation": {} - }, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "schemes": "blob" - }, - "ios": { - "permissions": { - "WRITE_EXTERNAL_STORAGE": { - "description": "允许应用保存文件到外部存储", - "permission": "YES" - }, - "READ_EXTERNAL_STORAGE": { - "description": "允许应用从外部存储读取文件", - "permission": "YES" - } + "name" : "作业管控智慧平台", + "appid" : "__UNI__4165875", + "description" : "作业管控智慧平台", + "versionName" : "1.0.11", + "versionCode" : 111, + "transformPx" : false, + "app-plus" : { + "runmode" : "liberate", + "compatible" : { + "ignoreVersion" : true }, - "urlschemewhitelist": ["baidumap", "iosamap"], - "dSYMs": false, - "privacyDescription": { - "NSAppleMusicUsageDescription": "库该应用需要访问你的媒体资料,以便为你编辑个人信息", - "NSPhotoLibraryUsageDescription": "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", - "NSPhotoLibraryAddUsageDescription": "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", - "NSCameraUsageDescription": "该应用需要你的相机,以便你拍摄上传个人信息,更新头像设置,验证是否为本人", - "NSMicrophoneUsageDescription": "", - "NSLocationWhenInUseUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息", - "NSLocationAlwaysUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息", - "NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要你的位置信息,以便为你编辑个人信息", - "NSCalendarsUsageDescription": "该应用需要你的日历,以便为你编辑个人信息", - "NSContactsUsageDescription": "", - "NSLocalNetworkUsageDescription": "该应用需要你的网络,以便为你编辑个人信息" + "popGesture" : "none", + "useragent" : { + "value" : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app", + "concatenate" : true //true则为在默认基础上追加 false则为替换默认 }, - "idfa": false - }, - "sdkConfigs": { - "ad": {}, - "geolocation": { - "system": { - "__platform__": ["ios", "android"] - }, - "baidu": { - "__platform__": ["android"], - "appkey_ios": "", - "appkey_android": "MCuOO39EDhdgg9vvkEE2eOyba201oQOF" - } + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "nvueLaunchMode" : "fast", + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 }, - "maps": { - "baidu": { - "appkey_ios": "", - "appkey_android": "" - } + "modules" : { + "Camera" : {}, + "VideoPlayer" : {}, + "Barcode" : {}, + "FaceID" : {}, + "Geolocation" : {} + }, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "schemes" : "blob" + }, + "ios" : { + "permissions" : { + "WRITE_EXTERNAL_STORAGE" : { + "description" : "允许应用保存文件到外部存储", + "permission" : "YES" + }, + "READ_EXTERNAL_STORAGE" : { + "description" : "允许应用从外部存储读取文件", + "permission" : "YES" + } + }, + "urlschemewhitelist" : [ "baidumap", "iosamap" ], + "dSYMs" : false, + "privacyDescription" : { + "NSAppleMusicUsageDescription" : "库该应用需要访问你的媒体资料,以便为你编辑个人信息", + "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", + "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息,更新头像设置", + "NSCameraUsageDescription" : "该应用需要你的相机,以便你拍摄上传个人信息,更新头像设置,验证是否为本人", + "NSMicrophoneUsageDescription" : "", + "NSLocationWhenInUseUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSLocationAlwaysUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSCalendarsUsageDescription" : "该应用需要你的日历,以便为你编辑个人信息", + "NSContactsUsageDescription" : "", + "NSLocalNetworkUsageDescription" : "该应用需要你的网络,以便为你编辑个人信息" + }, + "idfa" : false + }, + "sdkConfigs" : { + "ad" : {}, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + }, + "baidu" : { + "__platform__" : [ "android" ], + "appkey_ios" : "", + "appkey_android" : "MCuOO39EDhdgg9vvkEE2eOyba201oQOF" + } + }, + "maps" : { + "baidu" : { + "appkey_ios" : "", + "appkey_android" : "" + } + } + }, + "orientation" : [ "portrait-primary" ], + "icons" : { + "ios" : { + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + }, + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + } + }, + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + } + }, + "splashscreen" : { + "iosStyle" : "common" + } + }, + "uniStatistics" : { + "enable" : true } - }, - "orientation": ["portrait-primary"], - "icons": { - "ios": { - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - }, - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - } + }, + "quickapp" : {}, + "quickapp-native" : { + "icon" : "/static/logo.png", + "package" : "com.example.demo", + "features" : [ + { + "name" : "system.clipboard" + } + ] + }, + "quickapp-webview" : { + "icon" : "/static/logo.png", + "package" : "com.example.demo", + "minPlatformVersion" : 1070, + "versionName" : "1.0.0", + "versionCode" : 100 + }, + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false }, - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" + "usingComponents" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "演示定位能力" + } + }, + "uniStatistics" : { + "enable" : true } - }, - "splashscreen": { - "iosStyle": "common" - } }, - "uniStatistics": { - "enable": true - } - }, - "quickapp": {}, - "quickapp-native": { - "icon": "/static/logo.png", - "package": "com.example.demo", - "features": [ - { - "name": "system.clipboard" - } - ] - }, - "quickapp-webview": { - "icon": "/static/logo.png", - "package": "com.example.demo", - "minPlatformVersion": 1070, - "versionName": "1.0.0", - "versionCode": 100 - }, - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false - }, - "usingComponents": true, - "permission": { - "scope.userLocation": { - "desc": "演示定位能力" - } - }, - "uniStatistics": { - "enable": true - } - }, - "mp-alipay": { - "usingComponents": true, - "uniStatistics": { - "enable": true - } - }, - "mp-baidu": { - "usingComponents": true, - "uniStatistics": { - "enable": true - }, - "dynamicLib": { - "editorLib": { - "provider": "swan-editor" - } - } - }, - "mp-toutiao": { - "usingComponents": true, - "uniStatistics": { - "enable": true - } - }, - "mp-jd": { - "usingComponents": true, - "uniStatistics": { - "enable": true - } - }, - "h5": { - "template": "template.h5.html", - "router": { - "mode": "history", - "base": "" - }, - "sdkConfigs": { - "maps": { - "qqmap": { - "key": "TKUBZ-D24AF-GJ4JY-JDVM2-IBYKK-KEBCU" + "mp-alipay" : { + "usingComponents" : true, + "uniStatistics" : { + "enable" : true } - } }, - "async": { - "timeout": 20000 + "mp-baidu" : { + "usingComponents" : true, + "uniStatistics" : { + "enable" : true + }, + "dynamicLib" : { + "editorLib" : { + "provider" : "swan-editor" + } + } }, - "uniStatistics": { - "enable": true + "mp-toutiao" : { + "usingComponents" : true, + "uniStatistics" : { + "enable" : true + } + }, + "mp-jd" : { + "usingComponents" : true, + "uniStatistics" : { + "enable" : true + } + }, + "h5" : { + "template" : "", + "router" : { + "mode" : "hash", + "base" : "./" + }, + "sdkConfigs" : { + "maps" : { + "qqmap" : { + "key" : "TKUBZ-D24AF-GJ4JY-JDVM2-IBYKK-KEBCU" + } + } + }, + "async" : { + "timeout" : 20000 + }, + "uniStatistics" : { + "enable" : true + }, + "title" : "作业管控智慧平台", + "devServer" : { + "https" : true + } + }, + "vueVersion" : "2", + "mp-kuaishou" : { + "uniStatistics" : { + "enable" : true + } + }, + "mp-lark" : { + "uniStatistics" : { + "enable" : true + } + }, + "mp-qq" : { + "uniStatistics" : { + "enable" : true + } + }, + "quickapp-webview-huawei" : { + "uniStatistics" : { + "enable" : true + } + }, + "quickapp-webview-union" : { + "uniStatistics" : { + "enable" : true + } + }, + "uniStatistics" : { + "version" : "2", + "enable" : true } - }, - "vueVersion": "2", - "mp-kuaishou": { - "uniStatistics": { - "enable": true - } - }, - "mp-lark": { - "uniStatistics": { - "enable": true - } - }, - "mp-qq": { - "uniStatistics": { - "enable": true - } - }, - "quickapp-webview-huawei": { - "uniStatistics": { - "enable": true - } - }, - "quickapp-webview-union": { - "uniStatistics": { - "enable": true - } - }, - "uniStatistics": { - "version": "2", - "enable": true - } } diff --git a/pages/YNEduApp/exam/examination.vue b/pages/YNEduApp/exam/examination.vue index 820af59..a376068 100644 --- a/pages/YNEduApp/exam/examination.vue +++ b/pages/YNEduApp/exam/examination.vue @@ -284,14 +284,15 @@ export default { ) console.log('🚀 ~ changeCountDown ~:', this.answerTime / 1000 == this.random1) console.log('🚀 ~ changeCountDown ~:', this.answerTime / 1000 == this.random2) - if (this.answerTime / 1000 == this.random1) { - console.log('🚀 ~ changeCountDown ~ 人脸识别') - // this.openFaceScan() // Android 人脸识别 - this.openPhotograph() // IOS 拍照识别 - } else if (this.answerTime / 1000 == this.random2) { - // this.openFaceScan() - this.openPhotograph() - } else if (this.answerTime == this.time) { + // if (this.answerTime / 1000 == this.random1) { + // console.log('🚀 ~ changeCountDown ~ 人脸识别') + // // this.openFaceScan() // Android 人脸识别 + // this.openPhotograph() // IOS 拍照识别 + // } else if (this.answerTime / 1000 == this.random2) { + // // this.openFaceScan() + // this.openPhotograph() + // } else + if (this.answerTime == this.time) { // 提示: 时间结束, 自动提交 this.$refs.uToast.show({ message: '考试时间结束, 系统将自动提交', diff --git a/pages/YNEduApp/index/index.vue b/pages/YNEduApp/index/index.vue index 8ff47cd..eb08f12 100644 --- a/pages/YNEduApp/index/index.vue +++ b/pages/YNEduApp/index/index.vue @@ -247,7 +247,7 @@ export default { .search { width: 100%; - margin: 0 auto; + margin: 10px auto 0; display: flex; align-items: center; } diff --git a/pages/YNEduApp/learn/learn.vue b/pages/YNEduApp/learn/learn.vue index 618016c..f2795af 100644 --- a/pages/YNEduApp/learn/learn.vue +++ b/pages/YNEduApp/learn/learn.vue @@ -112,13 +112,13 @@ export default { console.log('🚀 ~ 视频总时长: ~ this.allStudyDuration:', this.allStudyDuration) console.log('🚀 ~ videoTimeUpdate ~ random1-2:', this.random1, this.random2) - if (this.currentTime != this.oldTime) { - if (this.currentTime == this.random2 || this.currentTime == this.random1) { - this.oldTime = this.currentTime // 记录当前时间, 防止重复执行, 如果下次时间等于当前时间, 则不执行 - this.video.pause() - this.openPhotograph() - } - } + // if (this.currentTime != this.oldTime) { + // if (this.currentTime == this.random2 || this.currentTime == this.random1) { + // this.oldTime = this.currentTime // 记录当前时间, 防止重复执行, 如果下次时间等于当前时间, 则不执行 + // this.video.pause() + // this.openPhotograph() + // } + // } }, openModal() { this.showModal = true diff --git a/pages/YNEduApp/learnProj/imageStudy.vue b/pages/YNEduApp/learnProj/imageStudy.vue index 1e1c6de..6822012 100644 --- a/pages/YNEduApp/learnProj/imageStudy.vue +++ b/pages/YNEduApp/learnProj/imageStudy.vue @@ -97,11 +97,11 @@ export default { this.allStudyDuration-- this.params.studyDuration++ } - if (this.allStudyDuration == this.random) { - this.isShow = false - clearInterval(this.timer) - this.openPhotograph() - } + // if (this.allStudyDuration == this.random) { + // this.isShow = false + // clearInterval(this.timer) + // this.openPhotograph() + // } console.log('🚀 ~ countDown ~ this.params.studyDuration:', this.params.studyDuration) if (this.allStudyDuration <= 0) { this.params.studyDuration = this.params.allStudyDuration diff --git a/pages/YNEduApp/learnProj/learnProj.vue b/pages/YNEduApp/learnProj/learnProj.vue index ebfcce0..f240fb9 100644 --- a/pages/YNEduApp/learnProj/learnProj.vue +++ b/pages/YNEduApp/learnProj/learnProj.vue @@ -1,7 +1,15 @@ @@ -58,6 +71,7 @@ import config from '@/config' export default { data() { return { + activeIndex: 0, statusList: [ // status -1: 全部 1: 已完成 0: 未完成 { text: '全部', id: 0 }, @@ -176,7 +190,8 @@ export default { // this.projList = res.data this.getStudentStudyWorkList(params) }, - async chooseStatus(count) { + async chooseStatus(count, index) { + this.activeIndex = index this.projList = [] // 清空搜索框 this.totalStatus.keyword = '' @@ -184,12 +199,12 @@ export default { userId: uni.getStorageSync('userId'), status: '-1' } - this.totalStatus.statusCount = count - if (count === 0) { + this.totalStatus.statusCount = count.id + if (count.id === 0) { params.status = '-1' - } else if (count === 1) { + } else if (count.id === 1) { params.status = '1' - } else if (count === 2) { + } else if (count.id === 2) { params.status = '0' } // const res = await getStudentStudyWorkList(params) @@ -265,6 +280,38 @@ export default {