Merge branch 'master' of http://git.weirui0755.com/liang/samehome

pages/recharge/recharge.vue

@@ -167,8 +167,8 @@
 						// #ifdef APP-PLUS
 						plus.runtime.openURL(res.msg);
 						// #endif
-						// #ifdef H5
+						// #ifdef H5
-						window.location.href = res.msg
+						window.open(res.msg, '_blank');
 						// #endif
 					}
 					if (res.code == 1) {

pages/subscription/details.vue

@@ -48,7 +48,7 @@
 			<!-- ProjectDetails -->
 			<view class="contentTitle">
 				<view class="ProjectDetails">{{ i18n.ProjectDetails }}</view>
-				<view class="videoBtn" @click="getContact('video')">{{ i18n.Video }}</view>
+				<view class="videoBtn" @click="playVideo(deinfo.sysCoinInfo.videoWebsite)">{{ i18n.Video }}</view>
 				<view class="whiteBook" @click="getContact('book')">{{ i18n.WhiteBook }}</view>
 			</view>
 
@@ -62,7 +62,8 @@
 			<view class="content">{{i18n.TotalCirculation+deinfo.sysCoinInfo.issueAmount}}</view>
 			<view class="content">{{i18n.ICOPrice+deinfo.sysCoinInfo.initalPrice}} USDT</view>
 			<view class="content">{{i18n.ICOTime+deinfo.sysCoinInfo.initialReleasePhase}}</view>
-
+			<video class="video" v-show="videoShow" id="video" :enable-progress-gesture="false" autoplay="true"
+				:src="videoUrl" controls x5-video-player-type="h5-page" @fullscreenchange="ifStopVideo"></video>
 		</view>
 	</view>
 </template>
@@ -97,6 +98,9 @@
 				hr: '',
 				min: '',
 				sec: '',
+				videoPlayer:null,
+				videoUrl:'',
+				videoShow:false
 			};
 		},
 		computed: {
@@ -128,8 +132,25 @@
 			this.getDetail(res.id);
 			// console.log(this.$t('login.emailInputMessage'));
 		},
-		onShow() {},
+		onShow() {
+			this.videoPlayer = uni.createVideoContext(`video`, this);
+		},
 		methods: {
+			ifStopVideo(e) {
+				if (e.detail.fullScreen) {
+					this.videoPlayer.play()
+				} else {
+					this.videoShow = false
+					this.videoPlayer.pause()
+				}
+			},
+			playVideo(data) {
+				this.videoUrl = data;
+				this.videoShow = true;
+				this.videoPlayer.requestFullScreen({
+					direction: 0
+				})
+			},
 			//提交申购订单
 			subscribe() {
 				api.exchangeCoin({
@@ -177,11 +198,12 @@
 				} else {
 					url = this.deinfo.sysCoinInfo.whitePaperWebsite
 				}
+				
 				// #ifdef APP-PLUS
 				plus.runtime.openURL(url);
 				// #endif
 				// #ifdef H5
-				window.location.href = url
+				window.open(url, '_blank');
 				// #endif
 			},
 			// 申购详情