zjs_project 1 vuosi sitten
vanhempi
commit
b9a0afca3d

+ 2 - 2
src/components/newBottomCom/viewAI/viewAI.html

@@ -80,9 +80,9 @@
 								红包调整
 							</div>
 						</div> -->
-						<div class="red-info">
+						<div class="red-info" v-if="amount">
 							<div class="red-money">
-								<span class="tips">¥</span>888888
+								<span class="tips">¥</span>{{amount}}
 							</div>
 							<div class="word">
 								场景礼包总奖励金

+ 34 - 14
src/components/newBottomCom/viewAI/viewAI.vue

@@ -70,6 +70,10 @@
 				type: String,
 				default: '',
 			},
+			amount: {
+				type: String,
+				default: '',
+			},
 		},
 		// mixins: [touchHandle],
 		async mounted() {
@@ -79,6 +83,7 @@
 			this.getDatalist(0);
 			this.getDatalist(1);
 			this.getDatalist(3);
+			// this.getRelationInfo();//获取场景信息
 		},
 		computed: {
 			userId() {
@@ -527,6 +532,21 @@
 					this.aiPeopleChange(this.musicList[this.musicIndex], 'add')
 				}
 			},
+			// // 获取场景信息
+			// async getRelationInfo() {
+			// 	if(!this.$parent.relationId){
+			// 		return false;
+			// 	}
+			// 	var parmas = {
+			// 		"relationId": this.$parent.relationId,
+			// 		"brandId": $config.brandId,
+			// 	}
+			// 	let res = await requestConfig('getRelationInfo', parmas)
+			// 	this.selectIndex = 0;
+			// 	if (res && res.success) {
+			// 		this.count = res.single.count;
+			// 	}
+			// },
 			// 获取瀑布流数据
 			async getDatalist(type) {
 				let typeName = "Virtual_Human";
@@ -586,20 +606,20 @@
 			//发布全景
 			mynavigateFuc(e) {
 				if (e) {
-					if(this.hasRedBox){
-						if(!this.$parent.redBoxData.count){
-							Toast({
-								message: '请输入红包个数!',
-							});
-							return false;
-						}
-						if(!this.$parent.redBoxData.money){
-							Toast({
-								message: '请输入充值金额!',
-							});
-							return false;
-						}
-					}
+					// if(this.hasRedBox){
+					// 	if(!this.$parent.redBoxData.count){
+					// 		Toast({
+					// 			message: '请输入红包个数!',
+					// 		});
+					// 		return false;
+					// 	}
+					// 	if(!this.$parent.redBoxData.money){
+					// 		Toast({
+					// 			message: '请输入充值金额!',
+					// 		});
+					// 		return false;
+					// 	}
+					// }
 					if(this.peopleIndex==0 && (this.uploadStatus ==1 || this.uploadStatus ==2)){
 						Toast({
 							message: '请在个人形象上传完成后发布!',

+ 2 - 1
src/pages/webgl_rxdz_krpano720/webgl_rxdz_krpano720.scss

@@ -169,5 +169,6 @@ page {
 	top: 0px;
 	width: 100vw;
 	height: 100vh;
-	z-index: 99;
+	z-index: 9999;
+	pointer-events: none;
 }

+ 29 - 13
src/pages/webgl_rxdz_krpano720/webgl_rxdz_krpano720.vue

@@ -5,6 +5,9 @@
 	import krpanoVideo from "@/components/krpanoVideo/index.vue";
 	import commonPageMethod from '@/mixins/commonPageMethod.js';
 	import lottie from "lottie-web"; //lottie
+	import {
+		Toast
+	} from 'mint-ui';
 	// import commonPageMethod from '@/common/commonPageMethod.js';
 	export default {
 		components: {
@@ -50,7 +53,7 @@
 				showLottery:false,//是否显示中红包状态
 				result:{
 					"amount": 0,	//抢的红包金额
-					"status": 0,	//状态 1:成功抢到红包,2:已经抢过,3:红包已经被抢完了,4已经过期
+					"status": 0,	//状态 1:领取成功,2:已经领过了,3:礼盒领完了,4:礼盒已过期,5:网络异常"
 				},	//中奖
 				showAnim:false,	//是否添加lottie动画
 				anim:null,
@@ -86,10 +89,10 @@
 			// this.scale = this.$route.query.scale || '1';
 			this.type = this.$route.query.type || '';
 			
-			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) : '';
-			this.redBox = this.$route.query.redBox ? JSON.parse(this.$route.query.redBox) : '';
+			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) : {};
+			this.redBox = this.$route.query.redBox ? JSON.parse(this.$route.query.redBox) : {};
 			this.initAI();
 		},
 		methods: {
@@ -112,6 +115,8 @@
 			},
 			closeLottery(){
 				this.showLottery = false;
+				lottie.destroy("lottieView");
+				this.showAnim = false;
 			},
 			//用户选中了红包,要派奖了
 			async winLottery(){
@@ -120,20 +125,31 @@
 					console.warn("***no-leavePhoneCustomerId***")
 					return false
 				}
-				if(!this.$route.query.redpackId){
-					console.warn("***no-redpackId***")
+				if(!this.$route.query.boxNo){
+					console.warn("***no-boxNo***")
 					return false
 				}
 				let res = await requestConfig("rob", {
 					"brandId": $config.brandId,
-					"redpackId": this.$route.query.redpackId,
+					"boxNo": this.$route.query.boxNo,
 					"userId": this.$route.query.leavePhoneCustomerId,
+					"openId": this.$route.query.openid,
+					"worksId": this.$route.query.worksId || '', //作品id
+					"sharer": this.$route.query.sharer || '', //分享者秘钥
 				});
 				if (res.success) {
 					this.result = res.single;
 					this.showLottery = true;
 					if(this.result.status==1){
 						this.lottieAni()
+					}else if(this.result.status==5){
+						Toast({
+							message: '已达到限制!',
+						});
+					}else if(this.result.status==2){
+						Toast({
+							message: '已经领过了!',
+						});
 					}
 				}else{
 					this.result = null;
@@ -150,14 +166,14 @@
 					container: element,
 					name: "lottieView",
 					renderer: "svg",
-					loop: false,
+					loop: true,
 					autoplay: true,
 					path: this.specialList[lottieIndex].url, //动画json
 				});
-				setTimeout(()=>{
-					lottie.destroy("lottieView");
-					this.showAnim = false;
-				},2000)
+				// setTimeout(()=>{
+				// 	lottie.destroy("lottieView");
+				// 	this.showAnim = false;
+				// },2000)
 			}
 			
 		}

+ 1 - 1
src/pages/webgl_rxdz_krpanovr/webgl_rxdz_krpanovr.html

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

+ 2 - 0
src/pages/webgl_rxdz_krpanovr/webgl_rxdz_krpanovr.vue

@@ -61,6 +61,7 @@
 					url:'',	//音乐地址
 				},
 				relationId:'',	//场景id
+				amount:'',	//场景总金额,如果有的话
 			}
 		},
 		beforeDestroy() {
@@ -73,6 +74,7 @@
 			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.amount = this.$route.query.amount || '';//场景总金额
 			// 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) : '';

+ 4 - 4
src/services/urlConfig.js

@@ -2,7 +2,7 @@ var config = function(env) {
     let WEB_CONF = {}
     if (env === 'test') {
         WEB_CONF = {
-			brandId: 94,
+			brandId: 102,
 			xcxHouseId: '100296',
             miniAppUrl: 'https://h5test.elab-plus.com/',
             zipUrl: 'http://139.196.5.59:5307',
@@ -27,7 +27,7 @@ var config = function(env) {
         }
     } else if (env === 'test2') {
         WEB_CONF = {
-			brandId: 94,
+			brandId: 102,
 			xcxHouseId: '100296',
             miniAppUrl: 'https://h5test.elab-plus.com/',
             zipUrl: 'http://139.196.5.59:5307',
@@ -52,7 +52,7 @@ var config = function(env) {
         }
     } else if (env === 'test3') {
         WEB_CONF = {
-			brandId: 94,
+			brandId: 102,
 			xcxHouseId: '100296',
             miniAppUrl: 'https://h5test.elab-plus.com/',
             zipUrl: 'http://139.196.5.59:5307',
@@ -77,7 +77,7 @@ var config = function(env) {
         }
     } else if (env === 'test4') {
         WEB_CONF = {
-			brandId: 94,
+			brandId: 102,
 			xcxHouseId: '100296',
             miniAppUrl: 'https://h5test.elab-plus.com/',
             zipUrl: 'http://139.196.5.59:5307',