Browse Source

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

xxdezh 7 months ago
parent
commit
d219a4be50
2 changed files with 11 additions and 7 deletions
  1. 2 0
      pages/index/game/order.vue
  2. 9 7
      pages/index/index.vue

+ 2 - 0
pages/index/game/order.vue

@@ -497,6 +497,8 @@
 								})
 							} else {
 								console.log(this.info)
+								if(uni.getStorageSync('userId')==this.info.user.userId)
+									return this.$queue.showToast('自己无法与自己聊天')
 								this.$Request.postJson('/app/chat/insertChatConversation', {
 									userId: uni.getStorageSync('userId'), //用户userid
 									focusedUserId: this.info.user.userId, //企业userid

+ 9 - 7
pages/index/index.vue

@@ -229,11 +229,11 @@
 											<view class="title-left flex align-center">
 												<view class="job-title-text"
 													style="max-width: 450rpx;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;-o-text-overflow:ellipsis;">
-													<block v-if="isSameName(item.ruleClassifyName,item.stationName)">
+													<!-- <block v-if="isSameName(item.ruleClassifyName,item.stationName)">
 														{{item.ruleClassifyName}}-
-													</block>
+													</block> -->
 													<block>
-														{{item.stationName}}
+														{{item.ruleClassifyName}}
 													</block>
 												</view>
 												<view v-if="item.isDue==1" class="salary-text-box">
@@ -264,7 +264,7 @@
 											<view class="gwList-box-item-box-info-l flex align-center">
 												<image
 													:src="item.hr&&item.hr.hrImg?item.hr.hrImg:'../../static/logo.png'"
-													style="width: 58rpx;height: 58rpx;border-radius: 50%;margin-right: 20rpx;"
+													style="width: 58rpx;height: 58rpx;border-radius: 50%;"
 													mode=""></image>
 												<view class="company-info-text">
 													{{item.user.userName?item.user.userName:'未知'}}·{{item.hr.hrPosition?item.hr.hrPosition:'未知'}}
@@ -272,7 +272,7 @@
 												<view class="reply-time">10分钟前回复</view>
 											</view>
 											<view class="location-text">
-												{{item.distance}} {{item.county}} {{item.address}}
+												{{item.distance}} {{item.county}} 
 											</view>
 										</view>
 									</view>
@@ -1035,6 +1035,8 @@
 			},
 			isSameName(className, name) {
 				let str1 = className.trim();
+				if(str2==null)
+					return false;
 				let str2 = name.trim();
 				if (str1.length !== str2.length) {
 					return true;
@@ -1458,11 +1460,11 @@
 				}).then(res => {
 					if (res.code == 0) {
 						let arr = res.data
-						let classRule = [{
+						let classRule = [/* {
 							id: '',
 							name: '',
 							label: '全部'
-						}]
+						} */]
 
 						let industry = this.directionList
 						var industryArr = this.industry == '' ? [] : this.industry.split(',')