更改空间显示名称 X空间 类型 根据布局所属类型来显示

src/pages/webgl_rxdz_env/webgl_rxdz_env.html

@@ -19,16 +19,16 @@
         			class="master-pic-img" :src="item.imageUrl" mode="aspectFill" />
                 </el-carousel-item>
             </el-carousel>
-			<div class="indicator-view rows" >
+			<div class="indicator-view rows" v-if="aiImagesList && aiImagesList.length>1">
 				<div class="indicator-item" :class="{'active': currentIndex == idx}" v-for="(item, idx) in aiImagesList" :key="idx"></div>
 			</div>
 			<!-- v-if="aiFlag && aiImagesList.length>0 && showAIImage" -->
 			<div class="load-mask"></div>
 			<div class="loading_more">
 				<template v-if="!startCreate">
-					<img class="leftSwiperImg"
+					<!-- <img class="leftSwiperImg"
 						src="https://dm.static2.elab-plus.com/miniProgram/leftSwiperImg.png"
-						mode="aspectFit"></image>
+						mode="aspectFit"></image> -->
 				</template>
 				<template v-else>
 					<img class="loading_img"
@@ -42,7 +42,7 @@
 		<!-- 底部视图 -->
 		<div class="bottom-view">
 			<!-- 左侧按钮  -->
-			<div class="btn-view columns" v-if="aiImagesList[currentIndex] && aiImagesList[currentIndex].type=='AI'">
+			<div class="btn-view columns" v-if="aiImagesList[currentIndex]">
 				<!-- 下载 -->
 				<!-- <div class="compareBtn btn1" @click.stop="save" v-if="showAIImage">
 					<img class="down" src="https://dm.static.elab-plus.com/miniProgram/iconfont/down.png" mode="widthFix"/>

src/pages/webgl_rxdz_env/webgl_rxdz_env.vue

@@ -106,14 +106,14 @@
 					return false;
 				}
 				// console.log("***leftScroll***",this.currentIndex,this.aiImagesList.length)
-				let obj = {
-					imgUrl:this.AIImg,
-					prompt:this.options[this.optionIndex].remark,
-					negativePrompt:this.options[this.optionIndex].tips,
-					tabIndex:this.tabIndex,
-					optionIndex:this.optionIndex,
-				}
-				this.startServer(obj);//继续生成下一张
+				// let obj = {
+				// 	imgUrl:this.AIImg,
+				// 	prompt:this.options[this.optionIndex].remark,
+				// 	negativePrompt:this.options[this.optionIndex].tips,
+				// 	tabIndex:this.tabIndex,
+				// 	optionIndex:this.optionIndex,
+				// }
+				// this.startServer(obj);//继续生成下一张
 			},
 			//点赞喜欢
 			changeAIImg() {
@@ -143,12 +143,21 @@
 					list.forEach(it => {
 						it.checkedIndex = -1;////增加当前题目用户选择的需要，默认不选中
 						it.options.forEach(option=>{
-							option.hardboundEffect = [
-								{
-									imageUrl :option.imageUrl,
-									type:'system',//人为添加的
-								}
-							];//AI生成图存放对象
+							if(option.imageUrls){
+								option.hardboundEffect = option.imageUrls.map(it=>{
+									return {
+										imageUrl: it,
+										checked: false,
+										type:'system',//表示系统生成的
+									}
+								})
+							}
+							// option.hardboundEffect = [
+							// 	{
+							// 		imageUrl :option.imageUrl,
+							// 		type:'system',//人为添加的
+							// 	}
+							// ];//AI生成图存放对象
 						})
 					});
 					let envData = getStorage('envData') ? JSON.parse(getStorage('envData')) : null;
@@ -186,6 +195,10 @@
 				this.tabIndex = id;
 				this.options = this.tabData[this.tabIndex].options; //选项数据
 				this.optionIndex = this.tabData[this.tabIndex].checkedIndex; //获取用户已经选中的选项
+				if(this.optionIndex>-1){
+					this.aiImagesList = this.options[this.optionIndex].hardboundEffect;
+					this.checked = this.aiImagesList[this.currentIndex].checked;
+				}
 				// let param = {
 				// 	type: 'CLK', //埋点类型
 				// 	clkId: 'clk_2cmina_24012601', //点击ID
@@ -214,6 +227,7 @@
 				this.aiImagesList = this.options[this.optionIndex].hardboundEffect;
 				this.currentIndex = 0;
 				this.$refs.carousel.setActiveItem(0); //切换到第一张
+				this.checked = this.aiImagesList[this.currentIndex].checked;
 				console.warn("***changeOption***", this.tabData,this.AIImg,this.subDataList)
 				// let param = {
 				// 	type: 'CLK', //埋点类型

src/services/urlConfig.js

@@ -38,6 +38,7 @@ var config = function(env) {
             redirect_uri: 'https://h5test1.elab-plus.com/krpano/template', // 授权回调地址
             min_uri: 'https://dm.static.elab-plus.com/miniProgram/webgl/test1/index.html#/', // H5小程序的地址
 			ws_url: 'wss://wstest3.skyforestcity.com/',
+			// ws_url: 'ws://192.168.50.190:5556/',
             themeColor1: '#FFD09F',
             themeColor2: '#FFAD5C',
             themeColor3: '#EF863F',

src/utils/util.js

@@ -24,6 +24,30 @@ let wsConfig = {
         houseId: null
     }
 }
+/**
+ * 获取随机数,为socket请求拼接后缀
+ */
+function uuid(len, radix) {
+	var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+	var uuid = [],
+		i;
+	radix = radix || chars.length;
+	if (len) {
+		for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+	} else {
+		var r;
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+		uuid[14] = '4';
+
+		for (i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16;
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+			}
+		}
+	}
+	return uuid.join('');
+}
 /**
  * 初始化websocket
  */
@@ -34,11 +58,11 @@ function initWebsocket() {
     let str4 = "" + str1 + str2 + str3;
     //初始化weosocket
     let websocketUrl = $config.ws_url;
+	let rod = uuid(8, 60);
     const wsuri =
         `${websocketUrl}gs-guide-websocket/` +
         str4 +
-        "/shi23jfrw" +
-        "/websocket";
+        "/" + rod + "/websocket";
     wsConfig.ws = new WebSocket(wsuri);
     // 连接建立时触发
     wsConfig.ws.onopen = websocketonopen;
@@ -256,7 +280,7 @@ function reset() {
 // socket 心跳发送
 function wsSendHeartBeat() {
 	let ws = wsConfig.ws;
-	// var data = ["\n"];//心跳的数据格式
+	let data = ["\n"];//心跳的数据格式
 	if(!socketInter){
 		console.warn('***ws-开启WebSocket心跳***');
 		//5秒钟发送一次心跳
@@ -266,7 +290,7 @@ function wsSendHeartBeat() {
 			console.warn('***ws-心跳***');
 			if (ws.readyState == 1) {
 			    //如果连接正常
-			    ws.send("heartCheck"); //这里可以自己跟后端约定
+			    ws.send(JSON.stringify(data)); //这里可以自己跟后端约定
 			} else {
 			    //否则重连
 			    reconnect();