merge conflicts for v4.0.5

web/src/components/ChatPrompt.vue

@@ -57,6 +57,7 @@ export default defineComponent({
     if (!this.finalTokens) {
       httpPost("/api/chat/tokens", {text: this.content, model: this.model}).then(res => {
         this.finalTokens = res.data;
+      }).catch(() => {
       })
     }
   }

web/src/components/ConfigDialog.vue

@@ -25,10 +25,8 @@
 
 <script setup>
 import {computed, onMounted, ref} from "vue"
-import {httpGet, httpPost} from "@/utils/http";
+import {httpGet} from "@/utils/http";
 import {ElMessage} from "element-plus";
-import {Plus} from "@element-plus/icons-vue";
-import Compressor from "compressorjs";
 import {dateFormat} from "@/utils/libs";
 
 // eslint-disable-next-line no-undef

web/src/components/LoginDialog.vue

@@ -106,7 +106,7 @@
                         autocomplete="off">
                 <template #prefix>
                   <el-icon>
-                    <Iphone/>
+                    <Message/>
                   </el-icon>
                 </template>
               </el-input>

web/src/components/ResetPass.vue

@@ -9,17 +9,21 @@
     >
       <div class="form">
 
-        <el-form :model="form" label-width="120px" label-position="left">
+        <el-form :model="form" label-width="80px" label-position="left">
           <el-form-item label="用户名">
             <el-input v-model="form.username" placeholder="手机号/邮箱地址"/>
           </el-form-item>
           <el-form-item label="验证码">
+            <div class="code-box">
+              <el-input v-model="form.code" maxlength="6"/>
+              <send-msg size="" :receiver="form.username" style="margin-left: 10px; min-width: 100px"/>
+            </div>
             <el-row :gutter="20">
-              <el-col :span="16">
-                <el-input v-model="form.code" maxlength="6"/>
+              <el-col :span="12">
+
               </el-col>
-              <el-col :span="8">
-                <send-msg size="" :receiver="form.username"/>
+              <el-col :span="12" style="justify-content: right">
+
               </el-col>
             </el-row>
           </el-form-item>
@@ -97,9 +101,13 @@ const close = function () {
 <style lang="stylus">
 .reset-pass {
   .form {
-    padding 10px 40px
+    padding 10px 20px
+  }
+  .code-box {
+    display: flex;
+    justify-content: space-between;
+    width: 100%
   }
-
   .el-dialog__footer {
     text-align center
   }

web/src/components/SendMsg.vue

@@ -11,7 +11,7 @@
         style="width: 360px;"
     >
       <slide-captcha
-          v-if="isIphone()"
+          v-if="isMobile()"
           :bg-img="bgImg"
           :bk-img="bkImg"
           :result="result"
@@ -38,12 +38,13 @@
 import {ref} from "vue";
 import lodash from 'lodash'
 import {validateEmail, validateMobile} from "@/utils/validate";
-import {ElMessage} from "element-plus";
 import {httpGet, httpPost} from "@/utils/http";
 import CaptchaPlus from "@/components/CaptchaPlus.vue";
 import SlideCaptcha from "@/components/SlideCaptcha.vue";
-import {isIphone} from "@/utils/libs";
+import {isMobile} from "@/utils/libs";
+import {showMessageError, showMessageOK} from "@/utils/dialog";
 
+// eslint-disable-next-line no-undef
 const props = defineProps({
   receiver: String,
   size: String,
@@ -65,13 +66,13 @@ const handleRequestCaptCode = () => {
     thumbBase64.value = data.thumb
     captKey.value = data.key
   }).catch(e => {
-    ElMessage.error('获取人机验证数据失败：' + e.message)
+    showMessageError('获取人机验证数据失败：' + e.message)
   })
 }
 
 const handleConfirm = (dots) => {
   if (lodash.size(dots) <= 0) {
-    return ElMessage.error('请进行人机验证再操作')
+    return showMessageError('请进行人机验证再操作')
   }
 
   let dotArr = []
@@ -87,19 +88,19 @@ const handleConfirm = (dots) => {
     showCaptcha.value = false
     sendMsg()
   }).catch(() => {
-    ElMessage.error('人机验证失败')
+    showMessageError('人机验证失败')
     handleRequestCaptCode()
   })
 }
 
 const loadCaptcha = () => {
   if (!validateMobile(props.receiver) && !validateEmail(props.receiver)) {
-    return ElMessage.error("请输入合法的手机号/邮箱地址")
+    return showMessageError("请输入合法的手机号/邮箱地址")
   }
 
   showCaptcha.value = true
-  // iphone 手机用滑动验证码
-  if (isIphone()) {
+  // 手机用滑动验证码
+  if (isMobile()) {
     getSlideCaptcha()
   } else {
     handleRequestCaptCode()
@@ -113,7 +114,7 @@ const sendMsg = () => {
 
   canSend.value = false
   httpPost('/api/sms/code', {receiver: props.receiver, key: captKey.value, dots: dots.value}).then(() => {
-    ElMessage.success('验证码发送成功')
+    showMessageOK('验证码发送成功')
     let time = 120
     btnText.value = time
     const handler = setInterval(() => {
@@ -128,7 +129,7 @@ const sendMsg = () => {
     }, 1000)
   }).catch(e => {
     canSend.value = true
-    ElMessage.error('验证码发送失败：' + e.message)
+    showMessageError('验证码发送失败：' + e.message)
   })
 }
 
@@ -144,7 +145,7 @@ const getSlideCaptcha = () => {
     bgImg.value = res.data.bgImg
     captKey.value = res.data.key
   }).catch(e => {
-    ElMessage.error('获取人机验证数据失败：' + e.message)
+    showMessageError('获取人机验证数据失败：' + e.message)
   })
 }
 

web/src/components/admin/AdminHeader.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="header admin-header">
+  <div :class="'admin-header '+theme">
     <!-- 折叠按钮 -->
     <div class="collapse-btn" @click="collapseChange">
       <el-icon v-if="sidebar.collapse">
@@ -17,17 +17,15 @@
     </div>
     <div class="header-right">
       <div class="header-user-con">
-        <!-- 消息中心 -->
-        <div class="btn-bell">
-          <el-tooltip
-              effect="dark"
-              :content="message ? `有${message}条未读消息` : `消息中心`"
-              placement="bottom"
-          >
-            <i class="iconfont icon-bell"></i>
-          </el-tooltip>
-          <span class="btn-bell-badge" v-if="message"></span>
-        </div>
+        <!-- 切换主题 -->
+        <el-switch
+            style="margin-right: 10px"
+            v-model="dark"
+            inline-prompt
+            :active-action-icon="Moon"
+            :inactive-action-icon="Sunny"
+            @change="changeTheme"
+        />
         <!-- 用户名下拉菜单 -->
         <el-dropdown class="user-name" :hide-on-click="true" trigger="click">
 					<span class="el-dropdown-link">
@@ -38,20 +36,9 @@
 					</span>
           <template #dropdown>
             <el-dropdown-menu>
-
-              <a href="https://github.com/yangjian102621/chatgpt-plus" target="_blank">
-                <el-dropdown-item>
-                  <i class="iconfont icon-github"></i>
-                  <span>{{ sysTitle }}</span>
-                </el-dropdown-item>
-              </a>
               <el-dropdown-item>
                 <i class="iconfont icon-version"></i> 当前版本：{{ version }}
               </el-dropdown-item>
-              <el-dropdown-item @click="showDialog = true">
-                <i class="iconfont icon-reward"></i>
-                <span>打赏作者</span>
-              </el-dropdown-item>
               <el-dropdown-item divided @click="logout">
                 <i class="iconfont icon-logout"></i>
                 <span>退出登录</span>
@@ -62,41 +49,39 @@
       </div>
     </div>
 
-    <el-dialog
-        v-model="showDialog"
-        :show-close="true"
-        class="donate-dialog"
-        width="400px"
-        title="请作者喝杯咖啡"
-    >
-      <el-alert type="info" :closable="false">
-        <p>如果你觉得这个项目对你有帮助，并且情况允许的话，可以请作者喝杯咖啡，非常感谢你的支持～</p>
-      </el-alert>
-      <p>
-        <el-image :src="donateImg"/>
-      </p>
-    </el-dialog>
   </div>
 </template>
 <script setup>
-import {onMounted, ref} from 'vue';
+import {computed, onMounted, ref} from 'vue';
 import {getMenuItems, useSidebarStore} from '@/store/sidebar';
-import {useRouter} from 'vue-router';
-import {ArrowDown, ArrowRight, Expand, Fold} from "@element-plus/icons-vue";
+import {useRouter} from "vue-router";
+import {ArrowDown, ArrowRight, Expand, Fold, Moon, Sunny} from "@element-plus/icons-vue";
 import {httpGet} from "@/utils/http";
 import {ElMessage} from "element-plus";
 import {removeAdminToken} from "@/store/session";
 
-const message = ref(5);
-const sysTitle = ref(process.env.VUE_APP_TITLE)
 const version = ref(process.env.VUE_APP_VERSION)
 const avatar = ref('/images/user-info.jpg')
-const donateImg = ref('/images/wechat-pay.png')
-const showDialog = ref(false)
 const sidebar = useSidebarStore();
 const router = useRouter();
 const breadcrumb = ref([])
 
+// eslint-disable-next-line no-undef
+const props = defineProps({
+  theme: String,
+});
+
+const theme = computed(() => {
+  return props.theme
+})
+const dark = ref(props.theme === 'dark' ? true : false)
+
+
+// eslint-disable-next-line no-undef
+const emits = defineEmits(['changeTheme']);
+const changeTheme = () => {
+  emits('changeTheme', dark.value)
+}
 
 router.afterEach((to, from) => {
   initBreadCrumb(to.path)
@@ -166,7 +151,7 @@ const logout = function () {
 }
 </script>
 <style scoped lang="stylus">
-.header {
+.admin-header {
   position: relative;
   box-sizing: border-box;
   overflow hidden
@@ -174,7 +159,6 @@ const logout = function () {
   font-size: 22px;
   color: #303133;
   background-color #ffffff
-  border-bottom 1px solid #eaecef
 
   .collapse-btn {
     display: flex;

web/src/components/admin/AdminSidebar.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="sidebar">
-    <div class="logo">
+  <div :class="'sidebar '+theme">
+    <a class="logo" href="/" target="_blank">
       <el-image :src="logo"/>
       <span class="text" v-show="!sidebar.collapse">{{ title }}</span>
-    </div>
+    </a>
 
     <el-menu
         class="sidebar-el-menu"
@@ -54,9 +54,9 @@
 <script setup>
 import {computed, ref} from 'vue';
 import {setMenuItems, useSidebarStore} from '@/store/sidebar';
-import {useRoute} from 'vue-router';
 import {httpGet} from "@/utils/http";
 import {ElMessage} from "element-plus";
+import {useRoute} from "vue-router";
 
 const title = ref('Chat-Plus-Admin')
 const logo = ref('/images/logo.png')
@@ -69,6 +69,15 @@ httpGet('/api/admin/config/get?key=system').then(res => {
   ElMessage.error("加载系统配置失败: " + e.message)
 })
 
+// eslint-disable-next-line no-undef
+const props = defineProps({
+  theme: String,
+});
+
+const theme = computed(() => {
+  return props.theme
+})
+
 const items = [
   {
     icon: 'home',
@@ -190,6 +199,7 @@ setMenuItems(items)
     width 219px
     background-color #324157
     padding 6px 15px;
+    cursor pointer
 
     .el-image {
       width 36px;
@@ -234,4 +244,37 @@ setMenuItems(items)
   width: 0;
 }
 
+.sidebar.dark {
+  border-right 1px solid var(--el-border-color-dark)
+
+  .logo {
+    background var(--el-bg-color)
+    border-right 1px solid var(--el-border-color)
+
+    .text {
+      color var(--el-text-color-regular)
+    }
+  }
+
+  ul {
+    background var(--el-bg-color)
+
+    .el-menu-item.is-active {
+      background-color var(--el-menu-bg-color-dark)
+    }
+
+    .el-menu-item:hover {
+      background-color var(--el-menu-bg-color-darker)
+    }
+  }
+
+  .sidebar-el-menu:not(.el-menu--collapse) {
+    width: 250px;
+  }
+
+  .el-menu {
+    border-color var(--el-border-color)
+  }
+}
+
 </style>

web/src/components/admin/AdminTags.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tags" v-if="tags.show">
+  <div :class="'tags '+theme" v-if="tags.show">
     <ul>
       <li
           class="tags-li"
@@ -38,6 +38,16 @@ import {onBeforeRouteUpdate, useRoute, useRouter} from 'vue-router';
 import {ArrowDown, Close} from "@element-plus/icons-vue";
 import {checkAdminSession} from "@/action/session";
 import {ElMessageBox} from "element-plus";
+import {computed} from "vue";
+
+// eslint-disable-next-line no-undef
+const props = defineProps({
+  theme: String,
+});
+
+const theme = computed(() => {
+  return props.theme
+})
 
 const router = useRouter();
 checkAdminSession().catch(() => {
@@ -108,74 +118,75 @@ const handleTags = (command) => {
 // });
 </script>
 
-<style>
+<style scoped lang="stylus">
 .tags {
   position: relative;
   height: 30px;
   overflow: hidden;
   background: #fff;
-  padding-right: 120px;
+  padding 5px 120px 5px 10px
   -webkit-box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
   box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+
+  ul {
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+
+    .tags-li {
+      display: flex;
+      align-items: center;
+      float: left;
+      margin: 3px 5px 2px 3px;
+      border-radius: 3px;
+      font-size: 12px;
+      overflow: hidden;
+      cursor: pointer;
+      height: 23px;
+      border: 1px solid var(--el-border-color);
+      background: var(--el-bg-color);
+      padding: 0 5px 0 12px;
+      color: var(--el-text-color);
+      -webkit-transition: all 0.3s ease-in;
+      -moz-transition: all 0.3s ease-in;
+      transition: all 0.3s ease-in;
+
+      &:hover {
+        background: var(--el-menu-bg-color-dark);
+      }
+    }
+
+    .tags-li-title {
+      float: left;
+      max-width: 80px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-right: 5px;
+      color: #666;
+    }
+
+    .tags-li.active .tags-li-title {
+      color: var(--el-color-primary)
+    }
+  }
+
+  .tags-close-box {
+    position: absolute;
+    right: 0;
+    top: 7px;
+    box-sizing: border-box;
+    padding-top: 1px;
+    text-align: center;
+    width: 110px;
+    height: 30px;
+    background: var(--el-bg-color);
+    z-index: 10;
+  }
 }
 
-.tags ul {
-  box-sizing: border-box;
-  width: 100%;
-  height: 100%;
+.tags.dark {
+  border-bottom 1px solid var(--el-border-color)
 }
 
-.tags-li {
-  display: flex;
-  align-items: center;
-  float: left;
-  margin: 3px 5px 2px 3px;
-  border-radius: 3px;
-  font-size: 12px;
-  overflow: hidden;
-  cursor: pointer;
-  height: 23px;
-  border: 1px solid #e9eaec;
-  background: #fff;
-  padding: 0 5px 0 12px;
-  color: #666;
-  -webkit-transition: all 0.3s ease-in;
-  -moz-transition: all 0.3s ease-in;
-  transition: all 0.3s ease-in;
-}
-
-.tags-li:not(.active):hover {
-  background: #f8f8f8;
-}
-
-.tags-li.active {
-  color: #fff;
-}
-
-.tags-li-title {
-  float: left;
-  max-width: 80px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  margin-right: 5px;
-  color: #666;
-}
-
-.tags-li.active .tags-li-title {
-  color: #fff;
-}
-
-.tags-close-box {
-  position: absolute;
-  right: 0;
-  top: 2px;
-  box-sizing: border-box;
-  padding-top: 1px;
-  text-align: center;
-  width: 110px;
-  height: 30px;
-  background: #fff;
-//box-shadow: -3px 0 15px 3px rgba(0, 0, 0, 0.1); z-index: 10;
-}
 </style>

web/src/components/mobile/ChatPrompt.vue

@@ -16,6 +16,7 @@ import {onMounted, ref} from "vue";
 import Clipboard from "clipboard";
 import {showNotify} from "vant";
 
+// eslint-disable-next-line no-unused-vars,no-undef
 const props = defineProps({
   content: {
     type: String,