From 243e1b1d037ac57211048a7daae3f7c260071a60 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Sat, 15 Feb 2025 21:58:36 +0800
Subject: [PATCH] =?UTF-8?q?2025.02.15=20=E5=B7=A5=E4=BD=9C=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=20=E4=BF=AE=E5=A4=8D=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E8=AE=BE=E7=BD=AE=E4=BA=86=E4=BA=8C=E7=BA=A7=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=B2=A1=E6=9C=89=E5=85=88=E9=AA=8C=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/common/js/config.js               |  4 +--
 jiuyi2/components/index/proDetailAlt.vue |  1 -
 jiuyi2/pages/index/dataCenter/push.vue   |  8 ++---
 jiuyi2/pages/index/index.nvue            |  9 +++---
 jiuyi2/pages/mine/setting/secondPwd.vue  | 37 ++++++++++++++++--------
 jiuyi2/vite.config.js                    |  5 ++--
 6 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index e05aaa5e..52b44074 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -6,8 +6,8 @@ const config = {
 	// host: 'h5api',
 	// #endif
 	// #ifndef H5
-	// host: 'http://91f.xyz:8080',
-	host: 'http://1a4b9ed1.r24.cpolar.top',
+	host: 'http://91f.xyz:8080',
+	// host: 'http://d5si5v.natappfree.cc',
 	// #endif
 	// 支付方式配置
 	payType: {
diff --git a/jiuyi2/components/index/proDetailAlt.vue b/jiuyi2/components/index/proDetailAlt.vue
index 0ec9256f..4906e4f1 100644
--- a/jiuyi2/components/index/proDetailAlt.vue
+++ b/jiuyi2/components/index/proDetailAlt.vue
@@ -41,7 +41,6 @@
 	 */
 	function init(productId) {
 		if (productId) proId.value = productId
-
 		// 打开
 		open()
 		// 获取详情
diff --git a/jiuyi2/pages/index/dataCenter/push.vue b/jiuyi2/pages/index/dataCenter/push.vue
index 96916d57..a0ca0507 100644
--- a/jiuyi2/pages/index/dataCenter/push.vue
+++ b/jiuyi2/pages/index/dataCenter/push.vue
@@ -134,11 +134,7 @@
 		}).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.data.push(...rs.rows)
 				list.total = rs.total
 				return
 			}
@@ -285,7 +281,7 @@
 				<scroll-view scroll-x="true" class="scroll">
 					<view class="list df">
 						<view class="item oh pr fs0 mr20 br20" v-for="(item,index) in myVideos" :key="index">
-							<image class="poster br20" :src="item.format_imageUrl" mode="aspectFill" />
+							<image class="poster br20" :src="item.coverUrl" mode="aspectFill" />
 							<!-- <view class="window pfull"></view> -->
 						</view>
 					</view>
diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue
index 94c26332..c4b4dde8 100644
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@@ -216,9 +216,9 @@
 		}, 50)
 		// 
 		// proxy.$refs.productAltRef.init()
-		handleProBuy({
-			productId: 42,
-		})
+		// handleProBuy({
+		// 	productId: 42,
+		// })
 	})
 
 	onShow(() => {
@@ -686,6 +686,7 @@
 	 * @param {Object} item 视频列表项
 	 */
 	function handleShowProduct(item) {
+		console.log('video', item)
 		// 打开产品详情弹窗
 		proxy.$refs.productAltRef.init(item.productId)
 	}
@@ -856,7 +857,7 @@
 	<!-- 左侧菜单弹窗 -->
 	<leftMenuAlt ref="leftMenuRef" />
 	<!-- 产品详情弹窗 -->
-	<productAlt ref="productAltRef" @click="handleProductBuy" />
+	<productAlt ref="productAltRef" @buy="handleProductBuy" />
 	<!-- 产品立即下单弹窗 -->
 	<productSpecAlt ref="productSpecAltRef" :detail="productDetail" @confirm="handlePay" />
 
diff --git a/jiuyi2/pages/mine/setting/secondPwd.vue b/jiuyi2/pages/mine/setting/secondPwd.vue
index 3cb2c9ce..fa574f95 100644
--- a/jiuyi2/pages/mine/setting/secondPwd.vue
+++ b/jiuyi2/pages/mine/setting/secondPwd.vue
@@ -28,19 +28,23 @@
 	} = getCurrentInstance()
 	// 
 	const store = useStore()
-	// 模式  set设置密码 rePwd确认密码 check验证密码
-	const mode = ref('set')
+	// 模式  pwd设置密码 rePwd确认密码 check验证密码
+	const mode = ref('pwd')
 	// 表单
 	const form = reactive({
 		pwd: '',
 		rePwd: '',
+		check: '',
 	})
 	// 当前输入表单键
 	const formKey = ref('pwd')
 	// 用户信息
 	const userinfo = computed(() => {
 		let result = store.state.userinfo
-		if (result.hasSecondCipher) mode.value = 'check'
+		if (result.hasSecondCipher) {
+			mode.value = 'check'
+			formKey.value = 'check'
+		}
 		return result
 	})
 
@@ -79,7 +83,7 @@
 			// 密码
 			form.pwd = ''
 			form.rePwd = ''
-			mode.value = 'set'
+			mode.value = 'pwd'
 			return
 		}
 		// 
@@ -112,22 +116,23 @@
 		}
 
 		// 验证必填项
-		if (!data.pwd) {
+		if (!data.check) {
 			util.alert('二级密码不能为空')
+			return
 		}
 		// 
-		data.pwd = CryptoJS.MD5(data.pwd).toString()
+		data.check = CryptoJS.MD5(data.check).toString()
 
 		// 设置二级密码
 		api.mine.checkSecondLevelCipher({
 			data: {
 				id: userinfo.value.id,
-				secondLevelCipher: data.pwd,
+				secondLevelCipher: data.check,
 			}
 		}).then(rs => {
 			if (rs.code == 200) {
-				form.pwd = ''
-				mode.value = 'set'
+				form.check = ''
+				mode.value = 'pwd'
 				return
 			}
 			util.alert({
@@ -162,7 +167,7 @@
 
 <template>
 	<view class="appbw">
-		<view class="container ver mt10p" v-if="mode === 'set'">
+		<view class="container ver mt10p" v-if="mode === 'pwd'">
 			<view class="title c333 f54">设置二级密码</view>
 			<view class="content mt50 c666 f32">请设置六位数字的二级密码</view>
 
@@ -187,14 +192,22 @@
 		<view class="container ver mt10p" v-if="mode === 'check'">
 			<view class="title c333 f54">验证二级密码</view>
 			<view class="content mt50 c666 f32">请输入二级密码用于验证</view>
-			<view class="inputBox mt50 ptb10 plr30">
-				<input type="number" :maxlength="6" v-model="form.pwd" :focus="true" placeholder="六位数字密码" />
+
+			<view class="pwd">
+				<codeInput v-model:modelValue="form.check" />
 			</view>
 
+			<!-- <view class="inputBox mt50 ptb10 plr30">
+				<input type="number" :maxlength="6" v-model="form.pwd" :focus="true" placeholder="六位数字密码" />
+			</view> -->
+
 			<view class="btn lg black mtb50 plr50" @click="handleCheck">验证</view>
 		</view>
 	</view>
 
+	<!--  -->
+	<view v-show="0">{{userinfo}}</view>
+
 	<!-- 安全键盘 -->
 	<!-- <cc-defineKeyboard ref="CodeKeyboard" passwrdType="pay" @KeyInfo="KeyInfo" /> -->
 	<view class="keyboard">
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index 4406b763..e01a9a9f 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,9 +3,8 @@ import {
 } from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 
-// let target = 'http://91f.xyz:8080'
-let target = 'http://1a4b9ed1.r24.cpolar.top'
-
+let target = 'http://91f.xyz:8080'
+// let target = 'http://d5si5v.natappfree.cc'
 
 export default defineConfig({
 	plugins: [uni()],