修改

components/subComponents/dmHomeChoose.vue

@@ -105,20 +105,20 @@
 				tab:1,
 				types:[
 					{
-						title:"获电",
-						value:1
-					},{
 						title:"获客",
 						value:2
 					},{
-						title:"到访",
+						title:"获电",
 						value:3
 					},{
-						title:"成交",
+						title:"到访",
 						value:4
 					},{
-						title:"注册",
+						title:"成交",
 						value:5
+					},{
+						title:"注册",
+						value:1
 					}
 				],
 				currentType:"",

components/subComponents/dmLogin.vue

@@ -62,6 +62,9 @@
 			show() {
 				this.$refs.popView.show()
 			},
+			hide(){
+				this.knowAction();
+			},
 			close(){
 				this.mobile = "";
 				this.verifity = "";

pages/homePage/homePage.vue

@@ -287,7 +287,7 @@
 				this.getHomePage();
 			},
 			chooiceType(e){
-				this.city = e.city==''?"城市":e.city;
+				this.city = e.city==''?"城市":(e.city).split('市')[0];
 				this.type = e.type;
 				this.typeName = e.typeName==''?'类型':e.typeName;
 				this.pageNo = 1;
@@ -412,10 +412,7 @@
 			},
 			toShareCard(projectId,type){
 				if(this.userInfo.userId){
-					let href = location.href;
-					if (href.indexOf("?")){
-						href = href.split('?')[0]
-					}
+					let href = location.origin+location.pathname;
 					uni.navigateTo({
 						url:'../shareCardPage/shareCardPage?page='+href+"&projectId="+projectId+"&type="+type
 					})

pages/houseDetail/houseDetail.vue

@@ -8,7 +8,7 @@
 					<view class="item" v-for="(item, idx) in dataInfo.categoryList" :key="idx"
 					:style="`color: ${color2}; background-color: ${color6};`">{{item.categoryName}}</view>
 				</view>
-				<view class="shareBtn" :style="`background-color: ${color1};`" @click="toShareCard(dataInfo)">
+				<view class="shareBtn" :style="`background-color: ${color1};`" @click="toShareCard(2)">
 					<image class="icon" src="https://dm.static.elab-plus.com/yezhu/h5/icon_share.png" mode="aspectFit"></image>
 					<text>分享项目</text>
 				</view>
@@ -34,13 +34,13 @@
 				</view>
 			</view>
 		</view>
-		<view class="sectionD">
+		<view class="sectionD" >
 			<image class="icon" src="https://dm.static.elab-plus.com/yezhu/icon_hongbao.png" mode="aspectFit"></image>
 			<view class="midSection">
 				<view class="name">邀请好友注册</view>
 				<view class="value">完成邀请，可获得￥{{dataInfo.registAmount}}/人</view>
 			</view>
-			<view class="invitationBtn">邀请好友</view>
+			<view class="invitationBtn" @click="toShareCard(1)">邀请好友</view>
 		</view>
 		
 		<backHome></backHome>
@@ -217,11 +217,16 @@
 				return parseFloat(val / 10000).toFixed(2) + '万'
 			},
 			
-			toShareCard(item,type=2){
-				uni.navigateTo({
-					url:'../shareCardPage/shareCardPage?page='+item.xcxPage+"&projectId="+item.projectId+"&type="+type
-				})
-			},
+			toShareCard(type){
+				if(getApp().globalData.userId){
+					let href = location.origin+location.pathname;
+					uni.navigateTo({
+						url:'../shareCardPage/shareCardPage?page='+href+"&projectId="+this.projectId+"&type="+type
+					})
+				}else{
+					uni.$emit('unLogin')
+				}
+			},
 			
 			backAction() {
 				uni.navigateBack({

pages/ownerCertification/ownerCertification.vue

@@ -343,7 +343,7 @@
 					}
 				})
 				if (ret.data.success) {
-					uni.navigateTo({
+					uni.redirectTo({
 						url:'../certificationResultPage/certificationResultPage'
 					})
 				}else{