diff --git a/config.js b/config.js index 0224d01..5a9980b 100644 --- a/config.js +++ b/config.js @@ -3,7 +3,8 @@ module.exports = { // baseUrl: 'https://vue.ruoyi.vip/prod-api', imagesUrl: 'http://122.51.230.86:9000', - baseUrl: 'http://localhost:48080', + // baseUrl: 'http://localhost:48080', + baseUrl: 'http://192.168.1.27:48080', appId:'wx684fc832e96cee65', appSecret:'d1fecac806c5f3cd9aca9f3d5c3759c7', // baseUrl: 'http://192.168.31.54:8016/jx', diff --git a/newPages/courseList/index.vue b/newPages/courseList/index.vue index 084d8ad..139a5c2 100644 --- a/newPages/courseList/index.vue +++ b/newPages/courseList/index.vue @@ -100,7 +100,7 @@ export default { // 跳转到详情页 goToDetail(courseId) { uni.navigateTo({ - url: `/newPages/courseDetail/index?courseId=${courseId}&tenantId=${this.tenantId}`, + url: `/pagesA/courseDetail/index?courseId=${courseId}&tenantId=${this.tenantId}`, }); }, diff --git a/newPages/informationAdd/assets/style/index.rem.scss b/newPages/informationAdd/assets/style/index.rem.scss deleted file mode 100644 index c0c0c49..0000000 --- a/newPages/informationAdd/assets/style/index.rem.scss +++ /dev/null @@ -1,313 +0,0 @@ -.page { - background-color: rgba(242, 244, 248, 1); - position: relative; - width: 10rem; - height: 21.654rem; - overflow: hidden; - .box_1 { - background-color: rgba(255, 255, 255, 1); - width: 10rem; - height: 1.227rem; - .image_1 { - width: 0.854rem; - height: 0.48rem; - margin: 0.374rem 0 0 0.8rem; - } - .box_2 { - background-color: rgba(0, 0, 0, 0.9); - width: 0.48rem; - height: 0.294rem; - margin: 0.454rem 0 0 6.16rem; - } - .box_3 { - background-color: rgba(0, 0, 0, 0.9); - width: 0.427rem; - height: 0.32rem; - margin: 0.454rem 0 0 0.134rem; - } - .image_2 { - width: 0.667rem; - height: 0.32rem; - margin: 0.454rem 0.374rem 0 0.107rem; - } - } - .box_4 { - width: 10rem; - height: 18.854rem; - .box_5 { - background-color: rgba(255, 255, 255, 1); - width: 10rem; - height: 1.28rem; - justify-content: flex-center; - .label_1 { - width: 0.64rem; - height: 0.64rem; - margin: 0.32rem 0 0 0.32rem; - } - .text_1 { - width: 1.707rem; - height: 0.694rem; - overflow-wrap: break-word; - color: rgba(0, 0, 0, 0.9); - font-size: 0.426rem; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: center; - white-space: nowrap; - line-height: 0.694rem; - margin: 0.294rem 0 0 3.174rem; - } - .block_1 { - background-color: rgba(0, 0, 0, 0.2); - border-radius: 16px; - height: 0.854rem; - width: 2.32rem; - margin: 0.214rem 0.32rem 0 1.52rem; - .image-wrapper_1 { - width: 0.534rem; - height: 0.027rem; - margin: 0.16rem 0 0 1.2rem; - .thumbnail_1 { - width: 0.534rem; - height: 0.027rem; - } - } - .group_1 { - width: 1.627rem; - height: 0.427rem; - margin: 0.027rem 0 0.214rem 0.347rem; - .section_1 { - background-color: rgba(255, 255, 255, 0.9); - width: 0.48rem; - height: 0.16rem; - margin-top: 0.134rem; - } - .section_2 { - background-color: rgba(255, 255, 255, 0.9); - width: 0.427rem; - height: 0.427rem; - } - } - } - } - .box_6 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - height: 4.32rem; - width: 9.147rem; - margin: 0.267rem 0 0 0.427rem; - .box_7 { - width: 8.614rem; - height: 0.934rem; - margin: 0.24rem 0 0 0.267rem; - .text_2 { - width: 0.747rem; - height: 0.374rem; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 0.373rem; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 0.374rem; - margin-top: 0.294rem; - } - .label_2 { - width: 0.934rem; - height: 0.934rem; - } - } - .text-wrapper_1 { - width: 8.614rem; - height: 0.374rem; - margin: 0.8rem 0 0 0.267rem; - .text_3 { - width: 0.747rem; - height: 0.374rem; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 0.373rem; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 0.374rem; - } - .text_4 { - width: 1.494rem; - height: 0.374rem; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 0.373rem; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: right; - white-space: nowrap; - line-height: 0.374rem; - } - } - .text-wrapper_2 { - width: 8.614rem; - height: 0.374rem; - margin: 1.067rem 0 0.534rem 0.267rem; - .text_5 { - width: 1.494rem; - height: 0.374rem; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 0.373rem; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 0.374rem; - } - .text_6 { - width: 2.64rem; - height: 0.374rem; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 0.373rem; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: right; - white-space: nowrap; - line-height: 0.374rem; - } - } - } - .box_8 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - height: 4.187rem; - width: 9.147rem; - justify-content: flex-center; - margin: 0.267rem 0 0 0.427rem; - .text-wrapper_3 { - width: 1.867rem; - height: 0.374rem; - margin: 0.4rem 0 0 0.267rem; - .text_7 { - width: 1.867rem; - height: 0.374rem; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 0.373rem; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: left; - white-space: nowrap; - line-height: 0.374rem; - } - } - .group_2 { - width: 8.614rem; - height: 2.614rem; - margin: 0.4rem 0 0.4rem 0.267rem; - .image-wrapper_2 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - height: 2.614rem; - width: 4.16rem; - .image_3 { - width: 1.867rem; - height: 1.867rem; - margin: 0.374rem 0 0 1.147rem; - } - } - .image-wrapper_3 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - height: 2.614rem; - width: 4.16rem; - .image_4 { - width: 1.867rem; - height: 1.867rem; - margin: 0.374rem 0 0 1.147rem; - } - } - } - } - .box_9 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - width: 9.147rem; - height: 3.707rem; - justify-content: flex-center; - margin: 0.267rem 0 4.56rem 0.427rem; - .text_8 { - width: 1.494rem; - height: 0.374rem; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 0.373rem; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: left; - white-space: nowrap; - line-height: 0.374rem; - margin: 0.4rem 0 0 0.267rem; - } - .block_2 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - width: 2.134rem; - height: 2.134rem; - margin: 0.4rem 0 0.4rem 0.267rem; - .image-text_1 { - width: 1.067rem; - height: 1.067rem; - margin: 0.534rem 0 0 0.534rem; - .label_3 { - width: 0.64rem; - height: 0.64rem; - margin-left: 0.214rem; - } - .text-group_1 { - width: 1.067rem; - height: 0.267rem; - overflow-wrap: break-word; - color: rgba(115, 124, 144, 1); - font-size: 0.266rem; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: left; - white-space: nowrap; - line-height: 0.267rem; - margin-top: 0.16rem; - } - } - } - } - } - .box_10 { - background-color: rgba(255, 255, 255, 1); - height: 1.6rem; - margin-top: -0.026rem; - width: 10rem; - .text-wrapper_4 { - background-color: rgba(4, 78, 242, 1); - border-radius: 20px; - height: 1.067rem; - width: 9.147rem; - margin: 0.267rem 0 0 0.427rem; - .text_9 { - width: 0.854rem; - height: 0.427rem; - overflow-wrap: break-word; - color: rgba(255, 255, 255, 1); - font-size: 0.426rem; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: center; - white-space: nowrap; - line-height: 0.427rem; - margin: 0.32rem 0 0 4.24rem; - } - } - } -} diff --git a/newPages/informationAdd/assets/style/index.response.scss b/newPages/informationAdd/assets/style/index.response.scss deleted file mode 100644 index f5ded1c..0000000 --- a/newPages/informationAdd/assets/style/index.response.scss +++ /dev/null @@ -1,313 +0,0 @@ -.page { - background-color: rgba(242, 244, 248, 1); - position: relative; - width: 100vw; - height: 216.54vw; - overflow: hidden; - .box_1 { - background-color: rgba(255, 255, 255, 1); - width: 100vw; - height: 12.27vw; - .image_1 { - width: 8.54vw; - height: 4.8vw; - margin: 3.73vw 0 0 8vw; - } - .box_2 { - background-color: rgba(0, 0, 0, 0.9); - width: 4.8vw; - height: 2.94vw; - margin: 4.53vw 0 0 61.6vw; - } - .box_3 { - background-color: rgba(0, 0, 0, 0.9); - width: 4.27vw; - height: 3.2vw; - margin: 4.53vw 0 0 1.33vw; - } - .image_2 { - width: 6.67vw; - height: 3.2vw; - margin: 4.53vw 3.73vw 0 1.06vw; - } - } - .box_4 { - width: 100vw; - height: 188.54vw; - .box_5 { - background-color: rgba(255, 255, 255, 1); - width: 100vw; - height: 12.8vw; - justify-content: flex-center; - .label_1 { - width: 6.4vw; - height: 6.4vw; - margin: 3.2vw 0 0 3.2vw; - } - .text_1 { - width: 17.07vw; - height: 6.94vw; - overflow-wrap: break-word; - color: rgba(0, 0, 0, 0.9); - font-size: 4.26vw; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: center; - white-space: nowrap; - line-height: 6.94vw; - margin: 2.93vw 0 0 31.73vw; - } - .block_1 { - background-color: rgba(0, 0, 0, 0.2); - border-radius: 16px; - height: 8.54vw; - width: 23.2vw; - margin: 2.13vw 3.2vw 0 15.2vw; - .image-wrapper_1 { - width: 5.34vw; - height: 0.27vw; - margin: 1.6vw 0 0 12vw; - .thumbnail_1 { - width: 5.34vw; - height: 0.27vw; - } - } - .group_1 { - width: 16.27vw; - height: 4.27vw; - margin: 0.26vw 0 2.13vw 3.46vw; - .section_1 { - background-color: rgba(255, 255, 255, 0.9); - width: 4.8vw; - height: 1.6vw; - margin-top: 1.34vw; - } - .section_2 { - background-color: rgba(255, 255, 255, 0.9); - width: 4.27vw; - height: 4.27vw; - } - } - } - } - .box_6 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - height: 43.2vw; - width: 91.47vw; - margin: 2.66vw 0 0 4.26vw; - .box_7 { - width: 86.14vw; - height: 9.34vw; - margin: 2.4vw 0 0 2.66vw; - .text_2 { - width: 7.47vw; - height: 3.74vw; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 3.73vw; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 3.74vw; - margin-top: 2.94vw; - } - .label_2 { - width: 9.34vw; - height: 9.34vw; - } - } - .text-wrapper_1 { - width: 86.14vw; - height: 3.74vw; - margin: 8vw 0 0 2.66vw; - .text_3 { - width: 7.47vw; - height: 3.74vw; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 3.73vw; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 3.74vw; - } - .text_4 { - width: 14.94vw; - height: 3.74vw; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 3.73vw; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: right; - white-space: nowrap; - line-height: 3.74vw; - } - } - .text-wrapper_2 { - width: 86.14vw; - height: 3.74vw; - margin: 10.66vw 0 5.33vw 2.66vw; - .text_5 { - width: 14.94vw; - height: 3.74vw; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 3.73vw; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 3.74vw; - } - .text_6 { - width: 26.4vw; - height: 3.74vw; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 3.73vw; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: right; - white-space: nowrap; - line-height: 3.74vw; - } - } - } - .box_8 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - height: 41.87vw; - width: 91.47vw; - justify-content: flex-center; - margin: 2.66vw 0 0 4.26vw; - .text-wrapper_3 { - width: 18.67vw; - height: 3.74vw; - margin: 4vw 0 0 2.66vw; - .text_7 { - width: 18.67vw; - height: 3.74vw; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 3.73vw; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: left; - white-space: nowrap; - line-height: 3.74vw; - } - } - .group_2 { - width: 86.14vw; - height: 26.14vw; - margin: 4vw 0 4vw 2.66vw; - .image-wrapper_2 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - height: 26.14vw; - width: 41.6vw; - .image_3 { - width: 18.67vw; - height: 18.67vw; - margin: 3.73vw 0 0 11.46vw; - } - } - .image-wrapper_3 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - height: 26.14vw; - width: 41.6vw; - .image_4 { - width: 18.67vw; - height: 18.67vw; - margin: 3.73vw 0 0 11.46vw; - } - } - } - } - .box_9 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - width: 91.47vw; - height: 37.07vw; - justify-content: flex-center; - margin: 2.66vw 0 45.6vw 4.26vw; - .text_8 { - width: 14.94vw; - height: 3.74vw; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 3.73vw; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: left; - white-space: nowrap; - line-height: 3.74vw; - margin: 4vw 0 0 2.66vw; - } - .block_2 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - width: 21.34vw; - height: 21.34vw; - margin: 4vw 0 4vw 2.66vw; - .image-text_1 { - width: 10.67vw; - height: 10.67vw; - margin: 5.33vw 0 0 5.33vw; - .label_3 { - width: 6.4vw; - height: 6.4vw; - margin-left: 2.14vw; - } - .text-group_1 { - width: 10.67vw; - height: 2.67vw; - overflow-wrap: break-word; - color: rgba(115, 124, 144, 1); - font-size: 2.66vw; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: left; - white-space: nowrap; - line-height: 2.67vw; - margin-top: 1.6vw; - } - } - } - } - } - .box_10 { - background-color: rgba(255, 255, 255, 1); - height: 16vw; - margin-top: -0.26vw; - width: 100vw; - .text-wrapper_4 { - background-color: rgba(4, 78, 242, 1); - border-radius: 20px; - height: 10.67vw; - width: 91.47vw; - margin: 2.66vw 0 0 4.26vw; - .text_9 { - width: 8.54vw; - height: 4.27vw; - overflow-wrap: break-word; - color: rgba(255, 255, 255, 1); - font-size: 4.26vw; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: center; - white-space: nowrap; - line-height: 4.27vw; - margin: 3.2vw 0 0 42.4vw; - } - } - } -} diff --git a/newPages/informationAdd/assets/style/index.rpx.scss b/newPages/informationAdd/assets/style/index.rpx.scss deleted file mode 100644 index 935be7c..0000000 --- a/newPages/informationAdd/assets/style/index.rpx.scss +++ /dev/null @@ -1,313 +0,0 @@ -.page { - background-color: rgba(242, 244, 248, 1); - position: relative; - width: 750rpx; - height: 1624rpx; - overflow: hidden; - .box_1 { - background-color: rgba(255, 255, 255, 1); - width: 750rpx; - height: 92rpx; - .image_1 { - width: 64rpx; - height: 36rpx; - margin: 28rpx 0 0 60rpx; - } - .box_2 { - background-color: rgba(0, 0, 0, 0.9); - width: 36rpx; - height: 22rpx; - margin: 34rpx 0 0 462rpx; - } - .box_3 { - background-color: rgba(0, 0, 0, 0.9); - width: 32rpx; - height: 24rpx; - margin: 34rpx 0 0 10rpx; - } - .image_2 { - width: 50rpx; - height: 24rpx; - margin: 34rpx 28rpx 0 8rpx; - } - } - .box_4 { - width: 750rpx; - height: 1414rpx; - .box_5 { - background-color: rgba(255, 255, 255, 1); - width: 750rpx; - height: 96rpx; - justify-content: flex-center; - .label_1 { - width: 48rpx; - height: 48rpx; - margin: 24rpx 0 0 24rpx; - } - .text_1 { - width: 128rpx; - height: 52rpx; - overflow-wrap: break-word; - color: rgba(0, 0, 0, 0.9); - font-size: 32rpx; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: center; - white-space: nowrap; - line-height: 52rpx; - margin: 22rpx 0 0 238rpx; - } - .block_1 { - background-color: rgba(0, 0, 0, 0.2); - border-radius: 16px; - height: 64rpx; - width: 174rpx; - margin: 16rpx 24rpx 0 114rpx; - .image-wrapper_1 { - width: 40rpx; - height: 2rpx; - margin: 12rpx 0 0 90rpx; - .thumbnail_1 { - width: 40rpx; - height: 2rpx; - } - } - .group_1 { - width: 122rpx; - height: 32rpx; - margin: 2rpx 0 16rpx 26rpx; - .section_1 { - background-color: rgba(255, 255, 255, 0.9); - width: 36rpx; - height: 12rpx; - margin-top: 10rpx; - } - .section_2 { - background-color: rgba(255, 255, 255, 0.9); - width: 32rpx; - height: 32rpx; - } - } - } - } - .box_6 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - height: 324rpx; - width: 686rpx; - margin: 20rpx 0 0 32rpx; - .box_7 { - width: 646rpx; - height: 70rpx; - margin: 18rpx 0 0 20rpx; - .text_2 { - width: 56rpx; - height: 28rpx; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 28rpx; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 28rpx; - margin-top: 22rpx; - } - .label_2 { - width: 70rpx; - height: 70rpx; - } - } - .text-wrapper_1 { - width: 646rpx; - height: 28rpx; - margin: 60rpx 0 0 20rpx; - .text_3 { - width: 56rpx; - height: 28rpx; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 28rpx; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 28rpx; - } - .text_4 { - width: 200rpx; - height: 28rpx; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 28rpx; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: right; - white-space: nowrap; - line-height: 28rpx; - } - } - .text-wrapper_2 { - width: 646rpx; - height: 28rpx; - margin: 80rpx 0 40rpx 20rpx; - .text_5 { - width: 112rpx; - height: 28rpx; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 28rpx; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 28rpx; - } - .text_6 { - width: 300rpx; - height: 28rpx; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 28rpx; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: right; - white-space: nowrap; - line-height: 28rpx; - } - } - } - .box_8 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - height: 314rpx; - width: 686rpx; - justify-content: flex-center; - margin: 20rpx 0 0 32rpx; - .text-wrapper_3 { - width: 140rpx; - height: 28rpx; - margin: 30rpx 0 0 20rpx; - .text_7 { - width: 140rpx; - height: 28rpx; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 28rpx; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: left; - white-space: nowrap; - line-height: 28rpx; - } - } - .group_2 { - width: 646rpx; - height: 196rpx; - margin: 30rpx 0 30rpx 20rpx; - .image-wrapper_2 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - height: 196rpx; - width: 312rpx; - .image_3 { - width: 140rpx; - height: 140rpx; - margin: 28rpx 0 0 86rpx; - } - } - .image-wrapper_3 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - height: 196rpx; - width: 312rpx; - .image_4 { - width: 140rpx; - height: 140rpx; - margin: 28rpx 0 0 86rpx; - } - } - } - } - .box_9 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - width: 686rpx; - height: 278rpx; - justify-content: flex-center; - margin: 20rpx 0 342rpx 32rpx; - .text_8 { - width: 112rpx; - height: 28rpx; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 28rpx; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: left; - white-space: nowrap; - line-height: 28rpx; - margin: 30rpx 0 0 20rpx; - } - .block_2 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - width: 160rpx; - height: 160rpx; - margin: 30rpx 0 30rpx 20rpx; - .image-text_1 { - width: 80rpx; - height: 80rpx; - margin: 40rpx 0 0 40rpx; - .label_3 { - width: 48rpx; - height: 48rpx; - margin-left: 16rpx; - } - .text-group_1 { - width: 80rpx; - height: 20rpx; - overflow-wrap: break-word; - color: rgba(115, 124, 144, 1); - font-size: 20rpx; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: left; - white-space: nowrap; - line-height: 20rpx; - margin-top: 12rpx; - } - } - } - } - } - .box_10 { - background-color: rgba(255, 255, 255, 1); - height: 120rpx; - margin-top: -2rpx; - width: 750rpx; - .text-wrapper_4 { - background-color: rgba(4, 78, 242, 1); - border-radius: 20px; - height: 80rpx; - width: 686rpx; - margin: 20rpx 0 0 32rpx; - .text_9 { - width: 64rpx; - height: 32rpx; - overflow-wrap: break-word; - color: rgba(255, 255, 255, 1); - font-size: 32rpx; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: center; - white-space: nowrap; - line-height: 32rpx; - margin: 24rpx 0 0 318rpx; - } - } - } -} diff --git a/newPages/informationAdd/assets/style/index.scss b/newPages/informationAdd/assets/style/index.scss deleted file mode 100644 index cfb92ec..0000000 --- a/newPages/informationAdd/assets/style/index.scss +++ /dev/null @@ -1,313 +0,0 @@ -.page { - background-color: rgba(242, 244, 248, 1); - position: relative; - width: 375px; - height: 812px; - overflow: hidden; - .box_1 { - background-color: rgba(255, 255, 255, 1); - width: 375px; - height: 46px; - .image_1 { - width: 32px; - height: 18px; - margin: 14px 0 0 30px; - } - .box_2 { - background-color: rgba(0, 0, 0, 0.9); - width: 18px; - height: 11px; - margin: 17px 0 0 231px; - } - .box_3 { - background-color: rgba(0, 0, 0, 0.9); - width: 16px; - height: 12px; - margin: 17px 0 0 5px; - } - .image_2 { - width: 25px; - height: 12px; - margin: 17px 14px 0 4px; - } - } - .box_4 { - width: 375px; - height: 707px; - .box_5 { - background-color: rgba(255, 255, 255, 1); - width: 375px; - height: 48px; - justify-content: flex-center; - .label_1 { - width: 24px; - height: 24px; - margin: 12px 0 0 12px; - } - .text_1 { - width: 64px; - height: 26px; - overflow-wrap: break-word; - color: rgba(0, 0, 0, 0.9); - font-size: 16px; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: center; - white-space: nowrap; - line-height: 26px; - margin: 11px 0 0 119px; - } - .block_1 { - background-color: rgba(0, 0, 0, 0.2); - border-radius: 16px; - height: 32px; - width: 87px; - margin: 8px 12px 0 57px; - .image-wrapper_1 { - width: 20px; - height: 1px; - margin: 6px 0 0 45px; - .thumbnail_1 { - width: 20px; - height: 1px; - } - } - .group_1 { - width: 61px; - height: 16px; - margin: 1px 0 8px 13px; - .section_1 { - background-color: rgba(255, 255, 255, 0.9); - width: 18px; - height: 6px; - margin-top: 5px; - } - .section_2 { - background-color: rgba(255, 255, 255, 0.9); - width: 16px; - height: 16px; - } - } - } - } - .box_6 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - height: 162px; - width: 343px; - margin: 10px 0 0 16px; - .box_7 { - width: 323px; - height: 35px; - margin: 9px 0 0 10px; - .text_2 { - width: 28px; - height: 14px; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 14px; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 14px; - margin-top: 11px; - } - .label_2 { - width: 35px; - height: 35px; - } - } - .text-wrapper_1 { - width: 323px; - height: 14px; - margin: 30px 0 0 10px; - .text_3 { - width: 28px; - height: 14px; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 14px; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 14px; - } - .text_4 { - width: 56px; - height: 14px; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 14px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: right; - white-space: nowrap; - line-height: 14px; - } - } - .text-wrapper_2 { - width: 323px; - height: 14px; - margin: 40px 0 20px 10px; - .text_5 { - width: 56px; - height: 14px; - overflow-wrap: break-word; - color: rgba(131, 131, 131, 1); - font-size: 14px; - letter-spacing: -0.30000001192092896px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: center; - white-space: nowrap; - line-height: 14px; - } - .text_6 { - width: 99px; - height: 14px; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 14px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: right; - white-space: nowrap; - line-height: 14px; - } - } - } - .box_8 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - height: 157px; - width: 343px; - justify-content: flex-center; - margin: 10px 0 0 16px; - .text-wrapper_3 { - width: 70px; - height: 14px; - margin: 15px 0 0 10px; - .text_7 { - width: 70px; - height: 14px; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 14px; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: left; - white-space: nowrap; - line-height: 14px; - } - } - .group_2 { - width: 323px; - height: 98px; - margin: 15px 0 15px 10px; - .image-wrapper_2 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - height: 98px; - width: 156px; - .image_3 { - width: 70px; - height: 70px; - margin: 14px 0 0 43px; - } - } - .image-wrapper_3 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - height: 98px; - width: 156px; - .image_4 { - width: 70px; - height: 70px; - margin: 14px 0 0 43px; - } - } - } - } - .box_9 { - background-color: rgba(255, 255, 255, 1); - border-radius: 8px; - width: 343px; - height: 139px; - justify-content: flex-center; - margin: 10px 0 171px 16px; - .text_8 { - width: 56px; - height: 14px; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 14px; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: left; - white-space: nowrap; - line-height: 14px; - margin: 15px 0 0 10px; - } - .block_2 { - background-color: rgba(242, 244, 248, 1); - border-radius: 4px; - width: 80px; - height: 80px; - margin: 15px 0 15px 10px; - .image-text_1 { - width: 40px; - height: 40px; - margin: 20px 0 0 20px; - .label_3 { - width: 24px; - height: 24px; - margin-left: 8px; - } - .text-group_1 { - width: 40px; - height: 10px; - overflow-wrap: break-word; - color: rgba(115, 124, 144, 1); - font-size: 10px; - font-family: PingFang SC-Regular; - font-weight: NaN; - text-align: left; - white-space: nowrap; - line-height: 10px; - margin-top: 6px; - } - } - } - } - } - .box_10 { - background-color: rgba(255, 255, 255, 1); - height: 60px; - margin-top: -1px; - width: 375px; - .text-wrapper_4 { - background-color: rgba(4, 78, 242, 1); - border-radius: 20px; - height: 40px; - width: 343px; - margin: 10px 0 0 16px; - .text_9 { - width: 32px; - height: 16px; - overflow-wrap: break-word; - color: rgba(255, 255, 255, 1); - font-size: 16px; - font-family: PingFang SC-Semibold; - font-weight: 600; - text-align: center; - white-space: nowrap; - line-height: 16px; - margin: 12px 0 0 159px; - } - } - } -} diff --git a/newPages/informationAdd/index.vue b/newPages/informationAdd/index.vue deleted file mode 100644 index 95a5c47..0000000 --- a/newPages/informationAdd/index.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - diff --git a/newPages/my/assets/style/index.rpx.scss b/newPages/my/assets/style/index.rpx.scss index a47c34b..c7c6c02 100644 --- a/newPages/my/assets/style/index.rpx.scss +++ b/newPages/my/assets/style/index.rpx.scss @@ -2,7 +2,7 @@ background-color: rgba(255, 255, 255, 1); position: relative; width: 750rpx; - height: 1624rpx; + height: 100vh; overflow: hidden; .box_1 { width: 750rpx; diff --git a/newPages/my/index.vue b/newPages/my/index.vue index e75c908..6ce10ed 100644 --- a/newPages/my/index.vue +++ b/newPages/my/index.vue @@ -78,21 +78,21 @@ - + 个人信息 - + - + 消息中心 @@ -104,10 +104,10 @@ - - + + - 学车码 + 学车码 @@ -136,6 +136,7 @@ export default { showQrCode: false, isCreateQrCode:true, noReadNum:0, + rpxUnit: 2, loopData: [ { url: '/static/myImgs/alreadyPaid.png', @@ -169,6 +170,8 @@ export default { onLoad() { this.selfInfoLocal = getLocalUserInfo() this.getUserInfo() + this.systemInfo() + }, onShow() { if (getToken()) { @@ -192,6 +195,11 @@ export default { tabbar }, methods: { + systemInfo(){ + const systemInfo = uni.getSystemInfoSync(); + //1rpx 转换px 的单位 + this.rpxUnit= (systemInfo.screenWidth / 750) + }, goback() { uni.navigateBack() }, @@ -203,7 +211,7 @@ export default { createQrCode(data) { const qr = new UQRCode(); qr.data = data; - qr.size = 300; + qr.size = 300*this.rpxUnit-10; qr.make(); const ctx = uni.createCanvasContext('qrcode', this); // 组件内调用需传this,vue3 中 this 为 getCurrentInstance()?.proxy qr.canvasContext = ctx; @@ -252,6 +260,7 @@ export default { uni.navigateTo({ url: "/pages/login/login" }) + return } uni.navigateTo({ url: `/newPages/orderList/index?orderType=${orderType}&type=${type}&userId=${this.selfInfo.id}` @@ -262,9 +271,10 @@ export default { uni.navigateTo({ url: "/pages/login/login" }) + return } uni.navigateTo({ - url: `/newPages/information/index?userId=${this.selfInfo.id}` + url: `/pagesA/information/index?userId=${this.selfInfo.id}` }) }, goFeedback(){ diff --git a/newPages/newIndex/assets/style/index.rpx.scss b/newPages/newIndex/assets/style/index.rpx.scss index c5e8ef0..bee2027 100644 --- a/newPages/newIndex/assets/style/index.rpx.scss +++ b/newPages/newIndex/assets/style/index.rpx.scss @@ -2,7 +2,7 @@ background-color: rgba(255, 255, 255, 1); position: relative; //width: 750rpx; - //height: 1706rpx; + height: 100vh; overflow: hidden; .section_1 { height: 500rpx; diff --git a/newPages/newIndex/index.vue b/newPages/newIndex/index.vue index 9211669..2a2af84 100644 --- a/newPages/newIndex/index.vue +++ b/newPages/newIndex/index.vue @@ -21,9 +21,20 @@ + - + + + @@ -59,8 +70,8 @@ import SchoolInfo from './SchoolInfo.vue'; import request from "@/utils/request"; import { - getCoachId, - getInviteId, + getCoachId, + getInviteId, getLocalUserInfo, getToken, removeCoachId, @@ -107,6 +118,7 @@ export default { total: 0, imageUrl: this.$imagesUrl, textList:[], + noticeList: [], qTenantId: null, qCoachId: null, }; @@ -131,6 +143,7 @@ export default { removeInviteId() removeCoachId() removeTenantId() + this.getList() /* uni.reLaunch({ url: '/pages-home/home/home' }) */ @@ -168,7 +181,6 @@ export default { } }) }, - getList() { const params = { pageNo: this.pageNo, @@ -211,22 +223,44 @@ export default { /** * 实时讯息 */ - async getTextList() { + /* async getTextList() { let res = await request({ - url: '/app-api/drivingSchool/text/list', + url: '/app-api/base/notice/pageList', method: 'get', params: { pageNum: 1, - pageSize: 10000 + pageSize: 10000, + parentServer: 'jiaxiao', + server: 'wx' } }) - // this.textList = res.data.records - // 将textList中的title拼接成数组赋值给textList this.textList = [] res.data.records.forEach(item => { this.textList.push(item.title) }) - }, + }, */ + async getTextList() { + let res = await request({ + url: '/app-api/base/notice/pageList', + method: 'get', + params: { + pageNum: 1, + pageSize: 10000, + parentServer: 'jiaxiao', + server: 'wx' + } + }) + this.noticeList = res.data.records // 保留原始数据 + this.textList = res.data.records.map(item => item.title) // 提取 title 用于展示 + }, + handleNoticeClick(index) { + const currentNotice = this.noticeList[index] + if (currentNotice && currentNotice.id) { + uni.navigateTo({ + url: `/pagesA/noticeContent/index?id=${currentNotice.id}` + }) + } + }, getSwiperList() { request({ url: '/app-api/drivingSchool/text/swiper/list', @@ -304,7 +338,7 @@ export default { return; } uni.navigateTo({ - url: '/newPages/appointment/index' + url: '/pagesA/appointment/index' }); break; case '考试结果录入': @@ -324,7 +358,7 @@ export default { return; } uni.navigateTo({ - url: '/newPages/examinationList/index' + url: '/pagesA/examinationList/index' }); break; case '评价': @@ -344,7 +378,7 @@ export default { return; } uni.navigateTo({ - url: '/newPages/evaluate/index' + url: '/pagesA/evaluate/index' }); break; default: diff --git a/newPages/schoolDetail/index.vue b/newPages/schoolDetail/index.vue index b908a2e..96ee305 100644 --- a/newPages/schoolDetail/index.vue +++ b/newPages/schoolDetail/index.vue @@ -18,57 +18,12 @@ 地址:{{ schoolInfo.address }} 营业时间 - - {{ schoolInfo.businessStartTime }} - {{schoolInfo.businessEndTime}} + {{ schoolInfo.businessStartTime }} - {{ schoolInfo.businessEndTime }} + 08:00-18:00 - - - - - - - - - - - - - + - - - @@ -337,7 +292,7 @@ export default { // 跳转到详情页 goToDetail(courseId) { uni.navigateTo({ - url: `/newPages/courseDetail/index?courseId=${courseId}&tenantId=${this.tenantId}`, + url: `/pagesA/courseDetail/index?courseId=${courseId}&tenantId=${this.tenantId}`, }); }, diff --git a/pages.json b/pages.json index f65da79..c0351db 100644 --- a/pages.json +++ b/pages.json @@ -24,101 +24,6 @@ "navigationStyle": "custom" } }, - - { - "path": "pages/index/schoolList", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "驾校列表", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/Details", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "驾校详情", - "navigationStyle": "custom" - } - }, - { - "path": "pages/reservation/reservation", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "预约中心", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/courseInfo", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "课程详情", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/bmPage", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "报名页面", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/schoolFeedback", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "意见反馈", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/TextInfo", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "实施讯系", - "navigationStyle": "custom", - "backgroundColorTop": "#fff" - } - }, - { - "path": "pages/index/schoolCounseling", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "列表", - "navigationStyle": "custom", - "backgroundColorTop": "#fff" - } - }, - { - "path": "pages/index/schoolCDetails", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "列表详情", - "navigationStyle": "custom", - "backgroundColorTop": "#fff" - } - }, - { - "path": "pages/index/coachDetails", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "教练详情", - "navigationStyle": "custom", - "backgroundColorTop": "#fff" - } - }, - { - "path": "pages/index/TextContrnt", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "公告信息", - "navigationStyle": "custom", - "backgroundColorTop": "#fff" - } - }, - { "path": "pages/login/login", "style": { @@ -127,71 +32,7 @@ "navigationStyle": "custom" } }, - { - "path": "pages/my/my", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "预约中心", - "navigationStyle": "custom" - } - }, - { - "path": "pages/my/passThrough", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, - - { - "path": "pages/index/bookingInfo", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "预约详情", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/allOrders", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "全部订单", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/selfInfo", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "个人信息", - "navigationStyle": "custom" - } - }, - { - "path": "pages/index/jlInfo", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "教练信息", - "navigationStyle": "custom" - } - }, -// { -// "path": "newPages/newIndex/index", -// "style": { -// "enablePullDownRefresh": true, -// "navigationBarTitleText": "考试通过", -// "navigationStyle": "custom" -// } -// }, - { - "path": "newPages/appointmentDetail/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, + { "path": "newPages/orderList/index", "style": { @@ -200,22 +41,8 @@ "navigationStyle": "custom" } }, - { - "path": "newPages/evaluateAdd/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, - { - "path": "newPages/examinationList/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, + + { "path": "newPages/courseList/index", "style": { @@ -224,22 +51,7 @@ "navigationStyle": "custom" } }, - { - "path": "newPages/evaluate/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, - { - "path": "newPages/appointment/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, + { "path": "newPages/my/index", "style": { @@ -248,14 +60,7 @@ "navigationStyle": "custom" } }, - { - "path": "newPages/examinationAdd/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, + { "path": "newPages/schoolDetail/index", "style": { @@ -264,38 +69,9 @@ "navigationStyle": "custom" } }, - { - "path": "newPages/courseDetail/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, - { - "path": "newPages/informationAdd/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, - { - "path": "newPages/information/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, - { - "path": "newPages/appointmentAdd/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "考试通过", - "navigationStyle": "custom" - } - }, + + + { "path": "newPages/schoolList/index", "style": { @@ -304,14 +80,7 @@ "navigationStyle": "custom" } }, - { - "path": "newPages/register/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "报名", - "navigationStyle": "custom" - } - }, + { "path": "newPages/messageCenter/index", "style": { @@ -330,6 +99,107 @@ } ], + "subPackages": [ + { + "root": "pagesA", + "pages": [ + { + "path": "appointmentAdd/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "添加预约", + "navigationStyle": "custom" + } + }, + { + "path": "appointmentDetail/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "预约详情", + "navigationStyle": "custom" + } + }, + { + "path": "appointment/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "预约", + "navigationStyle": "custom" + } + }, + { + "path": "evaluateAdd/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "添加评价", + "navigationStyle": "custom" + } + }, + { + "path": "evaluate/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "评价", + "navigationStyle": "custom" + } + }, + { + "path": "examinationList/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "考试成绩录入列表", + "navigationStyle": "custom" + } + }, + { + "path": "examinationAdd/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "考试成绩录入", + "navigationStyle": "custom" + } + }, + { + "path": "register/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "报名", + "navigationStyle": "custom" + } + }, + { + "path": "information/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "个人信息", + "navigationStyle": "custom" + } + }, + { + "path": "courseDetail/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "课程详情", + "navigationStyle": "custom" + } + }, + { + "path": "noticeContent/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "通知公告详情", + "navigationStyle": "custom" + } + } + ] + }, + { + "root": "uni_modules", + "name": "modules", + "pages": [] + } + ], + "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", diff --git a/pages/index/contract.vue b/pages/index/contract.vue index 4904ae5..a46e9ba 100644 --- a/pages/index/contract.vue +++ b/pages/index/contract.vue @@ -122,7 +122,7 @@ export default { const pages = getCurrentPages(); const prevPage = pages[pages.length - 2]; - if (prevPage && (prevPage.route === 'newPages/register/index' || prevPage.route === '/newPages/register/index')) { + if (prevPage && (prevPage.route === 'pagesA/register/index' || prevPage.route === '/pagesA/register/index')) { if (this.callback) { // 从onLoad中获取的callback try { const callback = decodeURIComponent(this.callback); diff --git a/newPages/appointment/assets/style/index.rem.scss b/pagesA/appointment/assets/style/index.rem.scss similarity index 100% rename from newPages/appointment/assets/style/index.rem.scss rename to pagesA/appointment/assets/style/index.rem.scss diff --git a/newPages/appointment/assets/style/index.response.scss b/pagesA/appointment/assets/style/index.response.scss similarity index 100% rename from newPages/appointment/assets/style/index.response.scss rename to pagesA/appointment/assets/style/index.response.scss diff --git a/newPages/appointment/assets/style/index.rpx.scss b/pagesA/appointment/assets/style/index.rpx.scss similarity index 99% rename from newPages/appointment/assets/style/index.rpx.scss rename to pagesA/appointment/assets/style/index.rpx.scss index 56402c7..15c6804 100644 --- a/newPages/appointment/assets/style/index.rpx.scss +++ b/pagesA/appointment/assets/style/index.rpx.scss @@ -2,7 +2,8 @@ background-color: rgba(242, 244, 248, 1); position: relative; width: 750rpx; - height: 1624rpx; + // height: 1624rpx; + height: 100vh; overflow: hidden; .box_1 { background-color: rgba(255, 255, 255, 1); @@ -417,7 +418,7 @@ background-color: rgba(255, 255, 255, 1); height: 120rpx; margin-top: -2rpx; - //width: 750rpx; + width: 100%; .text-wrapper_12 { background-color: rgba(4, 78, 242, 1); border-radius: 20px; diff --git a/newPages/appointment/assets/style/index.scss b/pagesA/appointment/assets/style/index.scss similarity index 100% rename from newPages/appointment/assets/style/index.scss rename to pagesA/appointment/assets/style/index.scss diff --git a/newPages/appointment/index.vue b/pagesA/appointment/index.vue similarity index 90% rename from newPages/appointment/index.vue rename to pagesA/appointment/index.vue index ab17bb8..7e33633 100644 --- a/newPages/appointment/index.vue +++ b/pagesA/appointment/index.vue @@ -8,7 +8,7 @@ - @@ -114,7 +114,8 @@ constants: {}, list: ['预约记录', '训练记录'], curNow: 0, - subjectArr: ['科目一', '科目二', '科目三', '科目四'] + subjectArr: ['科目一', '科目二', '科目三', '科目四'], + scrollHeight: 0, }; }, onLoad() { @@ -129,6 +130,10 @@ } }) }, + onReady() { + // 动态计算滚动区域高度 + this.calculateScrollHeight(); + }, methods: { goback() { uni.navigateBack() @@ -188,9 +193,19 @@ goDetail(data, str) { //将data转为字符串 uni.navigateTo({ - url: `/newPages/appointmentDetail/index?data=${JSON.stringify(data)}&type=${str}` + url: `/pagesA/appointmentDetail/index?data=${JSON.stringify(data)}&type=${str}` }) }, + calculateScrollHeight() { + // 获取屏幕高度 + const screenHeight = uni.getSystemInfoSync().windowHeight; + // 获取顶部区域高度(头部+分段选择器) + const topHeight = 138; // 140rpx转换为px + // 获取底部按钮高度(假设约100rpx) + const bottomHeight = uni.upx2px(120); + // 计算滚动区域高度 + this.scrollHeight = screenHeight - topHeight - bottomHeight; + }, /** * 上滑加载数据 */ @@ -225,13 +240,13 @@ }, goAppointment() { uni.navigateTo({ - url: '/newPages/appointmentAdd/index' + url: '/pagesA/appointmentAdd/index' }) }, goEvaluateAdd(data) { data = JSON.stringify(data) uni.navigateTo({ - url: `/newPages/evaluateAdd/index?data=${data}&type=xunlian&controls=add` + url: `/pagesA/evaluateAdd/index?data=${data}&type=xunlian&controls=add` }) }, } diff --git a/newPages/appointmentAdd/assets/style/index.rem.scss b/pagesA/appointmentAdd/assets/style/index.rem.scss similarity index 100% rename from newPages/appointmentAdd/assets/style/index.rem.scss rename to pagesA/appointmentAdd/assets/style/index.rem.scss diff --git a/newPages/appointmentAdd/assets/style/index.response.scss b/pagesA/appointmentAdd/assets/style/index.response.scss similarity index 100% rename from newPages/appointmentAdd/assets/style/index.response.scss rename to pagesA/appointmentAdd/assets/style/index.response.scss diff --git a/newPages/appointmentAdd/assets/style/index.rpx.scss b/pagesA/appointmentAdd/assets/style/index.rpx.scss similarity index 100% rename from newPages/appointmentAdd/assets/style/index.rpx.scss rename to pagesA/appointmentAdd/assets/style/index.rpx.scss diff --git a/newPages/appointmentAdd/assets/style/index.scss b/pagesA/appointmentAdd/assets/style/index.scss similarity index 100% rename from newPages/appointmentAdd/assets/style/index.scss rename to pagesA/appointmentAdd/assets/style/index.scss diff --git a/newPages/appointmentAdd/index.vue b/pagesA/appointmentAdd/index.vue similarity index 100% rename from newPages/appointmentAdd/index.vue rename to pagesA/appointmentAdd/index.vue diff --git a/newPages/appointmentDetail/assets/style/index.rem.scss b/pagesA/appointmentDetail/assets/style/index.rem.scss similarity index 100% rename from newPages/appointmentDetail/assets/style/index.rem.scss rename to pagesA/appointmentDetail/assets/style/index.rem.scss diff --git a/newPages/appointmentDetail/assets/style/index.response.scss b/pagesA/appointmentDetail/assets/style/index.response.scss similarity index 100% rename from newPages/appointmentDetail/assets/style/index.response.scss rename to pagesA/appointmentDetail/assets/style/index.response.scss diff --git a/newPages/appointmentDetail/assets/style/index.rpx.scss b/pagesA/appointmentDetail/assets/style/index.rpx.scss similarity index 100% rename from newPages/appointmentDetail/assets/style/index.rpx.scss rename to pagesA/appointmentDetail/assets/style/index.rpx.scss diff --git a/newPages/appointmentDetail/assets/style/index.scss b/pagesA/appointmentDetail/assets/style/index.scss similarity index 100% rename from newPages/appointmentDetail/assets/style/index.scss rename to pagesA/appointmentDetail/assets/style/index.scss diff --git a/newPages/appointmentDetail/index.vue b/pagesA/appointmentDetail/index.vue similarity index 100% rename from newPages/appointmentDetail/index.vue rename to pagesA/appointmentDetail/index.vue diff --git a/pagesA/common/common.css b/pagesA/common/common.css new file mode 100644 index 0000000..ec18962 --- /dev/null +++ b/pagesA/common/common.css @@ -0,0 +1,65 @@ +body * { + box-sizing: border-box; + flex-shrink: 0; +} +body { + font-family: PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma, + Arial, PingFang SC-Light, Microsoft YaHei; +} +button { + margin: 0; + padding: 0; + border: 1px solid transparent; + outline: none; + background-color: transparent; +} + +button:active { + opacity: 0.6; +} +.flex-col { + display: flex; + flex-direction: column; +} +.flex-row { + display: flex; + flex-direction: row; +} +.justify-start { + display: flex; + justify-content: flex-start; + } +.justify-center { + display: flex; + justify-content: center; +} + +.justify-end { + display: flex; + justify-content: flex-end; +} +.justify-evenly { + display: flex; + justify-content: space-evenly; +} +.justify-around { + display: flex; + justify-content: space-around; +} +.justify-between { + display: flex; + justify-content: space-between; +} +.align-start { + display: flex; + align-items: flex-start; +} +.align-center { + display: flex; + align-items: center; +} +.align-end { + display: flex; + align-items: flex-end; +} + \ No newline at end of file diff --git a/pagesA/common/common.less b/pagesA/common/common.less new file mode 100644 index 0000000..ec18962 --- /dev/null +++ b/pagesA/common/common.less @@ -0,0 +1,65 @@ +body * { + box-sizing: border-box; + flex-shrink: 0; +} +body { + font-family: PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma, + Arial, PingFang SC-Light, Microsoft YaHei; +} +button { + margin: 0; + padding: 0; + border: 1px solid transparent; + outline: none; + background-color: transparent; +} + +button:active { + opacity: 0.6; +} +.flex-col { + display: flex; + flex-direction: column; +} +.flex-row { + display: flex; + flex-direction: row; +} +.justify-start { + display: flex; + justify-content: flex-start; + } +.justify-center { + display: flex; + justify-content: center; +} + +.justify-end { + display: flex; + justify-content: flex-end; +} +.justify-evenly { + display: flex; + justify-content: space-evenly; +} +.justify-around { + display: flex; + justify-content: space-around; +} +.justify-between { + display: flex; + justify-content: space-between; +} +.align-start { + display: flex; + align-items: flex-start; +} +.align-center { + display: flex; + align-items: center; +} +.align-end { + display: flex; + align-items: flex-end; +} + \ No newline at end of file diff --git a/pagesA/common/common.scss b/pagesA/common/common.scss new file mode 100644 index 0000000..20c56ef --- /dev/null +++ b/pagesA/common/common.scss @@ -0,0 +1,64 @@ +body * { + box-sizing: border-box; + flex-shrink: 0; +} +body { + font-family: PingFangSC-Regular, Roboto, Helvetica Neue, Helvetica, Tahoma, + Arial, PingFang SC-Light, Microsoft YaHei; +} +button { + margin: 0; + padding: 0; + border: 1px solid transparent; + outline: none; + background-color: transparent; +} + +button:active { + opacity: 0.6; +} +.flex-col { + display: flex; + flex-direction: column; +} +.flex-row { + display: flex; + //flex-direction: row; +} +.justify-start { + display: flex; + justify-content: flex-start; + } +.justify-center { + display: flex; + justify-content: center; +} + +.justify-end { + display: flex; + justify-content: flex-end; +} +.justify-evenly { + display: flex; + justify-content: space-evenly; +} +.justify-around { + display: flex; + justify-content: space-around; +} +.justify-between { + display: flex; + justify-content: space-between; +} +.align-start { + display: flex; + align-items: flex-start; +} +.align-center { + display: flex; + align-items: center; +} +.align-end { + display: flex; + align-items: flex-end; +} diff --git a/newPages/courseDetail/assets/style/index.rem.scss b/pagesA/courseDetail/assets/style/index.rem.scss similarity index 100% rename from newPages/courseDetail/assets/style/index.rem.scss rename to pagesA/courseDetail/assets/style/index.rem.scss diff --git a/newPages/courseDetail/assets/style/index.response.scss b/pagesA/courseDetail/assets/style/index.response.scss similarity index 100% rename from newPages/courseDetail/assets/style/index.response.scss rename to pagesA/courseDetail/assets/style/index.response.scss diff --git a/newPages/courseDetail/assets/style/index.rpx.scss b/pagesA/courseDetail/assets/style/index.rpx.scss similarity index 100% rename from newPages/courseDetail/assets/style/index.rpx.scss rename to pagesA/courseDetail/assets/style/index.rpx.scss diff --git a/newPages/courseDetail/assets/style/index.scss b/pagesA/courseDetail/assets/style/index.scss similarity index 100% rename from newPages/courseDetail/assets/style/index.scss rename to pagesA/courseDetail/assets/style/index.scss diff --git a/newPages/courseDetail/index.vue b/pagesA/courseDetail/index.vue similarity index 97% rename from newPages/courseDetail/index.vue rename to pagesA/courseDetail/index.vue index d8b75af..1912d1b 100644 --- a/newPages/courseDetail/index.vue +++ b/pagesA/courseDetail/index.vue @@ -140,7 +140,7 @@ export default { return; } uni.navigateTo({ - url: `/newPages/register/index?courseId=${this.courseDetails.id}&userId=${this.userDetails.id}&tenantId=${this.tenantId}`, + url: `/pagesA/register/index?courseId=${this.courseDetails.id}&userId=${this.userDetails.id}&tenantId=${this.tenantId}`, // url: '/pages/index/bmPage' }); }, diff --git a/newPages/evaluate/assets/style/index.rem.scss b/pagesA/evaluate/assets/style/index.rem.scss similarity index 100% rename from newPages/evaluate/assets/style/index.rem.scss rename to pagesA/evaluate/assets/style/index.rem.scss diff --git a/newPages/evaluate/assets/style/index.response.scss b/pagesA/evaluate/assets/style/index.response.scss similarity index 100% rename from newPages/evaluate/assets/style/index.response.scss rename to pagesA/evaluate/assets/style/index.response.scss diff --git a/newPages/evaluate/assets/style/index.rpx.scss b/pagesA/evaluate/assets/style/index.rpx.scss similarity index 100% rename from newPages/evaluate/assets/style/index.rpx.scss rename to pagesA/evaluate/assets/style/index.rpx.scss diff --git a/newPages/evaluate/assets/style/index.scss b/pagesA/evaluate/assets/style/index.scss similarity index 100% rename from newPages/evaluate/assets/style/index.scss rename to pagesA/evaluate/assets/style/index.scss diff --git a/newPages/evaluate/index.vue b/pagesA/evaluate/index.vue similarity index 99% rename from newPages/evaluate/index.vue rename to pagesA/evaluate/index.vue index d0417f3..307c3b4 100644 --- a/newPages/evaluate/index.vue +++ b/pagesA/evaluate/index.vue @@ -160,7 +160,7 @@ export default { goEvaluateDetail(data) { data = JSON.stringify(data) uni.navigateTo({ - url: `/newPages/evaluateAdd/index?data=${data}` + url: `/pagesA/evaluateAdd/index?data=${data}` }) } } diff --git a/newPages/evaluateAdd/assets/style/index.rem.scss b/pagesA/evaluateAdd/assets/style/index.rem.scss similarity index 100% rename from newPages/evaluateAdd/assets/style/index.rem.scss rename to pagesA/evaluateAdd/assets/style/index.rem.scss diff --git a/newPages/evaluateAdd/assets/style/index.response.scss b/pagesA/evaluateAdd/assets/style/index.response.scss similarity index 100% rename from newPages/evaluateAdd/assets/style/index.response.scss rename to pagesA/evaluateAdd/assets/style/index.response.scss diff --git a/newPages/evaluateAdd/assets/style/index.rpx.scss b/pagesA/evaluateAdd/assets/style/index.rpx.scss similarity index 99% rename from newPages/evaluateAdd/assets/style/index.rpx.scss rename to pagesA/evaluateAdd/assets/style/index.rpx.scss index eb79421..ff59330 100644 --- a/newPages/evaluateAdd/assets/style/index.rpx.scss +++ b/pagesA/evaluateAdd/assets/style/index.rpx.scss @@ -2,7 +2,7 @@ background-color: rgba(242, 244, 248, 1); position: relative; width: 750rpx; - height: 1624rpx; + height: 100vh; overflow: hidden; .section_1 { background-color: rgba(255, 255, 255, 1); diff --git a/newPages/evaluateAdd/assets/style/index.scss b/pagesA/evaluateAdd/assets/style/index.scss similarity index 100% rename from newPages/evaluateAdd/assets/style/index.scss rename to pagesA/evaluateAdd/assets/style/index.scss diff --git a/newPages/evaluateAdd/index.vue b/pagesA/evaluateAdd/index.vue similarity index 94% rename from newPages/evaluateAdd/index.vue rename to pagesA/evaluateAdd/index.vue index 1afa0fb..b5b0e01 100644 --- a/newPages/evaluateAdd/index.vue +++ b/pagesA/evaluateAdd/index.vue @@ -1,7 +1,7 @@