修改

assets/colorui/app.scss

@@ -272,4 +272,10 @@
 	flex-direction: row;
 	justify-content: center;
 	padding: 30rpx;
+}
+
+.center{
+	display: flex;
+	justify-content: center;
+	align-items: center;
 }

assets/http/service.js

@@ -1,19 +1,12 @@
 import Request from 'luch-request'
 import util from '../../utils/util.js'
+import setting from './setting.js'
 
-// let	baseURL = 'http://192.168.1.244:9527/'
-
-let	baseURL = 'http://192.168.1.160'
-// let	baseURL = 'http://8.135.18.59:1889/api'
-
-// let	baseURL = 'http://park.nxzhsq.cn:9527/'
-
-// let	baseURL = 'https://park.58fo.com/api/'
+let	baseURL = setting.baseURL
 
 const getTokenUrl=()=>{
 	let tokenObj=uni.getStorageSync("tokenObj")
-	let url = baseURL+`/blade-auth/oauth/token?tenant_id=${tokenObj.tenant_id}&password=${tokenObj.password}&username=${tokenObj.username}&grant_type=password&scope=all&type=account`;
-	// let url = baseURL+"/blade-auth/oauth/token?tenant_id=804981&password=d84786746a846669404dd20587fed3b99ef90f23&username=wpadmin&grant_type=password&scope=all&type=account"
+	let url = baseURL+`blade-auth/oauth/token?tenant_id=${tokenObj.tenant_id}&password=${tokenObj.password}&username=${tokenObj.username}&grant_type=password&scope=all&type=account`;
 	console.log("tokenurl:"+url)
 	return url
 }
@@ -54,6 +47,7 @@ http.interceptors.request.use((config) => { /* 请求之前拦截器。可以使
 let isRefreshing = false
 // 重试队列，每一项将是一个待执行的函数形式
 let requests = []
+let count=0
 http.interceptors.response.use(async (response) => { /* 请求之后拦截器。可以使用async await 做异步操作  */
 	//toekn过期处理
 	  //200 返回数据成功 0 上传文件成功 400 没有相关数据 || response.data.buildingCount 数据统计的~晕~~~~
@@ -66,6 +60,10 @@ http.interceptors.response.use(async (response) => { /* 请求之后拦截器。
   },async (err) => { // 请求错误做点什么
 	  
 	  if (err.data.code == 401) {
+		  count ++
+		  if (count==10) {
+		  	return
+		  }
 	      let {config} = err
 	      if (!isRefreshing) {
 	          isRefreshing = true
@@ -95,6 +93,7 @@ http.interceptors.response.use(async (response) => { /* 请求之后拦截器。
 	          //否则保存新的token
 	          token=res.data.token_type+" "+res.data.access_token
 	          uni.setStorageSync('token', token)
+			  
 	          requests.forEach(cb => cb())
 	          // 重试完了清空这个队列
 	          requests = []

assets/http/setting.js

@@ -0,0 +1,14 @@
+let setting = {}
+
+
+setting.baseURL = 'http://192.168.1.69/'
+// setting.baseURL = 'http://park.nxzhsq.cn:9527/'
+// setting.baseURL = 'https://park.58fo.com/api/'
+
+setting.imgBaseURL='http://192.168.1.218:1889/'
+
+setting.indexBanner = [{
+	'banners': setting.imgBaseURL+"/miniofile/xlyq/banner.jpg"
+}, ]
+
+export default setting

assets/js/tabbar.js

@@ -1,30 +1,29 @@
-export  const tabbar = {
-		inactiveColor:"#8a8a8a",
-		activeColor:"#5064eb",
-		bgColor:"#ffffff",
-		midButton:true,
-		iconSize:44,
-		MinButtonSize:70,
-		borderTop:true,
-		list:[{
-				iconPath: "/static/tarbar/index0.png",
-				selectedIconPath: "/static/tarbar/index.png",
-				text: '园区',
-				pagePath: "/pages/index/index"
-			},
-			{
-				iconPath: "/static/tarbar/menjin0.png",
-				selectedIconPath: "/static/tarbar/menjin.png",
-				text: '门禁',
-				midButton: true,
-				pagePath: "/pages/device/device"
-			},
-			{
-				iconPath: "/static/tarbar/my0.png",
-				selectedIconPath: "/static/tarbar/my.png",
-				text: '我的',
-				pagePath: "/pages/mine/mine"
-			},
-		]
+export const tabbar = {
+	inactiveColor: "#8a8a8a",
+	activeColor: "#5064eb",
+	bgColor: "#ffffff",
+	midButton: true,
+	iconSize: 44,
+	MinButtonSize: 70,
+	borderTop: true,
+	list: [{
+			iconPath: "/static/tarbar/index0.png",
+			selectedIconPath: "/static/tarbar/index.png",
+			text: '园区',
+			pagePath: "/pages/index/index"
+		},
+		{
+			iconPath: "/static/tarbar/menjin0.png",
+			selectedIconPath: "/static/tarbar/menjin.png",
+			text: '门禁',
+			midButton: true,
+			pagePath: "/pages/device/device"
+		},
+		{
+			iconPath: "/static/tarbar/my0.png",
+			selectedIconPath: "/static/tarbar/my.png",
+			text: '我的',
+			pagePath: "/pages/mine/mine"
+		},
+	]
 }
-

components/mescroll-body/components/mescroll-empty.vue

@@ -66,8 +66,8 @@ export default {
 }
 
 .mescroll-empty .empty-icon {
-	width: 280rpx;
-	height: 280rpx;
+	width: 320rpx;
+	height: 180rpx;
 }
 
 .mescroll-empty .empty-icon-sm {

components/mescroll-body/mescroll-uni-option.js

@@ -15,7 +15,7 @@ const GlobalOption = {
 	up: {
 		// 其他up的配置参数也可以写,这里只展示了常用的配置:
 		textLoading: '加载中 ...', // 加载中的提示文本
-		textNoMore: '到底啦', // 没有更多数据的提示文本
+		textNoMore: '没有更多啦', // 没有更多数据的提示文本
 		offset: 150, // 距底部多远时,触发upCallback,仅mescroll-uni生效 ( mescroll-body配置的是pages.json的 onReachBottomDistance )
 		toTop: {
 			// 回到顶部按钮,需配置src才显示
@@ -26,9 +26,9 @@ const GlobalOption = {
 			width: 72 // 回到顶部图标的宽度, 默认72 (支持"20rpx", "20px", "20%"格式的值, 纯数字则默认单位rpx)
 		},
 		empty: {
-			isSmall:false,
+			isSmall: false,
 			use: true, // 是否显示空布局
-			icon: "http://139.9.103.171:1888/miniofile/xlyq/empty.png", // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			icon: "/static/icon/empty.png", // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
 			tip: '暂无数据' // 提示
 		}
 	}

main.js

@@ -189,6 +189,30 @@ Vue.prototype.$isEmpty=function(value){
 	return false;
 }
 
+Vue.prototype.$isNotEmpty=function(value){
+	switch (typeof value) {
+		case 'undefined':
+			return false;
+		case 'string':
+			if(value=='undefined') return false
+			if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0) return false;
+			break;
+		case 'boolean':
+			if (!value) return false;
+			break;
+		case 'number':
+			if (0 === value || isNaN(value)) return false;
+			break;
+		case 'object':
+			if (null === value || value.length === 0) return false;
+			for (var i in value) {
+				return true;
+			}
+			return false;
+	}
+	return true;
+}
+
 Vue.config.productionTip = false
 
 App.mpType = 'app'

pages/auth/auth.vue

@@ -31,7 +31,7 @@
 							   :width="$isEmpty(model.face)?350:560"
 							   :height="$isEmpty(model.face)?350:420"
 							  :currentImage="model.face"
-							  bgsrc="http://139.9.103.171:1888/miniofile/xlyq/face1.png"
+							  bgsrc="https://vote-obs.guosen-fumao.cn/c683bfabcdfe4306adb96bb1605394b6-face1%5B0%5D.png"
 							  >
 							</upload-img>
 							<view class="text-center  padding-top-20 base-color" >
@@ -111,7 +111,7 @@
 			<!-- 区域 -->
 			<u-picker v-model="residentialSelectShow" @confirm="residentialSelectCallback" :range="residentialSelectList" range-key="name" mode="selector"></u-picker>
 			<!-- 企业 -->
-			<u-popup  border-radius="60" height="60%"  mode="bottom" v-model="companySelectShow">
+			<u-popup  border-radius="8" height="60%"  mode="bottom" v-model="companySelectShow">
 				<view class="fixed cu-bar search bg-white">
 					<view class="search-form round">
 						<text class="cuIcon-search"></text>
@@ -247,9 +247,7 @@
 				this.uploadFile(currPage.data.image)
 			}
 		},
-		
 		onLoad(options) {
-			
 			that=this
 			
 			//兼容低版本获取头像的方式
@@ -631,10 +629,13 @@
 			  });
 			},
 			//处理照片，拍照上传和相册上传的共同处理方法
-			uploadFile(imgUrl){
-				this.$api.uploadFile.submit(imgUrl).then(res=>{
-					that.model.face=res.data.link
+			async uploadFile(imgUrl){
+				uni.showLoading({
+					title:"上传中",
 				})
+				let res=await this.$api.uploadFile.submit(imgUrl)
+				that.model.face=res.data.link
+				uni.hideLoading()
 			},
 		},
 	}

pages/company/company.vue

@@ -10,7 +10,6 @@
 		<view class="card">
 			<view class="flex flex-direction justify-center padding-left-20">
 				<text class="text-bold  text-lg" style="padding-bottom: 12rpx;">{{detail.enterpriseName}}</text>
-				<text class="text-sm">{{detail.enterpriseType}}</text>
 			</view>
 		</view>
 		<view class="desc">
@@ -20,7 +19,7 @@
 			</view>
 			<view class="sub-title">
 				<text style="padding-left: 60rpx;">
-					{{detail.enterpriseIntroduce}}
+					{{detail.enterpriseIntroduce || '暂无简介'}}
 				</text>
 			</view>
 		</view>
@@ -81,58 +80,17 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="history">
-			<view class="top u-border-bottom margin-bottom-40">
-				<text class="text-bold text-lg">发展历程</text>
-				<view class="text-sm padding-top-10 text-gray">
-					<text>更多</text>
-					<text class="cuIcon-right padding-left-10"></text>
-				</view>
-			</view>
-			<u-time-line>
-				<u-time-line-item nodeTop="2" v-for="(item,index) in historyList" :key="index">
-					<template v-slot:node>
-						<view class="u-node" style="background-color: rgba(200, 217, 243,.6);">
-							<u-icon name="clock-fill" color="#093c8f" :size="28"></u-icon>
-						</view>
-					</template>
-					<template v-slot:content>
-						<view>
-							<view class="u-order-title">{{item.time}}</view>
-							<view class="u-order-desc">{{item.content}}</view>
-						</view>
-					</template>
-				</u-time-line-item>
-			</u-time-line>
-		</view>
-		<view class="address">
-			<view class="top u-border-bottom">
-				<text class="text-bold text-lg">公司地址</text>
-			</view>
-			
-			<view class="item" >
-				<view class="flex">
-					<u-icon name="map" size="50"></u-icon>
-					<text class="padding-left-20 text-lg">鹏鼎控股深圳园区</text>
-				</view>
-				<text class="sub-address">广东省深圳市宝安区燕罗街道松罗路</text>
-			</view>
-		</view> -->
 	</view>
 </template>
 
 <script>
+	import setting from  '@/assets/http/setting.js'
 	export default {
 		data() {
 			return {
 				id:this.$cache.get('enterpriseId'),
 				detail:{},
-				bannerList: [
-					{
-					  'banners': "http://139.9.103.171:1888/miniofile/xlyq/banner.jpg"
-					},
-				],
-				historyList:[],
+				bannerList: setting.indexBanner,
 			}
 		},
 		onLoad() {
@@ -190,12 +148,6 @@
 		}
 	}
 	
-	.history{
-		background-color: #FFFFFF;
-		margin-top: 20rpx;
-		padding: 40rpx 20rpx 20rpx 50rpx;
-	}
-	
 	.top{
 		padding-bottom: 30rpx;
 		display: flex;

pages/device/device.vue

@@ -36,7 +36,7 @@
 			
 			<u-action-sheet :list="actionList" v-model="actionShow" @click="actionClick"></u-action-sheet>
 		</view>
-		<u-tabbar v-model="tabbarCurr"
+		<u-tabbar
 		 :icon-size="tabbar.iconSize" 
 		 :active-color="tabbar.activeColor" 
 		 :mid-button-size="tabbar.MinButtonSize" 
@@ -76,7 +76,6 @@ export default {
 			userId:'',
 			
 			//tabbar
-			tabbarCurr:1,
 			tabbar:tabbar,
 			//是否已开门
 			isopen:false,
@@ -89,12 +88,7 @@ export default {
 	onLoad() {
 		that=this
 		this.fetchDeviceList()
-		
-		let loginType=this.$cache.get('loginType')
-		if (loginType==this.$loginType.STAFF) {
-			this.getUserId()
-		}
-		      
+		this.userId=this.$cache.get('loginuser').id
 	},
 	onShow() {
 		if (this.canReset) {
@@ -146,7 +140,6 @@ export default {
 				let userInfo=getApp().globalData.userInfo
 				this.userId=userInfo.id
 			}
-			
 		},
 		async fetchDeviceList(){
 			let res=await this.$api.device.page()
@@ -171,26 +164,26 @@ export default {
 		 */
 		openDoor(macAddress) {
 			let params={
-				userId:this.userId || 123,
+				userType:2,
+				userId:this.userId,
 				macAddress:macAddress
 			}
 			this.isloading=true
-			setTimeout(()=>{
-				this.$api.device.open(params).then(res=>{
-					if (res.success) {
-						this.isloading=false
-						this.isopen=true
-						that.$showModel('开门成功',false)
-					}else{
-						that.$showModel(res.msg,false)
-						this.isloading=false
-						that.isopen=false
-					}
-				}).catch(err=>{
+			this.$api.device.open(params).then(res=>{
+				if (res.success) {
+					this.isloading=false
+					this.isopen=true
+					this.$u.toast('开门成功')
+				}else{
+					this.$u.toast('开门失败')
 					this.isloading=false
 					that.isopen=false
-				})
-			},500)
+				}
+			}).catch(err=>{
+				this.$u.toast('开门失败')
+				this.isloading=false
+				that.isopen=false
+			})
 		},
 	}
 };

pages/guest/guest.vue

@@ -15,10 +15,10 @@
 				<view class="card">
 					<u-form :model="model"  ref="uForm" >
 						<u-form-item :required="true"  :label-width="labelWidth"   label="访问园区" >
-							<u-input  type="select" :select-open="agencyShow" v-model="agencyName"  placeholder="请选择要访问的园区" @click="agencyShow=true"></u-input>
+							<u-input  type="select" :select-open="agencyShow" v-model="model.agencyName"  placeholder="请选择要访问的园区" @click="agencyShow=true"></u-input>
 						</u-form-item>
 						<u-form-item  :label-width="labelWidth"   label="访问企业" >
-							<u-input  type="select" :select-open="enterpriseShow" v-model="enterpriseName" placeholder="请选择要访问的企业" @click="enterpriseShow=true"></u-input>
+							<u-input  type="select" :select-open="enterpriseShow" v-model="model.enterpriseName" placeholder="请选择要访问的企业" @click="enterpriseShow=true"></u-input>
 						</u-form-item>
 						<u-form-item :required="true"  :label-width="labelWidth"   label="访问时间" >
 							<u-input  type="select" :select-open="interviewTimeShow" v-model="model.interviewTime" placeholder="请选择访问时间" @click="interviewTimeShow=true"></u-input>
@@ -67,12 +67,12 @@
 				</view>
 				<view class="card">
 					<view @click="faceSelectShow=true" class="flex justify-center padding-bottom-50">
-						<view class=" ">
+						<view  :class="$isNotEmpty(model.imageUri)?'padding-top-30':''">
 							<upload-img
 							   :width="$isEmpty(model.imageUri)?350:560"
 							   :height="$isEmpty(model.imageUri)?350:420"
 							  :currentImage="model.imageUri"
-							  bgsrc="http://139.9.103.171:1888/miniofile/xlyq/face1.png"
+							  bgsrc="https://vote-obs.guosen-fumao.cn/c683bfabcdfe4306adb96bb1605394b6-face1%5B0%5D.png"
 							  >
 							</upload-img>
 							<view class="text-center  padding-top-20 base-color" >
@@ -92,7 +92,7 @@
 			<u-picker v-model="sexSelectShow" @confirm="sexSelectCallback" :range="sexSelectList" range-key="text" mode="selector"></u-picker>
 			
 			<!-- 园区 -->
-			<u-popup  border-radius="60" height="60%"  mode="bottom" v-model="agencyShow">
+			<u-popup  border-radius="8" height="60%"  mode="bottom" v-model="agencyShow">
 				<view class="fixed cu-bar search bg-white">
 					<view class="search-form round">
 						<text class="cuIcon-search"></text>
@@ -109,7 +109,7 @@
 			</u-popup>
 			
 			<!-- 企业列表 -->
-			<u-popup  border-radius="60" height="60%"  mode="bottom" v-model="enterpriseShow">
+			<u-popup  border-radius="8" height="60%"  mode="bottom" v-model="enterpriseShow">
 				<view class="fixed cu-bar search bg-white">
 					<view class="search-form round">
 						<text class="cuIcon-search"></text>
@@ -176,13 +176,11 @@
 				sexSelectIndex:0,
 				
 				//园区下拉框
-				agencyName:'',
 				agencyList:[],
 				agencyKeyWord:'',
 				agencyShow:false,
 				
 				//企业下拉框
-				enterpriseName:'',//回显
 				enterpriseShow:false,
 				enterpriseList:[],
 				enterpriseKeyword:'',
@@ -252,11 +250,11 @@
 			
 			if (!this.$isEmpty(options.agencyId)&&!this.$isEmpty(options.agencyName)) {
 				this.model.agencyId=options.agencyId
-				this.agencyName=options.agencyName
+				this.model.agencyName=options.agencyName
 			}
 			if (!this.$isEmpty(options.enterpriseId)&&!this.$isEmpty(options.enterpriseName)) {
 				this.model.enterpriseId=options.enterpriseId
-				this.enterpriseName=options.enterpriseName
+				this.model.enterpriseName=options.enterpriseName
 			}
 			
 			if (!this.$isEmpty(options.interviewTime)&&!this.$isEmpty(options.interviewTime)) {
@@ -330,7 +328,7 @@
 					grant_type: "password"
 				}
 				this.model.agencyId=item.id
-				this.agencyName=item.agencyName
+				this.model.agencyName=item.agencyName
 				this.agencyShow=false
 				this.$cache.put('tokenObj',params)
 				//获取token
@@ -355,7 +353,7 @@
 			//选择企业
 			selectEnterprise(item){
 				this.enterpriseShow=false
-				this.enterpriseName=item.enterpriseName
+				this.model.enterpriseName=item.enterpriseName
 				this.model.enterpriseId=item.id
 			},
 			
@@ -490,12 +488,12 @@
 							showCancel:false,
 							success() {
 								that.getOpenListAndSendMsg()
-								that.agencyName=''
-								that.enterpriseName=''
 								that.model={
 									openId:'',
 									agencyId:'',
+									agencyName:'',
 									enterpriseId:'',
+									enterpriseName:'',
 									guestName:'', 
 									guestSex:'',//1 男 2 女
 									guestIdcard:'',//身份证号

pages/guest/open-door/open-door.vue

@@ -6,10 +6,10 @@
 				<view class="flex justify-between">
 					<view class="flex"  style="width: 80%;">
 						<view class="tag" :class="item.tagColor">
-							<text>{{item.cameraName.substr(0,1)}}</text>
+							<text>{{item.name.substr(0,1)}}</text>
 						</view>
 						<view class="flex justify-center align-center padding-left-20 text-lg">
-							<text>{{item.cameraName}}</text>
+							<text>{{item.name}}</text>
 						</view>
 					</view>
 					
@@ -62,13 +62,13 @@ export default {
 	},
 	onLoad(options) {
 		that=this
-		if (this.$isEmpty(options.guestTel)) {
+		if (this.$isEmpty(options.id)) {
 			this.$dialog.showModal('系统异常',false).then(res=>{
 				this.$navigateBack()
 			})
 			return
 		}
-		this.userId='999'+options.guestTel
+		this.userId=options.id
 		this.fetchDeviceList()
 	},
 	onShow() {
@@ -102,7 +102,6 @@ export default {
 				let userInfo=getApp().globalData.userInfo
 				this.userId=userInfo.id
 			}
-			
 		},
 		async fetchDeviceList(){
 			let res=await this.$api.device.page()
@@ -117,24 +116,25 @@ export default {
 		 */
 		openDoor(macAddress) {
 			let params={
-				userId:this.userId || 123,
-				macAddress:macAddress
+				userType:4,
+				userId:this.userId,
+				macAddress
 			}
 			this.isloading=true
-			setTimeout(()=>{
-				this.$api.device.open(params).then(res=>{
-					if (res.success) {
-						this.isloading=false
-						this.isopen=true
-						that.$showModel('开门成功',false)
-					}else{
-						that.isopen=false
-					}
-				}).catch(err=>{
+			this.$api.device.open(params).then(res=>{
+				if (res.success) {
 					this.isloading=false
+					this.isopen=true
+					that.$showModel('开门成功',false)
+				}else{
+					this.$u.toast('开门失败')
 					that.isopen=false
-				})
-			},500)
+				}
+			}).catch(err=>{
+				this.$u.toast('开门失败')
+				this.isloading=false
+				that.isopen=false
+			})
 		},
 	}
 };

pages/guest/records/comps/card.vue

@@ -22,7 +22,7 @@
 						</view>
 						<view class="content">
 							<text class="padding-right-10">访问园区：</text>
-							<text >{{item.agencyName}}</text>
+							<text >{{item.agencyName || '暂无'}}</text>
 						</view>
 						<view  v-if="item.enterpriseName" class="content">
 							<text class="padding-right-10">访问企业：</text>
@@ -33,7 +33,7 @@
 							<text >{{item.interviewTime}}</text>
 						</view>
 						<!-- 访客角色不需要看到联系方式，不然卡片太大 -->
-						<view class="content" v-if="!$isEmpty(loginType)">
+						<view class="content" style="padding-top: 10rpx;" v-if="!$isEmpty(loginType)">
 							<text class="padding-right-10">联系方式：</text>
 							<text>{{item.guestTel}}</text>
 							<image @click.stop="call(item.guestTel)" class="call" src="../../../../static/index/call.png" ></image>
@@ -54,8 +54,7 @@
 					<view @click.stop="fail(item)" v-if="item.checkState==0" style="font-size: 22rpx;" class="cu-btn  sm round bg-red" >
 						审核不通过
 					</view>
-					<u-button @click="del(item,index)" size="mini" v-else plain type="error">删除</u-button>
-					
+					<!-- <u-button @click="del(item,index)" size="mini" v-else plain type="error">删除</u-button> -->
 				</block>
 				
 				<block v-else>
@@ -80,7 +79,7 @@ export default {
 			}
 		},
 		loginType:{
-			type:String,
+			type:String | Boolean,
 		}
 	},
 	data() {
@@ -128,8 +127,9 @@ export default {
 			}
 			//获取当前园区的token并把token存进缓存中
 			//因为拉取门禁设备和开门需要用到token
-			let res=await this.$api.agency.getAgencyTenantList(params)
-			let data=res.data[0]
+			let res=await this.$api.agency.getAgency(params)
+			let data=res.data
+			console.log(data);
 			let tokenParams={
 				tenant_id:data.tenantId,
 				username:data.account,
@@ -141,7 +141,7 @@ export default {
 			let token=resp.token_type+" "+resp.access_token
 			uni.setStorageSync('token', token)
 			uni.navigateTo({
-				url:"/pages/guest/open-door/open-door?guestTel="+item.guestTel
+				url:"/pages/guest/open-door/open-door?id="+item.id
 			})
 			
 		}
@@ -189,7 +189,7 @@ export default {
 			.call{
 				width: 36rpx;
 				height: 36rpx;
-				margin-left: 40rpx;
+				margin-left: 20rpx;
 				margin-top: 10rpx;
 			}
 		}

pages/guest/records/comps/item.vue

@@ -104,7 +104,7 @@
 					checkState:1
 				}
 				this.$showModel('确定要审核通过此申请记录吗？').then(()=>{
-					this.$api.guest.check(params).then(res=>{
+					this.$api.guest.audit(params).then(res=>{
 						if (res.success==true) {
 							this.$u.toast('操作成功')
 							this.send(item.openId)
@@ -200,7 +200,7 @@
 						//先去除token
 						this.$cache.remove('tokenObj')
 						this.$cache.remove('token')
-						res=await this.$api.guest.getByGuestOpenId(params)
+						res=await this.$api.guest.page(params)
 					}
 					let data=res.data.records
 					let total=res.data.total

pages/guest/records/records.vue

@@ -133,7 +133,7 @@
 					checkState:2,
 					opinion:this.opinion
 				}
-				this.$api.guest.check(params).then(res=>{
+				this.$api.guest.audit(params).then(res=>{
 					if (res.success==true) {
 						this.$u.toast('操作成功')
 						this.send()
@@ -260,7 +260,7 @@
 	.container {
 	  height: calc(100vh);
 	  background-color: #F6F6F6;
-	  padding: 78rpx 0rpx 0rpx;
+	  padding: 86rpx 0rpx 0rpx;
 	 .tabs {
 	    position: fixed;
 	    top: -2rpx;

pages/index/fire/detail.vue

@@ -29,7 +29,7 @@
 						</view>
 						<view class="content flex">
 							<view class="flex">
-								<u-icon  size="36" name="http://139.9.103.171:1888/miniofile/xlyq/dianchi.png"></u-icon>
+								<u-icon  size="36" name="/static/icon/dianchi.png"></u-icon>
 								<text class="text-bold padding-left-10">电池电量：</text>
 							</view>
 							<view class="striped active cu-progress round margin-top-sm " style="width: 60%;">

pages/index/fire/list/comps/card.vue

@@ -32,7 +32,7 @@
 						</view>
 						<view class="content flex">
 							<view class="flex">
-								<u-icon  size="36" name="http://139.9.103.171:1888/miniofile/xlyq/dianchi.png"></u-icon>
+								<u-icon  size="36" name="/static/icon/dianchi.png"></u-icon>
 								<text class="text-bold padding-left-10">电池电量：</text>
 							</view>
 							<view class="striped active cu-progress round margin-top-sm " style="width: 60%;">

pages/index/index.vue

@@ -116,7 +116,7 @@
 			</view>
 			<u-action-sheet @click="ganderChange" :list="ganderArray" v-model="ganderShow"></u-action-sheet>
 		</view>
-		 <u-tabbar v-model="tabbarCurr"
+		 <u-tabbar
 		  :icon-size="tabbar.iconSize" 
 		  :active-color="tabbar.activeColor" 
 		  :mid-button-size="tabbar.MinButtonSize" 
@@ -129,6 +129,7 @@
 import {tabbar} from "@/assets/js/tabbar.js"
 import hotConsult from "@/components/hot-consult/hot-consult.vue"
 import infomation from "@/components/infomation/infomation.vue"
+import setting from "@/assets/http/setting.js"
 let plugin = requirePlugin("subway");
 export default {
 	components:{
@@ -139,11 +140,9 @@ export default {
 			background:{
 				backgroundColor:'#5064eb'
 			},
-			
 			//登陆类型
 			loginType:this.$cache.get('loginType') || '',
 			//tabbar
-			tabbarCurr:0,
 			tabbar:tabbar,
 			//园区 label
 			
@@ -153,11 +152,7 @@ export default {
 			gander:'',
 			
 			//banner
-			bannerList: [
-				{
-				  'banners': "http://139.9.103.171:1888/miniofile/xlyq/banner.jpg"
-				},
-			],
+			bannerList:setting.indexBanner,
 			// 公告
 			noticeList:[],
 			//消防服务
@@ -271,10 +266,10 @@ export default {
 				})
 		   }else if (this.loginType==this.$loginType.ENTERPRISE) {
 				let creditCode=this.$cache.get('creditCode')
-				this.$api.enterprise.detail({creditCode:creditCode}).then(res=>{
+				this.$api.enterprise.detail({creditCode}).then(res=>{
 					this.gander=res.data.enterpriseName
 					getApp().globalData.userInfo=res.data
-					this.$u.vuex('vuex_userInfo',userInfo)
+					this.$u.vuex('vuex_userInfo',res.data)
 					this.$cache.put('enterpriseName',res.data.enterpriseName)
 					this.$cache.put("residentialId",res.data.residentialId)
 				})
@@ -607,14 +602,16 @@ export default {
 					icon:'../../static/icon/dk1.png',
 					url:'/punch/pages/index/index',
 					count:0,
-					show:this.loginType==this.$loginType.STAFF
+					show:false
+					// show:this.loginType==this.$loginType.STAFF
 				}, 
 				{
 					title: '智慧党建',
 					icon:'../../static/icon/dang.png',
 					url:'/party/pages/home/home',
 					count:0,
-					show:this.loginType==this.$loginType.STAFF
+					show:false
+					// show:this.loginType==this.$loginType.STAFF
 				}, 
 				{
 					title: '视频监控',
@@ -629,7 +626,8 @@ export default {
 					icon:'../../static/icon/subway.png',
 					url:'subway',
 					count:0,
-					show:this.loginType==this.$loginType.STAFF
+					show:false
+					// show:this.loginType==this.$loginType.STAFF
 				}, 
 				{
 					title: '公告管理',

pages/index/myinfo/myinfo.vue

@@ -33,7 +33,7 @@
 							   :width="$isEmpty(model.face)?350:560"
 							   :height="$isEmpty(model.face)?350:420"
 							  :currentImage="model.face"
-							  bgsrc="http://139.9.103.171:1888/miniofile/xlyq/face1.png"
+							  bgsrc="https://vote-obs.guosen-fumao.cn/c683bfabcdfe4306adb96bb1605394b6-face1%5B0%5D.png"
 							  >
 							</upload-img>
 							<view class="text-center base-color padding-top-20" >
@@ -186,7 +186,7 @@
 			  uni.chooseImage({
 			    count: 1,
 			    //最多可以选择的图片张数，默认9
-			    sourceType: ['album', 'camera'],
+			    sourceType: ['album'],
 			    sizeType: ['compressed'],
 			    //可选择原图或压缩后的图片
 			    success: res => {

pages/index/staffAudit/detail.vue

@@ -32,7 +32,7 @@
 									<text class="padding-right-10">微信昵称：</text>
 									<text>{{dataDetail.name}}</text>
 								</view>
-								<view style="padding: 50rpx 0;display: flex;">
+								<view style="padding: 15rpx 0  0;display: flex;">
 									<view class="flex justify-center align-center">
 										<text class="padding-right-10">微信头像：</text>
 									</view>
@@ -47,7 +47,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="content">
+						<view class="content" style="margin-top: -40rpx;">
 							<text class="padding-right-10">性别：</text>
 							<text v-text="dataDetail.sex==2?'女':'男'"></text>
 						</view>
@@ -90,10 +90,10 @@
 			</view>
 		</view>
 		<view v-if="dataDetail.auditStatus==0" :style="{marginBottom:safeAreaBottom}" class="footer-fixed padding-20  bg-white flex justify-end margin-right-30" style="box-sizing: border-box;z-index: 999;border-top: 1rpx solid #f1f1f1;">
-			<view @click="pass" class="cu-btn df base-bg-color  round margin-right-20" >
+			<view @click="pass" class="cu-btn df base-bg-color  round margin-right-20" style="font-size: 22rpx;">
 				审核通过
 			</view>
-			<view @click="fail" class="cu-btn df bg-red  round " >
+			<view @click="fail" class="cu-btn df bg-red  round " style="font-size: 22rpx;">
 				审核不通过
 			</view>
 		</view>

pages/login/login1.vue

@@ -71,7 +71,7 @@
 					<view  @click="wxLogin()"><image style="width: 88rpx;height: 88rpx;" src="@/static/login/wx.png"></image></view>
 				</view>
 			</view>
-			<u-popup  border-radius="60" height="60%"  mode="bottom" v-model="enterpriseShow">
+			<u-popup  border-radius="8" height="60%"  mode="bottom" v-model="enterpriseShow">
 				<view class="fixed cu-bar search bg-white">
 					<view class="search-form round">
 						<text class="cuIcon-search"></text>

pages/mine/feedback/feedback.vue

@@ -35,8 +35,8 @@
 						<view class="grid col-4 grid-square flex-sub">
 							<view class="bg-img" v-for="(item,index) in imgList" :key="index" @click="viewImage(index)" >
 							 <image :src="imgList[index]" mode="aspectFill"></image>
-								<view class="cu-tag bg-red" @click.stop="DelImg(index)" >
-									<text class='cuIcon-close'></text>
+								<view class="cu-tag bg-red" style="padding: 6rpx;" @click.stop="DelImg(index)" >
+									<text class='cuIcon-close' ></text>
 								</view>
 							</view>
 							<view class="solids" @click="chooseImage" v-if="imgList.length<4">
@@ -119,7 +119,7 @@
 			input(e){
 				this.data.content=e.detail.value
 			},
-			sumit(){
+			submit(){
 				this.data.agnecyId=this.$cache.get('agencyId')
 				if (this.$cache.get('loginType')==this.$loginType.STAFF) {
 					let userInfo=getApp().globalData.userInfo

pages/mine/mine.vue

@@ -9,17 +9,17 @@
 							<open-data  style="width: 120rpx;height: 120rpx; " type="userAvatarUrl"></open-data>
 			    		</view>
 			    		<view style="padding: 10rpx 20rpx;" v-if="loginType=='staff'">
-			    			<open-data style="font-size: 32rpx;" type="userNickName"></open-data>
+			    			<open-data style="font-size: 32rpx;color: #FFFFFF;" type="userNickName"></open-data>
 			    			<view class="text-white text-df padding-top-20">
 			    				{{$cache.get('phone')}}
 			    			</view>
 			    		</view>
-			    		<view v-else class="nickname">
+			    		<view v-else class="nickname text-white">
 			    			<open-data  type="userNickName"></open-data>
 			    		</view>
 			    	</view>
 					<view @click="loginOut" class="flex justify-center align-center" style="text-decoration: underline;color: #FFFFFF;padding-right: 80rpx;">
-						<image src="../../static/login/logout.png" style="width: 50rpx;" mode="widthFix"></image>
+						<image src="../../static/login/logout.png" style="width: 50rpx;height: 50rpx;" ></image>
 					</view>
 			    </view>
 			</view>
@@ -39,12 +39,12 @@
 						<text>{{ item.itemName }}</text>
 					</view>
 					<view class="">
-						<image src="http://139.9.103.171:1888/img/image/arrow.png"></image>
+						<image src="/static/icon/arrow.png"></image>
 					</view>
 				</view>
 			</view>
 		</view>
-		 <u-tabbar v-model="tabbarCurr"
+		 <u-tabbar 
 		  :icon-size="tabbar.iconSize" 
 		  :active-color="tabbar.activeColor" 
 		  :mid-button-size="tabbar.MinButtonSize" 
@@ -61,7 +61,6 @@
 		data() {
 			return {
 				//tabbar
-				tabbarCurr:2,
 				tabbar:tabbar,
 				
 				//登陆类型
@@ -138,12 +137,6 @@
 						itemIcon: '/static/icon/fankui.png',
 						name:'feedback',
 						show:true
-					},
-					{
-						itemName: '用户协议',
-						itemIcon: '/static/icon/xieyi.png',
-						name:'protocol',
-						show:true
 					}
 				]
 			},

party/pages/empty/empty.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<u-empty color="#8d8d8d" marginTop="300" iconSize="300" text="请先认证党员" src="http://139.9.103.171:1888/miniofile/xlyq/empty.png">
+		<u-empty color="#8d8d8d" marginTop="300" iconSize="300" text="请先认证党员" src="/static/icon/empty.png">
 			<view @click="jump" slot="bottom" class="cu-btn round base-bg-color margin-top-20" style="padding: 36rpx 100rpx;">
 				去认证
 			</view>

utils/dialog.js

@@ -3,12 +3,13 @@ let dialog = {};
 /**
  * 封装模态框
  */
-dialog.showModal=(content,isShowCancel=true,title='提示',)=>{
+dialog.showModal=(content,showCancel=true,confirmColor)=>{
     return new Promise((resolve,reject)=>{
         uni.showModal({
-			title: title,
-			content: content,
-			showCancel:isShowCancel,
+			title:'提示',
+			content,
+			showCancel,
+			confirmColor:confirmColor?confirmColor:'#5064eb',
 			success: (res)=>{
 				if (res.confirm) {
 					resolve(res)
@@ -17,6 +18,23 @@ dialog.showModal=(content,isShowCancel=true,title='提示',)=>{
 		});
 	})
 }
+
+dialog.showModalAndBack=(content,confirmColor)=>{
+    uni.showModal({
+    	title: "提示",
+    	content: content,
+    	showCancel:false,
+		confirmColor:confirmColor?confirmColor:'#5064eb',
+    	success: (res)=>{
+    		if (res.confirm) {
+    			uni.navigateBack({
+    				delta:1
+    			})
+    		} 
+    	}
+    });
+}
+
 dialog.showLoading=(title='加载中...')=>{
 	uni.showLoading({
 		title