diff --git a/App.vue b/App.vue
index ccdc28c..6d6a731 100644
--- a/App.vue
+++ b/App.vue
@@ -14,12 +14,12 @@
 
 <style>
 	/*每个页面公共css */
-	@import './static/iconfont/iconfont.css';
+	@import '@/static/iconfont/iconfont.css';
 	@import '@/common/animate.css';
 	.main_container {
 		width: 100%;
 		height: 100vh;
-		background: url(./static/images/bg.png) no-repeat left top;
+		background: url(~@/static/images/bg.png) no-repeat left top;
 		background-size: cover;
 	}
 	.login_bg {
diff --git a/manifest.json b/manifest.json
index 16260b4..7ae5822 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "画屏",
     "appid" : "__UNI__487D0A3",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/bind/bind.vue b/pages/bind/bind.vue
index 82bc15c..2ce1d91 100644
--- a/pages/bind/bind.vue
+++ b/pages/bind/bind.vue
@@ -16,7 +16,7 @@
 					<view class="uni-form-item uni-column" @click.native.stop="radioDirection = !radioDirection">
 						<view class="bind-radio-label"  >
 							<view class="title" >选择设备方向</view>
-							<image class="select_img" src="../../static/images/bind-select.png"></image>
+							<image class="select_img" src="@/static/images/bind-select.png"></image>
 						</view>
 						<view v-show="radioDirection" class="device_radio">
 							<radio-group name="device_direction">
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import Header from '@/pages/header.vue'
+import Header from '@/pages/header.vue';
 export default {
 	components: {
 		Header
@@ -124,7 +124,7 @@ export default {
 .device_radio /deep/ uni-radio .uni-radio-input{
 	width: 27.77rpx;
 	height: 27.77rpx;
-	background: url(../../static/images/an-wx.png) no-repeat left top;
+	background: url(~@/static/images/an-wx.png) no-repeat left top;
 	background-size: 100% 100%;
 	border: none;
 }
@@ -136,7 +136,7 @@ export default {
 	content: "";
 	width: 27.77rpx;
 	height: 27.77rpx;
-	background: url(../../static/images/an-xz.png) no-repeat left top;
+	background: url(~@/static/images/an-xz.png) no-repeat left top;
 	background-size: 100% 100%;
 	transform: translate(-50%,-50%) scale(1);
 }
diff --git a/pages/header.vue b/pages/header.vue
index dc5e8c5..5f1f71e 100644
--- a/pages/header.vue
+++ b/pages/header.vue
@@ -73,7 +73,6 @@ export default {
 	}
 	.help-cont /deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box{
 		padding: 83.33rpx 69.44rpx 62.5rpx 69.44rpx;
-		/* width: 597.22rpx; */
 		border-radius: 20.83rpx;
 		overflow: initial;
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c3b0b7b..70ed3b4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,7 +27,7 @@
 	}
 </script>
 
-<style>
+<style scoped>
 	.content {
 		display: flex;
 		flex-direction: column;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index e7da38e..c3ff5f3 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import Header from '@/pages/header.vue'
+import Header from '@/pages/header.vue';
 export default {
 	components: {
 		Header
diff --git a/pages/show/show.vue b/pages/show/show.vue
index 51162b6..e1c255c 100644
--- a/pages/show/show.vue
+++ b/pages/show/show.vue
@@ -1,31 +1,34 @@
 <template>
 	<view class="main_container">
-		<view class="show-content" @touchstart="touchStart" @touchend="touchEnd">
+		<view class="show-content" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd">
 			<view v-for="(item, index) in show_materials" :key="index" :class="['show-item', item.material_type == 1 && itemIndex == index ? 'show-video' : '']">
-				<!-- <image
-					:class="['show-img', 'animate__animated', item.material_type == 0 ? item.effect : '']"
-					v-show="item.material_type == 0 && itemIndex == index"
-					:src="require('@/static/source/' + linkUrl)"
-				></image> -->
 				<image
 					:class="['show-img', 'animate__animated', item.material_type == 0 ? item.effect : '']"
 					v-show="item.material_type == 0 && itemIndex == index"
 					:src="linkUrl"
 					mode="aspectFill"
-				></image>
-				<!-- <video
-					v-if="item.material_type == 1 && itemIndex == index"
-					:src="'../../static/source/' + linkUrl"
-					:autoplay="autoplay"
-					controls
-					object-fit="fill"
-					@ended="videoPlayEnd"
-				></video> -->
-				<video v-if="item.material_type == 1 && itemIndex == index" :src="linkUrl" :autoplay="autoplay" :controls="false" object-fit="fill" @ended="videoPlayEnd"></video>
+				></image>				
+				<video v-if="item.material_type == 1 && itemIndex == index" :src="linkUrl" :autoplay="autoplay" :controls="false" :enable-progress-gesture="false" object-fit="contain" @ended="videoPlayEnd">
+				</video>
 			</view>
-		</view>fill
+		</view>
+		<!-- <swiper @change="changeMaterial()"  style="height: 100%;">
+				<swiper-item v-for="(item, index) in show_materials" :key="index" :class="['show-item', item.material_type == 1 && itemIndex == index ? 'show-video' : '']">
+					<view class="item"  v-if="item.material_type == 1 && itemIndex == index">
+						<video id="myVideo" ref="myVideo" 
+							:src="linkUrl" :autoplay="autoplay" :controls="false" :enable-progress-gesture="false" object-fit="contain" @ended="videoPlayEnd"></video>
+						<cover-view
+							style="z-index:99;position: fixed;width:100%;height:100%;top:0;left:0;display:flex; justify-content:center; align-items:center;">
+							<image style="width: 40px;height: 40px;"></image>
+						</cover-view>
+					</view>
+					<view class="item" v-if="item.material_type == 0 && itemIndex == index">
+							<image  :src="linkUrl" :class="['show-img', 'animate__animated', item.material_type == 0 ? item.effect:'']"></image>
+					</view>
+				</swiper-item>
+		</swiper> -->
 		<view class="show-audio"></view>
-		<view style="position:absolute; bottom:55.55rpx; left: 69.44rpx; color: #fff; z-index: 99999;">{{ infoTxt }}----{{ audioName }}</view>
+		<view style="position:absolute; bottom:55.55rpx; left: 69.44rpx; color: #fff; z-index: 99999;">{{ infoTxt }}--{{ audioName }}</view>
 
 		<!-- <view v-if="!deviceInfoShow" class="local-data">
 			<text class="title">欢迎使用数字新视窗</text>
@@ -38,7 +41,6 @@
 </template>
 
 <script>
-import utils from '@/utils/common.js';
 import one from './show2.js';
 let innerAudioContext = uni.createInnerAudioContext();
 export default {
@@ -67,7 +69,14 @@ export default {
 			// 刚触碰的位置
 			startPosition: 0,
 			// 结束的位置
-			endPosition: 0
+			endPosition: 0,
+			startY: 0,
+			startX: 0,
+			elePosition: null,
+			isAutoSwitch: true,
+			moveX: 0, //滑动的x轴距离
+			moveY: 0, //滑动的y轴距离
+			like_state: 0, //-1：左滑，0：没滑动，1：右滑
 		};
 	},
 	onLoad() {
@@ -90,38 +99,71 @@ export default {
 	},
 	methods: {
 		touchStart(event) {
-			// 获取初始时间
-			this.startTime = Date.now();
-			// 获取初始的位置
-			this.startPosition = event.changedTouches[0].clientX;
-		},
-		touchEnd(event) {
-			const endTime = Date.now();
-			if (endTime - this.startTime > 2000) {
-				// 如果手指滑动的距离超过2s 就默认不合法
-				return;
-			}
-			// 判断其滑动的距离是否值得触发，给定一个10 的距离
-			if (Math.abs(this.endPosition - this.startPosition) > 10) {
-				this.endPosition = event.changedTouches[0].clientX;
-				var elePosition = this.endPosition - this.startPosition > 0 ? 'right' : 'left';
-			} else {
-				return;
-			}
-			
-			if(elePosition=='left'){
-				this.itemIndex++
-				this.flagIndex++
-			}else{
-				this.itemIndex--
-				this.flagIndex--
-				if(this.itemIndex == -1 || this.flagIndex == -1){
-					this.itemIndex = this.show_materials.length-1;
+				this.startX = event.touches[0].pageX;
+				this.startY = event.touches[0].pageY;
+				console.log('开始触摸：', this.startX, this.startY);
+			},
+			touchMove(event) {
+				
+				var currentX = event.touches[0].pageX;
+				var currentY = event.touches[0].pageY;
+				var moveX = currentX - this.startX;
+				var moveY = currentY - this.startY;
+				var text = '';
+				var state = 0; //-1：左滑，0：没滑动，1：右滑
+				// //左右方向滑动
+				if (Math.abs(moveX) > Math.abs(moveY)) {
+					if (moveX < -10) {
+						text = '左滑';
+						state = 1;
+					} else if (moveX > 10) {
+						text = '右滑';
+						state = -1;
+					}
+				} else { //上下方向滑动
+					if (moveY < 0) {
+						text = '上滑';
+						state = -2;
+					} else if (moveY > 0){
+						 text = '下滑'; 
+						 state = 2;
+					}
 				}
-			}
-			this.changIndex();
-			console.log(elePosition);
-		},
+				this.like_state = state;
+				this.moveX = moveX;
+				this.moveY = moveY;
+				console.log('开始滑动：', this.moveX, this.moveY, this.like_state);
+			},
+			touchEnd(event) {
+				console.log(`移动距离:${Math.abs(this.moveX)}`)
+				// if (Math.abs(this.moveX) > 60 ) {
+				// 	console.log(this.like_state)
+				// 	if(this.like_state == -1){
+				// 		this.isAutoSwitch = false;
+				// 		this.itemIndex--;
+				// 		this.flagIndex--;
+				// 		this.changIndex()
+				// 	}else if(this.like_state == 1){
+				// 		this.itemIndex++;
+				// 		this.flagIndex++;
+				// 		this.isAutoSwitch = true;
+				// 		this.changIndex()
+				// 	}
+				// }
+				if(Math.abs(this.moveY) > 60){
+					innerAudioContext.stop();
+					if(this.like_state == -2){
+						this.itemIndex++;
+						this.flagIndex++;
+						this.isAutoSwitch = true;
+					}else if(this.like_state == 2){
+						this.itemIndex--;
+						this.flagIndex--;
+						this.isAutoSwitch = false;
+					}
+					this.changIndex()
+				}
+			},
 		changeMaterial() {
 			const _this = this;
 			clearInterval(_this.timer);
@@ -143,10 +185,18 @@ export default {
 				this.contentIndex = 0;
 				innerAudioContext.stop();
 			}
+			if(this.itemIndex == -1){
+				this.itemIndex = this.show_materials.length-1
+				this.contentIndex = this.itemLength.length-1
+				this.flagIndex = this.itemLength[this.contentIndex]
+			}		
+			if (this.flagIndex == 0) {
+				this.contentIndex--;
+				this.flagIndex = this.itemLength[this.contentIndex];
+			}
 			_this.duration = this.show_materials[this.itemIndex].duration;
 			_this.linkUrl = this.show_materials[this.itemIndex].deposit_url;
 			if (this.show_materials[this.itemIndex].bgm_url) {
-				// _this.audioSrc = '../../static/source/' + this.show_materials[this.itemIndex].bgm_url;
 				_this.audioSrc = this.show_materials[this.itemIndex].bgm_url;
 				_this.audioName = this.show_materials[this.itemIndex].bgm_name;
 			} else {
@@ -154,13 +204,14 @@ export default {
 					this.flagIndex = 0;
 					this.contentIndex = 0;
 				} else {
-					if (this.flagIndex == this.itemLength[this.contentIndex]) {
-						this.flagIndex = 0;
-						this.contentIndex++;
+					if(this.isAutoSwitch){
+						if (this.flagIndex == this.itemLength[this.contentIndex]) {
+							this.flagIndex = 0;
+							this.contentIndex++;
+						}
 					}
 				}
 				if (this.materialsCont[this.contentIndex].bgm_main) {
-					// this.audioSrc = '../../static/source/' + this.materialsCont[this.contentIndex].bgm_main;
 					this.audioSrc = this.materialsCont[this.contentIndex].bgm_main;
 					this.audioName = this.materialsCont[this.contentIndex].bgm_name;
 				}
@@ -245,6 +296,7 @@ export default {
 }
 .show-item uni-video {
 	width: 100%;
+	height: 100%;
 }
 .show-video {
 	width: 100%;
@@ -256,7 +308,7 @@ export default {
 	right: 46.52rpx;
 	width: 159.72rpx;
 	height: 152.08rpx;
-	background: url(../../static/images/an-yy.png) no-repeat;
+	background: url(~@/static/images/an-yy.png) no-repeat;
 	background-size: cover;
 }
 .show-audio uni-image {
@@ -299,4 +351,36 @@ export default {
 	border: 1px solid #333;
 	border-radius: 50%;
 }
+.swiper{
+	height: 100vh;
+}
+.item{
+	width: 100%;
+	height: 100%;
+}
+.mask{
+	position: absolute;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0,0,0,.3);
+	z-index: 999;
+}
+.controls-title {
+	position: absolute;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,.3);
+		text-align: center;
+		color: #FFFFFF;
+		border: 10px solid #fff;
+		z-index: 9999;
+	}
 </style>
diff --git a/pages/show/show2.js b/pages/show/show2.js
new file mode 100644
index 0000000..0ce1db1
--- /dev/null
+++ b/pages/show/show2.js
@@ -0,0 +1,209 @@
+let data = {
+	"code": 200,
+	"msg": "操作成功",
+	"data": [
+		{
+			"relaase_id": "4028e3d47fd34b5d017fd34c08e60003",
+			"relaase_name": "fsfsdf",
+			"bgm_name": "主-res_01",
+			"bgm_main": "https://qiniu.aiyxlib.com/yuekan-BGM31.mp3",
+			"release_start": "2022-03-30 00:00:00.0",
+			"release_end": "2022-04-24 00:00:00.0",
+			"show_materials": [
+				{
+					"release_id": "4028e3d47fd34b5d017fd34c08e60003",
+					"material_name": "bg-index.jpg",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__fadeInTopRight",
+					"bgm_name": "img-1-1",
+					"bgm_url": '',
+					"ranking": "1"
+				},
+				{
+					"release_id": "4028e3d47fd34b5d017fd34c08e60003",
+					"material_name": "s-j1.png",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/yuekan-4-content-background%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/yuekan-4-content-background%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__backInLeft",
+					"bgm_name": 'img-1-2',
+					"bgm_url": 'https://qiniu.aiyxlib.com/yuekan-BGM20-Chinap.mp3',
+					"ranking": "2"
+				},
+				{
+					"release_id": "4028e3d47fd34b5d017fd34c08e60003",
+					"material_name": "Atlas跑酷的成功与失败｜2021【Boston Dynamics】.mp4",
+					"material_type": "1",
+					"deposit_url": "https://qiniu.aiyxlib.com/1608277325000.mp4",
+					"img_path": "",
+					"device_direction": "1",
+					"duration": "0",
+					"effect": "false",
+					"bgm_name": null,
+					"bgm_url": null,
+					"ranking": "4"
+				}
+			]
+		},
+		{
+			"relaase_id": "4028e3d47fcfa36c017fd0063c4d001a",
+			"relaase_name": "111",
+			"bgm_name": "主-res_02",
+			"bgm_main": "https://qiniu.aiyxlib.com/yuekan-BGM27.mp3",
+			"release_start": "2022-03-28 00:00:00.0",
+			"release_end": "2022-03-28 00:00:00.0",
+			"show_materials": [{
+					"release_id": "4028e3d47fcfa36c017fd0063c4d001a",
+					"material_name": "s-j3.png",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/bj45_1%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/bj45_1%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__flip",
+					"bgm_name": 'img-2-1',
+					"bgm_url": null,
+					"ranking": "1"
+				},
+				{
+					"release_id": "4028e3d47fcfa36c017fd0063c4d001a",
+					"material_name": "s-t3.png",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/yuekan-1-read.jpg",
+					"img_path": "https://qiniu.aiyxlib.com/yuekan-1-read.jpg",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__rotateInUpRight",
+					"bgm_name": 'img-2-2',
+					"bgm_url": null,
+					"ranking": "2"
+				},
+				{
+					"release_id": "4028e3d47fcfa36c017fd0063c4d001a",
+					"material_name": "s-j1.png",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/bj_15%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/bj_15%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__jackInTheBox",
+					"bgm_name": 'img-2-3',
+					"bgm_url": 'https://qiniu.aiyxlib.com/yuekan-BGM16.mp3',
+					"ranking": "3"
+				},
+				{
+					"release_id": "4028e3d47fd34b5d017fd34c08e60003",
+					"material_name": "bg-index.jpg",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__zoomInDown",
+					"bgm_name": 'img-2-4',
+					"bgm_url": null,
+					"ranking": "1"
+				},
+				{
+					"release_id": "4028e3d47fd34b5d017fd34c08e60003",
+					"material_name": "s-j1.png",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/yuekan-4-content-background%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/yuekan-4-content-background%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__slideInLeft",
+					"bgm_name": 'img-2-5',
+					"bgm_url": null,
+					"ranking": "2"
+				},
+				{
+					"release_id": "4028e3d47fcfa36c017fd0063c4d001a",
+					"material_name": "Atlas跑酷的成功与失败｜2021【Boston Dynamics】.mp4",
+					"material_type": "1",
+					"deposit_url": "https://qiniu.aiyxlib.com/1634285181000.mp4",
+					"img_path": "",
+					"device_direction": "1",
+					"duration": "0",
+					"effect": "false",
+					"bgm_name": null,
+					"bgm_url": null,
+					"ranking": "4"
+				},
+				{
+					"release_id": "4028e3d47fcfa36c017fd0063c4d001a",
+					"material_name": "s-j1.png",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/bj_15%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/bj_15%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__jackInTheBox",
+					"bgm_name": 'img-2-7',
+					"bgm_url": 'https://qiniu.aiyxlib.com/yuekan-BGM16.mp3',
+					"ranking": "3"
+				}
+			]
+		},
+		{
+			"relaase_id": "4028e3d47fd34b5d017fd34c08e60003",
+			"relaase_name": "fsfsdf",
+			"bgm_name": "主-res_03",
+			"bgm_main": "https://qiniu.aiyxlib.com/yuekan-BGM19.mp3",
+			"release_start": "2022-03-30 00:00:00.0",
+			"release_end": "2022-04-24 00:00:00.0",
+			"show_materials": [
+				{
+					"release_id": "4028e3d47fd34b5d017fd34c08e60003",
+					"material_name": "Atlas跑酷的成功与失败｜2021【Boston Dynamics】.mp4",
+					"material_type": "1",
+					"deposit_url": "https://qiniu.aiyxlib.com/1608277325000.mp4",
+					"img_path": "",
+					"device_direction": "1",
+					"duration": "0",
+					"effect": "false",
+					"bgm_name": null,
+					"bgm_url": null,
+					"ranking": "4"
+				},
+				{
+					"release_id": "4028e3d47fd34b5d017fd34c08e60003",
+					"material_name": "bg-index.jpg",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/yuekan-6-shiguangji%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__fadeInTopRight",
+					"bgm_name": "img-3-1",
+					"bgm_url": '',
+					"ranking": "1"
+				},
+				{
+					"release_id": "4028e3d47fd34b5d017fd34c08e60003",
+					"material_name": "s-j1.png",
+					"material_type": "0",
+					"deposit_url": "https://qiniu.aiyxlib.com/bj_15%402x.png",
+					"img_path": "https://qiniu.aiyxlib.com/bj_15%402x.png",
+					"device_direction": "1",
+					"duration": "15",
+					"effect": "animate__backInLeft",
+					"bgm_name": 'img-3-2',
+					"bgm_url": 'https://qiniu.aiyxlib.com/yuekan-BGM20-Chinap.mp3',
+					"ranking": "2"
+				}
+			]
+		},
+	]
+}
+
+
+module.exports = {
+	data
+}
diff --git a/pages/show/show2.vue b/pages/show/show2.vue
new file mode 100644
index 0000000..45e5aff
--- /dev/null
+++ b/pages/show/show2.vue
@@ -0,0 +1,298 @@
+<template>
+	<view class="main_container">
+		<view class="show-content">
+			<view v-for="(item, index) in show_materials" :key="index" :class="['show-item', item.material_type == 1 && itemIndex == index ? 'show-video' : '']">
+				<!-- <image
+					:class="['show-img', 'animate__animated', item.material_type == 0 ? item.effect : '']"
+					v-show="item.material_type == 0 && itemIndex == index"
+					:src="require('@/static/source/' + linkUrl)"
+				></image> -->
+				<image
+					:class="['show-img', 'animate__animated', item.material_type == 0 ? item.effect : '']"
+					v-show="item.material_type == 0 && itemIndex == index"
+					:src="'https://images.weserv.nl/?url=' + linkUrl"
+					mode="aspectFill"
+				></image>
+				<video
+					v-if="item.material_type == 1 && itemIndex == index"
+					:src="'../../static/source/' + linkUrl"
+					:autoplay="autoplay"
+					controls
+					object-fit="fill"
+					@ended="videoPlayEnd"          
+				></video>
+				<!-- <iframe v-if="item.material_type == 1 && itemIndex == index" ref="iframe" class="video-iframe" style="z-index:1;" :src="linkUrl" 
+					    frameborder="0"  scrolling="no" allowfullscreen="true"   
+				            webkitallowfullscreen="true" mozallowfullscreen="true" @ended="videoPlayEnd">
+				    </iframe> -->
+			</view>
+		</view>
+		<view class="show-audio"></view>
+		<view style="position:absolute; bottom:55.55rpx; left: 69.44rpx; color: #fff; z-index: 99999;">{{infoTxt}}--{{linkUrl}}--{{ audioName }}</view>
+		
+
+		<!-- <view v-if="!deviceInfoShow" class="local-data">
+			<text class="title">欢迎使用数字新视窗</text>
+			<view class="data-info">设备ID : 123456789</view>
+			<view class="data-info">设备账号 : 123456789</view>
+			<view class="data-info">设备名称 : CVBBN2</view>
+			<view class="count-down" @click="deviceInfoShow=true">{{ count }}</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+import utils from '@/utils/common.js';
+import one from './show2.js';
+let innerAudioContext = uni.createInnerAudioContext();
+export default {
+	components: {},
+	data() {
+		return {
+			// 已登录情况显示6S得设备信息
+			count: 6,
+			deviceInfoShow: false,
+			autoplay: false,
+			// 素材
+			materialsCont: [],
+			show_materials: [],
+			contentIndex: 0,
+			itemIndex: 0,
+			linkUrl: '',
+			timer: null,
+			duration: null,
+			audioSrc: null,
+			audioName: null,
+			itemLength: [],
+			flagIndex: 0,
+			infoTxt:'',
+			voicePlayer: null
+		};
+	},
+	onLoad() {
+		const _this = this;
+		let result = one.data.data;
+		this.materialsCont = result;
+		this.materialsCont.map(item => {
+			this.itemLength = this.itemLength.concat(item.show_materials.length);
+			this.show_materials = this.show_materials.concat(item.show_materials);
+		});
+		// 初始化
+		this.changIndex();
+		
+		this.voicePlayer = plus.audio.createPlayer({ src: 'https://qiniu.aiyxlib.com/yuekan-BGM27.mp3' });
+		this.voicePlayer.setRoute(this.playMode);
+		// 监听自然播放完成
+		this.voicePlayer.addEventListener('ended', () => {
+			// 销毁正在监听设备距离的监听器
+			if (this.watchProximity) {
+				plus.proximity.clearWatch(this.watchProximity);
+				this.watchProximity = null;
+			}
+			console.log('播放完毕了');
+		});
+		// 监听音频可以开始播放事件
+		this.voicePlayer.addEventListener('play', () => {
+			// 首次播放时会执行两次回调
+			if (this.playState !== 2) {
+				// plus.audio.ROUTE_SPEAKER：扬声器 0
+				// plus.audio.ROUTE_EARPIECE：听筒 1
+				this.voicePlayer.setRoute(this.playMode);
+				this.playState++;
+			}
+		});
+		// 监听音频播放错误事件
+		this.voicePlayer.addEventListener('error', (err) => {
+			console.log('报错err', err);
+			// 销毁正在监听设备距离的监听器
+			if (this.watchProximity) {
+				plus.proximity.clearWatch(this.watchProximity);
+				this.watchProximity = null;
+			}
+		});
+	},
+	created() {
+		this.atuo();
+	},
+	mounted() {
+		// this.countdown();
+		this.changeMaterial();
+		this.voicePlayer.play();
+	},
+	methods: {
+		changeMaterial() {
+			const _this = this;
+			clearInterval(_this.timer);
+			_this.timer = setInterval(() => {
+				_this.duration -= 1;
+				if (_this.duration == 0) {
+					_this.itemIndex++;
+					_this.flagIndex++;
+					this.changIndex();
+				}
+			}, 1000);
+		},
+		changIndex() {
+			const _this = this;
+			if (_this.itemIndex == this.show_materials.length) {
+				// clearInterval(_this.timer);
+				this.itemIndex = 0;
+				this.flagIndex = 0;
+				this.contentIndex = 0;
+				innerAudioContext.stop();
+			}
+			_this.duration = this.show_materials[this.itemIndex].duration;
+			_this.linkUrl = this.show_materials[this.itemIndex].deposit_url;
+			if (this.show_materials[this.itemIndex].bgm_url) {
+				_this.audioSrc = '../../static/source/' + this.show_materials[this.itemIndex].bgm_url;
+				_this.audioName = this.show_materials[this.itemIndex].bgm_name;
+			} else {
+				if (this.contentIndex == this.itemLength.length) {
+					this.flagIndex = 0;
+					this.contentIndex = 0;
+				}else{
+					if (this.flagIndex == this.itemLength[this.contentIndex]) {
+						this.flagIndex = 0;
+						this.contentIndex++;
+					}
+				}
+				if (this.materialsCont[this.contentIndex].bgm_main) {
+					this.audioSrc = '../../static/source/' + this.materialsCont[this.contentIndex].bgm_main;
+					this.audioName = this.materialsCont[this.contentIndex].bgm_name;
+				}
+			}
+			// this.playVoice(this.audioSrc);
+			if (this.show_materials[this.itemIndex].material_type == 1) {
+				innerAudioContext.stop();
+			}
+		},
+		videoPlayEnd() {
+			this.itemIndex++;
+			this.flagIndex++;
+			this.changIndex();
+		},
+		playVoice(src) {
+			if (innerAudioContext != undefined) {
+				innerAudioContext.stop();
+			}
+			innerAudioContext = uni.createInnerAudioContext();
+			innerAudioContext.stop();
+			innerAudioContext.src = src;
+			innerAudioContext.autoplay = true;
+			innerAudioContext.onPlay(() => {
+				this.infoTxt = ''
+				this.infoTxt = '开始播放'
+				console.log('开始播放');
+			});
+			innerAudioContext.onError(res => {
+				console.log(res.errMsg);
+				console.log(res.errCode);
+				innerAudioContext.stop();
+			});
+			innerAudioContext.onPause(() => {
+				//暂停监听
+				this.infoTxt = '暂停'
+				console.log('暂停');
+				// innerAudioContext.stop();
+			});
+			innerAudioContext.onEnded(() => {
+				// 自然播放结束监听也需要更改isPause 开关状态
+				this.infoTxt = '音频自然播放结束事件'
+				console.log('音频自然播放结束事件');
+				innerAudioContext.stop();
+			});
+		},
+		atuo() {
+			this.autoplay = true;
+		},
+		countdown() {
+			this.count = 6;
+			const timer = setInterval(() => {
+				this.count -= 1;
+				if (this.count < 1) {
+					clearInterval(timer);
+					this.deviceInfoShow = true;
+					console.log('倒计时结束');
+				}
+			}, 1000);
+		}
+	}
+};
+</script>
+
+<style scoped>
+.main_container {
+	position: relative;
+	overflow: hidden;
+	background: #000;
+}
+.show-item {
+	/* width: 100%;
+	height: 100vh; */
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+.show-item .show-img {
+	width: 100%;
+	height: 100vh;
+	object-fit: cover;
+}
+.show-item uni-video {
+	width: 100%;
+}
+.show-video {
+	width: 100%;
+	height: 100vh;
+}
+.show-audio {
+	position: fixed;
+	bottom: 79.16rpx;
+	right: 46.52rpx;
+	width: 159.72rpx;
+	height: 152.08rpx;
+	background: url(~@/static/images/an-yy.png) no-repeat;
+	background-size: cover;
+}
+.show-audio uni-image {
+	width: 159.72rpx;
+	height: 152.08rpx;
+}
+.local-data {
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	width: 625rpx;
+	height: 555.55rpx;
+	transform: translate(-50%, -50%);
+	font-size: 27.77rpx;
+	color: #333;
+	border-radius: 27.77rpx;
+	background: rgba(255, 255, 255, 0.85);
+}
+.title {
+	margin-bottom: 32.63rpx;
+	font-size: 56.94rpx;
+	text-align: center;
+}
+.data-info {
+	padding: 0 83.33rpx;
+	margin-bottom: 32.63rpx;
+}
+.count-down {
+	position: absolute;
+	right: 34.72rpx;
+	top: 27.77rpx;
+	width: 48.61rpx;
+	height: 48.61rpx;
+	font-size: 30.55rpx;
+	text-align: center;
+	line-height: 48.61rpx;
+	border: 1px solid #333;
+	border-radius: 50%;
+}
+</style>
diff --git a/unpackage/cache/apk/__UNI__487D0A3_cm.apk b/unpackage/cache/apk/__UNI__487D0A3_cm.apk
index 37833de..c0696c5 100644
Binary files a/unpackage/cache/apk/__UNI__487D0A3_cm.apk and b/unpackage/cache/apk/__UNI__487D0A3_cm.apk differ
diff --git a/unpackage/cache/apk/apkurl b/unpackage/cache/apk/apkurl
index 32a1b94..c3daf35 100644
--- a/unpackage/cache/apk/apkurl
+++ b/unpackage/cache/apk/apkurl
@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/6e254010-b979-11ec-8bee-47dfbe383b6d
\ No newline at end of file
+https://ide.dcloud.net.cn/build/download/f4cdad70-ba2b-11ec-a335-23d69ebb189d
\ No newline at end of file
diff --git a/unpackage/cache/apk/cmManifestCache.json b/unpackage/cache/apk/cmManifestCache.json
index d2daab8..cbce8f9 100644
--- a/unpackage/cache/apk/cmManifestCache.json
+++ b/unpackage/cache/apk/cmManifestCache.json
@@ -1 +1 @@
-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
\ No newline at end of file
+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
\ No newline at end of file