feat: check if the user's chat quota is gt than current chat model required before starting a conversation

2025-11-04 08:13:43 +08:00 · 2023-11-09 16:56:44 +08:00
parent ef87487f60
commit df367e0d47
16 changed files with 200 additions and 208 deletions
--- a/web/src/components/ConfigDialog.vue
+++ b/web/src/components/ConfigDialog.vue
@@ -5,55 +5,30 @@
      :close-on-click-modal="true"
      :before-close="close"
      style="max-width: 600px"
-      title="用户设置"
+      title="账户信息"
  >
    <div class="user-info" id="user-info">
-      <el-form v-if="form.id" :model="form" label-width="150px">
+      <el-form v-if="user.id" :model="user" label-width="150px">
        <el-form-item label="账户">
-          <span>{{ form.mobile }}</span>
-        </el-form-item>
-        <el-form-item label="头像">
-          <el-upload
-              class="avatar-uploader"
-              :auto-upload="true"
-              :show-file-list="false"
-              :http-request="afterRead"
-          >
-            <el-avatar v-if="form.avatar" :src="form.avatar" shape="square" :size="100"/>
-            <el-icon v-else class="avatar-uploader-icon">
-              <Plus/>
-            </el-icon>
-          </el-upload>
+          <span>{{ user.mobile }}</span>
        </el-form-item>
        <el-form-item label="剩余对话次数">
-          <el-tag>{{ form['calls'] }}</el-tag>
+          <el-tag>{{ user['calls'] }}</el-tag>
        </el-form-item>
        <el-form-item label="剩余绘图次数">
-          <el-tag>{{ form['img_calls'] }}</el-tag>
+          <el-tag>{{ user['img_calls'] }}</el-tag>
        </el-form-item>
-        <el-form-item label="累计消耗 Tokens">
-          <el-tag type="info">{{ form['total_tokens'] }}</el-tag>
+        <el-form-item label="本月消耗电量">
+          <el-tag type="info">{{ user['tokens'] }}</el-tag>
        </el-form-item>
-        <el-form-item label="OpenAI API KEY">
-          <el-input v-model="form.chat_config['api_keys']['OpenAI']"/>
+        <el-form-item label="累计消耗电量">
+          <el-tag type="info">{{ user['total_tokens'] }}</el-tag>
        </el-form-item>
-        <el-form-item label="Azure API KEY">
-          <el-input v-model="form['chat_config']['api_keys']['Azure']"/>
-        </el-form-item>
-        <el-form-item label="ChatGLM API KEY">
-          <el-input v-model="form['chat_config']['api_keys']['ChatGLM']"/>
+        <el-form-item label="会员到期时间" v-if="user['expired_time']  > 0">
+          <el-tag type="danger">{{ dateFormat(user['expired_time']) }}</el-tag>
        </el-form-item>
      </el-form>
    </div>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="close">关闭</el-button>
-        <el-button type="primary" @click="save">
-          保存
-        </el-button>
-      </span>
-    </template>
  </el-dialog>
 </template>

@@ -63,6 +38,7 @@ import {httpGet, httpPost} 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
 const props = defineProps({
@@ -74,7 +50,7 @@ const props = defineProps({
 const showDialog = computed(() => {
  return props.show
 })
-const form = ref({
+const user = ref({
  username: '',
  nickname: '',
  avatar: '',
@@ -87,50 +63,15 @@ const form = ref({
 onMounted(() => {
  // 获取最新用户信息
  httpGet('/api/user/profile').then(res => {
-    form.value = res.data
-    form.value.chat_config.api_keys = res.data.chat_config.api_keys ?? {OpenAI: "", Azure: "", ChatGLM: ""}
+    user.value = res.data
+    user.value.chat_config.api_keys = res.data.chat_config.api_keys ?? {OpenAI: "", Azure: "", ChatGLM: ""}
  }).catch(e => {
    ElMessage.error("获取用户信息失败：" + e.message)
  });
 })

-const afterRead = (file) => {
-  // console.log(file)
-  // 压缩图片并上传
-  new Compressor(file.file, {
-    quality: 0.6,
-    success(result) {
-      const formData = new FormData();
-      formData.append('file', result, result.name);
-      // 执行上传操作
-      httpPost('/api/upload', formData).then((res) => {
-        form.value.avatar = res.data
-        ElMessage.success({message: "上传成功", duration: 500})
-      }).catch((e) => {
-        ElMessage.error('上传失败:' + e.message)
-      })
-    },
-    error(err) {
-      console.log(err.message);
-    },
-  });
-};
-
 // eslint-disable-next-line no-undef
-const emits = defineEmits(['hide', 'update-user']);
-const save = function () {
-  httpPost('/api/user/profile/update', form.value).then(() => {
-    ElMessage.success({
-      message: '更新成功',
-      duration: 500,
-      onClose: () => emits('hide', false)
-    })
-    // 更新用户数据
-    emits('update-user', {nickname: form.value['nickname'], avatar: form.value['avatar']});
-  }).catch((e) => {
-    ElMessage.error('更新失败：' + e.message)
-  })
-}
+const emits = defineEmits(['hide']);
 const close = function () {
  emits('hide', false);
 }
--- a/web/src/components/LoginDialog.vue
+++ b/web/src/components/LoginDialog.vue
@@ -9,7 +9,7 @@
      title="用户登录"
  >
    <div class="form">
-      <el-form label-width="65px">
+      <el-form label-width="75px">
        <el-form-item>
          <template #label>
            <div class="label">
@@ -20,7 +20,7 @@
            </div>
          </template>
          <template #default>
-            <el-input v-model="username" placeholder="手机号码"/>
+            <el-input v-model="username" size="large" placeholder="手机号码"/>
          </template>
        </el-form-item>
        <el-form-item>
@@ -33,12 +33,12 @@
            </div>
          </template>
          <template #default>
-            <el-input v-model="password" type="password" placeholder="密码"/>
+            <el-input v-model="password" type="password" size="large" placeholder="密码"/>
          </template>
        </el-form-item>

        <div class="login-btn">
-          <el-button type="primary" @click="submit" round>登录</el-button>
+          <el-button type="primary" @click="submit" size="large" round>登录</el-button>
        </div>
      </el-form>
    </div>
@@ -90,9 +90,17 @@ const close = function () {
  border-radius 20px

  .label {
+    padding-top 3px
+
    .el-icon {
-      font-size 16px
+      position relative
+      font-size 20px
      margin-right 6px
+      top 4px
+    }
+
+    span {
+      font-size 16px
    }
  }

--- a/web/src/components/UserProfile.vue
+++ b/web/src/components/UserProfile.vue
@@ -32,6 +32,20 @@
      <el-form-item label="会员到期时间" v-if="user['expired_time']  > 0">
        <el-tag type="danger">{{ dateFormat(user['expired_time']) }}</el-tag>
      </el-form-item>
+
+      <el-form-item label="OpenAI API KEY">
+        <el-input v-model="user.chat_config['api_keys']['OpenAI']"/>
+      </el-form-item>
+      <el-form-item label="Azure API KEY">
+        <el-input v-model="user['chat_config']['api_keys']['Azure']"/>
+      </el-form-item>
+      <el-form-item label="ChatGLM API KEY">
+        <el-input v-model="user['chat_config']['api_keys']['ChatGLM']"/>
+      </el-form-item>
+
+      <el-row class="opt-line">
+        <el-button color="#47fff1" :dark="false" round @click="save">保存</el-button>
+      </el-row>
    </el-form>
  </div>
 </template>
@@ -43,6 +57,7 @@ import {ElMessage} from "element-plus";
 import {Plus} from "@element-plus/icons-vue";
 import Compressor from "compressorjs";
 import {dateFormat} from "@/utils/libs";
+import {checkSession} from "@/action/session";

 const user = ref({
  username: '',
@@ -55,13 +70,17 @@ const user = ref({
 })

 onMounted(() => {
-  // 获取最新用户信息
-  httpGet('/api/user/profile').then(res => {
-    user.value = res.data
-    user.value.chat_config.api_keys = res.data.chat_config.api_keys ?? {OpenAI: "", Azure: "", ChatGLM: ""}
+  checkSession().then(() => {
+    // 获取最新用户信息
+    httpGet('/api/user/profile').then(res => {
+      user.value = res.data
+      user.value.chat_config.api_keys = res.data.chat_config.api_keys ?? {OpenAI: "", Azure: "", ChatGLM: ""}
+    }).catch(e => {
+      ElMessage.error("获取用户信息失败：" + e.message)
+    });
  }).catch(e => {
-    ElMessage.error("获取用户信息失败：" + e.message)
-  });
+    console.log(e)
+  })
 })

 const afterRead = (file) => {
@@ -74,14 +93,7 @@ const afterRead = (file) => {
      // 执行上传操作
      httpPost('/api/upload', formData).then((res) => {
        user.value.avatar = res.data
-        httpPost('/api/user/profile/update', user.value).then(() => {
-          ElMessage.success({
-            message: '更新成功',
-            duration: 500,
-          })
-        }).catch((e) => {
-          ElMessage.error('更新失败：' + e.message)
-        })
+        ElMessage.success({message: "上传成功", duration: 500})
      }).catch((e) => {
        ElMessage.error('图片上传失败:' + e.message)
      })
@@ -91,6 +103,14 @@ const afterRead = (file) => {
    },
  });
 };
+
+const save = () => {
+  httpPost('/api/user/profile/update', user.value).then(() => {
+    ElMessage.success({message: '更新成功', duration: 500})
+  }).catch((e) => {
+    ElMessage.error('更新失败：' + e.message)
+  })
+}
 </script>

 <style lang="stylus" scoped>
@@ -101,5 +121,13 @@ const afterRead = (file) => {
    justify-content center
    margin-bottom 10px
  }
+
+  .opt-line {
+    padding-top 20px
+
+    .el-button {
+      width 100%
+    }
+  }
 }
 </style>
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -32,7 +32,7 @@ import {
    TextEllipsis,
    Uploader
 } from "vant";
-import router from "@/router";
+import {router} from "@/router";
 import 'v3-waterfall/dist/style.css'
 import V3waterfall from "v3-waterfall";

--- a/web/src/router.js
+++ b/web/src/router.js
@@ -226,12 +226,14 @@ const router = createRouter({
    routes: routes,
 })

+let prevRoute = null
 // dynamic change the title when router change
 router.beforeEach((to, from, next) => {
    if (to.meta.title) {
        document.title = `${to.meta.title} | ${process.env.VUE_APP_TITLE}`
    }
+    prevRoute = from
    next()
 })

-export default router;
+export {router, prevRoute};
--- a/web/src/views/ChatApps.vue
+++ b/web/src/views/ChatApps.vue
@@ -40,7 +40,7 @@
 </template>

 <script setup>
-import {nextTick, onMounted, ref} from "vue"
+import {onMounted, ref} from "vue"
 import {ElMessage} from "element-plus";
 import {httpGet, httpPost} from "@/utils/http";
 import ItemList from "@/components/ItemList.vue";
@@ -48,7 +48,6 @@ import {Delete, Plus} from "@element-plus/icons-vue";
 import LoginDialog from "@/components/LoginDialog.vue";
 import {checkSession} from "@/action/session";
 import {arrayContains, removeArrayItem, substr} from "@/utils/libs";
-import router from "@/router";

 const listBoxHeight = window.innerHeight - 97
 const list = ref([])
@@ -71,8 +70,8 @@ onMounted(() => {
 })

 const getRoles = () => {
+  showLoginDialog.value = false
  checkSession().then(user => {
-    showLoginDialog.value = false
    roles.value = user.chat_roles
  }).catch(() => {
  })
--- a/web/src/views/ChatPlus.vue
+++ b/web/src/views/ChatPlus.vue
@@ -52,33 +52,7 @@
                  <el-icon>
                    <Tools/>
                  </el-icon>
-                  <span>聊天设置</span>
-                </el-dropdown-item>
-
-                <el-dropdown-item @click="showPasswordDialog=true">
-                  <i class="iconfont icon-password"></i>
-                  <span>修改密码</span>
-                </el-dropdown-item>
-
-                <el-dropdown-item @click="showBindMobileDialog = true">
-                  <el-icon>
-                    <Iphone/>
-                  </el-icon>
-                  <span>绑定手机号</span>
-                </el-dropdown-item>
-
-                <el-dropdown-item @click="showRewardDialog = true" v-if="enableReward">
-                  <el-icon>
-                    <Present/>
-                  </el-icon>
-                  <span>加入众筹</span>
-                </el-dropdown-item>
-
-                <el-dropdown-item @click="showRewardVerifyDialog = true" v-if="enableReward">
-                  <el-icon>
-                    <Checked/>
-                  </el-icon>
-                  <span>众筹核销</span>
+                  <span>账户信息</span>
                </el-dropdown-item>

                <el-dropdown-item @click="clearAllChats">
@@ -222,30 +196,6 @@

    <config-dialog v-if="isLogin" :show="showConfigDialog" :models="models" @hide="showConfigDialog = false"
                   @update-user="updateUser"/>
-    <password-dialog v-if="isLogin" :show="showPasswordDialog" @hide="showPasswordDialog = false"
-                     @logout="logout"/>
-
-    <bind-mobile v-if="isLogin" :show="showBindMobileDialog" :mobile="loginUser.mobile"
-                 @hide="showBindMobileDialog = false"/>
-
-    <reward-verify v-if="isLogin" :show="showRewardVerifyDialog" @hide="showRewardVerifyDialog = false"/>
-
-    <el-dialog
-        v-model="showRewardDialog"
-        :show-close="true"
-        width="400px"
-        title="参与众筹"
-    >
-      <el-alert type="info" :closable="false">
-        <div style="font-size: 14px">您好，众筹 9.9元，就可以兑换 100 次对话，以此来覆盖我们的 OpenAI
-          账单和服务器的费用。<strong
-              style="color: #f56c6c">由于本人没有开通微信支付，付款后请凭借转账单号进入核销【众筹核销】菜单手动核销。</strong>
-        </div>
-      </el-alert>
-      <div style="text-align: center;padding-top: 10px;">
-        <el-image v-if="enableReward" :src="rewardImg"/>
-      </div>
-    </el-dialog>
  </div>


@@ -257,13 +207,10 @@ import ChatReply from "@/components/ChatReply.vue";
 import {
  ArrowDown,
  Check,
-  Checked,
  Close,
  Delete,
  Edit,
-  Iphone,
  Plus,
-  Present,
  Promotion,
  RefreshRight,
  Search,
@@ -279,16 +226,11 @@ import {httpGet, httpPost} from "@/utils/http";
 import {useRouter} from "vue-router";
 import Clipboard from "clipboard";
 import ConfigDialog from "@/components/ConfigDialog.vue";
-import PasswordDialog from "@/components/PasswordDialog.vue";
 import {checkSession} from "@/action/session";
-import BindMobile from "@/components/BindMobile.vue";
-import RewardVerify from "@/components/RewardVerify.vue";
 import Welcome from "@/components/Welcome.vue";
 import ChatMidJourney from "@/components/ChatMidJourney.vue";

 const title = ref('ChatGPT-智能助手');
-const enableReward = ref(false) // 是否启用众筹功能
-const rewardImg = ref('/images/reward.png')
 const models = ref([])
 const modelID = ref(0)
 const chatData = ref([]);
@@ -305,10 +247,6 @@ const roleId = ref(0)
 const newChatItem = ref(null);
 const router = useRouter();
 const showConfigDialog = ref(false);
-const showPasswordDialog = ref(false);
-const showBindMobileDialog = ref(false);
-const showRewardDialog = ref(false);
-const showRewardVerifyDialog = ref(false);
 const isLogin = ref(false)
 const showHello = ref(true)
 const textInput = ref(null)
@@ -360,8 +298,6 @@ onMounted(() => {

    httpGet("/api/admin/config/get?key=system").then(res => {
      title.value = res.data.title
-      rewardImg.value = res.data.reward_img
-      enableReward.value = res.data.enabled_reward
    }).catch(e => {
      ElMessage.error("获取系统配置失败：" + e.message)
    })
@@ -855,11 +791,6 @@ const searchChat = function () {
  chatList.value = items;
 }

-const updateUser = function (data) {
-  loginUser.value.avatar = data.avatar;
-  loginUser.value.nickname = data.nickname;
-}
-
 // 导出会话
 const exportChat = () => {
  if (!activeChat.value['chat_id']) {
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -58,6 +58,7 @@ import {isMobile} from "@/utils/libs";
 import {checkSession} from "@/action/session";
 import {setUserToken} from "@/store/session";
 import {validateMobile} from "@/utils/validate";
+import {prevRoute} from "@/router";

 const router = useRouter();
 const title = ref('ChatGPT-PLUS 用户登录');
@@ -91,11 +92,16 @@ const login = function () {

  httpPost('/api/user/login', {username: username.value.trim(), password: password.value.trim()}).then((res) => {
    setUserToken(res.data)
-    if (isMobile()) {
-      router.push('/mobile')
+    if (prevRoute.path === '') {
+      if (isMobile()) {
+        router.push('/mobile')
+      } else {
+        router.push('/chat')
+      }
    } else {
-      router.push('/chat')
+      router.push(prevRoute.path)
    }
+
  }).catch((e) => {
    ElMessage.error('登录失败，' + e.message)
  })
--- a/web/src/views/Member.vue
+++ b/web/src/views/Member.vue
@@ -7,6 +7,21 @@

      <div class="user-profile">
        <user-profile/>
+
+        <el-row class="user-opt" :gutter="20">
+          <el-col :span="12">
+            <el-button type="primary">修改密码</el-button>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary">绑定手机号</el-button>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary">加入众筹</el-button>
+          </el-col>
+          <el-col :span="12">
+            <el-button type="primary">众筹核销</el-button>
+          </el-col>
+        </el-row>
      </div>

      <div class="product-box">
@@ -49,6 +64,31 @@

    <login-dialog :show="showLoginDialog" @hide="showLoginDialog = false"/>

+    <password-dialog v-if="isLogin" :show="showPasswordDialog" @hide="showPasswordDialog = false"
+                     @logout="logout"/>
+
+    <bind-mobile v-if="isLogin" :show="showBindMobileDialog" :mobile="loginUser.mobile"
+                 @hide="showBindMobileDialog = false"/>
+
+    <reward-verify v-if="isLogin" :show="showRewardVerifyDialog" @hide="showRewardVerifyDialog = false"/>
+
+    <el-dialog
+        v-model="showRewardDialog"
+        :show-close="true"
+        width="400px"
+        title="参与众筹"
+    >
+      <el-alert type="info" :closable="false">
+        <div style="font-size: 14px">您好，众筹 9.9元，就可以兑换 100 次对话，以此来覆盖我们的 OpenAI
+          账单和服务器的费用。<strong
+              style="color: #f56c6c">由于本人没有开通微信支付，付款后请凭借转账单号进入核销【众筹核销】菜单手动核销。</strong>
+        </div>
+      </el-alert>
+      <div style="text-align: center;padding-top: 10px;">
+        <el-image v-if="enableReward" :src="rewardImg"/>
+      </div>
+    </el-dialog>
+
    <el-dialog
        v-model="showPayDialog"
        :close-on-click-modal="false"
@@ -78,16 +118,18 @@
 </template>

 <script setup>
-import {nextTick, onMounted, ref} from "vue"
+import {onMounted, ref} from "vue"
 import {ElMessage} from "element-plus";
 import {httpGet, httpPost} from "@/utils/http";
 import ItemList from "@/components/ItemList.vue";
-import {Delete, InfoFilled, Plus, SuccessFilled} from "@element-plus/icons-vue";
+import {InfoFilled, SuccessFilled} from "@element-plus/icons-vue";
 import LoginDialog from "@/components/LoginDialog.vue";
 import {checkSession} from "@/action/session";
-import {arrayContains, removeArrayItem, substr} from "@/utils/libs";
-import router from "@/router";
 import UserProfile from "@/components/UserProfile.vue";
+import PasswordDialog from "@/components/PasswordDialog.vue";
+import BindMobile from "@/components/BindMobile.vue";
+import RewardVerify from "@/components/RewardVerify.vue";
+import {useRouter} from "vue-router";

 const listBoxHeight = window.innerHeight - 97
 const list = ref([])
@@ -95,32 +137,51 @@ const showLoginDialog = ref(false)
 const showPayDialog = ref(false)
 const elements = ref(null)
 const vipImg = ref("/images/vip.png")
+const enableReward = ref(false) // 是否启用众筹功能
+const rewardImg = ref('/images/reward.png')
 const qrcode = ref("")
-const amount = ref(0)
-const discount = ref(0)
+const showPasswordDialog = ref(false);
+const showBindMobileDialog = ref(false);
+const showRewardDialog = ref(false);
+const showRewardVerifyDialog = ref(false);
 const text = ref("")
+const user = ref(null)
+const isLogin = ref(false)
+const router = useRouter()
+
+
 onMounted(() => {
-  httpGet("/api/product/list").then((res) => {
-    list.value = res.data
+  checkSession().then(_user => {
+    user.value = _user
+    isLogin.value = true
+    httpGet("/api/product/list").then((res) => {
+      list.value = res.data
+    }).catch(e => {
+      ElMessage.error("获取产品套餐失败：" + e.message)
+    })
+  }).catch(() => {
+    router.push("/login")
+  })
+
+  httpGet("/api/admin/config/get?key=system").then(res => {
+    rewardImg.value = res.data['reward_img']
+    enableReward.value = res.data['enabled_reward']
  }).catch(e => {
-    ElMessage.error("获取产品套餐失败：" + e.message)
+    ElMessage.error("获取系统配置失败：" + e.message)
  })
 })

 const orderPay = (row) => {
-  checkSession().then(user => {
-    console.log(row)
-    httpPost("/api/payment/alipay/qrcode", {product_id: row.id, user_id: user.id}).then(res => {
-      console.log(res)
-      showPayDialog.value = true
-      qrcode.value = res.data['image']
-      queryOrder(res.data['order_no'])
-    }).catch(e => {
-      ElMessage.error("生成支付订单失败：" + e.message)
-    })
-  }).catch(e => {
-    console.log(e)
+  if (!user.value.id) {
    showLoginDialog.value = true
+    return
+  }
+  httpPost("/api/payment/alipay/qrcode", {product_id: row.id, user_id: user.value.id}).then(res => {
+    showPayDialog.value = true
+    qrcode.value = res.data['image']
+    queryOrder(res.data['order_no'])
+  }).catch(e => {
+    ElMessage.error("生成支付订单失败：" + e.message)
  })
 }

@@ -210,8 +271,19 @@ const queryOrder = (orderNo) => {
        color #ffffff
        justify-content start
      }
+
+      .user-opt {
+        .el-col {
+          padding 10px
+
+          .el-button {
+            width 100%
+          }
+        }
+      }
    }

+
    .product-box {
      padding 0 10px

--- a/web/src/views/mobile/ChatList.vue
+++ b/web/src/views/mobile/ChatList.vue
@@ -78,7 +78,7 @@ import {ref} from "vue";
 import {httpGet, httpPost} from "@/utils/http";
 import {showConfirmDialog, showFailToast, showSuccessToast} from "vant";
 import {checkSession} from "@/action/session";
-import router from "@/router";
+import {router} from "@/router";
 import {setChatConfig} from "@/store/chat";
 import {removeArrayItem} from "@/utils/libs";
 import BindMobile from "@/components/mobile/BindMobile.vue";