diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue index a709ea6..2e860d9 100644 --- a/components/tabbar/tabbar.vue +++ b/components/tabbar/tabbar.vue @@ -53,7 +53,7 @@ }, methods: { gogogo(id) { - this.actindex = id + this.actindex = id; if (id == 1) { uni.reLaunch({ url: '/newPages/newIndex/index' @@ -65,9 +65,9 @@ }) } if (id == 3) { - uni.reLaunch({ - url: '/pages/my/my' + // url: '/pages/my/my' + url: '/newPages/my/index' }) } if (id == 4) { diff --git a/newPages/courseDetail/assets/style/index.rpx.scss b/newPages/courseDetail/assets/style/index.rpx.scss index cbbdf34..bee3f3d 100644 --- a/newPages/courseDetail/assets/style/index.rpx.scss +++ b/newPages/courseDetail/assets/style/index.rpx.scss @@ -99,10 +99,12 @@ } .group_3 { height: 594rpx; - background: url(/static/lanhu_kechengxiangqing/FigmaDDSSlicePNGd876ad79433fb9b2d50bcb5270f579a4.png) - 100% no-repeat; - background-size: 100% 100%; - width: 750rpx; + background: 100% no-repeat; + background-size: 100% 100%; + width: 750rpx; + border-bottom-left-radius: 30rpx; /* 设置左下角圆角 */ + border-bottom-right-radius: 30rpx; /* 设置右下角圆角 */ + overflow: hidden; /* 确保内容不会溢出圆角区域 */ .section_1 { background-color: rgba(255, 255, 255, 1); width: 750rpx; diff --git a/newPages/courseDetail/index.vue b/newPages/courseDetail/index.vue index 0a70c7c..27d7cd1 100644 --- a/newPages/courseDetail/index.vue +++ b/newPages/courseDetail/index.vue @@ -1,54 +1,39 @@ diff --git a/newPages/evaluate/assets/style/index.rpx.scss b/newPages/evaluate/assets/style/index.rpx.scss index 9e6fb6e..77798e3 100644 --- a/newPages/evaluate/assets/style/index.rpx.scss +++ b/newPages/evaluate/assets/style/index.rpx.scss @@ -175,7 +175,7 @@ height: 48rpx; } .text-group_1 { - width: 84rpx; + /* width: 84rpx; height: 28rpx; overflow-wrap: break-word; color: rgba(51, 51, 51, 1); @@ -185,7 +185,19 @@ text-align: left; white-space: nowrap; line-height: 28rpx; - margin-top: 10rpx; + margin-top: 10rpx; */ + width: 84rpx; + 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: center; + white-space: nowrap; + line-height: 28rpx; + margin-top: 0; + justify-content: center; } } .section_2 { diff --git a/newPages/my/assets/style/index.rpx.scss b/newPages/my/assets/style/index.rpx.scss index 8bd0643..8d4de62 100644 --- a/newPages/my/assets/style/index.rpx.scss +++ b/newPages/my/assets/style/index.rpx.scss @@ -305,8 +305,12 @@ margin: 30rpx 0 30rpx 64rpx; .image-text_3 { width: 72rpx; - height: 116rpx; - margin-right: 90rpx; + height: 116rpx; + margin-right: 90rpx; + display: flex; /* 使用 flex 布局 */ + flex-direction: column; /* 垂直排列子元素 */ + align-items: center; /* 水平居中 */ + justify-content: center; /* 垂直居中 */ .label_3 { width: 72rpx; height: 72rpx; @@ -323,6 +327,7 @@ white-space: nowrap; line-height: 24rpx; margin-top: 20rpx; + } } } diff --git a/newPages/my/index.vue b/newPages/my/index.vue index ce3ee20..4a29d1a 100644 --- a/newPages/my/index.vue +++ b/newPages/my/index.vue @@ -1,29 +1,8 @@ diff --git a/newPages/schoolDetail/assets/style/index.rpx.scss b/newPages/schoolDetail/assets/style/index.rpx.scss index 2e000ac..cb6d315 100644 --- a/newPages/schoolDetail/assets/style/index.rpx.scss +++ b/newPages/schoolDetail/assets/style/index.rpx.scss @@ -99,8 +99,8 @@ } .group_4 { height: 482rpx; - background: url(/static/lanhu_jiaxiaoxiangqing/FigmaDDSSlicePNGcd54efcc9a8c89af0ef99c8275464828.png) - 100% no-repeat; + /* background: url(/static/lanhu_jiaxiaoxiangqing/FigmaDDSSlicePNGcd54efcc9a8c89af0ef99c8275464828.png) + 100% no-repeat; */ background-size: 100% 100%; width: 750rpx; .box_3 { @@ -303,6 +303,7 @@ } } } + .text-wrapper_3 { background-color: rgba(255, 239, 229, 1); border-radius: 2px; @@ -833,4 +834,113 @@ } } } + .container { + padding: 20rpx; + background: #fff; + border-radius: 16rpx; + } + + .section-title { + font-size: 32rpx; + font-weight: bold; + margin-bottom: 20rpx; + } + + .class-list { + display: flex; + flex-direction: column; + gap: 20rpx; + width: 90%; + height: 30%; + margin: 40rpx 0 0 20rpx; + } + + .class-item { + display: flex; + + padding: 20rpx; + border-radius: 12rpx; + } + + .class-image { + width: 160rpx; + height: 100rpx; + border-radius: 8rpx; + } + + .class-info { + flex: 1; + margin-left: 20rpx; + display: flex; + flex-direction: column; + justify-content: space-between; + } + + .class-name { + font-size: 35rpx; + font-weight: bold; + margin-bottom: 10px; + } + + .class-price { + display: flex; + align-items: center; + } + + .price { + font-size: 28rpx; + color: #ff4d4f; + font-weight: bold; + } + + .original-price { + font-size: 24rpx; + text-decoration: line-through; + color: #999; + margin-left: 10rpx; + } + + .class-details { + display: flex; + gap: 8rpx; /* 设置两个标签之间的间距 */ + align-items: center; + margin-bottom: 10rpx; + + } + + .view-all { + margin-top: 20rpx; + display: flex; + justify-content: center; + align-items: center; + color: #007aff; + font-size: 28rpx; + } + + .arrow-icon { + width: 20rpx; + height: 20rpx; + } + + .class-type, + .class-license { + display: flex; /* 设置为行内块元素 */ + padding: 6rpx; + border-radius: 3px; /* 圆角 */ + font-size: 12px; /* 较小的字体 */ + font-weight: bold; /* 加粗 */ + justify-content: center; + align-items: center; + } + + /* 如果需要区分两个标签的样式,可以单独设置 */ + .class-type { + color: #3478DC; + background-color: #DDEDFE; /* 红色背景 */ + } + + .class-license { + color: #8B623D; + background-color: #FFF0E4; /* 蓝色背景 */ + } } diff --git a/newPages/schoolDetail/index.vue b/newPages/schoolDetail/index.vue index 349e4e8..4987dbd 100644 --- a/newPages/schoolDetail/index.vue +++ b/newPages/schoolDetail/index.vue @@ -1,39 +1,30 @@ \ No newline at end of file + diff --git a/pages/login/login.vue b/pages/login/login.vue index 32ed73b..979afe9 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -57,7 +57,9 @@ import request from '../../utils/request'; import config from '@/config' import { - setToken + getLocalUserInfo, + setLocalUserInfo, + setToken, setUserInfo } from '@/utils/auth.js' export default { @@ -198,6 +200,7 @@ export default { // clearInterval(this.loginStatus) // } setToken(rex.data.data.token) + setLocalUserInfo(rex.data.data.userinfo) //uni.setStorageSync('App-Token', ); if (this.returnUrl) { uni.navigateBack() diff --git a/static/myImgs/allOrder.png b/static/myImgs/allOrder.png new file mode 100644 index 0000000..73a6fa7 Binary files /dev/null and b/static/myImgs/allOrder.png differ diff --git a/static/myImgs/alreadyInterviewed.png b/static/myImgs/alreadyInterviewed.png new file mode 100644 index 0000000..9d4b863 Binary files /dev/null and b/static/myImgs/alreadyInterviewed.png differ diff --git a/static/myImgs/alreadyPaid.png b/static/myImgs/alreadyPaid.png new file mode 100644 index 0000000..c9b81ed Binary files /dev/null and b/static/myImgs/alreadyPaid.png differ diff --git a/static/myImgs/registered.png b/static/myImgs/registered.png new file mode 100644 index 0000000..2787dcf Binary files /dev/null and b/static/myImgs/registered.png differ diff --git a/utils/auth.js b/utils/auth.js index 6a3a083..76bbe18 100644 --- a/utils/auth.js +++ b/utils/auth.js @@ -1,5 +1,6 @@ const TokenKey = 'App-Token' const TenantIdKey = 'TENANT_ID' +const userInfo = 'userInfo' export function getToken() { return uni.getStorageSync(TokenKey) @@ -16,6 +17,15 @@ export function removeToken() { export function setTenantId(TenantId) { return uni.setStorageSync(TenantIdKey, TenantId); } + export function getTenantId(){ return uni.getStorageSync(TenantIdKey) } + +export function setLocalUserInfo(userinfo){ + return uni.setStorageSync(userInfo,userinfo) +} + +export function getLocalUserInfo() { + return uni.getStorageSync(userInfo) +}