From e7bcd4328d75946533ebea0dc279360f26ebcbc5 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Thu, 19 Sep 2024 16:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js            | 25 +-----------------
 api/login.js          | 22 ++++++++++++++++
 pages/login/login.vue | 61 +++++++------------------------------------
 pages/tab/index.vue   |  4 ++-
 pages/tab/my.vue      |  4 ++-
 pages/tab/office.vue  |  2 +-
 utils/index.js        |  2 +-
 7 files changed, 41 insertions(+), 79 deletions(-)
 create mode 100644 api/login.js

diff --git a/api/api.js b/api/api.js
index 8bebac7..84ec9eb 100644
--- a/api/api.js
+++ b/api/api.js
@@ -1,27 +1,4 @@
-import {
-	https
-} from '@/utils/http.js';
-export function loginApi(config) { // 登录
-	return https({
-		url: '/sys/sinopecLogin',
-		method: 'post',
-		data: config
-	})
-}
-export function queryRoleApi(config) { // 获取角色职位
-	return https({
-		url: '/appConnet/app/queryRoleByRoleIds',
-		method: 'get',
-		data: config
-	})
-}
-export function getUserPermissionApi(config) { // 获取权限
-	return https({
-		url: '/sys/permission/getUserPermissionByToken',
-		method: 'get',
-		data: config
-	})
-}
+import { https } from '@/utils/http.js';
 export function taskListApi(config) { // 我的任务列表
 	return https({
 		url: '/act/task/list',
diff --git a/api/login.js b/api/login.js
new file mode 100644
index 0000000..d62ade8
--- /dev/null
+++ b/api/login.js
@@ -0,0 +1,22 @@
+import { https } from '@/utils/http.js';
+export function loginApi(config) { // 登录
+	return https({
+		url: '/sys/sinopecLogin',
+		method: 'post',
+		data: config
+	})
+}
+export function queryRoleApi(config) { // 获取角色职位
+	return https({
+		url: '/appConnet/app/queryRoleByRoleIds',
+		method: 'get',
+		data: config
+	})
+}
+export function getUserPermissionApi(config) { // 获取权限
+	return https({
+		url: '/sys/permission/getUserPermissionByToken',
+		method: 'get',
+		data: config
+	})
+}
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c80db5a..087a27a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,41 +1,33 @@
 <template>
 	<view :class="{'gray':store.isgray==1}">
 		<view class="logo f-col aic">
-			<image src="../../static/login/logo.png" mode=""></image>
+			<image src="@/static/login/logo.png"></image>
 		</view>
 		<view class="form f-col aic">
 			<view class="box f-row aic">
-				<image src="../../static/login/phone.png" mode=""></image>
-				<input v-model="username" type="text" placeholder="请输入账号"
+				<image src="@/static/login/phone.png"></image>
+				<input v-model="username" type="text" placeholder="请输入统一身份认证"
 					placeholder-style="font-size: 28rpx;color: #999999;" />
-				<!-- <view class="account_box" id="account" v-if="showAccount">
-					<view class="account">
-						<view class="" v-for="item,i in accountArr" :key="i" @click="chooseAccount(item.un)">
-							{{item.un}}
-						</view>
-					</view>
-				</view> -->
 			</view>
 			<view class="box f-row aic">
-				<image src="../../static/login/pwd.png" mode=""></image>
+				<image src="@/static/login/pwd.png"></image>
 				<input v-model="password" :type="!showpwd?'password':'text'" placeholder="请输入密码"
 					placeholder-style="font-size: 28rpx;color: #999999;" />
-
-				<image v-if="showpwd" src="../../static/login/eye.png" mode="" @click="showpwd=!showpwd"></image>
-				<image v-else src="../../static/login/eye-off.png" mode="" @click="showpwd=!showpwd"></image>
+				<image v-if="showpwd" src="@/static/login/eye.png" @click="showpwd = !showpwd"></image>
+				<image v-else src="@/static/login/eye-off.png" @click="showpwd = !showpwd"></image>
 			</view>
 		</view>
 		<view class="pwd f-row aic">
 			<view style="display: inline-block;" @click="check = !check">
 				<view class="f-row aic">
-					<image v-if="!check" src="../../static/login/nocheck.png" mode=""></image>
-					<image v-else src="../../static/login/checked.png" mode=""></image>
+					<image v-if="!check" src="@/static/login/nocheck.png"></image>
+					<image v-else src="@/static/login/checked.png"></image>
 					<text>记住密码</text>
 				</view>
 			</view>
 		</view>
 		<view class="login f-col aic">
-			<view class="" @click="login">
+			<view @click="login">
 				登录
 			</view>
 		</view>
@@ -51,8 +43,7 @@
 	import {
 		loginApi,
 		queryRoleApi
-	} from '@/api/api.js';
-
+	} from '@/api/login.js';
 	import Base64 from 'base-64';
 	import {
 		onLoad
@@ -132,34 +123,8 @@
 		})
 	}
 
-
-	const showAccount = ref(false)
 	let localAccountArr = []
 	const accountArr = ref([])
-	// watch(username, (newVal, oldVal) => {
-	// 	if (!newVal) {
-	// 		showAccount.value = false
-	// 		password.value = ''
-	// 		return
-	// 	}
-	// 	let arr = localAccountArr.filter(item => item.un == newVal)
-	// 	let arr1 = localAccountArr.filter(item => item.un.indexOf(newVal) != -1)
-	// 	if (arr1.length) {
-	// 		accountArr.value = arr1
-	// 		showAccount.value = true
-	// 	} else {
-	// 		showAccount.value = false
-	// 	}
-	// 	if (arr.length) {
-	// 		password.value = arr[0].pw
-	// 		showAccount.value = false
-	// 	}
-
-	// });
-	const chooseAccount = (item) => {
-		showAccount.value = false
-		username.value = item
-	}
 	onLoad(() => {
 		if (uni.getStorageSync('accountObj')) {
 			let obj = JSON.parse(uni.getStorageSync('accountObj'))
@@ -169,12 +134,6 @@
 		// localAccountArr = uni.getStorageSync('accountArr') ? JSON.parse(uni.getStorageSync('accountArr')) : []
 		// accountArr.value = localAccountArr
 	})
-	const closeShowAccount = (e) => {
-		if (e.target.id !== "account") {
-			showAccount.value = false
-		}
-	}
-
 	function getDeviceIp() {
 		// #ifdef APP-PLUS
 
diff --git a/pages/tab/index.vue b/pages/tab/index.vue
index 560ee99..23bb454 100644
--- a/pages/tab/index.vue
+++ b/pages/tab/index.vue
@@ -142,9 +142,11 @@
 		faguiApi,
 		cjzhiduApi,
 		zhiduApi,
-		getUserPermissionApi,
 		cxcDapingApi
 	} from '@/api/api.js';
+	import {
+		getUserPermissionApi
+	} from '@/api/login.js';
 	import customNav from '../../component/customNav.vue';
 	import {
 		useStore
diff --git a/pages/tab/my.vue b/pages/tab/my.vue
index e124c4f..ac92f71 100644
--- a/pages/tab/my.vue
+++ b/pages/tab/my.vue
@@ -87,9 +87,11 @@
 	} from 'vue';
 	import {
 		userProfileApi,
-		queryRoleApi,
 		taskListApi
 	} from '@/api/api.js';
+	import {
+		queryRoleApi
+	} from '@/api/login.js';
 	import {
 		onLoad,
 		onShow
diff --git a/pages/tab/office.vue b/pages/tab/office.vue
index e51ffb7..cfd9b0b 100644
--- a/pages/tab/office.vue
+++ b/pages/tab/office.vue
@@ -64,7 +64,7 @@
 	} from '@dcloudio/uni-app';
 	import {
 		getUserPermissionApi
-	} from '@/api/api.js';
+	} from '@/api/login.js';
 	import {
 		useStore
 	} from '@/store';
diff --git a/utils/index.js b/utils/index.js
index 1fdff48..cd95d19 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -11,7 +11,7 @@ import {
 } from '@/store';
 import {
 	getUserPermissionApi
-} from '@/api/api.js'
+} from '@/api/login.js'
 /**判断用户跳转前是否可以进入该页面*/
 export const beforeJump = (url, callback) => {
 	const store = useStore();