feat: 代码合并

src/views/login/index.vue

@@ -15,17 +15,23 @@
           <el-radio-button :value="1">员工</el-radio-button>
         </el-radio-group>
       </el-form-item>
+<<<<<<< HEAD
       <el-form-item prop="staffUserName" v-if="state.loginForm.loginType == 1">
         <el-input
           v-model="state.loginForm.staffUserName"
+=======
+      <el-form-item prop="username">
+        <el-input
+          v-model="state.loginForm.username"
+>>>>>>> aeae74d89449789e68381f821001d74d4bfe1b2c
           type="text"
           auto-complete="off"
           placeholder="商户号"
         ></el-input>
       </el-form-item>
-      <el-form-item prop="username">
+      <el-form-item prop="staffUserName" v-if="state.loginForm.loginType == 1">
         <el-input
-          v-model="state.loginForm.username"
+          v-model="state.loginForm.staffUserName"
           type="text"
           auto-complete="off"
           placeholder="账号"
@@ -101,15 +107,26 @@ const state = reactive({
     loginType: 0,
   },
   loginRules: {
-    username: [{ required: true, trigger: "blur", message: "用户名不能为空" }],
+    username: [{ required: true, trigger: "blur", message: "商户号不能为空" }],
     password: [{ required: true, trigger: "blur", message: "密码不能为空" }],
     code: [{ required: true, trigger: "change", message: "验证码不能为空" }],
-    staffUserName: [{ required: true, trigger: "change", message: "商户号不能为空" }],
+    staffUserName: [{ required: true, trigger: "change", message: "用户名不能为空" }],
   },
   loading: false,
   redirect: undefined,
 });
 
+watch(
+  () => state.loginForm.loginType,
+  (newval) => {
+    if (1) {
+      delete state.loginForm.staffUserName;
+    } else {
+      state.loginForm.staffUserName = "";
+    }
+  }
+);
+
 onMounted(() => {
   // 获取验证码
   getCode();
@@ -144,7 +161,6 @@ function getCookie() {
     password: password,
     rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
     code: "",
-    staffUserName: "",
     loginType: 0,
   };
 }