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

components/btnPopous/btnPopous.vue

@@ -41,7 +41,7 @@
 						:refresher-enabled="true" :refresher-triggered="refresher" @refresherpulling="scrolltoupper"
 						@refresherrefresh="refresherrefresh" @scrolltolower="scrolltolower">
 						<view class="jobAll-item-box-item" v-for="(item, index) in list" :key="index"
-							@tap.native="gotos(item.postPushId)">
+							@tap.stop="gotos(item.postPushId)">
 							<!-- 标题-薪资 -->
 							<view class="jobAll-item-box-item-title flex justify-between align-center">
 								<view class="title-left flex align-center">

pages/msg/im.vue

@@ -17,7 +17,7 @@
 						</view>
 						<view class="user-details">
 							<view class="user-name">{{ postPushInfo.user&&postPushInfo.user.userName || '未知' }}</view>
-							<view class="user-title">{{ postPushInfo.company ? postPushInfo.company.companyName : '未知公司' }} · {{postPushInfo.hr&&postPushInfo.hr.hrPosition || '未知'}}</view>
+							<view class="user-title">{{ postPushInfo.company && postPushInfo.company.companyName ||(postPushInfo.company &&postPushInfo.company.companyAllName|| '未知公司') }} · {{postPushInfo.hr&&postPushInfo.hr.hrPosition || '未知'}}</view>
 						</view>
 					</view>
 					<view v-else class="user-info">
@@ -407,7 +407,7 @@
 							class="chat-listitem-text"
 							style="padding-bottom: 20rpx;;padding-top: 20rpx;margin-left: 20rpx;color: #000000;background-color: #ffffff;border: 1rpx solid #c6fee7;background: linear-gradient(to bottom, #D9FEED, #ffffff);">
 							<view class="flex align-center">
-								<image src="../../static/im/orderInfo.png"
+								<image src="../../static/im/msyy.svg"
 									style="width: 60rpx;height: 60rpx;margin-right: 10rpx;flex-shrink: 0;" mode="aspectFill"></image>
 								您收到了{{item.content}}
 							</view>
@@ -416,7 +416,7 @@
 							class="chat-listitem-text"
 							style="padding-bottom: 20rpx;;padding-top: 20rpx;margin-left: 20rpx;color: #000000;background-color: #ffffff;border: 1rpx solid #c6fee7;background: linear-gradient(to bottom, #D9FEED, #ffffff);">
 							<view class="flex align-center">
-								<image src="../../static/im/orderInfo.png"
+								<image src="../../static/im/msjg.svg"
 									style="width: 60rpx;height: 60rpx;margin-right: 10rpx;flex-shrink: 0;" mode="aspectFill"></image>
 								{{item.content}}
 							</view>
@@ -526,7 +526,7 @@
 							class="chat-listitem-text textColor"
 							style="padding-bottom: 20rpx;;padding-top: 20rpx;margin-right: 20rpx;color: #000000;background-color: #ffffff;border: 1rpx solid #c6fee7;background: linear-gradient(to bottom, #D9FEED, #ffffff);">
 							<view class="flex align-center">
-								<image src="../../static/im/orderInfo.png"
+								<image src="../../static/im/msyy.svg"
 									style="width: 60rpx;height: 60rpx;margin-right: 10rpx;flex-shrink: 0;" mode="aspectFill"></image>
 								您发送了{{item.content}}
 							</view>
@@ -535,7 +535,7 @@
 							class="chat-listitem-text textColor"
 							style="padding-bottom: 20rpx;;padding-top: 20rpx;margin-right: 20rpx;color: #000000;background-color: #ffffff;border: 1rpx solid #c6fee7;background: linear-gradient(to bottom, #D9FEED, #ffffff);">
 							<view class="flex align-center">
-								<image src="../../static/im/orderInfo.png"
+								<image src="../../static/im/msjg.svg"
 									style="width: 60rpx;height: 60rpx;margin-right: 10rpx;flex-shrink: 0;" mode="aspectFill"></image>
 								{{item.content}}
 							</view>

static/im/msjg.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1765509576332" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8582" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M317.2 273.6h406.9v53H317.2z" p-id="8583" fill="#1296DB"></path><path d="M777.4 97H246.6c-53.6 0-97.1 43.6-97.1 97.1v635.7c0 53.6 43.6 97.1 97.1 97.1h530.9c53.6 0 97.1-43.6 97.1-97.1V194.1c0-53.5-43.6-97.1-97.2-97.1z m-530.8 53h530.9c24.3 0 44.1 19.8 44.1 44.1v461.4H618c0.1 1.6 0.1 3.2 0.1 4.8 0 17.3-4.2 33.7-11.6 48.2-17.6 34.3-53.3 57.8-94.4 57.8s-76.8-23.5-94.3-57.8c-7.4-14.5-11.6-30.8-11.6-48.2 0-1.6 0-3.2 0.1-4.8h-204V194.1c0.1-24.3 19.9-44.1 44.3-44.1z m530.8 724H246.6c-24.3 0-44.1-19.8-44.1-44.1V708.5h158.3c20.5 64.2 80.6 110.8 151.5 110.8 70.8 0 131-46.6 151.5-110.8h157.9v121.4c-0.1 24.3-19.9 44.1-44.3 44.1z m0 0" p-id="8584" fill="#1296DB"></path><path d="M317.2 457.9h406.9v53H317.2z" p-id="8585" fill="#1296DB"></path></svg>

static/im/msyy.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1765509503818" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5978" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M692.167111 246.499556H331.832889a28.444444 28.444444 0 0 0 0 56.888888h360.334222a28.444444 28.444444 0 1 0 0-56.888888z m0 113.777777H331.832889a28.444444 28.444444 0 0 0 0 56.888889h360.334222a28.444444 28.444444 0 1 0 0-56.888889z" fill="#1296DB" p-id="5979"></path><path d="M872.277333 493.056L853.333333 499.086222V151.722667c0-41.927111-33.962667-75.889778-75.832889-75.889778H246.499556C204.629333 75.832889 170.666667 109.795556 170.666667 151.722667v347.363555l-18.944-6.030222A75.832889 75.832889 0 0 0 75.832889 568.888889v303.388444c0 41.927111 33.962667 75.889778 75.889778 75.889778h720.554666c41.927111 0 75.889778-33.962667 75.889778-75.889778V568.888889c0-41.870222-33.962667-75.832889-75.889778-75.832889zM227.555556 151.722667c0-10.467556 8.533333-19.000889 18.944-19.000889h531.000888c10.467556 0 18.944 8.533333 18.944 19.000889v365.226666l-284.444444 89.884445-284.444444-89.884445v-365.226666z m663.722666 720.554666c0 10.467556-8.533333 19.000889-19.000889 19.000889H151.722667a18.944 18.944 0 0 1-19.000889-19.000889V568.888889c0-18.944 19.000889-18.944 37.944889-18.944l341.333333 113.777778 341.333333-113.777778h18.944c7.623111 2.446222 19.000889 10.581333 19.000889 18.944v303.388444z" fill="#1296DB" p-id="5980"></path></svg>