774078984@qq.com пре 3 месеци
родитељ
комит
0027fc4b9f

+ 1 - 1
src/components/Layout/components/layout/components/HongKong.vue

@@ -5,7 +5,7 @@
             <div class="logo-layout">
                 <div class="logo">
                     <img src="@/assets/images/logo.jpg" style="height: 26px; width: 26px;" />
-                    <h3 v-if="!menuSecondLongShow" style="margin-left: 10px;"> Easy life</h3>
+                    <h3 v-if="!menuSecondLongShow" style="margin-left: 10px;">FlexiStream</h3>
                 </div>
             </div>
 

+ 2 - 4
src/views/customer/NewCustomerForm.vue

@@ -323,13 +323,12 @@ const rules = {
 
 
 const handleSubmit = () => {
-  if (activeKey.value != 5 && !props.editData?.id) {
-    Message.error('请继续填写下一步骤')
-  } else {
     formRef.value.validate(async (values, errors) => {
       if (!errors) {
         if (formData.value.password) {
           formData.value.password = encryptByDES(formData.value.password);
+        }else{
+          formData.value.password = ''; // 若不修改密码,则置空
         }
         formData.value.amountWarn = Number(formData.value.amountWarn);
         formData.value.warnPhone = String(formData.value.warnPhone);
@@ -350,7 +349,6 @@ const handleSubmit = () => {
 
       }
     });
-  }
 };
 
 const handleCancel = () => {

+ 1 - 7
src/views/login/components/HongKong/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <div class="logo">
-      <div class="logo-text">Easy life Platform</div>
+      <div class="logo-text">FlexiStream</div>
     </div>
     <div class="content">
       <div class="content-inner">
@@ -16,12 +16,6 @@
 import { onMounted } from "vue"
 import LoginForm from '../../components/HongKong/login-form.vue'
 
-import bannerImage from '@/assets/images/login-banner.png'
-const carouselItem = {
-  slogan: 'Easy life Platform',
-  subSlogan: 'Technology serves life',
-  image: bannerImage,
-}
 </script>
 
 <style scoped lang="less">

+ 0 - 1
src/views/login/index.vue

@@ -7,7 +7,6 @@
 import LoginHongKeng from './components/HongKong/index.vue'
 import Thailand from './components/Thailand/index.vue'
 import { EnvTypeNum } from '@/settings/designSetting'
-console.log(EnvTypeNum);
 </script>
 
 <style scoped lang='less'>

+ 0 - 156
src/views/login/login-form.vue

@@ -1,156 +0,0 @@
-<template>
-  <div class="login-form-wrapper">
-    <div class="login-form-title">Easy life</div>
-    <div class="login-form-sub-title">Login to Easy life</div>
-
-    <a-form ref="loginForm" :model="formData" class="login-form" @submit-success="handleSubmit">
-      <a-form-item field="username" :rules="[{ required: true, message: '用户名不能为空' }]"
-        :validate-trigger="['change', 'blur']" hide-label>
-        <a-input v-model="formData.username" :placeholder="$t('login.userName')">
-          <template #prefix>
-            <icon-user />
-          </template>
-        </a-input>
-      </a-form-item>
-      <a-form-item field="password" :rules="[{ required: true, message: '密码不能为空' }]"
-        :validate-trigger="['change', 'blur']" hide-label>
-        <a-input-password v-model="formData.password" :placeholder="$t('login.password')" allow-clear>
-          <template #prefix>
-            <icon-lock />
-          </template>
-        </a-input-password>
-      </a-form-item>
-
-
-      <a-space :size="16" direction="vertical">
-        <div class="login-form-password-actions">
-          <a-checkbox v-model="rememberPassword">
-            {{ $t('login.RememberAccountNumber') }}
-          </a-checkbox>
-          <!-- <a-link>忘记密码</a-link> -->
-        </div>
-        <a-button type="primary" html-type="submit" long :loading="formLoading">{{ $t('login.disembark') }}</a-button>
-      </a-space>
-    </a-form>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, toRefs, onMounted } from 'vue'
-import { encryptByDES } from "@/utils"
-import { loginApi } from "@/api/path/login.api"
-import { useSystemStore } from "@/store/modules/systemStore"
-import { useRouter } from 'vue-router'
-import { updateRouteByMenu } from '@/router/router.update'
-import { FormLoginUser } from '@/store/modules/Login'
-import {useI18n} from 'vue-i18n'
-const {t} = useI18n();
-const router = useRouter()
-const systemStore = useSystemStore()
-const LoginSet = FormLoginUser()
-const state = ref({
-  formData: {
-    username: '',
-    password: ''
-  },
-  formLoading: false,
-  rememberPassword: false,
-})
-
-const { formData, formLoading, rememberPassword } = toRefs(state.value)
-
-const handleSubmit = async () => {
-  const { data } = await loginApi({
-    username: formData.value.username,
-    password: encryptByDES(formData.value.password)
-  })
-
-  if (rememberPassword.value) {
-    LoginSet.loginYester(formData.value)
-  } else {
-    const nste = localStorage.getItem("USER_KEY_ACCOUT") || false;
-    if (nste) {
-      localStorage.removeItem('USER_KEY_ACCOUT')
-    }
-  }
-
-  systemStore.setStateValue({
-    key: 'token',
-    value: data.token,
-    localStorage: true,
-  })
-  systemStore.setStateValue({
-    key: 'user_login_information',
-    value: JSON.stringify(data.userInfo ? data.userInfo : data),
-    localStorage: true,
-  })
-  systemStore.setStateValue({
-    key: 'role',
-    value: data.userType,
-    localStorage: true,
-  })
-  await updateRouteByMenu(router, systemStore)
-
-  const settingLayout = localStorage.getItem('LayoutDisposition') || false
-  if(!settingLayout) {
-    const item = {
-      crumbs:false,
-      BreadcrumbIcon:false,
-      SidebarLogo:false,
-      HeadNavigationBar:false,
-      laoutStyle:1
-    }
-    localStorage.setItem('LayoutDisposition',JSON.stringify(item))
-  }
-
-  router.push({
-    path: "/",
-  })
-}
-
-onMounted(() => {
-  if (LoginSet.loadCredentials()) {
-    formData.value.username = LoginSet.loadCredentials()?.username
-    formData.value.password = LoginSet.loadCredentials()?.password
-  }
-})
-
-
-</script>
-
-<style lang="less" scoped>
-.login-form-wrapper {
-  margin: 0 1rem;
-}
-
-.login-form {
-  margin-top: 32px;
-
-  &-wrapper {
-    width: 320px;
-  }
-
-  &-title {
-    color: @text_color_1;
-    font-weight: 500;
-    font-size: 24px;
-    line-height: 32px;
-  }
-
-  &-sub-title {
-    color: @text_color_2;
-    font-size: 16px;
-    line-height: 24px;
-  }
-
-  &-password-actions {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 15px;
-  }
-
-  &-register-btn {
-    color: @text_color_3 !important;
-  }
-}
-</style>