feature-img-1.0:有BUG待修复

api/creator.js

@@ -18,6 +18,7 @@ export function getCreatorImgsPage(data) {
 		data
 	})
 }
+
 // 获取图片详情
 export function detailsTiktokImg(data) {
 	return request({
@@ -73,3 +74,29 @@ export function tiktokUnCollect(data) {
 		data
 	})
 }
+
+// 根据艺术家id获取搜索码
+export function queryCreatorScanCodeById(data) {
+	return request({
+		url: `${serviceTitle}/img/mini/tiktok/queryCreatorScanCodeById/${data}`,
+		method: 'get'
+	})
+}
+
+// 新增/更新艺术家即将入账广告收益
+export function insertOrUpdatePreAdProfit(data) {
+	return request({
+		url: `${serviceTitle}/img/mini/tiktok/insertOrUpdatePreAdProfit`,
+		method: 'post',
+		data
+	})
+}
+
+// 新增/更新艺术家即将入账邀请收益
+export function insertOrUpdatePreInviteProfit(data) {
+	return request({
+		url: `${serviceTitle}/img/mini/tiktok/insertOrUpdatePreInviteProfit`,
+		method: 'post',
+		data
+	})
+}

pages/creator/creator.vue

@@ -10,9 +10,9 @@
 		</view>
 
 		<view class="list">
-			<view v-for="(item, index) in creatorImgList" :key="index" class="list-item">
+			<view v-for="(item, index) in creatorImgList" :key="index" class="list-item" @click="toCreatorDetail(item)">
 				<!-- 展示用户相关信息 -->
-				<view class="fb-d-r fb-j-sb fb-a-c list-top" @click="toCreatorDetail(item)">
+				<view class="fb-d-r fb-j-sb fb-a-c list-top">
 					<view class="fb-d-r fb-a-c head-box">
 						<image class="head" :src="item.img"></image>
 						<view class="ml-10">
@@ -40,7 +40,7 @@
 				<!-- 	展示用户对应三张图 -->
 				<view class="fb-d-r fb-j-sb img-box">
 					<view v-for="(pic,param) in item.imgList" :key="param">
-						<image class="threeImg" @click="linkTo(pic)" :src="pic.imgUrl"></image>
+						<image class="threeImg" :src="pic.imgUrl"></image>
 					</view>
 				</view>
 			</view>
@@ -53,6 +53,9 @@
 		getBannerList,
 		getCreatorImgsPage
 	} from '@/api/creator.js'
+	import {
+		creatorImgsDetails
+	} from '@/api/index.js'
 	export default {
 		data() {
 			return {
@@ -63,7 +66,8 @@
 				duration: 1000,
 				indicatorDots: true,
 				pageNum: 1,
-				pageSize: 2
+				pageSize: 2,
+				creatorInfo: {}
 			}
 		},
 		onLoad() {
@@ -90,15 +94,29 @@
 			// 跳转艺术家详情页
 			toCreatorDetail(item){
 				if (item) {
-					uni.setStorage({
+					const params = {
-						key: 'creatorDetail',
+						scanCode: item.scanCode
-						data: item,
+					}
-						success() {
+					creatorImgsDetails(params).then(response => {
-							uni.navigateTo({
+						if(response.data.code === 200){
-								url: '../creator/creatorDetail'
+							this.creatorInfo = response.data.data
+							console.log("this.creatorInfo结果",this.creatorInfo);
+							uni.setStorage({
+								key: 'creatorDetail',
+								data: this.creatorInfo,
+								success() {
+									uni.navigateTo({
+										url: '../creator/creatorDetail'
+									})
+								}
 							})
-						}
+						}else {
-					})
+							uni.showModal({
+							content: '艺术家详情加载失败！',
+							showCancel: false
+						});
+					}
+				});
 				} 
 			},
 			// 跳转图片详情页

pages/creator/creatorDetail.vue

@@ -7,7 +7,9 @@
 					<text>{{creatorInfo.scanCode}}</text>
 				</view>
 				<view class="avatar-right-box">
-					<image src="../../static/img/share.svg" mode=""></image>
+					<button open-type="share" size="mini" type="default" style="background-color:#11A8FD;outline：none;">
+						<image src="../../static/img/share.svg" mode=""></image>
+					</button>
 				</view>
 			</view>
 			<view class="avatar-box-text">
@@ -37,7 +39,7 @@
 				activeColor="#11A8FD"></uni-segmented-control>
 		</view>
 		<view class="bottom">
-			<image :src="item.imgUrl" mode="" v-for="(item,index) in creatorInfo.imgList" :key="index"
+			<image :src="item.imgUrl" mode="" v-for="(item,index) in creatorInfo.typeImgList[index].imgList" :key="index"
 				:style="'width:'+imgWidth+';height:'+imgHeight" @click="targetDetail(item)"></image>
 		</view>
 	</view>
@@ -45,14 +47,14 @@
 
 <script>
 	import {
-		tiktokUserDetails
+		creatorImgsDetails
-	} from '@/api/creator.js'
+	} from '@/api/index.js'
 	export default {
 		data() {
 			return {
 				creatorInfo: {},
 				current: 0,
-				arrList: ['背景图', '头像', '表情包'],
+				arrList: [],
 				imgWidth: 0, // 图片宽
 				imgHeight: 0, // 图片高
 			}
@@ -70,22 +72,36 @@
 				success: res => {
 					console.log('getStorage', res)
 					this.creatorInfo = res.data
+					this.current = res.data.typeImgList[0].typeId
+					this.arrList = res.data.typeImgList[0].typeName
 				}
 			})
 		},
+		onShareAppMessage(res) {
+			if (res.from === 'button') { // 来自页面内分享按钮
+				console.log(res)
+			}
+			return {
+				title: '来看看艺术家['+this.creatorInfo.scanCode+']精心准备的图片吧~',
+				path: `/pages/creator/imgDetail?id=${this.creatorInfo.id}`
+			}
+			uni.showToast({
+				title: '分享成功',
+				icon: 'none'
+			})
+		},
 		methods: {
 			onClickItem(e) {
 				console.log('点击', e)
 			},
 			// 前往详情页
 			targetDetail(item) {
-				console.log('跳转', item)
+				console.log('item',item)
 				if (item.id) {
 					uni.setStorage({
 						key: 'detailId',
 						data: item.id,
 						success() {
-							console.log(111111)
 							uni.navigateTo({
 								url: './imgDetail'
 							})

pages/creator/imgDetail.vue

@@ -40,6 +40,9 @@
 		tiktokUnLike, // 取消点赞
 		tiktokCollect, // 收藏
 		tiktokUnCollect, // 取消收藏
+		queryCreatorScanCodeById, //获取艺术家搜索码
+		insertOrUpdatePreAdProfit, //新增/更新艺术家即将入账广告收益
+		insertOrUpdatePreInviteProfit // 新增/更新艺术家即将入账邀请收益
 	} from '@/api/creator.js'
 	export default {
 		data() {
@@ -48,7 +51,9 @@
 				userInfo: {}, // 登录用户信息
 				isDownload: false, // 是否已下载
 				isLike: false, // 是否点赞/喜欢
-				isCollect: false, // 是否收藏
+				isCollect: false, // 是否收藏,
+				scanCode: undefined ,//艺术家搜索码
+				
 			}
 		},
 		created() {
@@ -64,7 +69,7 @@
 				console.log(res)
 			}
 			return {
-				title: '自定义分享标题',
+				title: '来看看艺术家['+this.scanCode+']精心准备的图片吧~',
 				path: `/pages/creator/imgDetail?id=${this.userInfo.id}`,
 				bgImgUrl: `${this.detailMsg.imgUrl}`
 			}
@@ -80,6 +85,15 @@
 				if (res.data.code === 200) {
 					this.detailMsg = res.data.data
 					console.log('图片详情', this.detailMsg)
+					const result = await queryCreatorScanCodeById(this.detailMsg.creatorId)
+					if(result.data.code === 200){
+						this.scanCode = result.data.data.scanCode
+					}else{
+						uni.showToast({
+							title: '该艺术家不存在!',
+							icon: 'none'
+						})
+					}
 					uni.getStorage({
 						key: 'userInfo',
 						success: res => {
@@ -186,12 +200,61 @@
 
 
 			},
+			//写入图片广告收益
+			async insertPreAdProfit(){
+				const params = {
+					imgId: this.detailMsg.id,
+					creatorId: this.detailMsg.creatorId,
+					scanCode: this.scanCode,
+					appType: '0',
+					platform: '0'
+				}
+				const res = await insertOrUpdatePreAdProfit(params);
+				if (res.data.code === 200) {
+					console.log("写入广告收益成功!")
+					this.adResult = res.data.code;
+				}else{
+					uni.showToast({
+						title: '图片下载失败!',
+						icon: 'none'
+					})
+				}
+			},
+			
+			//写入图片邀请收益
+			async insertPreInviteProfit(){
+				const params = {
+					imgId: this.detailMsg.id,
+					creatorId: this.detailMsg.creatorId,
+					scanCode: this.scanCode,
+					appType: '0',
+					platform: '0'
+				}
+				const res = await insertOrUpdatePreInviteProfit(params)
+				if (res.data.code === 200) {
+					console.log("写入邀请收益成功");
+					this.inviteResult = res.data.code;
+				}else{
+					uni.showToast({
+						title: '图片下载失败!',
+						icon: 'none'
+					})
+				} 
+			},
+			
 			// 下载
 			download(url) {
 				this.isDownload = true
 				uni.showLoading({
 					title: '正在保存图片...'
 				});
+				this.insertPreAdProfit();
+				this.insertPreInviteProfit();
+				console.log('广告响应结果',this.adResult);
+				console.log('邀请响应',this.inviteResult)
+				// if(aResult === 200 && iResult === 200){
+					
+				// }
 				//获取用户的当前设置。获取相册权限
 				uni.getSetting({
 					success: (res) => {

pages/userInfo/myCollection/myCollection.vue

@@ -48,6 +48,7 @@
 					userId: this.userInfo.id
 				})
 				if (res.data.code === 200) {
+					console.log('图片结果为：',res)
 					for (let i = 0; i < res.data.data.length; i++) {
 						this.imgList = res.data.data
 					}
@@ -58,7 +59,7 @@
 					})
 				}
 			},
-			// 前往详情页
+			// 前往详情页 //TODO bug待修复
 			targetDetail(item) {
 				console.log('跳转', item)
 				if (item.id) {
@@ -68,7 +69,7 @@
 						success() {
 							console.log(111111)
 							uni.navigateTo({
-								url: '../creator/imgDetail'
+								url: '../../creator/imgDetail'
 							})
 						}
 					})

pages/userInfo/userInfo.vue

@@ -17,9 +17,6 @@
 				<button title="分享" open-type="share">分享</button>
 			</view>
 		</uni-list>
-		<view class="bottom-btn">
-			<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">绑定手机号</button>
-		</view>
 	</view>
 </template>
 
@@ -38,18 +35,13 @@
 				console.log(res)
 			}
 			return {
-				title: '自定义分享标题',
+				title: '想要好看的图片就来[节点壁纸]吧!',
 				path: `/pages/index/index?id=${this.userInfo.id}`
 			}
 		},
 		methods: {
 			share() {
 
-			},
-			getPhoneNumber(e) {
-				console.log(e.detail.errMsg);
-				console.log(e.detail.iv);
-				console.log(e.detail.encryptedData);
 			}
 		}
 	}