Browse Source

样式修改

tanxue 2 months ago
parent
commit
1b47d5fc49
4 changed files with 134 additions and 57 deletions
  1. 62 4
      common/styles/global/pages.scss
  2. 34 15
      pages/my/xuexiJilu.vue
  3. 38 38
      pages/my/yingyongshezhi.vue
  4. BIN
      static/images/my/list-jt.png

+ 62 - 4
common/styles/global/pages.scss

@@ -899,7 +899,7 @@
 
 
 // 我的页面
 // 我的页面
 .ezy-my-page{
 .ezy-my-page{
-	width: 100%;height: 100vh;background-color: #00c5fe;position: relative;overflow: auto;
+	width: 100%;height: 100vh;min-height: 1400rpx;background-color: #00c5fe;position: relative;overflow: auto;
 	padding-top:var(--status-bar-height);@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/my/my-page-bj.png");
 	padding-top:var(--status-bar-height);@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/my/my-page-bj.png");
 	.my-head-box{
 	.my-head-box{
 		width: 100%;padding: 80rpx 24rpx 42rpx;box-sizing: border-box;display: flex;align-items: center;color: #fff;
 		width: 100%;padding: 80rpx 24rpx 42rpx;box-sizing: border-box;display: flex;align-items: center;color: #fff;
@@ -942,9 +942,6 @@
 		.not-confirm-btn{display: none;}
 		.not-confirm-btn{display: none;}
 		.confirm-btn{margin: 24rpx auto;}
 		.confirm-btn{margin: 24rpx auto;}
 	}
 	}
-	@media (max-height: 700px) {
-		min-height: 1400rpx;
-	}
 }
 }
 .ezy-my-page::before{
 .ezy-my-page::before{
 	content: '';width: 279rpx;height: 250rpx;display:block;
 	content: '';width: 279rpx;height: 250rpx;display:block;
@@ -952,6 +949,23 @@
 	@include ezy-no-repeat-cover;background-image: url("@/static/images/my/my-page-img.png");
 	@include ezy-no-repeat-cover;background-image: url("@/static/images/my/my-page-img.png");
 }
 }
 
 
+// 应用设置
+.ezy-yysz-page{
+	width: 100%;height: 100vh;min-height: 1400rpx;background-color: #00c5fe;position: relative;overflow: auto;
+	padding-top:var(--status-bar-height);@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/my/my-page-bj.png");
+	display: flex;flex-direction: column;
+	.yysz-row-box{width: 94%;background-color: rgba(255, 255, 255, 0.6);
+	border-radius: 8rpx;margin: 16rpx 3% 0;color: #333;font-size: 30rpx;}
+	.yysz-item{display: flex;align-items: center;justify-content: space-between;padding: 32rpx 46rpx 32rpx 16rpx;position: relative;}
+	.img-item{padding: 32rpx 46rpx 0 16rpx;}
+	.yysz-item::after{
+		content: '';width: 14rpx;height: 24rpx;@include ezy-no-repeat-cover;
+		background-image: url("@/static/images/my/list-jt.png");
+		position: absolute;right: 16rpx;
+	}
+	.yysz-img-box{width: 36px;height: 36px;border-radius: 50%;}
+}
+
 // 错题
 // 错题
 .ezy-cuoti-page{
 .ezy-cuoti-page{
 	width: 100%;height: 100vh;background-color: #00c5fe;position: relative;
 	width: 100%;height: 100vh;background-color: #00c5fe;position: relative;
@@ -998,6 +1012,50 @@
 
 
 }
 }
 
 
+// 学习记录
+.ezy-xxjl-page{
+	width: 100%;height: 100vh;background-color: #00c5fe;position: relative;
+	padding-top:var(--status-bar-height);display: flex;flex-direction: column;
+	@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/common/ezy-page-bj.png");
+	.uni-list{background-color: transparent!important;}
+	.uni-list--border-top,.uni-list--border-bottom{display: none;}
+
+	.xxjl-content-box{flex: 1;background-color: rgba(255, 255, 255, 0.6);z-index: 3;margin: 10rpx 20rpx;}
+	.cuoti-scroll-view{overflow-y: auto;height: calc(100vh - 380rpx - var(--status-bar-height));}
+
+	// item
+	.xxjl-item-box{
+		width: 94%;background-color: transparent!important;
+		border-bottom: 1px dashed #77d6f7;margin: 0 3%;
+		.uni-list-item__header{display: none;}
+		.uni-list-item__container{flex-direction: column;position: relative;padding:24rpx 0;overflow: unset;}
+		.item-date-row{
+			display: flex;justify-content: space-between;align-items: center;color:#28bdf2;font-size: 24rpx;	
+			.data-item{display: flex;align-items: center;}
+			.del-item{width: 60rpx;height: 60rpx;}
+			.data-icon{
+				width: 35rpx;height: 35rpx;margin: 10rpx;
+				@include ezy-no-repeat-cover;background-image: url("@/static/images/exam/cuoti-time-icon.png");}
+			.del-icon{
+				width: 35rpx;height: 35rpx;margin: 10rpx;
+				@include ezy-no-repeat-cover;background-image: url("@/static/images/my/sz-icon2.png");
+			}
+		}
+/* 		.item-zhang-row{
+			width: 100%;display: flex;align-items: center;color:#333;font-size: 32rpx;margin-bottom: 16rpx;	
+			>view{width: 60%;@include single-line-ellipsis;}
+			.zhang-icon{
+				width: 37rpx;height: 37rpx;margin:0 9rpx;
+				@include ezy-no-repeat-cover;background-image: url("@/static/images/my/sz-icon1.png");}
+		}
+		.item-jie-row{
+			width: 100%;color:#444;font-size: 26rpx;padding-left: 55rpx;line-height: 1;margin-bottom: 16rpx;@include single-line-ellipsis;
+			>text{width: 100%;@include single-line-ellipsis;}
+		} */
+	}
+
+}
+
 // 关于我们
 // 关于我们
 .ezy-about-page{
 .ezy-about-page{
 	width: 100%;height: 100vh;background-color: #00c5fe;position: relative;
 	width: 100%;height: 100vh;background-color: #00c5fe;position: relative;

+ 34 - 15
pages/my/xuexiJilu.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-	<view class="ezy-cuoti-page">
+	<view class="ezy-xxjl-page">
 		<view class="icon-title-navBar-box">
 		<view class="icon-title-navBar-box">
 			<view @click="handleBack" class="nav-bar-icon"></view>
 			<view @click="handleBack" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">学习记录</text>
 			<text class="nav-bar-title">学习记录</text>
@@ -7,24 +7,34 @@
 		<view class="ezy-tab-border">
 		<view class="ezy-tab-border">
 			<uni-segmented-control :current="data.current" :values="data.items" active-color="#3A7FE9"
 			<uni-segmented-control :current="data.current" :values="data.items" active-color="#3A7FE9"
 				@clickItem="onChangeTab" class="ezy-tab-box" />
 				@clickItem="onChangeTab" class="ezy-tab-box" />
-			<view class="cuoti-content-box">
+			<view class="xxjl-content-box">
 				<view v-if="data.current === 0">
 				<view v-if="data.current === 0">
 					<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.shuxue.loading"
 					<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.shuxue.loading"
 						:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
 						:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
-						class="cuoti-scroll-view">
+						class="xxjl-scroll-view">
 						<!--数学-->
 						<!--数学-->
 						<uni-list>
 						<uni-list>
-							<uni-list-item v-for="item in data.shuxue.list"  class="list-item-box">
+							<uni-list-item v-for="item in data.shuxue.list"  class="xxjl-item-box">
 								<template v-slot:body>
 								<template v-slot:body>
 									<view @click="goDao(item)">
 									<view @click="goDao(item)">
 										<view class="item-date-row">
 										<view class="item-date-row">
-											<icon class="data-icon"></icon>
-											<text>{{ item.levelName }}</text>
+											<view class="data-item">
+												<icon class="data-icon"></icon>
+												<text>{{ item.createTime }}</text>
+											</view>
+											<!-- 这里加点击事件 wgy看这里 -->
+											<view class="data-item del-item">
+												<icon class="del-icon"></icon>
+											</view>
 										</view>
 										</view>
-										<view>
+										<view class="item-zhang-row">
+											<icon class="zhang-icon"></icon>
+											<view>{{ item.levelName }}</view>
+										</view>
+										<view class="item-jie-row">
 											<text>{{ item.zhangName }}</text>
 											<text>{{ item.zhangName }}</text>
 										</view>
 										</view>
-										<view>
+										<view class="item-jie-row">
 											<text>{{ item.jieName }}</text>
 											<text>{{ item.jieName }}</text>
 										</view>
 										</view>
 									</view>
 									</view>
@@ -39,24 +49,33 @@
 				<view v-if="data.current === 1">
 				<view v-if="data.current === 1">
 					<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.yingyu.loading"
 					<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.yingyu.loading"
 						:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
 						:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
-						class="cuoti-scroll-view">
+						class="xxjl-scroll-view">
 						<!--英语-->
 						<!--英语-->
 						<uni-list>
 						<uni-list>
-							<uni-list-item v-for="item in data.yingyu.list" class="list-item-box">
+							<uni-list-item v-for="item in data.yingyu.list" class="xxjl-item-box">
 								<template v-slot:body>
 								<template v-slot:body>
 									<view>
 									<view>
 										<view class="item-date-row">
 										<view class="item-date-row">
-											<icon class="data-icon"></icon>
-											<text>{{ item.levelName }}</text>
+											<view class="data-item">
+												<icon class="data-icon"></icon>
+												<text>{{ item.createTime }}</text>
+											</view>
+											<!-- 这里加点击事件 wgy看这里 -->
+											<view class="data-item del-item">
+												<icon class="del-icon"></icon>
+											</view>
+										</view>
+										<view class="item-zhang-row">
+											<icon class="zhang-icon"></icon>
+											<view>{{ item.levelName }}</view>
 										</view>
 										</view>
-										<view>
+										<view class="item-jie-row">
 											<text>{{ item.zhangName }}</text>
 											<text>{{ item.zhangName }}</text>
 										</view>
 										</view>
-										<view>
+										<view class="item-jie-row">
 											<text>{{ item.jieName }}</text>
 											<text>{{ item.jieName }}</text>
 										</view>
 										</view>
 									</view>
 									</view>
-
 								</template>
 								</template>
 							</uni-list-item>
 							</uni-list-item>
 							<uni-load-more :status="data.yingyu.state" @click="getMore(1)"
 							<uni-load-more :status="data.yingyu.state" @click="getMore(1)"

+ 38 - 38
pages/my/yingyongshezhi.vue

@@ -1,47 +1,47 @@
 <template>
 <template>
-	<view class="ezy-my-page">
+	<view class="ezy-yysz-page">
 		<view class="icon-title-navBar-box">
 		<view class="icon-title-navBar-box">
 			<view @click="handleBack" class="nav-bar-icon"></view>
 			<view @click="handleBack" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">应用设置</text>
 			<text class="nav-bar-title">应用设置</text>
 		</view>
 		</view>
-		<view class="my-list-box">
-			<view class="list-row" @click="headClick">
-				<icon class="list-icon tel-icon"></icon>
-				<text>头像</text>
-				<icon style="width: 20px;height: 20px;" class="head-img-box"
-					:style="{backgroundImage: 'url(' + myInfoData.icon + ')'}"></icon>
+		<view class="ezy-tab-border">
+			<view class="yysz-row-box">
+				<view class="yysz-item img-item" @click="headClick">
+					<text>头像</text>
+					<icon class="yysz-img-box"
+						:style="{backgroundImage: 'url(' + myInfoData.icon + ')'}"></icon>
+				</view>
+				<view class="yysz-item" @click="nichengClick">
+					<text>昵称</text>
+					<text>{{myInfoData.nickName}}</text>
+				</view>
+			</view>	
+			<view class="yysz-row-box">
+				<view class="yysz-item" @click="telClick">
+					<text>手机号码</text>
+					<text>{{myInfoData.userName}}</text>
+				</view>
 			</view>
 			</view>
-			<view class="list-row" @click="nichengClick">
-				<icon class="list-icon tel-icon"></icon>
-				<text>昵称</text>
-				<text>{{myInfoData.nickName}}</text>
-			</view>
-			<view class="list-row" @click="telClick">
-				<icon class="list-icon tel-icon"></icon>
-				<text>手机号码</text>
-			</view>
-			<view class="list-row" @click="aboutClick">
-				<icon class="list-icon about-icon"></icon>
-				<text>关于我们</text>
-			</view>
-			<view v-if="loginFlag" class="list-row" @click="yonghuzhuxiao">
-				<icon class="list-icon zhuxiao-icon"></icon>
-				<text>用户注销</text>
-			</view>
-			<view v-if="loginFlag" class="list-row" @click="yinsizhengce">
-				<icon class="list-icon yszc-icon"></icon>
-				<text>隐私政策</text>
-			</view>
-			<view class="list-row" @click="kefudianhua">
-				<icon class="list-icon kfdh-icon"></icon>
-				<text>客服与投诉</text>
-				<text>4001750778</text>
-			</view>
-			<view class="list-row" @click="exitLogin">
-				<icon class="list-icon login-out-icon"></icon>
-				<text>退出登录</text>
-			</view>
-
+			<view class="yysz-row-box">	
+				<view class="yysz-item" @click="aboutClick">
+					<text>关于我们</text>
+				</view>
+				<view v-if="loginFlag" class="yysz-item" @click="yinsizhengce">
+					<text>隐私政策</text>
+				</view>
+				<view class="yysz-item" @click="kefudianhua">
+					<text>客服与投诉</text>
+					<text>4001750778</text>
+				</view>
+				<!--<view v-if="loginFlag" class="yysz-item" @click="yonghuzhuxiao">
+					<icon class="list-icon zhuxiao-icon"></icon>
+					<text>用户注销</text>
+				</view>
+				 <view class="yysz-item" @click="exitLogin">
+					<icon class="list-icon login-out-icon"></icon>
+					<text>退出登录</text>
+				</view> -->
+		</view>
 		</view>
 		</view>
 		<CustomTabBar :levelId="levelId" :currentTabNumber="3" :typeId="typeId" :subjectId="subjectId"
 		<CustomTabBar :levelId="levelId" :currentTabNumber="3" :typeId="typeId" :subjectId="subjectId"
 			:tipFlag="tipFlag">
 			:tipFlag="tipFlag">

BIN
static/images/my/list-jt.png