Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu

src/components/word/Pronunciation.vue

 <template>
 	<view class="wordPronItem">
 		<view class="num">
-			{{cur}}/{{total}}<text style="margin-left: 6rpx;">{{type==0?'':"复习"}}</text>
+			{{cur}}/{{total}}<text style="margin-left: 6rpx;font-size: 20rpxs;">{{type==0?'':"复习"}}</text>
 		</view>
 		<view class="meaning">
 			{{item.ChineseMean}}

src/pages/index/index.vue

@@ -116,7 +116,7 @@
 				<view class="gardenCon" v-for="(item1,index1) in item.List" :key="index1" id="img">
 					<image :src="item1.Img" mode="aspectFill"
 						style="width: 100%;height:100%;border-radius: 24rpx 24rpx 0 0;"></image>
-					<view class="gardenTextBox" :style="{'background':`linear-gradient(to bottom,rgb(255,255,255,0) 0% ,${item1.bgcolor} , ${item1.bgcolor2}) ` }">
+					<view class="gardenTextBox" :style="{'background':`linear-gradient(to bottom,${item1.bgcolor},${item1.bgcolor1} , ${item1.bgcolor2})` }">
 						<view class="gardenTitle one_line">
 							{{item1.Title}}
 						</view>
@@ -124,7 +124,6 @@
 							{{item1.Digest}}
 						</view>
 					</view>
-
 				</view>
 			</view>
 
@@ -196,9 +195,8 @@
 								if(x.List.length>0){
 									x.List.forEach((item,index)=>{
 										this.getColor(item.Img,index,y).then(v=>{
-											console.log(v)
-											// item.bgcolor = v;
 											data.pageData.LearningGardenList[v.y].List[v.index].bgcolor = v.formatres;
+											data.pageData.LearningGardenList[v.y].List[v.index].bgcolor1 = v.formatres1;
 											data.pageData.LearningGardenList[v.y].List[v.index].bgcolor2 = v.formatres2;
 											
 										})
@@ -208,15 +206,14 @@
 						}
 					})
 				},
-				
 				async getColor(src,index,y) {
 					let res = await getImageColor('myCanvas', 'img', src)
 					let obj={}
-					obj.formatres = `rgba(${res.r},${res.g},${res.b},0.4)`
+					obj.formatres = `rgba(${res.r},${res.g},${res.b},0.01)`
+					obj.formatres1 = `rgba(${res.r},${res.g},${res.b},0.6)`
 					obj.formatres2 = `rgba(${res.r},${res.g},${res.b},1)`
 					obj.index = index
 					obj.y = y
-					// console.log(168, formatres)
 					return obj
 				},
 				againdata() {

src/pages/study/index.vue

@@ -217,6 +217,14 @@
 	.status-red {
 	  color: #ff3816;
 	}
+	.reviewcenter{
+		
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-top: 100rpx;
+	}
+
 </style>
 <template>
 	<view class="studyindex">
@@ -266,7 +274,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="box_review" v-if='InfoData'>
+				<view class="box_review" v-if='InfoData' :style="{height:InfoData.Review && InfoData.Review.length>0?'660rpx':'300rpx'}">
 					<view class="row" style="justify-content: space-between;height: 50rpx;">
 						<view class="row" style="color: #111111;font-size: 14px;font-weight: bold;">
 							<view >课程回顾 </view>
@@ -274,7 +282,11 @@
 						</view>
 						<view style="font-size: 11px;color: #4C50E7;"  @click="gourl()">所有课程</view>
 					</view>
-					<view class="box_review_date row" style="margin-top: 40rpx;" v-if='InfoData.Review'>
+					<view class="reviewcenter" v-if='InfoData.Review && InfoData.Review.length==0'>
+						<view style="font-size: 13px;font-family: PingFang SC;font-weight: bold;color: #111111;">暂无课程</view>
+						<view style="font-size: 10px;font-family: PingFang SC;font-weight: 400;color: #888888;margin-top: 10px;">购买课程后可回顾</view>
+					</view>
+					<view class="box_review_date row" style="margin-top: 40rpx;" v-if='InfoData.Review && InfoData.Review.length>0'>
 						<view v-for="(x,y) in InfoData.Review" :key='y'>
 							<view :class="{'box_review_date_item2':current==y}" class="box_review_date_item" @click="goreview(x,y)">
 								<text>{{getdate(x,1)}}</text>
@@ -283,7 +295,7 @@
 						</view>
 						
 					</view>
-					<view class="box_review_sp">
+					<view class="box_review_sp" v-if='InfoData.Review && InfoData.Review.length>0'>
 						<view class="box_review_box" v-if="loading">
 							<van-loading size="24px" vertical color="#FFF"text-color="#FFF">加载中...</van-loading>
 						</view>
@@ -310,8 +322,19 @@
 							<view style="font-size: 14px;color: #4C50E7;" @click="gourlkaoshilist()">更多试题</view>
 						</view>
 					</view>
-					
-					<view v-for="(x,y) in InfoData.ExamList" :key='y'>
+					<view class="reviewcenter" style="height: 300rpx;margin-top: 0;align-items: center;justify-content: center;" v-if="InfoData.ExamList.length==0">
+						<view style="font-size: 13px;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #111111;
+							line-height: 35px;">暂无记录</view>
+						<view style="font-size: 10px;margin-top: 10px;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;">参与考试后可查看</view>
+					</view>
+					<view v-if="InfoData.ExamList.length>0">
+						<view v-for="(x,y) in InfoData.ExamList" :key='y' >
 							<view class="examination-box">
 								<view style="padding: 20px;">
 									<view style="font-size: 18px;font-weight: bold;color: #111111;">{{x.PaperName}}</view>
@@ -402,6 +425,9 @@
 								
 							</view>
 						</view>
+					</view>
+					
+					
 					
 				</view>
 			</template>

src/utils/index.js

@@ -265,7 +265,6 @@ export let getImageColor = async (canvasID, imgID, imgSrc) => {
 					// 取所有像素的平均值
 					for (var row = 0; row < imgHeight; row++) {
 						for (var col = 0; col < imgWidth; col++) {
-							// console.log(data[((img.width * row) + col) * 4])
 							if (row == 0) {
 								r += data[((imgWidth * row) + col)];
 								g += data[((imgWidth * row) + col) + 1];