Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

src/views/Login.vue

@@ -10,8 +10,8 @@
   <div class="backdrop-layer">
     <div class="head">
       <div class="logo"></div>
-      <div class="title">飞鸟智慧巡园平台
-
+      <div class="title">
+        飞鸟智慧果园管理平台
       </div>
     </div>
     <div class="ve_container">
@@ -27,10 +27,10 @@
               :inline="false"
               @keyup.enter="onSubmit"
           >
-            <el-form-item prop="phone">
+            <el-form-item prop="userName">
               <el-input
                   size="large"
-                  v-model.trim="phone"
+                  v-model.trim="userName"
                   placeholder="用户名"
               >
                 <template #prepend>
@@ -38,11 +38,12 @@
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item prop="code">
+            <el-form-item prop="pwd">
               <el-input
                   size="large"
-                  v-model.trim="code"
-                  placeholder="验证码"
+                  type="password"
+                  v-model.trim="pwd"
+                  placeholder="密码"
               >
                 <template #prepend>
                   <el-icon :size="20"><Key /></el-icon>
@@ -75,24 +76,25 @@ import { ref, reactive, toRefs } from "vue";
 import { useStore } from "vuex";
 import { useRouter } from "vue-router";
 
-const rules = {
-  phone: [{ required: true, message: "请输入用户名", trigger: "blur" }]
-};
-
 // const rules = {
 //   phone: [{ required: true, message: "请输入用户名", trigger: "blur" }]
-//   ,
-//   code: [{ required: true, message: "请输入验证码", trigger: "blur" }
-//   ],
 // };
 
+const rules = {
+  userName: [{ required: true, message: "请输入用户名", trigger: "blur" }]
+  ,
+  pwd: [{ required: true, message: "请输入验证码", trigger: "blur" }
+  ],
+};
+
 const store = useStore();
 const router = useRouter();
 const form = reactive({
-  "code": "",
-  "phone": "13797066447"
+  "pwd": "",
+  // "phone": "13797066447"
+  "userName": "13797066447"
 });
-const { phone, code } = toRefs(form);
+const { userName, pwd } = toRefs(form);
 const ref_form = ref(null);
 const success = ref(false);
 sessionStorage.clear();
@@ -101,26 +103,25 @@ router.options.isAddDynamicMenuRoutes = false;
 
 
 const onSubmit = () => {
-    ref_form.value.validate(async (valid) => {
-        if (valid) {
-            const res = await VE_API.system.phoneLogin(form);
-            if (res.code == 0) {
-                const { token, userName, djiCloudToken } = res.data;
-                store.commit(`app/${SET_TOKEN}`, token);
-                store.commit(`app/djiCloudToken`, djiCloudToken);
-                store.commit(`app/${SET_UNAME}`, userName);
-                res.data["token"] = undefined
-                res.data["x-auth-token"] = undefined
-                res.data["pwd"] = undefined
-                store.commit(`app/${SET_USER_INFO}`, JSON.stringify(res.data));
-                success.value = true;
-                // router.push({ name: "Home" });
-                router.push({ name: "warningHome" });
-            }
-        } else {
-            return;
-        }
-    });
+  ref_form.value.validate(async (valid) => {
+    if (valid) {
+      const res = await VE_API.system.login(form);
+      if (res.code == 0) {
+        const { token, userName, djiCloudToken } = res.data;
+        store.commit(`app/${SET_TOKEN}`, token);
+        store.commit(`app/djiCloudToken`, djiCloudToken);
+        store.commit(`app/${SET_UNAME}`, userName);
+        res.data["token"] = undefined
+        res.data["x-auth-token"] = undefined
+        res.data["pwd"] = undefined
+        store.commit(`app/${SET_USER_INFO}`, JSON.stringify(res.data));
+        success.value = true;
+        router.push({ name: "warningHome" });
+      }
+    } else {
+      return;
+    }
+  });
 };
 </script>