Browse Source

解决冲突

test
douzhuo 2 years ago
parent
commit
fb21edeccf
15 changed files with 259 additions and 17 deletions
  1. +34
    -12
      pages.json
  2. +6
    -0
      pages/center/Piabodata/Employeesstatistics.vue
  3. +6
    -0
      pages/center/Piabodata/Groupcontrast.vue
  4. +6
    -0
      pages/center/Piabodata/StaffAnalysis.vue
  5. +6
    -0
      pages/center/Piabodata/Theteamcompared.vue
  6. +6
    -0
      pages/center/Piabodata/TrendAnalysis.vue
  7. +6
    -0
      pages/center/Piabodata/Userinsightinto.vue
  8. +17
    -0
      pages/center/Piabodata/index.vue
  9. +6
    -0
      pages/center/prohibited/index.vue
  10. +46
    -4
      pages/center/records/index.vue
  11. +7
    -0
      pages/index/customer.vue
  12. +4
    -1
      pages/index/index.vue
  13. +7
    -0
      pages/mine/consultanonduty/index.vue
  14. +6
    -0
      pages/mine/equipment/index.vue
  15. +96
    -0
      pages/mine/selectBuilding.vue

+ 34
- 12
pages.json View File

@@ -34,7 +34,8 @@
"style": { "style": {
"navigationBarTitleText": "接待", "navigationBarTitleText": "接待",
"navigationBarBackgroundColor": "#2671E2", "navigationBarBackgroundColor": "#2671E2",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"enablePullDownRefresh":true
} }
}, { }, {
"path": "pages/index/learning", "path": "pages/index/learning",
@@ -192,7 +193,8 @@
"style": { "style": {
"navigationBarTitleText": "值班顾问", "navigationBarTitleText": "值班顾问",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh":true
} }
}, },
{ {
@@ -200,7 +202,8 @@
"style": { "style": {
"navigationBarTitleText": "设备管理", "navigationBarTitleText": "设备管理",
"navigationBarBackgroundColor": "#FFFFFF", "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": { "style": {
"navigationBarTitleText": "销讲数据", "navigationBarTitleText": "销讲数据",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh":true
} }
}, },
{ {
@@ -314,7 +328,8 @@
"style": { "style": {
"navigationBarTitleText": "集团对比", "navigationBarTitleText": "集团对比",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh":true
} }
}, },
{ {
@@ -322,7 +337,8 @@
"style": { "style": {
"navigationBarTitleText": "团队对比", "navigationBarTitleText": "团队对比",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh":true
} }
}, },
{ {
@@ -346,7 +362,8 @@
"style": { "style": {
"navigationBarTitleText": "客户画像", "navigationBarTitleText": "客户画像",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh":true
} }
}, },
{ {
@@ -354,7 +371,8 @@
"style": { "style": {
"navigationBarTitleText": "趋势分析", "navigationBarTitleText": "趋势分析",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh":true
} }
}, },
{ {
@@ -362,7 +380,8 @@
"style": { "style": {
"navigationBarTitleText": "员工分析", "navigationBarTitleText": "员工分析",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh":true
} }
}, },


@@ -395,7 +414,8 @@
"style": { "style": {
"navigationBarTitleText": "顾问排名", "navigationBarTitleText": "顾问排名",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh":true
} }
}, },


@@ -404,7 +424,8 @@
"style": { "style": {
"navigationBarTitleText": "接待记录", "navigationBarTitleText": "接待记录",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh": true
} }
}, },
{ {
@@ -420,7 +441,8 @@
"style": { "style": {
"navigationBarTitleText": "违禁记录", "navigationBarTitleText": "违禁记录",
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "black",
"enablePullDownRefresh": true
} }
}, },
{ {


+ 6
- 0
pages/center/Piabodata/Employeesstatistics.vue View File

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


+ 6
- 0
pages/center/Piabodata/Groupcontrast.vue View File

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


+ 6
- 0
pages/center/Piabodata/StaffAnalysis.vue View File

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


+ 6
- 0
pages/center/Piabodata/Theteamcompared.vue View File

@@ -370,6 +370,12 @@
this.getSectionList() this.getSectionList()


}, },
onPullDownRefresh(){
this.getSectionList()
setTimeout(function () {
uni.stopPullDownRefresh();
}, 1000);
},
methods: { methods: {
//是否对比 //是否对比
checkboxChange() { checkboxChange() {


+ 6
- 0
pages/center/Piabodata/TrendAnalysis.vue View File

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


+ 6
- 0
pages/center/Piabodata/Userinsightinto.vue View File

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


+ 17
- 0
pages/center/Piabodata/index.vue View File

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






+ 6
- 0
pages/center/prohibited/index.vue View File

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


+ 46
- 4
pages/center/records/index.vue View File

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


+ 7
- 0
pages/index/customer.vue View File

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


+ 4
- 1
pages/index/index.vue View File

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


+ 7
- 0
pages/mine/consultanonduty/index.vue View File

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


+ 6
- 0
pages/mine/equipment/index.vue View File

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


+ 96
- 0
pages/mine/selectBuilding.vue View File

@@ -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>

Loading…
Cancel
Save