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

common/httpRequest.js

@@ -227,10 +227,10 @@ module.exports = {
 								icon: 'none'
 							})
 						}else if (result.data.code !=0&&result.data.msg!='未进入公司') {
-							// uni.showToast({
-							// 	title: result.data.msg||'查询失败！',
-							// 	icon: 'none'
-							// })
+							uni.showToast({
+								title: result.data.msg||'查询失败',
+								icon: 'none'
+							})
 							}
 						succ.call(self, result.data)
 					},
@@ -250,10 +250,10 @@ module.exports = {
 					},
 					success: function(result) {
 						if (result.data.code !=0&&result.data.msg!='未进入公司'){
-							// uni.showToast({
-							// 	title: result.data.msg||'查询失败.',
-							// 	icon: 'none'
-							// })
+							uni.showToast({
+								title: result.data.msg||'查询失败',
+								icon: 'none'
+							})
 						}
 						succ.call(self, result.data)
 					},
@@ -294,10 +294,10 @@ module.exports = {
 							icon: 'none'
 						})
 					}else if (result.data.code !=0&&result.data.msg!='未进入公司') {
-							// uni.showToast({
-							// 	title: result.data.msg||'查询失败？',
-							// 	icon: 'none'
-							// })
+							uni.showToast({
+								title: result.data.msg||'查询失败',
+								icon: 'none'
+							})
 					}
 					succ.call(self, result.data)
 				},

pages/index/index.vue

@@ -441,8 +441,8 @@
 										</view>
 									</view>
 									<!-- 标签 -->
-									<view v-if="item.skillName" class="flex align-center" style="gap:8rpx;margin: 32rpx 0;">
-										<view v-for="(text, i) in (item.skillName ? item.skillName.split(',') : [])" :key="i" class="skillTag">
+									<view v-if="item.intentPostSkill" class="flex align-center flex-wrap" style="gap:8rpx;margin: 32rpx 0;">
+										<view v-for="(text, i) in (item.intentPostSkill ? item.intentPostSkill.split(',') : [])" :key="i" class="skillTag">
 											{{text}}
 										</view>
 									</view>