巡检点优化

pages/setPolling/selectPolling.vue

@@ -20,7 +20,7 @@
 <script setup>
   import { debounce } from 'lodash-es'
   import { ref, reactive} from 'vue'
-  import { onLoad } from '@dcloudio/uni-app'
+  import { onLoad, onPullDownRefresh } from '@dcloudio/uni-app'
   import { api_inspectionNode } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
@@ -120,6 +120,10 @@
   onLoad((option) => {
     getList(0);
   })
+	
+	onPullDownRefresh(()=>{
+		uni.stopPullDownRefresh()
+	})
 </script>
 
 <style lang="scss" scoped>

pages/setPolling/setPolling.vue

@@ -2,8 +2,8 @@
 	<view class="handler">
 		<view class="body">
 			<view class="scan-box">
-				<view class="scan">
-					<text class="newicon newicon-saoma icon" @click="scanCodes"></text>
+				<view class="scan" @click="scanCodes">
+					<text class="newicon newicon-saoma icon"></text>
 				</view>
 			</view>
 			<view class="container">
@@ -32,7 +32,7 @@
 <script setup>
 	import { SM } from "@/http/http.js"
   import { ref, reactive, computed } from 'vue'
-  import { onLoad, onUnload } from '@dcloudio/uni-app'
+  import { onLoad, onUnload, onShow, onPullDownRefresh } from '@dcloudio/uni-app'
   import { api_inspectionNode, api_inspectionNodeEdit } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
@@ -151,6 +151,9 @@
 					if(res2.list.length>0){
 						dataInfo.pollingData = res2.list[0].name
 						dataInfo.pollingId = res2.list[0].id
+					}else{
+						dataInfo.pollingData = '无'
+						dataInfo.pollingId = null
 					}
 					let data = {
 						code: res,
@@ -158,6 +161,9 @@
 						pollingId: dataInfo.pollingId,
 					}
 					uni.setStorageSync('pollingCode',JSON.stringify(data))
+					if(dataInfo.newPollingData){
+						dataInfo.content = `二维码绑定为“${dataInfo.newPollingData.name}”，原“${dataInfo.pollingData}”二维码被清空，您确认绑定吗？`
+					}
 					dataInfo.type = true
 			  } else {
 			    uni.showToast({
@@ -170,9 +176,11 @@
 	}
 	
   onLoad((option) => {
+		uni.hideLoading();
 		if(option && option.data){
 			let data = JSON.parse(option.data)
 			dataInfo.newPollingData = data
+			dataInfo.type = true
 			console.log(998,data)
 		}
 		if(uni.getStorageSync('pollingCode')){
@@ -183,9 +191,17 @@
 		}
   })
 	
+	onShow(()=>{
+		uni.hideLoading();
+	})
+	
 	onUnload(()=>{
 		setInfoData()
 	})
+	
+	onPullDownRefresh(()=>{
+		uni.stopPullDownRefresh()
+	})
 </script>
 
 <style>