2025.03.18 工作代码提交

jiuyi2/api/mine.js

@@ -213,7 +213,6 @@ const mine = {
 	 * @param {Object} param
 	 */
 	alipayPay(param) {
-		console.log('alipayPay',param)
 		return util.request({
 			url: '/user/alipay/recharge',
 			query: param.query,

jiuyi2/api/video.js

@@ -474,8 +474,9 @@ const video = {
 	 */
 	videoShare(param) {
 		return util.request({
-			url: `/home/videoShare`,
+			url: `/user/chat/single/sendVideo`,
 			query: param.query,
+			data: param.data,
 			method: 'POST',
 		})
 	},

jiuyi2/common/js/config.js

@@ -7,6 +7,7 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
+	// host: 'http://96w3gq.natappfree.cc',
 	// #endif
 	// 是否vivo显示
 	showVivo: true,

jiuyi2/components/index/collectList.vue

@@ -29,7 +29,7 @@
 		// 数据
 		data: [],
 		// 条数
-		pageSize: 10,
+		pageSize: 20,
 		// 页码
 		pageNum: 1,
 		// 总数
@@ -190,6 +190,7 @@
 
 	// 
 	defineExpose({
+		listProperty,
 		getList,
 		getMoreList,
 		refrshList,

jiuyi2/manifest.json

@@ -2,8 +2,8 @@
     "name" : "九亿",
     "appid" : "__UNI__08B31BC",
     "description" : "",
-    "versionName" : "1.0.16",
-    "versionCode" : 1016,
+    "versionName" : "1.0.17",
+    "versionCode" : 1017,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

jiuyi2/pages/index/dataCenter/pushVideoCollects.vue

@@ -66,9 +66,9 @@
 	// 获取收藏夹下的视频
 	function getList() {
 		// 
-		api.video.getCollectVideoList({
+		api.video.getFavoriteVideo({
 			query: {
-				collectId: collects.value.id,
+				folderId: collects.value.id,
 			}
 		}).then(rs => {
 			if (rs.code == 200) {
@@ -100,7 +100,7 @@
 	<view class="appbw">
 		<view>
 			<!--  -->
-			<collectList :pageSize="20" ref="collectListRef" @handleItem="handleCollects" />
+			<collectList ref="collectListRef" @handleItem="handleCollects" />
 		</view>
 
 		<!-- 选择 -->

jiuyi2/pages/index/index.nvue

@@ -231,12 +231,12 @@
 
 	onHide(() => {
 		// 上一个视频的id
-		const videoId = tabCurrent.value.listData()[current[tabIndex.value]].id
+		const videoItem = tabCurrent.value.listData()[current[tabIndex.value]]
 
 		// 暂停视频
-		if (videoId) {
+		if (videoItem && videoItem.id) {
 			// 视频组件
-			const VideoRef = proxy.$refs[`videoRef${videoId}`][0]
+			const VideoRef = proxy.$refs[`videoRef${videoItem.id}`][0]
 			VideoRef.pause()
 			// videoRefList[current[tabIndex.value]].pause()
 		}

jiuyi2/pages/index/wallet/topUp.vue

@@ -27,17 +27,17 @@
 			name: '支付宝',
 			provider: 'alipay',
 			apiRequest: (event) => {
-				return api.mine.alipayPay(event)
-			}
-		},
-		{
-			img: '/static/shop-weixin-pay.png',
-			name: '微信支付',
-			provider: 'wxpay',
-			apiRequest: (event) => {
-				return api.mine.wechatPay(event)
+				return handleAlipayPay(event)
 			}
 		},
+		// {
+		// 	img: '/static/shop-weixin-pay.png',
+		// 	name: '微信支付',
+		// 	provider: 'wxpay',
+		// 	apiRequest: (event) => {
+		// 		return handleWeChat(event)
+		// 	}
+		// },
 	])
 	// 支付列表下标
 	const paymentIndex = ref(0)
@@ -70,29 +70,59 @@
 
 	// 调用支付
 	function handlePayment() {
-		const data = {
-			...form
-		}
-
-		if (!data.totalAmount) {
+		if (!form.totalAmount) {
 			util.alert('金额不正确')
 			return
 		}
 
 		// 调用支付方式
-		payment.value.apiRequest({
+		payment.value.apiRequest()
+	}
+
+	// 支付宝支付
+	function handleAlipayPay() {
+		api.mine.alipayPay({
 			query: {
-				...data,
+				...form,
 			},
 		}).then(rs => {
-			console.log('payment rs', rs)
-			if (rs.code == 200) {
+			// 唤起支付
+			callPayment({
+				response: rs,
+				paymentParams: {
+					orderInfo: rs.msg,
+				},
+			})
+		})
+	}
+
+	// 微信支付
+	function handleWeChat() {
+		api.mine.wechatPay({
+			query: {
+				...form,
+			},
+		}).then(rs => {
+			// 唤起支付
+			callPayment({
+				response: rs,
+				paymentParams: {
+					...rs.data.msg,
+				},
+			})
+		})
+	}
+
+	/**
+	 * 唤起支付
+	 * @param {Object} params 
+	 */
+	function callPayment(params = {}) {
+		if (params.response.code == 200) {
 			uni.requestPayment({
 				provider: payment.value.provider,
-					// orderInfo: rs.data,
-					package: `prepay_id=${rs.data.prepayId}`,
+				...params.paymentParams,
 				success: rs => {
-						console.log('requestPayment', rs)
 					util.getPurse()
 					uni.navigateBack()
 				},
@@ -103,10 +133,10 @@
 			return
 		}
 		util.alert({
-				content: rs.msg,
+			content: params.response.msg,
 			showCancel: false,
 		})
-		})
+
 	}
 </script>
 

jiuyi2/pages/mine/mine.vue

@@ -217,10 +217,10 @@
 						<image src="/static/mien-dianpuguanli.png" mode="aspectFit" class="wh50" />
 						<text class="txt mt10 wsn">商品管理</text>
 					</view>
-					<view class="item ver" @click="link('/pages/shop/store/order')">
+					<!-- <view class="item ver" @click="link('/pages/shop/store/order')">
 						<image src="/static/mine-dingdanguanli.png" mode="aspectFit" class="wh50" />
 						<text class="txt mt10 wsn">订单管理</text>
-					</view>
+					</view> -->
 					<!-- <view class="item ver">
 						<image src="/static/mine-kehuxiaoxi.png" mode="aspectFit" class="wh50" />
 						<text class="txt mt10 wsn">客户消息</text>

jiuyi2/pages/news/news.vue

@@ -62,13 +62,9 @@
 	// im加载
 	const imLoad = ref(false)
 	// 用户信息
-	const userinfo = computed(() => {
-		return store.state.userinfo
-	})
+	const userinfo = computed(() => store.state.userinfo)
 	// 当前选中的菜单
-	const menuCurrent = computed(() => {
-		return menuList[menuIndex.value]
-	})
+	const menuCurrent = computed(() => menuList[menuIndex.value])
 	const footerMneuRef = ref()
 
 	onLoad(() => {

jiuyi2/vite.config.js

@@ -4,6 +4,7 @@ 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()],