即时通讯问题修改

MingGaoApp/.gitignore

@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
+unpackage/
 
 # Editor directories and files
 .vscode/*

MingGaoApp/App.vue

@@ -65,6 +65,10 @@
 			uni.getStorage({
 				key: 'session_key',
 				success: function(res) {
+					if(!res.data){
+						return
+					}
+					
 					that.globalData.token = res.data
 					// console.log('登录成功了')
 					console.log(res)
@@ -226,6 +230,7 @@
 					} else if (val.action == 'occupy_rsp') {
 						console.warn('----------------------- is refused')
 						// 占线中，挂断发起通话
+						this.$store.commit('updateOccupyedStatus',true);
 						this.$store.commit('updateIsRefusedCall', true)
 					} else if (val.action == 'ok') {
 						this.start(); // 心跳机制
@@ -317,6 +322,10 @@
 				if (this.lockReconnect) {
 					return;
 				};
+				if(!this.globalData.token){
+					return 
+				}
+				
 				this.lockReconnect = true;
 
 				console.log('准备重连');

MingGaoApp/manifest.json

@@ -2,8 +2,8 @@
     "name" : "智网监测",
     "appid" : "__UNI__1BA09AD",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

MingGaoApp/pages/index/components/Gis.vue

@@ -105,7 +105,7 @@
 				const {
 					lng,
 					lat
-				} = first(this.dataSource.walk_lnglat_list[0])
+				} = first(this.dataSource.walk_lnglat_list[0]) || {}
 
 				this.latitude = lat;
 				this.longitude = lng;

MingGaoApp/pages/index/details.vue

@@ -8,9 +8,12 @@
 				<task-tabs @tabClick="handleTabClick" :tabList="tabList"></task-tabs>
 			</u-sticky>
 			<view class="task-details__content">
-				<transition name="slide-fade" mode="out-in" appear>
+				<ClockInRecordComponent :dataSource="taskDetail" :isEdit="isEdit" v-if="currentTabID===1"></ClockInRecordComponent>
+				<EntrapmentComponent :dataSource="taskDetail" :isEdit="isEdit" v-if="currentTabID===2"></EntrapmentComponent>
+				<GisComponent :dataSource="taskDetail" :isEdit="isEdit" v-if="currentTabID===3"></GisComponent>
+				<!-- <transition name="slide-fade" mode="out-in" appear>
 					<component :is="currentComponent" :dataSource="taskDetail" :isEdit="isEdit"></component>
-				</transition>
+				</transition> -->
 			</view>
 		</view>
 		<u-loading-page loading-text="加载中..." :loading="loading" font-size="16"></u-loading-page>
@@ -62,6 +65,7 @@
 		data() {
 			return {
 				currentComponent: ClockInRecordComponent,
+				currentTabID: 1,
 				taskID: '',
 				loading: false,
 				taskDetail: {},
@@ -149,6 +153,7 @@
 				})
 			},
 			handleTabClick(id) {
+				this.currentTabID = id;
 				switch (id) {
 					case 1:
 						this.currentComponent = ClockInRecordComponent;
@@ -159,14 +164,18 @@
 					case 3:
 						this.currentComponent = GisComponent;
 						break;
+					default:
+						this.currentComponent = null;
+						break;
 				}
+				console.log(typeof id, id, this.currentComponent)
 			},
 			async taskfillingdraft() { //任务填报接口
 				// this.gettaskinfo()
 
 				var arr = JSON.parse(JSON.stringify(this.$store.state.worndatabase))
-				console.warn(this.draft,'draft')
-				console.log(arr,'arr draft')
+				console.warn(this.draft, 'draft')
+				console.log(arr, 'arr draft')
 				for (var i = 0; i < arr.length; i++) {
 					for (var j = 0; j < this.draft.length; j++) {
 						if (arr[i].id == this.draft[j].record_id) {

MingGaoApp/pages/my/formRecord/fieldSurveys.vue

@@ -38,10 +38,12 @@
 					<u-switch v-model="baseForm.is_std" activeValue="是" inactiveValue="否"></u-switch>
 				</u-form-item>
 				<u-form-item label="调查株数:" labelWidth="100" prop="check_num" borderBottom>
-					<u--input v-model="baseForm.check_num" border="none" type="number" :maxlength="9"></u--input>
+					<u--input v-model="baseForm.check_num" border="none" type="number" :maxlength="9"
+						@input="value=>baseForm.check_num=value.replace('.','')"></u--input>
 				</u-form-item>
 				<u-form-item label="危害株数:" labelWidth="100" prop="harm_num" borderBottom>
-					<u--input v-model="baseForm.harm_num" border="none" type="number" :maxlength="9"></u--input>
+					<u--input v-model="baseForm.harm_num" border="none" type="number" :maxlength="9"
+						@input="value=>baseForm.harm_num=value.replace('.','')"></u--input>
 				</u-form-item>
 				<u-form-item label="危害部位:" labelWidth="100" prop="harm_place" borderBottom>
 					<u--input v-model="baseForm.harm_place" border="none"></u--input>

MingGaoApp/pages/my/formRecord/trapRecord.vue

@@ -53,11 +53,13 @@
 						<u-row class="mb-10" gutter="10">
 							<u-col span="6">
 								<u--input type="number" style="background-color: #fff;" v-model="item.female_num"
-									border="surround" placeholder="雌" maxlength="9"></u--input>
+									border="surround" placeholder="雌" maxlength="9"
+									@change="value=>item.female_num=value.replace('.','')"></u--input>
 							</u-col>
 							<u-col span="6">
 								<u--input type="number" style="background-color: #fff;" v-model="item.male_num"
-									placeholder="雄" border="surround" maxlength="9"></u--input>
+									placeholder="雄" border="surround" maxlength="9"
+									@change="value=>item.male_num=value.replace('.','')"></u--input>
 							</u-col>
 						</u-row>
 						<u-row class="mb-10">

MingGaoApp/pages/response/video.nvue

@@ -141,7 +141,7 @@
 		},
 
 		methods: {
-			...mapMutations(['updateIsRefusedCall', 'updateTalkingStatus']),
+			...mapMutations(['updateIsRefusedCall', 'updateTalkingStatus','updateOccupyedStatus']),
 			// 即构 - 视频通话 初始化
 			async setup() {
 				var that = this
@@ -441,6 +441,7 @@
 				console.warn('进入了啊offVideo', this.engine)
 				this.updateIsRefusedCall(false);
 				this.updateTalkingStatus(false);
+				this.updateOccupyedStatus(false);
 
 				if (!this.engine) {
 					console.warn('挂断退出 ------- 12131312')
@@ -450,11 +451,11 @@
 				}
 
 				var that = this
-				
-				if(!that.videoObj.room_id){
-					return 
+
+				if (that.videoObj && !that.videoObj.room_id || !that.videoObj) {
+					return
 				}
-				
+
 				this.engine.logoutRoom(that.videoObj.room_id); // 退出房间
 				this.$refs.uToast.show({
 					type: 'default',
@@ -490,16 +491,16 @@
 
 					if (isNotice) {
 						console.log(this.videoObj, 'is notice')
-						
-						if(!that.currentReceiveUserID){
+
+						if (!that.currentReceiveUserID) {
 							console.warn('当前连接的用户不存在，不是本人发起的通话.')
-						}else{
+						} else {
 							const socketData = {
 								action: 'reject_video', // 动作标识，必填
 								recv_user_id: that.currentReceiveUserID, // 接收人用户id， 非必填
 								data: {},
 							}
-							
+
 							API.socketTask.send({
 								data: JSON.stringify(socketData),
 								async success(res) {
@@ -507,8 +508,8 @@
 								},
 							})
 						}
-						
-						
+
+
 					}
 
 					this.handleBack()
@@ -550,9 +551,9 @@
 		},
 
 		async onLoad(optinos) {
-			console.log('onload -------------- 1213')
+			console.log('onload -------------- 1213', this.isVideoCallRefused)
 			if (this.isVideoCallRefused) {
-				
+
 				uni.$u.toast('对方正忙')
 
 				setTimeout(() => {
@@ -592,6 +593,7 @@
 
 		// 页面卸载 - 生命周期
 		onUnload() {
+			this.updateTalkingStatus(false);
 			this.destroyEngine();
 			console.log('onUnload');
 		},

MingGaoApp/store/index.js

@@ -24,6 +24,7 @@ const store = new Vuex.Store({
 		userInfo: {},
 		isInLoginPage:false,
 		currentReceiveUserID:'',// 当前接收到的视频用户ID
+		occupyedStatus:false, // 占线挂断
 	},
 	mutations: {
 		updateVideoInfo(state, payload) {
@@ -54,6 +55,9 @@ const store = new Vuex.Store({
 		},
 		updateCurrentReceiveUserID(state,id){
 			state.currentReceiveUserID = id
+		},
+		updateOccupyedStatus(state,occupyedStatus){
+			state.occupyedStatus = occupyedStatus
 		}
 	},
 	actions: {},

MingGaoApp/unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/3b32b850-b9aa-11ed-b646-51ebc4a57636
+https://ide.dcloud.net.cn/build/download/e83ee950-bd4c-11ed-978c-1d0ad1a0a24a

MingGaoApp/unpackage/dist/dev/app-plus/app-view.js

@@ -18721,28 +18721,22 @@ var render = function () {
             "uni-view",
             { staticClass: _vm._$g(6, "sc"), attrs: { _i: 6 } },
             [
-              _c(
-                "transition",
-                { attrs: { _i: 7 } },
-                [
-                  _c(_vm._$g(8, "is"), {
-                    tag: "component",
-                    attrs: {
-                      dataSource: _vm._$g(8, "a-dataSource"),
-                      isEdit: _vm._$g(8, "a-isEdit"),
-                      _i: 8,
-                    },
-                  }),
-                ],
-                1
-              ),
+              _vm._$g(7, "i")
+                ? _c("ClockInRecordComponent", { attrs: { _i: 7 } })
+                : _vm._e(),
+              _vm._$g(8, "i")
+                ? _c("EntrapmentComponent", { attrs: { _i: 8 } })
+                : _vm._e(),
+              _vm._$g(9, "i")
+                ? _c("GisComponent", { attrs: { _i: 9 } })
+                : _vm._e(),
             ],
             1
           ),
         ],
         1
       ),
-      _c("u-loading-page", { attrs: { _i: 9 } }),
+      _c("u-loading-page", { attrs: { _i: 10 } }),
     ],
     1
   )
@@ -25797,6 +25791,11 @@ var render = function () {
                 [
                   _c("u--input", {
                     attrs: { _i: 25 },
+                    on: {
+                      input: function ($event) {
+                        return _vm.$handleViewEvent($event)
+                      },
+                    },
                     model: {
                       value: _vm._$g(25, "v-model"),
                       callback: function () {},
@@ -25812,6 +25811,11 @@ var render = function () {
                 [
                   _c("u--input", {
                     attrs: { _i: 27 },
+                    on: {
+                      input: function ($event) {
+                        return _vm.$handleViewEvent($event)
+                      },
+                    },
                     model: {
                       value: _vm._$g(27, "v-model"),
                       callback: function () {},
@@ -27385,6 +27389,11 @@ var render = function () {
                                 _c("u--input", {
                                   staticStyle: { "background-color": "#fff" },
                                   attrs: { _i: "31-" + $30 },
+                                  on: {
+                                    change: function ($event) {
+                                      return _vm.$handleViewEvent($event)
+                                    },
+                                  },
                                   model: {
                                     value: _vm._$g("31-" + $30, "v-model"),
                                     callback: function () {},
@@ -27401,6 +27410,11 @@ var render = function () {
                                 _c("u--input", {
                                   staticStyle: { "background-color": "#fff" },
                                   attrs: { _i: "33-" + $30 },
+                                  on: {
+                                    change: function ($event) {
+                                      return _vm.$handleViewEvent($event)
+                                    },
+                                  },
                                   model: {
                                     value: _vm._$g("33-" + $30, "v-model"),
                                     callback: function () {},