From 86becf8df5e2e00d2cd46b3e552e8a7539fa71e2 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 30 Oct 2024 14:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/navbar.vue                         | 17 ++++-
 components/base/tabbar.vue                         | 18 ++---
 components/content/contentControls.vue             | 85 +++++++++++++++++++++-
 config.js                                          |  2 +-
 pages/publish/actorDetail.vue                      |  2 +-
 pages_mine/mine/certifiedIndividual.vue            | 20 ++---
 .../mine/sonPage/promotion/promotionRecordList.vue |  7 +-
 pages_mine/mine/sonPage/release/releaseList.vue    |  2 +-
 8 files changed, 125 insertions(+), 28 deletions(-)

diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index 909f33c..e774ef4 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -4,8 +4,14 @@
 		<view class="title"
 		:style="{backgroundColor : bgColor}">
 			<view class="left">
+				
 				<uv-icon name="arrow-left"
-				v-if="leftClick"
+				v-if="length == 1"
+				@click="toHome"
+				color="#333" size="46rpx"></uv-icon>
+				
+				<uv-icon name="arrow-left"
+				v-else-if="leftClick"
 				@click="$emit('leftClick')"
 				color="#333" size="46rpx"></uv-icon>
 			</view>
@@ -72,9 +78,18 @@
 		},
 		data() {
 			return {
+				length : getCurrentPages().length
 			};
 		},
 		methods : {
+			toHome(){
+				if(this.length != 1){
+					return
+				}
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			}
 		}
 	}
 </script>
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index e6e06ff..50c2a3a 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -51,15 +51,15 @@
 			};
 		},
 		mounted() {
-			this.inter = setInterval(() => {
-				console.log('$forceUpdate', this.isVedio);
-				this.$forceUpdate()
-			}, 500)
+			// this.inter = setInterval(() => {
+			// 	console.log('$forceUpdate', this.isVedio);
+			// 	this.$forceUpdate()
+			// }, 500)
 			
-			setTimeout(() => {
-				clearInterval(this.inter)
-				this.inter = null
-			}, 20000)
+			// setTimeout(() => {
+			// 	clearInterval(this.inter)
+			// 	this.inter = null
+			// }, 20000)
 		},
 		beforeDestroy() {
 			if(this.inter){
@@ -71,7 +71,7 @@
 				if(index == this.select){
 					return
 				}
-				uni.redirectTo({
+				uni.reLaunch({
 					url: item.pagePath
 				})
 			},
diff --git a/components/content/contentControls.vue b/components/content/contentControls.vue
index 2dcc150..8818b10 100644
--- a/components/content/contentControls.vue
+++ b/components/content/contentControls.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="controls">
 		<view class="bell"
-		@click="bell">
+		@click="$refs.confirmationPopup.open('bottom')">
 			<uv-icon size="35rpx" name="bell"></uv-icon>
 			举报
 		</view>
@@ -34,12 +34,51 @@
 			size="35rpx" name="thumb-down"></uv-icon>
 			踩
 		</view>
+		
+		
+		<!-- <confirmationPopup
+		ref="confirmationPopup"
+		title="举报"
+		@confirm="bell"
+		confirmText="确认举报">
+			<view class="confirmationPopup">
+				<view class="list">
+					<view
+					v-for="(item, index) in ju">
+						{{ item.title }}
+					</view>
+				</view>
+				
+			</view>
+		</confirmationPopup> -->
+		
+		<uv-popup ref="confirmationPopup" 
+		:round="30" 
+		:customStyle="{height: '50vh'}">
+			<view class="confirmationPopup">
+				<view class="list">
+					<view
+					:key="index"
+					@click="bell(item)"
+					v-for="(item, index) in ju">
+						{{ item.content }}
+						<!-- <view class="content">
+							{{ item.content }}
+						</view> -->
+					</view>
+				</view>
+			</view>
+		</uv-popup>
 	</view>
 </template>
 
 <script>
+	import confirmationPopup from '@/components/toast/confirmationPopup.vue'
 	export default {
 		name:"contentControls",
+		components : {
+			confirmationPopup,
+		},
 		props : {
 			type : {
 				default : 0
@@ -59,20 +98,41 @@
 		},
 		data() {
 			return {
-				
+				ju : [
+					{
+						title : '虚假信息',
+					},
+					{
+						title : '其他原因',
+					},
+				],
+				act : 0,
 			};
 		},
+		created() {
+			this.indexGetComplaintReason()
+		},
 		methods : {
+			indexGetComplaintReason(){
+				this.$api('indexGetComplaintReason', res => {
+					if(res.code == 200){
+						this.ju = res.result
+					}
+				})
+			},
 			// 举报
-			bell(){
+			bell(item){
 				this.$api('infoReport', {
 					type : this.type,
 					id : this.detail.id,
+					content : item.content
 				}, res => {
+					this.$refs.confirmationPopup.close()
 					if(res.code == 200){
 						this.$emit('loadData')
 						uni.showToast({
-							title: res.message
+							title: '举报成功',
+							// title: res.message,
 						})
 					}
 				})
@@ -131,5 +191,22 @@
 	.share::after{
 		border: none;
 	}
+	.confirmationPopup{
+		overflow: auto;
+		height: 100%;
+		padding: 20rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+		.list{
+			padding-bottom: env(safe-area-inset-bottom);
+			&>view{
+				margin: 20rpx;
+				display: flex;
+				justify-content: center;
+				padding: 20rpx;
+				border-radius: 10rpx;
+				border: 1px solid #000;
+			}
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/config.js b/config.js
index 9a6313c..0c3a700 100644
--- a/config.js
+++ b/config.js
@@ -5,7 +5,7 @@ import utils from './utils/utils.js'
 
 
 // 当前环境
-const type = 'prod'
+const type = 'dev'
 
 
 // 环境配置
diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue
index 2072333..a20d023 100644
--- a/pages/publish/actorDetail.vue
+++ b/pages/publish/actorDetail.vue
@@ -135,7 +135,7 @@
 		    return {
 		      title: this.item.details.title,
 		      desc: this.item.details.content && this.item.details.content.slice(0, 30),
-		      path: '/pages/publish/postDetail?id=' + this.id
+		      path: '/pages/publish/actorDetail?id=' + this.id
 		    }
 		},
 		onShow() {
diff --git a/pages_mine/mine/certifiedIndividual.vue b/pages_mine/mine/certifiedIndividual.vue
index ce470dc..8d1f1c2 100644
--- a/pages_mine/mine/certifiedIndividual.vue
+++ b/pages_mine/mine/certifiedIndividual.vue
@@ -162,25 +162,27 @@
 				flex-direction: column;
 				justify-content: center;
 				align-items: center;
-				gap: 150rpx;
-				margin-top: 15%;
+				gap: 80rpx;
+				margin-top: 20rpx;
 
 				.avatarFace {
-					width: 80vw;
-					height: 20vh;
+					width: 600rpx;
+					height: 300rpx;
 				}
 
 				.reverseSide {
-					width: 80vw;
-					height: 20vh;
+					width: 600rpx;
+					height: 300rpx;
 				}
 			}
 		}
 
 		.bottomBtn {
-			position: fixed;
-			bottom: 15%;
-			left: 25%;
+			// position: fixed;
+			// bottom: 15%;
+			// left: 25%;
+			margin: 0 auto;
+			margin-top: 50rpx;
 			width: 50%;
 			height: 60rpx;
 			line-height: 60rpx;
diff --git a/pages_mine/mine/sonPage/promotion/promotionRecordList.vue b/pages_mine/mine/sonPage/promotion/promotionRecordList.vue
index 2b44a95..3f8de7a 100644
--- a/pages_mine/mine/sonPage/promotion/promotionRecordList.vue
+++ b/pages_mine/mine/sonPage/promotion/promotionRecordList.vue
@@ -3,7 +3,7 @@
     <view class="item" v-for="(item, index) in list"
           @click="gotoItem(item)"
           :key="index">
-      <image :src="item.image" style="width: 40%"></image>
+      <image :src="item.image" style="width: 40%" mode="aspectFill"></image>
       <view class="text">
         <view>
           <view class="title">
@@ -22,9 +22,12 @@
               价格：{{ item.price }}
             </view>
           </view>
-          <view class="createTime">
+          <view class="createTime" v-if="item.isState == 1">
             推广时间：{{ item.createTime }}
           </view>
+          <view class="createTime" v-else>
+            未开始
+          </view>
         </view>
       </view>
     </view>
diff --git a/pages_mine/mine/sonPage/release/releaseList.vue b/pages_mine/mine/sonPage/release/releaseList.vue
index a70a05a..f3a9820 100644
--- a/pages_mine/mine/sonPage/release/releaseList.vue
+++ b/pages_mine/mine/sonPage/release/releaseList.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="publishList">
 		<view class="item" v-for="(item, index) in list" @click="gotoDetail(item)" :key="index">
-			<image :src="item.image" style="width: 40%"></image>
+			<image :src="item.image" style="width: 40%" mode="aspectFill"></image>
 			<view class="text">
 				<view class="title">
 					{{ item.title || item.name }}