解决冲突

pages.json

@@ -207,15 +207,25 @@
 						"navigationBarTextStyle": "black"
 					}
 				},
-				{
-                    "path" : "messageList",
+				{
+                    "path" : "messageList",
                     "style" :{
 						"navigationBarTitleText": "消息",
 						"navigationBarBackgroundColor": "#2671E2",
 						"navigationBarTextStyle": "white"
 					}
-                
-                }
+                
+                }
+                ,{
+                    "path" : "selectBuilding",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "切换项目",
+					"navigationBarBackgroundColor": "#FFFFFF",
+					"navigationBarTextStyle": "black"
+                }
+                
+                }
             ]
 		},
 		{
@@ -321,7 +331,7 @@
 				{
 					"path": "Piabodata/selectGroup",
 					"style": {
-						"navigationBarTitleText": "选择楼盘",
+						"navigationBarTitleText": "选择项目",
 						"navigationBarBackgroundColor": "#FFFFFF",
 						"navigationBarTextStyle": "black"
 					}

pages/center/Piabodata/Customerportrait/Receivedetailabout.vue

@@ -213,7 +213,7 @@
 					<view style="width: 75%;color: #333333;font-size: 26rpx;">{{userlistobj.agentName}}</view>
 				</view>
 				<view style="width: 96%;height: 26rpx;display: flex;margin: 0 auto; margin-top: 40rpx;align-items: center;">
-					<view style="width: 25%;color: #666666;font-size: 26rpx;">意向楼盘</view>
+					<view style="width: 25%;color: #666666;font-size: 26rpx;">意向项目</view>
 					<view style="width: 75%;color: #333333;font-size: 26rpx;">{{userlistobj.projectName}}</view>
 				</view>
 				<view style="width: 96%;height: 26rpx;display: flex;margin: 0 auto; margin-top: 40rpx;align-items: center;">

pages/center/Piabodata/Customerportrait/Receivingrecords.vue

@@ -151,7 +151,7 @@ export default {
 			starttime:'',//开始时间
 			endoftime:'',//结束时间
 			keywordsId:'',//选中语义词id
-			houseId:'',//楼盘id
+			houseId:'',//项目id
 			semanticlist:[],//语义词集合
 			name:'',
 			agentName:'',

pages/center/Piabodata/Employeesstatistics.vue

@@ -166,7 +166,7 @@
 			return {
 				activeTotal: 4,
 				totalTimeShow: false,
-				// 楼盘id
+				// 项目id
 				houseId:'',		
 				lastEndDate:'',
 				lastStartDate:'',
@@ -197,7 +197,7 @@
 			};
 		},
 		onLoad() {
-			// 获取楼盘id
+			// 获取项目id
 			this.houseId = uni.getStorageSync('buildingID').id;
 			this.init()
 		},

pages/center/Piabodata/Groupcontrast.vue

@@ -22,7 +22,7 @@
 				<view class="title1">接待量（TOP10）</view>
 			</view>
 			<view class="hejibox">
-				<view class="heji">楼盘：{{newTeam1||0}}</view>
+				<view class="heji">项目：{{newTeam1||0}}</view>
 				<view class="heji">均值：{{newAvg1||0}}</view>
 			</view>
 			<view class="jindu">
@@ -47,7 +47,7 @@
 				<view class="title1">接待时长（TOP10）</view>
 			</view>
 			<view class="hejibox">
-				<view class="heji">楼盘：{{newTeam2||0}}</view>
+				<view class="heji">项目：{{newTeam2||0}}</view>
 				<view class="heji">均值：{{newAvg2||0}}</view>
 			</view>
 			<view class="jindu">
@@ -80,7 +80,7 @@
 			</view>
 			
 			<view class="hejibox">
-				<view class="heji">楼盘：{{newTeam3||0}}</view>
+				<view class="heji">项目：{{newTeam3||0}}</view>
 				<view class="heji">均值：{{newAvg3||0}}%</view>
 			</view>
 			<view class="jindu">
@@ -113,7 +113,7 @@
 			</view>
 			
 <!-- 			<view class="hejibox">
-				<view class="heji">楼盘：{{newTeam4||0}}</view>
+				<view class="heji">项目：{{newTeam4||0}}</view>
 				<view class="heji">均值：{{newAvg4||0}}</view>
 			</view> -->
 			<view class="jindu">
@@ -137,7 +137,7 @@
 			<view class="title" style="padding-right: 30rpx;">
 				<view class="title1" style="flex: 1;">销讲能力</view>
 <!-- 				<view class="title2" style="flex: 1;justify-content: flex-end;" @click="Groupcontrast">
-					<view class="title2-che">楼盘
+					<view class="title2-che">项目
 						<image class="righttochoose" src="../../../static/images/righttochoose.png" mode=""></image>
 					</view>
 				</view> -->
@@ -148,7 +148,7 @@
 				</view>
 			</view>
 <!-- 			<view class="hejibox">
-				<view class="heji">楼盘：50</view>
+				<view class="heji">项目：50</view>
 				<view class="heji">均值：25</view>
 			</view> -->
 			<view class="uchaserbox">
@@ -193,7 +193,7 @@
 			<view class="title" style="padding-right: 30rpx;">
 				<view class="title1" style="flex: 1;">违禁能力（TOP10）</view>
 				<view class="title2" style="flex: 1;justify-content: flex-end;">
-					<view class="title2-che">楼盘
+					<view class="title2-che">项目
 						<image class="righttochoose" src="../../../static/images/righttochoose.png" mode=""></image>
 					</view>
 				</view>
@@ -214,7 +214,7 @@
 		</view> -->
 		
 		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
-		<!-- 选择楼盘 -->
+		<!-- 选择项目 -->
 		<u-select v-model="staffShow" :list="staffList" @confirm="staffSelectCallback" :default-value='selindex'></u-select>
 	</view>
 </template>
@@ -230,7 +230,7 @@
 				activeTotal2: 0,
 				bocindex:0,
 				totalTimeShow: false,
-				// 楼盘id
+				// 项目id
 				houseId:'',
 				staffShow:false,
 				staffList:[],

pages/center/Piabodata/StaffAnalysis.vue

@@ -151,7 +151,7 @@
 				totalTimeShow: false,
 				activeTotal:4,
 				activeTotal2:1,
-				// 楼盘id
+				// 项目id
 				houseId:'',
 				staffList:[],
 				staffList1:[],
@@ -236,7 +236,7 @@
 		},
 		
 		onLoad: function(options) {
-				// 获取楼盘id
+				// 获取项目id
 				this.houseId = uni.getStorageSync('buildingID').id;
 				// this.buildingname = uni.getStorageSync('buildingID').name;
 				// 请求接口获取所有置业顾问员工的列表

pages/center/Piabodata/Theteamcompared.vue

@@ -282,7 +282,7 @@
 			<view class="title" style="padding-right: 30rpx;">
 				<view class="title1" style="flex: 1;">违禁能力（TOP10）</view>
 				<view class="title2" style="flex: 1;justify-content: flex-end;">
-					<view class="title2-che">楼盘
+					<view class="title2-che">项目
 						<image class="righttochoose" src="../../../static/images/righttochoose.png" mode=""></image>
 					</view>
 				</view>
@@ -328,7 +328,7 @@
 				bocindex:0,
 				timepickpickisshow:false,
 				totalTimeShow: false,
-				// 楼盘id
+				// 项目id
 				houseId:'',
 				staffList:[],
 				staffList1:[],
@@ -464,7 +464,7 @@
 				// 获取销奖能力
 				that.getPowerList()
 			})
-			// 获取楼盘id
+			// 获取项目id
 			this.houseId = uni.getStorageSync('buildingID').id;
 			// this.buildingname = uni.getStorageSync('buildingID').name;
 			// 请求接口获取所有置业顾问员工的列表

pages/center/Piabodata/index.vue

@@ -318,7 +318,7 @@
 			};
 		},
 		onShow() {
-			// 获取楼盘id
+			// 获取项目id
 			this.houseId = uni.getStorageSync('buildingID').id;
 			// 获取数据看板
 

pages/center/Piabodata/selectGroup.vue

@@ -38,7 +38,7 @@
 			}
 		},
 		onLoad(e) {
-			// 获取楼盘id
+			// 获取项目id
 			// console.log(e)
 			this.ids=e.ids
 			// this.houseId = uni.getStorageSync('buildingID').id;

pages/center/Piabodata/selectTeam.vue

@@ -38,7 +38,7 @@
 			}
 		},
 		onLoad(e) {
-			// 获取楼盘id
+			// 获取项目id
 			// console.log(e)
 			this.ids=e.ids
 			this.houseId = uni.getStorageSync('buildingID').id;

pages/center/consumer/edit.vue

@@ -176,7 +176,7 @@
 				],
 				allList:[],
 				dataCode:'',
-				projectId: '', // 楼盘ID
+				projectId: '', // 项目ID
 			}
 		},
 		onLoad(e) {

pages/index/index.vue

@@ -4,9 +4,9 @@
 			<view class="Switching1">
 				<image class="Switching1-img" src="../../static/images/building.png" mode=""></image>
 			</view>
-			<view class="Switching2">楼盘：</view>
+			<view class="Switching2">项目：</view>
 			<view class="Switching3">{{buildingname}}</view>
-			<view class="Switching4" v-if="buildingishow" @click="piskbuilding()">切换楼盘</view>
+			<view class="Switching4" v-if="buildingishow" @click="piskbuilding()">切换项目</view>
 		</view>
 
 		<view class="title" style="margin-top: 30rpx;" v-if="Myworkcard">我的工牌</view>
@@ -15,8 +15,8 @@
 				<view class="Workcard-box">
 					<view class="Workcardimg">
 						<view class="Workcardimg1">
-							<view v-if="percentage>20" class="bar" :style="{width : percentage + '%' }"></view>
-							<view v-if="percentage<20" class="bar1" :style="{width : percentage + '%' }"></view>
+							<view v-if="percentage>20" class="bar" :style="{width : percentage + '%' }"></view>
+							<view v-if="percentage<20" class="bar1" :style="{width : percentage + '%' }"></view>
 						</view>
 					</view>
 					<view class="Workcardtext">电量：{{percentage}}%</view>
@@ -210,7 +210,7 @@
 		</view>
 
 
-		<!-- 楼盘切换 -->
+		<!-- 项目切换 -->
 		<view v-if="Showhiddenunits">
 			<u-select :mask-close-able="false" v-model="Showhiddenunits" mode="single-column" :list="lpanlist"
 				@cancel="cancel" @confirm="confirm"></u-select>
@@ -226,10 +226,10 @@
 			return {
 				userInfo: {},
 				Showhiddenunits: false,
-				lpanlist: [], //楼盘列表
-				buildingname: '', //楼盘名
-				buildingID: '', //楼盘id
-				buildingishow: false, //是否选择楼盘
+				lpanlist: [], //项目列表
+				buildingname: '', //项目名
+				buildingID: '', //项目id
+				buildingishow: false, //是否选择项目
 				Myworkcard: false,
 				percentage: '', //设备电量
 				Whetheroffline: false, //是否离线
@@ -462,11 +462,14 @@
 					}
 				})
 			},
-			//选择楼盘弹框
+			//选择项目弹框
 			piskbuilding() {
-				this.Showhiddenunits = true;
+				// this.Showhiddenunits = true;
+				uni.navigateTo({
+					url:"../mine/selectBuilding"
+				})
 			},
-			// 楼盘选择确认
+			// 项目选择确认
 			confirm(e) {
 				this.buildingname = e[0].label;
 				this.buildingID = e[0].value;
@@ -474,14 +477,14 @@
 					id: e[0].value,
 					name: e[0].label
 				}
-				uni.setStorageSync("buildingID", lopan); //楼盘id写入缓存
+				uni.setStorageSync("buildingID", lopan); //项目id写入缓存
 				this.initworkThisWeek()
 				this.initrealTimeStatistics()
 				this.initequipment()
 				this.iniodianloang()
 				
 			},
-			// 楼盘选择取消
+			// 项目选择取消
 			cancel() {
 				this.Showhiddenunits = false;
 			},

pages/login/index.vue

@@ -138,7 +138,7 @@
 					}
 					uni.setStorageSync("fendianindex", 0); //写入缓存
 					uni.setStorageSync("weapp_session_userInfo_data", data); //写入缓存
-					uni.setStorageSync("buildingID", lopan); //楼盘id写入缓存
+					uni.setStorageSync("buildingID", lopan); //项目id写入缓存
 					uni.switchTab({
 						url: '/pages/index/index'
 					});

pages/login/yinzhongmalogin.vue

@@ -164,7 +164,7 @@
 					}
 					uni.setStorageSync("fendianindex", 0); //写入缓存
 					uni.setStorageSync("weapp_session_userInfo_data", data); //写入缓存
-					uni.setStorageSync("buildingID", lopan); //楼盘id写入缓存
+					uni.setStorageSync("buildingID", lopan); //项目id写入缓存
 					uni.switchTab({
 						url: '/pages/index/index'
 					});

pages/mine/details2.vue

@@ -260,7 +260,7 @@
 				</view>
 				<view
 					style="width: 96%;height: 26rpx;display: flex;margin: 0 auto; margin-top: 40rpx;align-items: center;">
-					<view style="width: 25%;color: #666666;font-size: 26rpx;">意向楼盘</view>
+					<view style="width: 25%;color: #666666;font-size: 26rpx;">意向项目</view>
 					<view style="width: 75%;color: #333333;font-size: 26rpx;">{{userlistobj.projectName}}</view>
 				</view>
 				<view

pages/mine/detailsNew.vue

@@ -226,7 +226,7 @@
 					afterseek:false
 				},
 				customerId:"",//客户id
-				buildingID:'',//楼盘id
+				buildingID:'',//项目id
 				debug:true,
 				dialogList:[],//转写内容区域
 				isshowFile:false,//文件切换状态

pages/mine/selectBuilding.vue

@@ -0,0 +1,77 @@
+<template>
+	<view class="selectBuilding">
+		<view class="searchStyle">
+			<u-search placeholder="输入项目名称" v-model="search" @search="s" @custom="s"></u-search>
+		</view>
+		<view class="searchResultStyle">
+			<view class="searchList" v-for="(item,index) in list" :key="index" @click="okSelect(item.id,item.propertyName)">
+				{{item.propertyName}}
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	var config = require("@/config");
+	export default {
+		name: "selectBuilding",
+		data() {
+			return {
+				search: "",
+				list: [],
+			};
+		},
+		methods:{
+			s(e){
+				this.init(e)
+			},
+			okSelect(id,name){
+				let lopan = {
+					id,
+					name
+				}
+				uni.setStorageSync("buildingID", lopan);
+				uni.navigateBack({
+					delta:-1
+				})
+			},
+			init(e){
+				let data = {houseName:decodeURI(e)||''}
+				uni.request({
+					url: config.service.getUser,
+					method: "GET",
+					data,
+					header: {
+						'content-type': 'application/json',
+						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
+					},
+					success: (res) => {
+						console.log(res)
+						this.list = res.data.data.zkProperties
+					}
+				})
+			}
+		},
+		onLoad() {
+			this.init("")
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.selectBuilding {
+		.searchStyle {
+			padding: 20rpx;
+		}
+
+		.searchResultStyle {
+			padding: 0 30rpx;
+			.searchList{
+				border-bottom: 1rpx solid #E0E0E0;
+				padding: 30rpx 0;
+				font-size: 30rpx;
+			}
+		}
+	}
+</style>