解决冲突

pages.json

@@ -34,7 +34,8 @@
 			"style": {
 				"navigationBarTitleText": "接待",
 				"navigationBarBackgroundColor": "#2671E2",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh":true
 			}
 		}, {
 			"path": "pages/index/learning",
@@ -192,7 +193,8 @@
 					"style": {
 						"navigationBarTitleText": "值班顾问",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh":true
 					}
 				},
 				{
@@ -200,7 +202,8 @@
 					"style": {
 						"navigationBarTitleText": "设备管理",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": true
 					}
 				}
 			    ,{
@@ -233,6 +236,16 @@
                 }
                 
                 }
+                ,{
+                    "path" : "selectBuilding",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "切换楼盘",
+				"navigationBarBackgroundColor": "#2671E2",
+				"navigationBarTextStyle": "white"
+                }
+                
+                }
             ]
 		},
 		{
@@ -306,7 +319,8 @@
 					"style": {
 						"navigationBarTitleText": "销讲数据",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh":true
 					}
 				},
 				{
@@ -314,7 +328,8 @@
 					"style": {
 						"navigationBarTitleText": "集团对比",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh":true
 					}
 				},
 				{
@@ -322,7 +337,8 @@
 					"style": {
 						"navigationBarTitleText": "团队对比",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh":true
 					}
 				},
 				{
@@ -346,7 +362,8 @@
 					"style": {
 						"navigationBarTitleText": "客户画像",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh":true
 					}
 				},
 				{
@@ -354,7 +371,8 @@
 					"style": {
 						"navigationBarTitleText": "趋势分析",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh":true
 					}
 				},
 				{
@@ -362,7 +380,8 @@
 					"style": {
 						"navigationBarTitleText": "员工分析",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh":true
 					}
 				},
 
@@ -395,7 +414,8 @@
 					"style": {
 						"navigationBarTitleText": "顾问排名",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh":true
 					}
 				},
 
@@ -404,7 +424,8 @@
 					"style": {
 						"navigationBarTitleText": "接待记录",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
@@ -420,7 +441,8 @@
 					"style": {
 						"navigationBarTitleText": "违禁记录",
 						"navigationBarBackgroundColor": "#FFFFFF",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": true
 					}
 				},
 				{

pages/center/Piabodata/Employeesstatistics.vue

@@ -201,6 +201,12 @@
 			this.houseId = uni.getStorageSync('buildingID').id;
 			this.init()
 		},
+		onPullDownRefresh(){
+			this.init()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: {
 			init(){
 				this.newlisttabinfo1={

pages/center/Piabodata/Groupcontrast.vue

@@ -298,6 +298,12 @@
 			this.getSectionList()
 			
 			
+		},
+		onPullDownRefresh(){
+			this.getSectionList()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		methods: {
 			// 获取部门列表

pages/center/Piabodata/StaffAnalysis.vue

@@ -243,6 +243,12 @@
 				// 请求接口获取所有置业顾问员工的列表
 				this.getStaffList()
 		},
+		onPullDownRefresh(){
+			this.getStaffList()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: {
 			//是否对比
 			checkboxChange(){

pages/center/Piabodata/Theteamcompared.vue

@@ -370,6 +370,12 @@
 			this.getSectionList()
 
 		},
+		onPullDownRefresh(){
+			this.getSectionList()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: {
 			//是否对比
 			checkboxChange() {

pages/center/Piabodata/TrendAnalysis.vue

@@ -334,6 +334,12 @@
 			this.pamect.houseId = uni.getStorageSync('buildingID').id;
 			this.init()
 		},
+		onPullDownRefresh(){
+			this.init()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		watch: {
 			Showhiddenunits(newValue, oldValue) {
 				this.showCanvas = !newValue

pages/center/Piabodata/Userinsightinto.vue

@@ -113,6 +113,12 @@
 			this.buildingID=uni.getStorageSync('buildingID').id;
 			this.gitinit()
 		},
+		onPullDownRefresh(){
+			this.gitinit()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: {
 			anclick(i){
 				console.log(i)

pages/center/Piabodata/index.vue

@@ -362,6 +362,23 @@
 			// 获取维度
 			this.getindexZxl()
 		},
+		onPullDownRefresh(){
+			// 获取员工
+			this.getStaffList()
+			// 获取团队
+			this.getSectionList()
+			// 获取团队是否显示权限
+			
+			// 获取简报
+			this.getReport()
+			// 获取接待趋势
+			this.getRtrent()
+			// 获取维度
+			this.getindexZxl()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: {
 
 

pages/center/prohibited/index.vue

@@ -150,6 +150,12 @@
 				this.isnorefresh = '';
 			}
 		},
+		onPullDownRefresh(){
+			this.getMyCustom()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onReachBottom() {
 			if (this.totalRecord == this.nextPage) {
 				uni.showToast({

pages/center/records/index.vue

@@ -149,7 +149,13 @@
 						到访次数
 					</view>
 					<view class="screen-record-tab">
-						<view :class="[screen.visitRecord==1?'screen-record-chose':'screen-record-nochose']"
+						<block v-for="(item,index) in visitList" :key="index">
+							<view :class="[item.isShow?'screen-record-chose':'screen-record-nochose']"
+								@click="choice(index,item.value)">
+								{{item.label}}
+							</view>
+						</block>
+						<!-- <view :class="[screen.visitRecord==1?'screen-record-chose':'screen-record-nochose']"
 							@click="recordclick(1)">
 							首次到访
 						</view>
@@ -164,7 +170,7 @@
 						<view :class="[screen.visitRecord==4?'screen-record-chose':'screen-record-nochose']"
 							@click="recordclick(4)">
 							3次以上
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="screen-foot">
@@ -266,7 +272,7 @@
 					agentId: '', //顾问id
 					record: '0',
 					markAdvisor: null,
-					visitRecord: null,
+					visitRecord: [],
 					validInvalid: null
 				},
 				freeList: [], //顾问
@@ -287,6 +293,23 @@
 				startFilterTime: '接待时间', // s筛选状态展示
 				receptionDuration: '接待时长', // 筛选状态展示
 				sortText: '排序', // 
+				visitList: [{
+					label: '首次到访',
+					value: 1,
+					isShow: false,
+				}, {
+					label: '2次到访',
+					value: 2,
+					isShow: false,
+				}, {
+					label: '3次到访',
+					value: 3,
+					isShow: false,
+				}, {
+					label: '3次以上',
+					value: 4,
+					isShow: false,
+				}, ]
 			}
 		},
 		onLoad(options) {
@@ -324,6 +347,12 @@
 				this.isnorefresh = '';
 			}
 		},
+		onPullDownRefresh(){
+			this.getMyCustom()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onReachBottom() {
 			if (this.totalRecord == this.nextPage) {
 				uni.showToast({
@@ -482,7 +511,7 @@
 						time: 1,
 						staDate: this.staTime,
 						endDate: this.endtime,
-						visitRecord: this.screen.visitRecord,
+						visitRecords: this.screen.visitRecord.join(","),
 						markAdvisor: this.screen.markAdvisor,
 						dateType: dateType,
 						recDurationInterval: recDurationInterval,
@@ -539,6 +568,19 @@
 				this.recordList = [];
 				this.getMyCustom();
 			},
+			choice(index,e) {
+				if (this.visitList[index].isShow == true) {
+					this.visitList[index].isShow = false;
+					for (var i = 0; i < this.screen.visitRecord.length; i++) {
+						if (this.screen.visitRecord[i] === e) {
+							this.screen.visitRecord.splice(i, 1);
+						}
+					}
+				} else {
+					this.visitList[index].isShow = true;
+					this.screen.visitRecord.push(e)
+				}
+			},
 			recordclick(i) {
 				if (this.screen.visitRecord == i) {
 					this.screen.visitRecord = null

pages/index/customer.vue

@@ -215,6 +215,13 @@
 			this.init()
 			this.queryHaveDept()
 		},
+		
+		onPullDownRefresh(){
+			this.init()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: {
 			reshCustom() {
 				this.init()

pages/index/index.vue

@@ -747,7 +747,10 @@
 			},
 			//选择楼盘弹框
 			piskbuilding() {
-				this.Showhiddenunits = true;
+				// this.Showhiddenunits = true;
+				uni.navigateTo({
+					url:"../mine/selectBuilding"
+				})
 			},
 			// 楼盘选择确认
 			confirm(e) {

pages/mine/consultanonduty/index.vue

@@ -66,6 +66,13 @@
 			this.changeAgentListShow()
 			this.changePausedAgentListShow()
 		},
+		onPullDownRefresh(){
+			this.changeAgentListShow()
+			this.changePausedAgentListShow()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		computed: {
 			activeAgentList() {
 				return this.activeTotal == 1 ? this.agentList : this.pausedAgentList

pages/mine/equipment/index.vue

@@ -122,6 +122,12 @@
 			this.pageNum +=1;
 			this.init()
 		},
+		onPullDownRefresh(){
+			this.init()
+			setTimeout(function () {
+			    uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onLoad(options) {
 			if(options.active){
 				this.activeClass=options.active

pages/mine/selectBuilding.vue

@@ -0,0 +1,96 @@
+<template>
+	<view class="selectBuilding">
+		<view class="searchStyle">
+			<u-search placeholder="输入楼盘名称" v-model="search" :show-action="false"></u-search>
+		</view>
+		<view class="searchResultStyle">
+			<u-radio-group v-model="result" @change="radioGroupChange">
+				<u-radio v-for="(item, index) in list" :key="index" :name="item.id+'-'+item.propertyName"  label-size="34">
+					{{item.propertyName}}
+				</u-radio>
+			</u-radio-group>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	var config = require("@/config");
+	export default {
+		name: "selectBuilding",
+		data() {
+			return {
+				search: "",
+				list: [],
+				result: ""
+			};
+		},
+		watch:{
+			search(newState){
+				this.init(newState)
+			}
+		},
+		methods:{
+			radioGroupChange(e){
+				console.log()
+				let lopan = {
+					id: e.split('-')[0],
+					name: e.split('-')[1]
+				}
+				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',
+						'Authorization': 'Bearer ' + uni.getStorageSync('weapp_session_login_data').token
+					},
+					success: (res) => {
+						this.list = res.data.data.houseList
+					}
+				})
+			}
+		},
+		onLoad() {
+			this.init("")
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.selectBuilding {
+		background: #dedede;
+
+		.searchStyle {
+			padding: 20rpx;
+		}
+
+		.searchResultStyle {
+			/deep/ .u-radio-group {
+				display: flex;
+				flex-direction: column;
+			}
+
+			/deep/ .u-radio {
+				display: flex;
+				flex-direction: row-reverse;
+				width: 100% !important;
+				justify-content: space-between;
+				background: #fff;
+				box-shadow: 0px 4px 5px 3px #ccc;
+				margin: 15rpx 0;
+				padding: 20rpx;
+			}
+			/deep/ .u-radio__label {
+				width: 100%;
+			}
+		}
+	}
+</style>