From 1249d95addd5ed7da967ff8482c5be102ed08763 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 04 Mar 2022 17:14:47 +0800
Subject: [PATCH] 考试相关修改

---
 pages/exam/examTextPage.vue                  |    3 ++-
 App.vue                                      |    4 ++++
 pages/exam/startexam.vue                     |    3 +--
 pages/grabOrders/grabOrdersMain/business.vue |   24 +++++++++++++++---------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/App.vue b/App.vue
index c42ed80..7aca46e 100644
--- a/App.vue
+++ b/App.vue
@@ -143,6 +143,10 @@
 		width: 100%;
 		height: 100%;
 	}
+	
+	.uGridSelected {
+		background: #f4f4f4 !important;
+	}
 
 	/*每个页面公共css */
 </style>
diff --git a/pages/exam/examTextPage.vue b/pages/exam/examTextPage.vue
index 37fb949..79c13e4 100644
--- a/pages/exam/examTextPage.vue
+++ b/pages/exam/examTextPage.vue
@@ -30,12 +30,13 @@
 			this.$store.state.questionList = []
 
 			var that = this
+			console.log(this.$store.state.UserData)
 			// 理论考试
 			uni.request({
 				url: "http://z4042833u6.wicp.vip/simulateExamRecord/beginExam",
 				method: 'POST',
 				data: {
-					idCardNo: option.id
+					idCardNo: this.$store.state.UserData.cardid
 				},
 				success: (res) => {
 					var examObj = res.data.data.simulateExamRecord
diff --git a/pages/exam/startexam.vue b/pages/exam/startexam.vue
index 096be8c..e14aa94 100644
--- a/pages/exam/startexam.vue
+++ b/pages/exam/startexam.vue
@@ -37,7 +37,7 @@
 			enterExam() {
 
 				uni.navigateTo({
-					url: '/pages/exam/examTextPage?examType=exam&id=' + this.examItem.id
+					url: '/pages/exam/examTextPage'
 				})
 
 			},
@@ -52,7 +52,6 @@
 		onLoad(options) {
 			// 页面跳转 传递对象 传对象
 			options = {
-				id: '360198198812130014',
 				name: '保安员模拟考试',
 				examScore: 100,
 				examTime: 60,
diff --git a/pages/grabOrders/grabOrdersMain/business.vue b/pages/grabOrders/grabOrdersMain/business.vue
index 3105822..6147a43 100644
--- a/pages/grabOrders/grabOrdersMain/business.vue
+++ b/pages/grabOrders/grabOrdersMain/business.vue
@@ -10,7 +10,8 @@
 				<view class="title"></view>
 				<view class="list">
 					<u-grid :col="3" :border="false">
-						<u-grid-item bg-color="transparent" v-for="(item, index) in dataOne" :key="index">
+						<u-grid-item bg-color="transparent" :class="{'uGridSelected': itemSelectFlag && index == 3}"
+							v-for="(item, index) in dataOne" :key="index">
 							<navigator hover-class="none" class="nav-item" @click="goOnePage(item.url,index)">
 								<image :src="item.img" mode="widthFix" class="nav-item-img"></image>
 								<u-badge :count="item.cout" :offset="[20, 20]"></u-badge>
@@ -49,6 +50,7 @@
 			return {
 				tabbar: this.$store.state.tabbar,
 				bashow: false,
+				itemSelectFlag: false,
 				dataOne: [{
 					title: '治安巡查',
 					img: '/static/workbench/task2.png',
@@ -74,10 +76,6 @@
 						title: '电子证件',
 						img: '/static/workbench/task9.png',
 						url: ''
-					}, {
-						title: '模拟考试',
-						img: '/static/workbench/task5.png',
-						url: ''
 					}
 					// ,{
 					// 	title:'模拟考试',
@@ -91,7 +89,13 @@
 			this.getNum();
 		},
 		onLoad() {
-
+			if (this.$store.state.billFlag == true) {
+				this.dataTwo.push({
+					title: '模拟考试',
+					img: '/static/workbench/task5.png',
+					url: '/pages/exam/startexam'
+				})
+			}
 		},
 		onBackPress(e) {
 			console.log("监听返回按钮事件2", e);
@@ -131,8 +135,11 @@
 			},
 			//页面跳转
 			goOnePage(url, index) {
+
 				if (index == "3") {
 					this.bashow = !this.bashow;
+
+					this.itemSelectFlag = !this.itemSelectFlag;
 				}
 				uni.navigateTo({
 					url: url
@@ -167,9 +174,8 @@
 			},
 			goTwoPage(url, index) {
 				if (index == "1") {
-					this.$refs.uToast.show({
-						title: '功能研发中',
-						type: 'warning',
+					uni.navigateTo({
+						url
 					});
 					return;
 				} else {

--
Gitblit v1.9.3