Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service

packageB/login.vue

@@ -40,6 +40,7 @@
 	const placeholderStyle = 'font-size:30rpx'
 	const checked = ref(true)
 	const codeUrl = ref('')
+	const flag=ref('hlw')
 
 	const form = reactive({
 		username: 'langchaojituan',
@@ -49,8 +50,9 @@
 		uuid: ''
 	})
 
-	onLoad(() => {
-		
+	onLoad((option) => {
+		console.log("option",option)
+		flag.value=option.flag
 	})
 
 	onMounted(() => {
@@ -83,27 +85,51 @@
 			title: '登录中...',
 			mask: true
 		})
-		$api.myRequest('/auth/login',form,'post',10100).then((res) => {
-			console.log(res, 'res')
-			uni.setStorageSync('Padmin-Token', res.data.access_token)
-			uni.reLaunch({
-				url: '/pages/index/index'
+		if(flag.value=='hlw'){
+			$api.myRequest('/auth/login',form,'post',10100).then((res) => {
+				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+				codeUrl.value = 'data:image/gif;base64,' + res.img
+			}).catch(() => {
+				uni.hideLoading()
+				uni.showToast({
+					icon: 'none',
+					title: '登录失败，请重试'
+				})
 			})
-			codeUrl.value = 'data:image/gif;base64,' + res.img
-		}).catch(() => {
-			uni.hideLoading()
-			uni.showToast({
-				icon: 'none',
-				title: '登录失败，请重试'
+		}else if(flag.value=='nw'){
+			$api.myRequest('/auth/login',form,'post',9100).then((res) => {
+				uni.setStorageSync('Padmin-Token', res.data.access_token)
+				uni.reLaunch({
+					url: '/packageB/priority/helpFilter'
+				})
+				codeUrl.value = 'data:image/gif;base64,' + res.img
+			}).catch(() => {
+				uni.hideLoading()
+				uni.showToast({
+					icon: 'none',
+					title: '登录失败，请重试'
+				})
 			})
-		})
+		}
+		
 	}
 
 	function getCodeImg() {
-		$api.myRequest('/code',{},'get',10100).then((resData) => {
-			codeUrl.value = 'data:image/gif;base64,' + resData.img
-			form.uuid = resData.uuid
-		});
+		if(flag.value=='hlw'){
+			$api.myRequest('/code',{},'get',10100).then((resData) => {
+				codeUrl.value = 'data:image/gif;base64,' + resData.img
+				form.uuid = resData.uuid
+			});
+		}else if(flag.value=='nw'){
+			$api.myRequest('/code',{},'get',9100).then((resData) => {
+				codeUrl.value = 'data:image/gif;base64,' + resData.img
+				form.uuid = resData.uuid
+			});
+		}
+		
 	}
 </script>
 

pages/index/components/index-one.vue

@@ -749,7 +749,8 @@ const navToTestPage = () => {
     navTo('/pages/test/homepage-test');
 };
 const navToPage = () =>{
-	navTo('/packageB/priority/helpFilter');
+	navTo('/packageB/login?flag=nw');
+	// navTo('/packageB/priority/helpFilter');
 }
 
 async function loadData() {