修复bug

2025-08-04 13:13:53 +08:00
parent 4ba1ab9c89
commit 9af9f1f166
8 changed files with 87 additions and 20 deletions
--- a/.env.local
+++ b/.env.local
@@ -4,9 +4,9 @@ NODE_ENV=development
 VITE_DEV=true

 # 请求路径
-# VITE_BASE_URL='http://192.168.1.174:48080'
+VITE_BASE_URL='http://192.168.1.174:48080'
 # VITE_BASE_URL='http://47.79.98.113:48080'
-VITE_BASE_URL='https://backstageapi.yolozs.com'
+# VITE_BASE_URL='https://backstageapi.yolozs.com'

 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -539,5 +539,32 @@ export default {
    primaryKey: 'ID',
    action: 'Action',
    remark: 'Remark'
-  }
+  },
+  country: {
+    greece: 'Greece Region',
+    vietnam: 'Vietnam',
+    taiwan: 'Taiwan',
+    turkey: 'Turkey',
+    thailand: 'Thailand',
+    romania: 'Romania',
+    poland: 'Poland',
+    philippines: 'Philippines',
+    netherlands: 'Netherlands',
+    malaysia_singapore: 'Malaysia/Singapore',
+    korea: 'Korea',
+    japan: 'Japan',
+    italy: 'Italy',
+    indonesia: 'Indonesia',
+    nordic: 'Nordic',
+    usa: 'USA',
+    brazil: 'Brazil',
+    france: 'France',
+    australia_nz: 'Australia/New Zealand',
+    germany: 'Germany',
+    latam: 'Latin America',
+    central_asia: 'Central Asia',
+    uk: 'United Kingdom',
+    middle_east: 'Middle East',
+    spain: 'Spain'
+  },
 }
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -540,5 +540,32 @@ export default {
    action: '操作',
    remark: '备注'
  },
+  country: {
+    greece: '希腊大区',
+    vietnam: '越南',
+    taiwan: '中国台湾',
+    turkey: '土耳其',
+    thailand: '泰国',
+    romania: '罗马尼亚',
+    poland: '波兰',
+    philippines: '菲律宾',
+    netherlands: '荷兰',
+    malaysia_singapore: '马来西亚/新加坡',
+    korea: '韩国',
+    japan: '日本',
+    italy: '意大利',
+    indonesia: '印度尼西亚',
+    nordic: '北欧',
+    usa: '美国',
+    brazil: '巴西',
+    france: '法国',
+    australia_nz: '澳新',
+    germany: '德国',
+    latam: '拉美',
+    central_asia: '中亚',
+    uk: '英国',
+    middle_east: '中东',
+    spain: '西班牙'
+  },
  'OAuth 2.0': 'OAuth 2.0' // 避免菜单名是 OAuth 2.0 时，一直 warn 报错
 }
--- a/src/views/server/bigbrother/index.vue
+++ b/src/views/server/bigbrother/index.vue
@@ -40,13 +40,18 @@
          class="!w-240px" />
      </el-form-item> -->
      <el-form-item label="大哥所在的地区" prop="region">
-        <el-input v-model="queryParams.region" placeholder="请输入大哥所在的地区" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
+        <!-- <el-input v-model="queryParams.region" placeholder="请输入大哥所在的地区" clearable @keyup.enter="handleQuery"
+          class="!w-240px" /> -->
+        <el-select v-model="queryParams.region" :placeholder="t('newHosts.placeHostsCountry')" clearable
+          class="!w-240px">
+          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.COUNTRY_GROUP)" :key="dict.value"
+            :label="$t(dict.label)" :value="dict.value" />
+        </el-select>
      </el-form-item>
-      <el-form-item label="大哥的国家" prop="countryName">
+      <!-- <el-form-item label="大哥的国家" prop="countryName">
        <el-input v-model="queryParams.countryName" placeholder="请输入大哥的国家" clearable @keyup.enter="handleQuery"
          class="!w-240px" />
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item label="大哥打赏的历史最高金币" prop="historicHighCoins">
        <!-- <el-input v-model="queryParams.historicHighCoins" placeholder="请输入大哥打赏的历史最高金币" clearable
          @keyup.enter="handleQuery" class="!w-240px" /> -->
@@ -82,6 +87,13 @@
          start-placeholder="开始日期" end-placeholder="结束日期"
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" />
      </el-form-item>
+      <el-form-item :label="t('newHosts.isAssigned')" prop="isAssigned">
+        <el-select v-model="queryParams.isAssigned" :placeholder="t('newHosts.placeIsAssigned')" clearable
+          class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.INT_TRUE_FLASE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
      <el-form-item>
        <el-button @click="handleQuery">
          <Icon icon="ep:search" class="mr-5px" /> 搜索
@@ -202,6 +214,7 @@ const queryParams = reactive({
  totalGiftCoinsMax: undefined,
  hostDisplayId: undefined,
  ownerId: undefined,
+  isAssigned: undefined,
  createTime: [],
  createTimeStart: '',
  createTimeEnd: '',
--- a/src/views/server/employeehosts/index.vue
+++ b/src/views/server/employeehosts/index.vue
@@ -3,14 +3,14 @@
    <div v-show="isShowSearch">
      <ContentWrap>
        <!-- 搜索工作栏 -->
-        <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+        <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true">
          <el-form-item :label="$t('employee.hostsId')" prop="hostsId">
            <el-input v-model="queryParams.hostsId" :placeholder="$t('employee.placeHostId')" clearable
              @keyup.enter="handleQuery" class="!w-240px" />
          </el-form-item>
          <el-form-item :label="$t('employee.hostsLevel')" prop="hostsLevel">
            <el-select v-model="queryParams.hostsLevel" :placeholder="$t('employee.placeHostLevel')" clearable
-              class="!w-240px">
+              class="!w-240px" multiple>
              <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HOST_LEVEL)" :key="dict.value" :label="dict.label"
                :value="dict.value" />
            </el-select>
@@ -47,7 +47,7 @@
            <el-select v-model="queryParams.country" :placeholder="$t('employee.placeHostsCountry')" clearable
              class="!w-240px">
              <el-option v-for="dict in getStrDictOptions(DICT_TYPE.COUNTRY_GROUP)" :key="dict.value"
-                :label="dict.label" :value="dict.value" />
+                :label="$t(dict.label)" :value="dict.value" />
            </el-select>
          </el-form-item>
          <el-form-item :label="$t('employee.hostsKind')" prop="hostsKind">
@@ -178,7 +178,7 @@
        <div class="card-row"><b>{{ $t('employee.updateTime') }}：</b>{{ item.updateTime }}</div>
        <div class="card-row action-row">
          <el-button link type="primary" @click="openForm('update', item.id, index)">{{ $t('employee.edit')
-            }}</el-button>
+          }}</el-button>
        </div>
      </div>
    </div>
--- a/src/views/server/manageemployeehosts/index.vue
+++ b/src/views/server/manageemployeehosts/index.vue
@@ -3,14 +3,14 @@
    <div v-show="isShowSearch">
      <ContentWrap>
        <!-- 搜索工作栏 -->
-        <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+        <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true">
          <el-form-item :label="$t('employee.hostsId')" prop="hostsId">
            <el-input v-model="queryParams.hostsId" :placeholder="$t('employee.placeHostId')" clearable
              @keyup.enter="handleQuery" class="!w-240px" />
          </el-form-item>
          <el-form-item :label="$t('employee.hostsLevel')" prop="hostsLevel">
            <el-select v-model="queryParams.hostsLevel" :placeholder="$t('employee.placeHostLevel')" clearable
-              class="!w-240px">
+              class="!w-240px" multiple>
              <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HOST_LEVEL)" :key="dict.value" :label="dict.label"
                :value="dict.value" />
            </el-select>
@@ -47,7 +47,7 @@
            <el-select v-model="queryParams.country" :placeholder="$t('employee.placeHostsCountry')" clearable
              class="!w-240px">
              <el-option v-for="dict in getStrDictOptions(DICT_TYPE.COUNTRY_GROUP)" :key="dict.value"
-                :label="dict.label" :value="dict.value" />
+                :label="$t(dict.label)" :value="dict.value" />
            </el-select>
          </el-form-item>
          <el-form-item :label="$t('employee.hostsKind')" prop="hostsKind">
@@ -178,7 +178,7 @@
        <div class="card-row"><b>{{ $t('employee.updateTime') }}：</b>{{ formatTimestamp(item.updateTime) }}</div>
        <div class="card-row action-row">
          <el-button link type="primary" @click="openForm('update', item.id, index)">{{ $t('employee.edit')
-            }}</el-button>
+          }}</el-button>
        </div>
      </div>
    </div>
--- a/src/views/server/newhosts/index.vue
+++ b/src/views/server/newhosts/index.vue
@@ -8,7 +8,7 @@
      </el-form-item>
      <el-form-item :label="t('newHosts.hostsLevel')" prop="hostsLevel">
        <el-select v-model="queryParams.hostsLevel" :placeholder="t('newHosts.placeHostLevel')" clearable
-          class="!w-240px">
+          class="!w-240px" multiple>
          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HOST_LEVEL)" :key="dict.value" :label="dict.label"
            :value="dict.value" />
        </el-select>
@@ -78,8 +78,8 @@
      <el-form-item :label="t('newHosts.hostsCountry')" prop="country">
        <el-select v-model="queryParams.country" :placeholder="t('newHosts.placeHostsCountry')" clearable
          class="!w-240px">
-          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.COUNTRY_GROUP)" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.COUNTRY_GROUP)" :key="dict.value"
+            :label="$t(dict.label)" :value="dict.value" />
        </el-select>
      </el-form-item>
      <el-form-item :label="t('newHosts.hostsKind')" prop="hostsKind">
--- a/src/views/server/newhosts/test.vue
+++ b/src/views/server/newhosts/test.vue
@@ -78,8 +78,8 @@
      <el-form-item :label="t('newHosts.hostsCountry')" prop="country">
        <el-select v-model="queryParams.country" :placeholder="t('newHosts.placeHostsCountry')" clearable
          class="!w-240px">
-          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.COUNTRY_GROUP)" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.COUNTRY_GROUP)" :key="dict.value"
+            :label="$t(dict.label)" :value="dict.value" />
        </el-select>
      </el-form-item>
      <el-form-item :label="t('newHosts.hostsKind')" prop="hostsKind">