zjs_project преди 1 година
родител
ревизия
c044a83572

+ 1 - 1
src/components/krpanoVideo/panoramic_no_drag.xml

@@ -241,7 +241,7 @@
 				};
 				var scaledCanvas = document.createElement("canvas");
 				var scaledContext = scaledCanvas.getContext('2d');
-				scaledCanvas.width = 1680;//分享小图的尺寸-宽度-二倍图
+				scaledCanvas.width = 1684;//分享小图的尺寸-宽度-二倍图
 				scaledCanvas.height = 1344;//分享小图的尺寸-高度-二倍图
 				var unit = sizeinfo.w/scaledCanvas.width;
 				var vfw = sizeinfo.w;

+ 18 - 8
src/components/newBottomCom/viewAI/viewAI.html

@@ -1,6 +1,7 @@
 <div class="ai-view">
 	<div class="ai-title rows">
-		<div class="title-btn rows justify-center" :class="{active:tabIndex==2}" @click.stop="tabChange(2)">
+		<!-- v-if="relationId" -->
+		<div v-if="relationId" class="title-btn rows justify-center" :class="{active:tabIndex==2}" @click.stop="tabChange(2)">
 			<img class="redbox_icon" src="https://dm.static.elab-plus.com/miniProgram/redbox_icon.png" alt=""></img>
 			活动
 		</div>
@@ -69,33 +70,42 @@
 	<div class="redbox" v-else-if="tabIndex==2">
 		<div class="main-box rows rows-between flex-start">
 			<div class="left-box">
-				<div class="title">红包设置</div>
 				<div class="left-main rows">
 					<div class="main-red columns justify-center">
 						<img class="red-img" src="https://dm.static.elab-plus.com/miniProgram/redbox.gif"/>
-						<div v-if="hasRedBox==false" class="red-btn rows justify-center" @click="addRedBox">添加红包</div>
+						<!-- <div v-if="hasRedBox==false" class="red-btn rows justify-center" @click="addRedBox">添加红包</div>
 						<div class="rows justify-center" v-else>
 							<div class="iconfont icon-icon_delete rows justify-center" @click="removeRedBox"></div>
 							<div class="red-btn rows justify-center red-adjust" @click="setRedBox">
 								红包调整
 							</div>
+						</div> -->
+						<div class="red-info">
+							<div class="red-money">
+								<span class="tips">¥</span>888888
+							</div>
+							<div class="word">
+								场景礼包总奖励金
+							</div>
 						</div>
 					</div>
 					<div class="plus">+</div>
-					<!-- <img class="special-img" :src="specialImg"/> -->
 					<div id="special-img" class="special-img"></div>
 				</div>
+				<div class="title"></div>
 			</div>
 			<div class="right-box">
-				<div class="title">选择特效</div>
 				<div class="select-view columns" style="justify-content:space-around">
 					<div class="select-btn" :class="{active:specialIndex==0}" @click.stop="specialChange(0)">金光闪闪</div>
 					<div class="select-btn" :class="{active:specialIndex==1}" @click.stop="specialChange(1)">烟花喷射</div>
 					<div class="select-btn" :class="{active:specialIndex==2}" @click.stop="specialChange(2)">彩带飘落</div>
 				</div>
-				
+				<div class="title">打开特效</div>
 			</div>
 		</div>
+		<div class="playTips rows justify-center" @click="setRedBox">
+			玩法说明 >
+		</div>
 	</div>
 	<!-- 音乐列表 -->
 	<div class="ai-people" v-else-if="tabIndex==3">
@@ -108,9 +118,9 @@
 		</div>
 	</div>
 	<div class="ai-tips">
-		{{tabIndex==0?'点击添加到场景中,可调整大小和拖动到摆放位置':(tabIndex==1?'点击宠物添加到场景中,可调整大小和拖动到摆放位置':(tabIndex==3?'点击音乐添加到场景中':'点击红包添加到场景中,您的朋友将收到你的红包祝福'))}}
+		{{tabIndex==0?'点击添加到场景中,可调整大小和拖动到摆放位置':(tabIndex==1?'点击宠物添加到场景中,可调整大小和拖动到摆放位置':(tabIndex==3?'点击音乐添加到场景中':''))}}
 	</div>
-	<div class="ai-bottom rows justify-center" @click.stop="mynavigateFuc">发布全景</div>
+	<div class="ai-bottom rows justify-center" @click.stop="mynavigateFuc">立即发布</div>
 	<!-- 弹出层-添加个人形象 -->
 	<div class="mask-view" v-if="showPersonView" @touchmove.stop="catchTapEvent" @click.stop="catchTapEvent">
 		<div class="content">

+ 30 - 6
src/components/newBottomCom/viewAI/viewAI.scss

@@ -170,9 +170,10 @@
 .redbox{
 	position: relative;
 	box-sizing: border-box;
-	padding: 0px 40px;
+	padding: 0px 30px;
 	margin-top: 50px;
 	.main-box{
+		margin-bottom: 44px;
 		.title{
 			font-family: "Verdana";
 			font-weight: 400;
@@ -191,7 +192,6 @@
 					.red-img{
 						width: 217px;
 						height: 217px;
-						margin-bottom:20px;
 					}
 					.icon-icon_delete{
 						width: 54px;
@@ -215,15 +215,33 @@
 						background: rgba(242, 121, 102, 0.1);
 						color: #f27966;
 					}
+					.red-info{
+						.red-money{
+							color: rgb(229, 85, 85);
+							font-size: 40px;
+							font-family: DINCondensed-Bold;
+							font-weight: 700;
+							.tips{
+								font-size: 26px;
+							}
+						}
+						.word{
+							font-family: "Verdana";
+							font-weight: 400;
+							font-size: 24px;
+							text-align: center;
+							color: rgba(78, 78, 78, 0.5);
+						}
+					}
 				}
 				.plus{
-					font-size: 20px;
+					font-size: 30px;
 					margin-top: -50px;
 				}
 				.special-img{
-					width: 242px;
-					height: 242px;
-					margin-left:50px;
+					width: 286px;
+					height: 342px;
+					margin-left:49px;
 				}
 				
 			}
@@ -244,6 +262,12 @@
 			}
 		}
 	}
+	.playTips{
+		font-family: "Verdana";
+		font-weight: 400;
+		font-size: 26px;
+		color: #4e4e4e;
+	}
 }
 
 

+ 9 - 5
src/components/newBottomCom/viewAI/viewAI.vue

@@ -29,7 +29,7 @@
 				peopleIndex: -1,
 				petIndex: -1,
 				musicIndex: -1,
-				specialIndex: 0,
+				specialIndex: 1,
 				specialList:[
 					{
 						id:1,
@@ -66,7 +66,10 @@
 			}
 		},
 		props: {
-
+			relationId: {
+				type: String,
+				default: '',
+			},
 		},
 		// mixins: [touchHandle],
 		async mounted() {
@@ -138,6 +141,9 @@
 				this.tabIndex = index;
 				this.$emit("tabChange", this.tabIndex); //通知页面,户型大类发生了变更
 				if(this.tabIndex==2 && this.specialIndex>-1){
+					if(!this.hasRedBox){
+						this.addRedBox();//添加红包
+					}
 					this.$nextTick(() => {
 						// 播放lottie动画
 						lottie.destroy("markLoading");
@@ -561,10 +567,8 @@
 			catchTouchMove: function() {
 				return false;
 			},
-			// hideOrShowActor(type){
-			// 	this.$emit('hideOrShowActor',type);//隐藏所有视角
-			// },
 			addRedBox(){//添加红包
+				console.warn("***添加红包***")
 				this.$emit("redBox",'add');
 				this.hasRedBox = true;
 			},

+ 18 - 0
src/components/playTips/playTips.html

@@ -0,0 +1,18 @@
+<div class="pay-view" v-if="showRedBox">
+	<div class="pay-main">
+		<i class="modelClose iconfont icon-close" @click.stop="hideRedBoxSet"></i>
+		<div class="pay-title rows justify-center">玩法说明</div>
+		<div class="desc">
+			1.每个场景都有总奖励金,发光为止 <br />
+			<br />
+			2.创建场景礼包会有概率获取一定奖励,并且转发当<br />前场景,礼盒每被打开1次,再随机获得一定奖励金<br />
+			<br />
+			3. 打开带有该场景礼包的人,也会获得一定奖励金<br />
+			<br />
+			4.每人天可开同一场景礼盒次数有一定上限,每人每<br />天获得的同一场景的奖励金有一定上限
+		</div>
+		<div class="pay-btn rows justify-center" @click.stop="hideRedBoxSet">
+			好的
+		</div>
+	</div>
+</div>

+ 87 - 0
src/components/playTips/playTips.scss

@@ -0,0 +1,87 @@
+.pay-view{
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	width: 100%;
+	height: 100vh;
+	background: rgba(0, 0, 0, 0.64);
+	box-sizing: border-box;
+	z-index: 999;
+	.modelClose{
+		position: absolute;
+		right: 30px;
+		top: 30px;
+		font-size: 30px;
+	}
+	.pay-main{
+		position: absolute;
+		bottom: 0px;
+		width: 100%;
+		height: 782px;
+		border-radius: 40px 40px 0 0;
+		background: #fff;
+		padding: 40px;
+		box-sizing: border-box;
+		.pay-title{
+			font-family: "Verdana Bold";
+			font-weight: 700;
+			font-size: 34px;
+			color: #000;
+			margin-bottom: 40px;
+		}
+		.desc{
+			font-family: "Verdana";
+			font-weight: 400;
+			font-size: 28px;
+			line-height: 48px;
+			color: rgba(33, 33, 33, 0.76);
+			margin-bottom: 90px;
+		}
+		.pay-btn{
+			margin-left: 50%;
+			transform: translateX(-50%);
+			margin-bottom: 20px;
+			width: 550px;
+			height: 80px;
+			border-radius: 40px;
+			background: #3b3b3b;
+			border: 2px solid #ffffff38;
+			font-family: DINCondensed-Bold;
+			font-weight: 700;
+			font-size: 32px;
+			color: #fff;
+		}
+	}
+}
+textarea::-webkit-scrollbar{
+    display:none;
+}
+textarea::-webkit-input-placeholder{
+    color: rgba(43, 37, 37, 0.3);
+	font-size: 28px;
+}
+input::-webkit-input-placeholder{
+    color: rgba(132, 132, 132, 1);
+	font-size: 28px;
+}
+@font-face{
+	font-family: DINCondensed-Bold;
+	src: url('https://dm.static.elab-plus.com/miniprogram/DINAlternateBold.ttf');
+}
+.grid-view1 {
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	/* grid-row-gap: 20rem; */
+	grid-gap: 20px 20px;
+}
+input,textarea{
+	border: none;
+	outline: none;
+	appearance: none;
+	cursor:pointer;
+}
+input:focus,textarea:focus{
+	border: none;
+	outline: none;
+	appearance: none;
+}

+ 40 - 0
src/components/playTips/playTips.vue

@@ -0,0 +1,40 @@
+<template src="./playTips.html">
+
+</template>
+<script>
+	const util = require('@/utils/util.js').default;
+	// import lottie from "lottie-web"; //lottie
+	// import commonMethod from '@/common/commonMethod.js';
+	// import touchHandle from '@/mixins/touchHandle.js';
+	// import requestConfig from '@/static/lib/requestConfig';
+
+	export default {
+		data: function() {
+			return {
+				showRedBox:false,	//是否显示红包设置
+			}
+		},
+		props: {
+
+		},
+		async mounted() {
+			// await this.getCityHouseList();		
+			console.warn("***playTips***")
+		},
+		methods: {
+			showRedBoxSet() {
+				this.showRedBox = true;
+			},
+			hideRedBoxSet() {
+				this.showRedBox = false;
+			},
+			// hideOrShowActor(type){
+			// 	this.$emit('hideOrShowActor',type);//隐藏所有视角
+			// },
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	@import "./playTips.scss";
+	/* @import "@/common/css/common.css"; */
+</style>

+ 10 - 7
src/pages/webgl_rxdz_krpano720/webgl_rxdz_krpano720.html

@@ -23,22 +23,25 @@
 			<div class="iconfont icon-cancel" @click="closeLottery"></div>
 			<div class="win-title">
 				恭喜您<br />
-				获得红包
+				获得场景奖励
 			</div>
-			<div class="win-info rows justify-center" style="align-items: flex-end;">
+			<!-- <div class="win-info rows justify-center" style="align-items: flex-end;">
 				<span class="win-unit">¥</span>{{result.amount}}
+			</div> -->
+			<div class="win-messges">
+				请到微信钱包<br />
+				领取金额
 			</div>
-			<div class="win-messges">恭喜发财,大吉大利</div>
 			<div class="btn btn-style rows justify-center" @click="closeLottery">立即收下</div>
 		</div>
 		<!-- 过期 -->
 		<div class="main fail" v-else-if="result.status==4">
 			<div class="iconfont icon-cancel" @click="closeLottery"></div>
 			<div class="common-title">
-				包已过期
+				包已过期
 			</div>
 			<div class="common-desc">
-				包已经过期了,<br />
+				包已经过期了,<br />
 				去广场看看其他作品吧
 			</div>
 			<img class="common-img" src="https://dm.static.elab-plus.com/miniProgram/red-fail.png" alt=""></img>
@@ -48,10 +51,10 @@
 		<div class="main fail" v-else-if="result.status==3">
 			<div class="iconfont icon-cancel" @click="closeLottery"></div>
 			<div class="common-title">
-				包已抢完
+				包已抢完
 			</div>
 			<div class="common-desc">
-				包已被抢完了!<br />
+				包已被抢完了!<br />
 				去广场看看其他作品吧
 			</div>
 			<img class="common-img1" src="https://dm.static.elab-plus.com/miniProgram/red-over.png" alt=""></img>

+ 23 - 9
src/pages/webgl_rxdz_krpano720/webgl_rxdz_krpano720.scss

@@ -59,16 +59,23 @@ page {
 		text-align: center
 	}
 	.win{
-		backdrop-filter: blur(30px);
-		background: linear-gradient(360deg, rgba(255, 255, 255, 0.3) 0%,  rgba(255, 64, 64, 0.8)100%);
-		border: 6px solid #ffb8a7;
+		width: 100%;
+		height: 1026px;
+		padding-top: 0px;
+		background-image: url('https://dm.static.elab-plus.com/miniProgram/red-get.png');
+		background-repeat: no-repeat;
+		background-size: cover;
+		// backdrop-filter: blur(30px);
+		// background: linear-gradient(360deg, rgba(255, 255, 255, 0.3) 0%,  rgba(255, 64, 64, 0.8)100%);
+		// border: 6px solid #ffb8a7;
 	}
 	.win-title{
 		font-family: "Helvetica Bold";
 		font-weight: 700;
 		font-size: 44px;
 		color: #fff;
-		margin-bottom: 34px;
+		margin-top: 362px;
+		margin-bottom: 38px;
 	}
 	.win-info{
 		color: rgb(255, 255, 255);
@@ -84,10 +91,10 @@ page {
 		margin-bottom: 10px;
 	}
 	.win-messges{
-		font-family: "Helvetica";
-		font-weight: 400;
-		font-size: 26px;
-		color: #fff;
+		font-family: "Verdana Bold";
+		font-weight: 700;
+		font-size: 40px;
+		color: #931029;
 	}
 	.fail{
 		background: linear-gradient(360deg, #fff 0%, #ffeaea 100%);
@@ -104,7 +111,7 @@ page {
 	}
 	.btn-style{
 		position: absolute;
-		bottom: -42px;
+		bottom: 180px;
 		left: 50%;
 		transform: translateX(-50%);
 	}
@@ -148,6 +155,13 @@ page {
 		font-size: 50px;
 		color: #fff;
 	}
+	.win .icon-cancel{
+		position: absolute;
+		right: 60px;
+		top: 75px;
+		font-size: 50px;
+		color: #fff;
+	}
 }
 .lottie-view{
 	position: fixed;

+ 1 - 1
src/pages/webgl_rxdz_krpano720/webgl_rxdz_krpano720.vue

@@ -50,7 +50,7 @@
 				showLottery:false,//是否显示中红包状态
 				result:{
 					"amount": 0,	//抢的红包金额
-					"status": 3,	//状态 1:成功抢到红包,2:已经抢过,3:红包已经被抢完了
+					"status": 0,	//状态 1:成功抢到红包,2:已经抢过,3:红包已经被抢完了,4已经过期
 				},	//中奖
 				showAnim:false,	//是否添加lottie动画
 				anim:null,

+ 3 - 2
src/pages/webgl_rxdz_krpanovr/webgl_rxdz_krpanovr.html

@@ -31,6 +31,7 @@
 		<div class="slide-word">缩小</div>
 	</div>
 	<!-- AI数字人组件 -->
-	<viewAI ref="viewAI" @aiPeopleChange="aiPeopleChange" @tabChange="tabChange" @setRedBox="setRedBox" @redBox="redBox" style="z-index: 130;"></viewAI>
-	<payView ref="payView"></payView>
+	<viewAI ref="viewAI" :relationId="relationId" @aiPeopleChange="aiPeopleChange" @tabChange="tabChange" @setRedBox="setRedBox" @redBox="redBox" style="z-index: 130;"></viewAI>
+	<!-- <payView ref="payView"></payView> -->
+	<playTips ref="playTips"></playTips>
 </div>

+ 7 - 4
src/pages/webgl_rxdz_krpanovr/webgl_rxdz_krpanovr.vue

@@ -5,14 +5,15 @@
 	import krpanoVideo from "@/components/krpanoVideo/index.vue";
 	import commonPageMethod from '@/mixins/commonPageMethod.js';
 	import viewAI from '@/components/newBottomCom/viewAI/viewAI.vue';
-	import payView from '@/components/payView/payView.vue';
+	// import payView from '@/components/payView/payView.vue';
+	import playTips from '@/components/playTips/playTips.vue';
 	import {
 		Toast
 	} from 'mint-ui';
 	// import commonPageMethod from '@/common/commonPageMethod.js';
 	export default {
 		components: {
-			krpanoVideo,viewAI,payView
+			krpanoVideo,viewAI,playTips
 		},
 		mixins: [commonPageMethod],
 		/**
@@ -58,7 +59,8 @@
 				music:{
 					title:'',//音乐标题
 					url:'',	//音乐地址
-				}
+				},
+				relationId:'',	//场景id
 			}
 		},
 		beforeDestroy() {
@@ -70,6 +72,7 @@
 			this.isIOS = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
 			this.videoUrl = this.$route.query.videoUrl || '';
 			this.bgUrl = this.$route.query.bgUrl || 'https://elab-marketing-web.oss-accelerate.aliyuncs.com/replicate_images/1702457671501.png';
+			this.relationId = this.$route.query.relationId || '';//场景id
 			// this.AIPeople = this.$route.query.AIPeople ? JSON.parse(this.$route.query.AIPeople) : '';
 			// this.AIPet = this.$route.query.AIPet ? JSON.parse(this.$route.query.AIPet) : '';
 			// this.bgMusic = this.$route.query.bgMusic ? JSON.parse(this.$route.query.bgMusic) : '';
@@ -121,7 +124,7 @@
 				this.$refs.krpanoVideo.redBoxChange(type);
 			},
 			setRedBox(){
-				this.$refs.payView.showRedBoxSet();
+				this.$refs.playTips.showRedBoxSet();
 			},
 			aiPeopleChange(item,type,tabIndex){
 				let self = this;