修复部分验证码问题

x_admin_app/.hbuilderx/launch.json

@@ -2,16 +2,14 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {
-    	"app-plus" : 
+            "app-plus" : {
-    	{
                 "launchtype" : "local"
             },
-    	"mp-weixin" : 
+            "mp-weixin" : {
-    	{
                 "launchtype" : "local"
             },
             "type" : "uniCloud"

x_admin_app/pages/index/index.vue

@@ -33,33 +33,12 @@
 	let text = ["Fota", "轻松管理"];
 
 
-	let baseList = [
+	let baseList = [{
-		// {
-		// 	icon: "/static/index/product.png",
-		// 	path: "/pages/product/product",
-		// 	title: "产品",
-		// },
-		// {
-		// 	icon: "/static/index/group.png",
-		// 	path: "/pages/group/group",
-		// 	title: "分组",
-		// },
-		// {
-		// 	icon: "/static/index/version.png",
-		// 	path: "/pages/version/version",
-		// 	title: "版本",
-		// },
-		{
 			icon: "/static/index/equipment.png",
 			path: "/pages/monitor_project/index",
 			title: "项目监控",
 		},
 
-		{
-			icon: "/static/index/equipment.png",
-			path: "/pages/equipment/equipment",
-			title: "设备管理",
-		},
 
 		{
 			icon: "scan",
@@ -83,26 +62,8 @@
 				});
 			},
 		},
-		{
+
-			icon: "/static/index/equipmentLog.png",
+
-			path: "/pages/statistics/statistics",
-			title: "销量统计",
-		},
-		// {
-		// 	icon: "/static/index/sysUp.png",
-		// 	path: "/pages/log/sysUp/sysUp",
-		// 	title: "上行日志",
-		// },
-		// {
-		// 	icon: "/static/index/sysDown.png",
-		// 	path: "/pages/log/sysDown/sysDown",
-		// 	title: "下行日志",
-		// },
-		// {
-		// 	icon: "/static/index/log.png",
-		// 	path: "/pages/log/sysLog/sysLog",
-		// 	title: "系统日志",
-		// },
 	];
 
 	function toList(item) {

x_admin_app/pages/login/login.vue

@@ -1,90 +1,54 @@
 <template>
 	<view>
-    <uv-form
+		<uv-form class="form" ref="form" labelWidth="60" labelAlign="right" :model="model" :rules="rules">
-      class="form"
-      ref="form"
-      labelWidth="60"
-      labelAlign="right"
-      :model="model"
-      :rules="rules"
-    >
 			<uv-form-item class="hide">
-        <uv-input
+				<uv-input class="hide" v-model="model.username" placeholder="请输入账号"
-          class="hide"
+					:rules="[{ required: true, message: '请填写账号' }]" />
-          v-model="model.username"
-          placeholder="请输入账号"
-          :rules="[{ required: true, message: '请填写账号' }]"
-        />
 			</uv-form-item>
 			<uv-form-item class="hide">
-        <uv-input
+				<uv-input type="password" v-model="model.password" placeholder="请输入密码"
-          type="password"
+					:rules="[{ required: true, message: '请填写密码' }]" />
-          v-model="model.password"
-          placeholder="请输入密码"
-          :rules="[{ required: true, message: '请填写密码' }]"
-        />
 			</uv-form-item>
 			<uv-form-item label="账号" name="username" prop="username">
-        <uv-input
+				<uv-input v-model="model.username" placeholder="请输入账号"
-          v-model="model.username"
+					:rules="[{ required: true, message: '请填写账号' }]" />
-          placeholder="请输入账号"
-          :rules="[{ required: true, message: '请填写账号' }]"
-        />
 			</uv-form-item>
 			<uv-form-item label="密码" name="password" prop="password">
-        <uv-input
+				<uv-input type="password" v-model="model.password" placeholder="请输入密码"
-          type="password"
+					:rules="[{ required: true, message: '请填写密码' }]" />
-          v-model="model.password"
-          placeholder="请输入密码"
-          :rules="[{ required: true, message: '请填写密码' }]"
-        />
 			</uv-form-item>
 
-        <Verify
+			<Verify :mode="'pop'" :captchaType="'blockPuzzle'" ref="verifyRef"
-          @success="VerifySuccess"
+				:imgSize="{ width: '310px', height: '155px' }" @success="VerifySuccess"></Verify>
-          :mode="'pop'"
-          :captchaType="'blockPuzzle'"
-          ref="verifyRef"
-          :imgSize="{ width: '310px', height: '155px' }"
-        ></Verify>
- 
 
 			<view class="footer">
 				<!--  -->
 
-        <wd-button class="btn" size="large" @click="VerifyShow" block
+				<wd-button class="btn" size="large" @click="VerifyShow" block>登录</wd-button>
-          >VerifyShow</wd-button
-        >
-
-        <wd-button class="btn" size="large" @click="handleSubmit" block
-          >登录</wd-button
-        >
 			</view>
 		</uv-form>
 	</view>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive } from "vue";
+	import { ref, reactive } from "vue";
-import { v1 as uuid_v1 } from "uuid";
 
-import Verify from "@/components/verifition/verify";
+	import Verify from "@/components/verify/verify.vue";
 
-import { login } from "@/api/user.js";
+	import { login } from "@/api/user.js";
-import { setLocalStorage } from "@/utils/storage.js";
+	import { setLocalStorage } from "@/utils/storage.js";
-import { toast } from "@/utils/utils.js";
+	import { alert } from "@/utils/utils.js";
-// import appicon from "@/static/appicon.png";
+	// import appicon from "@/static/appicon.png";
 
-import { useUserStore } from "@/stores/user";
+	import { useUserStore } from "@/stores/user";
 
-const userStore = useUserStore();
+	const userStore = useUserStore();
 
-
+	const model = reactive({
-const model = reactive({
 		username: "",
 		password: "",
-});
+	});
-const rules = {
+	const rules = {
 		username: [
 			{
 				required: true,
@@ -99,19 +63,18 @@ const rules = {
 				trigger: ["blur", "change"],
 			},
 		],
+	};
+	const form = ref();
+	const verifyRef = ref();
+	function VerifyShow(e) {
+		verifyRef.value.show();
+	}
+	function VerifySuccess(e) {
+		console.log("VerifySuccess", e);
 
-};
+		handleSubmit(e);
-const form = ref();
+	}
-const verifyRef=ref()
+	function handleSubmit(verify) {
-function VerifyShow(e) {
-  verifyRef.value.show()
-}
-function VerifySuccess(e) {
-  console.log('VerifySuccess',e);
-  
-  handleSubmit(e)
-}
-function handleSubmit(verify) {
 		form.value
 			.validate()
 			.then((res) => {
@@ -119,7 +82,7 @@ function handleSubmit(verify) {
 					username: model.username,
 					password: model.password,
 
-        ...verify
+					...verify,
 				};
 
 				// userStore.getUser();
@@ -135,30 +98,29 @@ function handleSubmit(verify) {
 								});
 							});
 						} else {
-  
+							alert(res.message);
-            toast(res.message);
 						}
 					})
 					.catch((err) => {
-          toast(err.message);
+						alert(err.message);
 					});
 			})
 			.catch((err) => {
-      toast(err.message);
+				alert(err.message);
 			});
-}
+	}
 </script>
 
 <style lang="scss" scoped>
-.hide {
+	.hide {
 		height: 0 !important;
 		padding: 0 !important;
 
 		border: 0 !important;
 		overflow: hidden !important;
-}
+	}
 
-.form {
+	.form {
 		margin: 200rpx 20rpx;
 
 		.captchaImage {
@@ -172,5 +134,5 @@ function handleSubmit(verify) {
 				background-color: #00b294;
 			}
 		}
-}
+	}
 </style>