线上更新前，问题跟踪修复

MingGaoApp/App.vue

@@ -239,12 +239,13 @@
 						if (val.code == 403 || val.data && val.data.code == 403) {
 
 							this.close();
-							uni.setStorageSync('session_key', '')
+							uni.setStorageSync('session_key', '');
+							this.globalData.token = '';
 							if (!this.$store.state.isInLoginPage) {
 
-								uni.$u.totast(val.data.data && val.data.data.error_info || '用户在其他地方登陆，请重新登陆')
+								uni.$u.totast && uni.$u.totast(val.data.data && val.data.data.error_info || '用户在其他地方登陆，请重新登陆')
 								setTimeout(() => {
-									uni.navigateTo({
+									uni.reLaunch({
 										url: "/pages/login/login"
 									})
 								}, 2000)

MingGaoApp/components/task-card/task-card.vue

@@ -141,18 +141,34 @@
 		},
 		filters: {
 			numberFixed: function(val) {
-				return Number(val) ? Number(val).toFixed(2) : val
+				if(!val){
+					return 0
+				}
+				
+				return Number(val) ? Number(val).toFixed(2) : (val || 0)
 			},
 			meter: function(val) {
+				if(!val){
+					return '0m'
+				}
+				
 				return val / 1000 > 1 ? (val / 1000).toFixed(2) + 'km' : Number(val).toFixed(2) + 'm'
 			},
 		},
 		mounted() {},
 		methods: {
 			numberFixed(val) {
+				if(!val){
+					return 0
+				}
+				
 				return Number(val) ? Number(val).toFixed(2) : val
 			},
 			meter: function(val) {
+				if(!val){
+					return '0 m'
+				}
+				
 				return val / 1000 > 1 ? (val / 1000).toFixed(2) + 'km' : Number(val).toFixed(2) + 'm'
 			},
 			handleClick() {

MingGaoApp/pages/login/login.vue

@@ -216,6 +216,7 @@
 			this.updateInLoginPageStatus(true)
 		},
 		onHide(){
+			console.log('login page hide')
 			this.updateInLoginPageStatus(false)
 		}
 	}

MingGaoApp/pages/my/index.vue

@@ -58,6 +58,10 @@
 				// }
 			},
 		},
+		mounted() {
+			console.log('个人中心 mounted')
+			this.getinfo();
+		},
 		computed: {
 			// 视频消息
 			videoData() {
@@ -122,15 +126,15 @@
 					uni.navigateTo({
 						url: '/pages/my/warnList',
 					});
-				}else if (index == 5) {
+				} else if (index == 5) {
 					uni.navigateTo({
 						url: './formRecord/fieldSurveys',
 					});
-				}else if (index == 6) {
+				} else if (index == 6) {
 					uni.navigateTo({
 						url: './formRecord/samplePlot',
 					});
-				}else if (index == 7) {
+				} else if (index == 7) {
 					uni.navigateTo({
 						url: './formRecord/trapRecord',
 					});

MingGaoApp/pages/my/map.nvue

@@ -143,6 +143,8 @@
 					uid: this.userUID,
 					create_time: this.date
 				}
+				
+				console.warn(payload,'get track list payload')
 
 				trackService.fetchTrackListWithDate(payload).then(res => {
 					console.warn(res, '------------ track list')

MingGaoApp/pages/my/myinfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view style="background-color: #fff;">
 		<view class="" style="width: 100%;height: 30rpx;background-color: #f7f7f7;">
-			
+
 		</view>
 		<view class="my_infobox">
 			<view class="my_info_item">
@@ -16,8 +16,9 @@
 				<u-collapse>
 					<u-collapse-item title="隶属海关" name="Docs guide">
 						<p class="u-collapse-content" v-for="(item,index) in userinfo.org_list" :key="index">
-							{{index+1+"、"}}{{item.org_name}}</p>
-							<p v-if="userinfo.org_list.length == 0">暂无组织信息</p>
+							{{index+1+"、"}}{{item.org_name}}
+						</p>
+						<p v-if="userinfo.org_list.length == 0">暂无组织信息</p>
 					</u-collapse-item>
 				</u-collapse>
 			</view>
@@ -55,7 +56,8 @@
 			</view>
 			<view class="my_info_item">
 				<u-button type="primary" text="退出账号" @click="show = true" shape="circle"></u-button>
-				<u-modal :show="show" :title="title" :content='content' :showCancelButton="true" @confirm="confirm" @cancel="show = false"></u-modal>
+				<u-modal :show="show" :title="title" :content='content' :showCancelButton="true" @confirm="confirm"
+					@cancel="show = false"></u-modal>
 			</view>
 		</view>
 	</view>
@@ -69,7 +71,7 @@
 		data() {
 			return {
 				userinfo: {
-					org_list:[]
+					org_list: []
 				},
 				orglist: "",
 				title: "",
@@ -104,11 +106,24 @@
 				});
 			},
 			async confirm() {
-				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=sysmenage.usermanager.user_logout',
-				})
-				console.log(res)
-				if(res){
+				App.globalData.token = '';
+
+				try {
+					const res = await this.$myRequest({
+						url: '/api/api_gateway?method=sysmenage.usermanager.user_logout',
+					})
+					console.log(res)
+					if (res) {
+						App.close();
+						uni.removeStorage({
+							key: 'session_key',
+						})
+						uni.reLaunch({
+							url: '../login/login',
+						});
+					}
+				} catch (e) {
+					//TODO handle the exception
 					App.close();
 					uni.removeStorage({
 						key: 'session_key',
@@ -117,6 +132,7 @@
 						url: '../login/login',
 					});
 				}
+
 			}
 		},
 		onLoad() {
@@ -126,9 +142,10 @@
 </script>
 
 <style lang="less" scoped>
-	page{
+	page {
 		background-color: #f7f7f7;
 	}
+
 	.my_infobox {
 		width: 90%;
 		margin: 0 auto;

MingGaoApp/pages/response/details.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="details-page">
-		<uni-nav-bar :title="tltName" :statusBar="true" :fixed="true" leftIcon="back"
-			@clickRight="handleIMWithVideo" @clickLeft="handleBack">
+		<uni-nav-bar :title="tltName" :statusBar="true" :fixed="true" leftIcon="back" @clickRight="handleIMWithVideo"
+			@clickLeft="handleBack">
 			<image slot="right" style="width: 46rpx; height: 30rpx" src="@/static/response/video.svg" mode="aspectFit">
 			</image>
 		</uni-nav-bar>
@@ -91,7 +91,8 @@
 	} from 'vuex'
 	import store from '@/store/index.js' //需要引入store
 	import {
-		groupBy
+		groupBy,
+		debounce
 	} from 'lodash-es'
 	import dayjs from 'dayjs'
 
@@ -314,7 +315,7 @@
 				console.log(e)
 			},
 
-			handleIMWithVideo() {
+			handleIMWithVideo: debounce(function() {
 				console.log('video im connect', this.val)
 
 				let obj = {
@@ -327,11 +328,11 @@
 				}
 
 				console.log('send_video', obj)
-				
+
 				this.updateCurrentReceiveUserID(this.val.user_id);
 
 				this.transmit(obj)
-			},
+			}, 800),
 			handleKeyboardHeightChange() {
 				console.warn('height change 22323214214124')
 

MingGaoApp/pages/response/video.nvue

@@ -141,7 +141,7 @@
 		},
 
 		methods: {
-			...mapMutations(['updateIsRefusedCall', 'updateTalkingStatus','updateOccupyedStatus']),
+			...mapMutations(['updateIsRefusedCall', 'updateTalkingStatus', 'updateOccupyedStatus']),
 			// 即构 - 视频通话 初始化
 			async setup() {
 				var that = this
@@ -457,63 +457,99 @@
 				}
 
 				this.engine.logoutRoom(that.videoObj.room_id); // 退出房间
-				this.$refs.uToast.show({
-					type: 'default',
-					message: isRefused ? '对方正忙' : '结束视频通话！',
-				})
-				setTimeout(() => {
-					that.videoShow = true
-					that.allStreamList = [];
-					that.allUserViewObjectList = [];
-					var obj = {}
-					// obj = {
-					// 	'action': 'read', // 动作标识，必填
-					// 	'send_user_id': that.videoObj.user_id, // 接收人用户id， 非必填
-					// 	'data': {}
-					// }
-					console.warn('-----------off video 接收人用户id-------------', that.videoObj.user_id, API)
-					obj = {
-						'action': 'list', // 动作标识，必填
-						'type': '当前为挂断',
-						'recv_user_id': that.videoObj.user_id, // 接收人用户id， 非必填
-						'data': {}
-					}
-
-					if (!isRefused) {
-
-						API.socketTask.send({
-							data: JSON.stringify(obj),
-							async success(res) {
-								console.log("消息发送成功");
-							},
-						});
-					}
-
-					if (isNotice) {
-						console.log(this.videoObj, 'is notice')
-
-						if (!that.currentReceiveUserID) {
-							console.warn('当前连接的用户不存在，不是本人发起的通话.')
-						} else {
-							const socketData = {
-								action: 'reject_video', // 动作标识，必填
-								recv_user_id: that.currentReceiveUserID, // 接收人用户id， 非必填
-								data: {},
-							}
-
+				
+				const execExit = () => {
+					console.log('---------------- exec exit')
+					setTimeout(() => {
+						that.videoShow = true
+						that.allStreamList = [];
+						that.allUserViewObjectList = [];
+						var obj = {}
+						// obj = {
+						// 	'action': 'read', // 动作标识，必填
+						// 	'send_user_id': that.videoObj.user_id, // 接收人用户id， 非必填
+						// 	'data': {}
+						// }
+						console.warn('-----------off video 接收人用户id-------------', that.videoObj
+							.user_id, API)
+						obj = {
+							'action': 'list', // 动作标识，必填
+							'type': '当前为挂断',
+							'recv_user_id': that.videoObj.user_id, // 接收人用户id， 非必填
+							'data': {}
+						}
+				
+						if (!isRefused) {
+				
 							API.socketTask.send({
-								data: JSON.stringify(socketData),
+								data: JSON.stringify(obj),
 								async success(res) {
-									console.log('reject_video 消息发送成功 reject_video')
+									console.log("消息发送成功");
 								},
-							})
+							});
 						}
+				
+						if (isNotice) {
+							console.log(this.videoObj, 'is notice')
+				
+							if (!that.currentReceiveUserID) {
+								console.warn('当前连接的用户不存在，不是本人发起的通话.')
+							} else {
+								const socketData = {
+									action: 'reject_video', // 动作标识，必填
+									recv_user_id: that
+										.currentReceiveUserID, // 接收人用户id， 非必填
+									data: {},
+								}
+				
+								API.socketTask.send({
+									data: JSON.stringify(socketData),
+									async success(res) {
+										console.log(
+											'reject_video 消息发送成功 reject_video')
+									},
+								})
+							}
+				
+						}
+				
+						this.handleBack()
+					}, 1500)
+				}
+				
+				this.$refs.uToast.show({
+					type: 'default',
+					message: isRefused ? '对方正忙' : '结束视频通话！',
+				})
+				console.log('------------------------------------------ exec exit exec before')
+				execExit()
+
+				// if (isRefused) {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: isRefused ? '对方正忙' : '结束视频通话！',
+				// 		showCancel: false,
+				// 		confirmText: '好',
+				// 		success: (res) => {
+				// 			execExit()
+				// 		},
+				// 		fail: () => {
+				// 			this.handleBack()
+				// 		}
+				// 	});
+				// } else {
+				// 	this.$refs.uToast.show({
+				// 		type: 'default',
+				// 		message: isRefused ? '对方正忙' : '结束视频通话！',
+				// 	})
+				// 	console.log('------------------------------------------ exec exit exec before')
+				// 	execExit()
+				// }
+
+				
 
 
-					}
 
-					this.handleBack()
-				}, 1500)
 				// uni.redirectTo({
 				// 	url: "/pages/response/index"
 				// })
@@ -553,12 +589,28 @@
 		async onLoad(optinos) {
 			console.log('onload -------------- 1213', this.isVideoCallRefused)
 			if (this.isVideoCallRefused) {
-
-				uni.$u.toast('对方正忙')
-
+				this.$refs.uToast.show({
+					type: 'default',
+					message: '对方正忙',
+				})
+				
 				setTimeout(() => {
 					this.handleBack();
 				}, 1500)
+				// uni.showModal({
+				// 	title: '提示',
+				// 	content: '对方正忙',
+				// 	showCancel: false,
+				// 	confirmText: '好',
+				// 	success: (res) => {
+				// 		setTimeout(() => {
+				// 			this.handleBack();
+				// 		}, 1500)
+				// 	},
+				// 	fail: () => {
+				// 		this.handleBack()
+				// 	}
+				// });
 				return
 			}
 

MingGaoApp/unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/e83ee950-bd4c-11ed-978c-1d0ad1a0a24a
+https://ide.dcloud.net.cn/build/download/e5cfc2d0-bd95-11ed-a4ec-0198a1923e32

MingGaoApp/util/api.js

@@ -12,6 +12,7 @@ export const myRequest = (options) => {
 		data.token = session_key
 
 		if (!session_key) {
+			console.log('session_key',session_key)
 			return Promise.reject('请重新登录');
 		}
 	}
@@ -38,7 +39,7 @@ export const myRequest = (options) => {
 						if (!store.state.isInLoginPage) {
 							uni.setStorageSync('session_key', '')
 							setTimeout(() => {
-								uni.navigateTo({
+								uni.reLaunch({
 									url: "/pages/login/login"
 								})
 							}, 2000)

MingGaoApp/util/url.js

@@ -3,11 +3,14 @@ export default {
 	// wsUrl:process.env.NODE_ENV === 'development' ? "ws://114.115.147.140:12345" : "wss://www.yhswjc.com",
 	// baseUrl:"https://yfznscd.com"
 	// baseUrl:"https://www.toreskj.com"
-	// baseUrl:"https://www.yhswjc.com"
+
 	// baseUrl:"http://192.168.1.52:12345",
 	// wsUrl:"ws://192.168.1.52:12345",
 	// baseUrl:"http://192.168.1.77:12345",
 	// baseUrl:"https://www.toreskj.com",
-	baseUrl:"http://114.115.147.140:12345",
-	wsUrl:"ws://114.115.147.140:12345",
+	baseUrl: "https://www.yhswjc.com",
+	wsUrl: "wss://www.yhswjc.com",
+	// baseUrl:"http://114.115.147.140:12345",
+	// wsUrl:"ws://114.115.147.140:12345",
+
 }