修改bug

main.js

@@ -29,38 +29,38 @@ const app = new Vue({
 })
 app.$mount()
 console.log(getExpiresTime(),'getExpiresTime()');
-// var rsing=0
-// rs()
-// let isrefresh=false
-// function rs(){
-// 	const nowTime = new Date().getTime()
-// 	if (rsing==0 && nowTime > (getExpiresTime()-10*1000)&& !isrefresh) {
-// 		console.log("===rs call",)
-// 		refreshToken({
-// 			refreshToken: getRefreshToken()
-// 		}).then((res) => {
-// 			console.log(res.data, 'ressss')
-// 			setToken(res.data)
-// 			 isrefresh = true; // 设置标志变量为 true
-// 			rsing=0
-// 			setTimeout(function() {
-// 				isrefresh = false;
-// 			}, 11 * 1000)
-// 		}).catch(() => {
-// 			/*
-// 			showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
-// 				if (res.confirm) {
-// 					uni.navigateTo({
-// 						url: '/pages/login'
-// 					})
-// 				}
-// 			})*/
-// 		})
-// 	}
-// 	 setTimeout(function(){
-// 		 rs()
-// 	 },1*1000)
-// }
+var rsing=0
+rs()
+let isrefresh=false
+function rs(){
+	const nowTime = new Date().getTime()
+	if (rsing==0 && nowTime > (getExpiresTime()-10*1000)&& !isrefresh) {
+		console.log("===rs call",)
+		refreshToken({
+			refreshToken: getRefreshToken()
+		}).then((res) => {
+			console.log(res.data, 'ressss')
+			setToken(res.data)
+			 isrefresh = true; // 设置标志变量为 true
+			rsing=0
+			setTimeout(function() {
+				isrefresh = false;
+			}, 11 * 1000)
+		}).catch(() => {
+			
+			// showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
+			// 	if (res.confirm) {
+			// 		uni.navigateTo({
+			// 			url: '/pages/login'
+			// 		})
+			// 	}
+			// })
+		})
+	}
+	 setTimeout(function(){
+		 rs()
+	 },1*1000)
+}
 // #ifdef H5
 Vue.mixin({
     mounted() {

pages.json

@@ -337,7 +337,7 @@
 			}, {
 				"path": "fire/fire_station/edit_fireStation/edit_fireStation",
 				"style": {
-					"navigationBarTitleText": "编辑微型消防站",
+					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false
 				}
 			}, {

pages/work/index.vue

@@ -117,11 +117,18 @@
 					id: this.$store.state.user.id
 				}).then(response => {
 					console.log(response.data, 'dddd');
-					// this.urlList2 = this.urlList.splice(this.urlList.length-2,2)
-					this.urlList2 = response.data.filter(item => item.menuUrl == '/pagesA/fire/fire_inspetItem/fire_inspetItem' || item.menuUrl =='/pagesA/fire/archive/nav')
-					this.urlList = response.data.filter(item => !this.urlList2.includes(item)).sort((a, b) => a.menuSort - b.menuSort).splice(12);
-					// this.urlList = response.data.sort((a, b) => a.menuSort - b.menuSort).splice(12);
-					this.urlList1 = response.data.sort((a, b) => a.menuSort - b.menuSort).splice(0,12)
+					response.data.map(i => {
+					  if (i.menuSort.toString().startsWith("1")) {
+					    this.urlList1.push(i);
+					    this.urlList1 = this.urlList1.sort((a, b) => a.menuSort - b.menuSort);
+					  } else if (i.menuSort.toString().startsWith("2")) {
+					    this.urlList.push(i);
+					    this.urlList= this.urlList.sort((a, b) => a.menuSort - b.menuSort);
+					  } else if (i.menuSort.toString().startsWith("3")) {
+					    this.urlList2.push(i);
+					   this.urlList2 = this.urlList2.sort((a, b) => a.menuSort - b.menuSort);
+					  }
+					});
 
 					console.log(this.urlList2, 'asdbj',this.urlList);
 				});

pagesA/fire/architecture/add_architecture/add_architecture.vue

@@ -121,8 +121,8 @@
 						<u-input v-model="formData.fireRating" placeholder="请输入耐火等级" />
 					</u-form-item>
 					<u-form-item label="燃气类型	"><u-input v-model="formData.rqlx" placeholder="请输入燃气类型" /></u-form-item>
-					<u-form-item label="重点部位" prop="xfdts">
-						<u-input v-model="formData.zdbw" placeholder="请输入重点部位" />
+					<u-form-item label="重点部位" prop="zdbwpic">
+						<u-input v-model="formData.zdbwpic" placeholder="请输入重点部位" />
 					</u-form-item>
 					<u-form-item label="总平面图纸名称	">
 						<!-- 选择文件上传 -->

pagesA/fire/architecture/architecture_details/architecture_details.vue

@@ -80,8 +80,8 @@
 					<u-form-item label="燃气类型	">
 						<u-input v-model="formData.rqlx" placeholder="燃气类型" :disabled="true" />
 					</u-form-item>
-					<u-form-item label="重点部位" prop="xfdts">
-						<u-input v-model="formData.zdbw" placeholder="请输入重点部位" />
+					<u-form-item label="重点部位" prop="zdbwpic">
+						<u-input v-model="formData.zdbwpic" placeholder="请输入重点部位" />
 					</u-form-item>
 					<u-form-item label="总平面图纸名称	">
 						<view class="buju">

pagesA/fire/architecture/edit_architecture/edit_architecture.vue

@@ -34,7 +34,7 @@
 						<u-input v-model="formData.ownership" placeholder="请输入产权信息" />
 					</u-form-item>
 					<u-form-item label="重点部位" prop="xfdts">
-						<u-input v-model="formData.zdbw" placeholder="请输入重点部位" />
+						<u-input v-model="formData.zdbwpic" placeholder="请输入重点部位" />
 					</u-form-item>
 					<u-form-item prop="dlwz" @tap="agree_poup()">
 						<!-- <u-input v-model="formData.dlwz" placeholder="请输入地理位置" /> -->

pagesA/fire/check_active/add_check/add_check.vue

@@ -37,7 +37,7 @@
 						<isLodingModel v-if="loading"></isLodingModel>
 					</uni-file-picker>
 				</u-form-item>
-				<u-form-item label="已上传附件" v-if="bianji&&formData.attId.length" labelWidth="100">
+				<u-form-item label="已上传附件" v-if="bianji&&formData.attId.length" labelWidth="120">
 					<u-icon name="close" color="#4CB2B6" size="24" @click="closeImage()">
 					</u-icon>
 					<!-- #ifdef MP-WEIXIN -->

pagesA/fire/check_active/check_implement/check_implement.vue

@@ -41,11 +41,11 @@
 							</uni-grid-item>
 							<!-- </view> -->
 							<uni-grid-item>
-								<view class="grid-item-box" @click="photoUpload(item)">
+								<view class="grid-item-box" @click="photoUpload(item,index)">
 									<image :src="photograph" class="tupian"></image>
-									
+
 									<!--  -->
-									<uni-load-more v-if="loading" status="loading" :content-text="contentText"/>
+									<uni-load-more v-if="item.loading" status="loading" :content-text="contentText" />
 									<text v-else class="text">拍照上传</text>
 								</view>
 							</uni-grid-item>
@@ -169,7 +169,7 @@
 		<u-modal :show="show3" :title="title" content='未完成有问题检查项拍照' @confirm="show3= false"></u-modal>
 		<u-modal :show="show4" :title="title" content='未对消防设备进行扫码检查' @confirm="show4= false"></u-modal>
 		<!-- 弹出层 -->
-		<u-popup :show="maShow" :round="10" @close="maShow=false">
+		<u-popup :show="maShow" :round="10">
 			<view v-if="insTypeData!=''">
 				<view class="springFarm" v-for="(item,index) in insTypeData" :key="index">
 					<view class="show-title">设备名称:{{item.fpdName}}</view>
@@ -246,7 +246,18 @@
 				</view>
 			</view>
 			<view v-else>
-				暂无数据
+				<view class="" style="text-align: center;margin-top: 30px;">
+					暂无数据
+				</view>
+				<view style="width: 60%;position: absolute;left:150rpx;;bottom:60rpx;z-index: 9999;">
+					<div class="btnList" v-if="tableData.length!=0">
+						<u-button shape="circle" type="primary" color="#4CB2B6" text="保存"
+							customStyle="margin-right:20%" @click="checkPopupConfirm(item.id)">
+						</u-button>
+						<u-button shape="circle" type="primary" color="#4CB2B6" text="取消" @click="checkPopupCancel">
+						</u-button>
+					</div>
+				</view>
 			</view>
 		</u-popup>
 		<!-- 	<u-modal :show="show5" title="隐患描述" @confirm="descriptFpd" @cancel="show5 = false">
@@ -412,6 +423,9 @@
 			// ----隐患
 			checkboxConfirm2(index) {
 				this.tableData[index].description = this.checkedListDanger.toString()
+				if (this.tableData[index].description.startsWith(',')) {
+					this.tableData[index].description = this.tableData[index].description.slice(1);
+				}
 				this.tableData[index].showDanger = false
 				this.$forceUpdate()
 			},
@@ -467,6 +481,9 @@
 			},
 			checkboxConfirm3(index) {
 				this.description2 = this.checkedPopupDanger.toString()
+				if (this.description2.startsWith(',')) {
+					this.description2=this.description2.slice(1);
+				}
 				this.showPopupDanger = false
 				this.$forceUpdate()
 			},
@@ -576,7 +593,7 @@
 			closeImage(item, val, k) { //删除图片
 				if (item.inspType == 'fpd') {
 					this.insTypeData[k].attUrl.splice(val, 1)
-				}else{
+				} else {
 					this.tableData[k].attUrl.splice(val, 1)
 				}
 
@@ -733,6 +750,7 @@
 						this.tableData = response.data.records
 						this.tableData.map(i => {
 							i.inspId = i.id
+							i.loading=false
 							// i.inspName = i.insp_name
 							// i.inspCode = i.insp_code
 							i.isreport = 0
@@ -928,6 +946,7 @@
 										k['broadId'] = that.formData.broadId
 										if (k.id == fpdId) {
 											k['dangerDescribe'] = this.description2
+											this.description2 = ''
 										}
 
 									})
@@ -976,7 +995,7 @@
 			},
 
 			//拍照上传
-			photoUpload(val) {
+			photoUpload(val,index) {
 				let pictures = [];
 				var that = this;
 				uni.chooseImage({
@@ -985,7 +1004,8 @@
 					sizeType: ['original', 'compressed'],
 					// sourceType: ['album','camera'], //打开系统相册
 					success(res) {
-						that.loading = true
+						that.tableData[index].loading=true
+						// that.loading = true
 						if (Array.isArray(res.tempFilePaths)) { //从相册选择有三张的情况
 							// if (res.tempFilePaths.length === 3) {
 							// 	pictures.length = 0
@@ -1018,12 +1038,12 @@
 														getAccessToken(),
 												}, //请求token
 												success: (res) => {
-													that.loading = false
+													// that.loading = false
+														that.tableData[index].loading=false
 													let imgUrl = JSON.parse(res
 														.data)
 													// that.imageList.push(imgUrl.data)
-													if (val
-														.inspType != 'fpd') {
+													if (val.inspType != 'fpd') {
 														that.tableData.map((i,
 															index) => {
 															if (val.id == i
@@ -1053,7 +1073,8 @@
 													// // 返回的url
 												},
 												fail: (err) => {
-													that.loading = false
+													// that.loading = false
+													that.tableData[index].loading=false
 													this.$modal.msg(err.msg)
 												}
 											})
@@ -1202,7 +1223,7 @@
 	.uni-grid-wraps {
 		margin-left: 60rpx;
 		// margin-bottom: 40rpx;
-		    margin-bottom: 480rpx !important;
+		margin-bottom: 480rpx !important;
 	}
 
 	/deep/.u-slide-up-enter-active[data-v-39e33bf2],

pagesA/fire/check_active/index.vue

@@ -35,7 +35,7 @@
 					<view class="titles">{{item.taskName}}</view>
 					<view style="" v-if="item.taskContent">
 						<span class="name-align-task">任务说明:</span>
-						<span>{{item.taskContent?item.taskContent:''}}</span>
+						<span class="uni-ellipsis-set">{{item.taskContent?item.taskContent:''}}</span>
 					</view>
 					<!-- <text class="conts">{{item.taskContent}}</text> -->
 					<!-- <view class="">

pagesA/fire/check_inspection/check_inspection.vue

@@ -453,6 +453,9 @@
 			},
 			checkboxConfirm3(index) {
 				this.dangerDescribe = this.checkedPopupDanger.toString()
+				if (this.dangerDescribe.startsWith(',')) {
+					this.dangerDescribe =this.dangerDescribe.slice(1);
+				}
 				this.showPopupDanger = false
 				this.$forceUpdate()
 			},
@@ -1093,10 +1096,6 @@
 	::v-deep .u-icon__icon {
 		margin-right: 0px !important;
 	}
-	/deep/.u-popup__content {
-		overflow-y: auto;
-
-	}
 	.child {
 		margin: 20rpx 0 0 20rpx;
 		border-radius: 10rpx;
@@ -1302,7 +1301,8 @@
 	}
 
 	/deep/.u-action-sheet {
-		height: 90%;
+		height: 80vh;
+		background-color: #fff;
 		overflow-y: auto;
 	}
-</style>
+</style>vh

pagesA/fire/fire_device/edit_device/edit_device.vue

@@ -325,6 +325,9 @@
 							if (!item.picname) {
 								item.picname = '默认名称';
 							}
+							if (!item.fpdid) {
+								item.fpdid = this.formData.id
+							}
 						});
 						console.log(this.formData);
 						var jsdata = JSON.stringify(this.formData);

pagesA/fire/fpd_detection/add_detection/add_detection.vue

@@ -53,8 +53,8 @@
 			<!-- ----隐患 -->
 			<u-popup :show="showInspOption" :round="10" @close="showInspOption=false">
 				<view style="width: 70vw;overflow-y: auto;margin-bottom: 80rpx;padding:10px">
-					<text class="text-xl">选择隐患类型:</text>
-					<view class="" class="person-forward">
+					<text class="text-xl">选择检测项目:</text>
+					<view class="person-forward" style="margin-top: 10px;">
 						<u-checkbox-group placement="column" v-model="checkArr" @change="checkboxChange2"
 							activeColor="#4CB2B6" iconSize="red">
 							<u-checkbox v-for="(items, indexs) in detinspectOptions" :key="indexs"

pagesA/fire/fpd_detection/edit_detection/edit_detection.vue

@@ -54,8 +54,8 @@
 			<!-- ----隐患 -->
 			<u-popup :show="showInspOption" :round="10" @close="showInspOption=false">
 				<view style="width: 70vw;overflow-y: auto;margin-bottom: 80rpx;padding:10px">
-					<text class="text-xl">选择隐患类型:</text>
-					<view class="" class="person-forward">
+					<text class="text-xl">选择检测项目:</text>
+						<view class="person-forward" style="margin-top: 10px;">
 						<u-checkbox-group placement="column" v-model="checkArr" @change="checkboxChange2"
 							activeColor="#4CB2B6" iconSize="red">
 							<u-checkbox v-for="(items, indexs) in detinspectOptions" :key="indexs"

pagesA/fire/hidden_trouble/index.vue

@@ -213,7 +213,7 @@
 		<u-modal title="隐患复查" width="640rpx" :show="showreview " showCancelButton buttonReverse @confirm="onreviewclick"
 			@cancel="cancelClick" confirmColor="rgb(25, 146, 148)">
 			<view class="" style="width: 100%;">
-				<u--form :model="reviewFromdata" ref="reviewfrom" label-width='80'>
+				<u--form :model="reviewFromdata" ref="reviewfrom" label-width='95px'>
 					<u-form-item label="解决方式:" prop="handleMethod">
 						<u-radio-group v-model="reviewFromdata.handleMethod">
 							<u-radio :customStyle="{marginRight: '16px'}" activeColor="rgb(25, 146, 148)"

pagesA/fire/notice/index.vue

@@ -66,6 +66,8 @@
 		getNoticeList, // 通知公告列表 
 	} from "@/api/notice";
 	let that = null;
+	import config from '@/config'
+	const baseUrlImg = config.baseUrlImg
 	export default {
 		components: {
 			tarBar
@@ -90,7 +92,8 @@
 				// 初始化时搜索框的值
 				keyword: '',
 				ids: '0',
-				title: '1'
+				title: '1',
+				tan90: `${baseUrlImg}/tan90.png`,
 			}
 		},
 		// 在 vue页面，向起始页通过事件传递数据

pagesA/fire/staff_info/index.vue

@@ -17,7 +17,7 @@
 					<u-form-item prop="orgName" @click="
 						showOrg = true;
 						hideKeyboard();
-					" label="单位选择:" labelWidth="80px">
+					" label="单位选择:" labelWidth="120px">
 						<u--input border="none" disabled v-model="formData.orgName" placeholder="请选择所属单位"></u--input>
 						<u-icon slot="right" name="arrow-down"></u-icon>
 					</u-form-item>

pagesB/fire/fireSpecial/addSpecial/index.vue

@@ -62,8 +62,8 @@
 			<u-button v-if="isedit" @click="submit('customForm')" type="primary" shape="circle" size="large"
 				color="#4CB2B6" text="确认修改" style="width:200px">
 			</u-button>
-			<u-button v-else-if="!isedit&&!isview" @click="submit('customForm')" type="primary" shape="circle" size="large"
-				color="#4CB2B6" text="确认新增" style="width:200px">
+			<u-button v-else-if="!isedit&&!isview" @click="submit('customForm')" type="primary" shape="circle"
+				size="large" color="#4CB2B6" text="确认新增" style="width:200px">
 			</u-button>
 			<u-button v-else-if="isview" @click="submit('customForm')" type="primary" shape="circle" size="large"
 				color="#4CB2B6" text="返回" style="width:200px">
@@ -106,10 +106,10 @@
 					numberCode: '',
 					idcardno: '',
 					empGender: '',
-					att:'',
-					attId:[]
+					att: '',
+					attId: []
 				},
-				loading:'',
+				loading: '',
 				rules: {
 					empName: [{
 						type: 'string',
@@ -184,20 +184,20 @@
 				this.formData.attId = [];
 			},
 			selectFile(e) {
-			  let promises = [];
-			  for (let i = 0; i < e.tempFilePaths.length; i++) {
-			    const promise = uploadFile(e.tempFilePaths, i,this);
-			    promises.push(promise);
-			  }
-			  Promise.all(promises).then(result => {
-			    // 处理上传文件成功的结果
-			  }).catch(error => {
-			    // 处理上传文件失败的错误
-			  });
+				let promises = [];
+				for (let i = 0; i < e.tempFilePaths.length; i++) {
+					const promise = uploadFile(e.tempFilePaths, i, this);
+					promises.push(promise);
+				}
+				Promise.all(promises).then(result => {
+					// 处理上传文件成功的结果
+				}).catch(error => {
+					// 处理上传文件失败的错误
+				});
 			},
 			closeImage() {
 				this.formData.attId = []
-				this.formData.att=''
+				this.formData.att = ''
 				this.$forceUpdate()
 			},
 			sexSelect(e) {
@@ -218,7 +218,7 @@
 				})
 			},
 			bindDateChange(e) {
-				console.log(e,'ssss');
+				console.log(e, 'ssss');
 				this.formData.empBirthday = e.detail.value
 				this.$forceUpdate()
 			},
@@ -228,9 +228,13 @@
 			},
 			submit(ref) {
 				this.$refs[ref].validate().then(res => {
-				this.formData.att = this.formData.attId.length > 0 && this.formData.attId[0] ? this.formData
-					.attId[0] : this.formData.att
+					if (this.formData.attId && this.formData.attId.length > 0) {
+						this.formData.att = this.formData.attId[0];
+					} else {
+						this.formData.att = this.formData.att;
+					}
 					if (this.isedit) {
+						console.log('修改');
 						fireSpecialUpdate(JSON.stringify(this.formData)).then(res => {
 							this.$modal.msg('修改成功')
 							this.isedit = false
@@ -239,9 +243,11 @@
 							}, 400)
 						})
 					} else if (this.isview) {
+						console.log('查看');
 						this.isview = false
 						uni.navigateBack()
 					} else {
+						console.log('新增', this.isedit, this.isview);
 						fireSpecialCreate(JSON.stringify(this.formData)).then(response => {
 							this.$modal.msg('新增成功')
 							setTimeout(() => {
@@ -251,6 +257,7 @@
 					}
 
 				}).catch(err => {
+					console.log(err);
 				})
 			}
 		}
@@ -295,12 +302,11 @@
 			background-color: #fff;
 		}
 	}
-	
+
 	.selectBtn {
 		width: 200rpx;
 		margin-left: 0;
 		font-size: 30rpx;
 		background-color: #4cb2b6;
 	}
-	
 </style>

pagesB/fire/fireWork/addWork/index.vue

@@ -269,9 +269,11 @@
 					return this.$modal.msg('结束时间不能小于开始时间')
 				}
 				this.$refs[ref].validate().then(res => {
-
-					this.formData.att = this.formData.attId.length > 0 && this.formData.attId[0] ? this.formData
-						.attId[0] : this.formData.att
+					if (this.formData.attId && this.formData.attId.length > 0) {
+						this.formData.att = this.formData.attId[0];
+					} else {
+						this.formData.att = this.formData.att;
+					}
 					if (this.isedit) {
 						fireWorkUpdate(JSON.stringify(this.formData)).then(res => {
 							this.$modal.msg('修改成功')
@@ -292,8 +294,7 @@
 						})
 					}
 
-				}).catch(err => {
-				})
+				}).catch(err => {})
 			}
 		}
 	}

static/scss/global.scss

@@ -41,6 +41,12 @@
 	width: 155rpx;
 	height: 40rpx;
 }
+	.uni-ellipsis-set {
+	 display: -webkit-box;/*弹性伸缩盒子模型显示*/
+	    -webkit-box-orient: vertical;   /*排列方式*/ 
+	    -webkit-line-clamp: 1;/*显示文本行数*/
+	    overflow: hidden;/*溢出隐藏*/
+	}
 //任务派遣
 .name-align-task{
 	width: 130rpx;
@@ -211,6 +217,7 @@
 	}
 
 }
+
 .sub-botn{
 	position: fixed;
 	left: 50%;

utils/request.js

@@ -57,37 +57,37 @@ const request = async (config) => {
 				const code = res.data.code || 200
 				const msg = errorCode[code] || res.data.msg || errorCode['default']
 				if (code === 401) {
-					//token无效或已过期
-					if (!isRefreshing) {
-						// 是否已经执行刷新
-						isRefreshing = true
-						let token = getAccessToken(); // 获取到过期的token
-						try {
-							refreshToken({
-								refreshToken: getRefreshToken() // 刷新token的令牌存在token的对象里面，需要传给后端
-							}).then(reshRespore=>{
-								console.log(reshRespore, 'reshResporereshResporereshRespore');
-								// 请求成功把新的token存到本地
-								setToken(reshRespore.data);
-								// 已经刷新了token，将所有队列中的请求进行重试
-								requests.forEach((item) => item(reshRespore.data.accessToken))
-								requests = []
-								// 每个接口请求都要存入队列，等刷新完以后都需要执行
-								return new Promise((resolve) => {
-									// 将resolve放进队列，用一个函数形式来保存，等token刷新后直接执行
-									requests.push((token) => {
-										//这一步一定要有，刷新token，因为存入的信息是旧的token
-										response.config.header['Authorization'] =
-											'Bearer ' +
-											token;
-										resolve(uni.$u.http.request(response
-											.config)) //执行请求
-									})
-								})
-							})
+					// //token无效或已过期
+					// if (!isRefreshing) {
+					// 	// 是否已经执行刷新
+					// 	isRefreshing = true
+					// 	let token = getAccessToken(); // 获取到过期的token
+					// 	try {
+					// 		refreshToken({
+					// 			refreshToken: getRefreshToken() // 刷新token的令牌存在token的对象里面，需要传给后端
+					// 		}).then(reshRespore=>{
+					// 			console.log(reshRespore, 'reshResporereshResporereshRespore');
+					// 			// 请求成功把新的token存到本地
+					// 			setToken(reshRespore.data);
+					// 			// 已经刷新了token，将所有队列中的请求进行重试
+					// 			requests.forEach((item) => item(reshRespore.data.accessToken))
+					// 			requests = []
+					// 			// 每个接口请求都要存入队列，等刷新完以后都需要执行
+					// 			return new Promise((resolve) => {
+					// 				// 将resolve放进队列，用一个函数形式来保存，等token刷新后直接执行
+					// 				requests.push((token) => {
+					// 					//这一步一定要有，刷新token，因为存入的信息是旧的token
+					// 					response.config.header['Authorization'] =
+					// 						'Bearer ' +
+					// 						token;
+					// 					resolve(uni.$u.http.request(response
+					// 						.config)) //执行请求
+					// 				})
+					// 			})
+					// 		})
 							
-						} catch {
-							uni.$u.toast('未知错误')
+					// 	} catch {
+					// 		uni.$u.toast('未知错误')
 							showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
 								if (res.confirm) {
 									uni.navigateTo({
@@ -95,13 +95,13 @@ const request = async (config) => {
 									})
 								}
 							});
-						} finally {
-							// 请求成功，开启刷新标识
-							isRefreshing = false
-						}
-					} else {
+					// 	} finally {
+					// 		// 请求成功，开启刷新标识
+					// 		isRefreshing = false
+					// 	}
+					// } else {
 					
-					}
+					// }
 				} else if (code === 500) {
 					toast(msg)
 					reject('500')