Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

sc
10 changed files with 66 additions and 125 deletions
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -1,15 +0,0 @@
-{
-  "recommendations": [
-    "voorjaar.windicss-intellisense",
-    "vscode-icons-team.vscode-icons",
-    "davidanson.vscode-markdownlint",
-    "stylelint.vscode-stylelint",
-    "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode",
-    "vue.volar",
-    "lokalise.i18n-ally",
-    "mikestead.dotenv",
-    "eamodio.gitlens",
-    "antfu.iconify"
-  ]
-}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -1,16 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "msedge",
-      "request": "launch",
-      "name": "Launch Edge against localhost",
-      "url": "http://localhost",
-      "webRoot": "${workspaceFolder}/src",
-      "sourceMaps": true
-    }
-  ]
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,54 +0,0 @@
-{
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "prettier.enable": true,
-  "editor.formatOnType": true,
-  "editor.formatOnSave": true,
-  "editor.formatOnPaste": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  },
-  "[vue]": {
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
-  },
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[typescript]": {
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[jsonc]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[html]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[css]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[scss]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "i18n-ally.localesPaths": ["src/locales"],
-  "i18n-ally.keystyle": "nested",
-  "i18n-ally.sortKeys": true,
-  "i18n-ally.namespace": true,
-  "i18n-ally.enabledParsers": ["ts"],
-  "i18n-ally.sourceLanguage": "en",
-  "i18n-ally.displayLanguage": "zh-CN",
-  "i18n-ally.enabledFrameworks": ["vue", "react"],
-  "god.tsconfig": "./tsconfig.json",
-  "vue-i18n.i18nPaths": "src/locales",
-  "explorer.fileNesting.enabled": true,
-  "explorer.fileNesting.expand": false,
-  "explorer.fileNesting.patterns": {
-    "*.ts": "$(capture).test.ts, $(capture).test.tsx",
-    "*.tsx": "$(capture).test.ts, $(capture).test.tsx",
-    "*.env": "$(capture).env.*",
-    "CHANGELOG.md": "CHANGELOG*",
-    "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc,vite.config.*,windi.*,tailwind.*,tsconfig.*,postcss*",
-    ".eslintrc.js": ".eslintignore,.eslintrc-*,.prettierignore,.stylelintignore,.commitlintrc.js,.prettierrc.js,.stylelint*,stylelint*,prettier.*,.editorconfig"
-  }
-}
--- a/src/assets/imgs/login2.gif
+++ b/src/assets/imgs/login2.gif
--- a/src/assets/imgs/shisong.jpg
+++ b/src/assets/imgs/shisong.jpg
--- a/src/views/Home/CloseRate.vue
+++ b/src/views/Home/CloseRate.vue
@ -25,7 +25,7 @@
        <el-table-column type="index" width="50" fixed="left" />
        <el-table-column prop="nickname" label="姓名" width="80" fixed="left" />
        <el-table-column
-          v-for="(item, index) in new Date().getMonth() + 1"
+          v-for="(item, index) in 12"
          :key="index"
          :label="item + '月'"
          sortable
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@ -116,7 +116,13 @@
            <el-table-column type="index" width="40" />
            <el-table-column prop="username" label="姓名" width="80" />
            <el-table-column prop="followNum" label="成交数量" width="90" sortable />
-            <el-table-column prop="signPrice" label="成交额" min-width="90" sortable />
+            <el-table-column
+              v-if="appStore.getAppInfo?.instanceType != 1"
+              prop="signPrice"
+              label="成交额"
+              min-width="90"
+              sortable
+            />
            <el-table-column prop="deptName" label="所属组织" width="150" />
          </el-table>
        </el-skeleton>
--- a/src/views/Home/SalesReport.vue
+++ b/src/views/Home/SalesReport.vue
@ -174,10 +174,10 @@ const searchForm = ref({})

 function handleReset() {
  const year = new Date().getFullYear()
-  const month = new Date().getMonth() + 1
+  const month = new Date().getMonth() + 1 + ''
  searchForm.value = {
    nickname: undefined,
-    consultTime: [`${year}-${month}-01`, formatDate(new Date())],
+    consultTime: [`${year}-${month.padStart(2, '0')}-01`, formatDate(new Date())],
    licenseTypeList: [],
    sourceId: undefined
  }
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@ -1,17 +1,35 @@
 <template>
  <div
    :class="prefixCls"
-    class="h-[100%] relative <xl:bg-v-dark <sm:px-10px <xl:px-10px <md:px-10px"
+    class="h-[100%] relative dark:bg-v-dark <sm:px-10px <xl:px-10px <md:px-10px"
  >
    <div class="relative h-full flex mx-auto">
-      <div
-        :class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px <xl:hidden`"
-      >
+      <div :class="`${prefixCls}__left w-[30%] <lg:w-[100%] left-box relative p-30px <xl:p-20px`">
        <!-- 左上角的 logo + 系统标题 -->
-        <div class="flex items-center relative text-white">
-          <img alt="" class="w-48px h-48px mr-10px" :src="appInfo.instanceIcon" />
-          <span class="text-20px font-bold">{{ underlineToHump(appInfo.instanceName) }}</span>
+        <div class="flex items-center relative">
+          <h2 class="mb-3 text-2xl font-bold">
+            欢迎使用 {{ underlineToHump(appInfo.instanceName) }}
+          </h2>
+          <!-- <img alt="" class="w-48px h-48px mr-10px" :src="appInfo.instanceIcon" /> -->
+          <!-- <span class="text-20px font-bold">{{ underlineToHump(appInfo.instanceName) }}</span> -->
        </div>
+        <!-- 右边的登录界面 -->
+        <Transition appear enter-active-class="animate__animated animate__bounceInRight">
+          <div
+            class="flex items-center m-auto w-[100%] @2xl:max-w-500px @xl:max-w-500px @md:max-w-500px @lg:max-w-500px <xl:mt-20px"
+          >
+            <!-- 账号登录 -->
+            <LoginForm class="p-40px <xl:p-10px h-auto m-auto" />
+            <!-- 手机登录 -->
+            <!-- <MobileForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
+            <!-- 二维码登录 -->
+            <!-- <QrCodeForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
+            <!-- 注册 -->
+            <!-- <RegisterForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
+            <!-- 三方登录 -->
+            <!-- <SSOLoginVue class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
+          </div>
+        </Transition>
        <!-- 左边的背景图 + 欢迎语 -->
        <div class="flex justify-center">
          <TransitionGroup
@ -19,8 +37,8 @@
            enter-active-class="animate__animated animate__bounceInLeft"
            tag="div"
          >
-            <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
-            <!-- <div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div> -->
+            <!-- <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" /> -->
+            <img key="1" alt="" class="w-[50%] m-auto" src="@/assets/imgs/login2.gif" />
          </TransitionGroup>
        </div>

@ -30,35 +48,21 @@
          </transition-group>
        </div>
      </div>
-      <div class="flex-1 p-30px <sm:p-10px dark:bg-v-dark relative">
+      <div class="login-box flex-1 p-30px <sm:p-10px dark:bg-v-dark <lg:hidden relative">
        <!-- 右上角的主题、语言选择 -->
        <div class="flex justify-between items-center text-white @2xl:justify-end @xl:justify-end">
          <div class="flex items-center @2xl:hidden @xl:hidden">
-            <img alt="" class="w-48px h-48px mr-10px" :src="appInfo.instanceIcon" />
-            <span class="text-20px font-bold">{{ underlineToHump(appInfo.instanceName) }}</span>
+            <!-- <img alt="" class="w-48px h-48px mr-10px" :src="appInfo.instanceIcon" /> -->
+            <!-- <span class="text-20px font-bold text-black">
+              欢迎使用 {{ underlineToHump(appInfo.instanceName) }}
+            </span> -->
          </div>
          <div class="flex justify-end items-center space-x-10px">
            <ThemeSwitch />
            <!-- <LocaleDropdown class="<xl:text-white dark:text-white" /> -->
          </div>
        </div>
-        <!-- 右边的登录界面 -->
-        <Transition appear enter-active-class="animate__animated animate__bounceInRight">
-          <div
-            class="h-full flex items-center m-auto w-[100%] @2xl:max-w-500px @xl:max-w-500px @md:max-w-500px @lg:max-w-500px"
-          >
-            <!-- 账号登录 -->
-            <LoginForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" />
-            <!-- 手机登录 -->
-            <!-- <MobileForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
-            <!-- 二维码登录 -->
-            <!-- <QrCodeForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
-            <!-- 注册 -->
-            <!-- <RegisterForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
-            <!-- 三方登录 -->
-            <!-- <SSOLoginVue class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
-          </div>
-        </Transition>
+        <img src="@/assets/imgs/shisong.jpg" width="80%" alt="" srcset="" />
      </div>
    </div>
  </div>
@ -96,7 +100,7 @@ const chars = computed(() => {
  return text.slice(0, currentCharIndex.value)
 })

-async function init() {
+function init() {
  const res = currentRoute.value?.query?.tenantId
  authUtil.setTenantId(res)

@ -137,7 +141,7 @@ $prefix-cls: #{$namespace}-login;
      z-index: -1;
      width: 100%;
      height: 100%;
-      background-image: url('@/assets/svgs/login-bg.svg');
+      // background-image: url('@/assets/svgs/login-bg.svg');
      background-position: center;
      background-repeat: no-repeat;
      content: '';
@ -145,6 +149,20 @@ $prefix-cls: #{$namespace}-login;
  }
 }

+// .left-box {
+//   background: #f3f4fb;
+//   background-image: url('@/assets/imgs/login-left-bg.png');
+//   background-repeat: no-repeat;
+//   background-size: 100% 100%;
+// }
+
+.login-box {
+  background-image: url('@/assets/imgs/shisong.jpg');
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: 80% 80%;
+}
+
 .text-animation-enter-active,
 .text-animation-leave-active {
  transition: opacity 0.5s;
@ -160,12 +178,11 @@ $prefix-cls: #{$namespace}-login;
  width: 80%;
  display: flex;
  flex-wrap: wrap;
-  font-size: 18px;
-  line-height: 1.8;
+  font-size: 1rem;
+  line-height: 1.3;
  font-family: Lora, serif;
  white-space: pre;
  font-weight: 600;
-  color: #6ee1f5;

  span {
    animation: landIn 0.8s ease-out both;
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@ -11,10 +11,13 @@
  >
    <el-row style="margin-left: -10px; margin-right: -10px">
      <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
+        <slot name="title"></slot>
+      </el-col>
+      <!-- <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
        <el-form-item>
          <LoginFormTitle style="width: 100%" />
        </el-form-item>
-      </el-col>
+      </el-col> -->
      <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantId">
          <el-input
@ -107,7 +110,7 @@
 </template>
 <script name="LoginForm" setup>
 import { ElLoading } from 'element-plus'
-import LoginFormTitle from './LoginFormTitle.vue'
+// import LoginFormTitle from './LoginFormTitle.vue'

 import { useIcon } from '@/hooks/web/useIcon'
Author	SHA1	Message	Date
caolin	b3435a9a86	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	3 months ago
qsh	2eac9d0fc9	sc	3 months ago
qsh	f7924d7cb1	sc	3 months ago
qsh	6ac19b825e	sc	3 months ago