Browse Source

Merge branch 'ctt_dev' into dev

dev
chutingting 1 year ago
parent
commit
46aa2178be
3 changed files with 21 additions and 7 deletions
  1. +0
    -6
      src/types/auto-imports.d.ts
  2. +1
    -1
      src/utils/request.js
  3. +20
    -0
      src/views/createVideo/index.vue

+ 0
- 6
src/types/auto-imports.d.ts View File

@@ -2,9 +2,6 @@
export {}
declare global {
const EffectScope: typeof import('vue')['EffectScope']
const ElForm: typeof import('element-plus/es')['ElForm']
const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
const computed: typeof import('vue')['computed']
@@ -271,9 +268,6 @@ import { UnwrapRef } from 'vue'
declare module 'vue' {
interface ComponentCustomProperties {
readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
readonly computed: UnwrapRef<typeof import('vue')['computed']>


+ 1
- 1
src/utils/request.js View File

@@ -74,7 +74,7 @@ request.interceptors.response.use(
// ElMessage.error("系统异常,请稍后再试");
// ElMessage.error($t('tips.systemException'));
ElMessage.error(
appStore.language == "zh-cn" ? `服务器繁忙,请重试!` : `The server is busy, please try again`
appStore.language == "zh-cn" ? (response.data.languageMessage && response.data.languageMessage['zh-cn']) || `服务器繁忙,请重试!` : (response.data.languageMessage && response.data.languageMessage[appStore.language]) || `The server is busy, please try again`
);
// 其他错误
} else {


+ 20
- 0
src/views/createVideo/index.vue View File

@@ -1792,6 +1792,26 @@ const problemContent = ref(""); //问题输入框内容
const answerContent = ref(""); //回答输入框内容
// 点击发送需求
async function sendRequirement(tag) {
let userPoinsVal = localStorage.getItem('userPoinsVal') // 当前币值
if (Number(userPoinsVal) <= 0){
ElMessageBox.confirm(
'当前金币不足,是否去充值?',
'提示', {
confirmButtonText: 'OK',
cancelButtonText: 'Cancel',
type: 'warning',
}
).then(() => {
router.push({
path: "/myStore",
query: {
tag: ''
},
});
}).catch(() => {})
return
}
// loading
sendLoading.value = true;



Loading…
Cancel
Save