代码优化

vedio/components/coin-popup/coin-popup.vue

 <template>
 	<view>
 		<uni-popup type="bottom" ref="coinPop" :maskClick="false" :isMaskClick="false">
-			<view class="body">
-				<scroll-view scroll-y style="width: 100%;height: 100%;">
+			<view class="body" style="width: 100%;height: 100%;">
+				<scroll-view scroll-y>
 					<view style="display: flex;flex-direction: column;align-items: flex-end;">
 						<image @click="handleClose"
 							style="width: 30rpx;height: 30rpx;display: flex;align-items: right;margin-top: 20rpx;margin-right: 20rpx;margin-bottom: 10rpx;"
@@ -24,8 +24,8 @@
 
 									<view class="price row">
 										{{item.firstPayPrice}}元
-									</view>
-									
+									</view>
+
 									<view class="name row">
 										{{item.title}}
 									</view>
@@ -72,7 +72,7 @@
 		data() {
 			return {
 				vipList: [],
-				selectedIndex: 0,
+				selectedIndex: 0,
 				userBean: {},
 				showClone: false
 			};
@@ -97,16 +97,16 @@
 							this.selectedIndex = data.list[0].activityType;
 						}
 					}
-				});
-				
-				this.post({
-					url: '/user/baseMsg',
-					showLoading: false,
-					success: ({
-						data
-					}) => {
-						this.userBean = data;
-					}
+				});
+
+				this.post({
+					url: '/user/baseMsg',
+					showLoading: false,
+					success: ({
+						data
+					}) => {
+						this.userBean = data;
+					}
 				});
 			},
 			handleClose() {

vedio/pages/my/my.vue

 <template>
-	<view class="body" >
-		<scroll-view scroll-y="true" :style="'height: '+(windowHeight -60)+'px;'">
+	<view class="body">
+		<!-- <scroll-view :scroll-y="true"> -->
+		<z-paging style="height: 100%;">
 			<view
 				:style="'display: flex;flex-direction: row;align-items: center;margin: 20rpx;padding-left: 10rpx;margin-top:'+statusBarHeight+'px;'">
 				<image class="avatar" src="@/static/logo-about.png"></image>
@@ -35,7 +36,8 @@
 					src="https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/bg_my_vip.png" mode="scaleToFill"></image>
 			</view>
 
-			<view v-if="userBean.expireTime<=0" style="display: flex;height: 200rpx;margin: 20rpx;background: #f5ca86;border-radius: 20rpx;">
+			<view v-if="userBean.expireTime<=0"
+				style="display: flex;height: 200rpx;margin: 20rpx;background: #f5ca86;border-radius: 20rpx;">
 				<view style="flex-grow: 2; margin-left: 20rpx;">
 					<view
 						style="width: 100%;height: 100%;display: flex;flex-direction: column;justify-content: center;">
@@ -60,10 +62,10 @@
 				</view>
 			</view>
 
-			<view class="infobg" style="margin: 20rpx;">
-				<view v-if="userBean.showVipInner" class="item arrow" @click="handlePayRecord">
-					我的订单
-					<view class="item_bd ellipsis" style="margin-left: 58rpx;"></view>
+			<view class="infobg" style="margin: 20rpx;">
+				<view v-if="userBean.showVipInner" class="item arrow" @click="handlePayRecord">
+					我的订单
+					<view class="item_bd ellipsis" style="margin-left: 58rpx;"></view>
 				</view>
 				<view class="item arrow" @click="handleDotRecord">
 					看点记录
@@ -86,7 +88,8 @@
 			<view style="display: flex;justify-content: center;margin-top: 20rpx;font-size: 26rpx;color: gray;">
 				{{ versionName }}
 			</view>
-		</scroll-view>
+		</z-paging>
+		<!-- </scroll-view> -->
 		<coin-popup :show="showAnimate" @close="showAnimate = false" @paySuccess="paySuccess">
 		</coin-popup>
 
@@ -119,13 +122,13 @@
 			return {
 				statusBarHeight: app.globalData.statusBarHeight,
 				userBean: {},
-				showAnimate: false,
+				showAnimate: false,
 				windowHeight: 0,
 				versionName: app.globalData.versionName
 			};
 		},
 		methods: {
-			show() {
+			show() {
 				this.windowHeight = uni.getSystemInfoSync().windowHeight
 				// loadData() {
 				this.post({
@@ -184,16 +187,16 @@
 				// 			}
 				// 		})
 				// 	}
-				// });
-				
-				wx.makePhoneCall({
-				  phoneNumber: '4000969950',
-				  success: function(res) {
-				    console.log('拨打电话成功！');
-				  },
-				  fail: function(res) {
-				    console.log('拨打电话失败！');
-				  }
+				// });
+
+				wx.makePhoneCall({
+					phoneNumber: '4000969950',
+					success: function(res) {
+						console.log('拨打电话成功！');
+					},
+					fail: function(res) {
+						console.log('拨打电话失败！');
+					}
 				})
 			},
 			paySuccess() {

vedio/pages/recommend/follow.vue

@@ -93,7 +93,7 @@
 				this.$emit("goRecommend")
 			},
 			click(detail) {
-				navigateTo(`/pagesC/video/videoDetail?data=` + encodeURIComponent(JSON.stringify(detail)))
+				navigateTo(`/pagesC/video/newVideoDetail?data=` + encodeURIComponent(JSON.stringify(detail)))
 			},
 			longClick(key) {
 				this.isEditStyle = true

vedio/pages/recommend/recommendVideo.vue

@@ -236,7 +236,7 @@
 				this.isqp = e.detail.show
 			},
 			detail(detail) {
-				navigateTo(`/pagesC/video/videoDetail?data=` + encodeURIComponent(JSON.stringify(detail)) +
+				navigateTo(`/pagesC/video/newVideoDetail?data=` + encodeURIComponent(JSON.stringify(detail)) +
 					`&playNext=1`)
 			},
 			collect(vedioId, index) {

vedio/pagesC/video/newVideoDetail.vue

@@ -264,6 +264,7 @@
 							icon: 'none'
 						})
 						if (data.code == 200) {
+							that.originList[that.originIndex].lock = false
 							setTimeout(() => {
 								uni.createVideoContext('' + that.originList[that.originIndex].vedioId,
 										that)
@@ -271,6 +272,7 @@
 								this.commitVideo()
 							}, 500)
 						} else if (data.code == 301) {
+							that.originList[that.originIndex].lock = false
 							setTimeout(() => {
 								uni.createVideoContext('' + that.originList[that.originIndex].vedioId,
 										that)
@@ -278,6 +280,7 @@
 								this.commitVideo()
 							}, 500)
 						} else if (data.code == 302) {
+							that.originList[that.originIndex].lock = false
 							setTimeout(() => {
 								uni.createVideoContext('' + that.originList[that.originIndex].vedioId,
 										that)

vedio/pagesD/dotRecord/dotRecord.vue

@@ -7,13 +7,13 @@
 					<image style="margin: auto 10rpx;width: 60rpx;height: 60rpx;" src="../../static/ic_coin.png">
 					</image>
 					<view class="flex1 ml-10">
-						<view class="mt-10" style="font-size: 28rpx;color: black;">{{'充值'+item.createtime}}</view>
+						<view class="mt-10" style="font-size: 28rpx;color: black;">{{item.remark}}</view>
 						<view class="mt-10" style="font-size: 26rpx;color: darkgray;">
-							{{myFormateTime(1698911375977)}}
+							{{item.time}}
 						</view>
 					</view>
 					<view style="margin:auto 10rpx auto auto;font-size: 36rpx;color: steelblue;">
-						3000看点
+						{{ '+'+ item.subValue + '看点'}}
 					</view>
 				</view>
 			</view>
@@ -33,7 +33,7 @@
 		mixins: [common],
 		data() {
 			return {
-				dataList: [1, 2, 3]
+				dataList: []
 			};
 		},
 		methods: {
@@ -47,7 +47,11 @@
 			},
 			queryList(page, size) {
 				this.post({
-					url: '/vip/getOrderList',
+					url: '/vedio/assetsRecords/add',
+					data: {
+						page,
+						size
+					},
 					showLoading: false,
 					success: ({
 						data

vedio/pagesD/useDotRecord/useDotRecord.vue

@@ -7,13 +7,14 @@
 					<image style="margin: auto 10rpx;width: 60rpx;height: 60rpx;" src="../../static/ic_shop.png">
 					</image>
 					<view class="flex1 ml-10">
-						<view class="mt-10" style="font-size: 28rpx;color: black;">{{'购买《'+item.createtime+'》章节'}}
+						<view class="mt-10" style="font-size: 28rpx;color: black;">{{item.remark}}
 						</view>
 						<view class="mt-10" style="font-size: 26rpx;color: darkgray;">
-							{{myFormateTime(1698911375977)}}</view>
+							{{item.time}}
+						</view>
 					</view>
 					<view style="margin:auto 10rpx auto auto;font-size: 36rpx;color: steelblue;">
-						3000看点
+						{{ '-'+ item.subValue + '看点'}}
 					</view>
 				</view>
 			</view>
@@ -21,10 +22,10 @@
 	</view>
 </template>
 <script>
-	import common from '@/mixins/common';
-	
-	import {
-		formateTime
+	import common from '@/mixins/common';
+
+	import {
+		formateTime
 	} from "@/utils/utils.js"
 
 	export default {
@@ -32,7 +33,7 @@
 		mixins: [common],
 		data() {
 			return {
-				dataList: [1, 2, 3]
+				dataList: []
 			};
 		},
 		methods: {
@@ -46,7 +47,11 @@
 			},
 			queryList(page, size) {
 				this.post({
-					url: '/vip/getOrderList',
+					url: '/vedio/assetsRecords/sub',
+					data: {
+						page,
+						size
+					},
 					showLoading: false,
 					success: ({
 						data

vedio/pagesD/watchRecord/watchRecord.vue

 <template>
-	<view class="body">
+	<view class="body">
 		<status-title :showBack="true">观看记录</status-title>
 		<z-paging class="flex-1" ref="paging" v-model="dataList" @query="queryList">
 			<view style="font-size: 30rpx;font-weight: 777;margin-left: 12rpx;margin-top: 10rpx;">最近观看</view>
@@ -78,7 +78,7 @@
 				});
 			},
 			handleInfo(item) {
-				navigateTo(`/pagesC/video/videoDetail?data=` + encodeURIComponent(JSON.stringify(item)));
+				navigateTo(`/pagesC/video/newVideoDetail?data=` + encodeURIComponent(JSON.stringify(item)));
 			},
 			handleXing(item) {
 				var that = this;