dever 4 năm trước cách đây
mục cha
commit
78ce25534d

+ 21 - 4
lib/dever/components/seat.vue

@@ -119,8 +119,12 @@
 			};
 		},
 		computed: {
-			aPrice() {
-				return (this.SelectNum - 1) * this.price
+			aPrice() {
+				if (this.fetch.disabled) {
+					return (this.SelectNum - 1) * this.price
+				} else {
+					return (this.SelectNum) * this.price
+				}
 			},
 			rpxNum() {
 				return this.boxWidth / 750
@@ -411,12 +415,25 @@
 			buy : function(seat) {
 				seat = seat.join(',');
 				var self = this;
-				this.Dever.confirm('确定购买座位吗?公测期间免费~', function() {
+				this.Dever.confirm('确定购买座位吗?第一个座位免费哦~', function() {
+					var data = {};
+					data.code = self.Dever.config.code;
+					data.seat = seat;
+					data.content_id = self.type_id;
+					data.index = self.index;
+					var location = 'dream/view?code='+self.Dever.config.code + '&name=' + self.Dever.config.name;
+					data.refer = self.Dever.host + '/' + location;
+					self.Dever.post('app/user/?l=pay.seat', data, function(t) {
+						self.Dever.pay(t, location, '支付失败');
+					});
+					
+					/*
 					self.Dever.post('app/user/?l=api.seatSave', {code:self.Dever.config.code, seat:seat, content_id : self.type_id}, function(t) {
 						self.Dever.alert('选座成功,您可以点击头像发布内容~');
 						self.resetSeat();
 						self.initData(self.hall);
-					});
+					});
+					*/
 				})
 				
 			},

+ 9 - 2
lib/dever/components/video.nvue

@@ -4,6 +4,7 @@
 			<video
 				:src="src"
 				preload
+				:initial-time="initial_time"
 				:autoplay="false"
 				:show-mute-btn="true"
 				:muted="muted"
@@ -118,7 +119,8 @@ export default {
 			muted : true,
 			poster : true,
 			video : false,
-			showInfo : false,
+			showInfo : false,
+			initial_time : 0,
 			time : {},
 			control_style : '',
 		};
@@ -127,6 +129,11 @@ export default {
 		if (this.type == 2) {
 			this.objectFit = '';
 		}
+		var time = this.Dever.data('video_' + this.vid);
+		if (time) {
+			time = parseFloat(time);
+			this.initial_time = time;
+		}
 		this.video = uni.createVideoContext(this.id(), this);
 		if (this.auto) {
 			this.start();
@@ -210,7 +217,7 @@ export default {
 					this.time[currentTime] = currentTime;
 					this.$emit('play', 'time', currentTime);
 					//记录播放进度
-					//this.Dever.data('video_' + this.item.id, this.hall);
+					this.Dever.data('video_' + this.vid, this.currentTime);
 				}
 			}
 		}

+ 9 - 3
pages/dream/view/audioComment.vue

@@ -6,7 +6,8 @@
 			:pic="item.pic" 
 			:control="true"
 			:loop="true"
-			:load.sync="load"
+			:load.sync="load"
+			:disabled="disabled"
 			@play="play"
 			ref="audio"
 			>
@@ -16,7 +17,7 @@
 			<dever-comment ref="comment" :item="item" :type="`content/video_comment`" :type_id="item.id"></dever-comment>
 		</block>
 		<block v-if="item.type == 1">
-			<dever-seat ref="seat" :item="item" :type="`content/video_comment`" :type_id="item.id" @start="start" @stop="stop"></dever-seat>
+			<dever-seat ref="seat" :item="item" :index="index" :type="`content/video_comment`" :type_id="item.id" @start="start" @stop="stop" @setDisabled="setDisabled"></dever-seat>
 		</block>
 	</view>
 </template>
@@ -40,7 +41,9 @@ export default {
 	},
 	data() {
 		return {
-			load : false,
+			load : false,
+			//默认不能播放
+			disabled : true,
 		}
 	},
 	mounted() {
@@ -52,6 +55,9 @@ export default {
 		},
 		stop : function() {
 			this.$refs.audio.stop();
+		},
+		setDisabled : function(value) {
+			this.disabled = value;
 		},
 		play : function(state, time) {
 			if (this.item.type == 1) {

+ 8 - 2
pages/dream/view/liveComment.vue

@@ -8,6 +8,7 @@
 			:index="0" 
 			:vid="item.id" 
 			:load.sync="load"
+			:disabled="disabled"
 			ref="video"
 			>
 			</dever-video>
@@ -16,7 +17,7 @@
 			<dever-comment ref="comment" :item="item" :type="`content/video_comment`" :type_id="item.id"></dever-comment>
 		</block>
 		<block v-if="item.type == 1">
-			<dever-seat ref="seat" :item="item" :type="`content/video_comment`" :type_id="item.id" @start="start" @stop="stop"></dever-seat>
+			<dever-seat ref="seat" :item="item" :index="index" :type="`content/video_comment`" :type_id="item.id" @start="start" @stop="stop" @setDisabled="setDisabled"></dever-seat>
 		</block>
 	</view>
 </template>
@@ -40,7 +41,9 @@ export default {
 	},
 	data() {
 		return {
-			load : false,
+			load : false,
+			//默认不能播放
+			disabled : true,
 		}
 	},
 	mounted() {
@@ -52,6 +55,9 @@ export default {
 		},
 		stop : function() {
 			this.$refs.video.stop(true);
+		},
+		setDisabled : function(value) {
+			this.disabled = value;
 		},
 	},
 	components:{

+ 1 - 1
pages/dream/view/vodComment.vue

@@ -18,7 +18,7 @@
 			<dever-comment ref="comment" :item="item" :type="`content/video_comment`" :type_id="item.id"></dever-comment>
 		</block>
 		<block v-if="item.type == 1">
-			<dever-seat ref="seat" :item="item" :type="`content/video_comment`" :type_id="item.id" @start="start" @stop="stop" @setDisabled="setDisabled"></dever-seat>
+			<dever-seat ref="seat" :item="item" :index="index" :type="`content/video_comment`" :type_id="item.id" @start="start" @stop="stop" @setDisabled="setDisabled"></dever-seat>
 		</block>
 	</view>
 </template>