diff --git a/.env.development b/.env.development index 63546009..8329773c 100644 --- a/.env.development +++ b/.env.development @@ -2,14 +2,11 @@ ENV = 'development' # 'development' -# 苗扬 -# VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786' - # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' # DEV -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # app入口 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' @@ -18,5 +15,6 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' # h5专用地址 - -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.66:9786' \ No newline at end of file +# 王洋洋 +VITE_APP_BASE_H5_API_Url = 'http://25.64.16.140:9604' +#VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 6c54579d..5162413a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -93,6 +93,11 @@ view { display: flex; justify-content: space-between; } +.flex-c-c { + display: flex; + justify-content: center; + align-items: center; +} .tar{ text-align: right; } @@ -132,4 +137,8 @@ view { /* 显示的行数 */ overflow: hidden; } + +.no-overflow{ + overflow: hidden; +} diff --git a/src/api/testingHall.js b/src/api/testingHall.js new file mode 100644 index 00000000..7e0b47c1 --- /dev/null +++ b/src/api/testingHall.js @@ -0,0 +1,12 @@ +import request from '@/api/request' + +const module_url = '/traexam' + +// 1.查询考试列表分页 +export const queryTraExamPapersPage = (data) => { + return request({ + url: module_url + '/traExamPapers/queryTraExamPapersPage', + method: 'post', + data + }); +}; \ No newline at end of file diff --git a/src/components/list-no-data/list-no-data.vue b/src/components/list-no-data/list-no-data.vue new file mode 100644 index 00000000..637ba6e6 --- /dev/null +++ b/src/components/list-no-data/list-no-data.vue @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/src/enum.js b/src/enum.js index cb791e77..86262504 100644 --- a/src/enum.js +++ b/src/enum.js @@ -1,6 +1,9 @@ export const MAX_UPLOAD_PICTURE_SIZE = 2048 // 最大图片上传限制 export const Max_Upload_Document_Size = 102400 // 最大文档上传限制 export const TextareaInputLimitCharacter = 160 // 全局多行文本输入框限制字数 +// 公共tab页的图片 +export const LineBg = + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAOCAYAAAAvxDzwAAABL0lEQVQ4T6XSv0uCURTG8e9jgpRNDS1BU1sELUFLQVM1tgQFtcR7A8m1LQqaLGhOkQKH/o5aKiiHlgiE0K1oCYLAMk9ov/RF8e313u2ew4dzzzmi2+NsA9gH3hCr6srzbAJxDkS/nbvwYNJilMkDow1FXYUHneWAlV/MqN3ZcKCzHWDb164MGa3/H/Qshdj0YbdUmORIL8HBNRsgShZjoQkznvioY/e19wCgCccSsAcM+bBnjHmyuvx5bw8mrJ93FoEkYrzFej0g5kjrpjH2BTrro8oIYhgYQ0xhTCPibfb0ggjLHKrojwvPEogDIBZgycsYKQrscqpKq3zh7BXo7YBVgRMibLWqqvnLzh6BwTZgESNHD8edoL+hOJupT9CII0oYJcQ14oy0CgHa0JTyCeBLVNeWygE5AAAAAElFTkSuQmCC"; export const GENDER = [{ value: "m", label: "男性", diff --git a/src/pages.json b/src/pages.json index 9069a2c4..ea44dae2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -136,6 +136,60 @@ } } }, + { + "path": "pages/preview/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/favorites/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/messageNotification/index", + "style": { + "navigationBarTitleText": "消息", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/testingHall/index", + "style": { + "navigationBarTitleText": "考试中心", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/testingHall/details", + "style": { + "navigationBarTitleText": "考试详情", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/wrong_question_record/index", + "style": { + "navigationBarTitleText": "错题本", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/course/index", "style": { @@ -196,7 +250,8 @@ "navigationStyle": "custom", "app-plus": { "titleView": false, - "bounce": "none" + "bounce": "none", + "softinputNavBar": "none" } }, "uniIdRouter": {} diff --git a/src/pages/courseDetail/components/comment.vue b/src/pages/courseDetail/components/comment.vue index 8493088d..9dd8887b 100644 --- a/src/pages/courseDetail/components/comment.vue +++ b/src/pages/courseDetail/components/comment.vue @@ -107,7 +107,7 @@ const popup = ref(null) const popup_input_bottom = ref('0px') - + const inputValue = ref('') const placeholder = ref('') const message_list = reactive([]) diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index 1f67b719..673a46ae 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -16,16 +16,30 @@ + mode="heightFix"> 知识点 {{ form.pgrphNum || 0 }} - + 已学 {{ form.styParaGraphNum || 0 }} + + + + 考试排行榜 + + + + + + + + @@ -66,7 +80,7 @@ @click="common.navigateTo('/pages/courseDetail/submit?crsNum='+crsNum+'&imgId='+form.imgId)">发布评价 - + @@ -101,6 +115,7 @@ name: '评价' }]); + const test = ref(false); const commentRef = ref(null); const tabsDiv = ref(null); const form = ref({}); @@ -110,7 +125,6 @@ const tabSwitch = (item) => { tabAct.value = item.index; }; - // 滚动到底部/右边,会触发 scrolltolower 事件 const scrolltolower = (item) => { if (tabAct.value == 2) { commentRef.value?.getData(); @@ -183,7 +197,7 @@ margin-right: 10rpx; position: fixed; left: 25rpx; - top: var(--status-bar-height) ; + top: var(--status-bar-height); // background-color: red; // width: 60rpx; // height: 60rpx; @@ -250,7 +264,6 @@ left: -4rpx; .back-image { - width: 100%; } } @@ -275,13 +288,46 @@ } .title-icon { - width: 22rpx; height: 30rpx; margin-right: 10rpx; } + .collect-icon { + width: 40rpx; + height: 40rpx; + margin-right: 10rpx; + } + .title-num { display: flex; + + .examination { + color: #0066FF; + + .back-icon { + position: relative; + width: 40rpx; + height: 40rpx; + cursor: pointer; + } + + .back-icon::before, + .back-icon::after { + content: ''; + position: absolute; + transition: all 0.3s ease; + } + + .back-icon::after { + top: 25%; + left: 25%; + width: 40%; + height: 40%; + border-top: 4rpx solid #0066FF; + border-left: 4rpx solid #0066FF; + transform: rotate(135deg); + } + } } .body-box { @@ -348,6 +394,7 @@ font-size: 30rpx; margin-right: 30rpx; color: #666666; + height: 30rpx; } diff --git a/src/pages/favorites/components/favorites-course.vue b/src/pages/favorites/components/favorites-course.vue new file mode 100644 index 00000000..b799116c --- /dev/null +++ b/src/pages/favorites/components/favorites-course.vue @@ -0,0 +1,202 @@ + + + + \ No newline at end of file diff --git a/src/pages/favorites/components/favorites-task.vue b/src/pages/favorites/components/favorites-task.vue new file mode 100644 index 00000000..adb218d2 --- /dev/null +++ b/src/pages/favorites/components/favorites-task.vue @@ -0,0 +1,229 @@ + + + + \ No newline at end of file diff --git a/src/pages/favorites/index.vue b/src/pages/favorites/index.vue new file mode 100644 index 00000000..13bc051f --- /dev/null +++ b/src/pages/favorites/index.vue @@ -0,0 +1,167 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 4cd7fd7b..31321cdf 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -98,7 +98,7 @@ - + 考试中心 @@ -106,7 +106,7 @@ 竞赛练习 - + 错题本 diff --git a/src/pages/me/favorites.vue b/src/pages/me/favorites.vue deleted file mode 100644 index 02409e35..00000000 --- a/src/pages/me/favorites.vue +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index ee0409af..b31a8bc2 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -29,40 +29,34 @@ - - + - 累计学习时长 - - h - - - - 累计完成任务 + 我的积分 + + + - 累计获得积分 + 徽章墙 - + @@ -70,8 +64,6 @@ - - @@ -117,9 +109,12 @@ - - - + + + + @@ -543,6 +538,22 @@ z-index: 20; margin: 30rpx 50rpx; + .item-interval { + position: relative; + &:before { + content: ""; + position: absolute; + left: 50%; + top: 20%; + transform: translateX(-50%); + width: 1rpx; + height: 60%; + background-color: #444; + } + } + + + .item { flex: 1; display: flex; @@ -552,7 +563,7 @@ .top { font-family: PingFangSC, PingFang SC; font-weight: 400; - font-size: 25rpx; + font-size: 28rpx; color: #666666; line-height: 35rpx; text-align: center; diff --git a/src/pages/me/preview.vue b/src/pages/me/preview.vue deleted file mode 100644 index 02409e35..00000000 --- a/src/pages/me/preview.vue +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/messageNotification/index.vue b/src/pages/messageNotification/index.vue new file mode 100644 index 00000000..bf68bb5b --- /dev/null +++ b/src/pages/messageNotification/index.vue @@ -0,0 +1,335 @@ + + + + + \ No newline at end of file diff --git a/src/pages/preview/components/preview-ai-sparring.vue b/src/pages/preview/components/preview-ai-sparring.vue new file mode 100644 index 00000000..07bed1db --- /dev/null +++ b/src/pages/preview/components/preview-ai-sparring.vue @@ -0,0 +1,42 @@ + + + + \ No newline at end of file diff --git a/src/pages/preview/components/preview-course.vue b/src/pages/preview/components/preview-course.vue new file mode 100644 index 00000000..56a4d8bd --- /dev/null +++ b/src/pages/preview/components/preview-course.vue @@ -0,0 +1,195 @@ + + + + \ No newline at end of file diff --git a/src/pages/preview/index.vue b/src/pages/preview/index.vue new file mode 100644 index 00000000..f9f00e34 --- /dev/null +++ b/src/pages/preview/index.vue @@ -0,0 +1,174 @@ + + + + + \ No newline at end of file diff --git a/src/pages/setting/index.vue b/src/pages/setting/index.vue index f6794230..0110cd46 100644 --- a/src/pages/setting/index.vue +++ b/src/pages/setting/index.vue @@ -31,7 +31,18 @@ - + + + + + { - + common.navigateTo('/pages/mascot/mascot_select_list') - + // common.loading() // queryValidTraMascotInfo().then(({body}) => { // console.log(body); @@ -95,21 +121,21 @@ // console.log(`图片缓存成功: ${url}`); // // resolve(img); // }; - + // img.onerror = () => { // console.error(`图片缓存失败: ${url}`); // // reject(new Error(`Failed to load image: ${url}`)); // }; - + // img.src = base_url + url; // } // }) // common.hideLoading() // common.navigateTo('/pages/mascot/mascot_select_list') - + // }) } - + // 显示性别的计算属性 const showGenderText = computed(() => { const item = sexOptions.find((item) => item.value == userInfo.value.gender) if (item) { @@ -118,6 +144,16 @@ return '未填写' } }) + + // 显示是否匿名的计算属性 + const showAnonymousText = computed(() => { + const item = anonymousOptions.find((item) => item.value == userInfo.value?.anonymous) + if (item) { + return item.label + } else { + return '否' + } + }) // 点击修改头像 const click_update_avatar = (value) => { uni.chooseImage({ @@ -136,18 +172,20 @@ // 选择头像确定 const onConfirm = (file) => { avatarCropperStatus.value = false - nextTick(async() => { + nextTick(async () => { common.loading('更新头像中') - try{ + try { const data = { bizScen: 'S3007', thumbnailFlag: true, - thumbImgSize:100 + thumbImgSize: 100 } // 上传图片 const res = await uploadFile(file.tempFilePath, data) // 更新个人信息 - await updateDfSysUserExtandInfoImageAddr({imageAddr : res.thumbFileId}) + await updateDfSysUserExtandInfoImageAddr({ + imageAddr: res.thumbFileId + }) // 更新个人信息 const userData = await queryCurrentUser() common.msg('修改成功') @@ -165,13 +203,19 @@ common.loading("修改中") updateDfSysUserExtandInfoGender({ gender: userInfo.value.gender - }).then(async() => { + }).then(async () => { await queryCurrentUser() common.msg('修改成功') }).finally(() => { common.hideLoading() }) }; + const anonymousChange = (e) => { + userInfo.value.anonymous = anonymousOptions[e.detail.value].value; + // common.loading("修改中") + common.msg('修改成功') + }; + onLoad((params) => { userInfo.value = getUserInfo() }); diff --git a/src/pages/test/index - 副本.vue b/src/pages/test/index - 副本.vue deleted file mode 100644 index b5f2b3b1..00000000 --- a/src/pages/test/index - 副本.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/testingHall/components/content.vue b/src/pages/testingHall/components/content.vue new file mode 100644 index 00000000..3ef186e9 --- /dev/null +++ b/src/pages/testingHall/components/content.vue @@ -0,0 +1,242 @@ + + + + + \ No newline at end of file diff --git a/src/pages/testingHall/details.vue b/src/pages/testingHall/details.vue new file mode 100644 index 00000000..7ab30a19 --- /dev/null +++ b/src/pages/testingHall/details.vue @@ -0,0 +1,311 @@ + + + + + \ No newline at end of file diff --git a/src/pages/testingHall/index.vue b/src/pages/testingHall/index.vue new file mode 100644 index 00000000..5a2d7a2c --- /dev/null +++ b/src/pages/testingHall/index.vue @@ -0,0 +1,228 @@ + + + + + \ No newline at end of file diff --git a/src/pages/wrong_question_record/components/correct.vue b/src/pages/wrong_question_record/components/correct.vue new file mode 100644 index 00000000..b0106f87 --- /dev/null +++ b/src/pages/wrong_question_record/components/correct.vue @@ -0,0 +1,167 @@ + + + + \ No newline at end of file diff --git a/src/pages/wrong_question_record/components/favorites-course.vue b/src/pages/wrong_question_record/components/favorites-course.vue new file mode 100644 index 00000000..8b39db1d --- /dev/null +++ b/src/pages/wrong_question_record/components/favorites-course.vue @@ -0,0 +1,172 @@ + + + + \ No newline at end of file diff --git a/src/pages/wrong_question_record/components/radio-subject.vue b/src/pages/wrong_question_record/components/radio-subject.vue new file mode 100644 index 00000000..fbc7eb26 --- /dev/null +++ b/src/pages/wrong_question_record/components/radio-subject.vue @@ -0,0 +1,117 @@ + + + + + \ No newline at end of file diff --git a/src/pages/wrong_question_record/index.vue b/src/pages/wrong_question_record/index.vue new file mode 100644 index 00000000..017ffc7f --- /dev/null +++ b/src/pages/wrong_question_record/index.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/src/pagesA.json b/src/pagesA.json index 4f9a4909..9dd07c3e 100644 --- a/src/pagesA.json +++ b/src/pagesA.json @@ -71,6 +71,60 @@ "titleNView": false } } + }, + { + "path": "pages/preview/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/favorites/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/messageNotification/index", + "style": { + "navigationBarTitleText": "消息", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/testingHall/index", + "style": { + "navigationBarTitleText": "考试中心", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/testingHall/details", + "style": { + "navigationBarTitleText": "考试详情", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/wrong_question_record/index", + "style": { + "navigationBarTitleText": "错题本", + "app-plus": { + "titleNView": false + } + } } ] } \ No newline at end of file diff --git a/src/pagesOther.json b/src/pagesOther.json index 30ce19da..e8cf31c7 100644 --- a/src/pagesOther.json +++ b/src/pagesOther.json @@ -105,7 +105,8 @@ "navigationStyle": "custom", "app-plus": { "titleView": false, - "bounce": "none" + "bounce": "none", + "softinputNavBar": "none" } }, "uniIdRouter": {} diff --git a/src/static/images/common/default_img.png b/src/static/images/common/default_img.png index c813a2e4..531f7923 100644 Binary files a/src/static/images/common/default_img.png and b/src/static/images/common/default_img.png differ diff --git a/src/static/images/common/default_img_2.png b/src/static/images/common/default_img_2.png new file mode 100644 index 00000000..2f7feab0 Binary files /dev/null and b/src/static/images/common/default_img_2.png differ diff --git a/src/static/images/common/error.png b/src/static/images/common/error.png new file mode 100644 index 00000000..2922e98d Binary files /dev/null and b/src/static/images/common/error.png differ diff --git a/src/static/images/common/loading.mp4 b/src/static/images/common/loading.mp4 new file mode 100644 index 00000000..3a4ce6e1 Binary files /dev/null and b/src/static/images/common/loading.mp4 differ diff --git a/src/static/images/common/mipmap-hdpi/splash.png b/src/static/images/common/mipmap-hdpi/splash.png deleted file mode 100644 index 1eda4edd..00000000 Binary files a/src/static/images/common/mipmap-hdpi/splash.png and /dev/null differ diff --git a/src/static/images/common/mipmap-mdpi/splash.png b/src/static/images/common/mipmap-mdpi/splash.png deleted file mode 100644 index 843beff4..00000000 Binary files a/src/static/images/common/mipmap-mdpi/splash.png and /dev/null differ diff --git a/src/static/images/common/mipmap-xhdpi/splash.png b/src/static/images/common/mipmap-xhdpi/splash.png deleted file mode 100644 index 9f934e1a..00000000 Binary files a/src/static/images/common/mipmap-xhdpi/splash.png and /dev/null differ diff --git a/src/static/images/common/mipmap-xxhdpi/splash.png b/src/static/images/common/mipmap-xxhdpi/splash.png deleted file mode 100644 index 5d47693e..00000000 Binary files a/src/static/images/common/mipmap-xxhdpi/splash.png and /dev/null differ diff --git a/src/static/images/common/mipmap-xxxhdpi/splash.png b/src/static/images/common/mipmap-xxxhdpi/splash.png deleted file mode 100644 index 557831e9..00000000 Binary files a/src/static/images/common/mipmap-xxxhdpi/splash.png and /dev/null differ diff --git a/src/static/images/common/success.png b/src/static/images/common/success.png new file mode 100644 index 00000000..ccad7082 Binary files /dev/null and b/src/static/images/common/success.png differ diff --git a/src/static/images/courseDetail/charts.png b/src/static/images/courseDetail/charts.png new file mode 100644 index 00000000..719c3d13 Binary files /dev/null and b/src/static/images/courseDetail/charts.png differ diff --git a/src/static/images/courseDetail/in_collect.png b/src/static/images/courseDetail/in_collect.png new file mode 100644 index 00000000..84833968 Binary files /dev/null and b/src/static/images/courseDetail/in_collect.png differ diff --git a/src/static/images/courseDetail/out_collect.png b/src/static/images/courseDetail/out_collect.png new file mode 100644 index 00000000..29c5a536 Binary files /dev/null and b/src/static/images/courseDetail/out_collect.png differ diff --git a/src/static/images/me/dot.png b/src/static/images/me/dot.png new file mode 100644 index 00000000..ea1eeb3f Binary files /dev/null and b/src/static/images/me/dot.png differ diff --git a/src/static/images/message_notification/delete_icon.png b/src/static/images/message_notification/delete_icon.png new file mode 100644 index 00000000..24110295 Binary files /dev/null and b/src/static/images/message_notification/delete_icon.png differ diff --git a/src/static/images/message_notification/type_1.png b/src/static/images/message_notification/type_1.png new file mode 100644 index 00000000..369e7f03 Binary files /dev/null and b/src/static/images/message_notification/type_1.png differ diff --git a/src/static/images/message_notification/type_2.png b/src/static/images/message_notification/type_2.png new file mode 100644 index 00000000..56d48606 Binary files /dev/null and b/src/static/images/message_notification/type_2.png differ diff --git a/src/static/images/message_notification/type_3.png b/src/static/images/message_notification/type_3.png new file mode 100644 index 00000000..93205675 Binary files /dev/null and b/src/static/images/message_notification/type_3.png differ diff --git a/src/static/images/message_notification/type_4.png b/src/static/images/message_notification/type_4.png new file mode 100644 index 00000000..ae7727df Binary files /dev/null and b/src/static/images/message_notification/type_4.png differ diff --git a/src/static/images/message_notification/type_5.png b/src/static/images/message_notification/type_5.png new file mode 100644 index 00000000..e3c460dd Binary files /dev/null and b/src/static/images/message_notification/type_5.png differ diff --git a/src/~ preview_17532708468282.json b/src/~ preview_17532708468282.json deleted file mode 100644 index aaea03e3..00000000 --- a/src/~ preview_17532708468282.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "userId": "USER001", - "userName": "ADMIN", - "loginName": "ADMIN", - "orgId": "00E200", - "orgName": "吉林银行-总行-金融科技部(下辖二级部研发部、运维部)", - "deptId": "", - "deptName": null, - "userStatus": "01", - "imageAddr": "/traoss/tras3/show/S3T0250181221042025072319404600000427552", - "gender": "f" -} \ No newline at end of file