From c73defcb5529a04198042066db82e305e1cf1fe3 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 6 Sep 2024 23:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                 |  16 +++
 components/config/showPrivacyAgreement.vue | 188 +++++++++++++++++------------
 components/post/actorList.vue              |   6 +-
 main.js                                    |   3 +
 manifest.json                              |   2 +-
 pages/index/index.vue                      |  34 +++---
 pages/mine/promotionRecord.vue             |   1 -
 pages/mine/purse.vue                       |  52 ++++++--
 pages/publish/actorDetail.vue              |  44 +++++--
 9 files changed, 224 insertions(+), 122 deletions(-)

diff --git a/api/api.js b/api/api.js
index 971e4a0..d7d6dba 100644
--- a/api/api.js
+++ b/api/api.js
@@ -18,6 +18,11 @@ const config = {
 		url: '/api/index/getBanner',
 		method: 'GET'
 	},
+	//获取演员集详情接口
+	indexGetActorDetail: {
+		url: '/api/index/getActorDetail',
+		method: 'GET'
+	},
 	//获取认证演员
 	indexGetActorList: {
 		url: '/api/index/getActorList',
@@ -43,6 +48,11 @@ const config = {
 		url: '/api/index/getComplaintReason',
 		method: 'GET'
 	},
+	//获取投诉原因
+	indexGetGetWorkPage: {
+		url: '/api/index/getWorkPage',
+		method: 'GET'
+	},
 
 
 
@@ -54,6 +64,12 @@ const config = {
 		method: 'GET',
 		auth: true
 	},
+	//获取用户平台数据
+	infoGetInfoMoney: {
+		url: '/api/info/getInfoMoney',
+		method: 'GET',
+		auth: true
+	},
 	//获取银行卡列表带分页
 	infoGetBankCardPage: {
 		url: '/api/info/getBankCardPage',
diff --git a/components/config/showPrivacyAgreement.vue b/components/config/showPrivacyAgreement.vue
index 99b6bb4..3166553 100644
--- a/components/config/showPrivacyAgreement.vue
+++ b/components/config/showPrivacyAgreement.vue
@@ -1,118 +1,148 @@
 <template>
-	<uv-popup ref="privacyPopup">
+	<uv-popup ref="popup" z-index="99999" :closeOnClickOverlay="false" :customStyle="{ backgroundColor: 'transparent' }">
 		<view class="privacyPopup">
 			<view class="title">
-				<view class="title_circle"></view>
-				<view>{{ title }}</view>
+				<view>协议与隐私政策</view>
 			</view>
 			<view class="content_pri">
-				<text>在你使用【{{ title }}】服务之前，请仔细阅读</text>
-				<text style="color: #1793ee;" @click="goToPrivacy">《{{ title }}小程序隐私保护指引》</text>。
-				<text>如你同意{{ title }}小程序隐私保护指引，请点击“同意”开始使用【{{ title }}】。</text>
+				<view class="text">
+					欢迎来到车队佳油!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。
+				</view>
+			</view>
+			<view class="config">
+				<uv-checkbox-group v-model="checkboxValue" shape="circle">
+					<view class="content">
+						<view style="display: flex;">
+							<uv-checkbox size="30rpx" :name="1"></uv-checkbox>
+							同意<text @click="goToPrivacy">《车队佳油隐私政策》</text>
+						</view>
+						<view class="">
+							以及<text @click="goToPrivacy">《用户协议》</text>
+						</view>
+					</view>
+				</uv-checkbox-group>
 			</view>
 			<view class="pri_btn">
-				<button class="confuse_btn" @click="confusePrivacy">拒绝</button>
-				<button class="confirm_btn" id="agree-btn" open-type="agreePrivacyAuthorization"
-					@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
+				<!-- <button class="confuse_btn" @click="confusePrivacy">拒绝</button> -->
+				<button 
+				class="confirm_btn" id="agree-btn" 
+				open-type="agreePrivacyAuthorization"
+				@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
 			</view>
 		</view>
 	</uv-popup>
 </template>
 
-
 <script>
 	export default {
-		data(){
-			return{
-				title : '帧视界',
+		name: 'PrivacyAgreementPoup',
+		data() {
+			return {
+				resolvePrivacyAuthorization: {},
+				checkboxValue : false
+			}
+		},
+		mounted() {
+			if(wx.getPrivacySetting){
+				wx.getPrivacySetting({
+					success: res => {
+						console.log(res)
+						if (res.needAuthorization) {
+							// 需要弹出隐私协议
+							this.init()
+						}
+					},
+					fail: () => {}
+				})
 			}
 		},
-		methods:{
-			init(resolve){
-				this.$refs.privacyPopup.open()
+		methods: {
+
+			//初始化
+			init(resolve) {
+				this.$refs.popup.open('center')
 				this.resolvePrivacyAuthorization = resolve
 			},
+
 			// 打开隐私协议
-			goToPrivacy(){
+			goToPrivacy() {
 				wx.openPrivacyContract({
-				  success: () => {
+					success: () => {
 						console.log('打开成功');
 					}, // 打开成功
-				  fail: () => {
+					fail: () => {
 						uni.showToast({
-							title:'打开失败，稍后重试',
+							title: '打开失败，稍后重试',
 							icon: 'none'
 						})
 					} // 打开失败
 				})
 			},
+
 			// 拒绝
-			confusePrivacy(){
-				this.$refs.privacyPopup.close()
-				this.resolvePrivacyAuthorization({ event:'disagree' })
+			confusePrivacy() {
+				this.$refs.popup.close()
+				this.resolvePrivacyAuthorization({
+					event: 'disagree'
+				})
 			},
+
 			// 同意
-			handleAgreePrivacyAuthorization(){
+			handleAgreePrivacyAuthorization() {
 				// 告知平台用户已经同意，参数传同意按钮的id
-				this.resolvePrivacyAuthorization({ buttonId: 'agree-btn', event: 'agree' })
-				this.$refs.privacyPopup.close()
+				// this.resolvePrivacyAuthorization({
+				// 	buttonId: 'agree-btn',
+				// 	event: 'agree'
+				// })
+				this.$refs.popup.close()
 			}
 		}
 	}
 </script>
 
-
-<style scoped lang="scss">
-	*{
-		box-sizing: border-box;
-	}
-	.privacyPopup{
-		width: 520rpx;
-		/* height: 500rpx; */
-		background-color: #fff;
-		border-radius: 50rpx;
-		padding: 20rpx 40rpx;
-	}
-	.title{
-		display: flex;
-		align-items: center;
-		justify-content: start;
-		margin: 20rpx 0;
-		font-size: 38rpx;
-		font-weight: 600;
-	}
-	.title .title_circle{
-		width: 60rpx;
-		height: 60rpx;
-		background-color: #efefef;
-		border-radius: 50%;
-		margin-right: 20rpx;
-	}
-	.content_pri{
-		width: 480rpx;
-		margin: 0 auto;
-		font-size: 34rpx;
-		line-height: 1.5;
-	}
-	.pri_btn{
-		width: 100%;
-		height: 158rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-evenly;
-	}
-	.pri_btn .confuse_btn,.pri_btn .confirm_btn{
-		width: 200rpx;
-		height: 90rpx;
+<style lang="scss" scoped>
+	.privacyPopup {
+		width: 90%;
+		margin: 0rpx auto;
+		background: white;
 		border-radius: 20rpx;
-		font-size: 34rpx;
-	}
-	.pri_btn .confuse_btn{
-		background-color: #eee;
-		color: #52bf6b;
-	}
-	.pri_btn .confirm_btn{
-		background-color: #52bf6b;
-		color: #fff;
+		box-sizing: border-box;
+		padding: 40rpx 30rpx;
+
+		.title {
+			text-align: center;
+			font-size: 36rpx;
+		}
+
+		.content_pri {
+			padding: 30rpx 0rpx;
+			font-size: 28rpx;
+		}
+
+		.config {
+			font-size: 28rpx;
+			text-align: center;
+			line-height: 40rpx;
+			margin-bottom: 30rpx;
+
+			text {
+				color: #00aaff;
+			}
+			
+			.content{
+				display: flex;
+			}
+		}
+
+		.pri_btn {
+
+			button {
+				background: #00aaff;
+				outline: none;
+				color: white;
+				font-size: 30rpx;
+			}
+
+		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/post/actorList.vue b/components/post/actorList.vue
index bfdd00f..6950d0d 100644
--- a/components/post/actorList.vue
+++ b/components/post/actorList.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="postList">
 		<view class="item" v-for="(item, index) in list"
-		@click="$utils.navigateTo('/publish/postDetail?id=123')"
+		@click="$utils.navigateTo('/publish/actorDetail?id=' + item.id)"
 		:key="index">
 			<image 
 			:src="item.image &&
@@ -17,7 +17,7 @@
 					</view>
 				</view>
 				<view class="info">
-					(介绍:介绍内容介内容介绍内容介内容介绍内容介内容介绍内容介内容)
+					{{ item.photographerContent }}
 				</view>
 				<view class="createBy">
 					<!-- <view class="">
@@ -31,7 +31,7 @@
 					联系方式 <text>去查看</text>
 				</view>
 				<view class="price">
-					价格 <text>￥9999</text>
+					价格 <text>￥{{ item.money }}</text>
 				</view>
 			</view>
 		</view>
diff --git a/main.js b/main.js
index 8468fb0..0d7bf7e 100644
--- a/main.js
+++ b/main.js
@@ -26,6 +26,9 @@ uni.$uv.setConfig({
 	},
 })
 
+//
+//wxe7ae8cbe1673834c
+
 //组件注册
 import configPopup from '@/components/config/configPopup.vue'
 import changeLanguage from '@/components/base/changeLanguage.vue'
diff --git a/manifest.json b/manifest.json
index f3f3714..6f93d37 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxe7ae8cbe1673834c",
+        "appid" : "wx3c24e397e3b132ea",
         "setting" : {
             "urlCheck" : false,
             "ignoreDevUnusedFiles" : false
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 678a26b..6df0904 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -122,24 +122,25 @@
 				actorList : [],
 				postList : [],
 				trends : [],
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10
+				},
+				total : 0,
 			}
 		},
 		computed : {
 		},
+		//滚动到屏幕底部
+		onReachBottom() {
+			if(this.queryParams.pageSize < this.total){
+				this.queryParams.pageSize += 10
+				this.indexGetTrendsPage()
+			}
+		},
 		onShow() {
 			this.getData()
-			
-			
-			if(wx.onNeedPrivacyAuthorization){
-				console.log('onNeedPrivacyAuthorization');
-				wx.onNeedPrivacyAuthorization(resolve => {
-					console.log('onNeedPrivacyAuthorization');
-					// 需要用户同意隐私授权时
-					// 弹出开发者自定义的隐私授权弹窗
-					this.resolvePrivacyAuthorization = resolve
-					this.$refs.showPrivacy.init(resolve)
-				})
-			}
+			this.indexGetTrendsPage()
 		},
 		methods: {
 			getData(){
@@ -153,12 +154,13 @@
 						this.actorList = res.result
 					}
 				})
-				this.$api('indexGetTrendsPage', {
-					pageNo : 1,
-					pageSize : 10,
-				}, res => {
+			},
+			indexGetTrendsPage(){
+				this.$api('indexGetTrendsPage', 
+				this.queryParams, res => {
 					if(res.code == 200){
 						this.trends = res.result.records
+						this.total = res.result.total
 					}
 				})
 			},
diff --git a/pages/mine/promotionRecord.vue b/pages/mine/promotionRecord.vue
index 078b58c..1c3049e 100644
--- a/pages/mine/promotionRecord.vue
+++ b/pages/mine/promotionRecord.vue
@@ -54,7 +54,6 @@
 <script>
 import PromotionRecordList from "@/pages/mine/sonPage/promotion/promotionRecordList.vue";
 import moment from "moment";
-
 export default {
   components: {PromotionRecordList},
   data() {
diff --git a/pages/mine/purse.vue b/pages/mine/purse.vue
index d3942a1..4665ffb 100644
--- a/pages/mine/purse.vue
+++ b/pages/mine/purse.vue
@@ -10,21 +10,21 @@
       <!--上部分-->
       <view class="content-top">
         <view class="aaa">
-          <view class="top">￥1240,045</view>
+          <view class="top">￥{{ money.money }}</view>
           <view class="bottom">可提现金额</view>
         </view>
         <view class="b">
           <view class="bb">
             <view class="top">今日收益</view>
-            <view class="bottom">￥1234</view>
+            <view class="bottom">￥{{ money.todayMoney }}</view>
           </view>
           <view class="bb">
             <view class="top">累计收益</view>
-            <view class="bottom">￥1234</view>
+            <view class="bottom">￥{{ money.userSumMoney }}</view>
           </view>
           <view class="bb">
             <view class="top">已提现</view>
-            <view class="bottom">￥1234</view>
+            <view class="bottom">￥{{ money.userMoney }}</view>
           </view>
         </view>
       </view>
@@ -34,16 +34,16 @@
         <view class="card-record">卡片记录</view>
         <!--具体银行卡-->
         <view class="cards" >
-          <view class="cardItem" v-for="(item, index) in 5" :key="index">
+          <view class="cardItem" v-for="(item, index) in list" :key="index">
             <view class="cardImage">
               <image src="/static/image/addBankCard/1.svg" style="width: 100%;height: 100%;"></image>
             </view>
             <view class="cardInfo">
               <view class="cardNum">
-                6222021000000000018
+                {{ item.bankId }}
               </view>
               <view class="cardName">
-                工商银行
+                {{ item.bankAddress }}
               </view>
             </view>
             <view class="cardIcon">
@@ -72,8 +72,27 @@ import '../../common.css'; // 引入公共 CSS 文件
 
 export default {
   data() {
-    return {};
+    return {
+		queryParams: {
+			pageNo: 1,
+			pageSize: 10
+		},
+		total : 0,
+		list : [],
+		money : {}
+	};
   },
+  onShow() {
+  	this.getData()
+  	this.infoGetInfoMoney()
+  },
+	//滚动到屏幕底部
+	onReachBottom() {
+		if(this.queryParams.pageSize < this.total){
+			this.queryParams.pageSize += 10
+			this.getData()
+		}
+	},
   methods: {
     // 跳转到收益记录页面
     gotoIncomeRecordPage() {
@@ -82,7 +101,22 @@ export default {
     // 跳转到提现页面
     gotoWithdrawPage() {
       this.$utils.navigateTo('/mine/withdraw');
-    }
+    },
+	getData(){
+		this.$api('infoGetBankCardPage', this.queryParams, res => {
+			if(res.code == 200){
+				this.list = res.result.records
+				this.total = res.result.total
+			}
+		})
+	},
+	infoGetInfoMoney(){
+		this.$api('infoGetInfoMoney', res => {
+			if(res.code == 200){
+				this.money = res.result
+			}
+		})
+	},
   }
 }
 </script>
diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue
index 141c609..1a9c534 100644
--- a/pages/publish/actorDetail.vue
+++ b/pages/publish/actorDetail.vue
@@ -14,7 +14,7 @@
 
 			<view class="topInfo">
 				<view class="title">
-					{{ item.title }}
+					{{ item.name }}
 				</view>
 			</view>
 
@@ -34,18 +34,18 @@
 
 
 			<view class="content">
-				<uv-parse :content="item.content"></uv-parse>
+				<uv-parse :content="item.photographerContent"></uv-parse>
 			</view>
 			
 			<view class="works">
 				<view class="item" 
-				v-for="(item, index) in 10"
+				v-for="(item, index) in list"
 				:key="index">
 					<view class="item-title">
-						代表作品夏
+						{{ item.title }}
 					</view>
 					<view class="item-image">
-						
+						<image :src="item.image" mode=""></image>
 					</view>
 				</view>
 			</view>
@@ -62,22 +62,30 @@
 		},
 		data() {
 			return {
-				item: {
-					title: "这是一条动态",
-					createTime: '2024-08-22 09:00:00',
-					createBy: "小飞",
-					content: '这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态这是一条动态',
+				item: {},
+				list : [],
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10
 				},
+				total : 0,
 			}
 		},
 		onLoad(options) {
 			// this.$route.query的参数
-			console.log(options)
-			// this.getData(options.id)
+			this.getData(options.id)
+			this.getList()
+		},
+		//滚动到屏幕底部
+		onReachBottom() {
+			if(this.queryParams.pageSize < this.total){
+				this.queryParams.pageSize += 10
+				this.indexGetTrendsPage()
+			}
 		},
 		methods: {
 			getData(id){
-				this.$api('indexGetTrendsDetail', {
+				this.$api('indexGetActorDetail', {
 					id
 				}, res => {
 					if(res.code == 200){
@@ -85,6 +93,16 @@
 					}
 				})
 			},
+			getList(){
+				this.$api('indexGetGetWorkPage', {
+					token : uni.getStorageSync('token')
+				}, res => {
+					if(res.code == 200){
+						this.list = res.result.records
+						this.total = res.result.total
+					}
+				})
+			}
 		}
 	}
 </script>