优化-tag

src/App.vue

@@ -48,6 +48,7 @@
 			let userId = this.$route.query.leavePhoneCustomerId ? this.$route.query.leavePhoneCustomerId : (userInfo?userInfo.userId:'');
 			let xcxHouseId = this.$route.query.xcxHouseId ? this.$route.query.xcxHouseId : (this.$route.query.houseId || '');
 			let landDataId = this.$route.query.landDataId ? this.$route.query.landDataId : '';//土地id
+			let cityCode = this.$route.query.cityCode ? this.$route.query.cityCode : '';//土地id
 			let query = this.$route.query;
 			let brandId = this.$route.query.brandId || this.$route.query.special_ID;
 			if (brandId) { //如果存在集团id
@@ -55,6 +56,9 @@
 			}
             if (landDataId) { //如果存在土地id
                 this.$store.state.landDataId = landDataId;
+            }
+            if (cityCode) { //如果存在cityCode
+                this.$store.state.cityCode = cityCode;
             }
 			if (xcxHouseId) { //如果存在houseid
 				this.$store.dispatch('setHouseId', xcxHouseId);

src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.html

@@ -21,7 +21,7 @@
             </div>
 			<div class="mask"></div>
 			<img class="text-img" src="https://dm.static.elab-plus.com/miniProgram/text-img.png" mode="widthFix"/>
-			<div class="lookHouseView rows justify-center" v-if="tabIndex==0 && (!shareUserId || shareUserId==userId)" @click="toMode">
+			<div class="lookHouseView rows justify-center" v-if="tabIndex==0 && projectUserId==userId" @click="toMode">
 				<img class="icon-ai" src="https://dm.static.elab-plus.com/miniProgram/iconfont/icon-ai.png" mode="widthFix"/>
 				查看户型
 			</div>
@@ -43,7 +43,7 @@
 			<div class="writingBox rows">
 				<img class="writing-img" :src="layoutStruct.houseImg || plotHeadDeafultImg" />
 				<div class="wiriting-right" >
-					<div class="font40 wiriting-text">{{shareUserId&&shareUserId!=userId?'':'我的'}}私人定制</div>
+					<div class="font40 wiriting-text">{{projectUserId&&projectUserId!=userId?'':'我的'}}私人定制</div>
 					<div class="font52 wiriting-text">{{layoutStruct.houseName || ''}}</div>
 				</div>
 			</div> -->
@@ -57,7 +57,7 @@
             </div>
         </div>
 		<!-- 支付后的显示视图 -->
-		<div class="pay-view columns" v-if="payed==1">
+		<div class="pay-view columns" v-if="payed==1 && projectUserId==userId">
 		    <div class="t1 rows" style="margin-bottom: 6px;">订金权益说明<i class="iconfont icon-shuoming rows" style="margin-left: 6px;"></i></div>
 		    <div class="t2">支付订金 ￥99</div>
 		    <div class="t2" style="margin-bottom: 22.5px;">立得专属私人空间定制方案</div>
@@ -70,8 +70,8 @@
 		        </div>
 		    </div>
 		</div>
-        <!-- 作品支持说明 -->
-		<div class="info-view columns justify-center" v-if="layoutStruct && typeStatus">
+        <!-- 作品支持说明 不是作者本人 -->
+		<div class="info-view columns justify-center" v-if="layoutStruct && projectUserId!=userId">
 			<div class="bottom-title" :style="{'color':tabIndex==0?'#fff':'#000'}">
 				- 支持我的梦想家 -
 			</div>
@@ -106,28 +106,29 @@
 				</div>
 			</div>
             <div class="rows justify-center" style="margin-top: 60px;">
-            	<div class="bottom-btn btn-qw rows justify-center" @click="toCustomized">
-            	    设计我的梦想家
-            	</div>
-            	<div class="bottom-btn btn-share rows justify-center" @click="toIndex">
-            		{{landDataId?'返回':'返回项目首页'}}
-            	</div>
+                <div class="bottom-btn btn-qw rows justify-center" @click="toCustomized">
+                    设计我的梦想家
+                </div>
+                <div class="bottom-btn btn-share rows justify-center" @click="toIndex">
+                    {{landDataId?'返回':'返回项目首页'}}
+                </div>
             </div>
 		</div>
 		<!-- 底部悬浮按钮占位 -->
         <div style="width: 100%;height: 100px;"></div>
-        <!-- 底部按钮 -->
-        <div class="bottom-view rows rows-between" v-if="typeStatus">
+        <!-- 底部按钮 不是作者本人-->
+        <div class="bottom-view rows rows-between" v-if="layoutStruct && projectUserId!=userId">
             <template v-if="layoutStruct.clickLike!=null">
-            	<!-- <img class="img" :src="layoutStruct.clickLike?'https://dm.static.elab-plus.com/miniProgram/like.png':'https://dm.static.elab-plus.com/miniProgram/unlike.png'"></img> -->
-            	<div class="text rows justify-center">感谢您的投票</div>
+                <div class="left rows justify-center" style="color:#ccc">不喜欢</div>
+                <div class="right rows justify-center" style="background: rgba(255, 255, 255, 0.33);color:#ccc">喜欢</div>
             </template>
             <template v-else>
                 <div class="left rows justify-center" @click="likeOrView(2)">不喜欢</div>
                 <div class="right rows justify-center" @click="likeOrView(1)">喜欢</div>
             </template>
 		</div>
-		<div class="bottom-view rows justify-center" v-else-if="payed==0">
+		<!-- 作者本人-未支付 -->
+        <div class="bottom-view rows justify-center" v-else-if="payed==0">
 			<!-- <div class="btn columns" @click="share">
 				<i class="iconfont icon-Shared rows"></i>
 				分享
@@ -143,7 +144,15 @@
                 下单
             </div>
 		</div>
-        
+        <!-- 作者本人-已经支付 -->
+        <div class="bottom-view rows justify-center" v-else-if="payed==1">
+        	<div class="bottom-btn btn-qw rows justify-center" style="margin-right: 0px;width: 143px;color: #ed9e5b;background: #fff;margin-right: 30px;" @click="toIndex">
+        		{{landDataId?'返回':'返回项目首页'}}
+        	</div>
+            <div class="bottom-btn btn-share rows justify-center" style="width: 124px;" @click="toCustomized">
+                设计我的梦想家
+            </div>
+        </div>
 		<!-- 高斯背景图 -->
 		<div class="swiper-img-gs-mh"  >
 			<img class="img" mode="aspectFill" src="https://dm.static.elab-plus.com/miniProgram/test-bg.jpg" />

src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.scss

@@ -284,7 +284,7 @@ page {
 	position: relative;
 	width: 100%;
 	padding: 0px 30px;
-	padding-bottom:300px;
+	padding-bottom:200px;
 	box-sizing: border-box;
 	z-index: 3;
 	.bottom-title{
@@ -342,7 +342,7 @@ page {
 		}
 	}
 	.sub-view-result{
-		margin-bottom: 180px;
+		margin-bottom: 50px;
 		.img{
 			width: 152px;
 			height: 60px;

src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.vue

@@ -45,6 +45,7 @@ export default {
             houseId: $config.houseIdHs,
 
             shareUserId: null, // 分享者ID
+            projectUserId: null, // 该作品的作品用户id
             id: '',//方案库id
 
             currImgIdx:0,
@@ -107,6 +108,9 @@ export default {
         landDataId() {
         	return this.$store.state.landDataId;
         },
+        cityCode() {
+        	return this.$store.state.cityCode;
+        },
 	},
 
     methods: {
@@ -365,6 +369,7 @@ export default {
 				houseId:this.houseId,
 				userId,
 				type:1,
+                cityCode:this.cityCode || '',
 			};
 			if(type==1){//喜欢
 				params.likeed = 1
@@ -426,6 +431,8 @@ export default {
 				this.likeCount = this.layoutStruct.liked;//喜欢的人数
 				this.unlikedCount = this.layoutStruct.unliked;//不喜欢人数
 				this.total = this.layoutStruct.total;//总人数
+                this.projectUserId = single.userId;//该作品的作品用户id
+                this.navbar.title = single.userName ? (single.userName + "定制") : "我的定制";//修改标题
 				if((this.likeCount + this.unlikedCount)>0){
 					this.proportion = parseInt((this.likeCount / (this.likeCount + this.unlikedCount))*100);
 				}

src/store/state.js

@@ -10,5 +10,6 @@ const state = {
 	aiData:null,	//AI生成的数据
 	curSpaceId:null,	//当前选中的空间id
 	landDataId:null,	//土地id
+	cityCode:null,	//城市编码
 }
 export default state