学员登记表表单项添加出生日期、去掉课程中间跳出人脸识别功能

package-lock.json

@@ -1,54 +1,6 @@
 {
-  "name": "edu-mini",
-  "lockfileVersion": 2,
   "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "@vant/weapp": "^1.10.2",
-        "dayjs": "^1.10.8",
-        "mobx-miniprogram": "^4.13.2",
-        "mobx-miniprogram-bindings": "^2.1.5",
-        "tim-wx-sdk": "^2.17.0"
-      }
-    },
-    "node_modules/@types/wechat-miniprogram": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmmirror.com/@types/wechat-miniprogram/-/wechat-miniprogram-3.4.0.tgz",
-      "integrity": "sha512-7d7KDwoV42/ANx/0C8C4ctBv1q9XnXYD4Fz0C+3ii0Tm+HRIwwDcinv8S88Ut/Y80czlI0shGpTgLFe0GbrXWQ=="
-    },
-    "node_modules/@vant/weapp": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.2.tgz",
-      "integrity": "sha512-caqA0xQxM4lMRncFsRPPVMDdEzUBCJ4xdFXuKReXpEU3qwnVIP/WIjVDIi7mWyS7xqz8C9WfSW5JL4PrlSq31w=="
-    },
-    "node_modules/dayjs": {
-      "version": "1.10.8",
-      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.10.8.tgz",
-      "integrity": "sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="
-    },
-    "node_modules/mobx-miniprogram": {
-      "version": "4.13.2",
-      "resolved": "https://registry.nlark.com/mobx-miniprogram/download/mobx-miniprogram-4.13.2.tgz",
-      "integrity": "sha1-tywD/VrR8bkCLEIvnIikfR5fiGg="
-    },
-    "node_modules/mobx-miniprogram-bindings": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmmirror.com/mobx-miniprogram-bindings/-/mobx-miniprogram-bindings-2.1.5.tgz",
-      "integrity": "sha512-2HuiQL5FPgoYJ8XIMdw5iD6XT61LtsujaGyizbN845iZcsLmrKZiF0dKd4jQTSuC/6rGozqqhcy0sDc7qcpjYQ==",
-      "dependencies": {
-        "@types/wechat-miniprogram": "^3.4.0"
-      },
-      "peerDependencies": {
-        "mobx-miniprogram": "^4.0.0"
-      }
-    },
-    "node_modules/tim-wx-sdk": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmmirror.com/tim-wx-sdk/-/tim-wx-sdk-2.17.0.tgz",
-      "integrity": "sha512-7Q0BSke+CzJL+xgdkY+dFK/3LvQq8abJzMTed3WC11VTYmF1P5Pn7Dkotmr3rVIZYgPedYu/hzkjiV/M239ZMA=="
-    }
-  },
+  "lockfileVersion": 1,
   "dependencies": {
     "@types/wechat-miniprogram": {
       "version": "3.4.0",

pages/courseDetail/courseDetail.js

@@ -317,19 +317,19 @@ Page({
         let unFulfilledFlag = lessStatus == logicStatus.NO;
 
         console.log("timeUpdate", currentTime, this.data.scanTime)
-        if (this.data.scanTime && unFulfilledFlag) { //需要处理验证人脸情况
-            let flag = currentTime % this.data.scanTime;
-            if (flag == 0 && currentTime != this.data.scanOkTime &&
-                currentTime >= this.data.nodeTime && currentTime != this.data.videoItem.duration) {
-                console.log("暂停,弹出人脸识别")
-                this.data.videoContext.exitFullScreen();
-                this.data.videoContext.pause();
-                this.setData({
-                    show: true,
-                    currentTime
-                });
-            }
-        }
+        // if (this.data.scanTime && unFulfilledFlag) { //需要处理验证人脸情况
+        //     let flag = currentTime % this.data.scanTime;
+        //     if (flag == 0 && currentTime != this.data.scanOkTime &&
+        //         currentTime >= this.data.nodeTime && currentTime != this.data.videoItem.duration) {
+        //         console.log("暂停,弹出人脸识别")
+        //         this.data.videoContext.exitFullScreen();
+        //         this.data.videoContext.pause();
+        //         this.setData({
+        //             show: true,
+        //             currentTime
+        //         });
+        //     }
+        // }
         if (currentTime - this.data.nodeTime <= 1) {
             // 播放时长和被记录的时长的时间差<=1秒 说明没有快进视频
             if (currentTime - this.data.nodeTime >= 0) {

pages/studentInfo/studentInfo.js

@@ -30,6 +30,7 @@ Page({
         // defaultAvatarUrl: 'https://college-file-1302740389.cos.ap-beijing.myqcloud.com/QJVCVcHsaNcK2bc17026cd7f3f710b5de7748f8f9194.jpg',
 
         formData: {
+            birthDay: '',
             teamId: '',
             id: '',
             idCard: '',
@@ -135,7 +136,8 @@ Page({
             isGridLeader,
             isBuildLeader,
             isUnitLeader,
-            isWelfare
+            isWelfare,
+            birthDay,
         } = user;
         // let userAvatar = picUrl ? picUrl : this.data.defaultAvatarUrl; //给一个默认头像
         this.setData({
@@ -169,6 +171,7 @@ Page({
                 isWelfare,
                 teamId,
                 id: eduStuId,
+                birthDay
             },
             isCommunityWorker: perType == studentTypes.COMMUNITY_WORKER,
             sexData,
@@ -352,6 +355,10 @@ Page({
         //     return;
         // }
         if (isCommunityWorker) {
+            if (this.checkEmpty('birthDay')) {
+                toast('请选择出生日期')
+                return;
+            }
             if (this.checkEmpty('education')) {
                 toast('请选择文化程度')
                 return;

pages/studentInfo/studentInfo.wxml

@@ -20,6 +20,9 @@
         <edu-picker bind:change="changeInfo" label="性别" pickData="{{sexData}}" emitKey="formData.sex" index="{{formData.sex}}" />
         <edu-picker bind:change="changeInfo" label="民族" pickData="{{nationData}}" emitKey="formData.nation" index="{{formData.nation}}" />
         <edu-picker bind:change="changeInfo" label="学员类别" pickData="{{studentTypeData}}" emitKey="formData.perType" index="{{formData.perType}}" />
+        <picker mode='date' bindchange="onChange" required="{{isCommunityWorker}}" data-field="formData.birthDay" data-value="value">
+            <van-field required="{{isCommunityWorker}}" value="{{formData.birthDay}}" label="出生日期" readonly is-link input-align="right" placeholder="请选择出生日期" />
+        </picker>
         <edu-picker bind:change="changeInfo" required="{{isCommunityWorker}}" label="文化程度" pickData="{{eduExpData}}" emitKey="formData.education" index="{{formData.education}}" />
 
         <van-field required="{{isCommunityWorker}}" bind:change='onChange' value="{{formData.graduate}}" label="毕业学校" placeholder="请输入毕业学校" input-align="right" data-field="formData.graduate" />

project.config.json

@@ -1,79 +1,76 @@
 {
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": true,
-    "es6": false,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": true,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": false,
-    "useApiHook": false,
-    "useApiHostProcess": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "packOptions": {
+        "ignore": [],
+        "include": []
     },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.21.1",
-  "projectname": "edu-mini",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "staticServerOptions": {
-    "baseURL": "",
-    "servePath": ""
-  },
-  "isGameTourist": false,
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "appid": "wxca8d0b33f3ab66fb",
-  "condition": {
-    "search": {
-      "list": []
+    "setting": {
+        "urlCheck": false,
+        "es6": false,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": false,
+        "coverView": true,
+        "nodeModules": true,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": false,
+        "useApiHook": false,
+        "useApiHostProcess": false,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "useIsolateContext": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "minifyWXML": true,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "ignoreUploadUnusedFiles": true,
+        "useStaticServer": true
     },
-    "conversation": {
-      "list": []
+    "compileType": "miniprogram",
+    "libVersion": "2.21.1",
+    "projectname": "edu-mini",
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "appid": "wxca8d0b33f3ab66fb",
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": []
+        }
     },
-    "game": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
     }
-  }
 }