From 135bcc71eede3c05ba489037ce84c2c30b4f36e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=84=86=E7=9A=AE=E9=B8=AD?= <1003092440@qq.com>
Date: Wed, 30 Aug 2023 23:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |  10 +-
 src/pages/index/components/Subject1.vue       |  33 ++-
 src/pages/index/components/Subject2.vue       |  71 ++++--
 src/pages/index/videoVip.vue                  |   6 +-
 src/pages/me/info.vue                         |  10 +-
 src/pages/me/uploadPic.vue                    | 217 ++++++++++++++++++
 src/pages/me/vip.vue                          |  22 +-
 src/pages/questionBank/baseOperate.vue        |  23 +-
 .../questionBank/components/Question.vue      |  10 +-
 src/pages/questionBank/exclusiveExercise.vue  |  21 +-
 src/static/image/index/danxuan.png            | Bin 0 -> 3735 bytes
 src/static/image/index/panduan.png            | Bin 0 -> 3615 bytes
 src/static/image/index/tupian.png             | Bin 0 -> 3944 bytes
 13 files changed, 368 insertions(+), 55 deletions(-)
 create mode 100644 src/pages/me/uploadPic.vue
 create mode 100644 src/static/image/index/danxuan.png
 create mode 100644 src/static/image/index/panduan.png
 create mode 100644 src/static/image/index/tupian.png

diff --git a/src/pages.json b/src/pages.json
index 417cfb7..447ce32 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -144,8 +144,14 @@
         "navigationBarTitleText": "真实考场模拟",
         "enablePullDownRefresh": false
       }
-
-    }
+    },
+		{
+			"path": "pages/me/uploadPic",
+			"style": {
+			  "navigationBarTitleText": "上传证件照",
+			  "enablePullDownRefresh": false
+			}
+		}
   ],
 
   "globalStyle": {
diff --git a/src/pages/index/components/Subject1.vue b/src/pages/index/components/Subject1.vue
index d3f2976..aeccebc 100644
--- a/src/pages/index/components/Subject1.vue
+++ b/src/pages/index/components/Subject1.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="box-nav">
-			<image style="width: 100%;" src="../../static/image/index/index_bg.jpg"></image>
+			<image style="width: 100%;" src="https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/%E9%A6%96%E9%A1%B5_20230830213855.png"></image>
 			<view class="center-box flex jc-sb ai-c">
 				<view class="box-item flex ai-c jc-c">
 					<view class="flex jc-c ai-c relative" style="width: 230rpx;height: 230rpx;" @tap="toAnswer('顺序答题',false)">
@@ -27,7 +27,7 @@
 				</view>
 			</view>
 		</view>
-		<view style="padding: 0 28rpx;margin-top: 60rpx;">
+		<view style="padding: 0 28rpx;margin-top: calc(100% - 718rpx);">
 			<view class="tabs-box">
 				<view class="wp33 flex ai-c jc-c" @tap="toVip">
 					<view class="text-center wp100">
@@ -102,6 +102,7 @@
 
 <script>
 	import { mapState,mapActions } from 'pinia' //引入映射函数
+	import useUserStore from '@/jtools/store/user'
 	import storage from '@/jtools/storage';
 	import useQuestionStore from '@/jtools/store/question' //引入store
 	export default {
@@ -125,16 +126,35 @@
 
 		},
 		computed: {
+			...mapState(useUserStore, ["vipOnList", "token"]),
 			...mapState(useQuestionStore, ["orderQuestion_subject1","orderQuestion_subject4"]) ,//映射函数，取出tagslist
 			getDoNum(){
 				return this.rightList.length+this.wrongList.length
 			}
 		},
 		methods: {
-			toTestRoom(){
-				uni.navigateTo({
-					url:"/pages/index/trueTest"
-				})
+			...mapActions(useUserStore, ['searchUserVip']),
+			async toTestRoom(){
+				// uni.navigateTo({
+				// 	url:"/pages/index/trueTest"
+				// })
+				if (this.token) {
+					await this.searchUserVip()
+					const res = this.vipOnList.some(item => item.subjects == this.subject)
+					if (!res) {
+						uni.navigateTo({
+							url:"/pages/index/videoVip?subject="+this.subject
+						})
+					}else{
+						uni.navigateTo({
+							url: "/pages/index/trueTest?subject="+this.subject
+						})
+					}
+				} else {
+					uni.redirectTo({
+						url: '/pages/login/login'
+					});
+				}
 			},
 			toVip(){
 				// if(storage.get('token')){
@@ -197,6 +217,7 @@
 	.box-nav {
 		width: 100%;
 		position: relative;
+		height: 500rpx;
 	}
 
 	.center-box {
diff --git a/src/pages/index/components/Subject2.vue b/src/pages/index/components/Subject2.vue
index b4cb490..0dfcaf4 100644
--- a/src/pages/index/components/Subject2.vue
+++ b/src/pages/index/components/Subject2.vue
@@ -1,10 +1,10 @@
 <template>
 	<view>
 		<view class="box-nav">
-			<image style="width: 100%;" src="../../../static/image/index/index_bg.jpg"></image>
-			<view style="width: 100%;position: absolute;top: 80px;left: 0;" class="flex jc-c">
+			<image style="width: 100%;" src="https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/%E9%A6%96%E9%A1%B5_20230830213855.png"></image>
+			<view style="width: 100%;position: absolute;top: 80px;left: 0;" class="flex jc-c" @tap="toVipVideo">
 				<image style="width: 694rpx" mode="widthFix"
-					:src="subject=='2'?'../../../static/image/index/subject2_bg.png':'../../../static/image/index/subject3_bg.png'">
+					:src="subject=='2'?'https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/%E7%A7%91%E4%BA%8C%E9%A6%96%E9%A1%B5banner_20230830214212.png':'https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/%E7%A7%91%E4%B8%89%E9%A6%96%E9%A1%B5banner_20230830214245.png'">
 				</image>
 			</view>
 		</view>
@@ -28,10 +28,13 @@
 				<swiper class="swiper" :current="videoIndex" style="height: 362rpx;" :autoplay="false"
 					:disable-programmatic-animation="true" @change="onChange">
 					<swiper-item v-for="(item,index) of operateList" :key="index" @tap="toVideo">
-						<view class="wp100 relative p5lr" style="height: 362rpx;border-radius: 16rpx;overflow: hidden;">
-							<image style="width: 100%;height: 362rpx;border-radius: 16rpx;" mode="widthFix"
-								:src="item.videoList[0].videoUrl+'?x-oss-process=video/snapshot,t_0,f_jpg'"></image>
-							<image class="play_btn_2" src="../../static/image/index/play.png" />
+						<view class="p5lr wp100">
+							<view class="wp100 relative hide"
+								style="height: 362rpx;border-radius: 16rpx;overflow: hidden;">
+								<image style="width: 100%;height: 362rpx;position: absolute;left: 0;top: 0;" mode="widthFix"
+									:src="item.videoList[0].videoUrl+'?x-oss-process=video/snapshot,t_0,f_jpg'"></image>
+								<image class="play_btn_2" src="../../static/image/index/play.png" />
+							</view>
 						</view>
 					</swiper-item>
 				</swiper>
@@ -44,7 +47,7 @@
 						<u-icon color="#666" name="arrow-right" size="18"></u-icon>
 					</view>
 				</view>
-				<view class="flex p14lr p20tb bc-fff mt10" style="border-bottom: 1rpx solid #DDDCDC;"
+				<view class="flex p14lr p20tb bc-fff" style="border-bottom: 1rpx solid #DDDCDC;"
 					v-for="(item,index) of videoList" :key="index" @click="toOperateDetail(item.videoId)">
 					<view class="pic relative" style="overflow: hidden;">
 						<image class="pic" mode="widthFix" :src="item.videoUrl+'?x-oss-process=video/snapshot,t_0,f_jpg'"></image>
@@ -61,6 +64,11 @@
 </template>
 
 <script>
+	import {
+		mapState,
+		mapActions
+	} from 'pinia' //引入映射函数
+	import useUserStore from '@/jtools/store/user'
 	import {
 		querySysConfigList,
 		queryProjectList
@@ -88,7 +96,31 @@
 		async mounted() {
 			await this.getDiverType()
 		},
+		computed: {
+			...mapState(useUserStore, ["vipOnList", "token"])
+		},
 		methods: {
+				...mapActions(useUserStore, ['searchUserVip']),
+			//vip视频页面
+			async toVipVideo(){
+				if (this.token) {
+					await this.searchUserVip()
+					const res = this.vipOnList.some(item => item.subjects == this.subject)
+					if (!res) {
+						uni.navigateTo({
+							url:"/pages/index/videoVip?subject="+this.subject
+						})
+					}else{
+						uni.navigateTo({
+							url: "/pages/questionBank/baseOperate?subject=" + this.subject+"&type=3"
+						})
+					}
+				} else {
+					uni.redirectTo({
+						url: '/pages/login/login'
+					});
+				}
+			},
 			onChange(e) {
 				this.videoIndex = e.detail.current
 				this.$nextTick(() => {
@@ -105,7 +137,7 @@
 				}).then(resp => {
 					if (resp.code === '0000') {
 						this.baseList = resp.data
-						this.videoList = resp.data[0].videoList.slice(0, 5)
+						this.videoList = resp.data[0] ? resp.data[0].videoList.slice(0, 5) : []
 					}
 				})
 			},
@@ -123,7 +155,7 @@
 					return {
 						...item,
 						videoUrl: item.videoList[0]?.videoUrl,
-						videoTime:this.formateTime(item.videoList[0]?.videoTime)
+						videoTime: this.formateTime(item.videoList[0]?.videoTime)
 					}
 				})
 				let jsonString = JSON.stringify(arr)
@@ -132,14 +164,14 @@
 						"&projectId=" + this.projectId + "&type=1"
 				})
 			},
-			toOperateDetail(val){
+			toOperateDetail(val) {
 				let arr = JSON.parse(JSON.stringify(this.baseList[0].videoList))
 				arr = arr.map(item => {
 					return {
 						...item,
-						projectId:item.videoId,
-						subDesc:this.baseList[0].description,
-						videoTime:this.formateTime(item.videoTime)
+						projectId: item.videoId,
+						subDesc: this.baseList[0].description,
+						videoTime: this.formateTime(item.videoTime)
 					}
 				})
 				let jsonString = JSON.stringify(arr)
@@ -181,7 +213,7 @@
 			},
 			toDetail() {
 				uni.navigateTo({
-					url: "/pages/questionBank/baseOperate?subject=" + this.subject
+					url: "/pages/questionBank/baseOperate?subject=" + this.subject+"&type=2"
 				})
 			}
 		}
@@ -227,7 +259,7 @@
 		width: 300rpx;
 		height: 169rpx;
 		background: #00B74F;
-		border-radius: 8rpx;
+		border-radius: 10rpx;
 	}
 
 	.play_btn_3 {
@@ -262,4 +294,11 @@
 		display: inline-block;
 		margin-right: 15px;
 	}
+
+	.hide {
+		backface-visibility: hidden;
+		transform: translate3d(0, 0, 0);
+		-webkit-backface-visibility: hidden;
+		-webkit-transform: translate3d(0, 0, 0);
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/index/videoVip.vue b/src/pages/index/videoVip.vue
index f590c88..128a8d9 100644
--- a/src/pages/index/videoVip.vue
+++ b/src/pages/index/videoVip.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="relative" style="height: 100vh;">
-		<image style="width: 100%;height: 600rpx;" src="../../static/image/index/vip_bg.jpg"></image>
+		<image style="width: 100%;height: 600rpx;" src="https://oss-bq.ahduima.com/%E5%B0%8F%E7%A8%8B%E5%BA%8F/%E5%9B%BE%E7%89%87/vip%E9%A1%B5%E8%83%8C%E6%99%AF%E5%9B%BE_20230830214136.png"></image>
 		<view class="p14">
-			<view class="flex jc-fa ai-c wp100">
-				<view class="option_tem relative mr15" :class="checkedId===item.memberId?'checked_item':''" v-for="(item,index) of priceList" :key="index" @click="checkPrice(item.memberId,item.price)">
+			<view class="flex jc-sb ai-c wp100">
+				<view class="option_tem relative" :class="checkedId===item.memberId?'checked_item':''" v-for="(item,index) of priceList" :key="index" @click="checkPrice(item.memberId,item.price)">
 					<text class="fw600 fs12 cor-333">{{item.memberName}}</text>
 					<view class="mt5">
 						<text class="fs14" style="color: #FF6E02;">¥</text>
diff --git a/src/pages/me/info.vue b/src/pages/me/info.vue
index 116f054..20256bd 100644
--- a/src/pages/me/info.vue
+++ b/src/pages/me/info.vue
@@ -11,6 +11,10 @@
         <view class="m30lr fs14 cor-333 fl1">安徽省合肥市包河区</view>
         <u-icon name="arrow-right" color="#999" />
       </view>
+			<view class="flex ai-c wp100" style="height: 110rpx;" @tap="toUpload">
+			  <view class="fs14 cor-666 fl1">证件照上传</view>
+			  <u-icon name="arrow-right" color="#999" />
+			</view>
     </view>
   </view>
 </template>
@@ -23,7 +27,11 @@
       }
     },
     methods: {
-      
+      toUpload(){
+				uni.navigateTo({
+					url:"/pages/me/uploadPic"
+				})
+			}
     }
   }
 </script>
diff --git a/src/pages/me/uploadPic.vue b/src/pages/me/uploadPic.vue
new file mode 100644
index 0000000..b90bfd2
--- /dev/null
+++ b/src/pages/me/uploadPic.vue
@@ -0,0 +1,217 @@
+<template>
+	<view class="">
+		<view class="wp100 bc-fff p14">
+			<view class="title fontColor">第一步 上传学员图像</view>
+			<view class="mt15">
+				<!-- <u-upload width="165" height="165" :file-list=" fileList1" multiple :max-count="1" @afterRead="afterRead" @delete="deletePic" /> -->
+				<!-- <u-upload ref="uUpload" class="mt25" :size-type="['compressed']" :file-list="fileList1" deletable :multiple="false" :max-count="1" width="165rpx" height="165rpx" @afterRead="afterRead" @delete="deletePic" /> -->
+				<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" multiple :maxCount="1" width="150"
+					height="150">
+					<view style="width: 320rpx;height:300rpx;background-color: rgb(247, 255, 255);border-radius: 20rpx;">
+						<view style="width: 320rpx;height:240rpx;" class="flex jc-c ai-c">
+							<image v-if="fileList1&&fileList1.length" style="width: 240rpx;height: 240rpx;" :src="fileList1[0].url">
+							</image>
+							<u-avatar v-else class="br-p50 overflow-h" :size="64" mp-avatar shape="circle"></u-avatar>
+						</view>
+						<view
+							style="width: 320rpx;height:60rpx;line-height:60rpx;background-color: #3C9CFF;border-radius: 0 0 20rpx 20rpx;"
+							class="text-center cor-fff">
+							点击
+						</view>
+					</view>
+				</u-upload>
+			</view>
+			<view class="mt20">
+				<view class="title fontColor">第二步 核实后再提交</view>
+				<u--form labelPosition="left" labelWidth="80" :model="form" :rules="rules" ref="form1">
+					<u-form-item label="姓名" :required="true" prop="name" borderBottom ref="item1">
+						<u--input v-model="form.name" border="none"></u--input>
+					</u-form-item>
+					<u-form-item label="身份证号" :required="true" prop="idNum" borderBottom ref="item2">
+						<u--input v-model="form.idNum" border="none"></u--input>
+					</u-form-item>
+				</u--form>
+			</view>
+			<view style="margin-top: 20px;">
+				<u-button type="primary" :style="{width: '100%',borderRadius:'40rpx'}" :disabled="saving" text="提交"
+					@click="submit" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import storage from '@/jtools/storage';
+	export default {
+		data() {
+			const shenfenzhen = (rule, value, callback) => {
+				/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value) ? callback() : callback(
+					new Error('请输入正确的身份证号'))
+			}
+			return {
+				form: {
+					name: '',
+					idNum: ''
+				},
+				fileList1: [],
+				uploadList: [],
+				saving: false,
+				rules: {
+					name: [{
+						required: true,
+						message: '请输入姓名',
+						trigger: ['blur', 'change']
+					}],
+					idNum: [{
+						required: true,
+						message: '请输入身份证号',
+						trigger: ['blur', 'change']
+					},{
+						// 自定义验证函数，见上说明
+						validator: shenfenzhen,
+						message: '身份证号码不正确',
+						// 触发器可以同时用blur和change
+						trigger: ['change', 'blur'],
+					}]
+				}
+			};
+		},
+		onReady() {
+			console.log(storage.get('photoForm'));
+			if(storage.get('photoForm')){
+				this.fileList1=storage.get('photoForm').file
+				this.form={
+					name: storage.get('photoForm').name,
+					idNum: storage.get('photoForm').idNum
+				}
+			}
+			this.$refs.form1.setRules(this.rules);
+		},
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this.fileList1.splice(event.index, 1);
+				this.uploadList.splice(event.index, 1);
+			},
+			// 新增图片
+			async afterRead(event) {
+				// this.compressImage(event.file);
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				const lists = [].concat(event.file);
+				this.fileList1 = lists;
+				uni.showToast({
+					title:'上传成功！'
+				})
+			},
+			uploadFilePromise(url) {
+				this.saving = true;
+				return new Promise((resolve, reject) => {
+					uni.uploadFile({
+						url: process.env.VUE_APP_BASE_API + 'mongodb/uploadFile', // 仅为示例，非真实的接口地址
+						filePath: url,
+						name: 'file',
+						success: (res) => {
+							// setTimeout(() => {
+							resolve(JSON.parse(res.data).data);
+							// }, 100);
+							this.saving = false;
+						},
+						fail: () => {
+							resolve(null);
+							this.saving = false;
+						}
+					});
+				});
+			},
+			// 提交
+			submit() {
+				this.$refs.form1.validate().then((valid) => {
+					if (valid) {
+						const param={
+							file:this.fileList1,
+							...this.form
+						}
+						storage.set('photoForm',param)
+						uni.showToast({
+							title:"提交成功！",
+							duration:2000,
+						})
+						setTimeout(()=>{
+							uni.navigateBack()
+						},1000)
+					} else {
+						console.log('验证失败');
+					}
+				});
+
+			},
+			async compressImage(image) {
+				const img = new Image();
+				img.src = image.url;
+
+				img.onload = async () => {
+					const canvas = document.createElement('canvas'); // 创建Canvas对象(画布)
+					const context = canvas.getContext('2d');
+					// 默认按比例压缩
+					const cw = img.width;
+					const ch = img.height;
+					let w = img.width;
+					let h = img.height;
+					canvas.width = w;
+					canvas.height = h;
+					if (cw > 400 && cw > ch) {
+						w = 400;
+						h = (400 * ch) / cw;
+						canvas.width = w;
+						canvas.height = h;
+					}
+					if (ch > 400 && ch > cw) {
+						h = 400;
+						w = (400 * cw) / ch;
+						canvas.width = w;
+						canvas.height = h;
+					}
+					// 生成canvas
+					let base64;
+					// 创建属性节点
+					context.clearRect(0, 0, 0, w, h);
+					context.drawImage(img, 0, 0, w, h);
+					if (image.size > 2000000) {
+						// 如果图片超过2m,则进行压缩
+						base64 = canvas.toDataURL(image['type'], 0.5);
+					}
+					const result = await this.uploadFilePromise(base64 || image.url);
+					this.uploadList.push(result);
+				};
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.upload-img {
+		width: 165rpx;
+		height: 165rpx;
+		border: 1px dashed #c4c4c4;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.fontColor {
+		color: #383838;
+		font-weight: 400;
+	}
+
+	::v-deep .u-textarea__count {
+		background-color: #f9faf9 !important;
+	}
+
+	::v-deep .u-upload__button>.u-icon>.u-icon__icon {
+		font-size: 90rpx !important;
+	}
+
+	::v-deep .u-button--square {
+		border-radius: 40rpx !important;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/me/vip.vue b/src/pages/me/vip.vue
index 2e49f7a..1b6050f 100644
--- a/src/pages/me/vip.vue
+++ b/src/pages/me/vip.vue
@@ -28,10 +28,10 @@
             <view v-if="vipHasOpened(item)" class="corner">
               VIP已开通
             </view>
-            <view v-if="vipHasOpened(item)" class="renew">
+            <view v-if="vipHasOpened(item)" @tap="chargeVip(item)" class="renew">
               {{ item.price }}元立即续费
             </view>
-            <view v-else class="buy">
+            <view v-else class="buy" @tap="chargeVip(item)">
               立即充值
             </view>
           </view>
@@ -141,6 +141,11 @@ export default {
     }
   },
   methods: {
+		chargeVip(item){
+			uni.navigateTo({
+				url:"/pages/index/videoVip?subject="+item.subjects
+			})
+		},
     onChange(e) {
       this.current = e.detail.current
     },
@@ -168,6 +173,9 @@ export default {
       // 当前vip是否已开通
       if (this.vipHasOpened(item)) {
         // 跳转
+				uni.navigateTo({
+					url:"/pages/questionBank/questionBank?navTitle=精简500题&subject="+item.subjects+"&needVip=true&isVip=1"
+				})
       } else {
         uni.showToast({
           title: `请先充值${this.getKmTitle(item.subjects)}vip`,
@@ -180,6 +188,9 @@ export default {
       // 当前vip是否已开通
       if (this.vipHasOpened(item)) {
         // 跳转
+				uni.navigateTo({
+					url: "/pages/index/trueTest?subject="+item.subjects
+				})
       } else {
         uni.showToast({
           title: `请先充值${this.getKmTitle(item.subjects)}vip`,
@@ -192,6 +203,9 @@ export default {
       // 当前vip是否已开通
       if (this.vipHasOpened(item)) {
         // 跳转
+				uni.navigateTo({
+					url:"/pages/questionBank/practiceExams?subject="+item.subjects+'&title=考前密卷&isExam1=1'
+				})
       } else {
         uni.showToast({
           title: `请先充值${this.getKmTitle(item.subjects)}vip`,
@@ -204,6 +218,10 @@ export default {
       // 当前vip是否已开通
       if (this.vipHasOpened(item)) {
         // 跳转
+				uni.showToast({
+					title:'敬请期待',
+					icon:'none'
+				})
       } else {
         uni.showToast({
           title: `请先充值${this.getKmTitle(item.subjects)}vip`,
diff --git a/src/pages/questionBank/baseOperate.vue b/src/pages/questionBank/baseOperate.vue
index 61342bb..000b6e5 100644
--- a/src/pages/questionBank/baseOperate.vue
+++ b/src/pages/questionBank/baseOperate.vue
@@ -8,7 +8,7 @@
 			<!-- <view class="flex ai-c">
 				<view class="car_item mr10" v-for="(item,index) of carTypeList" :key="index" @tap="chooseCar(item.value)" :class="item.value===tCar?'checked_car':'unchecked_car'">{{item.label}}</view>
 			</view> -->
-			<view class="flex p14lr p20tb bc-fff mt10" style="border-bottom: 1rpx solid #DDDCDC;;"
+			<view class="flex p14lr p20tb bc-fff mb10" style="border-radius: 10rpx;"
 				v-for="(item,index) of videoList" :key="index" @tap="toOperateDetail(item.videoId)">
 				<view class="pic relative" style="overflow: hidden;">
 					<image class="pic" mode="widthFix" :src="item.videoUrl+'?x-oss-process=video/snapshot,t_0,f_jpg'"></image>
@@ -32,6 +32,7 @@
 	export default {
 		data(){
 			return{
+				type:'2',
 				subject:'1',
 				tCar:0,
 				categoryList:[{
@@ -40,22 +41,18 @@
 					name:'自动挡C2'
 				}],
 				allVideoList:[],
-				videoList:[{
-					label:"111"
-				},{
-					label:'222'
-				},{
-					label:'333'
-				},{
-					label:'444'
-				}]
+				videoList:[]
 			}
 		},
 		onLoad(op){
 			if(op.subject){
 				this.subject=op.subject
-				this.getDiverType()
 			}
+			if(op.type){
+				this.type=op.type
+			}
+			console.log(this.type);
+			this.getDiverType()
 		},
 		methods:{
 			formateTime(time) {
@@ -87,7 +84,7 @@
 					"carTypeId": storage.get('carType') || '1001',
 					"subject": String(this.subject),
 					"driveType": this.categoryList[this.tCar].configItemCode,
-					"type": "2"
+					"type": this.type
 				}).then(resp => {
 					if(resp.code==='0000'){
 						this.videoList=resp.data[0]?resp.data[0].videoList:[]
@@ -150,7 +147,7 @@
 			width: 300rpx;
 			height: 169rpx;
 			background: #00B74F;
-			border-radius: 8rpx;
+			border-radius: 10rpx;
 		}
 		.play_btn_2 {
 			width: 65rpx;
diff --git a/src/pages/questionBank/components/Question.vue b/src/pages/questionBank/components/Question.vue
index dbf455e..48b8a9b 100644
--- a/src/pages/questionBank/components/Question.vue
+++ b/src/pages/questionBank/components/Question.vue
@@ -84,7 +84,7 @@
 			<view style="width: 220rpx;">
 			<view v-if="type==='practice'" style="width: 220rpx;height: 80rpx;"></view>
 				<view v-else-if="type=='exam'" class="btn" style="text-align: center;" @tap="submitPaper">
-					<u-count-down ref="countDown_1" :time=" 1*60*60 * 1000" format="HH:mm:ss" @change="timeChange"></u-count-down>
+					<u-count-down ref="countDown_1" :time=" timeCount" format="HH:mm:ss" @change="timeChange"></u-count-down>
 					<text>交卷</text>
 				</view>
 			</view>
@@ -135,7 +135,7 @@
 						<view class="cor-333">未答题数</view>
 					</view>
 					<view class="text-center">
-						<u-count-down ref="countDown_3" class="balckColor" :time="1*60*60 * 1000" format="HH:mm:ss"></u-count-down>
+						<u-count-down ref="countDown_3" class="balckColor" :time="timeCount" format="HH:mm:ss"></u-count-down>
 						<view>剩余时间</view>
 					</view>
 					<view class="text-center">
@@ -164,7 +164,7 @@
 					<view style="width: 220rpx;">
 						<view v-if="type==='practice'" style="width: 220rpx;height: 80rpx;"></view>
 						<view v-else-if="type=='exam'" class="btn" style="text-align: center;" @tap="submitPaper">
-							<u-count-down ref="countDown_2" :time="1 * 60 * 60 * 1000" format="HH:mm:ss"></u-count-down>
+							<u-count-down ref="countDown_2" :time="timeCount" format="HH:mm:ss"></u-count-down>
 							<text>交卷</text>
 						</view>
 					</view>
@@ -308,6 +308,10 @@ export default {
 			}else{
 				return false
 			}
+		},
+		timeCount() {
+			const time=this.subject == '1' ? 60 * 60 * 1000 : 45 * 60 * 1000
+		  return time
 		}
 	},
   methods: {
diff --git a/src/pages/questionBank/exclusiveExercise.vue b/src/pages/questionBank/exclusiveExercise.vue
index 102d221..9b1cf5f 100644
--- a/src/pages/questionBank/exclusiveExercise.vue
+++ b/src/pages/questionBank/exclusiveExercise.vue
@@ -44,6 +44,9 @@
 	import errorIcon from "../../static/image/practice/error_icon.png"
 	import newRulesIcon from "../../static/image/practice/newRules_icon.png"
 	import neverWriteIcon from "../../static/image/practice/neverWrite_icon.png"
+	import danxuanIcon from "../../static/image/index/danxuan.png"
+	import panduanIcon from "../../static/image/index/panduan.png"
+	import tupianIcon from "../../static/image/index/tupian.png"
 	import {
 		querySysConfigList,
 		querySpecialNum
@@ -72,19 +75,19 @@
 					subTitle:'392题',
 					isNew:0,
 					isError:0,
-					image:newRulesIcon
+					image:danxuanIcon
 				},{
 					title:'判断题',
 					subTitle:'392题',
 					isNew:0,
 					isError:0,
-					image:errorIcon
+					image:panduanIcon
 				},{
 					title:'图片题',
 					subTitle:'392题',
 					isNew:0,
 					isError:0,
-					image:neverWriteIcon
+					image:tupianIcon
 				}],
 				testCenterList:[],
 				subject:'1'
@@ -122,19 +125,19 @@
 								subTitle:resp.data.radioQuestionNum+'题',
 								isNew:0,
 								isError:0,
-								image:newRulesIcon
+								image:danxuanIcon
 							},{
 								title:'判断题',
 								subTitle:resp.data.judgeQuestionNum+'题',
 								isNew:0,
 								isError:0,
-								image:errorIcon
+								image:panduanIcon
 							},{
 								title:'图片题',
 								subTitle:resp.data.imageQuestionNum+'题',
 								isNew:0,
 								isError:0,
-								image:neverWriteIcon
+								image:tupianIcon
 							}]
 						}else{
 							this.list=[{
@@ -154,7 +157,7 @@
 								subTitle:resp.data.radioQuestionNum+'题',
 								isNew:0,
 								isError:0,
-								image:newRulesIcon
+								image:danxuanIcon
 							},{
 								title:'多选题',
 								subTitle:resp.data.multipleChoiceQuestionNum+'题',
@@ -166,13 +169,13 @@
 								subTitle:resp.data.judgeQuestionNum+'题',
 								isNew:0,
 								isError:0,
-								image:errorIcon
+								image:panduanIcon
 							},{
 								title:'图片题',
 								subTitle:resp.data.imageQuestionNum+'题',
 								isNew:0,
 								isError:0,
-								image:neverWriteIcon
+								image:tupianIcon
 							}]
 						}
 					
diff --git a/src/static/image/index/danxuan.png b/src/static/image/index/danxuan.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b3e89f3c1d012f811dfcf8c7d5f8c5b7003f223
GIT binary patch
literal 3735
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
B3}gTR

literal 0
HcmV?d00001

diff --git a/src/static/image/index/panduan.png b/src/static/image/index/panduan.png
new file mode 100644
index 0000000000000000000000000000000000000000..67d6389d36831cc7d2bcbf5142f7881e330aef47
GIT binary patch
literal 3615
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

literal 0
HcmV?d00001

diff --git a/src/static/image/index/tupian.png b/src/static/image/index/tupian.png
new file mode 100644
index 0000000000000000000000000000000000000000..43e9268e282f17922d7150009c6a46fdb9291848
GIT binary patch
literal 3944
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
Czh)l*

literal 0
HcmV?d00001