Merge branch 'wj' of http://git.2weisou.com/liumin/NewZkgj into wj

# Conflicts:
#	utils/domain.js

App.vue

@@ -1,12 +1,99 @@
-<template>
-	<view>
-	</view>
-</template>
 <script>
+	import Vue from 'vue'
 	//app.js
 	var config = require("./config");
 	export default {
-		onLaunch: function(options) {
+		onLaunch(options) {
+			uni.getSystemInfo({
+				success: function(e) {
+					console.log(e, 'adjsakljdklasjdklsakjdslakjd')
+					// #ifdef MP-WEIXIN
+					Vue.prototype.StatusBar = e.statusBarHeight;
+					let custom = wx.getMenuButtonBoundingClientRect();
+					Vue.prototype.Custom = custom;
+					Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
+					Vue.prototype.windowHeight = e.safeArea.height
+					// #endif
+					Vue.mixin({
+						data() {
+							return {
+								StatusBar: Vue.prototype.StatusBar,
+								CustomBar: Vue.prototype.CustomBar,
+								windowHeight: Vue.prototype.windowHeight
+							};
+						},
+
+						methods: {
+							// 时分秒转换为秒
+							TIMEEVENT(e) {
+								var time = e;
+								var len = time.split(':')
+								if (len.length == 3) {
+									var hour = time.split(':')[0];
+									var min = time.split(':')[1];
+									var sec = time.split(':')[2];
+									return Number(hour * 3600) + Number(min * 60) + Number(sec);
+								}
+								if (len.length == 2) {
+									var min = time.split(':')[0];
+									var sec = time.split(':')[1];
+									return Number(min * 60) + Number(sec);
+								}
+								if (len.length == 1) {
+									var sec = time.split(':')[0];
+									return Number(sec);
+								}
+							},
+
+							// 目前使用页面为录音页面
+							SPEAKERSTYLE(index) {
+								let obj = {
+									color: '',
+								}
+								switch (index) {
+									case 1:
+										obj.color = '#60CBEC';
+										break;
+									case 2:
+										obj.color = '#EC8B47';
+										break;
+									case 3:
+										obj.color = '#4F861E';
+										break;
+									case 5:
+										obj.color = '#4980C8';
+										break;
+									case 6:
+										obj.color = '#60CBEC';
+										break;
+									case 7:
+										obj.color = '#EC8B47';
+										break;
+									case 8:
+										obj.color = '#4F861E';
+										break;
+									default:
+										obj.color = '#9F61C8';
+										break;
+								}
+								return obj
+							},
+						},
+
+						filters: {
+							// ASCII码转换 大写字母A是65 演讲人是从1开始所以num+64
+							toCapital(num) {
+								let str = ''
+								if (num) {
+									str = String.fromCharCode(num + 64)
+								}
+								return str
+							}
+						}
+					});
+				}
+			});
+
 			if (wx.canIUse('getUpdateManager')) {
 				const updateManager = wx.getUpdateManager()
 				updateManager.onCheckForUpdate(function(res) {
@@ -49,70 +136,73 @@
 			this.$u.get("/user/getMenu").then(data => {
 				uni.setStorageSync("weapp_session_Menu_data", data)
 			})
-			
-			
+
+
 			wx.setInnerAudioOption({
 				obeyMuteSwitch: false
-			});	
+			});
 		},
 		onShow(options) {
 			const token = uni.getStorageSync("weapp_session_login_data")
 			if (typeof token.token != "string") {
 				console.log("没有")
 				return
-			}else{
+			} else {
 				this.infoscoket()
 			}
 		},
 		onHide() {},
 		methods: {
-			infoscoket(){
-				let pushon=uni.getStorageSync('weapp_session_userInfo_data').loginName
+
+			infoscoket() {
+				let pushon = uni.getStorageSync('weapp_session_userInfo_data').loginName
 				uni.connectSocket({
-				  url: 'wss://hfju.com/ws?uid='+pushon+'_applets',
-				  header: {
-					  "content-type": "application/json",
-					  'Access-Token': uni.getStorageSync('weapp_session_login_data').token
-				  }
+					url: 'wss://hfju.com/ws?uid=' + pushon + '_applets',
+					header: {
+						"content-type": "application/json",
+						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
+					}
 				});
-				uni.onSocketOpen(function (res) {
-				  console.log('WebSocket连接已打开！');
+				uni.onSocketOpen(function(res) {
+					console.log('WebSocket连接已打开！');
 				});
-				uni.onSocketError(function (res) {
-				  console.log('WebSocket连接打开失败，请检查！');
+				uni.onSocketError(function(res) {
+					console.log('WebSocket连接打开失败，请检查！');
 				});
-				uni.onSocketMessage(function (res) {
-					  console.log('收到服务器内容：' + res.data);
-					  let cedata=JSON.stringify(res);
-					  let data=JSON.parse(cedata);
-					  let zdata=JSON.parse(data.data) 
-					  if(zdata.to=="recCmd"){
-						   uni.$emit('update',{msg:'页面更新'})
-						  return
-					  }
-					  uni.showModal({
-					      title: '提示',
-					      content: zdata.to+'的设备电量过低请检查！',
-						  cancelText: "取消", // 取消按钮的文字  
-						  confirmText: "查看", // 确认按钮文字  
-					      success: function (res) {
-					          if (res.confirm) {
-					              console.log('用户点击确定');
-								  uni.navigateTo({
-								  	url: `/pages/main/toviewtherecording/index?jump=`+"jump"
-								  })
-								  
-					          } else if (res.cancel) {
-					              console.log('用户点击取消');
-					          }
-					      }
-					  });
+				uni.onSocketMessage(function(res) {
+					console.log('收到服务器内容：' + res.data);
+					let cedata = JSON.stringify(res);
+					let data = JSON.parse(cedata);
+					let zdata = JSON.parse(data.data)
+					if (zdata.to == "recCmd") {
+						uni.$emit('update', {
+							msg: '页面更新'
+						})
+						return
+					}
+					uni.showModal({
+						title: '提示',
+						content: zdata.to + '的设备电量过低请检查！',
+						cancelText: "取消", // 取消按钮的文字  
+						confirmText: "查看", // 确认按钮文字  
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: `/pages/main/toviewtherecording/index?jump=` + "jump"
+								})
+
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
 				});
 			},
-			Closewebsocke(){
+			Closewebsocke() {
 				uni.closeSocket();
-				uni.onSocketClose(function (res) {
-				  console.log('WebSocket 已关闭！');
+				uni.onSocketClose(function(res) {
+					console.log('WebSocket 已关闭！');
 				});
 			},
 		}
@@ -124,17 +214,20 @@
 </style>
 <style lang="scss">
 	@import "uview-ui/index.scss";
+
 	/*每个页面公共css */
 	//图表样式等
-	.single{
+	.single {
 		width: 100%;
 		background: #FFFFFF;
-		.title{
+
+		.title {
 			width: 100%;
 			height: 90rpx;
 			border-bottom: 1rpx solid #E0E0E0;
 			display: flex;
-			.title1{
+
+			.title1 {
 				flex: 2;
 				font-size: 30rpx;
 				font-weight: 600;
@@ -142,28 +235,33 @@
 				line-height: 90rpx;
 				text-indent: 30rpx;
 			}
-			.title3{
+
+			.title3 {
 				flex: 3;
 				height: 90rpx;
 				display: flex;
 				align-items: center;
 				justify-content: flex-end;
-				.title3-box{
+
+				.title3-box {
 					display: flex;
 					align-items: center;
 					width: 25%;
 					justify-content: center;
-					.activecltab{
+
+					.activecltab {
 						border-bottom: 2px solid #2671E2;
 					}
 				}
 			}
-			.title2{
+
+			.title2 {
 				flex: 3;
 				height: 90rpx;
 				display: flex;
 				align-items: center;
-				.title2-che{
+
+				.title2-che {
 					width: 178rpx;
 					height: 48rpx;
 					background: #FFFFFF;
@@ -176,7 +274,8 @@
 					text-indent: 12rpx;
 					margin-left: 35rpx;
 					position: relative;
-					.righttochoose{
+
+					.righttochoose {
 						width: 18rpx;
 						height: 24rpx;
 						position: absolute;
@@ -186,15 +285,18 @@
 				}
 			}
 		}
-		.swiper-box{
+
+		.swiper-box {
 			width: 97%;
 			margin: 0 auto;
 		}
-		.hejibox{
+
+		.hejibox {
 			width: 100%;
 			height: 80rpx;
 			display: flex;
-			.heji{
+
+			.heji {
 				width: 50%;
 				height: 100%;
 				font-size: 28rpx;
@@ -204,7 +306,8 @@
 				text-indent: 30rpx;
 			}
 		}
-		.danwei{
+
+		.danwei {
 			width: 100%;
 			height: 40rpx;
 			font-size: 24rpx;
@@ -213,31 +316,37 @@
 			line-height: 40rpx;
 			text-indent: 30rpx;
 		}
-		.uchaserbox{
+
+		.uchaserbox {
 			width: 95%;
 			height: 470rpx;
 		}
-		.jindu{
+
+		.jindu {
 			width: 100%;
 			height: 300rpx;
-			.jindu-box{
-				width: 100%; 
+
+			.jindu-box {
+				width: 100%;
 				padding-left: 30rpx;
 				padding-right: 30rpx;
-				.jindu-boxche{
+
+				.jindu-boxche {
 					width: 100%;
 					height: 46rpx;
 					display: flex;
 					align-items: center;
 					height: 50rpx;
-					.jindu-name{
+
+					.jindu-name {
 						width: 120rpx;
-						font-size: 28rpx; 
+						font-size: 28rpx;
 						color: #666666;
 					}
-					.jindu-zxl{
+
+					.jindu-zxl {
 						width: 120rpx;
-						font-size: 26rpx; 
+						font-size: 26rpx;
 						margin-left: 16rpx;
 						color: #666666;
 						text-align: center;
@@ -246,6 +355,7 @@
 			}
 		}
 	}
+
 	//时间切换的样式
 	.boxtittab {
 		width: 100;
@@ -254,7 +364,7 @@
 		border: 1px solid #E0E0E0;
 		display: flex;
 		align-items: center;
-	
+
 		.tabbox {
 			flex: 1;
 			height: 100%;
@@ -264,40 +374,46 @@
 			font-size: 28rpx;
 			display: flex;
 			justify-content: center;
-	
+
 			.activecllasscet {
 				width: 96rpx;
 				border-bottom: 2px solid #2671E2;
 			}
 		}
 	}
+
 	//多个格子的样式
 	.boxzonglan {
 		width: 100%;
 		min-height: 496rpx;
 		background: #FFFFFF;
 		padding: 30rpx 30rpx 30rpx 30rpx;
+
 		.zonglantit {
 			font-size: 30rpx;
 			color: #333333;
 			font-family: PingFangSC-Semibold, PingFang SC;
 			font-weight: 600;
 		}
+
 		.zonglanbox {
 			width: 100%;
 			display: flex;
 			flex-wrap: wrap;
 			margin-top: 24rpx;
+
 			.grid {
 				width: 50%;
 				height: 128rpx;
 				border: 1px solid #E0E0E0;
+
 				.audonum {
 					color: #666666;
 					text-indent: 40rpx;
 					font-size: 26rpx;
 					margin-top: 20rpx;
 				}
+
 				.num {
 					color: #333333;
 					text-indent: 40rpx;

pages.json

@@ -483,6 +483,15 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "prohibited/details",
+					"style": {
+						"navigationBarTitleText": "违禁详情",
+						"navigationBarBackgroundColor": "#038EF5",
+						"navigationBarTextStyle": "white",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
 					"path": "consumer/index",
 					"style": {

pages/center/prohibited/index.vue

@@ -1,7 +1,5 @@
 <template>
 	<view class="box">
-		
-		
 		<!-- 选择器 -->
 		<view class="boxtittab">
 			<view class="tabbox" @click="taptimeisshow">
@@ -13,20 +11,26 @@
 			<view class="tabbox" @click="selectshow = true">
 				顾问<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
 			</view>
+			<view class="tabbox" @click="showIdent = true">
+				违禁标识<u-icon name="arrow-down" size="24" style="padding-left: 12rpx;"></u-icon>
+			</view>
 		</view>
 		<view class="count" v-if="recordList.length > 0">
-			筛选结果：<text>{{totalRecords}}  </text>条
+			筛选结果：<text>{{totalRecords}} </text>条
 		</view>
 		<view class="content">
-			<view v-if="recordList.length==0" style="width: 100%;height: 100%;display: flex;align-items: center;background: #FFFFFF;">
+			<view v-if="recordList.length==0"
+				style="width: 100%;height: 100%;display: flex;align-items: center;background: #FFFFFF;">
 				<view style="width: 100%;padding-top: 200rpx;">
 					<view style="width: 100%;text-align: center;">
-						<image style="width: 220rpx;height: 200rpx;" src="https://static.quhouse.com/zhikong_xcx_img/nodatalist.png" mode=""></image>
+						<image style="width: 220rpx;height: 200rpx;"
+							src="https://static.quhouse.com/zhikong_xcx_img/nodatalist.png" mode=""></image>
 					</view>
-					<view style="text-align: center;width: 100%;margin-top: 20rpx;color: #999999;">暂无数据</view>	
+					<view style="text-align: center;width: 100%;margin-top: 20rpx;color: #999999;">暂无数据</view>
 				</view>
 			</view>
-			<view  v-if="recordList.length!=0" class="content-tips" v-for="(item,index) in recordList" :key='index' @click="tapThevisiting(item)">
+			<view v-if="recordList.length!=0" class="content-tips" v-for="(item,index) in recordList" :key='index'
+				@click="tapThevisiting(item, index)">
 				<view class="content-first">
 					<view class="left">
 						<!-- <view class="img">{{item.agentName.slice(0,1)}}</view> -->
@@ -42,7 +46,7 @@
 						<view class="cus">客户：{{item.name || '--'}} |</view>
 						<view class="arriveNum">{{item.visitRecord || "--"}}次到访</view>
 					</view>
-					
+
 				</view>
 				<view class="content-last">
 					{{item.createTime}} | {{item.mm || '0'}} min
@@ -50,182 +54,265 @@
 			</view>
 		</view>
 
-		
+
 		<!-- 选择顾问的选择框 -->
 		<u-select v-model="selectshow" :list="freeList" @confirm="actionSelectCallback"></u-select>
 		<u-calendar v-model="totalTimeShow" mode="range" @change="totalTimeChange"></u-calendar>
 		<u-popup v-model="timeshow" mode="bottom">
-			<view class="timeview" :style="{ color: activeTotal == 5 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(5)">全部</view>
-			<view class="timeview" :style="{ color: activeTotal == 0 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(0)">今天</view>
+			<block v-for="(data, index) in activeList" :key="index">
+				<view class="timeview" :style="{ color: activeTotal == data.id ? '#2B6EFF' : '#333333' }"
+					@click="tabtimetap(data.id)">{{ data.title }}</view>
+			</block>
+			<!-- 			<view class="timeview" :style="{ color: activeTotal == 0 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(0)">今天</view>
 			<view class="timeview" :style="{ color: activeTotal == 1 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(1)">昨天</view>
 			<view class="timeview" :style="{ color: activeTotal == 2 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(2)">近7天</view>
 			<view class="timeview" :style="{ color: activeTotal == 3 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(3)">近30天</view>
-			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(4)">自定义</view>
+			<view class="timeview" :style="{ color: activeTotal == 4 ? '#2B6EFF' : '#333333' }" @click="tabtimetap(4)">自定义</view> -->
 		</u-popup>
 		<u-select v-model="soltishow" :list="orderBylist" @confirm="selectCallback2"></u-select>
+		
+		<u-select v-model="showIdent" :list="identList" @confirm="selectIdent"></u-select>
 	</view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				orderBylist:[
-					{label:'全部',value:'0'},
-					{label:'创建时间倒序',value:'1'},
-					{label:'创建时间正序',value:'2'},
-					{label:'接待时间倒序',value:'3'},
-					{label:'接待时间正序',value:'4'},
+	export default {
+		data() {
+			return {
+				orderBylist: [{
+						label: '全部',
+						value: '0'
+					},
+					{
+						label: '创建时间倒序',
+						value: '1'
+					},
+					{
+						label: '创建时间正序',
+						value: '2'
+					},
+					{
+						label: '接待时间倒序',
+						value: '3'
+					},
+					{
+						label: '接待时间正序',
+						value: '4'
+					},
 				],
 				activeTotal: 5,
-				selectshow:false,
+				activeList: [ // 时间筛选数组
+					{
+						title: '全部',
+						id: 5,
+					},
+					{
+						title: '昨天',
+						id: 0,
+					},
+					{
+						title: '昨天',
+						id: 1,
+					},
+					{
+						title: '近7天',
+						id: 2,
+					},
+					{
+						title: '近30天',
+						id: 3,
+					},
+					{
+						title: '自定义',
+						id: 4,
+					},
+				],
+				showIdent: false, // 显示选择违禁标识列表
+				identList: [ // 违禁标识列表
+					{
+						label: '全部',
+						value: 0
+					},
+					{
+						label: '有效',
+						value: 1
+					},
+					{
+						label: '无效',
+						value: 2
+					},
+				],
+				violatedStatus: 0, // 违禁状态
+				selectshow: false,
 				totalTimeShow: false,
-				screen:{
-					agentId:'',//顾问id
-					record:'0',
+				screen: {
+					agentId: '', //顾问id
+					record: '0',
 				},
-				freeList:[],//顾问
-				recordList:[],	
-				buildingID:'',
-				nextPage:1,
-				totalRecord:"",
-				staTime:'',
-				endtime:'',
-				isnorefresh:'',
-				activeTotal2:0,
-				timeshow:false,
-				soltishow:false,
-				orderBy:'',
-				userInfo:{},
-				totalRecords:'',
-				isRefresh:false
+				freeList: [], //顾问
+				recordList: [],
+				buildingID: '',
+				nextPage: 1,
+				totalRecord: "",
+				staTime: '',
+				endtime: '',
+				isnorefresh: '',
+				activeTotal2: 0,
+				timeshow: false,
+				soltishow: false,
+				orderBy: '',
+				userInfo: {},
+				totalRecords: '',
+				isRefresh: false,
+				nextPageObj: {}, // 跳转详情页面的参数
 			}
 		},
 		onLoad(options) {
-			this.isnorefresh=options.refresh;
-			if(options.activeTotal){
-				this.activeTotal=options.activeTotal
+			this.isnorefresh = options.refresh;
+			if (options.activeTotal) {
+				this.activeTotal = options.activeTotal
 			}
-			if(options.staTime){
-				this.staTime=options.staTime;
-				this.endtime=options.endtime;
+			if (options.staTime) {
+				this.staTime = options.staTime;
+				this.endtime = options.endtime;
 			}
 		},
 		onShow() {
 			this.userInfo = uni.getStorageSync('weapp_session_userInfo_data');
-			if(this.isnorefresh=='refresh'){
+			if (this.isnorefresh == 'refresh') {
 				this.buildingID = uni.getStorageSync('buildingID').id;
-				this.recordList=[];
-				this.nextPage=1;
+				this.recordList = [];
+				this.nextPage = 1;
 				this.isRefresh = false;
 				this.getMyCustom()
 				this.getFreeList();
-				this.isnorefresh='';
-			}	
+				this.isnorefresh = '';
+			}
 			var pages = getCurrentPages();
-			pages[0].$vm.path='/pages/index/index'
+			pages[0].$vm.path = '/pages/index/index'
 			console.log(pages[0].$vm.path)
 		},
-		onPullDownRefresh(){
-			this.nextPage=1;
+		onPullDownRefresh() {
+			this.nextPage = 1;
 			this.isRefresh = true;
 			this.getMyCustom()
-			setTimeout(function () {
-			    uni.stopPullDownRefresh();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		onReachBottom() {
-			if(this.totalRecord==this.nextPage){
+			if (this.totalRecord == this.nextPage) {
 				uni.showToast({
-					icon:'none',
-				    title: '到底了',
-				    duration: 2000
+					icon: 'none',
+					title: '到底了',
+					duration: 2000
 				});
 				return
-			}else{
-				this.nextPage+=1;
+			} else {
+				this.nextPage += 1;
 				this.isRefresh = false;
 				this.getMyCustom();
 			}
 		},
-		methods:{
-			tapsoltishow(){
-				this.soltishow=true;
+		methods: {
+			tapsoltishow() {
+				this.soltishow = true;
 			},
-			
-			taptimeisshow(){
-				this.timeshow=true;
+
+			taptimeisshow() {
+				this.timeshow = true;
 			},
 			//选择标签
-			selectCallback2(e){
-				this.orderBy=e[0].value;
-				this.nextPage=1;
-				this.recordList=[];
+			selectCallback2(e) {
+				this.orderBy = e[0].value;
+				this.nextPage = 1;
+				this.recordList = [];
+				this.isRefresh = false;
+				this.getMyCustom();
+			},
+			
+			// 选择违禁标识
+			selectIdent(e) {
+				this.violatedStatus = e[0].value
+				this.nextPage = 1;
+				this.recordList = [];
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
+			
 			//时间选择
-			tabtimetap(index){
-				this.timeshow=false;
+			tabtimetap(index) {
+				this.timeshow = false;
 				if (index == 4) {
 					this.totalTimeShow = true;
 				} else {
 					this.activeTotal = index;
-					this.staTime='';
-					this.endtime='';
-					this.nextPage=1;
-					this.recordList=[];
+					this.staTime = '';
+					this.endtime = '';
+					this.nextPage = 1;
+					this.recordList = [];
 					this.isRefresh = false;
 					this.getMyCustom();
 				}
 			},
 			//自定义时间
 			totalTimeChange(e) {
-				this.staTime=e.startDate;
-				this.endtime=e.endDate;
-				this.activeTotal=4;
-				this.nextPage=1;
-				this.recordList=[];
+				this.staTime = e.startDate;
+				this.endtime = e.endDate;
+				this.activeTotal = 4;
+				this.nextPage = 1;
+				this.recordList = [];
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
-			tapThevisiting(item) {
-				if(item.status==0){
+
+			// 跳转违禁详情
+			tapThevisiting(item, index) {
+				if (item.status == 0) {
 					uni.showToast({
 						icon: "none",
 						title: "排队中"
 					})
 					return
-				}else{
+				} else {
 					const parames = {
 						pageNum: 1,
 						pageSize: 100,
 						query: {
 							customerId: item.id,
 						}
-					}	
-					this.$u.post("/customer/prohibitedMatch", {customerId:item.id}).then(res => {
-						let newweijin=res[0];
-							newweijin.transferContent=JSON.parse(newweijin.transferContent)	
-						var item={
-							bg:newweijin.transferContent.bg,
-							customerId:newweijin.corpusId,
+					}
+					this.$u.post("/customer/prohibitedMatch", {
+						customerId: item.id
+					}).then(res => {
+						let newweijin = res[0];
+						newweijin.transferContent = JSON.parse(newweijin.transferContent)
+						var item = {
+							bg: newweijin.transferContent.bg,
+							customerId: newweijin.corpusId,
 						}
 						uni.setStorageSync("searchobj", item); //写入缓存
 						this.$u.post("/corpus/findByPage", parames).then(res => {
-							if(res==null){
+							if (res == null) {
 								uni.showToast({
 									icon: "none",
 									title: "暂无音频"
 								})
 								return
-							}else{
+							} else {
 								let newobj = res[0];
-								if(res[0].merge==0){
+								if (res[0].merge == 0) {
+									let obj = {
+										pageSize: index,
+										query: {
+											...this.nextPageObj
+										}
+									}
+									uni.setStorageSync('nextPageObj', JSON.stringify(obj))
 									uni.navigateTo({
-										url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
+										url: `/pages/center/prohibited/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}&index=${index}`
 									})
-								}else{
+								} else {
 									uni.navigateTo({
 										url: `/pages/mine/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`
 									})
@@ -234,76 +321,80 @@
 						})
 					})
 				}
-				
+
 			},
-			getMyCustom(){
-				let dateType=0;
-				let orderBy=0;
-				if(this.activeTotal==5){
-					dateType=null;
-				}else if(this.activeTotal==4){
-					dateType=null;
-				}else{
-					dateType=this.activeTotal;
+			getMyCustom() {
+				let dateType = 0;
+				let orderBy = 0;
+				if (this.activeTotal == 5) {
+					dateType = null;
+				} else if (this.activeTotal == 4) {
+					dateType = null;
+				} else {
+					dateType = this.activeTotal;
 				}
-				
-				if(this.orderBy==0){
-					orderBy=null;
-				}else{
-					orderBy=this.orderBy;
+
+				if (this.orderBy == 0) {
+					orderBy = null;
+				} else {
+					orderBy = this.orderBy;
 				}
 				var parames = {
 					pageNum: this.nextPage,
 					pageSize: 10,
 					query: {
-						projectId:this.buildingID,
-						time:1,
-						staTime:this.staTime,
-						endtime:this.endtime,
-						taboo:1,
-						dateType:dateType,
-						orderBy:orderBy
+						projectId: this.buildingID,
+						time: 1,
+						staTime: this.staTime,
+						endtime: this.endtime,
+						taboo: 1,
+						dateType: dateType,
+						orderBy: orderBy,
+						violatedStatus: this.violatedStatus, // 违禁状态
 					}
 				};
-				if(this.screen.agentId){
+				if (this.screen.agentId) {
 					parames.query.agentId = this.screen.agentId
 				}
-				
+
 				this.$u.post("/customer/findbypage", parames).then(data => {
 					var list = data.results || [];
-					if(this.isRefresh){
+					if (this.isRefresh) {
 						this.recordList = list;
-					}else{
+					} else {
 						this.recordList = [...this.recordList, ...list];
 					}
-					this.totalRecord=data.totalPage;
+					this.totalRecord = data.totalPage;
 					this.totalRecords = data.totalRecord;
+					this.nextPageObj = parames.query
 				})
 			},
 			//获取顾问列表
 			getFreeList() {
-			  this.$u.post("/cusLvStatistics/selectAllAccountIdByHouseId", { houseId: this.buildingID }).then(res => {
-			    this.freeList = res;
-				 this.freeList.forEach(item => {
-					item.label=item.name;
-					item.value=item.accountId
+				this.$u.post("/cusLvStatistics/selectAllAccountIdByHouseId", {
+					houseId: this.buildingID
+				}).then(res => {
+					this.freeList = res;
+					this.freeList.forEach(item => {
+						item.label = item.name;
+						item.value = item.accountId
+					})
 				})
-			  })
 			},
 			//顾问确认
-			actionSelectCallback(e){
-				this.screen.agentId=e[0].value;
-				this.recordList=[];
-				this.nextPage=1;
-				this.selectshow=false;
+			actionSelectCallback(e) {
+				this.screen.agentId = e[0].value;
+				this.recordList = [];
+				this.nextPage = 1;
+				this.selectshow = false;
 				this.isRefresh = false;
 				this.getMyCustom();
 			},
-	
-		
-	
-		
-			
+
+
+
+
+
 		},
 	}
 </script>
@@ -314,6 +405,7 @@
 		height: 100%;
 		background: #F8F8F8;
 	}
+
 	.count {
 		width: 100%;
 		height: 90rpx;
@@ -321,18 +413,20 @@
 		align-items: center;
 		justify-content: center;
 		background-color: #FBE4E4;
-		
+
 		text {
 			color: #F71616;
 		}
 	}
-	.timeview{
+
+	.timeview {
 		height: 80rpx;
 		line-height: 80rpx;
 		width: 100%;
 		text-align: center;
 		border-bottom: 1px solid #F8F8F8;
 	}
+
 	//时间切换的样式
 	.boxtittab {
 		width: 100;
@@ -341,7 +435,7 @@
 		border: 1px solid #E0E0E0;
 		display: flex;
 		align-items: center;
-	
+
 		.tabbox {
 			flex: 1;
 			height: 100%;
@@ -351,61 +445,72 @@
 			font-size: 28rpx;
 		}
 	}
-	.search-box{
+
+	.search-box {
 		width: 100%;
 		height: 102rpx;
 		background: #FFFFFF;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		.search{
+
+		.search {
 			width: 94%;
 			height: 70rpx;
 			display: flex;
 			align-items: center;
 			background: #F8F8F8;
 			border-radius: 33rpx;
-			.search-img{
+
+			.search-img {
 				width: 26rpx;
 				height: 30rpx;
 				margin-left: 20rpx;
-				.search-img1{
+
+				.search-img1 {
 					width: 100%;
 					height: 100%;
 					margin-top: 2rpx;
-				}	
+				}
 			}
-			.search-text{
+
+			.search-text {
 				font-size: 28rpx;
 				font-weight: 400;
 				color: #999999;
-				margin-left:10rpx;
+				margin-left: 10rpx;
 			}
 		}
-		.search-screen{
+
+		.search-screen {
 			width: 40rpx;
 			height: 40rpx;
 			margin-left: 30rpx;
-			.search-screen1{
+
+			.search-screen1 {
 				width: 100%;
 				height: 100%;
 			}
 		}
 	}
-	.content{
-		.content-tips{
+
+	.content {
+		.content-tips {
 			background: #fff;
 			padding: 0 20rpx;
 			box-sizing: border-box;
 			overflow: hidden;
 			margin-top: 20rpx;
-			.content-first{
+
+			.content-first {
 				margin-top: 19rpx;
 				display: flex;
 				justify-content: space-between;
-				.left{
+
+				.left {
 					display: flex;
-					.img{
+
+					.img {
 						width: 52rpx;
 						height: 52rpx;
 						background: #FFFFFF;
@@ -414,13 +519,15 @@
 						text-align: center;
 						line-height: 52rpx;
 					}
-					.name{
+
+					.name {
 						font-weight: 600;
 						color: #333333;
 						// margin-left: 20rpx;
 						margin-top: 11rpx;
 					}
-					.status{
+
+					.status {
 						width: 110rpx;
 						height: 42rpx;
 						background: #FFF9F5;
@@ -434,42 +541,48 @@
 						margin-top: 11rpx;
 					}
 				}
-				.right{
+
+				.right {
 					display: flex;
 					margin-top: 11rpx;
-					.point{
+
+					.point {
 						width: 12rpx;
 						height: 12rpx;
 						background: #2B6EFF;
 						border-radius: 50%;
 						margin-right: 9rpx;
 						margin-top: 16rpx;
-						
+
 					}
 				}
 			}
-			
-			
-			.content-sec{
+
+
+			.content-sec {
 				display: flex;
 				justify-content: space-between;
 				margin-top: 19rpx;
-				.left{
+
+				.left {
 					display: flex;
-					.cus{
+
+					.cus {
 						font-size: 30rpx;
 						font-weight: 400;
 						color: #666666;
 						// line-height: 30rpx;
 					}
-					.arriveNum{
+
+					.arriveNum {
 						font-size: 30rpx;
 						font-weight: 400;
 						// line-height: 30rpx;
 						margin-left: 10rpx;
 					}
 				}
-				.right{
+
+				.right {
 					width: 120rpx;
 					height: 46rpx;
 					background: #F4F8FD;
@@ -480,7 +593,8 @@
 					color: #2671E2;
 				}
 			}
-			.content-last{
+
+			.content-last {
 				// margin: 30rpx 0;
 				font-size: 30rpx;
 				font-weight: 400;
@@ -489,62 +603,72 @@
 				margin-top: 22rpx;
 				margin-bottom: 30rpx;
 			}
-				
+
 		}
 	}
+
 	// 这是弹出层
-	.screen{
+	.screen {
 		// box-sizing: border-box;
 		// padding: 0 30rpx;
-		position:absolute;
-		.screen-counselor{
+		position: absolute;
+
+		.screen-counselor {
 			display: flex;
 			height: 106rpx;
 			// padding: 40rpx 30rpx 36rpx 30rpx;
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			border-bottom: 1px solid #EEEEEE;
-			.screen-text{
+
+			.screen-text {
 				margin: 40rpx 0 36rpx 0;
 				font-size: 30rpx;
 				font-weight: 400;
 				color: #333333;
 				line-height: 30rpx;
 			}
-			.screen-sel{
+
+			.screen-sel {
 				display: flex;
 				justify-content: space-between;
 				width: 500rpx;
 				margin-left: 60rpx;
-				.screen-sel-img{
+
+				.screen-sel-img {
 					margin: 40rpx 0 36rpx 0;
 					width: 14rpx;
 					height: 30rpx;
 				}
-				.screen-inp{
+
+				.screen-inp {
 					margin-top: 20rpx;
 				}
 			}
 		}
-		.screen-record{
+
+		.screen-record {
 			height: 192rpx;
 			// width: 100%;
 			overflow: hidden;
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			border-bottom: 1px solid #EEEEEE;
-			.screen-record-text{
+
+			.screen-record-text {
 				margin-top: 36rpx;
 				font-size: 30rpx;
 				font-weight: 400;
 				color: #333333;
 				line-height: 30rpx;
 			}
-			.screen-record-tab{
+
+			.screen-record-tab {
 				margin-top: 30rpx;
 				display: flex;
+
 				// justify-content: space-around;
-				.screen-record-chose{
+				.screen-record-chose {
 					width: 156rpx;
 					height: 60rpx;
 					background: #2671E2;
@@ -555,7 +679,8 @@
 					margin-right: 22rpx;
 					color: #FFFFFF;
 				}
-				.screen-record-nochose{
+
+				.screen-record-nochose {
 					width: 156rpx;
 					height: 60rpx;
 					background: #FFFFFF;
@@ -565,14 +690,16 @@
 					line-height: 60rpx;
 					margin-right: 22rpx;
 				}
-				
+
 			}
 		}
-		.screen-foot{
+
+		.screen-foot {
 			width: 100%;
 			height: 100rpx;
 			display: flex;
-			.screen-foot-reset{
+
+			.screen-foot-reset {
 				width: 50%;
 				text-align: center;
 				height: 100rpx;
@@ -581,7 +708,8 @@
 				font-weight: 400;
 				color: #666666;
 			}
-			.screen-foot-sure{
+
+			.screen-foot-sure {
 				width: 50%;
 				text-align: center;
 				line-height: 100rpx;

pages/mine/details2.vue

@@ -421,7 +421,8 @@
 					</view>
 					<view class="bioqianwayl" v-if="item.isshow==true">
 						<view class="jiangshang" v-for="(chend,i) in item.children" :key='i' v-if="chend.selected==0">
-							{{chend.text}}</view>
+							{{chend.text}}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -482,7 +483,7 @@
 	var config = require("../../config");
 	import LongAudio from "@/components/long_audio/long_audio.vue"
 	export default {
-		components:{
+		components: {
 			LongAudio
 		},
 		data() {
@@ -583,7 +584,7 @@
 				roleisshaw: false,
 				roleindexrow: 0,
 				roletiaoshu: 0,
-				infos:null
+				infos: null
 			};
 		},
 		onLoad: function(options) {
@@ -592,11 +593,11 @@
 			this.itemobj = uni.getStorageSync('searchobj');
 			console.log(this.itemobj)
 			this.stateisshow = options.stateisshow;
-			uni.$on("playNows",(val)=>{
-			    this.playNow=val;
+			uni.$on("playNows", (val) => {
+				this.playNow = val;
 			})
-			uni.$on("scrollIds",(val)=>{
-			    this.scrollId=val;
+			uni.$on("scrollIds", (val) => {
+				this.scrollId = val;
 			})
 		},
 		onShow() {
@@ -641,8 +642,8 @@
 			this.init(this.infos)
 
 		},
-		
-		
+
+
 		onUnload() {
 			//暂停
 			this.innerAudioContext.pause()
@@ -1058,7 +1059,7 @@
 							this.roleindexbiaoji = data.data.data.speaker - 1;
 							this.dshfkjsdkksodofydwfkhwdfkjh = data.data.data.speaker - 1;
 						}
-						if (this.roleindex > this.tablist.length - 1) { 
+						if (this.roleindex > this.tablist.length - 1) {
 							this.roleindex = this.tablist.length - 1
 							this.fenjiaoseunfo()
 						}
@@ -1102,10 +1103,10 @@
 					wx.enableAlertBeforeUnload({
 						message: "是否确认退出详情页面？",
 						success: function(res) {
-					 	console.log("方法注册成功：", res);
+							console.log("方法注册成功：", res);
 						},
 						fail: function(errMsg) {
-					  console.log("方法注册失败：", errMsg);
+							console.log("方法注册失败：", errMsg);
 						},
 					});
 				});
@@ -1918,8 +1919,8 @@
 		height: 84rpx;
 		border-bottom: 1px solid #E0E0E0;
 		display: flex;
-	
-	.boxhead1 {
+
+		.boxhead1 {
 			width: 50%;
 			color: #303030;
 			height: 84rpx;
@@ -2183,7 +2184,7 @@
 		left: 50%;
 		top: 50%;
 		transform: translate(-50%, -50%);
-		
+
 		.headpade {
 			margin-top: 10rpx;
 			padding: 8rpx 8rpx 8rpx 8rpx;

utils/domain.js

@@ -5,6 +5,8 @@ const baseUrl = 'http://127.0.0.1:8080/api';// 本地
 // const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.92:8080/api';// 测试站
 // const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
+// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 测试站
+const baseUrl = 'http://192.168.31.210:8080/api'; // 泽明
 // const baseUrl = 'http://192.168.31.167:8080/autoSR/api'; // 长龙	
 // const baseUrl = 'http://192.168.31.134:8080/autoSR/api'; // 佳豪
 // const baseUrl = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏