阶段5

common/methodTool.js

@@ -21,8 +21,8 @@ export default {
 		}
 	},
 	isLogout() {
-		uni.removeStorageSync('user_account')
-		uni.removeStorageSync('token')
+		// uni.removeStorageSync('user_account')
+		// uni.removeStorageSync('token')
 	},
 	//提示
 	showToast(title, icon = 'none', time = 2000) {

common/request.js

@@ -33,6 +33,12 @@ export const myRequest = (options) => {
 				TenantId: tenantId
 			},
 			success: async (res) => {
+				// if(num == 2) {
+				// 	return;
+				// } else {
+				// 	num++
+				// }
+				// doRequest(options)
 				if (res.data.code == 401) {
 					if (num <= 2) {
 						if (!uni.getStorageSync('user_account')) {
@@ -46,9 +52,9 @@ export const myRequest = (options) => {
 
 					}else{
 						uni.removeStorageSync('user_account');
-						uni.navigateTo({
-							url: '/pages/login/login'
-						});
+						// uni.navigateTo({
+						// 	url: '/pages/login/login'
+						// });
 					}
 				}
 				resolve(res)
@@ -67,8 +73,9 @@ export const myRequest = (options) => {
 		})
 	})
 	async function doRequest(response) {
+		let user_account = uni.getStorageSync('user_account')
 		var datas = {
-			url: '/refreshToken/' + uni.getStorageSync('user_account'),
+			url: '/refreshToken/' + user_account,
 			method: 'get',
 			noToken: true
 		}
@@ -83,6 +90,7 @@ export const myRequest = (options) => {
 			const resUser = await myRequest(userInfo)
 			if (resUser.data.code === 200) {
 				store.state.userInfo = resUser.data.data
+				uni.setStorageSync('user_account',user_account)
 				num = 1;
 			}
 			let onset = await myRequest(response)

components/course/courseChapter.vue

@@ -356,12 +356,13 @@ export default {
 		height: 24rpx;
 	}
 .title{
-	font-size: 24rpx;
+	font-size: 30rpx;
 	font-family: PingFang SC;
 	font-weight: bold;
 	color: #666666;
 	white-space:nowrap;
 	overflow:hidden;
 	text-overflow:ellipsis; 
+	margin-bottom:30rpx;
 }
 </style>

components/course/courseModule.vue

@@ -143,5 +143,6 @@ export default {
 	white-space:nowrap;
 	overflow:hidden;
 	text-overflow:ellipsis; 
+	margin-bottom:30rpx;
 }
 </style>

components/nav-bar/nav-bar.vue

@@ -0,0 +1,69 @@
+<template>
+	<view>
+		<u-navbar :is-back="showBackBtn" :title="title">
+			<view class="slot-wrap">
+				<u-icon class="homeIcon" v-if="showHomeBtn" @click="goHome()" name="home"  size="40"></u-icon>
+			</view>
+		</u-navbar>
+	</view>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+export default {
+	name: 'navBar',
+	props: {
+		statusBar:{
+			type:Boolean,
+			default:true
+		},
+		title:{
+			type:String,
+			default:''
+		},
+		showBackBtn:{
+			type:Boolean,
+			default:true,
+		},
+		showHomeBtn:{
+			type:Boolean,
+			default:true
+		}
+	},
+	components: {
+	},
+	data() {
+		return {
+			
+		};
+	},
+	onLoad() {},
+	created() {
+	},
+	mounted() {
+		
+	},
+	onPageShow() {
+		
+	},
+	methods: {
+		goHome() {
+			uni.switchTab({
+			    url: '/pages/index/index'
+			});
+		}
+	},
+	computed: { ...mapGetters(['goodsAuditionConfigIdList']) },
+};
+</script>
+
+<style scoped lang="scss">
+	.homeIcon {
+		margin-left:20rpx;
+	}
+	
+	.slot-wrap {
+		display: flex;
+		align-items: center;
+	}
+</style>

pages.json

@@ -98,6 +98,7 @@
 				"path": "wd/menu",
 				"style": {
 					"navigationBarTitleText": "基本资料",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -107,6 +108,7 @@
 				"path": "wd/edu_info",
 				"style": {
 					"navigationBarTitleText": "教育信息",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -153,6 +155,7 @@
 				"path": "wd/class",
 				"style": {
 					"navigationBarTitleText": "我的网课",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -163,6 +166,7 @@
 				"path": "order/confirm_list",
 				"style": {
 					"navigationBarTitleText": "确认订单",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -173,6 +177,7 @@
 				"path": "order/confirm_pay",
 				"style": {
 					"navigationBarTitleText": "订单支付",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -183,6 +188,7 @@
 				"path": "order/confirm_success",
 				"style": {
 					"navigationBarTitleText": "支付成功",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -193,6 +199,7 @@
 				"path": "order/index",
 				"style": {
 					"navigationBarTitleText": "我的订单",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					// "enablePullDownRefresh": true,
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
@@ -204,6 +211,7 @@
 				"path": "invoice/index",
 				"style": {
 					"navigationBarTitleText": "发票申请",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					// "enablePullDownRefresh": true,
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
@@ -215,6 +223,7 @@
 				"path": "exam/index",
 				"style": {
 					"navigationBarTitleText": "我的考试",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -225,6 +234,7 @@
 				"path": "exam/exam_appointment",
 				"style": {
 					"navigationBarTitleText": "考试预约",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -235,6 +245,7 @@
 				"path": "exam/exam_result",
 				"style": {
 					"navigationBarTitleText": "考试成绩和证书",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -245,6 +256,7 @@
 				"path": "wd/question_bank",
 				"style": {
 					"navigationBarTitleText": "我的题库通",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -255,6 +267,7 @@
 				"path": "bank/my_question",
 				"style": {
 					"navigationBarTitleText": "我的题库",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -265,6 +278,7 @@
 				"path": "bank/question_record",
 				"style": {
 					"navigationBarTitleText": "做题记录",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"enablePullDownRefresh":true,
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
@@ -276,6 +290,7 @@
 				"path": "bank/detail",
 				"style": {
 					"navigationBarTitleText": "题库详情",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -286,6 +301,7 @@
 				"path": "bank/question_detail",
 				"style": {
 					"navigationBarTitleText": "进入刷题",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -297,6 +313,7 @@
 				"style": {
 					"enablePullDownRefresh":true,
 					"navigationBarTitleText": "我的消息",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -307,6 +324,7 @@
 				"path": "bank/question_statistics",
 				"style": {
 					"navigationBarTitleText": "做题统计",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -317,6 +335,7 @@
 				"path": "bank/question_report",
 				"style": {
 					"navigationBarTitleText": "试卷报告",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -349,6 +368,7 @@
 				"path": "bank/questionBankExplain",
 				"style": {
 					"navigationBarTitleText": "解析",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -359,6 +379,7 @@
 				"path": "bank/questionBankWrongExplain",
 				"style": {
 					"navigationBarTitleText": "错题解析",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -370,6 +391,7 @@
 				"path": "bank/questionBankAllExplain",
 				"style": {
 					"navigationBarTitleText": "全部解析",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -391,6 +413,7 @@
 				"path": "bank/questionBankExplainDetail",
 				"style": {
 					"navigationBarTitleText": "试卷解析",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -400,7 +423,8 @@
 			{
 				"path": "bank/questionBankTest",
 				"style": {
-					"navigationBarTitleText": "试卷标题",
+					"navigationBarTitleText": "试卷",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -411,6 +435,7 @@
 				"path": "msg/detail",
 				"style": {
 					"navigationBarTitleText": "消息详情",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -421,6 +446,7 @@
 				"path": "plan/index",
 				"style": {
 					"navigationBarTitleText": "学习计划",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -431,6 +457,7 @@
 				"path": "plan/create",
 				"style": {
 					"navigationBarTitleText": "创建计划",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -441,6 +468,7 @@
 				"path": "plan/edit",
 				"style": {
 					"navigationBarTitleText": "修改计划",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -451,6 +479,7 @@
 				"path": "verify/input",
 				"style": {
 					"navigationBarTitleText": "填写审核资料",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -461,6 +490,7 @@
 				"path": "verify/input2",
 				"style": {
 					"navigationBarTitleText": "填写审核资料",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -471,6 +501,7 @@
 				"path": "appointment/index",
 				"style": {
 					"navigationBarTitleText": "预约考试",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -481,6 +512,7 @@
 				"path": "appointment/order",
 				"style": {
 					"navigationBarTitleText": "预约考试",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -491,6 +523,7 @@
 				"path": "appointment/kporder",
 				"style": {
 					"navigationBarTitleText": "考前培训预约考试",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -511,6 +544,7 @@
 				"path": "subject/collectBank",
 				"style": {
 					"navigationBarTitleText": "试卷",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -521,6 +555,7 @@
 				"path": "subject/wrongBank",
 				"style": {
 					"navigationBarTitleText": "错题",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -532,6 +567,7 @@
 				"path": "subject/collectTypeBank",
 				"style": {
 					"navigationBarTitleText": "试卷",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -542,6 +578,7 @@
 				"path": "subject/wrongTypeBank",
 				"style": {
 					"navigationBarTitleText": "试卷",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -552,6 +589,7 @@
 				"path": "class/question_report",
 				"style": {
 					"navigationBarTitleText": "试卷报告",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -562,6 +600,7 @@
 				"path": "subject/wrong",
 				"style": {
 					"navigationBarTitleText": "错题集",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -572,6 +611,7 @@
 				"path": "bank/wrongById",
 				"style": {
 					"navigationBarTitleText": "错题集",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -582,6 +622,7 @@
 				"path": "bank/collectById",
 				"style": {
 					"navigationBarTitleText": "收藏集",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -592,6 +633,7 @@
 				"path": "subject/collect",
 				"style": {
 					"navigationBarTitleText": "收藏集",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -602,6 +644,7 @@
 				"path": "learn/my_learn",
 				"style": {
 					"navigationBarTitleText": "我的学时",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -612,6 +655,7 @@
 				"path": "learn/details",
 				"style": {
 					"navigationBarTitleText": "详情",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -622,6 +666,7 @@
 				"path": "learn/menu",
 				"style": {
 					"navigationBarTitleText": "目录",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -632,6 +677,7 @@
 				"path": "wd/course",
 				"style": {
 					"navigationBarTitleText": "所有课程",
+					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -657,25 +703,27 @@
 				}
 		},
 		{
-				"path": "polyv/detail",
-				"style": {
-					"navigationBarTitleText": "课程详情",
-					"app-plus": {
-						"titleNView": false, //禁用原生导航栏 
-						"bounce": "none"
-					},
-					"mp-weixin": {
-						"usingComponents": {
-						    "player": "/pages3/static/polyv-sdk/components/player/player",
-							"polyv-player": "plugin://polyv-player/player"
-						  }
-					}
+			"path": "polyv/detail",
+			"style": {
+				"navigationBarTitleText": "课程详情",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏 
+					"bounce": "none"
+				},
+				"mp-weixin": {
+					"usingComponents": {
+						"player": "/pages3/static/polyv-sdk/components/player/player",
+						"polyv-player": "plugin://polyv-player/player"
+					  }
 				}
+			}
 		},
 		{
 			"path": "course/detail",
 			"style": {
 				"navigationBarTitleText": "课程详情",
+				"navigationStyle": "custom", // 隐藏系统导航栏
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏 
 					"bounce": "none"
@@ -689,7 +737,8 @@
 		},{
 			"path": "imgCompare/index",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "身份证",
+				"navigationStyle": "custom", // 隐藏系统导航栏
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏 
 					"bounce": "none"

pages/course/index.vue

@@ -10,7 +10,7 @@
 				<u-line color="#D6D6DB" />
 				<view style="display: flex;justify-content: space-between;height: 78rpx;line-height: 78rpx;padding: 0 30rpx;font-size: 28rpx;">
 					<view style="color: #666666;white-space: nowrap;width: 80%;overflow-x: hidden;">{{selObj.eName}}：{{selObj.pName}}-{{selObj.bName}}</view>
-					<view style="color: #007AFF;width: 20%;" @click="openLeft()">重新选择</view>
+					<view style="color: #007AFF;width: 20%;font-size: 32rpx;" @click="openLeft()">重新选择</view>
 				</view>
 				<u-line color="#D6D6DB" />
 				<view style="display: flex;align-items:center;">
@@ -65,7 +65,7 @@
 							<view style="display: flex;margin-top: 13rpx;align-items: center;">
 								<view class="yearTag" v-if="item.year">{{item.year}}</view>
 								<view class="titleTag" style="display: flex;justify-content: space-between;flex:1;">
-									<view>{{item.goodsName}}</view>
+									<view style="flex:1;">{{item.goodsName}}</view>
 									
 									<view class="priceTag">¥ {{item.standPrice.toFixed(2)}}</view>
 								</view>
@@ -224,6 +224,8 @@ export default {
 					self.eList = res.data.rows
 					if(self.selObj.eId){
 						self.businessList({educationId:self.selObj.eId})
+					} else {
+						this.active1(self.eList[0])
 					}
 				}
 			});
@@ -496,5 +498,6 @@ export default {
 		padding: 3rpx 8rpx;
 		margin-top: 11rpx;
 		color:#666666;
+		font-size: 30rpx;
 	}
 </style>

pages2/appointment/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="预约考试"></nav-bar>
 		<view class="appointment">
 			<view class="appointmentItem appointmentHead">
 				<view class="imgBox"><image :src="$method.splitImgHost(listData.applyUrl)" mode="widthFix"></image></view>

pages2/appointment/kporder.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="考前培训预约考试"></nav-bar>
 		<view class="appointment">
 			<view class="appointmentItem">
 				<view class="title">考前培训地点：</view>

pages2/appointment/order.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="预约考试"></nav-bar>
 		<view class="appointment">
 			<view class="appointmentItem">
 				<view class="title">考试地点：</view>

pages2/bank/collectById.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="收藏集"></nav-bar>
 		<view class="sceenBox">
 			<view :class="['item', {'active':sceenType===2} ]" @click="sceenType = !sceenType">全部试卷类型<u-icon class="icon" :class="sceenType ? 'animals':''" name="arrow-down"></u-icon></view>
 		</view>

pages2/bank/detail.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="题库详情"></nav-bar>
 		<view style="background-color: #FFFFFF;">
 			<view>
 				<image :src="$method.splitImgHost(goodsData.coverUrl, true)" style="width: 100%;"></image>
@@ -17,7 +18,7 @@
 			</view>
 			<u-line color="#D6D6DB" />
 			<view>
-				<view><u-tabs :list="list" item-width="50%" font-size="24" bar-width="24" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
+				<view><u-tabs :list="list" item-width="50%" font-size="30" bar-width="24" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
 			</view>
 			<u-line color="#D6D6DB" />
 		</view>
@@ -45,12 +46,10 @@
 									<u-icon  v-if="item2.showList" name="arrow-down"></u-icon> -->
 									<text style="margin-left:34rpx;">{{ item2.name }}</text>
 								</view>
-								<view v-if="item2.showList">
+								<view class="article-list" v-if="item2.showList">
 									<view class="article" :class="{ active: showTest(article.examId) }" v-for="(article, index3) in item2.list" :key="index3">
 										<view class="flex_auto">{{ article.examName }}</view>
-										<navigator hover-class="none" :url="'/pages2/bank/questionBankTest?id=' + article.examId + '&num=' + showTest(article.examId).num">
-											<view class="btn" v-if="showTest(article.examId)">试做</view>
-										</navigator>
+										<view class="btn" @click="goTest(item1.type,article)" v-if="showTest(article.examId)">试做</view>
 									</view>
 								</view>
 								<u-line></u-line>
@@ -66,12 +65,10 @@
 							<u-icon  v-if="item1.showList" name="arrow-down"></u-icon> -->
 							<text style="margin-left:34rpx;">{{ item1.name }}</text>
 						</view>
-						<view v-if="item1.showList" >
+						<view class="article-list" v-if="item1.showList" >
 							<view class="article" :class="{active:showTest(article.examId)}"  :key="index2" v-for="(article,index2) in item1.list">
-								<view class="flex_auto">{{item1.name}}</view>
-								<navigator  hover-class="none" :url="'/pages2/bank/questionBankTest?id='+article.examId+'&num='+showTest(article.examId).num">
-									<view class="btn"  v-if="showTest(article.examId)">试做</view>
-								</navigator>
+								<view class="flex_auto">{{article.examName}}</view>
+								<view class="btn" @click="goTest(item1.type,article)"  v-if="showTest(article.examId)">试做</view>
 							</view>
 						</view>
 					</template>
@@ -79,9 +76,7 @@
 					<template v-if="item1.type == 3">
 						<view class="article" :class="{ active: showTest(item1.majorId) }">
 							<view class="flex_auto">{{ item1.name }}</view>
-							<navigator hover-class="none" :url="'/pages2/bank/questionBankTest?id=' + item1.majorId + '&num=' + showTest(item1.majorId).num">
-								<view class="btn" v-if="showTest(item1.majorId)">试做</view>
-							</navigator>
+							<view class="btn" @click="goTest(item1.type,item1)" v-if="showTest(item1.majorId)">试做</view>
 						</view>
 					</template>
 				</view>
@@ -168,6 +163,26 @@ export default {
 					this.$set(bank, 'list', res.data.data);
 				});
 		},
+		
+		goTest(type,item) {
+			
+			if(type == 1) {
+				uni.setStorageSync('testname',item.examName)
+				uni.navigateTo({
+					url:'/pages2/bank/questionBankTest?id=' + item.examId + '&num=' + this.showTest(item.examId).num
+				})
+			} else if(type == 2) {
+				uni.setStorageSync('testname',item.examName)
+				uni.navigateTo({
+					url:'/pages2/bank/questionBankTest?id='+item.examId+'&num='+ this.showTest(item.examId).num
+				})
+			} else if(type == 3) {
+				uni.setStorageSync('testname',item.name)
+				uni.navigateTo({
+					url:'/pages2/bank/questionBankTest?id=' + item.majorId + '&num=' + this.showTest(item.majorId).num
+				})
+			}
+		},
 
 		showTest(id) {
 			return this.goodsExamConfig.find(item => item.examId == id);
@@ -332,42 +347,48 @@ page {
 				display: flex;
 				align-items: center;
 			}
-
-			.article {
-				min-height: 80rpx;
-				display: flex;
-				align-items: center;
-				margin-left: 64rpx;
-				font-size: 24rpx;
-				color: #666666;
-				border-bottom: 1rpx solid #eeeeee;
-				display: flex;
-
-				.flex_auto {
-					flex: 1;
-				}
-
-				&:nth-last-of-type(1) {
-					border: 0;
-				}
-
-				&.active {
-					color: #007aff;
-
-					.btn {
-						width: 96rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						text-align: center;
-						color: #fff;
-						font-size: 30rpx;
-						border-radius: 24rpx;
-						background: #007aff;
-						margin-left: 36rpx;
-						border-radius: 24rpx;
+			
+			.article-list {
+				margin-top:20rpx;
+				
+				.article {
+					min-height: 80rpx;
+					display: flex;
+					align-items: center;
+					margin-left: 64rpx;
+					font-size: 30rpx;
+					color: #666666;
+					border-bottom: 1rpx solid #eeeeee;
+					display: flex;
+				
+					.flex_auto {
+						flex: 1;
+					}
+				
+					&:nth-last-of-type(1) {
+						border: 0;
+					}
+				
+					&.active {
+						color: #007aff;
+				
+						.btn {
+							width: 96rpx;
+							height: 48rpx;
+							line-height: 48rpx;
+							text-align: center;
+							color: #fff;
+							font-size: 30rpx;
+							border-radius: 24rpx;
+							background: #007aff;
+							margin-left: 36rpx;
+							border-radius: 24rpx;
+						}
 					}
 				}
 			}
+
+			
 		}
 	}
 }

pages2/bank/my_question.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="padding: 30rpx;">
+		<nav-bar title="我的题库"></nav-bar>
 		<view v-for="(item, index) in list" :key="index"  style="margin-bottom: 30rpx;" @click="studyIn(item,index)">
 			<view class="class_item">
 				<image class="img" :src="$method.splitImgHost(item.coverUrl, true)"></image>

pages2/bank/questionBank.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="questionBank">
-		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" ref="navbar" :statusBar="true" title="试卷"></uni-nav-bar>
+		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" ref="navbar" :statusBar="true" :title="examData.examName"></uni-nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank, bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">
@@ -534,6 +534,7 @@ export default {
 			showArrow:false, //退出提示
 			isFromVideo:'',
 			gradeId:'',
+			examData:{},
 			cgType: 0 //对应设计稿弹窗编码
 		};
 	},
@@ -623,6 +624,7 @@ export default {
 				
 				this.$api.bankExam(this.id).then(res => {
 					this.bankType = res.data.data.doType;
+					this.examData = res.data.data;
 					if (this.bankType == 2) {
 						this.needBack = true;
 					}

pages2/bank/questionBankAllExplain.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="questionBank">
+		<nav-bar title="全部解析"></nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">

pages2/bank/questionBankContinue.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="questionBank">
-		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" :statusBar="true" title="试卷"></uni-nav-bar>
+		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" :statusBar="true" :title="examData.examName"></uni-nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">
@@ -465,6 +465,7 @@ export default {
 			chapterId:'',
 			moduleId:'',
 			isSubmit:false,
+			examData:{},
 			cgType: 0 //对应设计稿弹窗编码
 		};
 	},
@@ -642,7 +643,7 @@ export default {
 			console.log("继续做题")
 			this.$api.examReport(this.recordId).then(res => {
 				let json = JSON.parse(res.data.data.historyExamJson)
-				
+				this.examData = res.data.data;
 				this.questionList = json;
 			})
 		

pages2/bank/questionBankExplain.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="questionBank">
+		<nav-bar title="解析"></nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">

pages2/bank/questionBankExplainDetail.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="questionBank">
+		<nav-bar title="试卷解析"></nav-bar>
 		<view class="tabs-top">
 			<u-tabs :list="list" sticky :current="tabCurrent" @change="tabChange" active-color="#007AFF"></u-tabs>
 		</view>

pages2/bank/questionBankTest.vue

@@ -1,5 +1,6 @@
 <template>
 	<view id="questionBank">
+		<nav-bar :title="title"></nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">
@@ -412,6 +413,7 @@
 export default {
 	data() {
 		return {
+			title:'',
 			id:'',
 			current:0,
 			questionList:[],
@@ -431,7 +433,7 @@ export default {
 		this.num = +option.num;
 		
 		let showDialog = uni.getStorageSync('showDialog');
-		
+		this.title =  uni.getStorageSync('testname');
 		if(showDialog) {
 			this.showDialog = false;
 		} else {
@@ -659,7 +661,7 @@ export default {
 			} else {
 				uni.showModal({
 					title: '提示',
-					content: '试做题目已结束，够买题卷可作答所有题目',
+					content: '试做题目已经结束~',
 					cancelText:'返回详情',
 					cancelColor:'',
 					confirmText:'继续作答',
@@ -686,7 +688,7 @@ export default {
 				
 				uni.showModal({
 					title: '提示',
-					content: '试做题目已结束，够买题卷可作答所有题目',
+					content: '试做题目已经结束~',
 					cancelText:'返回详情',
 					cancelColor:'',
 					confirmText:'继续作答',
@@ -710,7 +712,7 @@ export default {
 		 */
 		submit() {
 			uni.showToast({
-			    title: '不能试做返回详情购买后即可交卷~',
+			    title: '试做题目不能交卷~',
 			    duration: 2000,
 				icon:'none'
 			});
@@ -724,7 +726,7 @@ export default {
 		 */
 		collect(state,index) {
 			uni.showToast({
-			    title: '返回详情购买后即可收藏~',
+			    title: '试做题目，不支持收藏~',
 			    duration: 2000,
 				icon:'none'
 			});

pages2/bank/questionBankWrongExplain.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="questionBank">
+		<nav-bar title="错题解析"></nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">

pages2/bank/question_detail.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="进入刷题"></nav-bar>
 		<view class="top">
 			<navigator  hover-class="none" :url="'/pages2/bank/question_statistics?id=' + id">
 				<view class="left">

pages2/bank/question_record.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="做题记录"></nav-bar>
 		<view class="tabs">
 			<view class="tab" :class="{ active: index == 1 }" data-index="1" @click="tab">
 				全部题库记录
@@ -289,7 +290,6 @@ page {
 	position: fixed;
 	left: 0;
 	width: 100%;
-	top: 0;
 	display: flex;
 	z-index: 10;
 	.tab {

pages2/bank/question_report.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="试卷报告"></nav-bar>
 		<view :class="reportdata.reportStatus === 0 ? 'redBtn' : reportdata.reportStatus === 1 ? 'greenBtn' : 'disNone'" v-if="examData.doType == 2 && reportdata.reportStatus !== null">
 			{{ reportdata.reportStatus === 0 ? '测试未通过' : reportdata.reportStatus === 1 ? '测试通过' : '' }}
 		</view>

pages2/bank/question_statistics.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="做题统计"></nav-bar>
 		<view class="top">
 			<view class="title">
 				做题统计

pages2/bank/wrongById.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="错题集"></nav-bar>
 		<view class="sceenBox">
 			<view :class="['item', {'active':sceenType===2} ]" @click="sceenType = !sceenType">全部试卷类型<u-icon class="icon" name="arrow-down" :class="sceenType ? 'animals':''" ></u-icon></view>
 		</view>

pages2/class/question_report.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="试卷报告"></nav-bar>
 		<view :class="reportStatus == 0 ? 'redBtn' : reportStatus == 1 ? 'greenBtn' : 'disNone'" v-if="reportStatus !== null">
 			{{ reportStatus == 0 ? '测试未通过' : reportStatus == 1 ? '测试通过' : '' }}
 		</view>

pages2/exam/exam_appointment.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="考试预约"></nav-bar>
 		<view style="width: 100%;text-align: center;position: fixed;height: 96rpx;z-index: 999;">
 			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#007AFF" inactive-color="#999"></u-tabs>
 		</view>
@@ -309,7 +310,7 @@ page {
 	font-family: PingFang SC;
 	font-weight: 500;
 	color: #999999;
-	margin: 160rpx 0;
+	margin: 200rpx 0;
 }
 .examMain {
 	padding: 8rpx;

pages2/exam/exam_result.vue

@@ -1,9 +1,10 @@
 <template>
 	<view>
+		<nav-bar title="考试成绩和证书"></nav-bar>
 		<view style="width: 100%;text-align: center;position: fixed;height: 96rpx;z-index: 999;">
 			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#007AFF" inactive-color="#999"></u-tabs>
 		</view>
-		<view class="safeArea" style="position: absolute;top: 96rpx;width: 100%;">
+		<view class="safeArea" style="position: absolute;top: 280rpx;width: 100%;">
 			<view class="examMain">
 				<view class="noData" v-if="!listData.length">您暂无相关考试成绩和证书哦~~</view>
 				<view v-for="(item, index) in listData" :key="index" class="examList">

pages2/exam/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="我的考试"></nav-bar>
 		<view class="examWrap">
 			<view class="examItem" @click="goAppointment">
 				<view class="item">考试预约</view>

pages2/invoice/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="invoice">
+		<nav-bar title="发票申请"></nav-bar>
 		<view class="invoice__tabs">
 			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#007AFF"></u-tabs>
 		</view>

pages2/learn/details.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="详情"></nav-bar>
 		<view class="detailsWrap">
 			<view class="topTitle">
 				<u-icon name="info-circle-fill" style="color:#FF3B30;margin-right:8rpx;"></u-icon>

pages2/learn/menu.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="目录"></nav-bar>
 		<view class="menuWrap">
 			<view class="videoMain">
 				<video id="myVideo" src="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/%E7%AC%AC1%E8%AE%B2%EF%BC%88uni-app%E4%BA%A7%E5%93%81%E4%BB%8B%E7%BB%8D%EF%BC%89-%20DCloud%E5%AE%98%E6%96%B9%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B@20200317.mp4" @error="videoErrorCallback" :danmu-list="danmuList" enable-danmu danmu-btn controls></video>

pages2/learn/my_learn.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="目录"></nav-bar>
 		<view style="width: 100%;text-align: center;position: fixed;height: 96rpx;z-index: 999;">
 			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#333" inactive-color="#999"></u-tabs>
 		</view>

pages2/msg/detail.vue

@@ -1,5 +1,6 @@
 <template>
-	<view style="padding: 20rpx;">
+	<view>
+		<nav-bar title="消息详情"></nav-bar>
 		<view class="item">
 			<view class="title">{{ listData.systemStatus === 2 ? listData.informVo.informName : listData.systemStatus === 1 ? listData.remind : '' }}</view>
 			<view class="time">{{ $method.timestampToTime(listData.sendTime, false) }}</view>

pages2/msg/index.vue

@@ -1,5 +1,6 @@
 <template>
-	<view style="padding: 20rpx;">
+	<view>
+		<nav-bar title="我的消息"></nav-bar>
 		<view v-if="!listData.length"><u-empty text="消息列表为空" mode="message"></u-empty></view>
 		<view v-else v-for="(item, index) in listData" :key="index" style="padding-bottom: 20rpx;">
 			<navigator hover-class="none" :url="`/pages2/msg/detail?id=${item.id}`" class="item" :style="item.receiptStatus === 1 ? 'opacity: 0.7' : ''">

pages2/order/confirm_list.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="确认订单"></nav-bar>
 		<view style="padding: 8rpx;padding-bottom: 98rpx;">
 			<view  >
 				<view class="item">

pages2/order/confirm_pay.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="订单支付"></nav-bar>
 		<view>
 			<view style="padding: 8rpx;">
 				<view class="box2">
@@ -42,6 +43,8 @@
 			</view>
 		</view>
 		<button class="bottomBtn" @click="pay()" :disabled="btnNo">确认支付</button>
+		
+		<u-modal v-model="showModal" confirm-text="返回购物车" cancel-text="知道了" cancel-color="#666666" confirm-color="rgba(0, 122, 255, 1);" :show-confirm-button="true" :show-cancel-button="true" :content="modalMsg" @cancel="modalCancel()" @confirm="modalConfirm()" ref="uModal" ></u-modal>
 	</view>
 	
 </template>
@@ -55,6 +58,8 @@ export default {
 	},
 	data() {
 		return {
+			showModal:false,
+			modalMsg:'',
 			list:[
 				{
 					name: '网课'
@@ -138,14 +143,19 @@ export default {
 					    }
 					});
 				}else{
-					uni.showModal({
-						title: "提示",
-						content: res.data.msg,
-						showCancel: false
-					})
+					this.modalMsg = res.data.msg;
+					this.showModal = true;
 				}
 			});
 		},
+		modalCancel() {
+			this.showModal = false;
+		},
+		modalConfirm() {
+			uni.switchTab({
+				url:'/pages/shopping/shoppingCart'
+			})
+		},
 		getOpenid(code){
 			let self = this
 			this.$api.wxOpenid({code:code}).then(res => {

pages2/order/confirm_success.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="支付成功"></nav-bar>
 		<view>
 			<view style="padding: 8rpx;">
 				<view class="box1">

pages2/order/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="创建计划"></nav-bar>
 		<view style="width: 100%;text-align: center;position: fixed;height: 96rpx;z-index: 999;">
 			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#007AFF"></u-tabs>
 		</view>

pages2/plan/create.vue

@@ -1,5 +1,6 @@
 <template>
-	<view style="padding: 16rpx;">
+	<view>
+		<nav-bar title="我的订单"></nav-bar>
 		<view class="list_box">
 			<view class="item" v-for="(item, index) in list" :key="index">
 				<image :src="item.coverUrl"></image>
@@ -75,7 +76,7 @@
 				</view>
 				<view class="popup_list" v-if="list2.length !== 0">
 					<scroll-view class="list_in" scroll-y="true">
-						<view class="popup_item" v-for="(item, index) in list2" :key="index">
+						<view class="popup_item" v-for="(item, index) in list2" :key="index" @click="selectToast(item)">
 							
 								<u-checkbox
 									:disabled="item.disabled"
@@ -305,6 +306,15 @@ export default {
 			console.log(34);
 			item.checked = !item.checked;
 		},
+		selectToast(item) {
+			if(item.disabled) {
+				uni.showToast({
+					icon:'none',
+					title:'选择网课（只能选同类课程）',
+					duration:3000
+				})
+			}
+		},
 		getMyCourse() {
 			let data = {
 				typeId: 1

pages2/plan/edit.vue

@@ -1,5 +1,6 @@
 <template>
-	<view style="padding: 16rpx;">
+	<view>
+		<nav-bar title="修改计划"></nav-bar>
 		<view class="list_box">
 			<view class="item" v-for="(item, index) in list" :key="index">
 				<image :src="item.coverUrl"></image>

pages2/plan/index.vue

@@ -1,5 +1,6 @@
 <template>
-	<view style="padding: 16rpx;">
+	<view >
+		<nav-bar title="学习计划"></nav-bar>
 		<view v-if="havePlan">
 			<view class="card" v-if="havePlan">
 				<view class="date_t1">

pages2/subject/collect.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="收藏集"></nav-bar>
 		<view class="sceenBox">
 			<view :class="['item', {'active':sceenType===1} ]" @click="showSceen(1)">全部题库记录<u-icon class="icon" :class="sceenType ===1 ? 'animals':''"  name="arrow-down"></u-icon></view>
 			<view :class="['item', {'active':sceenType===2} ]" @click="showSceen(2)">全部试卷类型<u-icon class="icon" :class="sceenType ===2 ? 'animals':''"  name="arrow-down"></u-icon></view>

pages2/subject/collectBank.vue

@@ -1,5 +1,6 @@
 <template>
 	<view id="questionBank">
+		<nav-bar title="试卷"></nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">
@@ -895,9 +896,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.swiper {
+#questionBank {
 	width:100%;
 	height:100vh;
+	display: flex;
+	flex-direction: column;
+}
+.swiper {
+	width: 100%;
+	flex:1;
 }
 .lisSty {
 	margin-bottom: 16rpx;

pages2/subject/collectTypeBank.vue

@@ -1,5 +1,6 @@
 <template>
 	<view id="questionBank">
+		<nav-bar title="试卷"></nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">
@@ -896,9 +897,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.swiper {
+#questionBank {
 	width:100%;
 	height:100vh;
+	display: flex;
+	flex-direction: column;
+}
+.swiper {
+	width: 100%;
+	flex:1;
 }
 .lisSty {
 	margin-bottom: 16rpx;

pages2/subject/wrong.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="safeArea">
+		<nav-bar title="错题集"></nav-bar>
 		<view class="sceenBox">
 			<view :class="['item', {'active':sceenType===1} ]" @click="showSceen(1)">全部题库记录<u-icon class="icon" :class="sceenType ===1 ? 'animals':''"  name="arrow-down"></u-icon></view>
 			<view :class="['item', {'active':sceenType===2} ]" @click="showSceen(2)">全部试卷类型<u-icon class="icon" :class="sceenType ===2? 'animals':''"  name="arrow-down"></u-icon></view>

pages2/subject/wrongBank.vue

@@ -1,5 +1,6 @@
 <template>
 	<view id="questionBank">
+		<nav-bar title="错题"></nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">
@@ -1066,9 +1067,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.swiper {
+#questionBank {
 	width:100%;
 	height:100vh;
+	display: flex;
+	flex-direction: column;
+}
+.swiper {
+	width: 100%;
+	flex:1;
 }
 .lisSty {
 	margin-bottom: 16rpx;

pages2/subject/wrongTypeBank.vue

@@ -1,5 +1,6 @@
 <template>
 	<view id="questionBank">
+		<nav-bar title="试卷"></nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">
@@ -950,9 +951,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.swiper {
+#questionBank {
 	width:100%;
 	height:100vh;
+	display: flex;
+	flex-direction: column;
+}
+.swiper {
+	width: 100%;
+	flex:1;
 }
 .lisSty {
 	margin-bottom: 16rpx;

pages2/verify/input.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="padding: 30rpx;">
-		
+		<nav-bar title="填写审核资料"></nav-bar>
 		<view v-show="!agreementModal">
 			<view class="topBox">
 				<view>

pages2/verify/input2.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="padding: 30rpx;">
+		<nav-bar title="填写审核资料"></nav-bar>
 		<view class="topBox">
 			<view>
 				<u-icon name="error-circle-fill" color="#FF3B30" size="28"></u-icon>

pages2/wd/avatar.vue

@@ -1,21 +1,21 @@
 <template>
 	<view>
 		<u-cell-group>
-				<u-cell-item  title="头像" @click="editAvatar">
-					<image :src="avatarUrl" class="avatar"></image>
-				</u-cell-item>
-				<u-cell-item  title="昵称" :value="nickname" @click="editNickName"></u-cell-item>
-			</u-cell-group>
-			<u-modal v-model="show" :show-cancel-button="true" title="修改昵称">
-				<view class="slot-content">
-					<u-input v-model="nickname"  />
-				</view>
-			</u-modal>
-			<view style="position: fixed;bottom: 50rpx;width: 100%;padding: 20rpx;">
-				<button  @click="submitForm" class="submit_btn">保存</button>
-				
-				<button  @click="exit" class="exit_btn">退出登录</button>
+			<u-cell-item  title="头像" @click="editAvatar">
+				<image :src="avatarUrl" class="avatar"></image>
+			</u-cell-item>
+			<u-cell-item  title="昵称" :value="nickname" @click="editNickName"></u-cell-item>
+		</u-cell-group>
+		<u-modal v-model="show" :show-cancel-button="true" title="修改昵称">
+			<view class="slot-content">
+				<u-input v-model="nickname"  />
 			</view>
+		</u-modal>
+		<view style="position: fixed;bottom: 50rpx;width: 100%;padding: 20rpx;">
+			<button  @click="submitForm" class="submit_btn">保存</button>
+			
+			<button  @click="exit" class="exit_btn">退出登录</button>
+		</view>
 			
 	</view>
 </template>

pages2/wd/class.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="padding: 30rpx;">
+		<nav-bar title="我的网课"></nav-bar>
 		<view class="class" v-for="(item, index) in goodsList" :key="index">
 			
 				<view class="class_item" @click.stop="studyIn(item.goodsId,item.gradeId,item,index)">

pages2/wd/course.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="padding: 30rpx;">
+		<nav-bar title="所有课程"></nav-bar>
 		<view v-if="!courseList.length">
 			<u-empty text="暂无课程" mode="list"></u-empty>
 		</view>

pages2/wd/edu_info.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="padding: 30rpx;" >
+		<nav-bar title="所有课程"></nav-bar>
 		<view style="position: relative;">
 			<view class="tip">
 				请填写真实信息，以便我们后续为您提供完善的 <br>

pages2/wd/info.vue

@@ -1,5 +1,6 @@
 <template>
 	<view >
+		
 	<image mode="widthFix" src="/static/wd_bg_login.jpg" class="login_full_img"></image>
 	
 	
@@ -59,10 +60,6 @@
 						<view>手机号码</view>
 						<view>{{ form.telphone }}<u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 					</view>
-				<!--	<view class="item">
-						<view>微信绑定</view>
-						<view>{{ form.gzh_open_id }}<u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
-					</view> -->
 				</view>
 			</view>
 		</view>

pages2/wd/menu.vue

@@ -1,5 +1,6 @@
 <template>
 	<view >
+		<nav-bar title="基本资料"></nav-bar>
 		<u-cell-group>
 				<u-cell-item  title="基本信息" @click="jumpInfo"></u-cell-item>
 				<u-cell-item  title="教育信息" @click="jumpEduInfo"></u-cell-item>

pages2/wd/question_bank.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="padding: 32rpx;">
+		<nav-bar title="我的题库通"></nav-bar>
 		<navigator  hover-class="none" url="/pages2/bank/my_question">
 			<view class="my_question">
 				<view class="flex">

pages3/course/detail.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="课程详情"></nav-bar>
 		<view class="videoBox" >
 			<view >
 				<view class="video_box" v-if="!startStatus">
@@ -35,16 +36,16 @@
 			</view>
 			<u-line color="#D6D6DB" />
 			<view style="height: 80rpx;">
-				<view><u-tabs :list="list" item-width="50%" font-size="24" bar-width="24"  :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
+				<view><u-tabs :list="list" item-width="50%" font-size="30" bar-width="24"  :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
 			</view>
 			
 		</view>
-		<view style="padding: 20rpx;position: relative;top: 730rpx;" v-show="current==0">
+		<view style="padding: 20rpx;position: relative;" v-show="current==0">
 			<view class="content">
 				<view v-html="detail.mobileDetailHtml" style="width: 100%;overflow: hidden;"></view>
 			</view>
 		</view>
-		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;top: 730rpx;" v-show="current==1">
+		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;d" v-show="current==1">
 			<view >
 				<view v-for="(item,index) in courseList" :key="index" >
 					<view class="courseItemBox" >
@@ -361,7 +362,6 @@ export default {
 		text-overflow:ellipsis; 
 	}
 	.videoBox{
-		position: fixed;
 		background-color: #FFFFFF;
 		width: 100%;
 		/* height: 680rpx; */

pages3/imgCompare/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<nav-bar title="身份证"></nav-bar>
 		<div class="camera-wrap">
 			<camera ref="camera" resolution="high" class="camera" frame-size="small"  device-position="back" flash="off"  @error="error"></camera>
 			<image class="avatar" :src="face ? '../static/avatar.png' : '../static/back.png' "></image>

pages3/polyv/detail.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<view style="position: fixed;width: 100%;z-index: 999;background: #FFFFFF;top: 0;" id="top">
+		<nav-bar title="身份证"></nav-bar>
+		<view style="position: fixed;width: 100%;z-index: 999;background: #FFFFFF;" id="top">
 			<view class="video_box" v-if="!startStatus">
 				<image :src="$method.splitImgHost(detail.coverUrl)" style="width: 100%;height: 460rpx;"></image>
 				<image v-if="false" class="video_play" src="/static/play.png" @click="startVideo"></image>