From bcef87c99ed74142e1fa0f57d6b797e8f755a7f0 Mon Sep 17 00:00:00 2001
From: jyt <1592211625@qq.com>
Date: Wed, 23 Feb 2022 14:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/center/consumer/consumerDetail.vue | 15 ++++++++++-----
 pages/center/consumer/index.vue          |  2 +-
 pages/center/prohibited/index.vue        |  2 +-
 pages/center/records/index.vue           |  9 +++++----
 pages/index/consumer/index.vue           | 11 ++++++-----
 pages/index/customer.vue                 | 17 +++++++++++++----
 pages/index/index.vue                    | 24 ++++++++++++------------
 pages/index/learning.vue                 |  4 ++--
 8 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue
index 7ea0133..efaf757 100644
--- a/pages/center/consumer/consumerDetail.vue
+++ b/pages/center/consumer/consumerDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
 		<view class="content">
-			<view class="content-tips" @click="goedit()">
+			<view class="content-tips">
 				<view class="content-first">
 					<view class="left">
 						<view v-if="customerInfo.level.length==0"></view>
@@ -12,7 +12,7 @@
 						
 						
 						<view class="test">{{customerInfo.name || '--'}}</view>
-						<view class="edit">
+						<view class="edit" @click="goedit()" v-if="isHavePermission">
 							<image class="screen-sel-img" src="../../../static/images/edit.png" mode=""></image>
 						</view>
 					</view>
@@ -209,7 +209,7 @@
 		</view>
 		
 		<view class="pon-foot" v-if="buttonisshow">
-			<view class="foot-tab" @click="goRemind">添加提醒</view>
+			<!-- <view class="foot-tab" @click="goRemind">添加提醒</view> -->
 			<!-- <view class="foot-tab">拨打电话</view> -->
 			<view class="foot-tab" @click="followRecordAdd()">写跟进</view>
 		</view>
@@ -245,7 +245,8 @@
 				ratelist:[],
 				fllowList:[],
 				userInfo:{},
-				buttonisshow:false
+				buttonisshow:false,
+				isHavePermission:false
 			}
 		},
 		onLoad(options) {
@@ -260,6 +261,10 @@
 				}
 			this.getCustomerInfo()
 			this.tabtimetap(0)
+			let newmenulist = uni.getStorageSync('weapp_session_Menu_data');
+			if(newmenulist.khgl_bj==true || newmenulist.khgl_gj==true){
+				this.isHavePermission = true
+			}
 		},
 		methods:{
 			// 获取到访记录
@@ -379,7 +384,7 @@
 			// 去编辑
 			goedit(){
 				let newmenulist= uni.getStorageSync('weapp_session_Menu_data');
-				if(newmenulist.khgl_bj==true){
+				if(newmenulist.khgl_bj==true || newmenulist.khgl_gj){
 					uni.navigateTo({
 						url:`/pages/center/consumer/edit?id=${this.customerId}`
 					})
diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue
index 16ed7bb..d0d856a 100644
--- a/pages/center/consumer/index.vue
+++ b/pages/center/consumer/index.vue
@@ -195,7 +195,7 @@
 		data(){
 			return{
 				orderBylist:[
-					{label:'全部',value:'0'},
+					// {label:'全部',value:'0'},
 					{label:'创建时间倒序',value:'1'},
 					{label:'创建时间正序',value:'2'},
 					{label:'接待时间倒序',value:'3'},
diff --git a/pages/center/prohibited/index.vue b/pages/center/prohibited/index.vue
index 0f37af9..e6db5a2 100644
--- a/pages/center/prohibited/index.vue
+++ b/pages/center/prohibited/index.vue
@@ -68,7 +68,7 @@
 		data(){
 			return{
 				orderBylist:[
-					{label:'全部',value:'0'},
+					// {label:'全部',value:'0'},
 					{label:'创建时间倒序',value:'1'},
 					{label:'创建时间正序',value:'2'},
 					{label:'接待时间倒序',value:'3'},
diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue
index 76720f0..6bfc8e5 100644
--- a/pages/center/records/index.vue
+++ b/pages/center/records/index.vue
@@ -211,10 +211,11 @@
 	export default {
 		data() {
 			return {
-				orderBylist: [{
-						label: '全部',
-						value: '0'
-					},
+				orderBylist: [
+					// {
+					// 	label: '全部',
+					// 	value: '0'
+					// },
 					{
 						label: '创建时间倒序',
 						value: '1'
diff --git a/pages/index/consumer/index.vue b/pages/index/consumer/index.vue
index 16411f5..a589590 100644
--- a/pages/index/consumer/index.vue
+++ b/pages/index/consumer/index.vue
@@ -239,10 +239,11 @@
 				current: 1,
 				tabbarList: tabbarList,
 				//--- end --- tabbar配置项
-				orderBylist: [{
+				orderBylist: [
+					/*{
 						label: '全部',
 						value: '0'
-					},
+					},*/
 					{
 						label: '创建时间倒序',
 						value: '1'
@@ -317,7 +318,6 @@
 		},
 		onLoad(options) {
 			this.isnorefresh = 'refresh';
-
 		},
 		onShow() {
 			let newmenulist = uni.getStorageSync('weapp_session_Menu_data');
@@ -327,11 +327,12 @@
 				this.buildingID = uni.getStorageSync('buildingID').id;
 				this.nextPage = 1;
 				this.recordList = []
-				this.getMyCustom()
+				// this.getMyCustom()
 				this.getFreeList()
 				this.getfindKeywordsList()
 				this.getFromSource();
-				this.isnorefresh = '';
+				// this.isnorefresh = '';
+				this.getMyCustom()
 			}
 		},
 		onReachBottom() {
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index b390764..c296f80 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -63,16 +63,19 @@
 			<view class="title">
 				<view class="zuo">
 					<view class="zuoimg">顾</view>
-					<view class="zuoname">{{item.agentName}}</view>
+					<view class="zuoname">{{item.agentName || '--'}}</view>
 				</view>
-				<view class="cen">
-					自动结束 <u-count-down :timestamp="timestamp(item.createTime)" color="#E7483C"></u-count-down>
+				<view class="cen" v-if="timestamp(item.createTime)<30">
+					<view v-if="item.status!=0">
+						自动结束 <u-count-down :timestamp="timestamp(item.createTime)" color="#E7483C"></u-count-down>
+					</view>
 				</view>
 				<view class="you">
 					<!-- <view class="youimg1" v-if="item.status!=0"></view>
 					<view class="youimg1-1" v-if="item.status==0"></view>
 					<view class="youtext">{{item.status==0?"排队中":item.status==1?"接待中":"已完成"}}</view> -->
 					<view class="" v-if="item.status!=0" style="display: flex;">
+						<block v-if="item.imei!=null || item.imei==''">
 						<!-- 接待中 -->
 						<view class="">
 							<!-- 工牌标示 -->
@@ -104,6 +107,7 @@
 									src="../../static/images/cus4.png" mode=""></image>
 							</view>
 						</view>
+						</block>
 					</view>
 					<view class="youtext" v-else>
 						<!--排队中  -->
@@ -111,7 +115,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="centerbox" v-if="item.status!=0">
+			<view class="centerbox">
 			<view class="content-sec">
 				<view class="left">
 					<view class="adviser">客</view>
@@ -190,6 +194,11 @@
 					return totalTime - nowTime
 				}
 			}
+			// judgeHalfAnHour(){
+			// 	return (e)=>{
+					
+			// 	}
+			// }
 		},
 		onShow() {
 			this.buildingID = uni.getStorageSync('buildingID').id;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 72cbaa2..5e8bd75 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -114,6 +114,10 @@
 		<view class="title" v-if="permissions.shishinum">今日工作</view>
 		<view class="real-timebox" v-if="permissions.shishinum">
 			<view class="timebox">
+				<view class="real" @click="tapjumpreception('1')">
+					<view class="realnum">{{realtimeobj.fraction || 0}}%</view>
+					<view class="realtext">平均执行率</view>
+				</view>
 				<view class="real" @click="tapjumpreception('1')">
 					<view class="realnum">{{realtimeobj.receptionCount || 0}}</view>
 					<view class="realtext">接待量</view>
@@ -126,20 +130,16 @@
 					<view class="realnum">{{realtimeobj.activeCustomer|| 0}}</view>
 					<view class="realtext">有效接待</view>
 				</view>
-				<view class="real" @click="tapjumpreception('1')">
-					<view class="realnum">{{realtimeobj.fraction || 0}}%</view>
-					<view class="realtext">平均执行率</view>
-				</view>
 			</view>
 			<view class="timebox">
-				<view class="real" @click="tapjumpreception('4')">
-					<view class="realnum">{{realtimeobj.tagCustomer || 0}}</view>
-					<view class="realtext">未标顾问</view>
-				</view>
 				<view class="real" @click="tapjumpreception('1')">
 					<view class="realnum">{{realtimeobj.avgDuration|| 0}}</view>
 					<view class="realtext">平均接待时长</view>
 				</view>
+				<view class="real" @click="tapjumpreception('4')">
+					<view class="realnum">{{realtimeobj.tagCustomer || 0}}</view>
+					<view class="realtext">未标顾问</view>
+				</view>
 				<view class="real">
 					<view @click="prohibitedtap(1)" v-if="methodsisshow==true" class="realnum" style="color: red;">
 						{{realtimeobj.prohibitedCustomer || 0}}</view>
@@ -171,6 +171,10 @@
 		</view>
 		<view class="real-timebox" v-if="permissions.jileinum">
 			<view class="timebox">
+				<view class="real" @click="tapjumpreception('3')">
+					<view class="realnum">{{Thisweekobj.fraction || 0}}%</view>
+					<view class="realtext">平均执行率</view>
+				</view>
 				<view class="real" @click="tapjumpreception('3')">
 					<view class="realnum">{{Thisweekobj.receptionCount || 0}}</view>
 					<view class="realtext">接待量</view>
@@ -179,10 +183,6 @@
 					<view class="realnum">{{Thisweekobj.activeCustomer|| 0}}</view>
 					<view class="realtext">有效接待</view>
 				</view>
-				<view class="real" @click="tapjumpreception('3')">
-					<view class="realnum">{{Thisweekobj.fraction || 0}}%</view>
-					<view class="realtext">平均执行率</view>
-				</view>
 			</view>
 			<view class="timebox">
 				<view class="real" @click="tapjumpreception('3')">
diff --git a/pages/index/learning.vue b/pages/index/learning.vue
index 47d6bcf..c7eff44 100644
--- a/pages/index/learning.vue
+++ b/pages/index/learning.vue
@@ -102,13 +102,13 @@
 											<image class="Piabodata-img1" src="../../static/images/img/message.png"
 												mode=""></image>
 											<!-- 热度 -->
-											{{item.commentNum || 0 }}
+											{{item.commentCount || 0 }}
 										</view>
 										<view class="icon">
 											<image class="Piabodata-img1" src="../../static/images/img/hand.png"
 												mode=""></image>
 											<!-- 点赞数 -->
-											{{item.likeNum || 0 }}
+											{{item.likeCount || 0 }}
 										</view>
 									</view>
 								</view>