ZaiZai 2 лет назад
Родитель
Сommit
feb1b2e488

+ 0 - 81
src/styles/error/app-auth.scss

@@ -72,84 +72,3 @@ html.theme-dark {
         }
     }
 }
-
-html.dark {
-    .hc-body-loading {
-        color-scheme: light;
-        --el-color-white: #ffffff;
-        --el-color-black: #000000;
-        --el-color-success: #67c23a;
-        --el-color-success-light-3: #95d475;
-        --el-color-success-light-5: #b3e19d;
-        --el-color-success-light-7: #d1edc4;
-        --el-color-success-light-8: #e1f3d8;
-        --el-color-success-light-9: #f0f9eb;
-        --el-color-success-dark-2: #529b2e;
-        --el-color-warning: #e6a23c;
-        --el-color-warning-light-3: #eebe77;
-        --el-color-warning-light-5: #f3d19e;
-        --el-color-warning-light-7: #f8e3c5;
-        --el-color-warning-light-8: #faecd8;
-        --el-color-warning-light-9: #fdf6ec;
-        --el-color-warning-dark-2: #b88230;
-        --el-color-danger: #f56c6c;
-        --el-color-danger-light-3: #f89898;
-        --el-color-danger-light-5: #fab6b6;
-        --el-color-danger-light-7: #fcd3d3;
-        --el-color-danger-light-8: #fde2e2;
-        --el-color-danger-light-9: #fef0f0;
-        --el-color-danger-dark-2: #c45656;
-        --el-color-error: #f56c6c;
-        --el-color-error-light-3: #f89898;
-        --el-color-error-light-5: #fab6b6;
-        --el-color-error-light-7: #fcd3d3;
-        --el-color-error-light-8: #fde2e2;
-        --el-color-error-light-9: #fef0f0;
-        --el-color-error-dark-2: #c45656;
-        --el-color-info: #909399;
-        --el-color-info-light-3: #b1b3b8;
-        --el-color-info-light-5: #c8c9cc;
-        --el-color-info-light-7: #dedfe0;
-        --el-color-info-light-8: #e9e9eb;
-        --el-color-info-light-9: #f4f4f5;
-        --el-color-info-dark-2: #73767a;
-        --el-bg-color: #ffffff;
-        --el-bg-color-page: #f2f3f5;
-        --el-bg-color-overlay: #ffffff;
-        --el-text-color-primary: #303133;
-        --el-text-color-regular: #606266;
-        --el-text-color-secondary: #909399;
-        --el-text-color-placeholder: #a8abb2;
-        --el-text-color-disabled: #c0c4cc;
-        --el-border-color: #dcdfe6;
-        --el-border-color-light: #e4e7ed;
-        --el-border-color-lighter: #ebeef5;
-        --el-border-color-extra-light: #f2f6fc;
-        --el-border-color-dark: #d4d7de;
-        --el-border-color-darker: #cdd0d6;
-        --el-fill-color: #f0f2f5;
-        --el-fill-color-light: #f5f7fa;
-        --el-fill-color-lighter: #fafafa;
-        --el-fill-color-extra-light: #fafcff;
-        --el-fill-color-dark: #ebedf0;
-        --el-fill-color-darker: #e6e8eb;
-        --el-fill-color-blank: #ffffff;
-        --el-box-shadow: 0px 12px 32px 4px rgba(0, 0, 0, 0.04),0px 8px 20px rgba(0, 0, 0, 0.08);
-        --el-box-shadow-light: 0px 0px 12px rgba(0, 0, 0, 0.12);
-        --el-box-shadow-lighter: 0px 0px 6px rgba(0, 0, 0, 0.12);
-        --el-box-shadow-dark: 0px 16px 48px 16px rgba(0, 0, 0, 0.08),0px 12px 32px rgba(0, 0, 0, 0.12),0px 8px 16px -8px rgba(0, 0, 0, 0.16);
-        --el-disabled-bg-color: var(--el-fill-color-light);
-        --el-disabled-text-color: var(--el-text-color-placeholder);
-        --el-disabled-border-color: var(--el-border-color-light);
-        --el-overlay-color: rgba(0, 0, 0, 0.8);
-        --el-overlay-color-light: rgba(0, 0, 0, 0.7);
-        --el-overlay-color-lighter: rgba(0, 0, 0, 0.5);
-        --el-mask-color: rgba(255, 255, 255, 0.9);
-        --el-mask-color-extra-light: rgba(255, 255, 255, 0.3);
-        --el-border-width: 1px;
-        --el-border-style: solid;
-        --el-border-color-hover: var(--el-text-color-disabled);
-        --el-border: var(--el-border-width) var(--el-border-style) var(--el-border-color);
-        --el-svg-monochrome-grey: var(--el-border-color);
-    }
-}

+ 0 - 83
src/styles/uni-app/table-form.scss

@@ -34,86 +34,3 @@
         width: 100% !important;
     }
 }
-
-
-html.dark {
-    .hc-uni-app-table-form {
-        color-scheme: light;
-        --el-color-white: #ffffff;
-        --el-color-black: #000000;
-        --el-color-success: #67c23a;
-        --el-color-success-light-3: #95d475;
-        --el-color-success-light-5: #b3e19d;
-        --el-color-success-light-7: #d1edc4;
-        --el-color-success-light-8: #e1f3d8;
-        --el-color-success-light-9: #f0f9eb;
-        --el-color-success-dark-2: #529b2e;
-        --el-color-warning: #e6a23c;
-        --el-color-warning-light-3: #eebe77;
-        --el-color-warning-light-5: #f3d19e;
-        --el-color-warning-light-7: #f8e3c5;
-        --el-color-warning-light-8: #faecd8;
-        --el-color-warning-light-9: #fdf6ec;
-        --el-color-warning-dark-2: #b88230;
-        --el-color-danger: #f56c6c;
-        --el-color-danger-light-3: #f89898;
-        --el-color-danger-light-5: #fab6b6;
-        --el-color-danger-light-7: #fcd3d3;
-        --el-color-danger-light-8: #fde2e2;
-        --el-color-danger-light-9: #fef0f0;
-        --el-color-danger-dark-2: #c45656;
-        --el-color-error: #f56c6c;
-        --el-color-error-light-3: #f89898;
-        --el-color-error-light-5: #fab6b6;
-        --el-color-error-light-7: #fcd3d3;
-        --el-color-error-light-8: #fde2e2;
-        --el-color-error-light-9: #fef0f0;
-        --el-color-error-dark-2: #c45656;
-        --el-color-info: #909399;
-        --el-color-info-light-3: #b1b3b8;
-        --el-color-info-light-5: #c8c9cc;
-        --el-color-info-light-7: #dedfe0;
-        --el-color-info-light-8: #e9e9eb;
-        --el-color-info-light-9: #f4f4f5;
-        --el-color-info-dark-2: #73767a;
-        --el-bg-color: #ffffff;
-        --el-bg-color-page: #f2f3f5;
-        --el-bg-color-overlay: #ffffff;
-        --el-text-color-primary: #303133;
-        --el-text-color-regular: #606266;
-        --el-text-color-secondary: #909399;
-        --el-text-color-placeholder: #a8abb2;
-        --el-text-color-disabled: #c0c4cc;
-        --el-border-color: #dcdfe6;
-        --el-border-color-light: #e4e7ed;
-        --el-border-color-lighter: #ebeef5;
-        --el-border-color-extra-light: #f2f6fc;
-        --el-border-color-dark: #d4d7de;
-        --el-border-color-darker: #cdd0d6;
-        --el-fill-color: #f0f2f5;
-        --el-fill-color-light: #f5f7fa;
-        --el-fill-color-lighter: #fafafa;
-        --el-fill-color-extra-light: #fafcff;
-        --el-fill-color-dark: #ebedf0;
-        --el-fill-color-darker: #e6e8eb;
-        --el-fill-color-blank: #ffffff;
-        --el-box-shadow: 0px 12px 32px 4px rgba(0, 0, 0, 0.04),0px 8px 20px rgba(0, 0, 0, 0.08);
-        --el-box-shadow-light: 0px 0px 12px rgba(0, 0, 0, 0.12);
-        --el-box-shadow-lighter: 0px 0px 6px rgba(0, 0, 0, 0.12);
-        --el-box-shadow-dark: 0px 16px 48px 16px rgba(0, 0, 0, 0.08),0px 12px 32px rgba(0, 0, 0, 0.12),0px 8px 16px -8px rgba(0, 0, 0, 0.16);
-        --el-disabled-bg-color: var(--el-fill-color-light);
-        --el-disabled-text-color: var(--el-text-color-placeholder);
-        --el-disabled-border-color: var(--el-border-color-light);
-        --el-overlay-color: rgba(0, 0, 0, 0.8);
-        --el-overlay-color-light: rgba(0, 0, 0, 0.7);
-        --el-overlay-color-lighter: rgba(0, 0, 0, 0.5);
-        --el-mask-color: rgba(255, 255, 255, 0.9);
-        --el-mask-color-extra-light: rgba(255, 255, 255, 0.3);
-        --el-border-width: 1px;
-        --el-border-style: solid;
-        --el-border-color-hover: var(--el-text-color-disabled);
-        --el-border: var(--el-border-width) var(--el-border-style) var(--el-border-color);
-        --el-svg-monochrome-grey: var(--el-border-color);
-    }
-}
-

+ 4 - 0
src/views/login/auth.vue

@@ -47,6 +47,10 @@ const useAppLoginApi = async (form) => {
     loading.value = true
     const { error, status } = await useAppLogin(form)
     if (!error && status === 200) {
+        //设置主题
+        useAppState.setTheme('light')
+        useAppState.setThemeVal('light')
+        //处理其他数据
         const { url, node } = useRoutes.query
         if (!isNullES(url)) {
             router.push({

+ 65 - 57
src/views/login/index.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="login-body">
-        <a class="left-logo" href="http://hczc.hcxxy.com/" target="_blank" v-if="appLogoIcon">
-            <img alt="" id="logo-icon" :src="appLogoIcon">
-            <img alt="" id="logo-name" :src="appLogoName">
+        <a v-if="appLogoIcon" class="left-logo" href="http://hczc.hcxxy.com/" target="_blank">
+            <img id="logo-icon" alt="" :src="appLogoIcon">
+            <img id="logo-name" alt="" :src="appLogoName">
         </a>
         <div class="left-pic-container">
             <Suspense>
-                <HcPicVue/>
+                <HcPicVue />
                 <template #fallback>
                     Loading...
                 </template>
@@ -17,70 +17,78 @@
             <div class="sign-list">
                 <h1 class="font-lg">登录</h1>
                 <div class="title-tab">
-                    <div :class="account?'active':''" @click="accountClick">密码登录</div>
-                    <div :class="account?'':'active'" @click="accountClick">游客登录</div>
+                    <div :class="account ? 'active' : ''" @click="accountClick">密码登录</div>
+                    <div :class="account ? '' : 'active'" @click="accountClick">游客登录</div>
                 </div>
                 <div v-if="account" class="form-box mt-4">
-                    <el-form ref="formRef" :model="formValue" :rules="formRules" label-position="left" label-width="0px"
-                             size="large">
+                    <el-form
+                        ref="formRef" :model="formValue" :rules="formRules" label-position="left" label-width="0px"
+                        size="large"
+                    >
                         <el-form-item prop="username">
-                            <el-input v-model="formValue.username" clearable placeholder="账号"/>
+                            <el-input v-model="formValue.username" clearable placeholder="账号" />
                         </el-form-item>
                         <el-form-item class="mt-8" prop="password">
-                            <el-input v-model="formValue.password" clearable placeholder="密码" show-password
-                                      type="password" @keyup="passwordKeyUp">
+                            <el-input
+                                v-model="formValue.password" clearable placeholder="密码" show-password
+                                type="password" @keyup="passwordKeyUp"
+                            >
                                 <template #suffix>
                                     <span class="clickable-text" @click="clickableClick">忘记密码</span>
                                 </template>
                             </el-input>
                         </el-form-item>
-                        <el-form-item prop="tenantId" v-if="tenantMode">
-                            <el-input v-model="formValue.tenantId" clearable placeholder="租户ID"/>
+                        <el-form-item v-if="tenantMode" prop="tenantId">
+                            <el-input v-model="formValue.tenantId" clearable placeholder="租户ID" />
                         </el-form-item>
                         <el-form-item>
-                            <el-checkbox v-model="checkbox" label="记住密码"/>
+                            <el-checkbox v-model="checkbox" label="记住密码" />
                         </el-form-item>
                         <el-form-item class="mt-8">
-                            <el-button :loading="loading" block type="primary" @click="formValidateClick">登 录
+                            <el-button :loading="loading" block type="primary" @click="formValidateClick">
+                                登 录
                             </el-button>
                         </el-form-item>
                     </el-form>
                 </div>
 
                 <div v-else class="form-box mt-4">
-                    <el-form ref="touristsRef" :model="touristsForm" :rules="touristsRules" label-position="left"
-                             label-width="auto" size="large">
+                    <el-form
+                        ref="touristsRef" :model="touristsForm" :rules="touristsRules" label-position="left"
+                        label-width="auto" size="large"
+                    >
                         <el-form-item prop="phone">
-                            <el-input v-model="touristsForm.phone" clearable placeholder="请输入手机号"/>
+                            <el-input v-model="touristsForm.phone" clearable placeholder="请输入手机号" />
                         </el-form-item>
                         <el-form-item class="mt-8">
-                            <el-button :loading="loading" block type="primary" @click="touristsValidateClick">登 录
+                            <el-button :loading="loading" block type="primary" @click="touristsValidateClick">
+                                登 录
                             </el-button>
                         </el-form-item>
                     </el-form>
                 </div>
             </div>
         </div>
-        <!--预先加载首页背景图-->
+        <!-- 预先加载首页背景图 -->
         <Suspense>
-            <HcHomeBg/>
+            <HcHomeBg />
         </Suspense>
     </div>
 </template>
 
 <script setup>
-import {ref, onMounted, nextTick} from "vue";
-import router from '~src/router/index';
-import {useAppStore} from "~src/store";
-import {useAppLogin} from "~sto/user";
-import {getTenantID} from "~api/user";
-import config from "~src/config/index";
-import {getTopUrl, setAppName} from "~uti/tools";
+import { nextTick, onMounted, ref } from 'vue'
+import router from '~src/router/index'
+import { useAppStore } from '~src/store'
+import { useAppLogin } from '~sto/user'
+import { getTenantID } from '~api/user'
+import config from '~src/config/index'
+import { getTopUrl, setAppName } from '~uti/tools'
 import HcPicVue from './components/pic.vue'
 import HcHomeBg from './components/home-bg.vue'
-import logoIcon from "~src/assets/logo/icon.png";
-import logoName from "~src/assets/logo/name.png";
-import {formValidate, getObjVal, setImageColorStyle} from "js-fast-way"
+import logoIcon from '~src/assets/logo/icon.png'
+import logoName from '~src/assets/logo/name.png'
+import { formValidate, getObjVal, setImageColorStyle } from 'js-fast-way'
 
 const userStore = useAppStore()
 userStore.clearStoreData() //先清理下缓存
@@ -94,7 +102,7 @@ const account = ref(true)
 const tenantMode = ref(true)
 
 const accountClick = () => {
-    account.value = !account.value;
+    account.value = !account.value
 }
 
 onMounted(() => {
@@ -108,38 +116,38 @@ const setAppImageColor = () => {
 }
 
 //表单
-const formRef = ref(null);
+const formRef = ref(null)
 const checkbox = ref(false)
-const formValue = ref({tenantId: "000000", username: '', password: '', type: "account"})
+const formValue = ref({ tenantId: '000000', username: '', password: '', type: 'account' })
 const formRules = {
     tenantId: {
         required: true,
-        message: "请输入租户ID",
-        trigger: "blur"
+        message: '请输入租户ID',
+        trigger: 'blur',
     },
     username: {
         required: true,
-        message: "请输入账号",
-        trigger: "blur"
+        message: '请输入账号',
+        trigger: 'blur',
     },
     password: {
         required: true,
-        message: "请输入密码",
-        trigger: "blur"
-    }
+        message: '请输入密码',
+        trigger: 'blur',
+    },
 }
 const passwordKeyUp = (e) => {
-    if (e.key === "Enter") {
+    if (e.key === 'Enter') {
         formValidateClick()
     }
 }
 
 //获取租户id
 const getTenantIdApi = async () => {
-    const {error, code, data} = await getTenantID(getTopUrl())
+    const { error, code, data } = await getTenantID(getTopUrl())
     const res = getObjVal(data)
     if (!error && code === 200 && res) {
-        const {tenantAvatar, tenantAvatarText, tenantTitle, tenantId} = res
+        const { tenantAvatar, tenantAvatarText, tenantTitle, tenantId } = res
         tenantMode.value = false
         //设置标题
         userStore.setTitle(tenantTitle)
@@ -173,8 +181,8 @@ const getTenantIdApi = async () => {
         userStore.setLogoName(logoName)
 
         //设置租户ID
-        formValue.value.tenantId = "000000"
-        userStore.setTenantId("000000")
+        formValue.value.tenantId = '000000'
+        userStore.setTenantId('000000')
     }
     nextTick(() => {
         setAppImageColor()
@@ -186,26 +194,26 @@ const loading = ref(false)
 const formValidateClick = async () => {
     const formRes = await formValidate(formRef.value)
     if (formRes) {
-        loading.value = true;
+        loading.value = true
         useAppLogin(formValue.value).then(() => {
-            loading.value = false;
-            window?.$message?.success('登录成功');
-            router.push({path: '/home/index'});
+            loading.value = false
+            window?.$message?.success('登录成功')
+            router.push({ path: '/home/index' })
         }).catch(() => {
-            loading.value = false;
+            loading.value = false
         })
     }
 }
 
 //游客登录
-const touristsRef = ref(null);
-const touristsForm = ref({phone: ''});
+const touristsRef = ref(null)
+const touristsForm = ref({ phone: '' })
 const touristsRules = {
     phone: {
         required: true,
-        message: "请输入手机号",
-        trigger: "blur"
-    }
+        message: '请输入手机号',
+        trigger: 'blur',
+    },
 }
 const touristsValidateClick = async () => {
     const formRes = await formValidate(touristsRef.value)
@@ -219,7 +227,7 @@ const clickableClick = () => {
     const val = '<div style="font-size: 16px;">忘记密码请不要紧张,联系您项目上的专属客服人员电话 <span style="color:#1ECC95;">18423665354</span> ,提供身份证明信息即可初始化密码,建议初始化之后由您单独去更改密码</div>'
     window?.$messageBox?.alert(val, '联系项目客服', {
         confirmButtonText: '确定',
-        dangerouslyUseHTMLString: true
+        dangerouslyUseHTMLString: true,
     })
 }
 </script>

+ 6 - 0
src/views/uni-app/table-form.vue

@@ -8,11 +8,13 @@
 import { onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import wbsApi from '~api/data-fill/wbs'
+import { useAppStore } from '~src/store'
 import { getObjVal, getObjValue, isString } from 'js-fast-way'
 
 //初始变量
 const useRoutes = useRoute()
 const appItem = useRoutes.query
+const useAppState = useAppStore()
 
 //基础变量
 const tableFormRef = ref(null)
@@ -21,6 +23,10 @@ const loading = ref(false)
 
 //渲染完成
 onMounted(() => {
+    //设置主题
+    useAppState.setTheme('light')
+    useAppState.setThemeVal('light')
+    //获取相关数据
     getWbsContractById()
     getDataApi()
     editTypeClick('form')