diff --git a/.env.development b/.env.development index d5be997b..24eca2f5 100644 --- a/.env.development +++ b/.env.development @@ -16,7 +16,9 @@ ENV = 'development' # dev # VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit + VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' + # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' @@ -28,7 +30,7 @@ VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' # h5专用地址x2 - +# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.150:9601' # dev #VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit diff --git a/src/components/points-and-badge/badge.vue b/src/components/points-and-badge/badge.vue index a1e6da12..20ada5e1 100644 --- a/src/components/points-and-badge/badge.vue +++ b/src/components/points-and-badge/badge.vue @@ -20,7 +20,8 @@ - {{ item.pointsBadgeName }} + {{ item.pointsBadgeName }} + {{ item.remark }} @@ -30,7 +31,6 @@ - badgesList.value.length > 1); const titleNumberText = ['', '两', '三', '四', '五', '六', '七', '八', '九', '十']; const title = computed(() => - badgesList.value.length === 1 - ? '恭喜你获得徽章' - : `恭喜你获得${titleNumberText[badgesList.value.length - 1]}枚徽章` + badgesList.value.length === 1 ? '恭喜你获得徽章' : `恭喜你获得${titleNumberText[badgesList.value.length - 1]}枚徽章` ); const buttonColor = 'linear-gradient( 270deg, #F81758 0%, #FFA062 100%)'; const customStyle = { @@ -101,7 +99,7 @@ // 点击 const clickFun = (status = true) => { emits('confirm', status, pointsList.value, badgesList.value, () => {}); - CloseComplete(status, pointsList.value, badgesList.value) + CloseComplete(status, pointsList.value, badgesList.value); }; const open = (points = [], badges = [], complete = () => {}) => { @@ -110,7 +108,7 @@ return; } console.log('badges', badges); - CloseComplete = complete + CloseComplete = complete; badgesList.value = badges; pointsList.value = points; opacity.value = 1; @@ -118,8 +116,7 @@ uni.$emit('update_me_data', true); popup.value.open('center'); }; - onUnmounted(() => { - }); + onUnmounted(() => {}); defineExpose({ open, close }); @@ -130,20 +127,28 @@ align-items: center; justify-content: space-between; .swiper { - height: 660rpx; + height: 700rpx; flex: 1; margin: 0 50rpx; + // background-color: red; .swiper-item-div { display: flex; align-items: center; - justify-content: center; + // justify-content: center; flex-direction: column; + .points-title-div { + margin-top: 40rpx; + // position: absolute; + // bottom: 60rpx; + } .points-msg-div { - position: absolute; - bottom: -30rpx; + margin: 30rpx 20rpx 0 20rpx; + // position: absolute; + // bottom: 0rpx; } .img-div { + margin-top: 60rpx; position: relative; display: flex; align-items: center; @@ -215,15 +220,21 @@ flex-direction: column; } } - .points-msg-div { - height: 120rpx; + .points-title-div { + // height: 120rpx; font-family: PingFangSC, PingFang SC; font-weight: 500; font-size: 36rpx; color: #dec38c; - line-height: 120rpx; text-align: center; - font-style: normal; + } + .points-msg-div { + // height: 120rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 500; + font-size: 26rpx; + color: #dec38c; + text-align: center; } .button-div { height: 80rpx; diff --git a/src/pages.json b/src/pages.json index 8d0ca400..62ee516d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -411,6 +411,15 @@ } } }, + { + "path": "pages/test/testChat", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/course/index", "style": { diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue index e4d866be..9c52ab1c 100644 --- a/src/pages/analytics/study.vue +++ b/src/pages/analytics/study.vue @@ -522,7 +522,7 @@ top: 14rpx; background-image: url(@/static/images/analytics/den-tips.png); background-repeat: no-repeat; - background-size: cover; + background-size: 100% 100%; } &.study2-tip{ &::before { diff --git a/src/pages/competition/matching.vue b/src/pages/competition/matching.vue index 33f61916..a4f29369 100644 --- a/src/pages/competition/matching.vue +++ b/src/pages/competition/matching.vue @@ -75,6 +75,8 @@ {{ data_info.isAnony === 'N' ? data_info.orgIdName : '机构不显示' }} + + @@ -195,7 +197,6 @@ comId }); const pkData = pkDataBody.body; - // 下面两行是给后端擦屁股,后端传回的数值为空 pkData.orgId = orgId; pkData.papersId = papersId; pkData.userId = data_info.userId; @@ -214,6 +215,7 @@ }); // 2. 执行匹配成功动画（等待1.5秒） await new Promise((resolve) => setTimeout(resolve, 600)); + // 3. 清除计时器 if (practiceTimeTimer) { clearInterval(practiceTimeTimer); diff --git a/src/pages/competition/ranking.vue b/src/pages/competition/ranking.vue index 181895c5..67a00174 100644 --- a/src/pages/competition/ranking.vue +++ b/src/pages/competition/ranking.vue @@ -8,7 +8,6 @@ - { - // showDialog({ - // title: '提示信息', - // content: '检测到您已离开，即将退出学习页面。', - // confirmText: '确认', - // showCancel: false, - // cancelText: '再想想', - // success: (res) => { - // if (res.confirm) { - // console.log('用户点击确定'); - // } - // }, - // cancel: () => { - // console.log('用户点击取消'); - // } - // }); - showDialog({ - title: '提示', - content: '检测到您已存在学习记录，要继续学习吗？', - confirmText: '重新学习', - showCancel: true, - cancelText: '继续学习', - success: (res) => { - if (res.confirm) { - console.log('用户点击确定'); - } - }, - cancel: () => { - console.log('用户点击取消'); - } - }); } const aaaa = () => { - common.show('提示','检测到您已存在学习记录，要继续学习吗？','继续学习', '重新学习').then(res => { - - }) - - -// function show(title, msg, showCancel = true, cancelText = '取消', confirmText = '确定') { - - - // showDialog({ - // title: '提示', - // content: '检测到您已存在学习记录，要继续学习吗？', - // confirmText: '重新学习', - // showCancel: true, - // cancelText: '继续学习', - // success: (res) => { - // if (res.confirm) { - // console.log('用户点击确定'); - // } - // }, - // cancel: () => { - // console.log('用户点击取消'); - // } - // }); + common.navigateTo('/pages/test/testChat') } diff --git a/src/pages/test/testChat2.vue b/src/pages/test/testChat2.vue new file mode 100644 index 00000000..e250a7d3 --- /dev/null +++ b/src/pages/test/testChat2.vue @@ -0,0 +1,147 @@ + + + + diff --git a/src/pagesA.json b/src/pagesA.json index 0d926927..552ff43a 100644 --- a/src/pagesA.json +++ b/src/pagesA.json @@ -346,6 +346,14 @@ "titleNView": false } } + },{ + "path": "pages/test/testChat", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } } ] } \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index e2ccf4bc..08a24f3a 100644 --- a/vite.config.js +++ b/vite.config.js @@ -10,5 +10,10 @@ export default defineConfig({ port: 5174, strictPort: true, // 可选：端口被占用时直接报错（避免自动切换端口） open: false // 可选：启动后自动打开浏览器（按需开启） + }, + base: './', // 关键：设置基础路径为相对路径 + build: { + outDir: 'dist', + assetsDir: 'assets' // 和打包后的目录一致 } }) \ No newline at end of file