Browse Source

优化修改

zjs_project 11 months ago
parent
commit
65ce321b24

+ 3 - 0
src/mixins/commonPageMethod.js

@@ -107,6 +107,9 @@ export default {
 				};
 				util.trackRequest(param);//发送统一PV埋点
 			}
+            if(this.onShow && typeof(this.onShow) ==='function'){
+                this.onShow()
+            }
 		},
 		pvCloseHandle(){
 			if(this.pvId){

+ 33 - 26
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.html

@@ -56,8 +56,21 @@
 				</div>
             </div>
         </div>
-		
-		<!-- 底部按钮 -->
+		<!-- 支付后的显示视图 -->
+		<div class="pay-view columns" v-if="payed==1">
+		    <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>
+		    <div class="rows ">
+		        <div class="bottom-btn btn-qw rows justify-center" @click="conectUS">
+		            加企微 · 定制服务
+		        </div>
+		        <div class="bottom-btn btn-share rows justify-center" @click="share">
+		            <i class="iconfont icon-Shared rows" style="margin-right: 8px;"></i>立即分享
+		        </div>
+		    </div>
+		</div>
+        <!-- 作品支持说明 -->
 		<div class="info-view columns justify-center" v-if="layoutStruct && typeStatus">
 			<div class="bottom-title" :style="{'color':tabIndex==0?'#fff':'#000'}">
 				- 支持我的梦想家 -
@@ -93,50 +106,44 @@
 				</div>
 			</div>
             <div class="rows justify-center" style="margin-top: 60px;">
-            	<div class="bottom-btn btn-qw rows justify-center" @click="toIndex">
+            	<div class="bottom-btn btn-qw rows justify-center" @click="toCustomized">
             	    设计我的梦想家
             	</div>
-            	<div class="bottom-btn btn-share rows justify-center" @click="share">
-            		分享我的设计
+            	<div class="bottom-btn btn-share rows justify-center" @click="toIndex">
+            		{{landDataId?'返回':'返回项目首页'}}
             	</div>
             </div>
 		</div>
-		<div class="bottom-view rows rows-between" v-if="typeStatus">
-			<!-- <div class="bottom-btn btn-qw rows justify-center" @click="toIndex">
-			    设计我的梦想家
-			</div>
-			<div class="bottom-btn btn-share rows justify-center" @click="share">
-				分享我的设计
-			</div> -->
+		<!-- 底部悬浮按钮占位 -->
+        <div style="width: 100%;height: 100px;"></div>
+        <!-- 底部按钮 -->
+        <div class="bottom-view rows rows-between" v-if="typeStatus">
             <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>
             </template>
             <template v-else>
-                <div class="left rows justify-center" @click="likeOrView(1)">喜欢</div>
-                <div class="right rows justify-center" @click="likeOrView(2)">不喜欢</div>
+                <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 rows-between" v-else>
-			<div class="btn columns" @click="share">
+		<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>
 				分享
 			</div>
 			<div class="btn columns" @click="conectUS">
 				<i class="iconfont icon-Comment rows"></i>
 				联系我们
-			</div>
-			<div class="btn1 btn-qw rows justify-center" style="margin-right: 0px;" @click="toIndex">
-				返回项目首页
-			</div>
-			<!-- <div class="bottom-btn btn-qw rows justify-center" @click="conectUS">
-			    联系我们了解更多
-			</div>
-			<div class="bottom-btn btn-share rows justify-center" @click="share">
-				分享我的设计
 			</div> -->
+			<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="payOrder">
+                下单
+            </div>
 		</div>
+        
 		<!-- 高斯背景图 -->
 		<div class="swiper-img-gs-mh"  >
 			<img class="img" mode="aspectFill" src="https://dm.static.elab-plus.com/miniProgram/test-bg.jpg" />

+ 21 - 13
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.scss

@@ -407,7 +407,7 @@ page {
         color: #fff;
     	width: 50%;
     	height: 80px;
-    	background: #e38330;
+    	background: rgba(255, 255, 255, 0.33);
     	border-radius: 40px 0% 0% 40px;
     	margin-right: -10px;
     	clip-path: polygon(0 0%, 100% 0, calc(100% - 20px) 100%, 0 100%);
@@ -419,7 +419,7 @@ page {
         color: #fff;
     	width: 50%;
     	height: 80px;
-    	background: rgba(255, 255, 255, 0.33);
+        background: #e38330;
     	border-radius: 0px 40px 40px 0px;
     	clip-path: polygon(20px 0%, 100% 0, 100% 100%, 0 100%);
     }
@@ -504,7 +504,25 @@ page {
 		color: #fff;
 	}
 }
-
+.pay-view{
+    position: relative;
+    z-index: 2;
+    .t1{
+        font-family: "Verdana";
+        font-weight: 400;
+        font-size: 26px;
+        line-height: 48px;
+        color: #fff;
+        opacity: 0.7;
+    }
+    .t2{
+        font-family: "DIN Alternate Bold";
+        font-weight: 700;
+        font-size: 40px;
+        line-height: 52px;
+        color: #fff;
+    }
+}
 
 .swiper-img-gs-mh {
 	// width: 100vw;
@@ -527,16 +545,6 @@ page {
 		object-fit: cover;
 	}
 }
-.pop-shareImg{
-	position: fixed;
-	width: 100vw;
-	height: 100vh;
-	box-sizing: border-box;
-	left: 0px;
-	top: 0px;
-	background-color: rgba(112, 112, 112, 0.5);
-	z-index: 99;
-}
 .pop-view{
 	position: fixed;
 	width: 100vw;

+ 39 - 5
src/pages/webgl_rxdz_text_customize/webgl_rxdz_text_customize.vue

@@ -74,6 +74,7 @@ export default {
 			isSend:false,
 			showPopup:false,
 			isIOS:false,
+            payed:0,//当前柔性定制是否已经支付了  1:是,0:否,默认0
 		}
     },
     /**
@@ -109,6 +110,10 @@ export default {
 	},
 
     methods: {
+        onShow(){
+            console.warn("***页面显示***");
+            this.getIdData();
+        },
 		showPop() {
 			this.showUserInput = true;
 		},
@@ -260,11 +265,30 @@ export default {
 				}
 			}
 		},
+        //去定制
+        toCustomized(){
+        	if(window.__wxjs_environment === 'miniprogram'){
+        		this.pvCloseHandle();//小程序跳转会主动杀死关闭当前页面-不经过页面框架跳转关闭逻辑-所以需要主动触发关闭埋点
+                if(this.landDataId){//有土地id-前往地块定制入口页面
+                    wx.miniProgram.redirectTo({url: '/amapPackage/pages/depositList/depositList?bizId='+this.landDataId+'&pageStatus=2'})
+                }else{
+                    wx.miniProgram.redirectTo({url: '/pages/index/index?houseId='+this.houseId})
+                }
+        	}else{
+        		let url = $config.min_uri + "pages/index/index?houseId=" + this.houseId
+        		// window.location.href = shottingImg;
+        		window.open(url)
+        	}
+        },
 		//去往首页
 		toIndex(){
 			if(window.__wxjs_environment === 'miniprogram'){
 				this.pvCloseHandle();//小程序跳转会主动杀死关闭当前页面-不经过页面框架跳转关闭逻辑-所以需要主动触发关闭埋点
-				wx.miniProgram.redirectTo({url: '/pages/index/index?houseId='+this.houseId})
+                if(this.landDataId){//有土地id
+                    wx.miniProgram.redirectTo({url: '/amapPackage/pages/blockDetail/blockDetail?id='+this.landDataId})
+                }else{
+                    wx.miniProgram.redirectTo({url: '/pages/index/index?houseId='+this.houseId})
+                }
 			}else{
 				let url = $config.min_uri + "pages/index/index?houseId=" + this.houseId
 				// window.location.href = shottingImg;
@@ -281,6 +305,16 @@ export default {
 				this.showPop();
 			}
 		},
+        //支付订单
+        payOrder(){
+        	if(window.__wxjs_environment === 'miniprogram'){
+        		this.pvCloseHandle();//小程序跳转会主动杀死关闭当前页面-不经过vue跳转关闭逻辑-所以需要主动触发关闭埋点
+        		wx.miniProgram.redirectTo({url: '/amapPackage/pages/transfer/transfer?goodId='+this.id+"&landDataId="+this.landDataId})
+        	}else{
+        		this.$message.warning("请在小程序中使用");
+        		// this.showPop();
+        	}
+        },
 		async share(){
 			if(window.__wxjs_environment === 'miniprogram'){
 				// Toast({
@@ -374,6 +408,7 @@ export default {
 			}
             if(this.landDataId){
                 params.landDataId = this.landDataId;
+                delete params.houseId
             }
 			// params.userId = this.userId;
 			const res = await requestConfig('getCustomizedRecord', params);
@@ -387,7 +422,7 @@ export default {
 					this.expand = list.slice(ind);
 				}
 				this.layoutStruct = JSON.parse(JSON.stringify(single));
-				
+				this.payed = single.payStatus || 0;//是否支付成功  1:是,0:否,默认0
 				this.likeCount = this.layoutStruct.liked;//喜欢的人数
 				this.unlikedCount = this.layoutStruct.unliked;//不喜欢人数
 				this.total = this.layoutStruct.total;//总人数
@@ -450,8 +485,7 @@ export default {
                 clkName: 'roomretpic_clk', //点击前往的页面名称
                 clkParams: {
                     type: this.tabData[this.tabIndex].name,
-                    locusName: "房间名称",
-                    // locusValue: this.tabData[this.tabIndex].name,
+                    locusValue: this.tabData[this.tabIndex].name,
                 }
             };
             util.trackRequest(param);
@@ -475,7 +509,7 @@ export default {
 				clkId: 'clk_2cmina_23080420', //点击ID
 				clkName: 'checkroom_clk', //点击前往的页面名称
 				clkParams: {
-					locusName: "查看户型",
+					locusValue: "查看户型",
 				}
 			};
 			util.trackRequest(param);