From 7389eb88b24639bde6ac62dcd3c334ae6ceb8710 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 19 Aug 2022 15:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                            |   4 +-
 components/city/city.vue           | 233 -----------------------------
 pages/tabbar/pagehome/pagehome.vue |  13 +-
 3 files changed, 9 insertions(+), 241 deletions(-)
 delete mode 100644 components/city/city.vue

diff --git a/App.vue b/App.vue
index 51f8e2a..7024795 100644
--- a/App.vue
+++ b/App.vue
@@ -15,7 +15,9 @@
 			// #ifdef MP-WEIXIN
 				this.globalData.bgmMusic = wx.createInnerAudioContext();
 			// #endif 
-			this.checkNotification();
+			// #ifdef APP-PLUS
+			// this.checkNotification();
+			// #endif
 		},
 		onShow: function() {
 			if(uni.getStorageSync('token')){
diff --git a/components/city/city.vue b/components/city/city.vue
deleted file mode 100644
index 4aab069..0000000
--- a/components/city/city.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-	<!--地址picker-->
-	<view :status="checkStatus" v-if="lotusAddressData.visible" class="lotus-address-mask">
-		<view :class="lotusAddressData.visible?'lotus-address-box':'lotus-address-box lotus-address-box-out'">
-			<view class="lotus-address-action">
-				<text @tap="cancelPicker" class="lotus-address-action-cancel">取消</text>
-				<text @tap="chosedVal" class="lotus-address-action-affirm">确认</text>
-			</view>
-			<view class="lotus-address-picker-box">
-				<!--省-->
-				<scroll-view scroll-y :scroll-into-view="'pid'+pChoseIndex" class="lotus-address-picker-box-item">
-					<view @tap="clickPicker(0,pIndex,pItem);" :id="'pid'+pIndex" :class="pIndex === pChoseIndex?'lotus-address-picker lotus-address-picker2':'lotus-address-picker'"  v-for="(pItem,pIndex) in province" :key="pIndex">{{pItem}}</view>
-				</scroll-view>
-				<!--市-->
-				<scroll-view scroll-y :scroll-into-view="'cid'+cChoseIndex" class="lotus-address-picker-box-item">
-					<view @tap="clickPicker(1,cIndex,cItem);" :id="'cid'+cIndex" :class="cIndex === cChoseIndex?'lotus-address-picker lotus-address-picker2':'lotus-address-picker'" v-for="(cItem,cIndex) in city" :key="cIndex">{{cItem}}</view>
-				</scroll-view>
-				<!--区-->
-				<scroll-view scroll-y :scroll-into-view="'tid'+tChoseIndex" class="lotus-address-picker-box-item">
-					<view @tap="clickPicker(2,tIndex,tItem);" :id="'tid'+tIndex" :class="tIndex === tChoseIndex?'lotus-address-picker lotus-address-picker2':'lotus-address-picker'" v-for="(tItem,tIndex) in town" :key="tIndex">{{tItem}}</view>
-				</scroll-view>
-				<!--区END-->
-			</view>
-		</view>
-	</view>
-	<!--地址picker END-->
-</template>
-
-<script>
-	import {lotusAddressJson} from  "./city.js";
-	export default {
-		props:['lotusAddressData'],
-		data() {
-			return {
-				visible: false,
-				province:[],
-				city:[],
-				town:[],
-				provinceName:'',
-				cityName:'',
-				townName:'',
-				type:0,//0新增1编辑
-				pChoseIndex:-1,
-				cChoseIndex:-1,
-				tChoseIndex:-1
-			};
-		},
-		methods:{
-			//取消
-			cancelPicker(){
-				const provinceCode = this.getTarId(this.provinceName);
-				const cityCode = this.getTarId(this.cityName);
-				const townCode = this.getTarId(this.townName);
-				this.visible = false;
-				this.$emit("choseVal",{
-					province:this.provinceName,
-					provinceCode,
-					city:this.cityName,
-					cityCode,
-					town:this.townName,
-					townCode,
-					isChose:0,
-					visible:false
-				});
-			},
-			//获取最后选择的省市区的值
-			chosedVal() {
-				this.type = 1;
-				const provinceCode = this.getTarId(this.provinceName);
-				const cityCode = this.getTarId(this.cityName);
-				const townCode = this.getTarId(this.townName);
-				this.visible = false;
-				let isChose = 0;
-				//已选省市区 isChose = 1
-				if((this.provinceName&&this.cityName)||(this.provinceName&&this.cityName&&this.townName)){
-					isChose = 1;
-				}
-				this.$emit("choseVal",{
-					province:this.provinceName,
-					provinceCode,
-					city:this.cityName,
-					cityCode,
-					town:this.townName,
-					townCode,
-					isChose,
-					visible:false
-				});
-			},
-			//获取省市区value
-			getTarId(name,type){
-			    let id = 0;
-			    lotusAddressJson.map((item,index)=>{
-			        if(item.name === name){
-			            id = item.value;
-			        }
-			    });
-			    return id;
-			},
-			//获取市数据
-			getCityArr(parentId){
-			    let city = [];
-			    lotusAddressJson.map((item,index)=>{
-			        if(item.parent === parentId){
-			            city.push(item.name);
-			        }
-			    });
-			    return city;
-			},
-			//获取区数据
-			getTownArr(parentId){
-			    let town = [];
-			    lotusAddressJson.map((item,index)=>{
-			        if(index>34&&item.parent === parentId){
-			            town.push(item.name);
-			        }
-			    });
-			    return town;
-			},
-			//初始化数据
-			initFn(){
-				if(!this.province.length){
-					lotusAddressJson.map((item,index)=>{
-						if(index<=34){
-							this.province.push(item.name);
-						}
-					});
-				}
-				//已选择省市区，高亮显示对应选择省市区
-				const p = this._props.lotusAddressData.provinceName;
-				const c = this._props.lotusAddressData.cityName;
-				const t = this._props.lotusAddressData.townName;
-				//已选省
-				if(p){
-					this.pChoseIndex = this.getTarIndex(this.province,p);
-				}
-				//已选市
-				if(p&&c){
-					const pid = this.getTarId(p);
-					this.city = this.getCityArr(pid);
-					this.cChoseIndex = this.getTarIndex(this.city,c);
-				}
-				//已选区
-				if(p&&c&&t){
-					const cid= this.getTarId(c);
-					this.town = this.getTownArr(cid);
-					this.tChoseIndex = this.getTarIndex(this.town,t);
-				}
-				//未选省市区
-				if(!p&&!c&&!t){
-					this.pChoseIndex = -1;
-					this.cChoseIndex = -1;
-					this.tChoseIndex = -1;
-					this.city = [];
-					this.town = [];
-				}
-			},
-			//获取已选省市区
-			getChosedData(){
-				const pid = this.getTarId(this.provinceName,'province');
-				this.city = this.getCityArr(pid);
-				const cid= this.getTarId(this.cityName,'city');
-				this.town = this.getTownArr(cid);
-				//已选省市区获取对应index
-				if(this.provinceName){
-					this.pChoseIndex = this.getTarIndex(this.province,this.provinceName);
-				}
-				if(this.cityName){
-					this.cChoseIndex = this.getTarIndex(this.city,this.cityName);
-				}
-				if(this.townName){
-					this.tChoseIndex = this.getTarIndex(this.town,this.townName);
-				}
-			},
-			//选择省市区交互
-			clickPicker(type,index,name){
-				//省
-				if(type === 0){
-					this.pChoseIndex = index;
-					this.provinceName = name;
-					this.cChoseIndex = -1;
-					this.tChoseIndex = -1;
-					this.cityName = '';
-					this.townName = '';
-				}
-				//市
-				if(type ===1){
-					this.cChoseIndex = index;
-					this.cityName = name;
-					this.tChoseIndex = -1;
-					this.townName = '';
-				}
-				//区
-				if(type === 2){
-					this.tChoseIndex = index;
-					this.townName = name;
-				}
-				//获取省市区数据
-				this.getChosedData();
-			},
-			//获取已选省市区index
-			getTarIndex(arr,tarName){
-			    let cIndex = 0;
-			    arr.map((item,index)=>{
-			        if(item === tarName){
-			            cIndex = index;
-			        }
-			    });
-			    return cIndex;
-			}
-		},
-		computed:{
-			checkStatus(){
-				let t = null;
-				const _this = this;
-				if(!_this.visible){
-					_this.visible = _this._props.lotusAddressData.visible;
-					//获取省市区
-					_this.provinceName = _this._props.lotusAddressData.provinceName;
-					_this.cityName = _this._props.lotusAddressData.cityName;
-					_this.townName = _this._props.lotusAddressData.townName;
-					//生成初始化数据
-					_this.initFn();
-					t = _this.visible;
-				}
-				return t;
-			}
-		}
-	}
-</script>
-
-<style lang="less">
-@import "./city.css";
-</style>
diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue
index eb306a0..5fc176f 100644
--- a/pages/tabbar/pagehome/pagehome.vue
+++ b/pages/tabbar/pagehome/pagehome.vue
@@ -34,7 +34,7 @@
 								<view class="fon60 bold">{{project_count || 0}}</view>
 							</view>
 							<view class="bleft" style="height: 90rpx;"></view>
-							<view class="disjcac fc width50" @click="connectEv">
+							<view class="disjcac fc width50">
 								<view class="fon26 col9">实时工单</view>
 								<view class="fon60 bold">{{project_error_count || 0}}</view>
 							</view>
@@ -352,6 +352,10 @@
 			// 调用首页信息查询事件
 			this.checkHome();
 			console.log(this.role,'角色id')
+			// 刷新连接
+			if(!this.ifConnect && this.uid){
+				this.connect();
+			}
 		},
 		onLoad(options) {
 			// #ifdef H5 || APP-PLUS
@@ -370,9 +374,7 @@
 			this.getFaultsList();
 			// 获取设置信息
 			this.getSettings();
-			if(!this.ifConnect && this.uid){
-				this.connect();
-			}
+			
 		},
 		methods: {
 			// 获取设置信息
@@ -388,9 +390,6 @@
 			    	}
 			    })
 			},
-			connectEv(){
-				socket.io.reconnect();
-			},
 			connect() {
 				const socket = io("ws://7and5.cn:2120",{
 				  query: {},