合并代码

2025-02-03 20:36:02 +08:00 · 2025-02-03 20:36:02 +08:00 · 933dc40ea2
parent 407f3b0a0f
commit 933dc40ea2
18 changed files with 220 additions and 134 deletions
--- a/jiuyi2/api/login.js
+++ b/jiuyi2/api/login.js
@ -47,7 +47,6 @@ const login = {
 		return util.request({
 			url: '/user/login/resetPassword',
 			data: param.data,
-			path: param.path,
 			method: 'POST',
 		})
 	},
--- a/jiuyi2/api/mine.js
+++ b/jiuyi2/api/mine.js
@ -52,7 +52,23 @@ const mine = {
 		})
 	},

-	// 实名认证
+	/**
+	 * 验证盖章后是否实名
+	 * @param {Object} param
+	 */
+	isCertification(param) {
+		return util.request({
+			url: `/user/isCertification`,
+			query: param.query,
+			method: 'POST',
+			load: true,
+		})
+	},
+
+	/**
+	 * 实名认证
+	 * @param {Object} param
+	 */
 	certification(param) {
 		return util.request({
 			url: `/user/info/certification`,
--- a/jiuyi2/api/shop.js
+++ b/jiuyi2/api/shop.js
@ -13,6 +13,7 @@ const shop = {
 			method: 'GET',
 		})
 	},
+
 	/**
 	 * 商家缴纳押金
 	 * @param {Object} param
@ -20,6 +21,7 @@ const shop = {
 	depositsPay(param) {
 		return util.request({
 			url: `/shopify/appDeposits/depositsPay`,
+			load: true,
 			method: 'POST',
 		})
 	},
@ -65,6 +67,7 @@ const shop = {
 	outDepositsPay(param) {
 		return util.request({
 			url: `/shopify/appDeposits/outDepositsPay`,
+			load: true,
 			method: 'POST',
 		})
 	},
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@ -5,18 +5,19 @@ const config = {
 	host: 'http://localhost:5173',
 	// #endif
 	// #ifndef H5
-	host: 'http://91f.xyz:8080',
-	// host: 'http://6jv6aq.natappfree.cc ',
+	// host: 'http://91f.xyz:8080',
+	// host: 'http://192.168.31.61:8080',
+	host: 'http://192.168.31.41:8080',
 	// #endif
 	// 支付方式配置
 	payType: {
 		score: {
 			name: '积分',
-			img: '/static/score.png',
+			icon: '/static/score.png',
 		},
 		balance: {
 			name: '余额',
-			img: '/static/balance.png',
+			icon: '/static/balance.png',
 		},
 	},
 	// 腾讯im聊天
--- a/jiuyi2/common/js/util.js
+++ b/jiuyi2/common/js/util.js
@ -1477,9 +1477,7 @@ const util = {
 					reslove(rs.data)
 					const userinfo = rs.data
 					// 如果开启了青少年模式
-					if (userinfo.teenTime) {
-						// 青少年模式验证 如果到了限制去锁定页
-					}
+					if (userinfo.teenTime) getTeenMode(userinfo.teenTime)
 					// 提交
 					store.commit('setState', {
 						key: 'userinfo',
@ -1496,6 +1494,31 @@ const util = {
 		})
 	},

+	// 青少年模式
+	getTeenMode(teenTime) {
+		// 当前时间
+		const currentDate = new Date()
+		// 当前小时
+		const currentHour = currentDate.getHours()
+		// 大于八点 小于22点 当前时间小于设定时间
+		const result = currentHour >= 8 && currentHour < 22 && currentDate.valueOf() < new Date(teenTime).valueOf()
+
+		// 锁定
+		function lock() {
+			uni.reLaunch({
+				url: '/pages/login/lock'
+			})
+		}
+
+		// 结果
+		if (result) {
+			// 设置定时器
+			setTimeout(() => {
+				lock()
+			}, parseInt(new Date(teenTime).valueOf() - currentDate.valueOf()))
+		} else lock()
+	},
+
 	/**
 	 * 验证登录
 	 * @param {Object} cb 回调函数
@ -1556,7 +1579,7 @@ const util = {
 		// 验证登录
 		util.isLogin(() => {
 			const userinfo = uni.$store.state.userinfo
-			if (userinfo.userIdCard) {
+			if (userinfo.isRealName) {
 				param.success ? param.success(userinfo) : ''
 				return
 			}
--- a/jiuyi2/components/index/collect.vue
+++ b/jiuyi2/components/index/collect.vue
@ -120,9 +120,10 @@
 			},
 		}).then(rs => {
 			if (rs.code == 200) {
-				detail.value.isCollect = false
-				detail.value.collect--
-				uni.$emit('updateVideo', detail.value)
+				uni.$emit('updateVideo', {
+					...detail.value,
+					...rs.data,
+				})
 				// 收藏了取消收藏
 				collectResult.value = false
 				proxy.$refs.result.open()
--- a/jiuyi2/components/index/fastCollect.vue
+++ b/jiuyi2/components/index/fastCollect.vue
@ -140,15 +140,16 @@
 				// 视频id
 				videoId: detail.value.id,
 				// 收藏夹id
-				collectId: item.id,
+				folderId: item.id,
 			}
 		}).then(rs => {
 			if (rs.code == 200) {
 				proxy.$refs.fastCollect.close()

-				detail.value.isCollect = true
-				detail.value.collect++
-				uni.$emit('updateVideo', detail.value)
+				uni.$emit('updateVideo', {
+					...detail.value,
+					...rs.data,
+				})
 				return
 			}
 			// 
--- a/jiuyi2/components/index/indexVideo.vue
+++ b/jiuyi2/components/index/indexVideo.vue
@ -170,9 +170,6 @@

 			// 
 			tapTimer.value = setTimeout(() => {
-				// 是否点赞
-				const isLike = props.item.isLike
-
 				let a = tapList.length
 				tapList.length = 0

@ -185,7 +182,7 @@
 						emit('like', {
 							likeType: 0,
 							index: props.index,
-							isLike: isLike == 0 ? 0 : 1
+							isLike: props.item.isLike
 						})
 						break;
 					case 3:
@ -193,7 +190,7 @@
 						emit('like', {
 							likeType: 1,
 							index: props.index,
-							isLike: isLike == 0 ? 3 : 1
+							isLike: props.item.isLike
 						})
 						break;
 				}
@ -558,9 +555,14 @@
 										@click="handleLike(index, 0, 0)" @longpress="handlePrivateLike(index)" />
 								</template>
 							</view>
-							<view class="txt mt10">
+
+							<!-- 只有公开赞显示点赞数 -->
+							<view class="txt mt10" v-if="item.isLike && item.likeType == 0">
 								<text class="text">{{ item.likeCount }}</text>
 							</view>
+							<view class="txt mt10" v-else>
+								<text class="text">点赞</text>
+							</view>
 						</view>
 					</view>

@ -581,7 +583,8 @@
 								v-if="item.isCollect" />
 							<image class="wh50" src="@/static/indexCollect.png" mode="aspectFit" v-else />
 							<view class="txt mt10">
-								<text class="text">{{ item.collectCount }}</text>
+								<text class="text">收藏</text>
+								<!-- <text class="text">{{ item.collectCount }}</text> -->
 							</view>
 						</view>
 					</view>
--- a/jiuyi2/components/mine/codeInput.vue
+++ b/jiuyi2/components/mine/codeInput.vue
@ -24,7 +24,7 @@
 <template>
 	<view class="pwd rows mt50 ptb10 plr30">
 		<view class="item fmid" v-for="(item,index) in 6" :key="index">
-			<text v-if="modelValue[index] != null">{{modelValue[index]}}●</text>
+			<text v-if="modelValue[index] != null">●</text>
 		</view>
 	</view>
 </template>
--- a/jiuyi2/pages.json
+++ b/jiuyi2/pages.json
@ -689,33 +689,29 @@
 			}
 		},
 		{
-			"path" : "pages/shop/commodity/history",
-			"style" : 
-			{
-				"navigationBarTitleText" : "商品修改历史"
+			"path": "pages/shop/commodity/history",
+			"style": {
+				"navigationBarTitleText": "商品修改历史"
 			}
 		},
 		{
-			"path" : "pages/shop/store/order",
-			"style" : 
-			{
-				"navigationBarTitleText" : "商家订单",
+			"path": "pages/shop/store/order",
+			"style": {
+				"navigationBarTitleText": "商家订单",
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/mine/setting/sequence",
-			"style" : 
-			{
-				"navigationBarTitleText" : "支付顺序",
+			"path": "pages/mine/setting/sequence",
+			"style": {
+				"navigationBarTitleText": "支付顺序",
 				"navigationBarBackgroundColor": "#fff"
 			}
 		},
 		{
-			"path" : "pages/shop/commodity/payment",
-			"style" : 
-			{
-				"navigationBarTitleText" : "继续付款",
+			"path": "pages/shop/commodity/payment",
+			"style": {
+				"navigationBarTitleText": "继续付款",
 				"navigationBarBackgroundColor": "#fff"
 			}
 		},
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@ -211,6 +211,7 @@
 	})

 	onHide(() => {
+		console.log('onHide', current[tabIndex.value], currentVideoRef)
 		// 暂停视频
 		if (proxy.$refs[`videoRef${tabIndex.value}`]) {
 			proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].pause()
@ -721,19 +722,20 @@
 					@touchend="onTouchend($event,index)" @loadmore="item.getMoreList">
 					<cell class="cell" :style="[{height: viewSize.height + 'px'}]" :ref="`cellRef` + index"
 						v-for="(secItem,secIndex) in item.listData()" :key="secItem.id" @click.stop>
-						<template v-if="current[tabIndex] < secIndex + 2 && current[tabIndex] > secIndex - 2">
-							<view class="pa t0 l0 r0 b0 fmid" :style="{zIndex: 99,}">
-								<text class="f32 cfff">{{current[tabIndex]}}</text>
-								<text class="f32 cfff">{{index}}</text>
-							</view>
-							<!-- 视频 -->
-							<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[tabIndex]"
-								:width="viewSize.width" :height="viewSize.height" :item="secItem" :index="secIndex"
-								@showTime="handleShowTime" @showComment="handleShowCommentAlt"
-								@showCollect="handleShowCollectAlt" @showShareFirend="handleShowShareFirend"
-								@onPlay="handleVideoOnPlay" @onPause="handleVideoOnPause" @like="videoLike"
-								@longtap="$refs.moreMenuRef.open(secItem)" @showFastCollect="handleShowFastCollect" />
-						</template>
+						<!-- <template v-if="current[tabIndex] < secIndex + 2 && current[tabIndex] > secIndex - 2"> -->
+						<view class="pa t0 l0 r0 b0 fmid" :style="{zIndex: 99,}">
+							<text class="f32 cfff">{{current[tabIndex]}}</text>
+							<text class="f32 cfff">{{index}}</text>
+						</view>
+
+						<!-- 视频 -->
+						<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[tabIndex]"
+							:width="viewSize.width" :height="viewSize.height" :item="secItem" :index="secIndex"
+							@showTime="handleShowTime" @showComment="handleShowCommentAlt"
+							@showCollect="handleShowCollectAlt" @showShareFirend="handleShowShareFirend"
+							@onPlay="handleVideoOnPlay" @onPause="handleVideoOnPause" @like="videoLike"
+							@longtap="$refs.moreMenuRef.open(secItem)" @showFastCollect="handleShowFastCollect" />
+						<!-- </template> -->
 					</cell>
 				</list>
 			</view>
--- a/jiuyi2/pages/login/forget.vue
+++ b/jiuyi2/pages/login/forget.vue
@ -14,54 +14,59 @@
 	import notice from '@/components/login/notice'
 	// api
 	import api from '@/api/index'
+	// 加密
+	import CryptoJS from 'crypto-js';

 	// 表单
 	const form = reactive({
 		// 设备imei
 		userImei: '',
 		// 手机号
-		userPhone: '',
+		phoneNumber: '',
 		// 密码
-		userPassword: '',
+		password: '',
+		// 验证码
+		verifyCode: '',
 	})
 	// 确认密码
 	const rePwd = ref('')
-	// 验证码
-	const cache = ref('')
 	// 阅读
 	const read = ref(false)

 	// 登录
 	function handleLogin() {
+		const data = {
+			...form
+		}
 		// 校验
-		if (!form.userPhone) {
+		if (!data.phoneNumber) {
 			util.alert('请输入手机号')
 			return
 		}
-		if (!cache.value) {
+		if (!data.verifyCode) {
 			util.alert('请输入验证码')
 			return
 		}
-		if (!form.userPassword) {
+		if (!data.password) {
 			util.alert('请输入密码')
 			return
 		}
-		if (form.userPassword !== rePwd.value) {
+		if (data.password !== rePwd.value) {
 			util.alert('两次输入密码不一致')
 			return
 		}
+		data.password = CryptoJS.MD5(data.password).toString()

 		// 如果imei为空
-		if (!form.userImei) {
+		if (!data.userImei) {
 			const info = uni.getSystemInfoSync()
 			// 
-			form.userImei = info.deviceId
+			data.userImei = info.deviceId
 		}

 		// 忘记密码找回
 		api.login.resetPassword({
-			data: form,
-			path: [cache.value],
+			data,
 		}).then(rs => {
 			if (rs.code == 200) {
 				util.alert({
@ -94,19 +99,19 @@
 				<view class="title mtb30">忘记密码</view>

 				<view class="inputBox mtb30 ptb10 plr30">
-					<input type="text" v-model="form.userPhone" placeholder="请输入手机号" />
+					<input type="text" v-model="form.phoneNumber" placeholder="请输入手机号" />
 				</view>

 				<view class="inputBox rows mtb30 ptb10 plr30">
-					<input type="text" v-model="cache" placeholder="请输入验证码" class="f1" />
+					<input type="text" v-model="form.verifyCode" placeholder="请输入验证码" class="f1" />

 					<view class="getCode btn sm plr20">
-						<getCode event="reset_password" :phone="form.userPhone" />
+						<getCode event="reset_password" :phone="form.phoneNumber" />
 					</view>
 				</view>

 				<view class="inputBox mtb30 ptb10 plr30">
-					<input type="text" v-model="form.userPassword" placeholder="请输入密码" />
+					<input type="text" v-model="form.password" placeholder="请输入密码" />
 				</view>

 				<view class="inputBox mtb30 ptb10 plr30">
--- a/jiuyi2/pages/mine/realname.vue
+++ b/jiuyi2/pages/mine/realname.vue
@ -43,32 +43,51 @@
 	})
 	// 格式化
 	const format_idCard = computed(() => {
-		let result = userinfo.value.idCard || ''
-		if (result) result = result.slice(0, 1) + '*'.repeat(userinfo.value.idCard.length - 2) + result.slice(-
+		let result = userinfo.value.userIdCard || ''
+		if (result) result = result.slice(0, 1) + '*'.repeat(userinfo.value.userIdCard.length - 2) + result.slice(-
 			1)
 		return result
 	})

 	// 活体检测
 	function startLive() {
-		// 调用异步方法
-		liveModule.startLive({
-				openSound: true,
-				signKey: 'HISP1YFG44LQ29W0',
-			},
-			result => {
-				console.log('startLive', result)
-				if (result.errorCode == 0) {
-					faceImage.value = result.liveImage
-				} else if (result.errorCode == 1 && result.errorMessage == '活体检测未通过') {
-					util.alert({
-						title: '系统提示',
-						content: '检测失败请重试',
-						showCancel: false
+		// 验证必填项
+		if (!form.idCard) {
+			util.alert('身份证号不能为空')
+			return
+		}
+
+		api.mine.isCertification({
+			query: {
+				userIdCard: form.idCard
+			}
+		}).then(rs => {
+			if (rs.code === 200) {
+				// 调用异步方法
+				liveModule.startLive({
+						openSound: true,
+						signKey: 'HISP1YFG44LQ29W0',
+					},
+					result => {
+						console.log('startLive', result)
+						if (result.errorCode == 0) {
+							faceImage.value = result.liveImage
+						} else if (result.errorCode == 1 && result.errorMessage == '活体检测未通过') {
+							util.alert({
+								title: '系统提示',
+								content: '检测失败请重试',
+								showCancel: false
+							})
+						}
+						// this.resultText = result.errorMessage;
 					})
-				}
-				// this.resultText = result.errorMessage;
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
 			})
+		})
 	}

 	// 实名认证
@ -125,7 +144,7 @@
 		<image class="authImg" src="/static/mineAuth.png" mode="aspectFill" />

 		<view class="mt30 tac c666 f30">
-			<view class="">{{userinfo.name}}</view>
+			<view class="">{{userinfo.userRealName}}</view>
 			<view class="mt50">{{format_idCard}}</view>
 		</view>
 	</view>
@ -186,7 +205,7 @@
 		.key {
 			width: 200rpx;
 		}
-		
+
 		.value {
 			flex: 1;
 			font-size: 28rpx;
--- a/jiuyi2/pages/mine/setting/secondPwd.vue
+++ b/jiuyi2/pages/mine/setting/secondPwd.vue
@ -33,7 +33,7 @@
 		rePwd: '',
 	})
 	// 当前输入表单键
-	const formKey = reactive('pwd')
+	const formKey = ref('pwd')
 	// 用户信息
 	const userinfo = computed(() => {
 		let result = store.state.userinfo
@ -56,6 +56,7 @@
 			util.alert('二级密码不能为空')
 		}
 		mode.value = 'rePwd'
+		formKey.value = 'rePwd'
 	}

 	// 确认输入密码
@ -76,6 +77,10 @@
 				content: '两次输入密码不一致',
 				showCancel: false
 			})
+
+			// 密码
+			form.pwd = ''
+			form.rePwd = ''
 			mode.value = 'set'
 			return
 		}
@ -139,14 +144,14 @@
 	 * @param {Object} val
 	 */
 	function KeyInfo(val) {
-		// 如果大于六位
-		if (form[formKey.value].length >= 6) return
 		// 判断是否输入的是删除键
 		if (val.keyCode === 8) {
 			// 删除最后一位
 			form[formKey.value] = form[formKey.value].slice(0, -1)
-			// passwordArr.splice(val.index + 1, 1)
+			return
 		}
+		// 如果大于六位
+		if (form[formKey.value].length >= 6) return
 		// 判断是否输入的是.
 		else if (val.keyCode == 190) {
 			// 输入.无效
@ -167,7 +172,7 @@
 				<codeInput v-model:modelValue="form.pwd" />
 			</view>

-			<view class="btn lg black mtb50 plr50" @click="handleSubmit">下一步</view>
+			<view class="btn lg black mtb50 plr50" @click="handleNext">下一步</view>
 		</view>

 		<view class="container ver mt10p" v-if="mode === 'rePwd'">
@ -175,7 +180,7 @@
 			<view class="content mt50 c666 f32">请再次输入刚才设置的二级密码</view>

 			<view class="pwd">
-				<codeInput v-model:modelValue="form.repwd" />
+				<codeInput v-model:modelValue="form.rePwd" />
 			</view>

 			<view class="btn lg black mtb50 plr50" @click="handleSubmit">确认</view>
@ -192,6 +197,7 @@
 		</view>
 	</view>

+	<!-- 安全键盘 -->
 	<cc-defineKeyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo" />
 </template>

--- a/jiuyi2/pages/mine/setting/sequence.vue
+++ b/jiuyi2/pages/mine/setting/sequence.vue
@ -1,17 +1,5 @@
-<template>
-	<view class="app">
-		<!-- 提示 -->
-		<view class="title mtb30 mlr30 c333 f32 b">按住图标拖动</view>
-		<!-- 拖拽 -->
-		<HM-dragSorts ref="dragSorts" :list="list" :listHeight="90" />
-
-		<view class="footer plr30 bfff shadow">
-			<view class="btn lg black" @click="handleSubmit">保存</view>
-		</view>
-	</view>
-</template>
-
 <script setup>
+	// 支付顺序
 	import {
 		onMounted,
 		ref
@ -35,10 +23,8 @@
 			if (res.code == 200) {
 				// 列表
 				list.value = res.data.map(node => {
-					node.name = {
-						'balance': '余额',
-						'score': '积分',
-					} [node.paymentMethod]
+					node.icon = util.config.payType[node.paymentMethod].icon
+					node.name = util.config.payType[node.paymentMethod].name
 					return node
 				})
 				return
@ -72,6 +58,19 @@
 	}
 </script>

+<template>
+	<view class="app">
+		<!-- 提示 -->
+		<view class="title mtb30 mlr30 c333 f32 b">按住图标拖动</view>
+		<!-- 拖拽 -->
+		<HM-dragSorts ref="dragSorts" :list="list" :listHeight="90" />
+
+		<view class="footer plr30 bfff shadow">
+			<view class="btn lg black" @click="handleSubmit">保存</view>
+		</view>
+	</view>
+</template>
+
 <style lang="scss" scoped>
 	// 
 </style>
--- a/jiuyi2/pages/shop/settle.vue
+++ b/jiuyi2/pages/shop/settle.vue
@ -65,7 +65,7 @@

 	onReady(() => {
 		// 测试缴纳接口
-		callPwd('depositsPay')
+		// callPwd('depositsPay')
 	})

 	// 获取表单信息
@ -354,14 +354,19 @@
 	 * @param {Object} key 后续方法key
 	 */
 	function callPwd(key) {
-		pwdCb.value = {
-			// 缴纳押金
-			'depositsPay': depositsPay,
-			// 取消押金并退出商家身份
-			'outDepositsPay': outDepositsPay,
-		} [key]
-		// 拉起弹窗
-		proxy.$refs.payPwdRef.open()
+		util.isAuth({
+			success: () => {
+				pwdCb.value = {
+					// 缴纳押金
+					'depositsPay': depositsPay,
+					// 取消押金并退出商家身份
+					'outDepositsPay': outDepositsPay,
+				} [key]
+				console.log('pwdCb', pwdCb.value)
+				// 拉起弹窗
+				proxy.$refs.payPwdRef.open()
+			}
+		})
 	}

 	// 二级密码验证
@ -389,7 +394,7 @@
 			<view class="footer plr30 bfff shadow">
 				<!-- 未缴纳押金 -->
 				<template v-if="mode.code == 0">
-					<view class="btn black" @click="$refs.payPwdRef.open()">缴纳押金</view>
+					<view class="btn black" @click="callPwd('depositsPay')">缴纳押金</view>
 				</template>
 				<template v-else>
 					<view class="rows">
--- a/jiuyi2/readme.md
+++ b/jiuyi2/readme.md
@ -100,7 +100,7 @@ npm install crypto-js --save-dev
 短信宝
 https://console.smsbao.com/#/general/log/mt
 bcmeta
-3216547@A
+3216547@A91a


 证书网址
@ -124,14 +124,6 @@ https://mastergo.com/goto/DPd3TfDa?page_id=M&file=140247496805863
 HelloWorld123!


-设计文档
-https://docs.qq.com/sheet/DWVJQeUdnTVR2a0xp?tab=BB08J2
-
-测试推荐码
-exercita
-UAZTMZ
-
-
 bilibili扒视频网站
 https://snapany.com/zh/bilibili

@ -424,4 +416,18 @@ likeType
 商品评论


+点赞
+收藏
+青少年模式
+闹钟
+有效读秒
+任务读秒
+商品上传
+购买流程
+商家和会员之间进行沟通
+购买卷轴榴莲果树释放
+榴莲果兑换展播量
+评论集合 查看他人评论消耗榴莲果
+
+

--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@ -4,8 +4,9 @@ import {
 import uni from '@dcloudio/vite-plugin-uni';

 // 
-let target = 'http://91f.xyz:8080'
-// let target = 'http://6jv6aq.natappfree.cc '
+// let target = 'http://91f.xyz:8080'
+// let target = 'http://192.168.31.41:8080'
+let target = 'http://192.168.31.61:8080'

 export default defineConfig({
 	plugins: [uni()],