ソースを参照

feat(records): change

gemercheung 1 年間 前
コミット
cc7583ac59
4 ファイル変更36 行追加20 行削除
  1. 6 2
      src/view/login.vue
  2. 6 3
      src/view/register/register.vue
  3. 13 4
      src/view/register/reset.vue
  4. 11 11
      vite.config.ts

+ 6 - 2
src/view/login.vue

@@ -79,10 +79,10 @@
             </el-form>
           </template>
           <template v-if="currentStatus(1)">
-            <register></register>
+            <register @done="goTologin"></register>
           </template>
           <template v-if="currentStatus(2)">
-            <reset></reset>
+            <reset @done="goTologin"></reset>
           </template>
         </div>
       </div>
@@ -188,6 +188,10 @@ const handleForgetPassword = () => {
 const handleRegister = () => {
   registerStatus.value = 1
 }
+// 业务回到login
+const goTologin = () => {
+  registerStatus.value = 0
+}
 
 
 </script>

+ 6 - 3
src/view/register/register.vue

@@ -88,12 +88,11 @@ import { OrganizationTypeDesc } from '@/store/organization';
 import { View, Hide } from '@element-plus/icons-vue';
 import { registerOrganization } from '@/request/organization';
 // import { encodePwd } from "@/util";
-
 import {
     getMsgAuthCode,
 } from "@/request";
 
-
+const emit = defineEmits(['done'])
 const baseFormRef = ref<FormInstance>();
 const addPassFlag = ref(false) //图标显示标识
 const addPassFlag1 = ref(false) //图标显示标识
@@ -106,6 +105,8 @@ let checkCodeBtn = reactive<any>({
     timer: null
 })
 
+
+
 const equalToPassword = (_, value: any, callback: any) => {
     if (form.password !== value) {
         callback(new Error("两次输入的密码不一致"));
@@ -113,6 +114,8 @@ const equalToPassword = (_, value: any, callback: any) => {
         callback();
     }
 };
+
+
 const rules = reactive<FormRules>({
     orgName: [
         { required: true, message: "请选择单位名称", trigger: "select" },
@@ -143,7 +146,6 @@ const form = reactive({
     orgName: "",
     type: "",
     userName: "",
-    // userName: "",
     password: "",
     contact: "",
     confirmPwd: "",
@@ -187,6 +189,7 @@ const submitClick = async () => {
         if (res) {
             const result = await registerOrganization(form)
             console.log('result', result)
+            emit('done')
             // ElMessage.success('新增成功!');
         }
     } else {

+ 13 - 4
src/view/register/reset.vue

@@ -51,7 +51,7 @@
             </el-form-item>
 
             <el-form-item class="panel-form-item">
-                <el-button type="primary" class="fill submit" @click="submitClick">注册</el-button>
+                <el-button type="primary" class="fill submit" @click="submitClick">确定</el-button>
             </el-form-item>
 
         </el-form>
@@ -59,16 +59,20 @@
 </template>
 <script lang="ts" setup>
 import { reactive, ref, unref } from 'vue'
+import {
+    changePassword,
+} from "@/request";
 import { ElMessage, type FormInstance, type FormRules } from "element-plus";
 // import { OrganizationTypeDesc } from '@/store/organization';
 import { View, Hide } from '@element-plus/icons-vue';
-import { registerOrganization } from '@/request/organization';
+// import { registerOrganization } from '@/request/organization';
 // import { encodePwd } from "@/util";
 
 import {
     getMsgAuthCode,
 } from "@/request";
 
+const emit =defineEmits(['done'])
 
 const baseFormRef = ref<FormInstance>();
 const addPassFlag = ref(false) //图标显示标识
@@ -161,9 +165,14 @@ const submitClick = async () => {
     if (unref(baseFormRef)) {
         const res = await unref(baseFormRef)?.validate();
         if (res) {
-            const result = await registerOrganization(form)
+            console.log('form', form)
+            const result = await changePassword({
+                ...form,
+                phoneNum: form.userName
+            });
             console.log('result', result)
-            // ElMessage.success('新增成功!');
+            ElMessage.success('重置密码成功!');
+            emit('done')
         }
     } else {
         throw "";

+ 11 - 11
vite.config.ts

@@ -29,22 +29,22 @@ export default ({ mode }: any) =>
       port: 5173,
       open: true,
       proxy: {
-        "/api": {
-          target: "http://192.168.0.11:8324",
-          changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/api/, ""),
-        },
+        // "/api": {
+        //   target: "http://192.168.0.11:8324",
+        //   changeOrigin: true,
+        //   rewrite: (path) => path.replace(/^\/api/, ""),
+        // },
         "/gear1": {
           target: `http://devimages.apple.com/iphone/samples/bipbop`,
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/gear1/, "/gear1"),
         },
-        // "/api": {
-        //   target: loadEnv(mode, process.cwd()).VITE_API,
-        //   // target: `http://192.168.0.11:8324/relics/`,
-        //   changeOrigin: true,
-        //   rewrite: (path) => path.replace(/^\/api/, "/api"),
-        // },
+        "/api": {
+          target: loadEnv(mode, process.cwd()).VITE_API,
+          // target: `http://192.168.0.11:8324/relics/`,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/api/, "/api"),
+        },
         // "/api": {
         //   target: `https://uat-sp.4dkankan.com/`,
         //   // target: `http://192.168.0.11:8324/relics/`,