From 95cc9a50bdd95b079fe4a13fbdb485357f2af977 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Thu, 20 Mar 2025 08:50:15 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.19=20=E5=B7=A5=E4=BD=9C=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/common/js/config.js                    |   1 -
 jiuyi2/components/index/shareFirend.vue       |  14 +-
 jiuyi2/components/index/videoMenu.vue         |   2 +-
 jiuyi2/pages.json                             |   2 +-
 jiuyi2/pages/mine/realname.vue                |  23 ++-
 .../news/chat/components/news-temp/index.vue  |  62 +++++-
 .../store/components/jy-store-head/index.vue  | 192 ------------------
 jiuyi2/static/amount.png                      | Bin 202 -> 0 bytes
 jiuyi2/vite.config.js                         |   1 -
 9 files changed, 86 insertions(+), 211 deletions(-)
 delete mode 100644 jiuyi2/pages/shop/store/components/jy-store-head/index.vue
 delete mode 100644 jiuyi2/static/amount.png

diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 042767f3..36cfa819 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -7,7 +7,6 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
-	// host: 'http://96w3gq.natappfree.cc',
 	// #endif
 	// 是否vivo显示
 	showVivo: true,
diff --git a/jiuyi2/components/index/shareFirend.vue b/jiuyi2/components/index/shareFirend.vue
index bf138b6a..2232ec5c 100644
--- a/jiuyi2/components/index/shareFirend.vue
+++ b/jiuyi2/components/index/shareFirend.vue
@@ -96,11 +96,17 @@
 		// 
 		api.video.videoShare({
 			query: {
+				// 分享用户id
+				toUserId: item.userID,
+			},
+			data: {
 				// 视频id
-				videoId: videoItem.videoId,
-				// 分享人id
-				sharedUserIds: item.userID,
-			}
+				videoId: videoItem.id,
+				// 视频标题
+				videoTitle: videoItem.title,
+				// 视频封面照片
+				videoImages: videoItem.coverUrl,
+			},
 		}).then(rs => {
 			if (rs.code == 200) {
 				util.alert('分享成功')
diff --git a/jiuyi2/components/index/videoMenu.vue b/jiuyi2/components/index/videoMenu.vue
index 930088f2..e60886cd 100644
--- a/jiuyi2/components/index/videoMenu.vue
+++ b/jiuyi2/components/index/videoMenu.vue
@@ -126,7 +126,7 @@
 				</view>
 
 				<view class="amount pa l0 r0 b0 df ptb10 plr10" v-if="item.play">
-					<image class="wh24" src="/static/amount.png" mode="aspectFit" />
+					<image class="wh24" src="/static/pause.png" mode="aspectFit" />
 					<view class="txt f1 ml10 cfff f20">{{item.play}}</view>
 				</view>
 			</view>
diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json
index d2059573..34a9cb3a 100644
--- a/jiuyi2/pages.json
+++ b/jiuyi2/pages.json
@@ -882,7 +882,7 @@
 		"list": [
 			{
 				"name": "test",
-				"path": "pages/mine/mine"
+				"path": "pages/news/news"
 			},
 			{
 				"name": "test",
diff --git a/jiuyi2/pages/mine/realname.vue b/jiuyi2/pages/mine/realname.vue
index 652b84ba..f53cdb61 100644
--- a/jiuyi2/pages/mine/realname.vue
+++ b/jiuyi2/pages/mine/realname.vue
@@ -51,15 +51,23 @@
 
 	// 活体检测
 	function startLive() {
-		// 验证必填项
-		if (!form.idCard) {
-			util.alert('身份证号不能为空')
+		const data = {
+			...form
+		}
+
+		// 验证
+		if (!data.name) {
+			util.alert('真实姓名不能为空')
+			return
+		}
+		if (!data.idCard) {
+			util.alert('用户身份证号不能为空')
 			return
 		}
 
 		api.mine.isCertification({
 			query: {
-				userIdCard: form.idCard
+				userIdCard: data.idCard,
 			}
 		}).then(rs => {
 			if (rs.code === 200) {
@@ -72,6 +80,9 @@
 						console.log('startLive', result)
 						if (result.errorCode == 0) {
 							faceImage.value = result.liveImage
+							// 实名认证
+							handleSubmit()
+							// 
 						} else if (result.errorCode == 1 && result.errorMessage == '活体检测未通过') {
 							util.alert({
 								title: '系统提示',
@@ -123,11 +134,7 @@
 		}).then(rs => {
 			console.log('certification', rs)
 			if (rs.code == 200) {
-				util.alert('认证成功')
 				util.getUserinfo()
-				setTimeout(() => {
-					uni.navigateBack()
-				}, 500)
 				return
 			}
 			util.alert({
diff --git a/jiuyi2/pages/news/chat/components/news-temp/index.vue b/jiuyi2/pages/news/chat/components/news-temp/index.vue
index 0916a2b7..99391117 100644
--- a/jiuyi2/pages/news/chat/components/news-temp/index.vue
+++ b/jiuyi2/pages/news/chat/components/news-temp/index.vue
@@ -82,13 +82,23 @@
 			urls,
 		})
 	}
+
+	// 跳转到视频详情
+	function toVideoDetail() {
+		console.log('videoId', formatData.value)
+		uni.navigateTo({
+			url: util.setUrl('/pages/index/videoDetail', {
+				videoId: formatData.value.videoId,
+			})
+		})
+	}
 </script>
 
 <template>
 	<view class="content pr">
 		<!-- 图片 -->
 		<template v-if="item.type === TencentCloudChat.TYPES.MSG_IMAGE">
-			<image class="br10" :src="item.payload.imageInfoArray[0].imageUrl" mode="widthFix"
+			<image class="viewImage br10" :src="item.payload.imageInfoArray[0].imageUrl" mode="widthFix"
 				@click="util.view_imgs([item.payload.imageInfoArray[0].imageUrl],0)" />
 		</template>
 		<!-- 文字 -->
@@ -167,6 +177,21 @@
 						</view>
 					</view>
 				</template>
+				<!-- 视频分享消息 -->
+				<template v-else-if="formatData.businessType == 'videoShare'">
+					<view class="videoShare pr" @click="toVideoDetail">
+						<!-- 视频封面 -->
+						<image class="poster" :src="formatData.videoImages" mode="aspectFill" />
+						<!-- 暂停的图标 -->
+						<image class="pause pmid" src="/static/pause.png" mode="aspectFit" />
+
+						<!-- 作者信息 -->
+						<view class="auth rows pa l0 r0 b0 ptb10 plr10">
+							<image class="avatar" :src="formatData.from_url" />
+							<view class="name thd f1 ml10 cfff f22">{{formatData.from_name}}</view>
+						</view>
+					</view>
+				</template>
 			</template>
 		</template>
 
@@ -198,17 +223,48 @@
 </template>
 
 <style scoped lang="scss">
+	// 消息内容
 	.content {
 		box-sizing: border-box;
 		min-height: 80rpx;
 		max-width: 60vw;
-		font-size: 28rpx;
 
-		image {
+		// 图片消息
+		.viewImage {
 			width: 200rpx;
 		}
 	}
 
+	// 视频分享消息
+	.videoShare {
+		over-flow: hidden;
+
+		// 封面
+		.poster {
+			width: 216rpx;
+			height: 384rpx;
+			border-radius: 10rpx;
+		}
+
+		// 
+		.pause {
+			width: 40rpx;
+			height: 40rpx;
+		}
+
+		// 作者信息
+		.auth {
+			background-image: linear-gradient(to top, rgba(0, 0, 0, .2) 0, rgba(0, 0, 0, .3) 20%, rgba(0, 0, 0, .3) 60%, rgba(0, 0, 0, .00) 100%);
+			border-radius: 0 0 10rpx 10rpx;
+
+			.avatar {
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 50%;
+			}
+		}
+	}
+
 	// 红包消息
 	.redPacket {
 		width: 360rpx;
diff --git a/jiuyi2/pages/shop/store/components/jy-store-head/index.vue b/jiuyi2/pages/shop/store/components/jy-store-head/index.vue
deleted file mode 100644
index 06380079..00000000
--- a/jiuyi2/pages/shop/store/components/jy-store-head/index.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
-    <JyCommonHead isRight>
-        <template v-slot:right>
-            <view class="df img-group">
-                <image @click.stop="open('more')" class="more" :src="search" />
-                <image @click.stop="open('share')" class="share" :src="share" />
-            </view>
-        </template>
-    </JyCommonHead>
-    <uni-popup ref="share_more" type="bottom" borderRadius="20px 20px 0 0">
-        <view class="popup-content">
-            <view class="df fjc item">
-                <view class="df fdc aic" @click.stop="iconClick(item)" v-for="(item, index) in more_share_data"
-                    :key="index">
-                    <image :src="item.icon" />
-                    <text class="title">{{ item.title }}</text>
-                </view>
-            </view>
-            <p class="cancel" @click="share_more.close()" :style="{ bottom: bottomSafeAreaHeight() }">取消</p>
-        </view>
-    </uni-popup>
-</template>
-<script setup>
-import {
-    ref, inject
-} from 'vue'
-import back from '@/static/back1.png'
-import share from '@/static/share2.png'
-import search from '@/static/search.png'
-
-import news from '@/static/news.png'
-import home from '@/static/home.png'
-import individual from '@/static/individual.png'
-import order from '@/static/order.png'
-
-import linkage from '@/static/linkage.png'
-import download from '@/static/download.png'
-import wx from '@/static/wx.png'
-import qq from '@/static/qq.png'
-import {
-    screenWidth,
-    bottomSafeAreaHeight,
-    statusBarHeight,
-    goBack
-} from '@/components/public/Mixins.js'
-import { shareToPlatform } from '@/components/public/share.js'
-const share_more = ref(null)
-const more_share_data = ref([])
-const { checkLink, copyText } = inject('util');
-
-// 分享弹窗
-const more_share = {
-    more: [{
-        name: 'news',
-        icon: news,
-        title: '信息'
-    },
-    {
-        name: 'home',
-        icon: home,
-        title: '回到首页'
-    },
-    {
-        name: 'individual',
-        icon: individual,
-        title: '个人中心'
-    },
-    {
-        name: 'order',
-        icon: order,
-        title: '我的订单'
-    }
-    ],
-    share: [{
-        name: 'linkage',
-        icon: linkage,
-        title: '复制链接'
-    },
-    {
-        name: 'download',
-        icon: download,
-        title: '保存图片'
-    },
-    {
-        name: 'wx',
-        icon: wx,
-        title: '微信'
-    },
-    {
-        name: 'qq',
-        icon: qq,
-        title: 'QQ'
-    }],
-    news() {
-        checkLink('pages/news/question-answer/index')
-    },
-    home() {
-        checkLink('pages/index/index')
-    },
-    individual() {
-        checkLink('pages/mine/mine')
-    },
-    order() {
-        checkLink('pages/shop/order/index')
-    },
-    linkage() {
-        // 复制当前完整url 
-        copyText(location.href)
-    },
-    download() {
-        console.log('====================================');
-        console.log('download');
-        console.log('====================================');
-    },
-    wx() {
-        console.log('====================================');
-        console.log('wx');
-        console.log('====================================');
-        // 分享到微信
-        shareToPlatform('weixin', '这是一个测试标题', 'https://example.com/image.jpg', '这是分享的内容', '');
-    },
-    qq() {
-        console.log('====================================');
-        console.log('qq');
-        console.log('====================================');
-        // 分享到QQ
-        shareToPlatform('qq', '这是一个测试标题', 'https://example.com/image.jpg', '这是分享的内容', '');
-    }
-}
-const iconClick = (item) => {
-    console.log('====================================');
-    console.log(item);
-    console.log('====================================');
-    more_share[item.name]()
-}
-const open = (val) => {
-    more_share_data.value = more_share[val]
-    share_more.value.open()
-}
-</script>
-<style lang="scss" scoped>
-.img-group {
-    image {
-        margin: 0 20rpx;
-        width: 34rpx;
-        height: 34rpx;
-    }
-}
-
-.popup-content {
-    width: 100%;
-    height: 600rpx;
-    background: #F0F0F0; //上面两个圆角
-    border-top-left-radius: 50rpx;
-    border-top-right-radius: 50rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-
-    .item {
-        position: absolute;
-        top: 60rpx;
-        margin: 0 10rpx;
-        z-index: 1;
-    }
-
-    image {
-        margin: 0 20rpx;
-        width: 100rpx;
-        height: 100rpx;
-    }
-
-    .title {
-        margin-top: 20rpx;
-        color: $uni-text-color-grey;
-        font-size: $uni-font-size-sm;
-    }
-
-    .cancel {
-        position: absolute;
-        bottom: 60rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin: 0 20rpx 20rpx 20rpx;
-        width: 700rpx;
-        height: 80rpx;
-        border-radius: 2314rpx;
-        background: $uni-bg-color;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/jiuyi2/static/amount.png b/jiuyi2/static/amount.png
deleted file mode 100644
index a6de99c00e638d26b62b77294e43c21ee00a1fb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^96-#;!3HGxgLCzO6k~CayA#8@b22Z19F}4y&kznE
zsNqQI0P;&bT^vIsrq)ha$lKx|;&T6ff?&%91}1N2lg7Ol7+I4haAYZzG&m#(s1!fi
zbTV!8@yq#YpZ9x8F|zxlZ4-Xjz@^dXc*#9TkSkIoqao@Nmrh#Q@h1LK2kp!<&V!Sg
vYgZjCW-RuqXxJ}pR`-0~!v)RL?Q0m*xfCV}+z*`qw4cG#)z4*}Q$iB}JoP^*

diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index 439ccb56..fc5535df 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -4,7 +4,6 @@ import {
 import uni from '@dcloudio/vite-plugin-uni';
 
 let target = 'http://91f.xyz:8080'
-// let target = 'http://96w3gq.natappfree.cc'
 
 export default defineConfig({
 	plugins: [uni()],