Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

pages/my/attachment.vue

@@ -439,7 +439,7 @@ export default {
 					
 					this.getUserInfo()
 				} else {
-					this.showModal('解析失败，请稍后重试')
+					this.showModal(res?.msg || '解析失败，请稍后重试')
 				}
 				
 				this.stopLoadStatus()

pages/public/improvePrompt.vue

@@ -40,7 +40,7 @@
 				<view class="popup-title">温馨提示</view>
 				<view class="tip-container">
 					<view>1-2页简历识别预计耗时1分钟；</view>
-					<view>3-5页简历识别预计耗时5分钟；</view>
+					<view>3-5页简历识别预计耗时1-3分钟；</view>
 					<view>5页简历以上耗时将会超过5分；</view>
 					<view>请您耐心等待！</view>
 				</view>
@@ -158,7 +158,7 @@
 							url: '/pages/my/onlineResume?fileId=AI_Resume_Data'
 						})
 					} else {
-						this.showModal('解析失败，请稍后重试')
+						this.showModal(res?.msg || '解析失败，请稍后重试')
 					}
 					
 					this.stopLoadStatus()

pages/recruitmentData/dataCenter.vue

@@ -178,7 +178,12 @@ export default {
   },
   data() {
     return {
-      zwList: [],
+      zwList: [
+		  {
+			  name: '全部',
+			  id: ''
+		  }
+	  ],
       zwIndex: 0,
       weekList: [],
       weekIndex: 0,