Merge branch 'dev' into supdev

pages/center/Piabodata/Customerportrait/Receivedetailabout.vue

@@ -467,6 +467,15 @@
 			};
 		},
 		onShow() {
+			wx.enableAlertBeforeUnload({
+						 message: "是否确认退出详情页面？",
+						 success: function (res) {
+						   console.log("方法注册成功：", res);
+						 },
+						 fail: function (errMsg) {
+						   console.log("方法注册失败：", errMsg);
+						 },
+			});
 			this.intention=false;
 			this.kehuyixiangcenterindex=0;
 			this.buildingID = uni.getStorageSync('buildingID').id;

pages/center/Piabodata/index.vue

@@ -147,8 +147,8 @@
 				<view class="heji">合计：50</view>
 				<view class="heji">均值：25</view>
 			</view> -->
-
-			<view class="jindu" style="margin-top: 20rpx;">
+			<view style="width: 100%;height: 300rpx;text-align: center;line-height: 300rpx;" v-if="newlisttabinfo.length==0">暂无数据</view>
+			<view v-else class="jindu" style="margin-top: 20rpx;">
 				<scroll-view style="height: 300rpx;" scroll-y="true">
 					<view class="jindu-box" v-for="(item,index) in newlisttabinfo" :key="index">
 						<view class="jindu-boxche">
@@ -175,7 +175,8 @@
 					:is-scroll="true">
 				</u-tabs-swiper>
 			</view>
-			<view class="jindu">
+			<view style="width: 100%;height: 300rpx;text-align: center;line-height: 300rpx;" v-if="newlisttabinfo1.length==0">暂无数据</view>
+			<view class="jindu" v-else>
 				<scroll-view style="height: 300rpx;" scroll-y="true">
 					<view class="jindu-box" v-for="(item,index) in newlisttabinfo1" :key="index">
 						<view class="jindu-boxche">
@@ -308,19 +309,7 @@
 						zxl: '80'
 					},
 				],
-				newlisttabinfo1: [{
-						name: '接待量',
-						zxl: '10'
-					},
-					{
-						name: '平均执行率',
-						zxl: '50'
-					},
-					{
-						name: '接待客户',
-						zxl: '80'
-					},
-				],
+				newlisttabinfo1: [],
 				Theteamcomparedisshow: false,
 				Groupcontrastisshow: false,
 				allechar: [],

pages/center/consumer/consumerDetail.vue

@@ -302,7 +302,15 @@
 				}
 			},
 			tapThevisiting(item) {
+				console.log("11111111111111")
+				uni.showLoading({
+				    title: '加载中',
+					mask:true
+				});
 				if(item.yon!=0){
+					setTimeout(function () {
+					    uni.hideLoading();
+					}, 2000);
 					uni.showToast({
 						icon:'none',
 					    title: '暂无录音',
@@ -325,14 +333,16 @@
 					uni.setStorageSync("entrance", 1); //写入缓存
 					uni.setStorageSync("searchobj", item); //写入缓存
 					this.$u.post("/corpus/findByPage", parames).then(res => {
+						setTimeout(function () {
+						    uni.hideLoading();
+						}, 2000);
 						if(res==null){
 						       uni.showToast({
 						        icon: "none",
 						        title: "暂无音频"
 						       })
 						       return
-						      }
-						if(res[0].merge==0){
+						}if(res[0].merge==0){
 							let newobj = res[0];
 							uni.navigateTo({
 								url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}`

pages/center/records/index.vue

@@ -312,7 +312,14 @@
 				this.getMyCustom();
 			},
 			tapThevisiting(item) {
+				uni.showLoading({
+				    title: '加载中',
+					mask:true
+				});
 				if(item.status==0){
+					setTimeout(function () {
+					    uni.hideLoading();
+					}, 2000);
 					uni.showToast({
 						icon: "none",
 						title: "排队中"
@@ -334,12 +341,18 @@
 					uni.setStorageSync("entrance", 1); //写入缓存
 					this.$u.post("/corpus/findByPage", parames).then(res => {
 						if(res==null){
+							setTimeout(function () {
+							    uni.hideLoading();
+							}, 2000);
 							uni.showToast({
 								icon: "none",
 								title: "暂无音频"
 							})
 							return
 						}else{
+							setTimeout(function () {
+							    uni.hideLoading();
+							}, 2000);
 							let newobj = res[0];
 							if(res[0].merge==0){
 								uni.navigateTo({

pages/center/records/recordSearch.vue

@@ -85,7 +85,16 @@
 		},
 		methods:{
 			tapThevisiting(item) {
+				console.log("11111111111111")
+				uni.showLoading({
+				    title: '加载中',
+					mask:true
+				});
+				
 				if(item.status==0){
+					setTimeout(function () {
+					    uni.hideLoading();
+					}, 2000);
 					uni.showToast({
 						icon: "none",
 						title: "排队中"
@@ -107,12 +116,18 @@
 					uni.setStorageSync("searchobj", item); //写入缓存
 					this.$u.post("/corpus/findByPage", parames).then(res => {
 						if(res==null){
+							setTimeout(function () {
+							    uni.hideLoading();
+							}, 2000);
 							uni.showToast({
 								icon: "none",
 								title: "暂无音频"
 							})
 							return
 						}else{
+							setTimeout(function () {
+							    uni.hideLoading();
+							}, 2000);
 							let newobj = res[0];
 							if(res[0].merge==0){
 								uni.navigateTo({

pages/index/customer.vue

@@ -84,7 +84,14 @@
 				this.init()
 			},
 			tapThevisiting(item) {
+				uni.showLoading({
+				    title: '加载中',
+					mask:true
+				});
 				if(item.status==0){
+					setTimeout(function () {
+					    uni.hideLoading();
+					}, 2000);
 					uni.showToast({
 						icon: "none",
 						title: "排队中"
@@ -105,6 +112,9 @@
 						onebest:''
 					}
 					this.$u.post("/corpus/findByPage", parames).then(res => {
+						setTimeout(function () {
+						    uni.hideLoading();
+						}, 2000);
 						if(res){
 							let newobj = res[0];
 							uni.navigateTo({

pages/index/learning.vue

@@ -79,6 +79,10 @@
     methods: {
 		//全部学习跳转
 		quclick(item){
+			uni.showLoading({
+			    title: '加载中',
+				mask:true
+			});
 			const parames = {
 			  pageNum: 1,
 			  pageSize: 100,
@@ -92,6 +96,9 @@
 				id:''
 			}
 			this.$u.post("/corpus/findByPage", parames).then(res => {
+				setTimeout(function () {
+				    uni.hideLoading();
+				}, 2000);
 				var newobj = res[0];
 				if(res[0].merge==0){
 					uni.navigateTo({

pages/learning/Equinoctiallearning.vue

@@ -40,6 +40,12 @@
 		},
 		methods: {
 			quclick(item) {
+				uni.showLoading({
+				    title: '加载中',
+					mask:true
+				});
+				
+				
 				const parames = {
 					pageNum: 1,
 					pageSize: 100,
@@ -56,6 +62,9 @@
 				}
 				this.$u.post("/corpus/fendianFindByPage", parames).then(res => {
 					var newobj = res[0];
+					setTimeout(function () {
+					    uni.hideLoading();
+					}, 2000);
 					if(res[0].merge==0){
 						uni.navigateTo({
 							url: `/pages/learning/Equinoctial/index2?customerId=${newobj.customerId}&biaoqian=${this.biaoqian}&startTime=${item.startTime}&startFile=${item.startFile}`

pages/learning/Thefulltext/index.vue

@@ -212,6 +212,15 @@
 			},30000)
 		},
 		onShow: function() {
+			wx.enableAlertBeforeUnload({
+						 message: "是否确认退出详情页面？",
+						 success: function (res) {
+						   console.log("方法注册成功：", res);
+						 },
+						 fail: function (errMsg) {
+						   console.log("方法注册失败：", errMsg);
+						 },
+			});
 			this.initRecord();
 			
 			let pages = getCurrentPages();

pages/learning/Thefulltext/index2.vue

@@ -242,6 +242,15 @@
 			},30000)
 		},
 		onShow: function() {
+			wx.enableAlertBeforeUnload({
+						 message: "是否确认退出详情页面？",
+						 success: function (res) {
+						   console.log("方法注册成功：", res);
+						 },
+						 fail: function (errMsg) {
+						   console.log("方法注册失败：", errMsg);
+						 },
+			});
 			this.initRecord();
 			
 			if(this.stateisshow==2){

pages/mine/details.vue

@@ -268,6 +268,15 @@
 			this.stateisshow=options.stateisshow;
 		},
 		onShow() {
+			wx.enableAlertBeforeUnload({
+						 message: "是否确认退出详情页面？",
+						 success: function (res) {
+						   console.log("方法注册成功：", res);
+						 },
+						 fail: function (errMsg) {
+						   console.log("方法注册失败：", errMsg);
+						 },
+			});
 			this.Menulist = uni.getStorageSync('weapp_session_Menu_data');
 			this.Menulist.forEach(item=>{
 				if(item.name=='标记有效无效接待'){

pages/mine/details2.vue

@@ -516,6 +516,15 @@
 			this.stateisshow=options.stateisshow;
 		},
 		onShow() {
+			wx.enableAlertBeforeUnload({
+			 message: "是否确认退出详情页面？",
+			 success: function (res) {
+			   console.log("方法注册成功：", res);
+			 },
+			 fail: function (errMsg) {
+			   console.log("方法注册失败：", errMsg);
+			 },
+		   });
 			this.Menulist = uni.getStorageSync('weapp_session_Menu_data');
 			this.Menulist.forEach(item=>{
 				if(item.name=='标记有效无效接待'){