修改企业bug

assets/http/api.js

@@ -21,11 +21,11 @@ const SMSApi = {
 //微信基本参数
 let wxData={
 	//国信的
-	appId:'wx988577c5a9061283',
-	secret:'5013c82bf72e6266dfb2720757433e74',
+	// appId:'wx988577c5a9061283',
+	// secret:'5013c82bf72e6266dfb2720757433e74',
 	//园区的
-	// appId:'wxcfb2b48079ca59e4',
-	// secret:'30f9cf566aa57892e55aee0406356b9e',
+	appId:'wxcfb2b48079ca59e4',
+	secret:'30f9cf566aa57892e55aee0406356b9e',
 	subscribe_grant_type:'client_credential', //订阅消息的grant_type
 }
 //微信url

main.js

@@ -44,7 +44,7 @@ Vue.prototype.$tmplIds=['QeE-CxbJGd05fo0lGkVa39wj3L5rKeXZclFsyC4am00']
 Vue.prototype.$miniprogramState={
 	DEVELOPER:'developer', //开发版
 	TRIAL:'trial', //体验版
-	FORMAL:'formal',//正式版
+	FORMAL:'developer',//正式版
 }
 
 //封装提示框

pages/auth/auth.vue

@@ -45,7 +45,7 @@
 				<text class="cuIcon-titles text-blue padding-right-10"></text>
 				<text>企业信息认证</text>
 				<view class="card">
-					<u-form :model="model"  ref="uForm" >
+					<u-form  :model="model"  ref="uForm" >
 						<u-form-item  :label-width="labelWidth"   label="公司园区" >
 							<u-input  type="select" :select-open="ganderSelectShow" v-model="gander"  placeholder="请选择工作园区" @click="ganderShow"></u-input>
 						</u-form-item>
@@ -96,7 +96,25 @@
 			<!-- 区域 -->
 			<u-picker v-model="residentialSelectShow" @confirm="residentialSelectCallback" :range="residentialSelectList" range-key="name" mode="selector"></u-picker>
 			<!-- 企业 -->
-			<u-picker v-model="companySelectShow" @confirm="companySelectCallback" :range="companySelectList" range-key="enterpriseName" mode="selector"></u-picker>
+			<u-popup  border-radius="60" 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>
+						<u-input style="width: 90%;" v-model="keyword" type="text" :adjust-position="false" placeholder="请输入关键字搜索" confirm-type="search"/>
+					</view>
+					<!-- <view @click="fetchEnterpriseList" class="action">
+						<button class="cu-btn bg-blue shadow-blur round">搜索</button>
+					</view> -->
+				</view>
+				<scroll-view v-if="!$isEmpty(companySelectList)" @scrolltolower="scrolltolower" style="padding-top: 110rpx;height: 100%;" :scroll-y="true" >
+					<view @click="companySelectCallback(item)" hover-class="hoverClass" class="text-center padding-30 solid-bottom"  v-for="(item,index) in companySelectList" :key="index">
+						<text>{{item.enterpriseName}}</text>
+					</view>
+					<u-divider v-if="flag" height="80">没有更多了</u-divider>
+				</scroll-view>
+				<u-empty v-else name="search"></u-empty>
+			</u-popup>
+			<!-- <u-picker v-model="companySelectShow" @confirm="companySelectCallback" :range="companySelectList" range-key="enterpriseName" mode="selector"></u-picker> -->
 			<u-action-sheet @click="faceSelectCallback"  z-index="999999" :list="faceSelectList" v-model="faceSelectShow"></u-action-sheet>
 		</view>
 		<view v-else>
@@ -150,14 +168,18 @@
 				ganderSelectIndex:0,
 				//区域
 				residential:'',
+				residentialId:'',
 				residentialSelectList: [],
 				residentialSelectShow: false,
 				residentialSelectIndex:0,
 				//企业
+				current:1,
+				flag:false,
+				keyword:'',
+				
 				company:'',
 				companySelectList: [],
 				companySelectShow: false,
-				companySelectIndex:0,
 				//上传人脸的方式
 				faceSelectList: [{
 					text: '相册上传',
@@ -171,6 +193,20 @@
 				
 			}
 		},
+		watch:{
+			keyword(){
+				let that=this
+				//节流函数
+				if (this.timer){
+					clearTimeout(this.timer)//阻止setTimeout函数的执行
+				}
+				this.timer = setTimeout(() => {
+					that.current=1
+					that.companySelectList=[]
+					that.fetchEnterpriseList(that.residentialId)
+				}, 500)
+			},
+		},
 		onShow() {
 			this.handelAppletAudit()
 			
@@ -306,12 +342,6 @@
 				this.model.avatar=userInfo.avatarUrl
 				this.model.name=userInfo.nickName
 				this.model.sex=this.sexSelectList[this.sexSelectIndex].value || 1
-				try{
-					this.model.enterpriseId=this.companySelectList[this.companySelectIndex].id
-				}catch(e){
-					this.model.enterpriseId=''
-				}
-				this.model.enterpriseName=this.company
 				if (this.$isEmpty(this.model.realName)) {
 					this.$u.toast('请输入您的姓名')
 					return
@@ -340,16 +370,11 @@
 					this.$u.toast('请选择所属企业')
 					return
 				}
-				this.model.residentialName=this.residential
-				this.model.residentialId=this.residentialSelectList[this.residentialSelectIndex].id
-				this.model.agencyName=this.gander
-				this.model.agencyId=this.ganderSelectList[this.ganderSelectIndex].id
-				
 				if (this.operationType==1) {
 					//重新审核
 					this.model.examine=0
 				}
-				this.model.createType=1
+				this.model.createType=1 //1小程序认证方式 0：后台数据导入
 				this.$api.enterprisestaff.submit(this.model).then(res=>{
 					if (res.code==200) {
 						if (this.operationType==0) {
@@ -368,7 +393,6 @@
 				})
 			},
 		//园区 begin
-		
 			/**
 			 * 显示园区
 			 */
@@ -389,16 +413,35 @@
 			 */
 			ganderSelectCallback(e) {
 				uni.hideKeyboard();
+				//先重置区域和企业
+				if (this.ganderSelectIndex!=e[0]) {
+					this.resetResidential()
+					this.resetEnterprise()
+				}
 				this.ganderSelectIndex=e[0]
 				this.gander=this.ganderSelectList[this.ganderSelectIndex].agencyName
+				this.model.agencyName=this.ganderSelectList[this.ganderSelectIndex].agencyName
+				this.model.agencyId=this.ganderSelectList[this.ganderSelectIndex].id
 				//加载区域
-				let agencyId=this.ganderSelectList[this.ganderSelectIndex].id
-				this.fetchResidentialList(agencyId)
+				
+				
+				
+				this.fetchResidentialList(this.model.agencyId)
 			},
 		//园区 end
 			
 		//区域 begin
-			
+			/**
+			 * 重置区域数据
+			 * @param {Object} 
+			 */
+			resetResidential(){
+				this.residentialSelectList=[]
+				this.residential=''
+				this.residentialSelectIndex=0
+				this.model.residentialName=''
+				this.model.residentialId=''
+			},
 			/**	
 			 * 根据园区id获取区域列表
 			 */
@@ -421,24 +464,58 @@
 			 */
 			residentialSelectCallback(e){
 				uni.hideKeyboard();
+				//先重置数据
+				if (this.residentialSelectIndex!=e[0]) {
+					this.resetEnterprise()
+				}
 				this.residentialSelectIndex=e[0]
 				this.residential=this.residentialSelectList[this.residentialSelectIndex].name
+				this.residentialId=this.residentialSelectList[this.residentialSelectIndex].id
+				this.model.residentialName=this.residentialSelectList[this.residentialSelectIndex].name
+				this.model.residentialId=this.residentialSelectList[this.residentialSelectIndex].id
 				//加载区域下的企业
-				let residentialId=this.residentialSelectList[this.residentialSelectIndex].id
-				this.fetchEnterpriseList(residentialId)
+				
+				this.fetchEnterpriseList(this.residentialId)
 			},
 		//区域 end
 			
 		//企业 begin
-			
+			/**
+			 * 重置企业数据
+			 */
+			resetEnterprise(){
+				this.companySelectList=[]
+				this.current=1
+				this.company=''
+				this.model.enterpriseName=''
+				this.model.enterpriseId=''
+			},
 			/**
 			 * 根据 区域id 获取 企业列表
 			 */
 			fetchEnterpriseList(residentialId){
-				this.$api.enterprise.page({residentialId:residentialId}).then(res=>{
-					this.companySelectList=res.data.records
+				let params={
+					residentialId:residentialId,
+					current:this.current,
+					enterpriseName:this.keyword
+				}
+				this.$api.enterprise.page(params).then(res=>{
+					this.companySelectList = [...this.companySelectList,...res.data.records]
 				})
 			},
+			/**
+			 * @param {Object} 下拉加载更多企业
+			 */
+			scrolltolower(e){
+				 if(this.companySelectList.length<this.current*10){
+					 this.flag=true
+				   return
+				}else{
+					this.current++
+					this.fetchEnterpriseList(this.residentialId)
+				}
+				
+			},
 			/**
 			 * 显示企业
 			 */
@@ -451,10 +528,11 @@
 				this.companySelectShow=true
 			},
 			//公司
-			companySelectCallback(e) {
-				uni.hideKeyboard();
-				this.companySelectIndex=e[0]
-				this.company = this.companySelectList[this.companySelectIndex].enterpriseName;
+			companySelectCallback(item) {
+				this.model.enterpriseId=item.id
+				this.model.enterpriseName=item.enterpriseName
+				this.company=item.enterpriseName
+				this.companySelectShow=false
 			},
 			
 		//企业 end

pages/index/index.vue

@@ -4,9 +4,9 @@
 			<!-- 头部 -->
 			<u-navbar :border-bottom="false" :is-back="false" title=" ">
 				<view class="slot-wrap">
-					<view class="padding-left-40 " >
+					<view class="padding-left-40 flex" >
 						<u-icon size="34" name="map"></u-icon>
-						<text  style="font-size: 34rpx;padding: 0 10rpx;">{{gander?gander:'暂无园区信息'}}</text>
+						<text class="text-cut-1" style="font-size: 34rpx;padding: 0 10rpx;">{{gander?gander:'暂无园区信息'}}</text>
 					</view>
 				  <!-- <view class="padding-left-40 " @click="ganderShow=true">
 					<text class="padding-right-10" style="font-size: 34rpx;">{{gander?gander:'暂无园区信息'}}</text>

pages/index/staffAudit/detail.vue

@@ -70,15 +70,15 @@
 						</view>
 						<view class="content" v-if="dataDetail.examine!=0">
 							<text class="padding-right-10" >审核时间：</text>
-							<text>{{dataDetail.auditTime}}</text>
+							<text v-text="dataDetail.auditTime?dataDetail.auditTime:''"></text>
 						</view>
 						<view class="content" v-if="dataDetail.examine!=0">
 							<text class="padding-right-10">审核意见：</text>
-							<text>{{dataDetail.opinion}}</text>
+							<text v-text="dataDetail.opinion?dataDetail.opinion:''"></text>
 						</view>
 						<view class="content">
 							<text class="padding-right-10">认证备注：</text>
-							<text style="line-height: 50rpx;">{{dataDetail.remarks}}</text>
+							<text style="line-height: 50rpx;" v-text="dataDetail.remarks?dataDetail.remarks:''"></text>
 						</view>
 						<view style="height: 100rpx;"></view>
 					</view>

pages/login/login.vue

@@ -54,18 +54,19 @@
 				<view class="fixed cu-bar search bg-white">
 					<view class="search-form round">
 						<text class="cuIcon-search"></text>
-						<input v-model="keyword"  :adjust-position="false" type="text" placeholder="请输入公司名称搜索" confirm-type="search"></input>
+						<u-input style="width: 90%;" v-model="keyword" type="text" :adjust-position="false" placeholder="请输入关键字搜索" confirm-type="search"/>
 					</view>
-					<view @click="fetchEnterpriseList" class="action">
+					<!-- <view @click="fetchEnterpriseList" class="action">
 						<button class="cu-btn bg-blue shadow-blur round">搜索</button>
-					</view>
+					</view> -->
 				</view>
-				<scroll-view @scrolltolower="scrolltolower" style="padding-top: 110rpx;height: 100%;" :scroll-y="true" >
+				<scroll-view v-if="!$isEmpty(enterpriseList)" @scrolltolower="scrolltolower" style="padding-top: 110rpx;height: 100%;" :scroll-y="true" >
 					<view @click="selectEnterprise(item)" hover-class="hoverClass" class="text-center padding-30 solid-bottom"  v-for="(item,index) in enterpriseList" :key="index">
 						<text>{{item.enterpriseName}}</text>
 					</view>
 					<u-divider v-if="flag" height="80">没有更多了</u-divider>
 				</scroll-view>
+				<u-empty v-else name="search"></u-empty>
 			</u-popup>
 			
 			<u-action-sheet @click="typeClick" :list="typeList" v-model="typeShow"></u-action-sheet>
@@ -110,6 +111,20 @@ export default {
 			flag:false,
 		};
 	},
+	watch:{
+		keyword(){
+			let that=this
+			//节流函数
+			if (this.timer){
+				clearTimeout(this.timer)//阻止setTimeout函数的执行
+			}
+			this.timer = setTimeout(() => {
+				that.enterpriseList=[]
+				that.current=1
+				that.fetchEnterpriseList()
+			}, 500)
+		},
+	},
 	onLoad() {
 		that=this
 		this.getOpenid()
@@ -163,11 +178,10 @@ export default {
 		 */
 		fetchEnterpriseList(){
 			let params={
-				enterpriseName:this.keyword,
-				current:this.current
+				current:this.current,
+				enterpriseName:this.keyword
 			}
 			this.$api.enterprise.page(params).then(res=>{
-				this.pages=res.data.pages
 				this.enterpriseList = [...this.enterpriseList,...res.data.records]
 			})
 		},
@@ -298,7 +312,7 @@ export default {
 		},
 		//员工登录
 		async staffLogin(){
-			if (this.phone=='19124812874') {
+			if (this.phone=='17795282222') {
 				this.userLogin()
 				return
 			}