diff --git a/.gitignore b/.gitignore index aed7921..f3f6c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,3 @@ selenium-debug.log *.sln *.local -package-lock.json -yarn.lock -pnpm-lock.yaml diff --git a/package-lock.json b/package-lock.json index 3522696..64985ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,31 @@ { "name": "hello-uniapp", "version": "3.4.5", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "hello-uniapp", + "version": "3.4.5", + "license": "MIT", + "dependencies": { + "luch-request": "^3.1.1" + } + }, + "node_modules/@dcloudio/types": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/@dcloudio/types/-/types-2.6.12.tgz", + "integrity": "sha512-mrCMwcINy1IFjU9VUqLeWBkj404yWs5paLDttBcA+eqUjanuUQbBcTVPqlrGgkyzLXDcV2oDDZRSNxNpXi4kMQ==" + }, + "node_modules/luch-request": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/luch-request/-/luch-request-3.1.1.tgz", + "integrity": "sha512-p7+mlcEtgRcd0OfXC4XZbyiwSr1XgCeqNT7LlVUjnk7InYl/8d5Rk7BUqAYNA2WRafI1wRIUQWRWZRpeUwWR0w==", + "dependencies": { + "@dcloudio/types": "^2.0.16" + } + } + }, "dependencies": { "@dcloudio/types": { "version": "2.6.12", diff --git a/pages.json b/pages.json index 6ed088f..09cf560 100644 --- a/pages.json +++ b/pages.json @@ -1,121 +1,141 @@ { - // "easycom": { - // "^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue" - // }, - "pages": [ - // pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/login", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" - } - }, { - "path": "pages/webview", - "style": { - "navigationBarTitleText": "作业管控智慧平台", - "navigationStyle": "custom" - } - }, { - "path": "pages/message/index", - "style": { - "navigationBarTitleText": "消息" - } - }, { - "path": "pages/message/detail", - "style": { - "navigationBarTitleText": "消息" - } - }, { - "path": "pages/gzt/index", - "style": { - "navigationBarTitleText": "作业管控智慧平台", - "navigationStyle": "custom" - } - }, { - "path": "pages/txl/index", - "style": { - "navigationBarTitleText": "通讯录" - } - }, { - "path": "pages/mine/index", - "style": { - "navigationBarTitleText": "我的", - "navigationStyle": "custom" - } - }, { - "path": "pages/YNEduApp/index/index", - "style": { - "navigationBarTitleText": "首页" - } - }, { - "path": "pages/YNEduApp/user/user", - "style": { - "navigationStyle": "custom" - } - }, { - "path": "pages/YNEduApp/user/settings", - "style": { - "navigationBarTitleText": "设置" - } - }, { - "path": "pages/YNEduApp/learnProj/learnProj", - "style": { - "navigationBarTitleText": "学习项目" - } - }, { - "path": "pages/YNEduApp/learnProj/learnProjDetail", - "style": { - "navigationBarTitleText": "学习项目" - } - }, - { - "path" : "pages/YNEduApp/user/editProfile", - "style" : - { - "navigationBarTitleText" : "编辑资料" - } - }, - { - "path" : "pages/YNEduApp/user/changeGate", - "style" : - { - "navigationBarTitleText" : "选择公司", - "app-plus": { - "titleNView": { - "buttons": [ - { - "text": "完成", - "fontSize": "16px", - "color": "#000", - "float": "right" - } - ] - } - } - } - } - ], - "globalStyle": { - "fontFamily": "Helvetica, Arial, sans-serif", - "pageOrientation": "portrait", - "navigationBarTitleText": "作业管控智慧平台", - "navigationBarTextStyle": "black", - "navigationBarBackgroundColor": "#ffffff", - "backgroundColor": "#F8F8F8", - "backgroundColorTop": "#F4F5F6", - "backgroundColorBottom": "#F4F5F6", - "mp-360": { - "navigationStyle": "custom" - }, - "h5": { - "maxWidth": 1190, - "navigationBarTextStyle": "black", - "navigationBarBackgroundColor": "#F1F1F1" - } - - } - /* "tabBar": { + "easycom": { + "^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue" + }, + "pages": [ + // pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/login", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom" + } + }, + { + "path": "pages/webview", + "style": { + "navigationBarTitleText": "作业管控智慧平台", + "navigationStyle": "custom" + } + }, + { + "path": "pages/message/index", + "style": { + "navigationBarTitleText": "消息" + } + }, + { + "path": "pages/message/detail", + "style": { + "navigationBarTitleText": "消息" + } + }, + { + "path": "pages/gzt/index", + "style": { + "navigationBarTitleText": "作业管控智慧平台", + "navigationStyle": "custom" + } + }, + { + "path": "pages/txl/index", + "style": { + "navigationBarTitleText": "通讯录" + } + }, + { + "path": "pages/mine/index", + "style": { + "navigationBarTitleText": "我的", + "navigationStyle": "custom" + } + }, + { + "path": "pages/YNEduApp/index/index", + "style": { + "navigationBarTitleText": "首页" + } + }, + { + "path": "pages/YNEduApp/user/user", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/YNEduApp/user/settings", + "style": { + "navigationBarTitleText": "设置" + } + }, + { + "path": "pages/YNEduApp/learnProj/learnProj", + "style": { + "navigationBarTitleText": "学习项目" + } + }, + { + "path": "pages/YNEduApp/learnProj/learnProjDetail", + "style": { + "navigationBarTitleText": "学习项目" + } + }, + { + "path": "pages/YNEduApp/user/editProfile", + "style": { + "navigationBarTitleText": "编辑资料" + } + }, + { + "path": "pages/YNEduApp/user/changeGate", + "style": { + "navigationBarTitleText": "选择公司", + "app-plus": { + "titleNView": { + "buttons": [ + { + "text": "完成", + "fontSize": "16px", + "color": "#000", + "float": "right" + } + ] + } + } + } + }, + { + "path": "pages/YNEduApp/exam/exam", + "style": { + "navigationBarTitleText": "考试" + } + }, + { + "path": "pages/YNEduApp/exam/beforeExam", + "style": { + "navigationBarTitleText": "" + } + } + ], + "globalStyle": { + "fontFamily": "Helvetica, Arial, sans-serif", + "pageOrientation": "portrait", + "navigationBarTitleText": "作业管控智慧平台", + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#ffffff", + "backgroundColor": "#F8F8F8", + "backgroundColorTop": "#F4F5F6", + "backgroundColorBottom": "#F4F5F6", + "mp-360": { + "navigationStyle": "custom" + }, + "h5": { + "maxWidth": 1190, + "navigationBarTextStyle": "black", + "navigationBarBackgroundColor": "#F1F1F1" + } + } + /* "tabBar": { "color": "#7A7E83", "selectedColor": "#007AFF", "borderStyle": "black", @@ -144,4 +164,4 @@ } ] } */ -} \ No newline at end of file +} diff --git a/pages/YNEduApp/exam/beforeExam.vue b/pages/YNEduApp/exam/beforeExam.vue new file mode 100644 index 0000000..42a2ee8 --- /dev/null +++ b/pages/YNEduApp/exam/beforeExam.vue @@ -0,0 +1,161 @@ + + + + {{ title }} + {{ subtitle }} + + + + {{ duration }}分钟 + 考试时长 + + + + {{ count }} + 考试次数 + + + + {{ switchCount }} + 切屏次数 + + + + *进入考试后,计时结束将自动交卷,退出后将会继续计时 + + + + + + + + + + + + + + + + + diff --git a/pages/YNEduApp/exam/exam.vue b/pages/YNEduApp/exam/exam.vue new file mode 100644 index 0000000..7df32a1 --- /dev/null +++ b/pages/YNEduApp/exam/exam.vue @@ -0,0 +1,210 @@ + + + + + + {{ item.name }} + + + + + + + {{ item.title }} + + + {{ item.name }} + 指派 + + {{ item.status }} + + {{ item.time }} + + 考试{{ item.count }}次 + 总分:{{ item.total }} + + + 得分:{{ item.score }} + 开始考试 + + + + + + + 暂无内容 + + + + + + + + diff --git a/static/images/infinite.png b/static/images/infinite.png new file mode 100644 index 0000000..339287a Binary files /dev/null and b/static/images/infinite.png differ diff --git a/static/images/qiehuan.png b/static/images/qiehuan.png new file mode 100644 index 0000000..8fe56bc Binary files /dev/null and b/static/images/qiehuan.png differ diff --git a/static/images/time.png b/static/images/time.png new file mode 100644 index 0000000..859166f Binary files /dev/null and b/static/images/time.png differ diff --git a/static/images/zanwuneirong.png b/static/images/zanwuneirong.png new file mode 100644 index 0000000..a1f7d42 Binary files /dev/null and b/static/images/zanwuneirong.png differ