diff --git a/dist.rar b/dist.rar index 6b4d226..5c8ea52 100644 Binary files a/dist.rar and b/dist.rar differ diff --git a/dist.zip b/dist.zip deleted file mode 100644 index b63d81e..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/utils/axios.js b/src/utils/axios.js index d3ec147..256a949 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -14,7 +14,7 @@ let baseURL = '' if (process.env.NODE_ENV === 'development') { // 生产环境 baseURL = "http://120.26.251.180:8085/" - // baseURL = "http://192.168.0.115:8085/" + // baseURL = "http://192.168.0.116:8085/" } else { // 开发环境 baseURL = "http://120.26.251.180:8085/" diff --git a/src/views/hosts/hostsList.vue b/src/views/hosts/hostsList.vue index e9860d7..d861e51 100644 --- a/src/views/hosts/hostsList.vue +++ b/src/views/hosts/hostsList.vue @@ -247,6 +247,9 @@ onMounted(() => { getStaff(); //获取国家 getCountry(); + + + getlist();//获取主播列表 }) function serch() { @@ -259,8 +262,8 @@ function exportList() { searchForm.value.dataEnd = searchForm.value.dataStart } exportToExcel({ - searchTime: searchForm.value.time, - region: searchForm.value.country, + searchTime: searchForm.value.time == '' ? null : searchForm.value.time, + region: searchForm.value.country == '' ? null : searchForm.value.country, dataType: searchForm.value.dataType == '' ? null : searchForm.value.dataType, dataStart: searchForm.value.dataStart == '' ? null : searchForm.value.dataStart, dataEnd: searchForm.value.dataEnd == '' ? null : searchForm.value.dataEnd, @@ -317,8 +320,8 @@ const getlist = () => { loading.value = true console.log(searchForm.value) tkhostdata({ - searchTime: searchForm.value.time, - region: searchForm.value.country, + searchTime: searchForm.value.time == '' ? null : searchForm.value.time, + region: searchForm.value.country == '' ? null : searchForm.value.country, dataType: searchForm.value.dataType == '' ? null : searchForm.value.dataType, dataStart: searchForm.value.dataStart == '' ? null : searchForm.value.dataStart, dataEnd: searchForm.value.dataEnd == '' ? null : searchForm.value.dataEnd, diff --git a/src/views/hosts/workbenches.vue b/src/views/hosts/workbenches.vue index 3116b1e..7e18489 100644 --- a/src/views/hosts/workbenches.vue +++ b/src/views/hosts/workbenches.vue @@ -8,9 +8,9 @@
可邀请: {{ hostData.canInvitationCount }}
- +
@@ -34,7 +34,7 @@ 登录tk + @click="loginTK(index)">登录后台
@@ -55,7 +55,7 @@
- + n
@@ -177,7 +177,7 @@ let pyData = ref({ }); //按钮提交状态 -let submitting = ref(false); +let submitting = ref(true); onMounted(() => { //从缓存获取数据 @@ -341,12 +341,12 @@ const loginTK = (index) => { } -// const openTK = () => { -// isTk.value = true; -// console.log(isTk.value) -// loginTikTok(); +const openTK = () => { + // isTk.value = true; + // console.log(isTk.value) + loginTikTok(); -// } +} function getloginStatus() { backStageloginStatus().then((res) => {