Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

api/jiazheng.js

@@ -1,281 +1,283 @@
 import request from '@/utils/request'
 
 export function getJiazhengList(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/list',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/list',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 // 阿里云 上传
 export function getAliyunPolicy(data = {}) {
-  return request({
-    url: '/app/file/policy',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/file/policy',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengLeixing(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/leixing',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/leixing',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengJineng(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/jineng',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/jineng',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengZhuangtai(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/zhuangtai',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/zhuangtai',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getBaozhengJigou(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/jigou',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/jigou',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengLevel(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/level',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/level',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengZhiye(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/zhiye',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/zhiye',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengXueli(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/xueli',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/xueli',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengHunyin(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/hunyin',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/hunyin',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengMinzu(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/minzu',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/minzu',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengXingzuo(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/xingzuo',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/xingzuo',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengShuxiang(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/ops/shuxiang',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/ops/shuxiang',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengJiguan(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/tree/city',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/tree/city',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengBanzhengCheckKc(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/kaozheng/check/kecheng',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/kaozheng/check/kecheng',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengJianli(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/jianli',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/jianli',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function getJiazhengInfo(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/info',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/info',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function jiazhengAdd(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/add',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/add',
+		headers: {
+			isToken: false
+		},
+		isLoading: true,
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function jiazhengUpdate(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/update',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/update',
+		headers: {
+			isToken: false
+		},
+		isLoading: true,
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 export function jiazhengKaozhengAdd(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/kaozheng/add',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/kaozheng/add',
+		headers: {
+			isToken: true
+		},
+		isLoading: true,
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 
 export function jiazhengKaozhengDelete(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/kaozheng/delete',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/kaozheng/delete',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 
 export function jiazhengIdcard(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/idcard',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
+	return request({
+		url: '/app/user/jiazheng/idcard',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
 }
 
 
 export function jiazhengCheck(data = {}) {
-  return request({
-    url: '/app/user/jiazheng/check',
-    headers: {
-      isToken: true
-    },
-    method: 'post',
-    data,
-    timeout: 20000
-  })
-}
-
+	return request({
+		url: '/app/user/jiazheng/check',
+		headers: {
+			isToken: true
+		},
+		method: 'post',
+		data,
+		timeout: 20000
+	})
+}

api/login.js

@@ -6,6 +6,7 @@ export function login(data = {}) {
     headers: {
       isToken: false
     },
+isLoading
     method: 'post',
     data,
     timeout: 20000

common/styles/global/components.scss

@@ -102,7 +102,7 @@ view{box-sizing: border-box;}
 // 三个元素
 .phone-navBar-box{
 	display: flex;align-items: center;justify-content: space-between;background-color: #fff;
-	padding: var(--status-bar-height) 20rpx 20rpx;box-sizing: border-box;position: relative;
+	padding: calc(20rpx + var(--status-bar-height)) 20rpx 20rpx;box-sizing: border-box;position: relative;
 	.nav-bar-icon{
 		width: 24rpx;height: 38rpx;
 		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
@@ -131,12 +131,12 @@ view{box-sizing: border-box;}
 // 两个元素
 .icon-title-navBar-box,.icon-title-bjcolor-navBar-box{
 	display: flex;align-items: center;justify-content: center;background-color: #fff;
-	padding: var(--status-bar-height) 20rpx 20rpx;box-sizing: border-box;position: relative;
+	padding: calc(20rpx + var(--status-bar-height)) 20rpx 20rpx;box-sizing: border-box;position: relative;
 	.nav-bar-title{
 		font-size: 32rpx;height: 63rpx;line-height: 63rpx;color: #333;max-width: 70%;
 	}
 	.nav-bar-icon{
-		width: 24rpx;height: 38rpx;position: absolute;left: 24rpx;top: calc(12rpx + var(--status-bar-height));;
+		width: 24rpx;height: 38rpx;position: absolute;left: 24rpx;top: calc(32rpx + var(--status-bar-height));
 		background-image: url("@/static/images/common/nav-bar-jt.svg");@include ezy-no-repeat-cover();
 	}
 }
@@ -144,7 +144,7 @@ view{box-sizing: border-box;}
 .icon-title-bjcolor-navBar-box{
 	background-color: #fff;padding: 10rpx;border-bottom: 1rpx solid #e0e0e0;
 	.nav-bar-title{color: #3fd2a1;}
-	.nav-bar-icon{width: 100rpx;height: 63rpx;background-image:unset;}
+	.nav-bar-icon{width: 100rpx;height: 63rpx;background-image:unset;top: calc(12rpx + var(--status-bar-height));}
 	.nav-bar-icon::before{content:'';width:50rpx;height: 50rpx;display: inline-block;margin-top: 6rpx;
 	@include ezy-no-repeat-cover();
 	background-image: url("@/static/images/common/return-icon.png");}

common/styles/global/pages.scss

@@ -179,8 +179,8 @@
 .phone-list-page{
 	box-sizing: border-box;
 	.phone-scroll-view {height: calc(100vh - 182rpx - var(--status-bar-height));}
-	.phone-scroll-saixuan-view {height: calc(100vh - 168rpx - var(--status-bar-height));}
-	.admin-phone-scroll-view{height: calc(100vh - 292rpx - var(--status-bar-height));}
+	.phone-scroll-saixuan-view {height: calc(100vh - 188rpx - var(--status-bar-height));}
+	.admin-phone-scroll-view{height: calc(100vh - 312rpx - var(--status-bar-height));}
 	.admin-list-box{
 		.admin-list-item-box{border-bottom: 20rpx solid #f4f6fa;}
 		.uni-list--border,.uni-list--border-top{display: none;}
@@ -388,10 +388,9 @@
 
 /*** 答题卡 ***/
 .answer-card-popup{
-	height: 100vh;
-	.answer-card-content{
-		display: flex;flex-wrap: wrap;box-sizing: border-box;padding: 20rpx 16rpx;
-	}
+	height: 100vh;width: 100%;display: flex;flex-direction: column;
+	.card-content-box{overflow: auto;flex: 1;}
+	.answer-card-content{display: flex;flex-wrap: wrap;box-sizing: border-box;padding: 20rpx 16rpx;}
 	.paragraph-title{width: 100%;font-size: 30rpx;margin:0 0 10rpx 24rpx;}
 	.paragraph-qa {
 		width: 80rpx;height: 80rpx;line-height: 78rpx;margin: 20rpx 30rpx;border: 1rpx solid transparent;
@@ -526,7 +525,7 @@
 /*** 家政人员列表 ***/
 .admin-jiazheng-list{
 	width: 100%;height: 100vh;position: relative;
-	.jz-scroll-view {height: calc(100vh - 250rpx - var(--status-bar-height));}
+	.jz-scroll-view {height: calc(100vh - 270rpx - var(--status-bar-height));}
 	.all-type-box{
 		position: absolute;top: 80rpx;left: 0;right: 0;bottom: 0;
 		z-index: 2;background-color: rgba(0,0,0,0.3);

manifest.json

@@ -59,7 +59,8 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>"
                 ],
                 "abiFilters" : [ "arm64-v8a" ],
                 "minSdkVersion" : 24,

pages/Login/components/adminloginBox.vue

@@ -106,10 +106,7 @@
 		const trimmedUserName = userName.value;
 		const trimmedPassword = lliPassword.value;
 		
-		uni.showLoading({
-			title: '登录中'
-		})
-		
+	
 		httpApi.login({
 			userName: trimmedUserName,
 			password: lliPassword.value,
@@ -125,8 +122,6 @@
 			}
 		}).catch(err => {
 			store.setIsCanBack(true)
-		}).finally(err => {
-			uni.hideLoading()
 		})
 	}
 	

pages/admin/Chengji/ksScoreShijuan.vue

@@ -80,13 +80,15 @@
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
 					<text class="nav-bar-title">答题卡</text>
 				</view>
-				<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
-					:key="paragraphIndex">
-					<view class="paragraph-title">
-						{{paragraph.name}}
-					</view>
-					<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex"
-						:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+				<view class="card-content-box">
+					<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
+						:key="paragraphIndex">
+						<view class="paragraph-title">
+							{{paragraph.name}}
+						</view>
+						<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex"
+							:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+						</view>
 					</view>
 				</view>
 			</view>

pages/admin/Kaoshi/exam.vue

@@ -56,12 +56,14 @@
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
 					<text class="nav-bar-title">答题卡</text>
 				</view>
-				<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData" :key="paragraphIndex">
-					<view class="paragraph-title">
-						{{paragraph.name}}
-					</view>
-					<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex" 
-					:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+				<view class="card-content-box">
+					<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData" :key="paragraphIndex">
+						<view class="paragraph-title">
+							{{paragraph.name}}
+						</view>
+						<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex" 
+						:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+						</view>
 					</view>
 				</view>
 			</view>

pages/admin/Lianxi/lianxi.vue

@@ -57,12 +57,14 @@
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
 					<text class="nav-bar-title">答题卡</text>
 				</view>
-				<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData" :key="paragraphIndex">
-					<view class="paragraph-title">
-						{{paragraph.name}}
-					</view>
-					<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex" 
-					:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+				<view class="card-content-box">
+					<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData" :key="paragraphIndex">
+						<view class="paragraph-title">
+							{{paragraph.name}}
+						</view>
+						<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex" 
+						:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+						</view>
 					</view>
 				</view>
 			</view>

pages/client/Chengji/ksScoreShijuan.vue

@@ -74,12 +74,14 @@
 						<view @click="handlePopupBack" class="nav-bar-icon"> </view>
 						<text class="nav-bar-title">答题卡</text>
 					</view>
-					<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData" :key="paragraphIndex">
-						<view class="paragraph-title">
-							{{paragraph.name}}
-						</view>
-						<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex" 
-						:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+					<view class="card-content-box">
+						<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData" :key="paragraphIndex">
+							<view class="paragraph-title">
+								{{paragraph.name}}
+							</view>
+							<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex" 
+							:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+							</view>
 						</view>
 					</view>
 				</view>

pages/client/Chengji/lxScoreShijuan.vue

@@ -80,13 +80,15 @@
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
 					<text class="nav-bar-title">答题卡</text>
 				</view>
-				<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
-					:key="paragraphIndex">
-					<view class="paragraph-title">
-						{{paragraph.name}}
-					</view>
-					<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex"
-						:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+				<view class="card-content-box">
+					<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
+						:key="paragraphIndex">
+						<view class="paragraph-title">
+							{{paragraph.name}}
+						</view>
+						<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex"
+							:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+						</view>
 					</view>
 				</view>
 			</view>

pages/client/Kaoshi/exam.vue

@@ -67,13 +67,15 @@
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
 					<text class="nav-bar-title">答题卡</text>
 				</view>
-				<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
-					:key="paragraphIndex">
-					<view class="paragraph-title">
-						{{paragraph.name}}
-					</view>
-					<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex"
-						:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+				<view class="card-content-box">
+					<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
+						:key="paragraphIndex">
+						<view class="paragraph-title">
+							{{paragraph.name}}
+						</view>
+						<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex"
+							:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+						</view>
 					</view>
 				</view>
 			</view>

pages/client/Lianxi/exam.vue

@@ -66,13 +66,15 @@
 					<view @click="handlePopupBack" class="nav-bar-icon"> </view>
 					<text class="nav-bar-title">答题卡</text>
 				</view>
-				<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
-					:key="paragraphIndex">
-					<view class="paragraph-title">
-						{{paragraph.name}}
-					</view>
-					<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex"
-						:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+				<view class="card-content-box">
+					<view class="answer-card-content" v-for="(paragraph,paragraphIndex) in questionData"
+						:key="paragraphIndex">
+						<view class="paragraph-title">
+							{{paragraph.name}}
+						</view>
+						<view class="paragraph-qa" v-for="(qa,qaIndex) in paragraph.qas" :key="qaIndex"
+							:class="getQaClass(qa)" @click="answerCardItemClick(qa)">{{qa.onlyNum}}
+						</view>
 					</view>
 				</view>
 			</view>

utils/request.js

@@ -18,7 +18,7 @@ const request = config => {
 	// 是否需要设置 token
 	// const isToken = (config.headers || {}).isToken === false
 	config.header = config.header || {}
-
+	console.log('config', config);
 
 	//  if (getToken() && !isToken) {
 	// config.headers['X-AUTH-SIGN'] = Md5.hashStr(JSON.stringify(config.data) +auth.secret);
@@ -26,10 +26,16 @@ const request = config => {
 	//  }
 	if (cacheManager.get('auth')) {
 		config.headers['X-AUTH-SIGN'] = Md5.hashStr(JSON.stringify(config.data) + cacheManager.get('auth').secret);
-		config.headers['X-AUTH-TOKEN'] =cacheManager.get('auth').token;
+		config.headers['X-AUTH-TOKEN'] = cacheManager.get('auth').token;
 	}
 	return new Promise((resolve, reject) => {
-		//  debugger
+
+		if (config.isLoading) {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			});
+		}
 		uni.request({
 				method: config.method || 'get',
 				timeout: config.timeout || timeout,
@@ -38,19 +44,17 @@ const request = config => {
 				header: config.headers,
 				dataType: 'json'
 			}).then(response => {
+				if (config.isLoading) {
+					uni.hideLoading()
+				}
 				const res = response.data;
-				// if (error) {
-				//   toast('后端接口连接异常')
-				//   reject('后端接口连接异常')
-				//   return
-				// }
 				const code = res.code
 				const msg = res.msg
 				// const msg = errorCode[code] || res.data.msg || errorCode['default']
 				if (code === 401) {
 					showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
 						if (res.confirm) {
-							if(cacheManager.get('auth')){
+							if (cacheManager.get('auth')) {
 								cacheManager.clearAll()
 							}
 							uni.reLaunch({
@@ -62,7 +66,7 @@ const request = config => {
 				} else if (code === 405) {
 					showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
 						if (res.confirm) {
-							if(cacheManager.get('auth')){
+							if (cacheManager.get('auth')) {
 								cacheManager.clearAll()
 							}
 							uni.reLaunch({
@@ -75,7 +79,7 @@ const request = config => {
 				} else if (code === 500) {
 					toast("数据异常-500")
 					reject('500')
-				}else if (code === 400) {
+				} else if (code === 400) {
 					toast("数据异常-400")
 					reject('400')
 				} else if (code !== 0) {
@@ -85,6 +89,9 @@ const request = config => {
 				resolve(res)
 			})
 			.catch(error => {
+				if (config.isLoading) {
+					uni.hideLoading()
+				}
 				let {
 					message
 				} = error