登录页修改

pages/Login/components/loginBox.vue

@@ -32,8 +32,8 @@
 	import passwordLli from "@/components/password-lli/password-lli.vue";
 	import {ref} from "vue"
 	import {toast} from "@/utils/common";
-	const userName = ref('18640920672') // 用户名
-	const password = ref('123') // 密码
+	const userName = ref('') // 用户名
+	const password = ref('') // 密码
 	const lliPassword = ref('') // 加密后的密码
 	const passLLiRef = ref(null)
 	const showPassword= ref(true)
@@ -116,18 +116,14 @@
 		// 客户端
 		// #ifdef H5
 		uni.navigateTo({
-<<<<<<< Updated upstream
-			url: `/pages/client/ShowYe/shouye`
-=======
-			url: `/pages/admin/Jiazheng/index`
->>>>>>> Stashed changes
+			url: `/pages/client/ShouYe/shouye`
 		})
 		// #endif
 		
 		// 管理端
 		// #ifdef APP-PLUS
 		uni.navigateTo({
-			url: `/pages/admin/Jiazheng/index`
+			url: `/pages/admin/ShouYe/shouye`
 		})
 		// #endif
 

pages/client/Lianxi/exam.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="phone-kaoshi-page">
 		<!-- 导航区域 -->
-		<view class="icon-title-navBar-box">
+		<view class="icon-title-bjcolor-navBar-box">
 			<view @click="handleBack" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{data.lxName}}</text>
 		</view>