Sfoglia il codice sorgente

Merge branch 'ctt_dev_new' into dev

dev
chutingting 1 anno fa
parent
commit
2a275bee1f
6 ha cambiato i file con 24 aggiunte e 39 eliminazioni
  1. +15
    -23
      src/views/home/index.vue
  2. +0
    -5
      src/views/template/index.vue
  3. +5
    -1
      src/views/userManage/rechargeList.vue
  4. +0
    -5
      src/views/userManage/userMouldList.vue
  5. +1
    -1
      src/views/userManage/videoList.vue
  6. +3
    -4
      src/views/video/index.vue

+ 15
- 23
src/views/home/index.vue Vedi File

@@ -15,7 +15,7 @@
<li><div style="height: 100%"><el-icon><i-ep-UserFilled /></el-icon> 登录账号<div class="user-right">{{ userData.username }}</div></div></li>
<li><el-icon><i-ep-Avatar /></el-icon> 用户昵称 <div class="user-right">{{ userData.name }}</div></li>
<li><el-icon><i-ep-User /></el-icon> 手机号 <div class="user-right"> {{ userData.phone }}</div></li>
<li v-if="(userData.isAdmin === 1 && userData.localDeploy) || userData.isAdmin === 0"><el-icon><i-ep-User /></el-icon> 当前账户时长 <div class="user-right"> {{ userData.remainingTimes }} (秒)</div></li>
<li v-if="(userData.isAdmin === 1 && localDeploy) || userData.isAdmin === 0"><el-icon><i-ep-User /></el-icon> 当前账户时长 <div class="user-right"> {{ userData.remainingTimes }} (秒)</div></li>
<li>
<el-icon><i-ep-edit /></el-icon> 安全设置
<div class="user-right">
@@ -62,32 +62,24 @@ const userData = ref({
isAdmin: '',
localDeploy: ''
});
function getUserFn() {
getUser().then(res => {
userData.value = res.data
localStorage.setItem("username", res.data.username);
localStorage.setItem("isAdmin", res.data.isAdmin); // isAdmin=1,为管理人员(邃芒后台) , isAdmin=0,为API接入方登录后台 isAmin=1&&localDeploy=true,就是私有化部署的管理后台
if (res.data.isAdmin === 1 && res.data.localDeploy || res.data.isAdmin === 0) {
getTime()
}
})
}
function localDeployFn() {
localDeployApi().then(res => {
userData.value.localDeploy = res.data
localStorage.setItem("localDeploy", res.data);
})
}
const localDeploy = ref('')
const getData = async () => {
let userRes = await getUser()
let localDeployRes = await localDeployApi()
userData.value = userRes.data
localStorage.setItem("username", userRes.data.username);
localStorage.setItem("isAdmin", userRes.data.isAdmin); // isAdmin=1,为管理人员(邃芒后台) , isAdmin=0,为API接入方登录后台 isAmin=1&&localDeploy=true,就是私有化部署的管理后台
userData.value.localDeploy = localDeployRes.data
localDeploy.value = localDeployRes.data
localStorage.setItem("localDeploy", localDeployRes.data);
// 当前账户时长
async function getTime() {
let res = userData.isAdmin === 1 && userData.localDeploy ? await privateDeployAdminCurrent() : await current()
userData.value.remainingTimes = res.data.remainingTimes
let res = userData.isAdmin === 1 && localDeploy ? await privateDeployAdminCurrent() : await current()
userData.value.remainingTimes = res.data.remainingTimes
}

onMounted(async () => {
await getUserFn()
await localDeployFn()
getData()
});
</script>
<style lang="scss" scoped>


+ 0
- 5
src/views/template/index.vue Vedi File

@@ -8,11 +8,6 @@
align="center"
border
>
<el-table-column
prop="title"
label="名称"
align="center"
/>

<el-table-column label="图片" align="center">
<template #default="scope">


+ 5
- 1
src/views/userManage/rechargeList.vue Vedi File

@@ -61,7 +61,11 @@
prop="phone"
label="手机号"
align="center"
/>
>
<template #default="scope">
{{ scope.row.cuserInfo ? scope.row.cuserInfo.phone : '' }}
</template>
</el-table-column>
<el-table-column
prop="createDate"


+ 0
- 5
src/views/userManage/userMouldList.vue Vedi File

@@ -21,11 +21,6 @@
align="center"
border
>
<el-table-column
prop="title"
label="模板名称"
align="center"
/>
<el-table-column
prop="coverImg"
label="封面图"


+ 1
- 1
src/views/userManage/videoList.vue Vedi File

@@ -138,7 +138,7 @@
>
<template #default="scope">
<el-button link type="primary" size="small" @click="showDetail(scope.row.id)">查看</el-button>
<el-button link type="primary" size="small" @click="confirmDel(scope.row.id)">删除</el-button>
<el-button v-if="scope.row.isDel === 0" link type="primary" size="small" @click="confirmDel(scope.row.id)">删除</el-button>
</template>
</el-table-column>


+ 3
- 4
src/views/video/index.vue Vedi File

@@ -1,6 +1,6 @@
<template>
<div class="page justify-around">
<el-alert :title="`已消耗总时长:${crrentVideoToal}`" type="success" :closable="false" />
<el-alert :title="`已消耗总时长:${crrentVideoToal}`" type="success" :closable="false" />
<el-table
:data="tableData"
style="width: 100%; height: 90%"
@@ -40,11 +40,10 @@
<el-table-column
fixed="right"
:label="$t('keyMangage.operations')"
width="400"
align="center"
>
<template #default="scope">
<el-button link type="primary" size="small" @click="showDetail(scope.row.id)">查看视频详情</el-button>
<el-button link type="primary" size="small" @click="showDetail(scope.row.userMouldVideoId)">查看视频详情</el-button>
</template>
</el-table-column>
</el-table>
@@ -133,7 +132,7 @@
const crrentVideoToal = ref('')
function getCrrentVideoToal() {
currentVideoToalApi().then(res => {
// TODO
crrentVideoToal.value = res.data
})
}
onMounted(() => {


Caricamento…
Annulla
Salva