diff --git a/pages.json b/pages.json
index 0330e249..99e47d25 100644
--- a/pages.json
+++ b/pages.json
@@ -1426,6 +1426,36 @@
 		  "navigationBarTitleText": "",
 		  "enablePullDownRefresh": false
 		}
+	  },
+	  {
+		"path": "pages/projectEnd/ukashManage/materials",
+		"style": {
+		  "navigationBarTitleText": "",
+		  "enablePullDownRefresh": false
+		}
+	  },
+	   {
+		"path": "pages/projectEnd/ukashManage/lookDetails",
+		"style": {
+		  "navigationBarTitleText": "",
+		  "enablePullDownRefresh": false
+		}
+	  },
+	  {
+		  "path" : "pages/projectEnd/visitorsManage/visitorsManage",
+		  "style" : 
+		  {
+			  "navigationBarTitleText" : "访客管理",
+			  "enablePullDownRefresh" : true
+		  }
+	  },
+	  {
+		  "path" : "pages/projectEnd/visitorsManage/visitorsDetails",
+		  "style" : 
+		  {
+			  "navigationBarTitleText" : "",
+			  "enablePullDownRefresh" : false
+		  }
 	  }
 	],
 	// "subPackages":[{
diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue
index 5bbd29b4..3b60b7b7 100644
--- a/pages/projectEnd/projectIndex/projectIndex.vue
+++ b/pages/projectEnd/projectIndex/projectIndex.vue
@@ -1,66 +1,66 @@
 <template>
-  <view class="fullHeight projectIndexPage" style="background-color: white">
-    <scroll-view class="" :class="accountType == 5 || accountType == 6 || accountType == 10 ? 'smallHeight' : ''"
-                 scroll-y>
-      <headers :showBack="accountType == 5 || accountType == 6 || accountType == 10 ? false : true"
-               :themeType="'white'">
-        <view class="headerName" @click="toDept">
-          {{ projectDetail.projectName }}
-        </view>
-      </headers>
-      <image src="/static/projectIndexBG.png" class="projectIndexBG"
-             :style="{ height: systemInfo.statusBarHeight + 357 + 'px' }"></image>
-      <view class="topBoxContent">
-        <view class="" style="height: 20px"></view>
-        <view class="progressBox">
-          <image src="/static/progressLine.png" class="progressLine"></image>
-          <view class="title1"> 工程进度</view>
-          <view class="title2">
-            <text>{{
+	<view class="fullHeight projectIndexPage" style="background-color: white">
+		<scroll-view class="" :class="accountType == 5 || accountType == 6 || accountType == 10 ? 'smallHeight' : ''"
+			scroll-y>
+			<headers :showBack="accountType == 5 || accountType == 6 || accountType == 10 ? false : true"
+				:themeType="'white'">
+				<view class="headerName" @click="toDept">
+					{{ projectDetail.projectName }}
+				</view>
+			</headers>
+			<image src="/static/projectIndexBG.png" class="projectIndexBG"
+				:style="{ height: systemInfo.statusBarHeight + 357 + 'px' }"></image>
+			<view class="topBoxContent">
+				<view class="" style="height: 20px"></view>
+				<view class="progressBox">
+					<image src="/static/progressLine.png" class="progressLine"></image>
+					<view class="title1"> 工程进度</view>
+					<view class="title2">
+						<text>{{
                 projectDetail.periodRatio ? projectDetail.periodRatio : '--'
               }}
-            </text>
-            <text class="unit">%</text>
-          </view>
-          <text class="status" :class="projectDetail.contractPeriodType == 2 ? 'redStatus' : ''">{{
+						</text>
+						<text class="unit">%</text>
+					</view>
+					<text class="status" :class="projectDetail.contractPeriodType == 2 ? 'redStatus' : ''">{{
               projectDetail.contractPeriodType == 1 ? '正常' : '已延期'
             }}
-          </text>
-        </view>
-        <view class="weatherBox">
-          <view class="top">
-            {{ weatherInfo.temperature }}℃
-            <image class="weatherIcon"
-                   :src=" '/static/weatherIcon/' +weatherIcon(weatherInfo.weather) +'.png'">
-            </image>
-          </view>
-          <view class="bottom">
-            <!-- {{weatherInfo.reporttime.split(' ')[0]}} -->
-            {{ weatherInfo.winddirection }}风 {{ weatherInfo.windpower }}级
-          </view>
-        </view>
-        <view class="dateBox">
-          <view class="item">
-            <view class="">
-              {{
+					</text>
+				</view>
+				<view class="weatherBox">
+					<view class="top">
+						{{ weatherInfo.temperature }}℃
+						<image class="weatherIcon"
+							:src=" '/static/weatherIcon/' +weatherIcon(weatherInfo.weather) +'.png'">
+						</image>
+					</view>
+					<view class="bottom">
+						<!-- {{weatherInfo.reporttime.split(' ')[0]}} -->
+						{{ weatherInfo.winddirection }}风 {{ weatherInfo.windpower }}级
+					</view>
+				</view>
+				<view class="dateBox">
+					<view class="item">
+						<view class="">
+							{{
                 projectDetail.contractPeriodStartTime != null
                     ? projectDetail.contractPeriodStartTime
                     : '—.—.—'
               }}
-            </view>
-            <view class=""> 项目开工日期</view>
-          </view>
-          <view class="item item2">
-            <view class="">
-              {{
+						</view>
+						<view class=""> 项目开工日期</view>
+					</view>
+					<view class="item item2">
+						<view class="">
+							{{
                 projectDetail.contractPeriodEndTime != null
                     ? projectDetail.contractPeriodEndTime
                     : '—.—.—'
               }}
-            </view>
-            <view class=""> 要求完成日期</view>
-          </view>
-          <!-- <view class="item">
+						</view>
+						<view class=""> 要求完成日期</view>
+					</view>
+					<!-- <view class="item">
             <view class="">
               —.—.—
             </view>
@@ -68,37 +68,37 @@
               预计完成日期
             </view>
           </view> -->
-        </view>
-      </view>
-      <view class="moudleContent">
-        <view class="moudleTitle"> ·已有产品·</view>
-        <view class="moudleBox">
-          <view class="moudleItem" @click="goMoudleFn(item)" v-for="(item, index) in list" :key="index"
-                v-if="item.operation && item.moduleType == 2 && item.appShow == 1">
-            <view class="inner" v-if="COMPANY=='sanjiang'">
-              <!-- <view class="imgBox" v-if="iconType == 1">
+				</view>
+			</view>
+			<view class="moudleContent">
+				<view class="moudleTitle"> ·已有产品·</view>
+				<view class="moudleBox">
+					<view class="moudleItem" @click="goMoudleFn(item)" v-for="(item, index) in list" :key="index"
+						v-if="item.operation && item.moduleType == 2 && item.appShow == 1">
+						<view class="inner" v-if="COMPANY=='sanjiang'">
+							<!-- <view class="imgBox" v-if="iconType == 1">
                 <image class="img" :src="'/static/moudleImg/' + item.moduleIcon + '.png'"></image>
               </view> -->
-              <view class="imgBox" v-if="item.bigModuleIcon">
-                <image class="img" :src="'/static/sjjtIcon/' + item.bigModuleIcon + '.png'"></image>
-              </view>
-              <view class="desc">
-                {{ item.appName || item.moduleName }}
-              </view>
-            </view>
-            <view class="inner" v-else>
-              <view class="imgBox" v-if="iconType == 1">
-                <image class="img" :src="'/static/moudleImg/' + item.moduleIcon + '.png'"></image>
-              </view>
-              <view class="imgBox" v-if="iconType == 2">
-                <image class="img" :src="'/static/moudleImg/' + item.bigModuleIcon + '.png'"></image>
-              </view>
-              <view class="desc">
-                {{ item.appName || item.moduleName }}
-              </view>
-            </view>
-          </view>
-          <!-- <view class="moudleItem" @click="goMoudleFnTest()">
+							<view class="imgBox" v-if="item.bigModuleIcon">
+								<image class="img" :src="'/static/sjjtIcon/' + item.bigModuleIcon + '.png'"></image>
+							</view>
+							<view class="desc">
+								{{ item.appName || item.moduleName }}
+							</view>
+						</view>
+						<view class="inner" v-else>
+							<view class="imgBox" v-if="iconType == 1">
+								<image class="img" :src="'/static/moudleImg/' + item.moduleIcon + '.png'"></image>
+							</view>
+							<view class="imgBox" v-if="iconType == 2">
+								<image class="img" :src="'/static/moudleImg/' + item.bigModuleIcon + '.png'"></image>
+							</view>
+							<view class="desc">
+								{{ item.appName || item.moduleName }}
+							</view>
+						</view>
+					</view>
+					<!-- <view class="moudleItem" @click="goMoudleFnTest()">
             <view class="inner">
               <view class="imgBox">
                 <image class="img" src=""></image>
@@ -108,9 +108,9 @@
               </view>
             </view>
           </view> -->
-        </view>
-      </view>
-      <!-- 	<view class="moudleTitle">
+				</view>
+			</view>
+			<!-- 	<view class="moudleTitle">
       未解锁模块
     </view>
     <view class="moudleBox moudleBox2">
@@ -125,941 +125,946 @@
         </view>
       </view>
     </view> -->
-    </scroll-view>
-    <uni-popup ref="popupqrcode" type="center">
-      <view class="qrcodeItem">
-        <view class="title"> 打卡成功</view>
-        <view class="checkingPointName">
-          巡检点：{{ qrCode.checkingPointName }}
-        </view>
-        <view class="position"> 巡检点位置：{{ qrCode.position }}</view>
-      </view>
-    </uni-popup>
-    <footers :activeTab="'projectEnd'" v-if="accountType == 5 || accountType == 6 || accountType == 10"></footers>
-  </view>
+		</scroll-view>
+		<uni-popup ref="popupqrcode" type="center">
+			<view class="qrcodeItem">
+				<view class="title"> 打卡成功</view>
+				<view class="checkingPointName">
+					巡检点：{{ qrCode.checkingPointName }}
+				</view>
+				<view class="position"> 巡检点位置：{{ qrCode.position }}</view>
+			</view>
+		</uni-popup>
+		<footers :activeTab="'projectEnd'" v-if="accountType == 5 || accountType == 6 || accountType == 10"></footers>
+	</view>
 </template>
 
 <script>
-import headers from '../../../components/headers/headers.vue'
-import footers from '../../../components/footers/footers.vue'
-import {
-  closeBle
-} from '@/static/js/BLEConn.js'
-import {
-  getBottomLevelData
-} from "@/utils/tool.js"
+	import headers from '../../../components/headers/headers.vue'
+	import footers from '../../../components/footers/footers.vue'
+	import {
+		closeBle
+	} from '@/static/js/BLEConn.js'
+	import {
+		getBottomLevelData
+	} from "@/utils/tool.js"
 
-export default {
-  components: {
-    headers,
-    footers
-  },
-  data() {
-    return {
-      qrCode: {},
-      projectDetail: {
-        projectName: '',
-        contractPeriodEndTime: '',
-        contractPeriodStartTime: '', //-.-.-
-        contractPeriodType: 1, //1是正常  2是已延期
-        periodRatio: 0
-      },
-      userInfo: {},
-      searchsn: '',
-      accountType: 1,
-      list: [],
-      weatherInfo: {
-        city: '--',
-        weather: '-',
-        temperature: '--',
-        winddirection: '--',
-        windpower: '--',
-        humidity: '--'
-      },
-      iconType: '1',
-      systemInfo: {
-        statusBarHeight: 0
-      },
-      styType: '',
-      //天气
-      imgUrl: '',
-      date: '', //现在时间
-      // weatherInfo: '--',
-      adressDetail: '--',
-      city: '',
-      url: '',
-      versionData: '',
+	export default {
+		components: {
+			headers,
+			footers
+		},
+		data() {
+			return {
+				qrCode: {},
+				projectDetail: {
+					projectName: '',
+					contractPeriodEndTime: '',
+					contractPeriodStartTime: '', //-.-.-
+					contractPeriodType: 1, //1是正常  2是已延期
+					periodRatio: 0
+				},
+				userInfo: {},
+				searchsn: '',
+				accountType: 1,
+				list: [],
+				weatherInfo: {
+					city: '--',
+					weather: '-',
+					temperature: '--',
+					winddirection: '--',
+					windpower: '--',
+					humidity: '--'
+				},
+				iconType: '1',
+				systemInfo: {
+					statusBarHeight: 0
+				},
+				styType: '',
+				//天气
+				imgUrl: '',
+				date: '', //现在时间
+				// weatherInfo: '--',
+				adressDetail: '--',
+				city: '',
+				url: '',
+				versionData: '',
 
-    }
-  },
-  mounted() {
-    this.loadWeather();
-  },
-  onShow() {
-    this.getSystemLogoConfig()
-    var userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-    if (this.accountType == 5 || this.accountType == 6) {
-      // this.searchsn = userInfo.sn
-      // let sn = uni.getStorageSync("dept");
-      // this.searchsn = getBottomLevelData([sn])[0].projectSn;
-      this.getProjectSn(() => {
-        this.getProjectDetail()
-        let arr = userInfo.menuAuthority.moduleList;
-        this.getAllModule(arr)
-      })
+			}
+		},
+		mounted() {
+			this.loadWeather();
+		},
+		onShow() {
+			this.getSystemLogoConfig()
+			var userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			if (this.accountType == 5 || this.accountType == 6) {
+				// this.searchsn = userInfo.sn
+				// let sn = uni.getStorageSync("dept");
+				// this.searchsn = getBottomLevelData([sn])[0].projectSn;
+				this.getProjectSn(() => {
+					this.getProjectDetail()
+					let arr = userInfo.menuAuthority.moduleList;
+					this.getAllModule(arr)
+				})
 
-    } else if (this.accountType == 10) {
-      // let sn = uni.getStorageSync("dept");
-      // this.searchsn = getBottomLevelData([sn])[0].projectSn;
-      this.getProjectSn(() => {
-        // console.log(sn, 888999)
-        this.getProjectDetail()
-        this.getAllModule([])
-        uni.setStorageSync('userInfo', JSON.stringify({
-          ...this.userInfo,
-          sn: this.searchsn
-        }))
-        uni.setStorageSync('userInfoObj', {
-          ...this.userInfo,
-          sn: this.searchsn
-        })
-      })
+			} else if (this.accountType == 10) {
+				// let sn = uni.getStorageSync("dept");
+				// this.searchsn = getBottomLevelData([sn])[0].projectSn;
+				this.getProjectSn(() => {
+					// console.log(sn, 888999)
+					this.getProjectDetail()
+					this.getAllModule([])
+					uni.setStorageSync('userInfo', JSON.stringify({
+						...this.userInfo,
+						sn: this.searchsn
+					}))
+					uni.setStorageSync('userInfoObj', {
+						...this.userInfo,
+						sn: this.searchsn
+					})
+				})
 
-      // this.sendRequest({
-      // 	url: 'xmgl/company/getTenantOrgTreeList',
-      // 	data: {
-      // 		userId: userInfo.userId,
-      // 	},
-      // 	method: 'POST',
-      // 	success(res) {
-      // 		console.log(res, '777888')
-      // 		if (res && res.result && res.result.length > 0) {
-      // 			let responseData = res.result;
-      // 			that.selectedDefaultProject(responseData[0])
-      // 		}
-      // 	}
-      // })
-    } else {
-      this.projectDetail = JSON.parse(uni.getStorageSync('projectDetail'))
-      this.loadWeather()
-      this.getAllModule()
-    }
-    closeBle()
-        .then((res) => {
-          // this.closeDiv = false
-          // this.clear()
-          // uni.hideLoading()
-          console.log('断开蓝牙成功')
-        })
-        .catch((err) => {
-          // uni.hideLoading()
-          console.log('断开蓝牙失败')
-        })
-    if (uni.getStorageSync('oldObj')) {
-      uni.removeStorageSync('oldObj')
-    }
-    if (uni.getStorageSync('buildObj')) {
-      uni.removeStorageSync('buildObj')
-    }
-  },
-  onLoad() {
-    var userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-    console.log('userInfo===========', userInfo)
-    this.userInfo = userInfo
-    this.accountType = userInfo.accountType
-    this.accountType = userInfo.accountType
-    this.styType = userInfo.styleType
-    this.systemInfo = uni.getStorageSync('systemInfo')
-    this.getSystemLogoConfig()
-    // #ifdef APP-PLUS
-    this.viewVersionInfo()
-    // #endif
-  },
-  methods: {
-    getProjectSn(next) {
-      var userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-      this.sendRequest({
-        url: "xmgl/company/getTenantOrgTreeList",
-        data: {
-          userId: userInfo.userId,
-          headquartersSn: uni.getStorageSync("company").headquartersSn
-        },
-        method: "POST",
-        success: (res) => {
-          console.log(res, "getTenantOrgTreeList");
-          let three = getBottomLevelData(res.result)[0];
-          console.log(three, "threeeeeee");
-          let dept = uni.getStorageSync("dept");
-          if (!dept) {
-            dept = three.projectSn;
-            uni.setStorageSync("dept", dept)
-          }
-          this.searchsn = dept;
-          next()
-        }
-      })
-    },
-    toDept() {
-      uni.navigateTo({
-        url: "/pages/deptList/deptList"
-      })
-    },
-    // 默认选中第一个组织的第一个项目
-    selectedDefaultProject(obj) {
-      console.log(obj.list, 888999)
-      // if (obj.list && obj.list.length > 0) {
-      // 	obj.list.map((item) => {
-      // 		this.selectedDefaultProject(item);
-      // 	});
-      // } else {
-      // 	// this.searchsn = obj.sn
-      // 	let sn = uni.getStorageSync("dept");
-      // 	this.searchsn = getBottomLevelData([sn])[0].projectSn;
-      // 	console.log(obj.sn, 888999)
-      // 	this.getProjectDetail()
-      // 	this.getAllModule([])
-      // 	uni.setStorageSync('userInfo', JSON.stringify({
-      // 		...this.userInfo,
-      // 		sn: this.searchsn
-      // 	}))
-      // }
-    },
-    viewVersionInfo() {
-      console.log('进入页面调用');
-      //fix 避开检查更新  罗劲章
-      // return false
-      var that = this
-      //获取当前应用版本
-      plus.runtime.getProperty(plus.runtime.appid, function (widgetInfo) {
-        // console.log('版本号的数据信息', widgetInfo.version);//其实是应用版本名称
-        console.log('应用版本名称', widgetInfo.version);
-        that.versionName = widgetInfo.version
-        console.log('应用版本号', widgetInfo.versionCode);
-        that.versionNo = widgetInfo.versionCode
-      })
-      console.log('viewVersionInfo', that.url_config)
-      // uni.navigateTo({
-      // 	url:'versionInfo'
-      // })
-      if (
-          this.systemInfo.platform.indexOf('android') != -1 &&
-          typeof plus !== 'undefined'
-      ) {
-        //获取最新版本
-        that.sendRequest({
-          url: 'xmgl/appVersion/getAppVersion',
-          data: {},
-          method: 'POST',
-          success(res2) {
-            console.log('获取当前app应用版本名称', that.versionName);
-            console.log('获取平台版本名称', res2.result.versionName);
-            let jxjAppVersionName = res2.result.versionName
-            console.log('获取当前app应用版本号', that.versionNo);
-            console.log('获取平台版本号', res2.result.versionNo);
-            let jxjAppVersionNo = res2.result.versionNo
+				// this.sendRequest({
+				// 	url: 'xmgl/company/getTenantOrgTreeList',
+				// 	data: {
+				// 		userId: userInfo.userId,
+				// 	},
+				// 	method: 'POST',
+				// 	success(res) {
+				// 		console.log(res, '777888')
+				// 		if (res && res.result && res.result.length > 0) {
+				// 			let responseData = res.result;
+				// 			that.selectedDefaultProject(responseData[0])
+				// 		}
+				// 	}
+				// })
+			} else {
+				this.projectDetail = JSON.parse(uni.getStorageSync('projectDetail'))
+				this.loadWeather()
+				this.getAllModule()
+			}
+			closeBle()
+				.then((res) => {
+					// this.closeDiv = false
+					// this.clear()
+					// uni.hideLoading()
+					console.log('断开蓝牙成功')
+				})
+				.catch((err) => {
+					// uni.hideLoading()
+					console.log('断开蓝牙失败')
+				})
+			if (uni.getStorageSync('oldObj')) {
+				uni.removeStorageSync('oldObj')
+			}
+			if (uni.getStorageSync('buildObj')) {
+				uni.removeStorageSync('buildObj')
+			}
+		},
+		onLoad() {
+			var userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			console.log('userInfo===========', userInfo)
+			this.userInfo = userInfo
+			this.accountType = userInfo.accountType
+			this.accountType = userInfo.accountType
+			this.styType = userInfo.styleType
+			this.systemInfo = uni.getStorageSync('systemInfo')
+			this.getSystemLogoConfig()
+			// #ifdef APP-PLUS
+			this.viewVersionInfo()
+			// #endif
+		},
+		methods: {
+			getProjectSn(next) {
+				var userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+				this.sendRequest({
+					url: "xmgl/company/getTenantOrgTreeList",
+					data: {
+						userId: userInfo.userId,
+						headquartersSn: uni.getStorageSync("company").headquartersSn
+					},
+					method: "POST",
+					success: (res) => {
+						console.log(res, "getTenantOrgTreeList");
+						let three = getBottomLevelData(res.result)[0];
+						console.log(three, "threeeeeee");
+						let dept = uni.getStorageSync("dept");
+						if (!dept) {
+							dept = three.projectSn;
+							uni.setStorageSync("dept", dept)
+						}
+						this.searchsn = dept;
+						next()
+					}
+				})
+			},
+			toDept() {
+				uni.navigateTo({
+					url: "/pages/deptList/deptList"
+				})
+			},
+			// 默认选中第一个组织的第一个项目
+			selectedDefaultProject(obj) {
+				console.log(obj.list, 888999)
+				// if (obj.list && obj.list.length > 0) {
+				// 	obj.list.map((item) => {
+				// 		this.selectedDefaultProject(item);
+				// 	});
+				// } else {
+				// 	// this.searchsn = obj.sn
+				// 	let sn = uni.getStorageSync("dept");
+				// 	this.searchsn = getBottomLevelData([sn])[0].projectSn;
+				// 	console.log(obj.sn, 888999)
+				// 	this.getProjectDetail()
+				// 	this.getAllModule([])
+				// 	uni.setStorageSync('userInfo', JSON.stringify({
+				// 		...this.userInfo,
+				// 		sn: this.searchsn
+				// 	}))
+				// }
+			},
+			viewVersionInfo() {
+				console.log('进入页面调用');
+				//fix 避开检查更新  罗劲章
+				// return false
+				var that = this
+				//获取当前应用版本
+				plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+					// console.log('版本号的数据信息', widgetInfo.version);//其实是应用版本名称
+					console.log('应用版本名称', widgetInfo.version);
+					that.versionName = widgetInfo.version
+					console.log('应用版本号', widgetInfo.versionCode);
+					that.versionNo = widgetInfo.versionCode
+				})
+				console.log('viewVersionInfo', that.url_config)
+				// uni.navigateTo({
+				// 	url:'versionInfo'
+				// })
+				if (
+					this.systemInfo.platform.indexOf('android') != -1 &&
+					typeof plus !== 'undefined'
+				) {
+					//获取最新版本
+					that.sendRequest({
+						url: 'xmgl/appVersion/getAppVersion',
+						data: {},
+						method: 'POST',
+						success(res2) {
+							console.log('获取当前app应用版本名称', that.versionName);
+							console.log('获取平台版本名称', res2.result.versionName);
+							let jxjAppVersionName = res2.result.versionName
+							console.log('获取当前app应用版本号', that.versionNo);
+							console.log('获取平台版本号', res2.result.versionNo);
+							let jxjAppVersionNo = res2.result.versionNo
 
-            if (res2.result && jxjAppVersionNo !== that.versionNo) {
-              uni.showModal({
-                title: '版本更新',
-                content: '更新内容：' + res2.result.versionDescribe,
-                // confirmText: '更新',
-                showCancel: false,
-                success(res) {
-                  if (res.confirm) {
-                    console.log('用户点击确定')
-                    // var url = that.url_config + 'image/' + JSON.parse(res2.result.downloadUrl)[0].url//地址拼错啦，直接返回的就是下载地址
-                    var url = JSON.parse(res2.result.downloadUrl)[0].url
-                    console.log('apk地址', url)
-                    uni.showModal({
-                      title: '提示',
-                      content: '正在后台下载更新资源，请耐心等待......',
-                      showCancel: false
-                    })
-                    uni.downloadFile({
-                      url: url,
-                      success: (res) => {
-                        // uni.hideLoading()
-                        console.log('res', res)
-                        if (res.statusCode === 200) {
-                          console.log('下载成功')
-                          var fileSaveUrl = plus.io
-                              .convertLocalFileSystemURL(
-                                  res.tempFilePath
-                              )
-                          plus.runtime.openFile(res
-                              .tempFilePath) //选择软件打开文件
-                        }
-                      }
-                    })
-                  } else if (res.cancel) {
-                    console.log('用户点击取消')
-                  }
-                }
-              })
-            } else {
-              // uni.showToast({
-              // 	title: '您已经是最新版本啦！',
-              // 	icon: 'none'
-              // })
-            }
-          }
-        })
-      }
-    },
-    weatherIcon(index) {
-      if (index == "晴") {
-        return "w_sun";
-      } else if (index == "多云") {
-        return "w_overcast";
-      } else if (index == "阴") {
-        return "w_cloud";
-      } else if (index.indexOf("雨")) {
-        return "w_rain";
-      } else if (index.indexOf("雷")) {
-        return "w_thunder";
-      } else if (index.indexOf("雪")) {
-        return "w_snow";
-      } else if (index.indexOf("雾")) {
-        return "w_fog";
-      } else {
-        return "w_cloud";
-      }
-    },
+							if (res2.result && jxjAppVersionNo !== that.versionNo) {
+								uni.showModal({
+									title: '版本更新',
+									content: '更新内容：' + res2.result.versionDescribe,
+									// confirmText: '更新',
+									showCancel: false,
+									success(res) {
+										if (res.confirm) {
+											console.log('用户点击确定')
+											// var url = that.url_config + 'image/' + JSON.parse(res2.result.downloadUrl)[0].url//地址拼错啦，直接返回的就是下载地址
+											var url = JSON.parse(res2.result.downloadUrl)[0].url
+											console.log('apk地址', url)
+											uni.showModal({
+												title: '提示',
+												content: '正在后台下载更新资源，请耐心等待......',
+												showCancel: false
+											})
+											uni.downloadFile({
+												url: url,
+												success: (res) => {
+													// uni.hideLoading()
+													console.log('res', res)
+													if (res.statusCode === 200) {
+														console.log('下载成功')
+														var fileSaveUrl = plus.io
+															.convertLocalFileSystemURL(
+																res.tempFilePath
+															)
+														plus.runtime.openFile(res
+															.tempFilePath) //选择软件打开文件
+													}
+												}
+											})
+										} else if (res.cancel) {
+											console.log('用户点击取消')
+										}
+									}
+								})
+							} else {
+								// uni.showToast({
+								// 	title: '您已经是最新版本啦！',
+								// 	icon: 'none'
+								// })
+							}
+						}
+					})
+				}
+			},
+			weatherIcon(index) {
+				if (index == "晴") {
+					return "w_sun";
+				} else if (index == "多云") {
+					return "w_overcast";
+				} else if (index == "阴") {
+					return "w_cloud";
+				} else if (index.indexOf("雨")) {
+					return "w_rain";
+				} else if (index.indexOf("雷")) {
+					return "w_thunder";
+				} else if (index.indexOf("雪")) {
+					return "w_snow";
+				} else if (index.indexOf("雾")) {
+					return "w_fog";
+				} else {
+					return "w_cloud";
+				}
+			},
 
-    getSystemLogoConfig() {
-      var that = this
-      this.sendRequest({
-        url: 'xmgl/systemLogoConfig/selectSystemLogoConfig',
-        data: {},
-        method: 'GET',
-        success(res) {
-          console.log(res.result.iconType)
-          that.iconType = res.result.iconType ? res.result.iconType : '1'
-        }
-      })
-    },
-    loadWeather() {
-      console.log('进来了吗：==========');
-      //获取天气温度等信息
-      let that = this
-      uni.getLocation({
-        type: 'gcj02',
-        geocode: true,
-        isHighAccuracy: "true",
-        accuracy: "best", // 精度值为20m
-        success: function (res) {
-          console.log('当前位置的经度：' + res.longitude);
-          console.log('当前位置的纬度：' + res.latitude);
-          var location = res.longitude + ',' + res.latitude
-          //通过当前经纬度获取当前地址
-          uni.request({
-            url: "https://restapi.amap.com/v3/geocode/regeo",
-            data: {
-              key: "56c91fb2683e5bf0f46014ac200d4c1b", //高德地图key
-              location: location
-            },
-            method: "GET",
-            success(res) {
+			getSystemLogoConfig() {
+				var that = this
+				this.sendRequest({
+					url: 'xmgl/systemLogoConfig/selectSystemLogoConfig',
+					data: {},
+					method: 'GET',
+					success(res) {
+						console.log(res.result.iconType)
+						that.iconType = res.result.iconType ? res.result.iconType : '1'
+					}
+				})
+			},
+			loadWeather() {
+				console.log('进来了吗：==========');
+				//获取天气温度等信息
+				let that = this
+				uni.getLocation({
+					type: 'gcj02',
+					geocode: true,
+					isHighAccuracy: "true",
+					accuracy: "best", // 精度值为20m
+					success: function(res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+						var location = res.longitude + ',' + res.latitude
+						//通过当前经纬度获取当前地址
+						uni.request({
+							url: "https://restapi.amap.com/v3/geocode/regeo",
+							data: {
+								key: "56c91fb2683e5bf0f46014ac200d4c1b", //高德地图key
+								location: location
+							},
+							method: "GET",
+							success(res) {
 
-              console.log("地址", res)
-              if (res.data.status == "1") {
-                var one = res.data.regeocode.formatted_address
-                if (one) {
-                  that.adressDetail = one.substr(3, 3) + one.substr(9,
-                      4) + one.substr(20, 7)
-                }
-                var city = res.data.regeocode.addressComponent.city
-                console.log("地址", that.adressDetail)
-                //通过当前城市，获取当前天气
-                uni.request({
-                  url: "http://restapi.amap.com/v3/weather/weatherInfo",
-                  data: {
-                    key: "56c91fb2683e5bf0f46014ac200d4c1b",
-                    city: city,
-                    extensions: "base",
-                    output: "JSON",
-                  },
-                  method: "GET",
-                  success(res) {
-                    if (res.data.status == "1") {
-                      that.weatherInfo = res.data.lives[0]
-                      console.log("成功获取天气", res)
-                      //获取完地址天气等信息后，开始画水印
-                      // that.canversImg();
-                    }
-                  }
-                })
-              }
-            }
-          })
-        },
-        fail: function (msg) {
-          console.log("获取位置失败", msg)
-        }
-      });
-      // let city=this.projectDetail.cityCode
-      //     uni.request({
-      //         url: 'https://v0.yiketianqi.com/api', //仅为示例，并非真实接口地址。
-      //         data: {
-      //           key: '3b060f3a0ce4bafebeba1621dcd99c31',
-      //           city:city ,
-      //           extensions: 'base',
-      //           output: 'JSON'
-      //         }
-      //       })
-      //       .then((res) => {
-      //         console.log('天气的数据', res)
-      //         this.weatherInfo = res.data.lives[0]
-      //         localStorage.setItem('weatherInfo', JSON.stringify(this.weatherInfo))
-      //       })
-    },
-    goMoudleFnTest() {
-      uni.navigateTo({
-        url: '../realMonitor/index'
-      })
-    },
-    goMoudleFn(item) {
-      //添加虚拟模块 报警提示
-      // if(item.moduleName=="预警播报"){
-      // 	uni.navigateTo({
-      // 		url: '/pages/alarmPage/index'
-      // 	})
-      // 	return false;
-      // }
-      console.log('item=======item.plugin', item, item.plugin)
+								console.log("地址", res)
+								if (res.data.status == "1") {
+									var one = res.data.regeocode.formatted_address
+									if (one) {
+										that.adressDetail = one.substr(3, 3) + one.substr(9,
+											4) + one.substr(20, 7)
+									}
+									var city = res.data.regeocode.addressComponent.city
+									console.log("地址", that.adressDetail)
+									//通过当前城市，获取当前天气
+									uni.request({
+										url: "http://restapi.amap.com/v3/weather/weatherInfo",
+										data: {
+											key: "56c91fb2683e5bf0f46014ac200d4c1b",
+											city: city,
+											extensions: "base",
+											output: "JSON",
+										},
+										method: "GET",
+										success(res) {
+											if (res.data.status == "1") {
+												that.weatherInfo = res.data.lives[0]
+												console.log("成功获取天气", res)
+												//获取完地址天气等信息后，开始画水印
+												// that.canversImg();
+											}
+										}
+									})
+								}
+							}
+						})
+					},
+					fail: function(msg) {
+						console.log("获取位置失败", msg)
+					}
+				});
+				// let city=this.projectDetail.cityCode
+				//     uni.request({
+				//         url: 'https://v0.yiketianqi.com/api', //仅为示例，并非真实接口地址。
+				//         data: {
+				//           key: '3b060f3a0ce4bafebeba1621dcd99c31',
+				//           city:city ,
+				//           extensions: 'base',
+				//           output: 'JSON'
+				//         }
+				//       })
+				//       .then((res) => {
+				//         console.log('天气的数据', res)
+				//         this.weatherInfo = res.data.lives[0]
+				//         localStorage.setItem('weatherInfo', JSON.stringify(this.weatherInfo))
+				//       })
+			},
+			goMoudleFnTest() {
+				uni.navigateTo({
+					url: '../realMonitor/index'
+				})
+			},
+			goMoudleFn(item) {
+				//添加虚拟模块 报警提示
+				// if(item.moduleName=="预警播报"){
+				// 	uni.navigateTo({
+				// 		url: '/pages/alarmPage/index'
+				// 	})
+				// 	return false;
+				// }
+				console.log('item=======item.plugin', item, item.plugin)
 
-      if (item.moduleName == "进度管理AG") {
-        return uni.navigateTo({
-          url: '/pages/standardScheduleNews/home'
-        })
-      }
-      switch (item.plugin) {
-          // case 'markRoom':
-          //   uni.navigateTo({
-          //     url: '../markRoom/markRoom'
-          //   })
-          //   break
-        case 'markRoom':
-          uni.navigateTo({
-            url: '../markRoom/markRoom'
-          })
-          break
-        case 'videoMonitor':
-          uni.navigateTo({
-            url: '../../videoManage/videoList?sn=' +
-                this.projectDetail.projectSn +
-                '&pageType=backEnd'
-          })
-          break
-        case 'projectInfo':
-          uni.navigateTo({
-            url: '../project/projectInfo'
-          })
-          break
-        case 'environmentMonitor':
-          uni.navigateTo({
-            url: '../environment/menu'
-          })
-          break
-        case 'laborManage':
-          uni.navigateTo({
-            url: '../laborManage/index'
-          })
-          break
-        case 'constructionLog':
-          uni.navigateTo({
-            url: '../constructionLog/list'
-          })
-          break
-        case 'electricBoxMange':
-          uni.navigateTo({
-            url: '../electricBox/index'
-          })
-          break
-        case 'lifterManage':
-          uni.navigateTo({
-            url: '../lifterMonitoring/index'
-          })
-          break
-        case 'carManage':
-          uni.navigateTo({
-            url: '../carManage/index'
-          })
-          break
-        case 'towerManage':
-          uni.navigateTo({
-            url: '../towerManage/index'
-          })
-          break
-        case 'dailyInspection':
-          uni.navigateTo({
-            url: '../dailyCheck/index'
-          })
-          break
-        case 'qualitySpringback':
-          uni.navigateTo({
-            url: '../qualitySpringback/index'
-          })
-          break
-        case 'unloadManage':
-          uni.navigateTo({
-            url: '../unload/index'
-          })
-          break
-        case 'concreteMonitoring':
-          uni.navigateTo({
-            url: '../concreteMonitoring/index'
-          })
-          break
-        case 'safeManage':
-          // uni.navigateTo({
-          // 	url: '../safeManage/index'
-          // })
-          uni.navigateTo({
-            url: '../safeManage/safeIndex'
-          })
-          break
-          // uni.navigateTo({
-          // 	url: '../safeManage/addExamine'
-          // })
-          break
-        case 'qualityManage':
-          uni.navigateTo({
-            url: '../qualityManage/index'
-          })
-          break
-        case 'carWashManage':
-          uni.navigateTo({
-            url: '../carWashManage/index'
-          })
-          break
-        case 'dangerBigProject':
-          uni.navigateTo({
-            url: '../dangerBigProject/index'
-          })
-          break
-        case 'fileManage':
-          uni.navigateTo({
-            url: '../../fileManage/fileManage'
-          })
-          break
-		  case 'ukashManage':
-		    uni.navigateTo({
-		      url: '../../projectEnd/ukashManage/ukashManage'
-		    })
-		    break
-        case 'betonManage':
-          uni.navigateTo({
-            url: '../betonManage/index'
-          })
-          break
-        case 'progressManage':
-          uni.navigateTo({
-            url: '../progressManagement/index'
-          })
-          break
-        case 'dangerBroadcast':
-          uni.navigateTo({
-            url: '../../alarmPage/index'
-          })
-          break
-        case 'standardSchedule':
-          uni.navigateTo({
-            url: '../standardSchedule/index',
-          })
-          break
-        case 'smartBeamField':
-          uni.navigateTo({
-            url: '../smartBeamField/beamMenu',
-          })
-          break
-        case 'saosao':
-          console.log('打开saosao')
-          // let that = this;
-          uni.scanCode({
-            scanType: ['qrCode'],
-            success: function (res) {
-              console.log('扫一扫得到的数据：' + res.result)
-              uni.navigateTo({
-                url: '../scan/saoSao?data=' + res.result
-              })
+				if (item.moduleName == "进度管理AG") {
+					return uni.navigateTo({
+						url: '/pages/standardScheduleNews/home'
+					})
+				}
+				switch (item.plugin) {
+					// case 'markRoom':
+					//   uni.navigateTo({
+					//     url: '../markRoom/markRoom'
+					//   })
+					//   break
+					case 'markRoom':
+						uni.navigateTo({
+							url: '../markRoom/markRoom'
+						})
+						break
+					case 'videoMonitor':
+						uni.navigateTo({
+							url: '../../videoManage/videoList?sn=' +
+								this.projectDetail.projectSn +
+								'&pageType=backEnd'
+						})
+						break
+					case 'projectInfo':
+						uni.navigateTo({
+							url: '../project/projectInfo'
+						})
+						break
+					case 'environmentMonitor':
+						uni.navigateTo({
+							url: '../environment/menu'
+						})
+						break
+					case 'laborManage':
+						uni.navigateTo({
+							url: '../laborManage/index'
+						})
+						break
+					case 'constructionLog':
+						uni.navigateTo({
+							url: '../constructionLog/list'
+						})
+						break
+					case 'electricBoxMange':
+						uni.navigateTo({
+							url: '../electricBox/index'
+						})
+						break
+					case 'lifterManage':
+						uni.navigateTo({
+							url: '../lifterMonitoring/index'
+						})
+						break
+					case 'carManage':
+						uni.navigateTo({
+							url: '../carManage/index'
+						})
+						break
+					case 'towerManage':
+						uni.navigateTo({
+							url: '../towerManage/index'
+						})
+						break
+					case 'dailyInspection':
+						uni.navigateTo({
+							url: '../dailyCheck/index'
+						})
+						break
+					case 'qualitySpringback':
+						uni.navigateTo({
+							url: '../qualitySpringback/index'
+						})
+						break
+					case 'unloadManage':
+						uni.navigateTo({
+							url: '../unload/index'
+						})
+						break
+					case 'concreteMonitoring':
+						uni.navigateTo({
+							url: '../concreteMonitoring/index'
+						})
+						break
+					case 'safeManage':
+						// uni.navigateTo({
+						// 	url: '../safeManage/index'
+						// })
+						uni.navigateTo({
+							url: '../safeManage/safeIndex'
+						})
+						break
+						// uni.navigateTo({
+						// 	url: '../safeManage/addExamine'
+						// })
+						break
+					case 'qualityManage':
+						uni.navigateTo({
+							url: '../qualityManage/index'
+						})
+						break
+					case 'carWashManage':
+						uni.navigateTo({
+							url: '../carWashManage/index'
+						})
+						break
+					case 'dangerBigProject':
+						uni.navigateTo({
+							url: '../dangerBigProject/index'
+						})
+						break
+					case 'fileManage':
+						uni.navigateTo({
+							url: '../../fileManage/fileManage'
+						})
+						break
+					case 'ukashManage':
+						uni.navigateTo({
+							url: '../../projectEnd/ukashManage/ukashManage'
+						})
+						break
+					case 'visitorsManage':
+						uni.navigateTo({
+							url: '../../projectEnd/visitorsManage/visitorsManage'
+						})
+						break
+					case 'betonManage':
+						uni.navigateTo({
+							url: '../betonManage/index'
+						})
+						break
+					case 'progressManage':
+						uni.navigateTo({
+							url: '../progressManagement/index'
+						})
+						break
+					case 'dangerBroadcast':
+						uni.navigateTo({
+							url: '../../alarmPage/index'
+						})
+						break
+					case 'standardSchedule':
+						uni.navigateTo({
+							url: '../standardSchedule/index',
+						})
+						break
+					case 'smartBeamField':
+						uni.navigateTo({
+							url: '../smartBeamField/beamMenu',
+						})
+						break
+					case 'saosao':
+						console.log('打开saosao')
+						// let that = this;
+						uni.scanCode({
+							scanType: ['qrCode'],
+							success: function(res) {
+								console.log('扫一扫得到的数据：' + res.result)
+								uni.navigateTo({
+									url: '../scan/saoSao?data=' + res.result
+								})
 
-              // let qrcodeVal=JSON.parse(res.result)
-              // let param={
-              // 	checkingPointId:qrcodeVal.checkingPointId,
-              // 	checkingPointName:qrcodeVal.checkingPointName,
-              // 	checkingPointUserId:that.userInfo.userId,
-              // 	checkingPointUserName:that.userInfo.realName||that.userInfo.account,
-              // 	position:qrcodeVal.position
-              // }
+								// let qrcodeVal=JSON.parse(res.result)
+								// let param={
+								// 	checkingPointId:qrcodeVal.checkingPointId,
+								// 	checkingPointName:qrcodeVal.checkingPointName,
+								// 	checkingPointUserId:that.userInfo.userId,
+								// 	checkingPointUserName:that.userInfo.realName||that.userInfo.account,
+								// 	position:qrcodeVal.position
+								// }
 
-              // that.sendRequest({
-              // 	url: "xmgl/checkingPointInfo/add",
-              // 	data:param,
-              // 	method: "POST",
-              // 	success(res) {
-              // 		console.log(res,'res');
-              // 		console.log(param,'===')
-              // 		that.qrCode=param;
-              // 		that.$refs.popupqrcode.open();
-              // 		setTimeout(item=>{
-              // 			that.$refs.popupqrcode.close();
-              // 		},5000)
-              // 	}
-              // })
-            }
-          })
-          break
-        default:
-          uni.showToast({
-            icon: 'none',
-            title: '该产品暂未开放，敬请期待！'
-          })
-      }
-    },
-    getProjectDetail() {
-      var that = this
-      this.sendRequest({
-        url: 'xmgl/project/getProjectInfoBySn',
-        data: {
-          projectSn: this.searchsn
-          // 获取存储数组最底层的projectSn
-        },
-        method: 'POST',
-        success(res) {
-          that.projectDetail = res.result
-          uni.setStorageSync('projectDetail', JSON.stringify(res.result))
-          that.loadWeather()
-        }
-      })
-    },
-    getAllModule(arr) {
-      console.log('获取的模块', arr)
-      var that = this
-      if (this.accountType == 10) {
-        this.sendRequest({
-          url: 'xmgl/baseModule/getModuleAndMenuList',
-          data: {
-            projectSn: this.searchsn,
-            userId: this.userInfo.userId,
-            moduleType: 2,
-          },
-          method: 'POST',
-          success(res) {
-            if (res.success) {
-              var all = res.result.moduleList;
-              console.log("all", all);
-              all.forEach((element, index) => {
-                all[index].operation = false;
-                res.result.menuList.forEach((element2) => {
-                  if (element2.moduleId == element.moduleId) {
-                    all[index].operation = true;
-                  }
-                });
-              });
-              console.log("all111", all);
-              that.list = all;
-            }
-          }
-        })
-      } else {
-        that.list = arr.map(item => {
-          item.operation = true;
-          return item;
-        });
+								// that.sendRequest({
+								// 	url: "xmgl/checkingPointInfo/add",
+								// 	data:param,
+								// 	method: "POST",
+								// 	success(res) {
+								// 		console.log(res,'res');
+								// 		console.log(param,'===')
+								// 		that.qrCode=param;
+								// 		that.$refs.popupqrcode.open();
+								// 		setTimeout(item=>{
+								// 			that.$refs.popupqrcode.close();
+								// 		},5000)
+								// 	}
+								// })
+							}
+						})
+						break
+					default:
+						uni.showToast({
+							icon: 'none',
+							title: '该产品暂未开放，敬请期待！'
+						})
+				}
+			},
+			getProjectDetail() {
+				var that = this
+				this.sendRequest({
+					url: 'xmgl/project/getProjectInfoBySn',
+					data: {
+						projectSn: this.searchsn
+						// 获取存储数组最底层的projectSn
+					},
+					method: 'POST',
+					success(res) {
+						that.projectDetail = res.result
+						uni.setStorageSync('projectDetail', JSON.stringify(res.result))
+						that.loadWeather()
+					}
+				})
+			},
+			getAllModule(arr) {
+				console.log('获取的模块', arr)
+				var that = this
+				if (this.accountType == 10) {
+					this.sendRequest({
+						url: 'xmgl/baseModule/getModuleAndMenuList',
+						data: {
+							projectSn: this.searchsn,
+							userId: this.userInfo.userId,
+							moduleType: 2,
+						},
+						method: 'POST',
+						success(res) {
+							if (res.success) {
+								var all = res.result.moduleList;
+								console.log("all", all);
+								all.forEach((element, index) => {
+									all[index].operation = false;
+									res.result.menuList.forEach((element2) => {
+										if (element2.moduleId == element.moduleId) {
+											all[index].operation = true;
+										}
+									});
+								});
+								console.log("all111", all);
+								that.list = all;
+							}
+						}
+					})
+				} else {
+					that.list = arr.map(item => {
+						item.operation = true;
+						return item;
+					});
 
-        console.log(that.list, "list============")
-        /*
-                this.sendRequest({
-                  url: 'xmgl/baseModule/list',
-                  data: {
-                    moduleType: 2,
-                    styleType: this.styType
-                  },
-                  method: 'POST',
-                  success(res) {
-                    var all = res.result;
-                    all.forEach((element, index) => {
-                      console.log(element,index,"=========")
-                      all[index].operation = false
-                      arr.forEach((element2) => {
-                        if (element2.moduleId == element.moduleId) {
-                          all[index].operation = true
-                          all[index].menuList = element2.menuList
-                        }
-                      })
-                    })
+					console.log(that.list, "list============")
+					/*
+					        this.sendRequest({
+					          url: 'xmgl/baseModule/list',
+					          data: {
+					            moduleType: 2,
+					            styleType: this.styType
+					          },
+					          method: 'POST',
+					          success(res) {
+					            var all = res.result;
+					            all.forEach((element, index) => {
+					              console.log(element,index,"=========")
+					              all[index].operation = false
+					              arr.forEach((element2) => {
+					                if (element2.moduleId == element.moduleId) {
+					                  all[index].operation = true
+					                  all[index].menuList = element2.menuList
+					                }
+					              })
+					            })
 
-                    that.list = all
-                    // this.list=newAppShow
+					            that.list = all
+					            // this.list=newAppShow
 
-                    //添加报警提示模块
-                    console.log('用户列表', that.list)
-                    // that.list.push({
-                    // 	operation:true,
-                    // 	appName: "报警提示",
-                    // 	appShow: 1,
-                    // 	bigModuleIcon: "log_active2",
-                    // 	disableModuleIcon: null,
-                    // 	labelName: "报警提示",
-                    // 	labelSortNum: "7",
-                    // 	menuList: null,
-                    // 	moduleDesc: "",
-                    // 	moduleEquipment: 0,
-                    // 	moduleIcon: "log_active",
-                    // 	moduleIcon2: "log",
-                    // 	moduleId: "41",
-                    // 	moduleName: "报警提示",
-                    // 	modulePath: "",
-                    // 	moduleType: 2,
-                    // 	plugin: "constructionLog",
-                    // 	styleType: 1
-                    // });
-                  }
-                })
-                */
-      }
-    }
-  }
-}
+					            //添加报警提示模块
+					            console.log('用户列表', that.list)
+					            // that.list.push({
+					            // 	operation:true,
+					            // 	appName: "报警提示",
+					            // 	appShow: 1,
+					            // 	bigModuleIcon: "log_active2",
+					            // 	disableModuleIcon: null,
+					            // 	labelName: "报警提示",
+					            // 	labelSortNum: "7",
+					            // 	menuList: null,
+					            // 	moduleDesc: "",
+					            // 	moduleEquipment: 0,
+					            // 	moduleIcon: "log_active",
+					            // 	moduleIcon2: "log",
+					            // 	moduleId: "41",
+					            // 	moduleName: "报警提示",
+					            // 	modulePath: "",
+					            // 	moduleType: 2,
+					            // 	plugin: "constructionLog",
+					            // 	styleType: 1
+					            // });
+					          }
+					        })
+					        */
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.qrcodeItem {
-  padding: 40rpx 30rpx;
-  width: 480rpx;
+	.qrcodeItem {
+		padding: 40rpx 30rpx;
+		width: 480rpx;
 
-  background-color: #fff;
-  border-radius: 8rpx;
+		background-color: #fff;
+		border-radius: 8rpx;
 
-  .title {
-    text-align: center;
-    margin-bottom: 12rpx;
-  }
-}
+		.title {
+			text-align: center;
+			margin-bottom: 12rpx;
+		}
+	}
 
-.topBoxContent {
-  color: white;
-  font-size: 14px;
-  // background: linear-gradient(360deg, #A59FFF 0%, #3258FF 100%);
-  height: 260px;
-  position: relative;
+	.topBoxContent {
+		color: white;
+		font-size: 14px;
+		// background: linear-gradient(360deg, #A59FFF 0%, #3258FF 100%);
+		height: 260px;
+		position: relative;
 
-  .dateBox {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: relative;
-    z-index: 2;
+		.dateBox {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+			z-index: 2;
 
-    .item {
-      flex: 1;
-      text-align: center;
-    }
+			.item {
+				flex: 1;
+				text-align: center;
+			}
 
-    .item2 {
-      border-left: 1px dashed white;
-      // border-right: 1px dashed white;
-    }
-  }
-}
+			.item2 {
+				border-left: 1px dashed white;
+				// border-right: 1px dashed white;
+			}
+		}
+	}
 
-.progressBox {
-  width: 150px;
-  height: 150px;
-  position: relative;
-  text-align: center;
-  margin: 0px auto 25px;
+	.progressBox {
+		width: 150px;
+		height: 150px;
+		position: relative;
+		text-align: center;
+		margin: 0px auto 25px;
 
-  .title1 {
-    padding-top: 24px;
-  }
+		.title1 {
+			padding-top: 24px;
+		}
 
-  .title2 {
-    font-size: 33px;
-    margin: 6px 0;
+		.title2 {
+			font-size: 33px;
+			margin: 6px 0;
 
-    .unit {
-      font-size: 20px;
-    }
-  }
+			.unit {
+				font-size: 20px;
+			}
+		}
 
-  .status {
-    width: 52px;
-    height: 25px;
-    background: #8fda5c;
-    border-radius: 12px;
-    display: inline-block;
-    line-height: 25px;
-  }
+		.status {
+			width: 52px;
+			height: 25px;
+			background: #8fda5c;
+			border-radius: 12px;
+			display: inline-block;
+			line-height: 25px;
+		}
 
-  .redStatus {
-    background: #ea6868;
-  }
+		.redStatus {
+			background: #ea6868;
+		}
 
-  .progressLine {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-  }
-}
+		.progressLine {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+		}
+	}
 
-.weatherBox {
-  position: absolute;
-  top: 15px;
-  right: 15px;
-  text-align: center;
+	.weatherBox {
+		position: absolute;
+		top: 15px;
+		right: 15px;
+		text-align: center;
 
-  .top {
-    font-size: 27px;
-    display: flex;
-    align-items: center;
-  }
+		.top {
+			font-size: 27px;
+			display: flex;
+			align-items: center;
+		}
 
-  .weatherIcon {
-    width: 36px;
-    height: 36px;
-  }
+		.weatherIcon {
+			width: 36px;
+			height: 36px;
+		}
 
-  .bottom {
-    font-size: 10px;
-  }
-}
+		.bottom {
+			font-size: 10px;
+		}
+	}
 
-.projectIndexPage {
-  /deep/ .headerBox {
-    background-color: transparent;
-    border-bottom: none;
-  }
-}
+	.projectIndexPage {
+		/deep/ .headerBox {
+			background-color: transparent;
+			border-bottom: none;
+		}
+	}
 
-.progressBox {
-  width: 150px;
-  height: 150px;
-  position: relative;
-  text-align: center;
-  margin: 0px auto 24px;
+	.progressBox {
+		width: 150px;
+		height: 150px;
+		position: relative;
+		text-align: center;
+		margin: 0px auto 24px;
 
-  .title1 {
-    padding-top: 24px;
-  }
+		.title1 {
+			padding-top: 24px;
+		}
 
-  .title2 {
-    font-size: 33px;
-    margin: 6px 0;
+		.title2 {
+			font-size: 33px;
+			margin: 6px 0;
 
-    .unit {
-      font-size: 20px;
-    }
-  }
+			.unit {
+				font-size: 20px;
+			}
+		}
 
-  .status {
-    width: 52px;
-    height: 25px;
-    background: #8fda5c;
-    border-radius: 12px;
-    display: inline-block;
-    line-height: 25px;
-  }
+		.status {
+			width: 52px;
+			height: 25px;
+			background: #8fda5c;
+			border-radius: 12px;
+			display: inline-block;
+			line-height: 25px;
+		}
 
-  .redStatus {
-    background: #ea6868;
-  }
+		.redStatus {
+			background: #ea6868;
+		}
 
-  .progressLine {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-  }
-}
+		.progressLine {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+		}
+	}
 
-.weatherBox {
-  position: absolute;
-  top: 10px;
-  right: 15px;
-  text-align: center;
+	.weatherBox {
+		position: absolute;
+		top: 10px;
+		right: 15px;
+		text-align: center;
 
-  .top {
-    font-size: 27px;
-    display: flex;
-    align-items: center;
-  }
+		.top {
+			font-size: 27px;
+			display: flex;
+			align-items: center;
+		}
 
-  .weatherIcon {
-    width: 36px;
-    height: 36px;
-  }
+		.weatherIcon {
+			width: 36px;
+			height: 36px;
+		}
 
-  .bottom {
-    font-size: 10px;
-  }
-}
+		.bottom {
+			font-size: 10px;
+		}
+	}
 
-.moudleBox2 {
-  opacity: 0.6;
-}
+	.moudleBox2 {
+		opacity: 0.6;
+	}
 
-.moudleBox {
-  overflow: hidden;
-  // margin: 20px 11px;
-}
+	.moudleBox {
+		overflow: hidden;
+		// margin: 20px 11px;
+	}
 
-.moudleItem {
-  float: left;
-  width: 33.33%;
-  font-size: 13px;
-  text-align: center;
-  margin-bottom: 10px;
+	.moudleItem {
+		float: left;
+		width: 33.33%;
+		font-size: 13px;
+		text-align: center;
+		margin-bottom: 10px;
 
-  .inner {
-    border: 1px solid rgba(18, 41, 75, 0.06);
-    padding: 15px 0 15px;
-    margin: 0 5px;
-    border-radius: 5px;
-  }
+		.inner {
+			border: 1px solid rgba(18, 41, 75, 0.06);
+			padding: 15px 0 15px;
+			margin: 0 5px;
+			border-radius: 5px;
+		}
 
-  .img {
-    width: 40px;
-    height: 40px;
-    color: red;
-  }
+		.img {
+			width: 40px;
+			height: 40px;
+			color: red;
+		}
 
-  .desc {
-    margin-top: 6px;
-    color: rgba(38, 45, 71, 0.77);
-  }
-}
+		.desc {
+			margin-top: 6px;
+			color: rgba(38, 45, 71, 0.77);
+		}
+	}
 
-.moudleTitle {
-  color: rgba(42, 43, 91, 0.5);
-  font-size: 13px;
-  margin: 0px 0 15px;
-  text-align: center;
-}
+	.moudleTitle {
+		color: rgba(42, 43, 91, 0.5);
+		font-size: 13px;
+		margin: 0px 0 15px;
+		text-align: center;
+	}
 
-.smallHeight {
-  // padding-bottom: 63px;
-  height: calc(100% - 63px);
-}
+	.smallHeight {
+		// padding-bottom: 63px;
+		height: calc(100% - 63px);
+	}
 
-.moudleContent {
-  box-shadow: 0px 4px 16px 0px rgba(212, 220, 236, 0.59);
-  border-radius: 8px;
-  padding: 15px 15px;
-  margin: 55px 15px 15px;
-  position: relative;
-  z-index: 2;
-}
+	.moudleContent {
+		box-shadow: 0px 4px 16px 0px rgba(212, 220, 236, 0.59);
+		border-radius: 8px;
+		padding: 15px 15px;
+		margin: 55px 15px 15px;
+		position: relative;
+		z-index: 2;
+	}
 
-.projectIndexBG {
-  width: 100%;
-  height: 357px;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-</style>
+	.projectIndexBG {
+		width: 100%;
+		height: 357px;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/projectEnd/safeManage/safeIndex.vue b/pages/projectEnd/safeManage/safeIndex.vue
index 78f7d052..244b2437 100644
--- a/pages/projectEnd/safeManage/safeIndex.vue
+++ b/pages/projectEnd/safeManage/safeIndex.vue
@@ -70,10 +70,10 @@
 						<image class="moudle-icon" src="/static/safeMange/danger_project.png"></image>
 						<text>危大工程</text>
 					</view>
-<!--					<view class="moudle-item flex" @click="jumpPage(7)" v-if="COMPANY != 'sanjiang'">-->
-<!--						<image class="moudle-icon" src="/static/safeMange/danger_check.png"></image>-->
-<!--						<text>危大验收</text>-->
-<!--					</view>-->
+					<!-- <view class="moudle-item flex" @click="jumpPage(7)" v-if="COMPANY != 'sanjiang'">
+						<image class="moudle-icon" src="/static/safeMange/danger_check.png"></image>
+						<text>危大验收</text>
+					</view> -->
 					<!-- <view class="moudle-item flex" @click="jumpPage(6)">
 						<image class="moudle-icon" src="/static/safeMange/enterprise_examine.png"></image>
 						<text>企业检查</text>
diff --git a/pages/projectEnd/ukashManage/lookDetails.vue b/pages/projectEnd/ukashManage/lookDetails.vue
index 842e32ba..a6afe6c5 100644
--- a/pages/projectEnd/ukashManage/lookDetails.vue
+++ b/pages/projectEnd/ukashManage/lookDetails.vue
@@ -1,50 +1,109 @@
 <template>
-  <view class="projectList">
-    <headers class="fixedheader" :themeType="true" :showBack="true">
-      <view class="headerName">
-        查看明细
-      </view>
-    </headers>
-  <view class="details">
-
-  </view>
-  </view>
+	<view class="projectList">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				查看明细
+			</view>
+		</headers>
+		<view class="details">
+			<view class="details-item">
+				<span>材料名称</span>
+				<span>{{result.name}}</span>
+			</view>
+			<view class="details-item">
+				<span>型号</span>
+				<span>{{result.model}}</span>
+			</view>
+			<view class="details-item">
+				<span>规格</span>
+				<span>{{result.specifications}}</span>
+			</view>
+			<view class="details-item">
+				<span>单位</span>
+				<span>{{result.unit}}</span>
+			</view>
+			<view class="details-item">
+				<span>数量</span>
+				<span>{{result.num}}</span>
+			</view>
+			<view class="details-item" style="height: 100px;">
+				<span>备注</span>
+				<span class="details-remark">{{result.remark}}</span>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  import headers from '../../../components/headers/headers.vue'
+	import headers from '../../../components/headers/headers.vue'
 
-  export default {
-    data() {
-      return {
+	export default {
+		data() {
+			return {
+				id: '',
+				result:{}
+			}
+		},
+		onShow() {
+			this.getDetails()
+		},
+		onLoad(vai) {
+			this.id = vai.itemS
+		},
+		onReachBottom() {
 
-      }
-    },
-    onShow() {
-    },
-	onLoad(vai) {
+		},
+		onPullDownRefresh() {
 
-	},
-    onReachBottom() {
-	
-    },
-    onPullDownRefresh() {
-
-    },
-    methods: {
-
-      }
-    }
-  
+		},
+		methods: {
+			getDetails() {
+				let data = {
+					id: this.id
+				}
+				let _this = this
+				this.sendRequest({
+					url: 'xmgl/xzMaterialDetail/queryById',
+					method: 'post',
+					data: data,
+					success: res => {
+						console.log(res);
+						this.result = res.result
+					}
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.projectList{
-	min-height: 100%;
-	background: #f4f5fd;
-	.details{
-		margin: 10px;
-		background-color: #fff;
+	.projectList {
+		min-height: 100%;
+		background: #f4f5fd;
+
+		.details {
+			margin: 10px;
+			background-color: #fff;
+			height: 380px;
+			border-radius: 4px;
+
+			.details-item {
+				height: 50px;
+				border-bottom: 1px solid #e4e6ef;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 15px;
+				.details-remark{
+					width: 150px;
+					height: 70px;
+					border: 1px solid #e4e6ef;
+					overflow: auto;
+					 word-wrap: break-word; /* 允许在单词内换行 */  
+					    overflow-wrap: break-word; /* 另一个允许换行的属性，用于更好的浏览器兼容性 */  
+					    white-space: normal; /* 确保文本正常换行，而不是保持在一行 */  
+				}
+			}
+		}
 	}
-}
 </style>
\ No newline at end of file
diff --git a/pages/projectEnd/ukashManage/materials.vue b/pages/projectEnd/ukashManage/materials.vue
index bcbe06be..8f710ae0 100644
--- a/pages/projectEnd/ukashManage/materials.vue
+++ b/pages/projectEnd/ukashManage/materials.vue
@@ -5,18 +5,24 @@
 				材料入场管理
 			</view>
 		</headers>
-		<view>
-			<view class="ukashList">
+		<view v-if="dataList.length > 0">
+			<view class="ukashList" v-for="item in dataList" :key="item.id">
+				<!--  @click="jobLookDetails(item.id)"  暂时不跳详情页 -->
 				<view class="ukashList-what">
-					<span style="font-size: 14px;font-weight: 700;">0000</span>
-					<span class="ukashList-look">查看明细</span>
+					<span style="font-size: 14px;font-weight: 700;">材料名称: {{item.name}}</span>
+					<!-- <span class="ukashList-look">查看明细</span> -->
 				</view>
-				<view class="ukashList-time">型号: 2222s</view>
-				<view class="ukashList-time">规格: 2222s</view>
-				<view class="ukashList-time">单位: 2222s</view>
-				<view class="ukashList-time">数量: 2222s</view>
+				<view class="ukashList-time">型号: {{item.model}}</view>
+				<view class="ukashList-time">规格: {{item.specifications}}</view>
+				<view class="ukashList-time">单位: {{item.unit}}</view>
+				<view class="ukashList-time">数量: {{item.num}}</view>
+				<view class="ukashList-time">备注: {{item.remark}}</view>
 			</view>
 		</view>
+		<view class="no-data" v-else>
+			<image class="img" src="/static/noData.png"></image>
+			<text class="txt">暂无数据</text>
+		</view>
 	</view>
 </template>
 
@@ -34,12 +40,10 @@
 				id: ''
 			}
 		},
-		onShow() {
-			this.queryList()
-		},
 		onLoad(vai) {
 			console.log(vai.itemS);
 			this.id = vai.itemS
+			this.queryList()
 		},
 		onReachBottom() {
 			console.log(99999);
@@ -58,29 +62,34 @@
 		methods: {
 			queryList() {
 				let data = {
-					id:this.id
+					materialId: this.id
 				}
 				let _this = this
 				this.sendRequest({
-					url: 'xmgl/xzMaterialDetail/queryById',
+					url: 'xmgl/xzMaterialDetail/list',
 					method: 'post',
 					data: data,
 					success: res => {
 						console.log(res);
-						// this.dataList =res.result.records
-						// if (res.result.records.length < this.pageSize) {
-						//   //判断接口返回数据量小于请求数据量，则表示此为最后一页
-						//   this.isLoadMore = true
-						//   this.loadStatus = 'nomore'
-						// } else {
-						//   this.isLoadMore = false
-						//   // that.loadStatus='more'
-						// }
-						// uni.stopPullDownRefresh()
-						// // console.log(res.result)
+						this.dataList = res.result
+						if (res.result.length < this.pageSize) {
+							//判断接口返回数据量小于请求数据量，则表示此为最后一页
+							this.isLoadMore = true
+							this.loadStatus = 'nomore'
+						} else {
+							this.isLoadMore = false
+							// that.loadStatus='more'
+						}
+						uni.stopPullDownRefresh()
+						// console.log(res.result)
 					}
 				})
 			},
+			jobLookDetails(id){
+				uni.navigateTo({
+					url: './lookDetails?itemS=' + id
+				})
+			}
 		}
 	}
 </script>
@@ -101,7 +110,7 @@
 		}
 
 		.ukashList {
-			height: 163px;
+			height: 193px;
 			background-color: #fff;
 			margin: 10px 10px;
 			border-radius: 15px;
@@ -129,5 +138,22 @@
 				color: #b9bbc9;
 			}
 		}
+
+		.no-data {
+			text-align: center;
+
+			.img {
+				display: block;
+				height: 200rpx;
+				width: 200rpx;
+				margin: 0 auto;
+				margin-top: 60rpx;
+				margin-bottom: 60rpx;
+			}
+
+			.txt {
+				color: #C0C4CC;
+			}
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/projectEnd/ukashManage/ukashManage.vue b/pages/projectEnd/ukashManage/ukashManage.vue
index 0ed48d76..38d8a3b7 100644
--- a/pages/projectEnd/ukashManage/ukashManage.vue
+++ b/pages/projectEnd/ukashManage/ukashManage.vue
@@ -5,16 +5,21 @@
 				材料入场管理
 			</view>
 		</headers>
-		<input class="uni-input" name="searchName" v-model="search" placeholder="请搜索" />
-		<view>
+		<input class="uni-input" name="searchName" v-model="search" placeholder="请搜索" @input="handleInput" />
+		<view v-if="dataList.length > 0">
 			<view class="ukashList" v-for="item in dataList" :key="item.id" @click="jobMaterials(item.id)">
 				<view class="ukashList-what">
 					<span style="font-size: 14px;font-weight: 700;">{{item.name}}</span>
 					<span class="ukashList-look">查看明细</span>
 				</view>
+				<view class="ukashList-time">企业: {{item.enterpriseName}}</view>
 				<view class="ukashList-time">入场时间: {{item.entryTime}}</view>
 			</view>
 		</view>
+		<view class="no-data" v-else>
+			<image class="img" src="/static/noData.png"></image>
+			<text class="txt">暂无数据</text>
+		</view>
 	</view>
 </template>
 
@@ -28,18 +33,20 @@
 				pageNo: 1,
 				pageSize: 10,
 				isLoadMore: false,
-				dataList: []
+				dataList: [],
+				isFinished: false
 			}
 		},
-		onShow() {
+		onLoad() {
 			this.queryList()
 		},
 		onReachBottom() {
 			console.log(99999);
+			// this.pageNo += 1
+			// this.queryList()
 			if (!this.isLoadMore) {
-				this.isLoadMore = true
-				this.pageNo + 1
-				this.queryList()
+				this.pageNo += 1;
+				this.queryList();
 			}
 		},
 		onPullDownRefresh() {
@@ -47,12 +54,13 @@
 			this.pageNo = 1
 			this.dataList = []
 			this.queryList()
+			this.isFinished = false
 		},
 		methods: {
 			queryList() {
 				let data = {
 					pageNo: this.pageNo,
-					pageSize: this.pageSize
+					pageSize: this.pageSize,
 				}
 				let _this = this
 				this.sendRequest({
@@ -61,11 +69,14 @@
 					data: data,
 					success: res => {
 						console.log(res);
-						this.dataList = res.result.records
+						// this.dataList = this.dataList.concat(res.result.records)
+						
+						this.dataList = [...this.dataList, ...res.result.records]
+						// console.log(this.dataList , res.result.total);
+						// this.dataList = res.result.records
 						if (res.result.records.length < this.pageSize) {
 							//判断接口返回数据量小于请求数据量，则表示此为最后一页
 							this.isLoadMore = true
-							this.loadStatus = 'nomore'
 						} else {
 							this.isLoadMore = false
 							// that.loadStatus='more'
@@ -79,6 +90,37 @@
 				uni.navigateTo({
 					url: './materials?itemS=' + id
 				})
+			},
+			handleInput(e) {
+				this.dataList = []
+				let data = {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					name: e.detail.value ? e.detail.value : null
+				}
+				let _this = this
+				this.sendRequest({
+					url: 'xmgl/xzMaterial/page',
+					method: 'post',
+					data: data,
+					success: res => {
+						console.log(res);
+						// this.dataList = this.dataList.concat(res.result.records)
+						
+						this.dataList = [...this.dataList, ...res.result.records]
+						// console.log(this.dataList , res.result.total);
+						// this.dataList = res.result.records
+						if (res.result.records.length < this.pageSize) {
+							//判断接口返回数据量小于请求数据量，则表示此为最后一页
+							this.isLoadMore = true
+						} else {
+							this.isLoadMore = false
+							// that.loadStatus='more'
+						}
+						uni.stopPullDownRefresh()
+						// console.log(res.result)
+					}
+				})
 			}
 		}
 	}
@@ -122,11 +164,28 @@
 			}
 
 			.ukashList-time {
-				margin-top: 20px;
+				margin-top: 10px;
 				margin-left: 20px;
 				font-size: 12px;
 				color: #b9bbc9;
 			}
 		}
+
+		.no-data {
+			text-align: center;
+
+			.img {
+				display: block;
+				height: 200rpx;
+				width: 200rpx;
+				margin: 0 auto;
+				margin-top: 60rpx;
+				margin-bottom: 60rpx;
+			}
+
+			.txt {
+				color: #C0C4CC;
+			}
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/projectEnd/visitorsManage/visitorsDetails.vue b/pages/projectEnd/visitorsManage/visitorsDetails.vue
new file mode 100644
index 00000000..36521f08
--- /dev/null
+++ b/pages/projectEnd/visitorsManage/visitorsDetails.vue
@@ -0,0 +1,157 @@
+<template>
+	<view class="projectList">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				查看明细
+			</view>
+		</headers>
+		<view class="details">
+			<view class="details-item">
+				<span>访客姓名</span>
+				<span>{{result.visitName}}</span>
+			</view>
+			<view class="details-item">
+				<span>访客身份证号</span>
+				<span>{{result.idCard}}</span>
+			</view>
+			<view class="details-item">
+				<span>预约人姓名</span>
+				<span>{{result.appointmentName}}</span>
+			</view>
+			<view class="details-item">
+				<span>预约结果</span>
+				<span>{{ result.isSuccess === 0 ? '预约成功' : '预约失败'}}</span>
+			</view>
+			<view class="details-item">
+				<span>预约有效开始时间</span>
+				<span>{{result.beginTime}}</span>
+			</view>
+			<view class="details-item">
+				<span>预约有效结束时间</span>
+				<span>{{result.endTime}}</span>
+			</view>
+			<view class="details-state" style="height: 100px;">
+				<span>当前状态</span>
+				<span>{{ result.isEnable === 0 ? '预约有效' : '预约已失效'}}</span>
+			</view>
+		</view>
+		<view class="delete" @click="deleteEvent">删除</view>
+	</view>
+</template>
+
+<script>
+	import headers from '../../../components/headers/headers.vue'
+
+	export default {
+		data() {
+			return {
+				id: '',
+				result: {}
+			}
+		},
+		onShow() {
+			this.getDetails()
+		},
+		onLoad(vai) {
+			this.id = vai.itemS
+		},
+		onReachBottom() {
+
+		},
+		onPullDownRefresh() {
+
+		},
+		methods: {
+			getDetails() {
+				let data = {
+					id: this.id
+				}
+				let _this = this
+				this.sendRequest({
+					url: 'xmgl/xzVisitorManageRecord/queryById',
+					method: 'post',
+					data: data,
+					success: res => {
+						console.log(res);
+						this.result = res.result
+					}
+				})
+			},
+			deleteEvent(){
+				let data = {
+					id: this.id
+				}
+				let _this = this
+				this.sendRequest({
+					url: 'xmgl/xzVisitorManageRecord/delete',
+					method: 'post',
+					data: data,
+					success: res => {
+						console.log(res);
+						// this.result = res.result
+						if(res.code=== 200){
+							uni.showToast({
+								title: '删除成功',
+								duration: 2000,
+								icon: 'none',
+								mask: true,
+							})
+							setTimeout(() => {
+								uni.navigateBack({
+									url:'visitorsManage'
+								})
+							}, 1000)
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.projectList {
+		min-height: 100%;
+		background: #f4f5fd;
+		position: relative;
+
+		.details {
+			margin: 10px;
+			background-color: #fff;
+			height: 380px;
+			border-radius: 4px;
+
+			.details-item {
+				height: 50px;
+				border-bottom: 1px solid #e4e6ef;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 15px;
+
+
+			}
+		}
+
+		.details-state {
+			display: flex;
+			justify-content: space-between;
+			padding: 0 15px;
+			margin-top: 15px;
+		}
+
+		.delete {
+			position: absolute;
+			bottom: 60px;
+			left: 0;
+			height: 50px;
+			background-color: #eb3b43;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			color: #fff;
+			font-size: 16px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/projectEnd/visitorsManage/visitorsManage.vue b/pages/projectEnd/visitorsManage/visitorsManage.vue
new file mode 100644
index 00000000..61dab715
--- /dev/null
+++ b/pages/projectEnd/visitorsManage/visitorsManage.vue
@@ -0,0 +1,209 @@
+<template>
+	<view class="projectList">
+		<headers class="fixedheader" :themeType="true" :showBack="true">
+			<view class="headerName">
+				访客管理
+			</view>
+		</headers>
+		<input class="uni-input" name="searchName" v-model="search" placeholder="请搜索访客姓名" @input="handleInput" />
+		<view v-if="dataList.length > 0">
+			<view class="visitors" @click="jobMaterials(item.id)" v-for="item in dataList" :key="item.id">
+				<view class="ukashList-what">
+					<span>访客姓名: {{item.visitName}}</span>
+					<span :class="['ukashList-look',item.isSuccess === 1 ? 'green' : 'red']">{{item.isSuccess===1?'预约成功':'预约失败'}}</span>
+				</view>
+				<view class="ukashList-time">访客身份证号: {{item.idCard}}</view>
+				<view class="ukashList-time">预约人姓名: {{ item.appointmentName }}</view>
+				<view class="ukashList-time">预约开始时间: {{ item.beginTime }}</view>
+				<view class="ukashList-what" style="font-size: 12px;color: #b9bbc9;">
+					<span>预约结束时间: {{ item.endTime }}</span>
+					<span :class="['ukashList-look',item.isEnable === 1 ? 'blue' : 'grey']" v-if="item.isSuccess === 1">{{ item.isEnable === 1 ? '预约有效' : '预约已失效' }}</span>
+				</view>
+			</view>
+		</view>
+		<view class="no-data" v-else>
+			<image class="img" src="/static/noData.png"></image>
+			<text class="txt">暂无数据</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import headers from '../../../components/headers/headers.vue'
+
+	export default {
+		data() {
+			return {
+				search: '',
+				pageNo: 1,
+				pageSize: 10,
+				isLoadMore: false,
+				dataList: [],
+				state: 1,
+				isBrowsing : 0
+			}
+		},
+		onLoad() {
+			this.queryList()
+		},
+		onReachBottom() {
+			console.log(99999);
+			if (!this.isLoadMore) {
+				this.isLoadMore = true
+				this.queryList()
+			}
+		},
+		onPullDownRefresh() {
+			console.log(222);
+			this.pageNo = 1
+			this.dataList = []
+			this.queryList()
+		},
+		methods: {
+			queryList(name = null) {
+				let data = {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					visitName: name ? name : null
+				}
+				let _this = this
+				this.sendRequest({
+					url: 'xmgl/xzVisitorManageRecord/page',
+					method: 'post',
+					data: data,
+					success: res => {
+						console.log(res);
+						this.dataList = this.dataList.concat(res.result.records)
+						if (res.result.records.length < this.pageSize) {
+							//判断接口返回数据量小于请求数据量，则表示此为最后一页
+							this.isLoadMore = true
+							this.loadStatus = 'nomore'
+						} else {
+							this.isLoadMore = false
+							// that.loadStatus='more'
+						}
+						uni.stopPullDownRefresh()
+						// console.log(res.result)
+					}
+				})
+			},
+			jobMaterials(id) {
+				uni.navigateTo({
+					url: './visitorsDetails?itemS=' + id
+				})
+			},
+			handleInput(e) {
+				console.log(e);
+				this.dataList = []
+				let data = {
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					visitName: e.detail.value ? e.detail.value : null
+				}
+				let _this = this
+				this.sendRequest({
+					url: 'xmgl/xzVisitorManageRecord/page',
+					method: 'post',
+					data: data,
+					success: res => {
+						console.log(res);
+						this.dataList = this.dataList.concat(res.result.records)
+						if (res.result.records.length < this.pageSize) {
+							//判断接口返回数据量小于请求数据量，则表示此为最后一页
+							this.isLoadMore = true
+							this.loadStatus = 'nomore'
+						} else {
+							this.isLoadMore = false
+							// that.loadStatus='more'
+						}
+						uni.stopPullDownRefresh()
+						// console.log(res.result)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.projectList {
+		min-height: 100%;
+		background: #f4f5fd;
+
+		.uni-input {
+			border-radius: 10px;
+			margin: 10px 10px;
+			background-color: #e6e7ef;
+			height: 35px;
+			line-height: 30px;
+			padding: 0 20px;
+			font-size: 14px;
+		}
+
+		.visitors {
+			height: 150px;
+			background-color: #fff;
+			border-radius: 5px;
+			margin: 10px;
+
+			.ukashList-what {
+				display: flex;
+				justify-content: space-between;
+				margin: 0 20px;
+				padding-top: 10px;
+
+				.ukashList-look {
+					// background-color: #5081f7;
+					border-radius: 10px;
+					padding: 0 4px 2px 4px;
+					font-size: 12px;
+					text-align: center;
+					color: #fff;
+				}
+			}
+
+			.ukashList-time {
+				margin-top: 10px;
+				margin-left: 20px;
+				font-size: 12px;
+				color: #b9bbc9;
+			}
+		}
+
+
+
+		.no-data {
+			text-align: center;
+
+			.img {
+				display: block;
+				height: 200rpx;
+				width: 200rpx;
+				margin: 0 auto;
+				margin-top: 60rpx;
+				margin-bottom: 60rpx;
+			}
+
+			.txt {
+				color: #C0C4CC;
+			}
+		}
+	}
+
+	.green {
+		background-color: #10b12a;
+	}
+
+	.blue {
+		background-color: #5081f7;
+		
+	}
+
+	.red {
+		background-color: #eb3b43;
+	}
+
+	.grey {
+		background-color: #a3a5b0;
+	}
+</style>
\ No newline at end of file