diff --git a/src/api/closeStyle.js b/src/api/closeStyle.js index b0bd978..06c8733 100644 --- a/src/api/closeStyle.js +++ b/src/api/closeStyle.js @@ -1,9 +1,9 @@ import { request } from "../utils/request" // 获取风格列表 -export function getListApi(pageNum, pageSize, sex) { +export function getListApi(pageNum, pageSize, sex, mouldType) { return request({ - url: `api/digitalAvatarMould/list?pageNum=${pageNum}&pageSize=${pageSize}&sex=${sex}`, + url: `api/digitalAvatarMould/list?pageNum=${pageNum}&pageSize=${pageSize}&sex=${sex}&mouldType=${mouldType}`, method: 'GET', }) } diff --git a/src/pages/chooseStyle/index.vue b/src/pages/chooseStyle/index.vue index f246543..f47be85 100644 --- a/src/pages/chooseStyle/index.vue +++ b/src/pages/chooseStyle/index.vue @@ -3,7 +3,7 @@ - 类型 + 性别 {{ item.name }} - 风格 + 类型 {{ item.name }} @@ -87,20 +87,61 @@ import { getListApi } from "../../api/closeStyle"; //#endregion ----------------------- //#region tab栏 +// 性别 const sex = ref(2); -const tabList = ref([ +const sexList = ref([ + { name: "女", id: 2 }, + { name: "男", id: 1 }, + { name: "单人", id: 3 }, + { name: "多人", id: 4 }, +]); +const sexList2 = ref([ { name: "女", id: 2 }, { name: "男", id: 1 }, - { name: "多人", id: 3 }, - { name: "电影明星", id: 4 }, - { name: "体育", id: 5 }, - { name: "多人", id: 6 }, - // { name: "电影明星", id: 7 }, - { name: "体育", id: 8 }, - { name: "", id: 999, disabled: true }, ]); + +// 类型 +const mouldType = ref(""); +const mouldTypeList = ref([ + { name: "单人", id: 1 }, + { name: "多人", id: 2 }, +]); +// 点击tab function chooseTab(item) { - sex.value = item.id; + if (item.id < 3) { + sex.value = item.id; + mouldType.value = ""; + } else if (item.id == 3) { + mouldType.value = 1; + sex.value = ""; + } else if (item.id == 4) { + mouldType.value = 2; + sex.value = ""; + } +} +// 更多里的tab 性别 +function chooseSex(item) { + if (sex.value == item.id) { + if (mouldType.value == "") { + return; + } else { + sex.value = ""; + } + } else { + sex.value = item.id; + } +} +// 更多里的tab 类型 +function chooseMouldType(item) { + if (mouldType.value == item.id) { + if (sex.value == "") { + return; + } else { + mouldType.value = ""; + } + } else { + mouldType.value = item.id; + } } //#endregion @@ -127,7 +168,12 @@ async function getList() { title: "加载中...", mask: true, }); - const res = await getListApi(pageNum.value, pageSize.value, sex.value); + const res = await getListApi( + pageNum.value, + pageSize.value, + sex.value, + mouldType.value + ); styleList.value = res.data.list; uni.hideLoading(); } catch (error) { @@ -139,9 +185,17 @@ async function getList() { } } // 监听性别tab变化 +watch( + () => mouldType.value, + (old) => { + pageNum.value = 1; + pageSize.value = 20; + getList(); + } +); watch( () => sex.value, - (sex) => { + () => { pageNum.value = 1; pageSize.value = 20; getList(); @@ -156,7 +210,12 @@ const scrolltolower = async () => { mask: true, }); pageNum.value += 1; - const res = await getListApi(pageNum.value, pageSize.value, sex.value); + const res = await getListApi( + pageNum.value, + pageSize.value, + sex.value, + mouldType.value + ); styleList.value.push(...res.data.list); setTimeout(function () { uni.hideLoading(); @@ -167,6 +226,7 @@ const scrolltolower = async () => { uni.showToast({ title: "已加载全部内容", icon: "none", + mask: false, }); } } catch (error) { diff --git a/src/pages/created/index.vue b/src/pages/created/index.vue index e796dfb..39db3fc 100644 --- a/src/pages/created/index.vue +++ b/src/pages/created/index.vue @@ -114,7 +114,6 @@ function previewImage(index) { //#endregion --------------------- //#region 页面跳转 - function goChooseStyle() { uni.navigateTo({ url: "/pages/chooseStyle/index",