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

src/api/exam.js

@@ -6,7 +6,8 @@ import request from '../utils/request.js'
  */
 export function getPaperList(data) {
     return request({
-        url: '/AppletIndex/GetGuestExaminationPublishPage',
+        //url: '/AppletIndex/GetGuestExaminationPublishPage_V2', 
+        url: '/AppletIndex/GetGuestPublishPage_V2',
         method: 'post',
         data
     })

src/components/word/explain.vue

@@ -100,8 +100,6 @@
 				}
 			}
 			onMounted(()=>{
-				console.log(103,props.item)
-				
 			})
 			let that = methods;
 			return {

src/pages/exam/examPaperList.vue

@@ -101,7 +101,6 @@ export default {
       msg: {
         PageIndex: 1,
         PageSize: 10,
-        rowsPerPage: 10,
         ExamStatus: 0,
         GuestId: 0,
       },

src/pages/study/components/vear-carousel/vear-carousel.vue

@@ -176,8 +176,6 @@
 		font-size: 20rpx;
 		color: #333333;
 		text-align: center;
-		
-		
 	}
 
 	@keyframes to-mini

src/pages/study/index.vue

@@ -316,12 +316,12 @@
 				</view>
 				<view class="examination" v-if='InfoData'>
 					<view style="padding: 0 20px;">
-						<view style="color: #666666;font-size: 14px;">加油哦！</view>
+						<view style="color: #666666;font-size: 28rpx;">加油哦！</view>
 						<view class="row" style="justify-content: space-between;margin-top: 9px;">
-							<view class="row" style="color: #111111;font-size: 23px;font-weight: bold;">
+							<view class="row" style="color: #111111;font-size: 46rpx;font-weight: bold;">
 								考试
 							</view>
-							<view style="font-size: 14px;color: #4C50E7;" @click="gourlkaoshilist()">更多考试</view>
+							<view style="font-size: 28rpx;color: #4C50E7;" @click="gourlkaoshilist()">更多考试</view>
 						</view>
 					</view>
 					<view class="reviewcenter" style="height: 300rpx;margin-top: 0;align-items: center;justify-content: center;" v-if="InfoData.ExamList.length==0">