From 25a7da0d1b8184e7f246d154646821fe8d52cdf2 Mon Sep 17 00:00:00 2001
From: zxy <353513737@qq.com>
Date: Mon, 19 Feb 2024 11:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E4=BB=BB=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=EF=BC=8C=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/companyList/companyList.vue |  12 ++++++++----
 components/companyList/workList.vue    |  17 ++++++++++++++---
 static/img/city.png                    | Bin 0 -> 528 bytes
 vue.config.js                          |   4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 static/img/city.png

diff --git a/components/companyList/companyList.vue b/components/companyList/companyList.vue
index ac5e5a9..26a5c36 100644
--- a/components/companyList/companyList.vue
+++ b/components/companyList/companyList.vue
@@ -11,16 +11,20 @@
 			</view>
 		</view>
 		<view class="ask">
+			<view class="askList">
+				{{ companyitem.tradeNames }}
+			</view>
 			<view class="askList" v-for="(item, index) in skillNames" :key="index">
 				{{ item }}
 			</view>
 		</view>
-		<view class="allName">
+		<!-- <view class="allName">
 			{{ companyitem.companyName }}
-		</view>
+		</view> -->
 		<view class="timeAddress" style="position: relative;">
-			<view v-if="companyitem.missionCompanyName">
-				{{ companyitem.missionCompanyName }}
+			<view style="display: flex;align-items: center;">
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
+				<view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
 			</view>
 			<!-- <view v-if="near">
 				{{ companyitem.distanceStr }}km
diff --git a/components/companyList/workList.vue b/components/companyList/workList.vue
index 89a84e4..78a1475 100644
--- a/components/companyList/workList.vue
+++ b/components/companyList/workList.vue
@@ -11,16 +11,27 @@
 			</view>
 		</view>
 		<view class="ask">
+			<view class="askList">
+				{{ companyitem.tradeNames }}
+			</view>
 			<view class="askList" v-for="(item, index) in skillNames" :key="index">
 				{{ item }}
 			</view>
 		</view>
-		<view class="allName">
+		<!-- <view class="allName">
 			{{ companyitem.jobCompanyName }}
-		</view>
+		</view> -->
 		<view class="timeAddress" style="position: relative;">
-			<view v-if="companyitem.missionCompanyName">
+			<!-- <view v-if="companyitem.missionCompanyName">
 				{{ companyitem.missionCompanyName }}
+			</view> -->
+			<!-- <view>
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;" mode=""></image>
+				{{ companyitem.jobCompanyName }}
+			</view> -->
+			<view style="display: flex;align-items: center;">
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
+				<view style="font-size: 26rpx;color:#333;">{{ companyitem.jobCompanyName }}</view>
 			</view>
 			<!-- <view v-if="near">
 				{{ companyitem.distanceStr }}km
diff --git a/static/img/city.png b/static/img/city.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfddaf96308831c3ca1dc5ece8d5bf04c090d6a2
GIT binary patch
literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$%1J~)RCr$PTFX@fF$|oPLyDjYZd5=Kxj_Xqz>OOfqyZ{`7P#>q74Y_!^-DbR
z+VXG5x4hL#@_1x@vIp#Z9d^Ed2mmo)=LlFs-~qs0Wvspde0bZm0PqCh-rJEI`ac1@
zdfK)C@b2k=LHDCUX0wO@FhCbFz&kFN`{r_W#{gG{0EB?M+S?KWt_}$RF+d@pJ3v`r
zur!$4BP=!l<r*#oa!chftqOqA?ttAh;AH40Vj?f(4tU<E{|CS?dv}CVnC&6<{0!hN
zCNMhye*l(&&doJD0L#Xs&D#h7d?m)fF(r$P06=Q{om58%00X^}5H;vyBDwaG-WLPd
zaTrEay;XwM86W@*EQ*Pg?gqtx+3EmBuq+0RkOc$)K|l=1nJJDC0&F0XHB=n|05wDG
z7Mwi<x@Um*P?QZs*ihAdBIMl*un1_L1_b~+qRc{usc+5z?>|RX2QUgK4XzQWJ`YGd
zAS#};fh*dQ-d8D1&!h5ZYla~#b6E_SZ6sE`7YILA4u9AFSUS}n^LM51+9jA<+OimJ
z{d~nJ0bt0Ztxv49eae8`{=T%srS+}m2bMypv;$q~698QuM+0ZXfCiv<W%3_iKbk=R
S!4S*<0000<MNUMnLSTZ#S=smi

literal 0
HcmV?d00001

diff --git a/vue.config.js b/vue.config.js
index 1af8282..c4294a3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,8 +3,8 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                // target: 'http://192.168.0.102:8000', // 本地服务接口地址
-				target: "http://39.98.184.58:8000",  // 阿里云后台地址
+                target: 'http://192.168.0.104:8000', // 本地服务接口地址
+				// target: "http://39.98.184.58:8000",  // 阿里云后台地址
 				// target: "http://192.168.0.100:8000",  // 本地网关
                 ws: true,
                 pathRewrite: {