zjs_project 1 рік тому
батько
коміт
6a7d901608

+ 1 - 0
public/index.html

@@ -14,5 +14,6 @@
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
+	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
   </body>
 </html>

+ 5 - 1
src/components/newBottomCom/viewMask/viewMask.vue

@@ -318,7 +318,11 @@
 						}
 					};
 					util.trackRequest(param);
-					this.$message.warning("敬请期待");
+					if(window.__wxjs_environment === 'miniprogram'){
+						wx.miniProgram.navigateTo({url: '/pages/transfer/transfer?event=openCustomerServiceChat'})
+					}else{
+						this.$message.warning("敬请期待");
+					}
 				}
 			},
 			catchTapEvent:function(){

+ 5 - 1
src/components/newBottomCom/viewShell/viewShell.vue

@@ -258,7 +258,11 @@
 						}
 					};
 					util.trackRequest(param);
-					this.$message.warning("敬请期待");
+					if(window.__wxjs_environment === 'miniprogram'){
+						wx.miniProgram.navigateTo({url: '/pages/transfer/transfer?event=openCustomerServiceChat'})
+					}else{
+						this.$message.warning("敬请期待");
+					}
 				}
 			},
 		}

+ 3 - 1
src/mixins/floorMethod.js

@@ -31,7 +31,9 @@ export default {
 			this.loaderCommonSpace(this.gltfSpaceUrl,comlist,1);
 			let arrlist = list.filter(it=>it.spaceType==14);//花园的空间
 			// this.loaderCommonSpace(this.gltfSpace1Url,arrlist,2);
-			this.loaderGraseSpace(list);//加载草地的模型-所有地块都添加,填补房间里面的
+			if(arrlist && arrlist.length>0){
+				this.loaderGraseSpace(list);//加载草地的模型-所有地块都添加,填补房间里面的
+			}
 		},
 		loaderCommonSpace(gltfSpaceUrl,list,type=1){
 			var that = this;

+ 0 - 1
src/mixins/wallMethod.js

@@ -920,7 +920,6 @@ export default {
 				let wallObj = item;
 				// console.log("处理模型替换", item.wallModelData);
 				if(item.wallModelData.wallWidth == 0){ // 模型隐藏
-					debugger
 					return resolve();
 				}
 				if(item.wallModelData.willCurWallType && item.wallModelData.willCurWallType != -1){

+ 2 - 1
src/pages/webgl_rxdz_customize/webgl_rxdz_customize.html

@@ -115,7 +115,8 @@
 				</div>
 				<div class="bottom-btn btn-share rows justify-center" @click="optionChange(true)">
 					<i class="iconfont icon-Shared" style="color: #ffffff;font-size:32rem;margin-right:20rem;"></i>
-				    立即分享
+				    <!-- 立即分享 -->
+					去首页
 				</div>
 			</div>
 		    

+ 10 - 4
src/pages/webgl_rxdz_customize/webgl_rxdz_customize.vue

@@ -96,12 +96,18 @@ export default {
 			}
 		},
         navigateFuc(){
-			// this.showToast("敬请期待!");
-			this.$message.warning("敬请期待");
+			if(window.__wxjs_environment === 'miniprogram'){
+				wx.miniProgram.navigateTo({url: '/pages/transfer/transfer?event=openCustomerServiceChat'})
+			}else{
+				this.$message.warning("敬请期待");
+			}
 		},
 		optionChange(){
-			// this.showToast("敬请期待!");
-			this.$message.warning("敬请期待");
+			if(window.__wxjs_environment === 'miniprogram'){
+				wx.miniProgram.redirectTo({url: '/pages/index/index?houseId='+this.houseId})
+			}else{
+				this.$message.warning("敬请期待");
+			}
 		},
 		tabDataHandle(expand){
 			let tmp = expand;