Merge branch 'lr' of http://1.94.221.165:3000/sx/jiuyiUniapp

# Conflicts:
#	jiuyi2/pages/news/chat/chat.vue

jiuyi/node_modules/.vue-global-types/vue_99_0_0_0.d.ts

@@ -0,0 +1,121 @@
+// @ts-nocheck
+export {};
+
+; declare global {
+	const __VLS_intrinsicElements: __VLS_IntrinsicElements;
+	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
+	const __VLS_unref: typeof import('vue').unref;
+	const __VLS_placeholder: any;
+
+	type __VLS_NativeElements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
+	type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements;
+	type __VLS_Element = import('vue/jsx-runtime').JSX.Element;
+	type __VLS_GlobalComponents = import('vue').GlobalComponents;
+	type __VLS_GlobalDirectives = import('vue').GlobalDirectives;
+	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
+	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+	type __VLS_SpreadMerge<A, B> = Omit<A, keyof B> & B;
+	type __VLS_WithComponent<N0 extends string, LocalComponents, Self, N1 extends string, N2 extends string, N3 extends string> =
+		N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
+		N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
+		N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N3] } :
+		Self extends object ? { [K in N0]: Self } :
+		N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
+		N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
+		N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
+		{ [K in N0]: unknown };
+	type __VLS_FunctionalComponentProps<T, K> =
+		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
+		: T extends (props: infer P, ...args: any) => any ? P :
+		{};
+	type __VLS_IsFunction<T, K> = K extends keyof T
+		? __VLS_IsAny<T[K]> extends false
+		? unknown extends T[K]
+		? false
+		: true
+		: false
+		: false;
+	type __VLS_NormalizeComponentEvent<Props, Events, onEvent extends keyof Props, Event extends keyof Events, CamelizedEvent extends keyof Events> = (
+		__VLS_IsFunction<Props, onEvent> extends true
+			? Props
+			: __VLS_IsFunction<Events, Event> extends true
+				? { [K in onEvent]?: Events[Event] }
+				: __VLS_IsFunction<Events, CamelizedEvent> extends true
+					? { [K in onEvent]?: Events[CamelizedEvent] }
+					: Props
+	) & Record<string, unknown>;
+	// fix https://github.com/vuejs/language-tools/issues/926
+	type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
+	type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
+		? U extends T
+		? never
+		: __VLS_OverloadUnionInner<T, Pick<T, keyof T> & U & ((...args: A) => R)> | ((...args: A) => R)
+		: never;
+	type __VLS_OverloadUnion<T> = Exclude<
+		__VLS_OverloadUnionInner<(() => never) & T>,
+		T extends () => never ? never : () => never
+	>;
+	type __VLS_ConstructorOverloads<T> = __VLS_OverloadUnion<T> extends infer F
+		? F extends (event: infer E, ...args: infer A) => any
+		? { [K in E & string]: (...args: A) => void; }
+		: never
+		: never;
+	type __VLS_NormalizeEmits<T> = __VLS_PrettifyGlobal<
+		__VLS_UnionToIntersection<
+			__VLS_ConstructorOverloads<T> & {
+				[K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never
+			}
+		>
+	>;
+	type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
+	type __VLS_PickFunctionalComponentCtx<T, K> = NonNullable<__VLS_PickNotAny<
+		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
+		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
+	>>;
+	type __VLS_OmitStringIndex<T> = {
+		[K in keyof T as string extends K ? never : K]: T[K];
+	};
+	type __VLS_UseTemplateRef<T> = Readonly<import('vue').ShallowRef<T | null>>;
+
+	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
+		item: T extends number ? number
+			: T extends string ? string
+			: T extends any[] ? T[number]
+			: T extends Iterable<infer T1> ? T1
+			: any,
+		index: number,
+	][];
+	function __VLS_getVForSourceType<T>(source: T): [
+		item: T[keyof T],
+		key: keyof T,
+		index: number,
+	][];
+	// @ts-ignore
+	function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
+	// @ts-ignore
+	function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
+	function __VLS_asFunctionalDirective<T>(dir: T): T extends import('vue').ObjectDirective
+		? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
+		: T extends (...args: any) => any
+			? T
+			: (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
+	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
+	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
+		T extends new (...args: any) => any
+		? (props: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>, ctx?: any) => __VLS_Element & {
+			__ctx?: {
+				attrs?: any;
+				slots?: K extends { $slots: infer Slots } ? Slots : any;
+				emit?: K extends { $emit: infer Emit } ? Emit : any;
+				expose?(exposed: K): void;
+				props?: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>;
+			}
+		}
+		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
+		: T extends (...args: any) => any ? T
+		: (_: {} & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record<string, unknown> } };
+	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
+	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (attrs: T & Record<string, unknown>) => void;
+	function __VLS_asFunctionalSlot<S>(slot: S): (props: NonNullable<S> extends (props: infer P) => any ? P : {}) => void;
+	function __VLS_tryAsConstant<const T>(t: T): T;
+}

jiuyi2/api/mine.js

@@ -354,9 +354,9 @@ const mine = {
 	},
 
 	/**
-	 * 查看已绑定的银行卡列表 
+	* 查看已绑定的银行卡列表
-	 * @param {Object} param
+	* @param {Object} param
-	 */
+	*/
 	getBankCards(param) {
 		return util.request({
 			url: '/user/bank-cards/getBankCards',
@@ -366,9 +366,8 @@ const mine = {
 			load: true,
 		})
 	},
-
 	/**
-	 * 添加银行卡 
+	 * 添加银行卡
 	 * @param {Object} param
 	 */
 	addBankCard(param) {
@@ -393,6 +392,30 @@ const mine = {
 			load: true,
 		})
 	},
+
+	/**
+	 * 拉黑
+	 * @param {Object} param
+	 */
+	blockUser(param) {
+		return util.request({
+			url: `/video/statistics/block`,
+			data: param,
+			method: 'POST',
+		})
+	},
+	
+	/**
+	 * 解锁他人评论
+	 * @param {Object} param
+	 */
+	unlockComment(param) {
+		return util.request({
+			url: `/video/comment/unlockOthersComment`,
+			data: param,
+			method: 'POST',
+		})
+	},
 }
 
 export default mine

jiuyi2/api/video.js

@@ -426,7 +426,7 @@ const video = {
 	 */
 	reportVideo(param) {
 		return util.request({
-			url: `/report/reportVideo`,
+			url: `/video/videoReport`,
 			data: param.data,
 			method: 'POST',
 		})

jiuyi2/components/index/videoMenu.vue

@@ -1,138 +1,138 @@
 <script setup>
-	/**
+/**
-	 * 视频菜单组件
+ * 视频菜单组件
-	 * 
+ * 
-	 */
+ */
 
-	import {
+import {
-		ref,
+	ref,
-		reactive,
+	reactive,
-		onMounted
+	onMounted
-	} from 'vue'
+} from 'vue'
-	import video from '../../api/video';
+import video from '../../api/video';
-	import util from '../../common/js/util';
+import util from '../../common/js/util';
 
-	// 传参
+// 传参
-	const props = defineProps({
+const props = defineProps({
-		// 列表数据
+	// 列表数据
-		list: {
+	list: {
-			type: Array,
+		type: Array,
-		},
+	},
-		// 模式 list列表展示 点击播放视频 menu菜单模式 点击触发回调事件 checkbox多选
+	// 模式 list列表展示 点击播放视频 menu菜单模式 点击触发回调事件 checkbox多选
-		mode: {
+	mode: {
-			type: String,
+		type: String,
-			default: 'list',
+		default: 'list',
-		},
+	},
-		// 多选模式下的 选择数量限制 0为不限制
+	// 多选模式下的 选择数量限制 0为不限制
-		limit: {
+	limit: {
-			type: Number,
+		type: Number,
-			default: 0,
+		default: 0,
-		},
+	},
-		// 是否我自己 0不是 1是
+	// 是否我自己 0不是 1是
-		isMine: {
+	isMine: {
-			type: [String, Number],
+		type: [String, Number],
-			default: 0,
+		default: 0,
-		},
+	},
-		// 是否显示统计 0不显示 1显示
+	// 是否显示统计 0不显示 1显示
-		statistic: {
+	statistic: {
-			type: [String, Number],
+		type: [String, Number],
-			default: 0,
+		default: 0,
-		},
+	},
-	})
+})
-	// 子触发父
+// 子触发父
-	const emit = defineEmits(['item'])
+const emit = defineEmits(['item'])
-	// 已选择的视频id
+// 已选择的视频id
-	const ids = defineModel('ids')
+const videoInfo = reactive({
-	// 视频上下文对象
+	videoId: '',
-	const videoContext = ref(null)
+	coverUrl: '',
-	// 视频播放路径
+})
-	const videoUrl = ref('')
+// 视频上下文对象
+const videoContext = ref(null)
+// 视频播放路径
+const videoUrl = ref('')
 
-	onMounted(() => {
+onMounted(() => {
-		// 创建视频上下文对象
+	// 创建视频上下文对象
-		videoContext.value = uni.createVideoContext('video')
+	videoContext.value = uni.createVideoContext('video')
-	})
+})
 
-	// 进入全屏
+// 进入全屏
-	function requestFullScreen() {
+function requestFullScreen() {
-		videoContext.value.requestFullScreen()
+	videoContext.value.requestFullScreen()
-	}
+}
 
-	// 暂停
+// 暂停
-	function pause() {
+function pause() {
-		// 暂停当前视频
+	// 暂停当前视频
-		videoContext.value.pause()
+	videoContext.value.pause()
-	}
+}
 
-	/**
+/**
-	 * 点击视频播放
+ * 点击视频播放
-	 * @param {Object} item
+ * @param {Object} item
-	 */
+ */
-	function handleVideo(item) {
+function handleVideo(item) {
-		// 列表模式
+	// 列表模式
-		if (props.mode == 'list') {
+	if (props.mode == 'list') {
-			uni.navigateTo({
+		uni.navigateTo({
-				url: util.setUrl('/pages/index/videoDetail', {
+			url: util.setUrl('/pages/index/videoDetail', {
-					videoId: item.id,
+				videoId: item.id,
-					isMine: props.isMine,
+				isMine: props.isMine,
-					statistic: props.statistic,
+				statistic: props.statistic,
-				})
 			})
-			// videoUrl.value = item.format_videoUrl
+		})
-			// 进入全屏
+		// videoUrl.value = item.format_videoUrl
-			// requestFullScreen()
+		// 进入全屏
-		}
+		// requestFullScreen()
-		// 菜单模式
-		else if (props.mode == 'menu') {
-			emit('item', item)
-		}
-		// 多选模式
-		else if (props.mode == 'checkbox') {
-			const findIndex = ids.value.findIndex(node => node == item.videoId)
-			if (findIndex >= 0) ids.value.splice(findIndex, 1)
-			else {
-				// 如果有限制 且 数量到达上限
-				if (props.limit != 0 && props.limit <= ids.value.length) return
-				ids.value.push(item.videoId)
-			}
-		}
 	}
-
+	// 菜单模式
-	/**
+	else if (props.mode == 'menu') {
-	 * 视频进入退出全屏
+		emit('item', item)
-	 * @param {Object} ev
-	 */
-	function videoFullscreenchange(ev) {
-		// 根据全屏状态决定是否播放盒暂停
-		if (ev.detail.fullScreen) videoContext.value.play()
-		else pause()
 	}
+	// 单选模式
+	else if (props.mode == 'checkbox') {
+		videoInfo.videoId = item.id
+		videoInfo.coverUrl = item.coverUrl
+		videoUrl.value = item.videoUrl
+		emit('videoInfo', videoInfo)
+	}
+}
 
-	defineExpose({
+/**
-		videoContext,
+ * 视频进入退出全屏
-		pause,
+ * @param {Object} ev
-		requestFullScreen,
+ */
-	})
+function videoFullscreenchange(ev) {
+	// 根据全屏状态决定是否播放盒暂停
+	if (ev.detail.fullScreen) videoContext.value.play()
+	else pause()
+}
+
+defineExpose({
+	videoContext,
+	pause,
+	requestFullScreen,
+})
 </script>
 
 <template>
 	<view>
 		<!-- 视频菜单 -->
 		<view class="list">
-			<view class="item pr" v-for="(item,index) in list" :key="index" @click="handleVideo(item)">
+			<view class="item pr" v-for="(item, index) in list" :key="index" @click="handleVideo(item)">
 				<image :src="item.coverUrl" mode="aspectFill" />
 
 				<view class="window pfull"></view>
 
 				<!-- 选项 -->
 				<view class="amount pa r0 t0 df ptb10 plr10" v-if="mode == 'checkbox'">
-					<uni-icons type="circle-filled" size="50rpx" color="#20D200" v-if="ids.includes(item.videoId)" />
+					<uni-icons type="circle-filled" size="50rpx" color="#20D200" v-if="videoInfo.videoId == item.id" />
 					<uni-icons type="circle" color="#fff" size="50rpx" v-else />
 				</view>
 
 				<view class="amount pa l0 r0 b0 df ptb10 plr10" v-if="item.play">
 					<image class="wh24" src="/static/amount.png" mode="aspectFit" />
-					<view class="txt f1 ml10 cfff f20">{{item.play}}</view>
+					<view class="txt f1 ml10 cfff f20">{{ item.play }}</view>
 				</view>
 			</view>
 		</view>
@@ -145,37 +145,37 @@
 </template>
 
 <style lang="scss" scoped>
-	// 
+// 
-	.list {
+.list {
-		display: grid;
+	display: grid;
-		grid-template-columns: repeat(3, 1fr);
+	grid-template-columns: repeat(3, 1fr);
-		grid-gap: 5rpx;
+	grid-gap: 5rpx;
 
-		.item {
+	.item {
-			height: 360rpx;
+		height: 360rpx;
 
-			image {
+		image {
-				width: 100%;
+			width: 100%;
-				height: 100%;
+			height: 100%;
-			}
-		}
-
-		.window {
-			background-color: rgba(0, 0, 0, .1);
-		}
-
-		// 播放量
-		.amount {
-			.txt {
-				opacity: .5;
-			}
 		}
 	}
 
-	// 视频上下文对象
+	.window {
-	.videoContext {
+		background-color: rgba(0, 0, 0, .1);
-		position: absolute;
-		width: 0;
-		height: 0;
 	}
+
+	// 播放量
+	.amount {
+		.txt {
+			opacity: .5;
+		}
+	}
+}
+
+// 视频上下文对象
+.videoContext {
+	position: absolute;
+	width: 0;
+	height: 0;
+}
 </style>

jiuyi2/components/mine/noAuth.vue

@@ -0,0 +1,21 @@
+<script setup>
+/**
+ * 未实名认证组件
+ */
+</script>
+
+<template>
+    <view class="nologin pr fmid fdc">
+        <view class="title f40 b">请先实名认证</view>
+        <navigator url="/pages/mine/realname" class="button btn pro bar black mt60">去实名认证</navigator>
+    </view>
+</template>
+
+<style lang="scss" scoped>
+// 
+.nologin {
+    .button {
+        width: 80%;
+    }
+}
+</style>

jiuyi2/node_modules/.vue-global-types/vue_99_0_0_0.d.ts

@@ -7,18 +7,14 @@ export {};
 	const __VLS_unref: typeof import('vue').unref;
 	const __VLS_placeholder: any;
 
-	const __VLS_nativeElements = {
+	type __VLS_NativeElements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
-		...{} as SVGElementTagNameMap,
-		...{} as HTMLElementTagNameMap,
-	};
-
 	type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements;
 	type __VLS_Element = import('vue/jsx-runtime').JSX.Element;
 	type __VLS_GlobalComponents = import('vue').GlobalComponents;
 	type __VLS_GlobalDirectives = import('vue').GlobalDirectives;
 	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
 	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
-	type __VLS_unknownDirective = (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
+	type __VLS_SpreadMerge<A, B> = Omit<A, keyof B> & B;
 	type __VLS_WithComponent<N0 extends string, LocalComponents, Self, N1 extends string, N2 extends string, N3 extends string> =
 		N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
 		N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
@@ -81,19 +77,12 @@ export {};
 	};
 	type __VLS_UseTemplateRef<T> = Readonly<import('vue').ShallowRef<T | null>>;
 
-	function __VLS_getVForSourceType(source: number): [number, number][];
+	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
-	function __VLS_getVForSourceType(source: string): [string, number][];
+		item: T extends number ? number
-	function __VLS_getVForSourceType<T extends any[]>(source: T): [
+			: T extends string ? string
-		item: T[number],
+			: T extends any[] ? T[number]
-		index: number,
+			: T extends Iterable<infer T1> ? T1
-	][];
+			: any,
-	function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
-		item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
-		index: number,
-	][];
-	// #3845
-	function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
-		item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
 		index: number,
 	][];
 	function __VLS_getVForSourceType<T>(source: T): [
@@ -109,21 +98,24 @@ export {};
 		? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
 		: T extends (...args: any) => any
 			? T
-			: __VLS_unknownDirective;
+			: (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
-	function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
 	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
 	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
 		T extends new (...args: any) => any
-		? (props: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>, ctx?: any) => __VLS_Element & { __ctx?: {
+		? (props: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>, ctx?: any) => __VLS_Element & {
-			attrs?: any,
+			__ctx?: {
-			slots?: K extends { $slots: infer Slots } ? Slots : any,
+				attrs?: any;
-			emit?: K extends { $emit: infer Emit } ? Emit : any
+				slots?: K extends { $slots: infer Slots } ? Slots : any;
-		} & { props?: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>; expose?(exposed: K): void; } }
+				emit?: K extends { $emit: infer Emit } ? Emit : any;
+				expose?(exposed: K): void;
+				props?: (K extends { $props: infer Props } ? Props : any) & Record<string, unknown>;
+			}
+		}
 		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
 		: T extends (...args: any) => any ? T
 		: (_: {} & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record<string, unknown> } };
-	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (_: T & Record<string, unknown>) => void;
 	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
-	function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
+	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (attrs: T & Record<string, unknown>) => void;
+	function __VLS_asFunctionalSlot<S>(slot: S): (props: NonNullable<S> extends (props: infer P) => any ? P : {}) => void;
 	function __VLS_tryAsConstant<const T>(t: T): T;
 }

jiuyi2/pages/index/report.vue

@@ -1,203 +1,204 @@
 <script setup>
-	/**
+/**
-	 * 视频举报
+ * 视频举报
-	 */
+ */
-	import {
+import {
-		ref,
+	ref,
-		reactive,
+	reactive,
-		computed,
+	computed,
-		getCurrentInstance
+	getCurrentInstance
-	} from 'vue'
+} from 'vue'
-	import {
+import {
-		onLoad,
+	onLoad,
-	} from '@dcloudio/uni-app'
+} from '@dcloudio/uni-app'
-	// 工具库
+// 工具库
-	import util from '@/common/js/util';
+import util from '@/common/js/util';
-	// api
+// api
-	import api from '@/api/index.js'
+import api from '@/api/index.js'
-	// 视频菜单
+// 视频菜单
-	import videoMenu from '@/components/index/videoMenu.vue';
+import videoMenu from '@/components/index/videoMenu.vue';
 
-	const {
+const {
-		proxy
+	proxy
-	} = getCurrentInstance()
+} = getCurrentInstance()
-	// 举报列表
+// 举报列表
-	const reportList = reactive([{
+const reportList = reactive([{
-			name: '发布不正当的内容或信息',
+	name: '发布不正当的内容或信息',
-		},
+},
-		{
+{
-			name: '传播涩情资源',
+	name: '传播涩情资源',
-		},
+},
-		{
+{
-			name: '冒充他人',
+	name: '冒充他人',
-		},
+},
-		{
+{
-			name: '涉嫌诈骗',
+	name: '涉嫌诈骗',
-		},
+},
-		{
+{
-			name: '侵犯权益',
+	name: '侵犯权益',
-		},
+},
-		{
+{
-			name: '其他',
+	name: '其他',
-		}
+}
-	])
+])
-	// 举报下标
+// 举报下标
-	const reportIndex = ref('')
+const reportIndex = ref('')
-	// 表单
+// 表单
-	const form = reactive({
+const form = reactive({
-		userId: '',
+	userId: '',
-		videoId: [],
+	videoId: '',
-		reason: '',
+	reasonForReporting: '',
-		context: '',
+	particulars: '',
-		pic: [],
+	videoPictureUrl: '',
-	})
+	coverUrl: ''
-	// 列表数据
+})
-	const list = reactive({
+// 列表数据
-		data: [],
+const list = reactive({
-		pageSize: 10,
+	data: [],
-		pageNum: 1,
+	pageSize: 10,
-		total: 0,
+	pageNum: 1,
-	})
+	total: 0,
-	// 已选择的视频列表
+})
-	const videos = computed(() => {
+// 已选择的视频列表
-		let result = form.videoId.map(item => {
+const videos = computed(() => {
-			return list.data.find(node => node.videoId == item) || {}
+	let result = form.videoId.map(item => {
-		})
+		return list.data.find(node => node.videoId == item) || {}
-		return result
 	})
+	return result
+})
 
-	onLoad((option) => {
+onLoad((option) => {
-		// 被举报的用户id
+	// 被举报的用户id
-		if (option.userId) form.userId = option.userId
+	if (option.userId) form.userId = option.userId
-		// 获取列表
-		getList()
-	})
-
-	/**
-	 * 选择举报列表
-	 * @param {Object} ev 携带参数
-	 */
-	function handleReportList(ev) {
-		const index = ev.detail.value
-		if (reportIndex.value === index) return
-		reportIndex.value = index
-	}
-
-	// 刷新列表
-	function refreshList() {
-		list.pageNum = 1
-		list.total = 0
-		getList()
-	}
-
-	// 获取更多列表
-	function getMoreList() {
-		if (list.data.length >= list.rows) return
-		list.pageNum++
-		getList()
-	}
-
 	// 获取列表
-	function getList() {
+	getList()
-		// 
+})
-		api.video.myVideoList({
-			query: {
-				isDraft: 0,
-				userId: form.userId,
-				pageSize: list.pageSize,
-				pageNum: list.pageNum,
-			}
-		}).then(rs => {
-			if (rs.code == 200) {
-				if (list.pageNum == 1) list.data.length = []
-				list.data.push(...rs.rows.map(item => {
-					item.format_videoUrl = util.format_url(item.videoUrl, 'video')
-					item.format_imageUrl = util.format_url(item.imageUrl, 'img')
-					return item
-				}))
-				list.total = rs.total
-				return
-			}
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
-			})
-		})
-	}
 
-	// 上传图片
+/**
-	function uploadImg() {
+ * 选择举报列表
-		util.upload_image({
+ * @param {Object} ev 携带参数
-			value: form.pic,
+ */
-		})
+function handleReportList(ev) {
-	}
+	const index = ev.detail.value
+	if (reportIndex.value === index) return
+	reportIndex.value = index
+}
 
-	/**
+// 刷新列表
-	 * 删除多媒体
+function refreshList() {
-	 * @param {Number} index 列表下标
+	list.pageNum = 1
-	 * @param {String} key 操作的键
+	list.total = 0
-	 */
+	getList()
-	function removeMedia(index, key) {
+}
+
+// 获取列表
+function getList() {
+	// 
+	api.video.myWorks({
+		query: {
+			userId: form.userId,
+			pageSize: list.pageSize,
+			pageNum: list.pageNum,
+		}
+	}).then(rs => {
+		if (rs.code == 200) {
+			if (list.pageNum == 1) list.data.length = []
+			list.data.push(...rs.rows.map(item => {
+				item.format_videoUrl = util.format_url(item.videoUrl, 'video')
+				item.format_imageUrl = util.format_url(item.imageUrl, 'img')
+				return item
+			}))
+			list.total = rs.total
+			return
+		}
 		util.alert({
-			content: '确认要删除吗？',
+			content: rs.msg,
-		}).then(rs => {
+			showCancel: false,
-			if (rs.confirm) form[key].splice(index, 1)
 		})
+	})
+}
+
+// 上传图片
+function uploadImg() {
+	util.upload_image({
+		type: 1,
+		success: rs => {
+			form.videoPictureUrl = rs.value
+		}
+	})
+}
+
+/**
+ * 删除多媒体
+ * @param {Number} index 列表下标
+ * @param {String} key 操作的键
+ */
+function removeMedia(key) {
+	util.alert({
+		content: '确认要删除吗？',
+	}).then(rs => {
+		if (key == 'videoId') {
+			form.videoId = null
+			form.coverUrl = null
+		}
+		if (key == 'videoPictureUrl') form.videoPictureUrl = null
+	})
+}
+
+// 视频举报
+function handleSubmit() {
+	// 
+	const data = {
+		...form
 	}
 
-	// 视频举报
+	// 验证必填项
-	function handleSubmit() {
+	if (reportIndex == '') {
-		// 
+		util.alert('请选择举报理由')
-		const data = {
+		return
-			...form
-		}
-
-		// 验证必填项
-		if (reportIndex == '') {
-			util.alert('请选择举报理由')
-			return
-		}
-		if (!data.context) {
-			util.alert('详细描述不能为空')
-			return
-		}
-		if (data.context.length > 100) {
-			util.alert('详细描述自述超过100')
-			return
-		}
-		if (!data.pic[0]) {
-			util.alert('请上传举报图片')
-			return
-		}
-		if (!data.videoId[0]) {
-			util.alert('请选择举报视频')
-			return
-		}
-
-		// 
-		data.reason = reportList[reportIndex.value].name
-		data.pic = data.pic.map(node => {
-			node = util.replace_url('node')
-			return node
-		}).join(',')
-		data.videoId = data.videoId.join(',')
-
-		api.video.reportVideo({
-			data: data,
-		}).then(rs => {
-			if (rs.code == 200) {
-				util.alert('举报成功，请等待后台审核')
-				setTimeout(() => {
-					uni.navigateBack()
-				}, 500)
-				return
-			}
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
-			})
-		})
 	}
+	if (!data.particulars) {
+		util.alert('详细描述不能为空')
+		return
+	}
+	if (data.particulars.length > 100) {
+		util.alert('详细描述自述超过100')
+		return
+	}
+	if (!data.videoPictureUrl) {
+		util.alert('请上传举报图片')
+		return
+	}
+	if (!data.videoId) {
+		util.alert('请选择举报视频')
+		return
+	}
+ 
+	data.reasonForReporting = reportList[reportIndex.value].name
+
+	api.video.reportVideo({
+		data: data,
+	}).then(rs => {
+		if (rs.code == 200) {
+			util.alert('举报成功，请等待后台审核')
+			setTimeout(() => {
+				uni.navigateBack()
+			}, 500)
+			return
+		}
+		util.alert({
+			content: rs.msg,
+			showCancel: false,
+		})
+	})
+}
+
+// 选中视频信息
+function videoInfo(param) {
+	console.log('选中视频信息', param);
+	form.videoId = param.videoId;
+	form.coverUrl = param.coverUrl;
+}
 </script>
 
 <template>
@@ -208,7 +209,7 @@
 				<view class="key mr20">举报理由</view>
 				<picker class="f1" :range="reportList" rangeKey="name" @change="handleReportList">
 					<view class="inputBox ptb10 plr10">
-						<text v-if="reportList[reportIndex]">{{reportList[reportIndex].name}}</text>
+						<text v-if="reportList[reportIndex]">{{ reportList[reportIndex].name }}</text>
 						<text v-else class="placeholderStyle">请选择举报理由</text>
 					</view>
 				</picker>
@@ -218,10 +219,10 @@
 				<view class="key">详细描述</view>
 
 				<view class="inputBox mt20 ptb15 plr15">
-					<textarea v-model="form.context" placeholder="请详细填写，以提高举报成功率。" />
+					<textarea v-model="form.particulars" placeholder="请详细填写，以提高举报成功率。" />
 				</view>
 
-				<view class="hint mt10 tar f20">{{form.context.length}}/100</view>
+				<view class="hint mt10 tar f20">{{ form.particulars.length }}/100</view>
 			</view>
 
 			<view class="line mtb50 uploadBox">
@@ -233,14 +234,15 @@
 					</view>
 
 					<view class="imgList images mt20">
-						<view class="item upload fmid pr mr20 br10" @click="uploadImg">
+						<view v-if="!form.videoPictureUrl" class="item upload fmid pr mr20 br10" @click="uploadImg">
 							<uni-icons type="plusempty" color="#D8D8D8" size="100rpx" />
 						</view>
 
-						<view class="imgs item mr20 br10" v-for="(item,index) in form.pic" :key="index">
+						<view v-else class="imgs item mr20 br10">
-							<image class="br10" :src="item" mode="aspectFill" />
+							<image class="br10" :src="form.videoPictureUrl" mode="aspectFill" />
 							<view class="close">
-								<uni-icons type="clear" size="30rpx" color="red" @click="removeMedia(index,'pic')" />
+								<uni-icons type="clear" size="30rpx" color="red"
+									@click="removeMedia('videoPictureUrl')" />
 							</view>
 						</view>
 					</view>
@@ -251,15 +253,15 @@
 				<view class="key">选择视频</view>
 
 				<view class="list pr mt20">
-					<view class="item fmid oh br10" @click="$refs.select.open()">
+					<view v-if="!form.coverUrl" class="item fmid oh br10" @click="$refs.select.open()">
 						<uni-icons type="plusempty" color="#D8D8D8" size="100rpx" />
 					</view>
 
-					<view class="item pr br10" v-for="(item,index) in videos" :key="index">
+					<view v-else class="item pr br10">
-						<image :src="item.format_imageUrl" mode="aspectFill" />
+						<image :src="form.coverUrl" mode="aspectFill" />
 
 						<view class="close">
-							<uni-icons type="clear" size="30rpx" color="red" @click="removeMedia(index,'videoId')" />
+							<uni-icons type="clear" size="30rpx" color="red" @click="removeMedia('videoId')" />
 						</view>
 					</view>
 				</view>
@@ -279,7 +281,7 @@
 					<view class="header rows ptb20 plr20">
 						<view class="title plr30 c333 f34">
 							<text>作品</text>
-							<text class="ml10">{{list.total}}</text>
+							<text class="ml10">{{ list.total }}</text>
 						</view>
 
 						<view class="fmid c999 f28" @click="refreshList">
@@ -290,7 +292,7 @@
 
 					<!-- 视频菜单 -->
 					<scroll-view scroll-y="true" class="scroll">
-						<videoMenu :list="list.data" v-model:ids="form.videoId" mode="checkbox" />
+						<videoMenu :list="list.data" @videoInfo="videoInfo" mode="checkbox" />
 					</scroll-view>
 				</view>
 			</view>
@@ -300,66 +302,66 @@
 </template>
 
 <style lang="scss">
-	image {
+image {
-		width: 100%;
+	width: 100%;
-		height: 100%;
+	height: 100%;
+}
+
+// 表单
+.form {
+
+	.hint {
+		color: #a7a7a7;
 	}
+}
 
-	// 表单
+// 上传图片
-	.form {
+.uploadBox {
 
-		.hint {
+	// 
-			color: #a7a7a7;
+	.uploads {
+		.cartoon {
+			top: 0;
+			right: -100rpx;
+			width: 530rpx;
+			height: 249rpx;
 		}
 	}
 
 	// 上传图片
-	.uploadBox {
+	.images .item {
+		width: 150rpx;
+		height: 150rpx;
+		background-color: #F3F3F5;
+	}
 
-		// 
+	// 列表
-		.uploads {
+	.list {
-			.cartoon {
+		display: grid;
-				top: 0;
+		grid-template-columns: repeat(3, 1fr);
-				right: -100rpx;
+		grid-gap: 20rpx;
-				width: 530rpx;
-				height: 249rpx;
-			}
-		}
-
-		// 上传图片
-		.images .item {
-			width: 150rpx;
-			height: 150rpx;
-			background-color: #F3F3F5;
-		}
 
 		// 列表
-		.list {
+		.item {
-			display: grid;
+			height: 290rpx;
-			grid-template-columns: repeat(3, 1fr);
+			background-color: #F1F1F1;
-			grid-gap: 20rpx;
 
-			// 列表
+			// 关闭
-			.item {
+			.close {
-				height: 290rpx;
+				position: absolute;
-				background-color: #F1F1F1;
+				top: 0;
-
+				right: 0;
-				// 关闭
+				transform: translate(50%, -50%);
-				.close {
+				z-index: 1;
-					position: absolute;
-					top: 0;
-					right: 0;
-					transform: translate(50%, -50%);
-					z-index: 1;
-				}
 			}
 		}
 	}
+}
 
-	// 作品数量
+// 作品数量
-	.product {
+.product {
-		.scroll {
+	.scroll {
-			height: 80vh;
+		height: 80vh;
-		}
 	}
+}
 </style>

jiuyi2/pages/index/videoHome.vue

@@ -1,233 +1,289 @@
 <script setup>
-	/**
+/**
-	 * 他人用户视频主页
+ * 他人用户视频主页
-	 */
+ */
-	import {
+import {
-		ref,
+	ref,
-		reactive,
+	reactive,
-		getCurrentInstance,
+	getCurrentInstance,
-		computed,
+	computed,
-	} from 'vue';
+} from 'vue';
-	import {
+import {
-		onLoad,
+	onLoad,
-		onPageScroll,
+	onPageScroll,
-		onReachBottom,
+	onReachBottom,
-		onHide
+	onHide
-	} from '@dcloudio/uni-app'
+} from '@dcloudio/uni-app'
-	import {
+import {
-		useStore
+	useStore
-	} from 'vuex'
+} from 'vuex'
-	// 工具库
+// 工具库
-	import util from '@/common/js/util';
+import util from '@/common/js/util';
-	// api
+// api
-	import api from '@/api/index.js'
+import api from '@/api/index.js'
-	// 顶部状态栏
+// 顶部状态栏
-	import statusBar from '@/components/header/statusBar.vue'
+import statusBar from '@/components/header/statusBar.vue'
-	// 顶部
+// 顶部
-	import apex from '@/components/header/apex.vue'
+import apex from '@/components/header/apex.vue'
-	// 视频菜单
+// 视频菜单
-	import videoMenu from '@/components/index/videoMenu.vue'
+import videoMenu from '@/components/index/videoMenu.vue'
 
-	// 代理
+// 代理
-	const {
+const {
-		proxy
+	proxy
-	} = getCurrentInstance()
+} = getCurrentInstance()
-	// 
+// 
-	const store = useStore()
+const store = useStore()
-	// 滚动头部
+// 滚动头部
-	const scrollTop = ref(false)
+const scrollTop = ref(false)
+// 用户id
+const userId = ref('')
+// 详情
+const detail = reactive({})
+// 列表对象
+const listProperty = reactive({
+	data: [],
+	pageSize: 9,
+	pageNum: 1,
+	total: 0,
+})
+// 用户信息
+let userinfo = computed(() => {
+	let result = store.state.userinfo
+	return result
+})
+
+// 
+onLoad((option) => {
 	// 用户id
-	const userId = ref('')
+	if (option.userId) userId.value = option.userId
-	// 详情
+	// 他人用户主页
-	const detail = reactive({})
+	getUserinfo()
-	// 列表对象
+	// 获取列表
-	const listProperty = reactive({
+	getList()
-		data: [],
+})
-		pageSize: 9,
-		pageNum: 1,
-		total: 0,
-	})
-	// 用户信息
-	let userinfo = computed(() => {
-		let result = store.state.userinfo
-		return result
-	})
 
-	// 
+onHide(() => {
-	onLoad((option) => {
+	// 暂停当前视频
-		// 用户id
+	proxy.$refs.videoMenuRef.pause()
-		if (option.userId) userId.value = option.userId
+})
-		// 他人用户主页
-		getUserinfo()
-		// 获取列表
-		getList()
-	})
 
-	onHide(() => {
+// 滚动
-		// 暂停当前视频
+onPageScroll((ev) => {
-		proxy.$refs.videoMenuRef.pause()
+	scrollTop.value = ev.scrollTop > 44 ? true : false
-	})
+})
-
-	// 滚动
-	onPageScroll((ev) => {
-		scrollTop.value = ev.scrollTop > 44 ? true : false
-	})
-
-	onReachBottom(() => {
-		// 获取更多列表
-		getMoreList()
-	})
-
-	// 获取用户信息
-	function getUserinfo() {
-		api.video.getUserInfo({
-			query: {
-				userId: userId.value,
-				myId: userinfo.value.id,
-			}
-		}).then(rs => {
-			if (rs.code == 200) {
-				console.log('userinfo', rs)
-				const result = rs.data
-				Object.assign(detail, result)
-				return
-			}
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
-			})
-		})
-	}
 
+onReachBottom(() => {
 	// 获取更多列表
-	function getMoreList() {
+	getMoreList()
-		if (listProperty.total <= listProperty.data.length) return
+})
-		listProperty.pageNum++
-		getList()
-	}
 
-	// 获取用户作品
+// 获取用户信息
-	function getList() {
+function getUserinfo() {
-		// 
+	api.video.getUserInfo({
-		api.video.myWorks({
+		query: {
-			query: {
+			userId: userId.value,
-				// 人员id
+			myId: userinfo.value.id,
-				userId: userId.value,
+		}
-				pageSize: listProperty.pageSize,
+	}).then(rs => {
-				pageNum: listProperty.pageNum,
+		if (rs.code == 200) {
-			}
+			console.log('userinfo', rs)
-		}).then(rs => {
+			const result = rs.data
-			if (rs.code == 200) {
+			Object.assign(detail, result)
-				if (listProperty.pageNum == 1) listProperty.data.length = 0
+			return
-				listProperty.data.push(...rs.rows)
+		}
-				listProperty.total = rs.total
+		util.alert({
-				return
+			content: rs.msg,
-			}
+			showCancel: false,
-			util.alert({
+		})
-				content: rs.msg,
+	})
-				showCancel: false,
+}
+
+// 获取更多列表
+function getMoreList() {
+	if (listProperty.total <= listProperty.data.length) return
+	listProperty.pageNum++
+	getList()
+}
+
+// 获取用户作品
+function getList() {
+	// 
+	api.video.myWorks({
+		query: {
+			// 人员id
+			userId: userId.value,
+			pageSize: listProperty.pageSize,
+			pageNum: listProperty.pageNum,
+		}
+	}).then(rs => {
+		if (rs.code == 200) {
+			if (listProperty.pageNum == 1) listProperty.data.length = 0
+			listProperty.data.push(...rs.rows)
+			listProperty.total = rs.total
+			return
+		}
+		util.alert({
+			content: rs.msg,
+			showCancel: false,
+		})
+	})
+}
+
+// 举报
+function handleReport() {
+	// 关闭弹窗
+	proxy.$refs.menuRef.close()
+
+	// 打开模态弹窗
+	uni.showActionSheet({
+		itemList: ['举报'],
+	}).then(rs => {
+		const index = rs.tapIndex
+		if (index == 0) {
+			uni.navigateTo({
+				url: util.setUrl('/pages/index/report', {
+					userId: userId.value,
+				}),
 			})
+		}
+	})
+}
+
+// 拉黑
+function handleBlack() {
+	// let text = detail.isBlock ? '取消拉黑' : '拉黑'
+	// util.alert({
+	// 	content: `确认要${text}用户${detail.userNickname}吗？`,
+	// }).then(rs => {
+	// 	let obj = {
+	// 		blockUserId: detail.id,
+	// 		status: detail.isBlock ? 1 : 0
+	// 	}
+	// 	api.mine.blockUser(obj).then(res => {
+	// 		if (res.code == 200) {
+	// 			util.alert('操作成功！')
+	// 			getUserinfo()
+
+	// 			// 关闭弹窗
+	// 			proxy.$refs.menuRef.close()
+	// 		}
+	// 	})
+	// })
+}
+
+// 复制账号
+function handleCopyAccount() {
+	// 复制用户账号
+	uni.setClipboardData({
+		data: detail.account,
+		showToast: false,
+		success: rs => {
+			util.alert('复制成功')
+		}
+	})
+}
+
+// 关注用户
+function handleAttention() {
+	let targetAtt = detail.isAttention == 0 ? 1 : 0
+	api.video.attention({
+		data: {
+			// 当前用户id
+			userId: userinfo.value.id,
+			// 被关注id
+			attentionId: detail.id,
+			// 
+			isAttention: targetAtt,
+		}
+	}).then(rs => {
+		if (rs.code == 200) {
+			// 关注状态切换
+			detail.isAttention = targetAtt
+
+			// 他人用户主页
+			getUserinfo()
+			// 修改了他人关注状态
+			uni.$emit('focusUser', {
+				userId: detail.id,
+				result: detail.isAttention,
+			})
+			// 重载关注列表
+			uni.$emit('updateFocusList')
+			return
+		}
+		util.alert({
+			content: rs.msg,
+			showCancel: false,
 		})
-	}
+	})
+}
 
-	// 举报
+// 操作不让看
-	function handleReport() {
+function handleBlock() {
-		// 关闭弹窗
+	// // 反选状态
-		proxy.$refs.menuRef.close()
+	// detail.isBlock = !detail.isBlock
 
-		// 打开模态弹窗
+	// api.video.videoBlock({
-		uni.showActionSheet({
+	// 	query: {
-			itemList: ['举报'],
+	// 		type: detail.isBlock ? 0 : 1,
+	// 		userId: detail.id,
+	// 	}
+	// }).then(rs => {
+	// 	if (rs.code == 200) {
+	// 		return
+	// 	}
+
+	// 	detail.isBlock = !detail.isBlock
+	// 	util.alert({
+	// 		content: rs.msg,
+	// 		showCancel: false,
+	// 	})
+	// })
+}
+
+// 私信
+function handleMessage() {
+	util.toChat({
+		name: detail.userNickname,
+		msgId: detail.id,
+		type: 'C2C',
+	})
+	return
+}
+// 评论
+function userComments() {
+	if (detail.isLock) {
+		toCommentsList()
+	} else {
+		// 解锁提示
+		util.alert({
+			content: `确认消耗${detail.consumeFruit}个榴莲果解锁评论吗？`,
 		}).then(rs => {
-			const index = rs.tapIndex
+			unlockComments()
-			if (index == 0) {
-				uni.navigateTo({
-					url: '/pages/index/report',
-				})
-			}
 		})
 	}
-
+}
-	// 复制账号
+// 解锁评论列表
-	function handleCopyAccount() {
+function unlockComments() {
-		// 复制用户账号
+	api.mine.unlockComment({ userId: detail.id }).then(res => {
-		uni.setClipboardData({
+		if (res.code == 200) {
-			data: detail.account,
+			util.alert('解锁成功！')
-			showToast: false,
+			if (res.data.isLock) {
-			success: rs => {
+				toCommentsList()
-				util.alert('复制成功')
-			}
-		})
-	}
-
-	// 关注用户
-	function handleAttention() {
-		let targetAtt = detail.isAttention == 0 ? 1 : 0
-		api.video.attention({
-			data: {
-				// 当前用户id
-				userId: userinfo.value.id,
-				// 被关注id
-				attentionId: detail.id,
-				// 
-				isAttention: targetAtt,
-			}
-		}).then(rs => {
-			if (rs.code == 200) {
-				// 关注状态切换
-				detail.isAttention = targetAtt
-
-				// 他人用户主页
 				getUserinfo()
-				// 修改了他人关注状态
-				uni.$emit('focusUser', {
-					userId: detail.userId,
-					result: detail.isAttention,
-				})
-				// 重载关注列表
-				uni.$emit('updateFocusList')
-				return
 			}
-			util.alert({
+		}
-				content: rs.msg,
+	})
-				showCancel: false,
+}
-			})
+// 跳转到评论列表
-		})
+function toCommentsList() {
-	}
+	uni.navigateTo({
-
+		url: util.setUrl('/pages/mine/myComment', {
-	// 操作不让看
+			userId: detail.id,
-	function handleBlock() {
+		}),
-		// 反选状态
+	})
-		detail.isBlock = !detail.isBlock
+}
-
-		// 
-		api.video.videoBlock({
-			query: {
-				type: detail.isBlock ? 0 : 1,
-				userId: detail.userId,
-			}
-		}).then(rs => {
-			if (rs.code == 200) {
-				return
-			}
-
-			detail.isBlock = !detail.isBlock
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
-			})
-		})
-	}
-
-	// 私信
-	function handleMessage() {
-		util.toChat({
-			name: detail.userNickname,
-			msgId: detail.userId,
-			type: 'C2C',
-		})
-		return
-	}
 </script>
 
 <template>
@@ -239,9 +295,9 @@
 				<view class="window pfull"></view>
 			</view>
 
-			<apex :bgColor="scrollTop?'#fff':'#fff0'" :color="scrollTop ? '#333' : '#fff'">
+			<apex :bgColor="scrollTop ? '#fff' : '#fff0'" :color="scrollTop ? '#333' : '#fff'">
 				<template #content v-if="scrollTop">
-					<view class="">{{detail.userNickname}}</view>
+					<view class="">{{ detail.userNickname }}</view>
 				</template>
 
 				<template #right>
@@ -258,8 +314,8 @@
 				</view>
 
 				<view class="user f1 ml20 cfff">
-					<view class="f36 b">{{detail.userNickname}}</view>
+					<view class="f36 b">{{ detail.userNickname }}</view>
-					<view class="f24">账号：{{detail.account}}</view>
+					<view class="f24">账号：{{ detail.account }}</view>
 				</view>
 			</view>
 		</view>
@@ -270,25 +326,25 @@
 
 				<view class="number df">
 					<view class="option mr40" v-if="0">
-						<text class="value f36">{{detail.userPraised}}</text>
+						<text class="value f36">{{ detail.userPraised }}</text>
 						<text class="key ml10 c666 f24">获赞</text>
 					</view>
 
 					<view class="option mr40">
-						<text class="value f36">{{detail.userFans}}</text>
+						<text class="value f36">{{ detail.userFans }}</text>
 						<text class="key ml10 c666 f24">粉丝</text>
 					</view>
 
 					<view class="option mr40">
-						<text class="value f36">{{detail.userAttention}}</text>
+						<text class="value f36">{{ detail.userAttention }}</text>
 						<text class="key ml10 c666 f24">关注</text>
 					</view>
 				</view>
-				<view class="">他的评论</view>
+				<view class="" @click="userComments">他的评论</view>
 			</view>
 
 			<!-- 个人介绍 -->
-			<view class="desc mtb20 c333 f28">{{detail.userBrief}}</view>
+			<view class="desc mtb20 c333 f28">{{ detail.userBrief }}</view>
 
 			<!-- 橱窗 -->
 			<view class="shopwindow df aic mtb30" v-if="detail.isShop == 1 && 0">
@@ -312,7 +368,7 @@
 		<view class="product mt30">
 			<view class="title plr30 c333 f32">
 				<text>作品</text>
-				<text class="ml10">{{listProperty.total}}</text>
+				<text class="ml10">{{ listProperty.total }}</text>
 			</view>
 
 			<view class="list mt20">
@@ -326,9 +382,9 @@
 		<view class="menuAlt ptb50 plr40 ">
 			<view class="header df">
 				<view class="user f1 c111">
-					<view class="nickname f28">{{detail.userNickname}}</view>
+					<view class="nickname f28">{{ detail.userNickname }}</view>
 					<view class="df aic mt10">
-						<text class="f20">账号：{{detail.account}}</text>
+						<text class="f20">账号：{{ detail.account }}</text>
 						<image class="wh30 ml10" src="/static/copy.png" mode="aspectFit" @click="handleCopyAccount" />
 						<view class="f1"></view>
 					</view>
@@ -345,7 +401,7 @@
 					<view class="txt mt20 c111 f20">分享主页</view>
 				</view> -->
 
-				<view class="option ver jcc bfff br10">
+				<view class="option ver jcc bfff br10" @click="handleMessage">
 					<image class="wh50" src="/static/email.png" mode="aspectFit" />
 					<view class="txt mt20 c111 f20">私信Ta</view>
 				</view>
@@ -358,14 +414,14 @@
 				<view class="option ver jcc bfff br10" @click="handleBlack">
 					<image class="wh50" src="/static/blackList.png" mode="aspectFit" />
 					<view class="txt mt20 c111 f20">
-						<text>拉黑</text>
+						<text>{{ detail.isBlock ? '取消拉黑' : '拉黑' }}</text>
 					</view>
 				</view>
 			</view>
 
 			<!-- 列表 -->
-			<view class="list mtb20 plr20 c111 f24 bfff br10">
+			<view class="list mtb20 plr20 c111 f24 bfff br10" v-if="0">
-				<view class="item rows ptb25" v-if="0">
+				<view class="item rows ptb25">
 					<view class="key">设置备注</view>
 					<view class="inputBox tac">
 						<input class="c111 f24" type="text" placeholder="请输入备注" />
@@ -385,47 +441,47 @@
 </template>
 
 <style lang="scss">
-	// 头部
+// 头部
-	.apex {
+.apex {
 
-		// 用户信息
+	// 用户信息
-		.userinfo {
+	.userinfo {
-			.avatar {
+		.avatar {
-				padding: 5rpx;
+			padding: 5rpx;
-				background-color: #fff;
+			background-color: #fff;
-			}
+		}
+	}
+}
+
+// 内容
+.container {
+	margin-top: -30rpx;
+	border-radius: 15rpx 15rpx 0 0;
+	background-color: #fff;
+}
+
+// 菜单弹窗
+.menuAlt {
+	border-radius: 24rpx 24rpx 0 0;
+	background: #F2F2F2;
+
+	// 选择菜单
+	.select {
+		display: grid;
+		grid-template-columns: repeat(3, 1fr);
+		grid-gap: 20rpx;
+
+		// 选项
+		.option {
+			height: 160rpx;
 		}
 	}
 
-	// 内容
+	// 列表
-	.container {
+	.list {
-		margin-top: -30rpx;
+		.inputBox {
-		border-radius: 15rpx 15rpx 0 0;
+			width: 220rpx;
-		background-color: #fff;
-	}
-
-	// 菜单弹窗
-	.menuAlt {
-		border-radius: 24rpx 24rpx 0 0;
-		background: #F2F2F2;
-
-		// 选择菜单
-		.select {
-			display: grid;
-			grid-template-columns: repeat(3, 1fr);
-			grid-gap: 20rpx;
-
-			// 选项
-			.option {
-				height: 160rpx;
-			}
-		}
-
-		// 列表
-		.list {
-			.inputBox {
-				width: 220rpx;
-			}
 		}
 	}
+}
 </style>

jiuyi2/pages/mine/myComment.vue

@@ -1,97 +1,144 @@
 <script setup>
-	// 我的评论
+// 我的评论
-	import {
+import {
-		ref,
+	ref,
-		reactive,
+	reactive,
-		computed,
+	computed,
-		getCurrentInstance,
+	getCurrentInstance,
-	} from 'vue';
+} from 'vue';
-	import {
+import {
-		onLoad,
+	onLoad,
-		onReady,
+	onReady,
-		onUnload,
+	onUnload,
-		onPageScroll,
+	onPageScroll,
-		onReachBottom,
+	onReachBottom,
-	} from '@dcloudio/uni-app'
+	onPullDownRefresh
-	import {
+} from '@dcloudio/uni-app'
-		useStore,
+import {
-	} from 'vuex'
+	useStore,
-	import api from '@/api/index.js'
+} from 'vuex'
-	// 工具库
+import api from '@/api/index.js'
-	import util from '@/common/js/util';
+// 工具库
+import util from '@/common/js/util';
 
-	// 仓库
+// 仓库
-	const store = useStore()
+const store = useStore()
-	// 数据列表
+// 数据列表
-	const list = reactive({
+const list = reactive({
-		data: [],
+	data: [],
-		pageSize: 20,
+	pageSize: 20,
-		pageNum: 1,
+	pageNum: 1,
-		total: 0,
+	total: 0,
-	})
+})
-	// 用户信息
+// 用户信息
-	const userinfo = computed(() => {
+const userinfo = computed(() => {
-		let result = store.state.userinfo
+	return store.state.userinfo
-		return result
+})
-	})
 
-	onLoad(() => {
+onLoad((option) => {
-		getLst()
+	if (option.userId) {
-	})
+		uni.setNavigationBarTitle({
-
+			title: '他的评论'
-	// 重载视频列表
-	function refreshVideoList() {
-		list.pageNum = 1
-		list.total = 0
-		getLst()
-	}
-
-	// 获取更多视频列表
-	function getMoreVideoList() {
-		if (list.data.length >= list.total) return
-		list.pageNum++
-		getLst()
-	}
-
-	// 获取我的评论
-	function getLst() {
-		api.mine.myComment({
-			query: {
-				userId: userinfo.value.id,
-				pageNum: list.pageNum,
-				pageSize: list.pageSize,
-			}
-		}).then(rs => {
-			if (rs.code == 200) {
-				if (list.pageNum) list.data.length = 0
-				// 追加视频列表
-				list.data.push(...rs.rows.map(item => {
-					return item
-				}))
-				// 视频列表
-				list.total = rs.total
-				console.log('list', list.data)
-				return
-			}
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
-			})
-		}).finally(() => {
-			uni.stopPullDownRefresh()
 		})
+		getList(option.userId)
+	} else {
+		getList()
 	}
+})
+
+onReachBottom(() => {
+	// 获取更多列表
+	getMoreVideoList()
+})
+
+onPullDownRefresh(() => {
+	// 刷新
+	refreshVideoList()
+})
+
+// 重载视频列表
+function refreshVideoList() {
+	list.pageNum = 1
+	list.total = 0
+	getLst()
+}
+
+// 获取更多视频列表
+function getMoreVideoList() {
+	if (list.data.length >= list.total) return
+	list.pageNum++
+	getLst()
+}
+
+// 获取我的评论
+function getLst() {
+	api.mine.myComment({
+		query: {
+			userId: userinfo.value.id,
+			pageNum: list.pageNum,
+			pageSize: list.pageSize,
+		}
+	}).then(rs => {
+		if (rs.code == 200) {
+			if (list.pageNum) list.data.length = 0
+			// 追加视频列表
+			list.data.push(...rs.rows.map(item => {
+				return item
+			}))
+			// 视频列表
+			list.total = rs.total
+			console.log('list', list.data)
+			return
+		}
+		util.alert({
+			content: rs.msg,
+			showCancel: false,
+		})
+	}).finally(() => {
+		uni.stopPullDownRefresh()
+	})
+}
+
+// 获取我的评论
+function getList(id) {
+	api.mine.myComment({
+		query: {
+			userId: id ? id : userinfo.value.id,
+			pageNum: list.pageNum,
+			pageSize: list.pageSize,
+		}
+	}).then(rs => {
+		if (rs.code == 200) {
+			if (list.pageNum) list.data.length = 0
+			// 追加视频列表
+			list.data.push(...rs.data[0].CommentVo.map(item => {
+				return item
+			}))
+			// 视频列表
+			list.total = rs.total
+			console.log('list', list.data)
+			return
+		}
+		util.alert({
+			content: rs.msg,
+			showCancel: false,
+		})
+	}).finally(() => {
+		uni.stopPullDownRefresh()
+	})
+
+}
 </script>
 
 <template>
 	<view class="appbw">
 		<view class="listBox plr30 ">
-			<view class="list ptb30 plr10" v-for="(item,index) in list.data" :key="index">
+			<view class="list ptb30 plr10" v-for="(item, index) in list.data" :key="index">
 				<view class="rows">
 					<view class="message">
-						<view class="title f32 c333">评论了 视频</view>
+						<view class="title f32 c333">评论了{{ item.commentType }}</view>
-						<view class="content t2hd mtb15 c333 f32">{{item.content}}</view>
+						<view class="content t2hd mtb15 c333 f32">{{ item.content }}</view>
-						<view class="time mt15 f28 c999">{{item.createTime}}</view>
+						<view class="time mt15 f28 c999">{{ item.createTime }}</view>
 					</view>
 					<view class="image ml20" v-if="item.imageUrl">
 						<image class="wh120 br10" :src="item.imageUrl" mode="aspectFill" />
@@ -106,12 +153,12 @@
 </template>
 
 <style scoped lang="scss">
-	// 
+// 
-	.listBox {
+.listBox {
 
-		// 列表
+	// 列表
-		.list+.list {
+	.list+.list {
-			border-top: 2rpx solid #eee;
+		border-top: 2rpx solid #eee;
-		}
 	}
+}
 </style>

jiuyi2/pages/news/chat/jy-voice.vue

@@ -16,265 +16,274 @@
 </template>
 
 <script setup>
-	import {
+import {
-		ref,
+	ref,
-		defineEmits
+	defineEmits
-	} from 'vue'
+} from 'vue'
-	// 腾讯云聊天
+// 腾讯云聊天
-	import TencentCloudChat from '@tencentcloud/chat';
+import TencentCloudChat from '@tencentcloud/chat';
-	const props = defineProps({
+const props = defineProps({
-		msg: {
+	msg: {
-			type: Object
+		type: Object
-		},
+	},
-	})
+})
-	const emit = defineEmits(['send'])
+const emit = defineEmits(['send'])
-	//录音
+//录音
-	// #ifdef APP-PLUS
+// #ifdef APP-PLUS
-	const recorderManager = uni.getRecorderManager();
+const recorderManager = uni.getRecorderManager();
-	// #endif
+// #endif
-	// 录音时长
+// 录音时长
-	const voiceLength = ref(0);
+const voiceLength = ref(0);
-	// 录音定时器
+// 录音定时器
-	const voiceTimer = ref(null);
+const voiceTimer = ref(null);
-	// 录音文本
+// 录音文本
-	const voiceText = ref('按住 说话');
+const voiceText = ref('按住 说话');
-	// 录音提示
+// 录音提示
-	const voiceTis = ref('手指上滑 取消发送');
+const voiceTis = ref('手指上滑 取消发送');
-	// 录音图标显示
+// 录音图标显示
-	const voiceFlg = ref(false);
+const voiceFlg = ref(false);
-	// 录音开始Y坐标
+// 录音开始Y坐标
-	const voicePageY = ref(0);
+const voicePageY = ref(0);
-	// 录音结束
+// 录音结束
-	const voiceStop = ref(false);
+const voiceStop = ref(false);
-	const str = '';
+const str = '';
-	// 录音相关
+// 录音相关
-	const sv = {
+const sv = {
-		// 按下触发
+	// 按下触发
-		touchstartVoice: (e) => {
+	touchstartVoice: (e) => {
-			voicePageY.value = (e.changedTouches[0].pageY).toFixed(2);
+		voicePageY.value = (e.changedTouches[0].pageY).toFixed(2);
-			recorderManager.start({
+		recorderManager.start({
-				duration: 60000, // 录音的时长，单位 ms，最大值 600000（10 分钟）
+			duration: 60000, // 录音的时长，单位 ms，最大值 600000（10 分钟）
-				sampleRate: 44100, // 采样率
+			sampleRate: 44100, // 采样率
-				numberOfChannels: 1, // 录音通道数
+			numberOfChannels: 1, // 录音通道数
-				encodeBitRate: 192000, // 编码码率
+			encodeBitRate: 192000, // 编码码率
-				format: "mp3"
+			format: "mp3"
-			});
+		});
-			voiceLength.value = 0;
+		voiceLength.value = 0;
-			voiceFlg.value = true
+		voiceFlg.value = true
-			console.log('recorder start success');
+		console.log('recorder start success');
-			//录音开始,
+		//录音开始,
-			voiceTimer.value = setInterval(() => {
+		voiceTimer.value = setInterval(() => {
-				voiceLength.value += 0.1;
+			voiceLength.value += 0.1;
-			}, 100);
+		}, 100);
 
-			console.log('touchstartVoice', voicePageY.value);
+		console.log('touchstartVoice', voicePageY.value);
-		},
+	},
-		// 滑动触发
+	// 滑动触发
-		touchmoveVoice: (e) => {
+	touchmoveVoice: (e) => {
-			// 没有展示UI不触发
+		// 没有展示UI不触发
-			if (!voiceFlg.value) {
+		if (!voiceFlg.value) {
-				return;
+			return;
-			}
+		}
-			let numTemp = voicePageY.value - ((e.changedTouches[0].pageY).toFixed(2));
+		let numTemp = voicePageY.value - ((e.changedTouches[0].pageY).toFixed(2));
-			if (numTemp >= 60) {
+		if (numTemp >= 60) {
-				console.log('取消发送');
+			console.log('取消发送');
-				voiceStop.value = true
-				voiceTis.value = '松开手指 取消发送'
-			} else {
-				console.log('继续发送');
-				voiceStop.value = false
-				voiceTis.value = '手指上滑 取消发送'
-			}
-		},
-		// 松开触发
-		touchendVoice: () => {
-			// 没有展示UI不触发
-			if (!voiceFlg.value) {
-				return;
-			}
-			clearInterval(voiceTimer.value);
-			voiceText.value = '按住 说话'
-			voiceTis.value = "手指上滑 取消发送"
-			console.log('touchendVoice');
-			sv.stop();
-		},
-		// 打断触发
-		touchcancelVoice: () => {
-			clearInterval(voiceTimer.value);
-			// 关闭UI
-			voiceText.value = '按住 说话'
-			voiceTis.value = "手指上滑 取消发送"
-			// 不发送语音
 			voiceStop.value = true
-			console.log('touchcancelVoice');
+			voiceTis.value = '松开手指 取消发送'
-			sv.stop();
+		} else {
-		},
+			console.log('继续发送');
-		stop: () => {
+			voiceStop.value = false
-			voiceTimer.value = null;
+			voiceTis.value = '手指上滑 取消发送'
-			voiceFlg.value = false
-			recorderManager.stop(); // 录音结束
-			console.log('录音结束');
 		}
-	};
+	},
-	// #ifdef APP-PLUS
+	// 松开触发
-	// 监听录音停止事件
+	touchendVoice: () => {
-	recorderManager.onStop((res) => {
+		// 没有展示UI不触发
-		// 被打断等情况不发送
+		if (!voiceFlg.value) {
-		if (voiceStop.value) {
+			return;
-			return
 		}
-		// 正常情况
+		clearInterval(voiceTimer.value);
-		if (voiceStop.value) {
+		voiceText.value = '按住 说话'
-			uni.showToast({
+		voiceTis.value = "手指上滑 取消发送"
-				icon: "none",
+		console.log('touchendVoice');
-				title: "取消发送",
+		sv.stop();
-				duration: 2000
+	},
-			})
+	// 打断触发
-			return
+	touchcancelVoice: () => {
-		}
+		clearInterval(voiceTimer.value);
-		if (voiceLength.value < 1) {
+		// 关闭UI
-			uni.showToast({
+		voiceText.value = '按住 说话'
-				icon: "none",
+		voiceTis.value = "手指上滑 取消发送"
-				title: "语音时长过短",
+		// 不发送语音
-				duration: 2000
+		voiceStop.value = true
-			})
+		console.log('touchcancelVoice');
-			return
+		sv.stop();
-		}
+	},
-		if (voiceLength.value > 60) {
+	stop: () => {
-			uni.showToast({
+		voiceTimer.value = null;
-				icon: "none",
+		voiceFlg.value = false
-				title: "语音时长过长",
+		recorderManager.stop(); // 录音结束
-				duration: 2000
+		console.log('录音结束');
-			})
+	}
-			return
+};
-		}
+// #ifdef APP-PLUS
-		console.log('file', res)
+// 监听录音停止事件
+recorderManager.onStop((res) => {
+	// 被打断等情况不发送
+	if (voiceStop.value) {
+		return
+	}
+	// 正常情况
+	if (voiceStop.value) {
+		uni.showToast({
+			icon: "none",
+			title: "取消发送",
+			duration: 2000
+		})
+		return
+	}
+	if (voiceLength.value < 1) {
+		uni.showToast({
+			icon: "none",
+			title: "语音时长过短",
+			duration: 2000
+		})
+		return
+	}
+	if (voiceLength.value > 60) {
+		uni.showToast({
+			icon: "none",
+			title: "语音时长过长",
+			duration: 2000
+		})
+		return
+	}
+	console.log('file', res)
 
-		try {
+	try {
-			let message = uni.$chat.createAudioMessage({
+		let message = uni.$chat.createAudioMessage({
-				to: props.msg.id,
+			to: props.msg.id,
-				conversationType: props.msg.type,
+			conversationType: props.msg.type,
-				payload: {
+			payload: {
-					file: res
+				file: res
-				},
+			},
-				// 音频上传进度回调
+			// 音频上传进度回调
-				onProgress: function(event) {
+			onProgress: function (event) {
-					console.log('file uploading:', event)
+				console.log('file uploading:', event)
-				}
+			}
-			})
+		}) 
-			emit('send', message)
-		} catch (e) {
-			console.log('message catch', e)
-		}
-		// 
 
-	})
+		let obj = {
-	// #endif
+			query: {
+				toUserId: message.to,
+				formId: message.from,
+				msgType: message.type,
+			},
+			data: message
+		}
+		emit('send', obj)
+	} catch (e) {
+		console.log('message catch', e)
+	}
+	// 
+
+})
+// #endif
 </script>
 <style scoped lang="scss">
-	.voice_box {
+.voice_box {
-		padding: 20rpx 0;
+	padding: 20rpx 0;
-		margin: 0 20rpx;
+	margin: 0 20rpx;
-		border-radius: 50rpx;
+	border-radius: 50rpx;
-		background: #fff;
+	background: #fff;
-		flex: 1;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.hidden {
+	display: none !important;
+}
+
+.record {
+	width: 40vw;
+	height: 40vw;
+	position: fixed;
+	top: 55%;
+	left: 30%;
+	background-color: rgba(0, 0, 0, .6);
+	border-radius: 20rpx;
+
+	.ing {
+		width: 100%;
+		height: 30vw;
 		display: flex;
-		align-items: center;
 		justify-content: center;
-	}
+		align-items: center;
 
-	.hidden {
+		// 模拟录音音效动画
-		display: none !important;
+		@keyframes volatility {
-	}
+			0% {
-
+				background-position: 0% 130%;
-	.record {
-		width: 40vw;
-		height: 40vw;
-		position: fixed;
-		top: 55%;
-		left: 30%;
-		background-color: rgba(0, 0, 0, .6);
-		border-radius: 20rpx;
-
-		.ing {
-			width: 100%;
-			height: 30vw;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			// 模拟录音音效动画
-			@keyframes volatility {
-				0% {
-					background-position: 0% 130%;
-				}
-
-				20% {
-					background-position: 0% 150%;
-				}
-
-				30% {
-					background-position: 0% 155%;
-				}
-
-				40% {
-					background-position: 0% 150%;
-				}
-
-				50% {
-					background-position: 0% 145%;
-				}
-
-				70% {
-					background-position: 0% 150%;
-				}
-
-				80% {
-					background-position: 0% 155%;
-				}
-
-				90% {
-					background-position: 0% 140%;
-				}
-
-				100% {
-					background-position: 0% 135%;
-				}
 			}
 
-			background-image: linear-gradient(to bottom, #f09b37, #fff 50%);
+			20% {
-			background-size: 100% 200%;
+				background-position: 0% 150%;
-			animation: volatility 1.5s ease-in-out -1.5s infinite alternate;
+			}
-			-webkit-background-clip: text;
+
-			-webkit-text-fill-color: transparent;
+			30% {
-			font-size: 150rpx;
+				background-position: 0% 155%;
+			}
+
+			40% {
+				background-position: 0% 150%;
+			}
+
+			50% {
+				background-position: 0% 145%;
+			}
+
+			70% {
+				background-position: 0% 150%;
+			}
+
+			80% {
+				background-position: 0% 155%;
+			}
+
+			90% {
+				background-position: 0% 140%;
+			}
+
+			100% {
+				background-position: 0% 135%;
+			}
+		}
+
+		background-image: linear-gradient(to bottom, #f09b37, #fff 50%);
+		background-size: 100% 200%;
+		animation: volatility 1.5s ease-in-out -1.5s infinite alternate;
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		font-size: 150rpx;
+		color: #f09b37;
+
+	}
+
+	.cancel {
+		width: 100%;
+		height: 30vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		color: #fff;
+		font-size: 150rpx;
+
+	}
+
+	.tis {
+		width: 100%;
+		height: 10vw;
+		display: flex;
+		justify-content: center;
+		font-size: 28rpx;
+		color: #fff;
+
+		&.change {
 			color: #f09b37;
-
-		}
-
-		.cancel {
-			width: 100%;
-			height: 30vw;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			color: #fff;
-			font-size: 150rpx;
-
-		}
-
-		.tis {
-			width: 100%;
-			height: 10vw;
-			display: flex;
-			justify-content: center;
-			font-size: 28rpx;
-			color: #fff;
-
-			&.change {
-				color: #f09b37;
-			}
 		}
 	}
+}
 </style>

jiuyi2/pages/news/myQr.vue

@@ -2,6 +2,8 @@
 // 我的二维码
 import uQRCode from '@/common/js/uqrcode.js'
 
+// 未实名认证
+import noAuth from '@/components/mine/noAuth.vue'
 import {
 	ref,
 	reactive,
@@ -60,7 +62,11 @@ function init() {
 </script>
 
 <template>
-	<view class="app">
+	<view class="page" v-if="!userinfo.isRealName">
+		<noAuth class="f1" />
+	</view>
+	
+	<view class="app" v-else>
 		<!--  -->
 		<view class="container ver mtb30 mlr30 tac">
 			<!-- 二维码插件 width height设置宽高 -->

jiuyi2/pages/news/news.vue

@@ -20,6 +20,8 @@ import TencentCloudChat from '@tencentcloud/chat';
 import apex from '@/components/header/apex'
 // 未登录
 import noLogin from '@/components/login/noLogin.vue'
+// 未实名认证
+import noAuth from '@/components/mine/noAuth.vue'
 // 通讯录
 import book from '@/components/news/book'
 // 群聊列表
@@ -107,7 +109,7 @@ function imLoading() {
 // 移除监听
 function removeListener() {
 	// #ifdef APP
-	uni.$chat.off(TencentCloudChat.EVENT.SDK_READY,()=>{});
+	uni.$chat.off(TencentCloudChat.EVENT.SDK_READY, () => { });
 	// #endif
 }
 
@@ -178,6 +180,10 @@ function getUserInfos(userRecommend) {
 		<noLogin class="f1" />
 	</view>
 
+	<view class="page" v-else-if="!userinfo.isRealName">
+		<noAuth class="f1" />
+	</view>
+
 	<view class="page" v-else>
 		<apex>
 			<template #left>