From 10ee602aaebad7a8246a229f5e36dfa70e7dfe5e Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Tue, 23 Jul 2024 22:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=93=81=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/index.vue                            |  2 +-
 pages/video/index.vue                         | 49 ++++++++++++++-----
 pages/video/setVideo.vue                      |  4 +-
 uni_modules/uni-countdown/changelog.md        |  2 +
 .../uni-countdown/uni-countdown.vue           | 30 +++++++-----
 uni_modules/uni-countdown/package.json        | 11 ++---
 6 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/pages/my/index.vue b/pages/my/index.vue
index f3001b3..c510fdb 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -232,7 +232,7 @@
 					</view>
 					<view class="box" @click="goNav('/pages/video/index')">
 						<image src="../../static/index/function4.png"></image>
-						<view class="box_text">视频</view>
+						<view class="box_text">视频圈</view>
 					</view>
 					<!-- <view class="box" v-if="renzheng == 0 && XCXIsSelect != '否'" @click="goNav('/my/renzheng/rzType')">
 						<image src="../../static/images/my/renzheng.png"></image>
diff --git a/pages/video/index.vue b/pages/video/index.vue
index 4763a75..85a0227 100644
--- a/pages/video/index.vue
+++ b/pages/video/index.vue
@@ -7,7 +7,7 @@
 				</view>
 				<view class="page-head-mian">
 					<view class="page-head__title">
-						 商家信息 
+						 视频 
 					</view>	
 					<view class="page-head-ft">
 						<view class="page-head-xuan" @click="xuanzhe">
@@ -49,6 +49,7 @@
 					:show-center-play-btn='false'
 					 @click="jieshu"
 					:src="filePath"></video>
+				<view class="videoConten">{{contentVideo}}</view>
 				<view class="videoHover" v-if="playShow==true" @click="kaishi">
 					<image class="playState" src="@/static/play.png"></image>
 				</view>
@@ -75,7 +76,8 @@
 				filePath:'',
 				playShow:false,
 				videoId:0,
-				couponId:''
+				couponId:'',
+				contentVideo:''
 			}
 		},
 		onLoad() {
@@ -99,6 +101,7 @@
 				}
 				this.$Request.get("/app/shipinquan/delete",data).then(res => {
 					if (res.code == 0) {
+						this.page=1;
 						this.get()
 						uni.showToast({
 							title:'删除成功！',
@@ -120,18 +123,29 @@
 				this.checkboxShow=!this.checkboxShow
 			},
 			guanbi(){
+				this.playShow=false;
+				const videoContext = uni.createVideoContext('myVideo', this);
+				videoContext.pause(); // 播放视频
 				this.$refs.pinglun.close("center")
 			},
 			jieshu(){
+				this.playShow=true;
 				const videoContext = uni.createVideoContext('myVideo', this);
 				videoContext.pause(); // 播放视频
-				this.playShow=true
 			},
 			kaishi(){
+			  this.playShow=false;
 			  const videoContext = uni.createVideoContext('myVideo', this);
 			  videoContext.src = this.filePath; // 设置视频源
 			  videoContext.play(); // 播放视频
-			  this.playShow=false
+			},
+			towxh5Video(item){
+				this.playShow=false;
+				console.log(" this.playShow", this.playShow)
+				this.filePath=item.filePath;
+				this.contentVideo=item.content
+				this.videoId=item.id
+				this.$refs.pinglun.open("center")
 			},
 			setVideo(){//发布视频
 				uni.navigateTo({
@@ -143,11 +157,7 @@
 					url:'/pages/my/index'
 				})
 			},
-			towxh5Video(item){
-				this.filePath=item.filePath;
-				this.videoId=item.id
-				this.$refs.pinglun.open("center")
-			},
+			
 			towxh5Videos(index){
 				let list = []
 				let videoNumber = 36;//（请输入 6 的倍数，来控制 DOM 节点的总视频数量）
@@ -199,12 +209,13 @@
 				// 这里就是数据加载完以后再向后端发送数据的地方
 				this.page++;
 				var data={
+					createBy:uni.getStorageSync('userId'),
 					page: this.page,
 					limit:this.limit,
 				}
 				this.$Request.get("/app/shipinquan/list", data).then(res => {
 					if (res.code == 0) {
-						var msg = res.data.records
+						var msg = res.data.list
 						for (let i = 0; i < msg.length; i++) {
 							this.dataList.push(msg[i])
 						}
@@ -231,12 +242,13 @@
 			},
 			get(){
 				var data={
+					 createBy:uni.getStorageSync('userId'),
 					page: this.page,
 					limit:this.limit,
 				}
 				this.$Request.get("/app/shipinquan/list", data).then(res => {
 					if (res.code == 0) {
-							this.dataList=res.data.records
+							this.dataList=res.data.list
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -314,6 +326,21 @@
 		align-items: center;
 		justify-content: space-between;
 	}
+	.videoConten{
+		width: 70%;
+		position: absolute;
+		bottom: 0px;
+		margin-bottom: 60px;
+		height: 30px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 定义文本的行数 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-break: break-all;
+		margin-left: 15px;
+		
+	}
 	.videoHover{
 		width: 76px;
 		height: 76px;
diff --git a/pages/video/setVideo.vue b/pages/video/setVideo.vue
index c438eb1..a650e5e 100644
--- a/pages/video/setVideo.vue
+++ b/pages/video/setVideo.vue
@@ -132,8 +132,8 @@
 							icon: 'none'
 						})
 						setTimeout(function() {
-							uni.switchTab({
-								url: '/pages/my/index'
+							uni.navigateTo({
+								url: '/pages/video/index'
 							})
 						}, 1000)
 					} else {
diff --git a/uni_modules/uni-countdown/changelog.md b/uni_modules/uni-countdown/changelog.md
index f25beef..16fc324 100644
--- a/uni_modules/uni-countdown/changelog.md
+++ b/uni_modules/uni-countdown/changelog.md
@@ -1,3 +1,5 @@
+## 1.2.3（2024-02-20）
+- 新增 支持控制小时，分钟的显隐：showHour showMinute
 ## 1.2.2（2022-01-19）
 - 修复 在微信小程序中样式不生效的bug
 ## 1.2.1（2022-01-18）
diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
index a296147..1e28dda 100644
--- a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
+++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
@@ -2,10 +2,10 @@
 	<view class="uni-countdown">
 		<text v-if="showDay" :style="[timeStyle]" class="uni-countdown__number">{{ d }}</text>
 		<text v-if="showDay" :style="[splitorStyle]" class="uni-countdown__splitor">{{dayText}}</text>
-		<text :style="[timeStyle]" class="uni-countdown__number">{{ h }}</text>
-		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
-		<text :style="[timeStyle]" class="uni-countdown__number">{{ i }}</text>
-		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
+		<text v-if="showHour" :style="[timeStyle]" class="uni-countdown__number">{{ h }}</text>
+		<text v-if="showHour" :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
+		<text v-if="showMinute" :style="[timeStyle]" class="uni-countdown__number">{{ i }}</text>
+		<text v-if="showMinute" :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
 		<text :style="[timeStyle]" class="uni-countdown__number">{{ s }}</text>
 		<text v-if="!showColon" :style="[splitorStyle]" class="uni-countdown__splitor">{{secondText}}</text>
 	</view>
@@ -30,6 +30,8 @@
 	 * @property {Number} second 秒
 	 * @property {Number} timestamp 时间戳
 	 * @property {Boolean} showDay = [true|false] 是否显示天数
+	 * @property {Boolean} showHour = [true|false] 是否显示小时
+	 * @property {Boolean} showMinute = [true|false] 是否显示分钟
 	 * @property {Boolean} show-colon = [true|false] 是否以冒号为分隔符
 	 * @property {String} splitorColor 分割符号颜色
 	 * @event {Function} timeup 倒计时时间到触发事件
@@ -43,6 +45,14 @@
 				type: Boolean,
 				default: true
 			},
+			showHour: {
+				type: Boolean,
+				default: true
+			},
+			showMinute: {
+				type: Boolean,
+				default: true
+			},
 			showColon: {
 				type: Boolean,
 				default: true
@@ -124,16 +134,12 @@
 					backgroundColor,
 					fontSize: `${fontSize}px`,
 					width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放
-					lineHeight: `${fontSize * 20 / 14}px`,
+ 					lineHeight: `${fontSize * 20 / 14}px`,
 					borderRadius: `${fontSize * 3 / 14}px`,
 				}
 			},
 			splitorStyle() {
-				const {
-					splitorColor,
-					fontSize,
-					backgroundColor
-				} = this
+				const { splitorColor, fontSize, backgroundColor } = this
 				return {
 					color: splitorColor,
 					fontSize: `${fontSize * 12 / 14}px`,
@@ -238,7 +244,7 @@
 					this.countDown()
 				}, 1000)
 			},
-			update() {
+			update(){
 				this.startData();
 			},
 			changeFlag() {
@@ -272,4 +278,4 @@
 			font-size: $font-size;
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/uni_modules/uni-countdown/package.json b/uni_modules/uni-countdown/package.json
index 70e99ee..6622074 100644
--- a/uni_modules/uni-countdown/package.json
+++ b/uni_modules/uni-countdown/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-countdown",
   "displayName": "uni-countdown 倒计时",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "CountDown 倒计时组件",
   "keywords": [
     "uni-ui",
@@ -16,11 +16,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -37,7 +33,8 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": ["uni-scss"],