tanxue пре 1 месец
родитељ
комит
543850f02a

+ 5 - 96
common/styles/global/pages.scss

@@ -34,24 +34,20 @@
 	.default-img-box{
 		display: flex;flex-direction: column;position: absolute;left: 50%;top:50%;transform: translate(-50%,-50%);
 		margin-bottom: 100rpx;
-		icon{
-			width: 254rpx;height: 335rpx;box-sizing: border-box;
-			background-image: url("@/static/images/index/index-default-img.png");@include ezy-no-repeat-cover();
-		}
+		icon{width: 254rpx;height: 335rpx;box-sizing: border-box;@include ezy-no-repeat-cover();}
 		text{margin-top: 16rpx;color: #666;}
 	}
 	.shouye-card-box{margin: 20rpx;border: 1rpx solid;border-radius: 6rpx;}
 	// head
 	.card-head-box{
-		height: 70rpx;display: flex;align-items: center;padding: 0 6rpx 0 20rpx;
+		height: 70rpx;display: flex;align-items: center;padding: 0 6rpx 0 20rpx;background-color: red;
 		.card-line-title {display: block;color: #fff;font-size: 30rpx;line-height: 1;}
 		.card-line-title:before{content: ' ';width: 6rpx;height: 28rpx;background-color:#fff;
 		margin-right: 12rpx;display: inline-block;vertical-align: middle;}
 		.card-more{
 			font-size: 24rpx;color: #fff;margin-left: auto;display: flex;align-items: center;
-			.more-num{border: 1rpx solid;border-radius: 50%;box-sizing:border-box;
-			min-width: 26rpx;display: inline-flex;margin-left:6rpx;justify-content: center;
-			span{font-size: 18rpx;}
+			.more-num{border: 1rpx solid;border-radius: 20rpx;box-sizing:border-box;font-size: 18rpx;padding: 2rpx 4rpx;
+			min-width: 26rpx;display: inline-flex;margin-left:6rpx;justify-content: center;line-height: 18rpx;
 			}
 			.more-jt{
 				width: 0;height: 0;
@@ -77,10 +73,6 @@
 		.card-content-item{
 			width: 50%;display: flex;flex-direction: row;justify-content: center;align-items: center;margin: 10rpx 0;
 			icon{width: 70rpx;height: 70rpx;@include ezy-no-repeat-cover;margin-right: 10rpx;}
-			.card-time-icon{background-image: url("@/static/images/index/index-content-icon1.png");}
-			.card-sum-icon{background-image: url("@/static/images/index/index-content-icon3.png");}
-			.card-num-icon{background-image: url("@/static/images/index/index-content-icon4.png");}
-			.card-pass-icon{background-image: url("@/static/images/index/index-content-icon2.png");}
 			.content-text-box{
 				min-width: 140rpx;
 				text{font-size: 26rpx;color: #666;}
@@ -124,90 +116,7 @@
 		.index-card-btn[type='default']{background-color: #febb6a;color: #fff;}
 	}
 }
-.admin-shouye-page{
-	width: 100%;background-color: #f8f9fd;box-sizing: border-box;padding-bottom: 120rpx;overflow: auto;
-	height: 100vh;
-	/*  #ifdef  H5  */
-	// height: calc(100vh - 180rpx);
-	/*  #endif  */
-	/*  #ifdef  APP-PLUS  */
-	
-	/*  #endif  */
-	.shouye-head-box{
-		width: 100%;height: 376rpx;text-align: center;font-size: 34rpx;color: #fff;
-		box-sizing: border-box;font-weight: 600;
-		background-image: url("@/static/images/index/index-head-bj.png");@include ezy-no-repeat-cover(bottom);
-		height: 376rpx;padding-top: 100rpx;
-	}
-	
-	// banner
-	.index-banner-default{width: 718rpx;height: 281rpx;margin: 0 auto;@include ezy-no-repeat-cover;
-	background-image: url("@/static/images/index/index-banner.png");margin-top: -180rpx;}
-	.shouye-swiper-box{
-		margin-top: -180rpx;overflow: unset!important;
-		.index-banner-img{width: 718rpx;height: 281rpx;margin: 0 auto;display: block;}
-	}
-	
-	.tj-btn-box{
-		width: 100%;box-sizing: border-box;padding:0 20rpx;margin-top: 50rpx;
-		text{font-size: 26rpx;padding:4rpx;margin-right: 24rpx;display: inline-block;color:#333;}
-		.active{border-bottom: 2rpx solid #3fd2a1;color:#3fd2a1;}
-	}
-	
-	.index-tj-row{width: 100%;display: flex;box-sizing: border-box;padding:6rpx 16rpx;align-items: center;}
-	.index-tj-box{
-		width: 400rpx;height: 150rpx;@include ezy-no-repeat-cover(right);background-image: url("@/static/images/index/tj-bj.png");
-		border-radius: 25rpx;padding: 16rpx 30rpx;box-sizing:border-box;flex-shrink: 0;
-		.tj-num-box{font-size: 48rpx;color:#fff;margin: 12rpx 0 6rpx;font-weight: bold;}
-		.tj-tip-box{font-size: 24rpx;color:#fff;}
-	}
-	.index-kc-box{
-		height: 136rpx;flex: 1;background-color: #fff;border: 1rpx solid #3fd2a1;position: relative;
-		border-radius: 16rpx;padding: 6rpx 16rpx;box-sizing:border-box;margin: 4rpx 0 0 8rpx;
-		.tj-num-box{font-size: 42rpx;color: #3fd2a1;margin: 12rpx 0 6rpx;font-weight: bold;}
-		.tj-tip-box{font-size: 24rpx;color: #3fd2a1;}
-		.sjkc-jt-icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/common/nav-bar-green-jt.svg");
-			position: absolute;right:12rpx;top:48rpx;transform: rotate(180deg);}
-	}
-	.index-tongzhi-box{
-		display: flex;justify-content: space-between;align-items: center;margin:6rpx 16rpx 16rpx;
-		background-color: #fff;border-radius: 12rpx;padding:10rpx 12rpx 10rpx 24rpx;box-sizing:border-box;
-		.tongzhi-num{
-			width: 80rpx;height: 80rpx;color: #3fd2a1;@include ezy-no-repeat-contain;text-align: center;flex-shrink: 0;
-			background-image: url("@/static/images/index/tz-icon.png");padding-top: 42rpx;box-sizing:border-box;
-			font-size: 28rpx;font-weight: bold;
-			}
-		.tongzhi-content{
-			height: 84rpx;padding:0 10rpx 0 20rpx;box-sizing: border-box;line-height: 1.5;flex: 1;
-			@include ezy-rich-text();@include multi-line-ellipsis(2);font-size: 26rpx;color:#333;
-			display: flex;align-items: center;margin: 16rpx 0;
-			>div,p{@include multi-line-ellipsis(2);}
-		}
-		icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;flex-shrink: 0;
-			background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
-			transform: rotate(270deg);margin-left: 4rpx;}
-	}
-	.card-list-title{width: 100%;font-size: 28rpx;color: #33a366;font-weight: 600;margin-bottom: 24rpx;}
-	.card-list-box{
-		display: flex;flex-wrap: wrap;box-sizing: border-box;padding:16rpx;margin: 16rpx;
-		background-color: #fff;border-radius: 8rpx;margin-bottom: 16rpx;}
-	.card-item-box{
-		width: 25%;display: flex;flex-direction: column;align-items: center;
-		font-size: 24rpx;color: #333;
-		.index-icon{width: 100rpx;height: 100rpx;@include ezy-no-repeat-cover;margin-bottom: 6rpx;}
-	}
-	//  FIXME 小程序不识别 ~ 符号
-	// .card-item-box:nth-child(5) ~ *{margin-top: 30rpx;}
-	.jz-icon{background-image: url("@/static/images/index/jz-icon.png");}
-	.zzh-icon{background-image: url("@/static/images/index/zzh-icon.png");}
-	.kz-icon{background-image: url("@/static/images/index/kz-icon.png");}
-	.ks-icon{background-image: url("@/static/images/index/ks-icon.png");}
-	.cj-icon{background-image: url("@/static/images/index/cj-icon.png");}
-	.lx-icon{background-image: url("@/static/images/index/lx-icon.png");}
-	.kc-icon{background-image: url("@/static/images/index/kc-icon.png");}
-	.zjz-icon{background-image: url("@/static/images/index/zjzgs-icon.png");}
-}
+
 /*** 考试页面***/
 .phone-list-page{
 	box-sizing: border-box;

+ 4 - 4
components/listCard/kaoshiCard.vue

@@ -16,28 +16,28 @@
 		<!-- 内容区域 -->
 		<view class="card-content-box kaoshi-content-box">
 			<view class="card-content-item">
-				<icon class="card-time-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + data.iconsArr.timeIcon + ')' }"></icon>
 				<view class="content-text-box">
 					<text>时间</text>
 					<view>{{data.totalTm}}分钟</view>
 				</view>
 			</view>
 			<view class="card-content-item">
-				<icon class="card-num-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + data.iconsArr.numIcon + ')' }"></icon>
 				<view class="content-text-box">
 					<text>次数</text>
 					<view>{{data.maxTimes ? data.loseTimes:'不限'}}次</view>
 				</view>
 			</view>
 			<view class="card-content-item">
-				<icon class="card-sum-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + data.iconsArr.sumIcon + ')' }"></icon>
 				<view class="content-text-box">
 					<text>总分</text>
 					<view>{{data.ksScore}}分</view>
 				</view>
 			</view>
 			<view class="card-content-item">
-				<icon class="card-pass-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + data.iconsArr.jgIcon + ')' }"></icon>
 				<view class="content-text-box">
 					<text>及格分</text>
 					<view>{{data.okScore}}分</view>

+ 1 - 1
components/listCard/kechengCard.vue

@@ -13,7 +13,7 @@
 		<!-- 内容区域 -->
 		<view class="card-content-box kaoshi-content-box">
 			<view class="card-content-item">
-				<icon class="card-time-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + data.iconsArr.timeIcon + ')' }"></icon>
 				<view class="content-text-box">
 					<text>时间</text>
 					<view>{{formatSecondsToCnhms(data.period, true)}}</view>

+ 2 - 2
components/listCard/lianxiCard.vue

@@ -20,14 +20,14 @@
 				</view>
 			</view> -->
 			<view class="card-content-item">
-				<icon class="card-sum-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + data.iconsArr.sumIcon + ')' }"></icon>
 				<view class="content-text-box">
 					<text>总分</text>
 					<view>{{data.ksScore}}分</view>
 				</view>
 			</view>
 			<view class="card-content-item">
-				<icon class="card-pass-icon"></icon>
+				<icon :style="{ backgroundImage: 'url(' + data.iconsArr.jgIcon + ')' }"></icon>
 				<view class="content-text-box">
 					<text>及格分</text>
 					<view>{{data.okScore}}分</view>

+ 19 - 5
pages/client/ShouYe/shouye.vue

@@ -1,19 +1,20 @@
 <template>
 	<view className="client-shouye-page">
+		<customNavbarVue title="首页"></customNavbarVue>
 		<!-- <view class="icon-title-bjcolor-navBar-box">
 			<text class="nav-bar-title">{{data.realName}}</text>
 		</view> -->
 	
 		<template v-if="data.kaoshiList.length||data.lianxiList.length||data.kechengList.length">
 			<!-- 考试 -->
-			<kaoshiCardVue v-if="data.kaoshiList.length" :data="{ count: data.kaoshiCount, ...data.kaoshiList[0] }"></kaoshiCardVue>
+			<kaoshiCardVue v-if="data.kaoshiList.length" :data="{ count: data.kaoshiCount, ...data.kaoshiList[0],iconsArr:data.iconsArr}"></kaoshiCardVue>
 			<!-- 练习 -->
-			<lianxiCardVue v-if="data.lianxiList.length"  :data="{ count: data.lianxiCount,...data.lianxiList[0] }"></lianxiCardVue>
+			<lianxiCardVue v-if="data.lianxiList.length"  :data="{ count: data.lianxiCount,...data.lianxiList[0],iconsArr:data.iconsArr}"></lianxiCardVue>
 			<!-- 课程 -->
-			<kechengCardVue v-if="data.kechengList.length"   :data="{ count: data.kechengCount,...data.kechengList[0] }"></kechengCardVue>
+			<kechengCardVue v-if="data.kechengList.length"   :data="{ count: data.kechengCount,...data.kechengList[0],iconsArr:data.iconsArr}"></kechengCardVue>
 		</template>
 		<view class="default-img-box" v-else>
-			<icon></icon>
+			<icon :style="{ backgroundImage: 'url(' + data.defaultIndexImg + ')' }"></icon>
 			<text>没有可培训的内容...</text>
 		</view>
 		<!-- 底部区域 -->
@@ -22,6 +23,7 @@
 </template>
 
 <script setup>
+	import customNavbarVue from "@/components/custom-navbar/custom-navbar.vue";
 	import kaoshiCardVue from '@/components/listCard/kaoshiCard.vue';
 	import kechengCardVue from '@/components/listCard/kechengCard.vue';
 	import lianxiCardVue from '@/components/listCard/lianxiCard.vue';
@@ -43,7 +45,14 @@
 		kechengList: [],
 		lianxiCount: 0,
 		lianxiList: [],
-		realName: ''
+		realName: '',
+		defaultIndexImg: '',
+		iconsArr: {
+			timeIcon: '',
+			numIcon: '',
+			sumIcon: '',
+			jgIcon: '',
+		},
 	})
 
 	function initPage() {
@@ -70,6 +79,11 @@
 	onLoad(() => {
 		const auth = cacheManager.get('auth');
 		data.realName = auth.realName;
+		data.defaultIndexImg = cacheManager.get('projectImg').index_default_img;
+		data.iconsArr.timeIcon = cacheManager.get('projectImg').index_content_icon1;
+		data.iconsArr.numIcon = cacheManager.get('projectImg').index_content_icon2;
+		data.iconsArr.sumIcon = cacheManager.get('projectImg').index_content_icon3;
+		data.iconsArr.jgIcon = cacheManager.get('projectImg').index_content_icon4;
 	})
 	
 	onShow(() => {

BIN
static/images/index/cj-icon.png


BIN
static/images/index/index-banner.png


BIN
static/images/index/index-content-icon1.png


BIN
static/images/index/index-content-icon2.png


BIN
static/images/index/index-content-icon3.png


BIN
static/images/index/index-content-icon4.png


BIN
static/images/index/index-default-img.png


BIN
static/images/index/index-head-bj.png


BIN
static/images/index/jz-icon.png


BIN
static/images/index/kc-icon.png


BIN
static/images/index/ks-icon.png


BIN
static/images/index/kz-icon.png


BIN
static/images/index/lx-icon.png


BIN
static/images/index/tj-bj.png


BIN
static/images/index/tz-icon.png


BIN
static/images/index/zjzgs-icon.png


BIN
static/images/index/zzh-icon.png