From 377eda596db9841688c94d7536f57dab865d5e9b Mon Sep 17 00:00:00 2001
From: chengkun <2500338766@qq.com>
Date: Wed, 6 Jul 2022 18:27:57 +0800
Subject: [PATCH] =?UTF-8?q?feature-tiktok-1.0:=E6=8F=90=E4=BA=A4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/creator.js                  | 12 +++++++++++-
 api/index.js                    |  4 ++--
 pages/creator/creator.vue       |  9 ++-------
 pages/creator/creatorDetail.vue | 25 ++++++++++++++++++++-----
 pages/index/choiceness.vue      |  6 +++---
 pages/index/index.vue           |  6 +++---
 6 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/api/creator.js b/api/creator.js
index 3f80b33..dd55c33 100644
--- a/api/creator.js
+++ b/api/creator.js
@@ -10,7 +10,8 @@ export function getBannerList() {
 		method: 'get'
 	})
 }
-//获取小程序艺术家图片分页
+
+//获取艺术家界面查询艺术家图片分页
 export function getCreatorImgsPage(data) {
 	return request({
 		url: `${serviceTitle}/img/mini/tiktok/creatorImgsPage`,
@@ -19,6 +20,15 @@ export function getCreatorImgsPage(data) {
 	})
 }
 
+//根据搜索码和分类id查询艺术家图片分页
+export function getTypeImgsPage(data) {
+	return request({
+		url: `${serviceTitle}/img/mini/tiktok/typeImgsPage`,
+		method: 'post',
+		data
+	})
+}
+
 // 获取图片详情
 export function detailsTiktokImg(data) {
 	return request({
diff --git a/api/index.js b/api/index.js
index 647cc49..1e2a0b4 100644
--- a/api/index.js
+++ b/api/index.js
@@ -19,9 +19,9 @@ export function imgLists(data) {
 	})
 }
 //艺术家详情页-根据搜索码查询艺术家图片列表
-export function creatorImgsDetails(data) {
+export function creatorDetails(data) {
 	return request({
-		url: `${serviceTitle}/img/mini/tiktok/creatorImgsDetails`,
+		url: `${serviceTitle}/img/mini/tiktok/creatorDetails`,
 		method: 'post',
 		data
 	})
diff --git a/pages/creator/creator.vue b/pages/creator/creator.vue
index ba88202..1e459d1 100644
--- a/pages/creator/creator.vue
+++ b/pages/creator/creator.vue
@@ -54,7 +54,7 @@
 		getCreatorImgsPage
 	} from '@/api/creator.js'
 	import {
-		creatorImgsDetails
+		creatorDetails
 	} from '@/api/index.js'
 	export default {
 		data() {
@@ -97,7 +97,7 @@
 					const params = {
 						scanCode: item.scanCode
 					}
-					creatorImgsDetails(params).then(response => {
+					creatorDetails(params).then(response => {
 						if(response.data.code === 200){
 							this.creatorInfo = response.data.data
 							console.log("this.creatorInfo结果",this.creatorInfo);
@@ -129,11 +129,6 @@
 				}
 			},
 
-			getCreatorDetails(item) {
-				//TODO 点击跳转对应艺术家详情页面
-				console.log(item);
-			},
-
 			async getBanner() {
 				const res = await getBannerList()
 				if (res.data.code === 200) {
diff --git a/pages/creator/creatorDetail.vue b/pages/creator/creatorDetail.vue
index fb46376..6a0ac0e 100644
--- a/pages/creator/creatorDetail.vue
+++ b/pages/creator/creatorDetail.vue
@@ -40,8 +40,8 @@
 		</view>
 		<swiper class="swiper" :circular="false" :current="current" :indicator-dots="false" :autoplay="false"
 			@change="changeItem" :duration="500">
-			<swiper-item v-for="(item,index) in creatorInfo.typeImgList" :key="item.typeId"
-				:current-item-id="item.typeId">
+			<swiper-item v-for="(item,index) in creatorInfo.typeList" :key="item.typeId"
+				:current-item-id="item.typeId" >
 				<view class="swiper-item bottom">
 					<image :src="val.imgUrl" mode="" v-for="(val,i) in item.imgList" :key="i"
 						:style="'width:'+imgWidth+';height:'+imgHeight" @click="targetDetail(val)"></image>
@@ -55,8 +55,8 @@
 
 <script>
 	import {
-		creatorImgsDetails
-	} from '@/api/index.js'
+		getTypeImgsPage
+	} from '@/api/creator.js'
 	export default {
 		data() {
 			return {
@@ -65,6 +65,8 @@
 				arrList: [],
 				imgWidth: 0, // 图片宽
 				imgHeight: 0, // 图片高
+				pageNum: 1,
+				pageSize: 10,
 			}
 		},
 		created() {
@@ -80,7 +82,7 @@
 				success: res => {
 					this.creatorInfo = res.data
 					console.log('getStorage', this.creatorInfo)
-					this.creatorInfo.typeImgList.forEach(item => {
+					this.creatorInfo.typeList.forEach(item => {
 						this.arrList.push(item.typeName)
 					})
 					console.log('arrList', this.arrList)
@@ -105,6 +107,19 @@
 			onClickItem(e) {
 				console.log('点击', e)
 				this.current = e.currentIndex
+				const params = {
+					scanCode: this.creatorInfo.scanCode,
+					typeId: this.current,
+					pageNum: this.pageNum,
+					pageSize: this.pageSize,
+				}
+				console.log('params',params)
+				getTypeImgsPage(params).then(response => {
+					if(response.data.code === 200){
+						console.log('response',response)
+						//TODO 待取出圖片列表
+					}
+				});
 			},
 			// 内容滑动
 			changeItem(e) {
diff --git a/pages/index/choiceness.vue b/pages/index/choiceness.vue
index ce6cf06..c7f62a5 100644
--- a/pages/index/choiceness.vue
+++ b/pages/index/choiceness.vue
@@ -19,7 +19,7 @@
 <script>
 	import {
 		imgLists,
-		creatorImgsDetails
+		creatorDetails
 	} from '@/api/index.js'
 	export default {
 		data() {
@@ -73,10 +73,10 @@
 			// 前往艺术家空间
 			async goCreatorDetail(scanCode) {
 				if (scanCode) {
-					const res = await creatorImgsDetails({
+					const res = await creatorDetails({
 						scanCode
 					})
-					console.log('creatorImgsDetails', res)
+					console.log('creatorDetails', res)
 					if (res.data.code === 200) {
 						uni.setStorage({
 							key: 'creatorDetail',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8eea613..0fa9ccb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -28,7 +28,7 @@
 <script>
 	import {
 		listHotCreator,
-		creatorImgsDetails,
+		creatorDetails,
 		loginTiktok
 	} from '@/api/index.js'
 	import Choiceness from './choiceness.vue'
@@ -138,10 +138,10 @@
 			// 前往艺术家空间
 			async goCreatorDetail(scanCode) {
 				if (scanCode) {
-					const res = await creatorImgsDetails({
+					const res = await creatorDetails({
 						scanCode
 					})
-					console.log('creatorImgsDetails', res)
+					console.log('creatorDetails', res)
 					if (res.data.code === 200) {
 						uni.setStorage({
 							key: 'creatorDetail',