Merge branch 'dev_xuanmiduanju20240307_douyin' of...

Merge branch 'dev_xuanmiduanju20240307_douyin' of http://39.97.65.143:81/android/uniapp_vedio into dev_xuanmiduanju20240307_douyin

vedio/components/home/index.vue

@@ -520,8 +520,8 @@
 	.box-wrap {
 		height: 100rpx;
 		width: 120rpx;
-		right: 20rpx;
-		bottom: 200rpx;
+		right: 10rpx;
+		bottom: 240rpx;
 		position: absolute;
 		z-index: 999;
 

vedio/pagesA/vipPay/vipPay.vue

 <template>
 	<view class="body">
 		<z-paging style="height: 88%;">
-			<view style="font-size: 36rpx;color: black;font-weight: 777;">充值看点</view>
+			<view style="font-size: 36rpx;color: black;font-weight: 777;margin-left: 20rpx;">充值看点</view>
 			<view class="section">
 				<view class="pack-box">
 					<view class="pack-item"
@@ -36,7 +36,7 @@
 				</view>
 			</view>
 
-			<view style="font-size: 36rpx;color: black;font-weight: 777;">充值VIP会员</view>
+			<view style="font-size: 36rpx;color: black;font-weight: 777;margin-left: 20rpx;margin-top: 10rpx;">充值VIP会员</view>
 			<view class="section">
 				<view class="pack-box">
 					<view class="pack-item"

vedio/pagesC/ttvideo/ttVideoDetail.vue

@@ -502,19 +502,19 @@
 				});
 			},
 			cancelCollect(vedioId, index) {
-				this.showSignPop = true
+				// this.showSignPop = true
 				this.data.collect = 0
-				// // 取消收藏
-				// this.post({
-				// 	url: '/vedio/cancelCollect',
-				// 	data: {
-				// 		vedioId
-				// 	},
-				// 	showLoading: false,
-				// 	success: ({
-				// 		data
-				// 	}) => {}
-				// });
+				// 取消收藏
+				this.post({
+					url: '/vedio/cancelCollect',
+					data: {
+						vedioId
+					},
+					showLoading: false,
+					success: ({
+						data
+					}) => {}
+				});
 			},
 			commitVideo() {
 				// 提交后台