From 06b6fe414003af99d762ad116e3886c14ed04444 Mon Sep 17 00:00:00 2001
From: zxy <353513737@qq.com>
Date: Wed, 21 Feb 2024 15:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/companyList/companyList.vue |   2 +-
 components/companyList/sqList.vue      | 225 +++++++++++++++++++++++++
 pageMy/myProject/myProject.vue         |  14 +-
 pages.json                             |   2 +-
 pages/index/index.vue                  |   2 +-
 pages/my/my.vue                        |  10 +-
 pages/projectInfo/projectInfo.vue      |   2 +-
 vue.config.js                          |   4 +-
 8 files changed, 243 insertions(+), 18 deletions(-)
 create mode 100644 components/companyList/sqList.vue

diff --git a/components/companyList/companyList.vue b/components/companyList/companyList.vue
index 4692711..270915f 100644
--- a/components/companyList/companyList.vue
+++ b/components/companyList/companyList.vue
@@ -7,7 +7,7 @@
 			</view>
 
 			<view class="head_right">
-				{{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+				{{ companyitem.wage }}
 			</view>
 		</view>
 		<view class="ask">
diff --git a/components/companyList/sqList.vue b/components/companyList/sqList.vue
new file mode 100644
index 0000000..78f8671
--- /dev/null
+++ b/components/companyList/sqList.vue
@@ -0,0 +1,225 @@
+<template>
+	<view class="body" @click="goInfo(companyitem)">
+		<view class="heads">
+			<view class="head_left">
+				<rich-text :nodes="string">
+				</rich-text>
+			</view>
+
+			<view class="head_right">
+				{{ companyitem.wage }}
+			</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 style="flex:1;"></view>
+			<u-tag text="任务" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
+			<u-tag text="岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
+		</view>
+		<view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+		<view class="timeAddress" style="position: relative;">
+			<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 style="display: flex;align-items: center;position:absolute;right:0;">
+				<image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+				<view>2.2km</view>
+			</view>
+		</view>
+		<view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
+			<view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+				<image class="commentimg_image" src="../../static/img/star.full.svg" v-for="index1 in companyitem.scoreAll"
+					mode="" :key="index1"></image>
+				<image class="commentimg_image" src="../../static/img/star.empty.svg"
+					v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
+			</view>
+			<view class="comment_content allName gocomment" v-else>
+				评价
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import {
+	toDoller,
+	dateFormat
+} from "../../untils/format.js";
+import dictionary from '@/common/textdata.js';
+
+export default {
+	beforeCreate: function () { },
+	props: {
+		companyitem: {
+			type: Object,
+			default() { return [] }
+		},
+		comment: {
+			type: Boolean,
+			default: false
+		},
+		noApply: {
+			type: Boolean,
+			default: true
+		},
+		near: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			...dictionary,
+			string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem.missionTitle +
+				"</div>"
+		};
+	},
+	computed: {
+		skillNames() {
+			return this.companyitem.skillNames.split(',')
+		}
+	},
+	methods: {
+		goComment: function (no) {
+			uni.navigateTo({
+				url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+			})
+		},
+		goInfo: function (item) {
+			// const isCan = this.noApply === false ? '0' : '1'
+			if(item.type == 0) {
+				uni.navigateTo({
+					url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
+				})
+			} else if(item.type == 1) {
+				uni.navigateTo({
+					url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
+				})
+			}
+		},
+		getCity: function (val) {
+			if (val) {
+				let areas = this.$store.getters.getAreaParents(val)
+				if (areas.length === 3) {
+					return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+				}
+			}
+		},
+		toDoller,
+		dateFormat
+	}
+}
+</script>
+
+<style>
+.commentimg_image {
+	width: 40rpx;
+	height: 40rpx;
+}
+
+.commentimg {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+}
+
+.gocomment {
+	font-size: 26rpx !important;
+	border-radius: 5rpx;
+	border: 1rpx solid #c3c3c3;
+	width: 160rpx;
+	text-align: center;
+	float: right;
+	height: 50rpx;
+	line-height: 50rpx;
+}
+
+.timeAddress {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #999999;
+	margin: 10rpx 0;
+	padding: 10rpx 0;
+}
+
+.allName {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #666666;
+}
+
+.askList {
+	/* width: 14%; */
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #666666;
+	background-color: #f6f6f6;
+	padding: 5rpx 15rpx;
+	margin-right: 10rpx;
+	margin-bottom: 10rpx;
+}
+
+.ask {
+	overflow: hidden;
+	width: 100%;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	margin: 20rpx 0;
+}
+
+.head_right {
+	ont-family: PingFangSC-Medium;
+	font-size: 28rpx;
+	color: #F46161;
+	font-weight: bold;
+}
+
+.head_left {
+	font-family: PingFangSC-Medium;
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #333333;
+	width: 350rpx;
+	overflow: hidden;
+	white-space: nowrap;
+	/*不换行*/
+	text-overflow: ellipsis;
+	/*超出部分文字以...显示*/
+}
+
+.highlight {
+	color: #F46161;
+}
+
+.body {
+	width: 690rpx;
+	margin: 0rpx auto;
+	background-color: #fefefe;
+	overflow: hidden;
+	box-sizing: border-box;
+	padding: 20rpx;
+	padding-bottom: 0;
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+}
+
+.heads {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+</style>
diff --git a/pageMy/myProject/myProject.vue b/pageMy/myProject/myProject.vue
index 569bab0..9d19d2b 100644
--- a/pageMy/myProject/myProject.vue
+++ b/pageMy/myProject/myProject.vue
@@ -1,27 +1,27 @@
 <template>
 	<view class="body">
-		<view class="tab">
-			<v-tabs :tabs="['全部任务','抢成功','抢失败']" v-model="activeTab" color="#999" activeColor="#000" fontSize="36rx"
+		<!-- <view class="tab">
+			<v-tabs :tabs="['全部任务','全部岗位']" v-model="activeTab" color="#999" activeColor="#000" fontSize="36rx"
 			 activeFontSize="36rpx" @change='changeTab' />
-		</view>
+		</view> -->
 		<block v-for="(page, pIndex) in data" :key="pIndex">
 			<block v-for="(item, index) in page" :key="item.id">
 				<view class="probody">
 					<company-list :companyitem="item" :noApply="false"></company-list>
 					<view class="baddd"></view>
-					<block>
+					<!-- <block>
 						<image src="/static/img/tab.orange.svg" mode="" v-if="item.status === 1"></image>
 						<image src="/static/img/tab.blue.svg" mode="" v-else-if="item.status === 2"></image>
 						<image src="/static/img/tab.green.svg" mode="" v-else-if="item.status === 3"></image>
 						<image src="/static/img/tab.gray.svg" mode="" v-else></image>
-					</block>
+					</block> -->
 				</view>
 			</block>
 		</block>
 		<view class="nothing" v-if="data.length === 0">
 			<image src="/static/img/pic_notask.svg" mode=""></image>
 			<view class="nothingContnt">
-				暂无任务信息
+				暂无申请信息
 			</view>
 		</view>
 	</view>
@@ -29,7 +29,7 @@
 
 <script>
 	import vTabs from '@/components/v-tabs/v-tabs.vue';
-	import companyList from '@/components/companyList/companyList.vue';
+	import companyList from '@/components/companyList/sqList.vue';
 	import {
 		myMission
 	} from '@/api/mission.js';
diff --git a/pages.json b/pages.json
index a237d8c..6a487b9 100644
--- a/pages.json
+++ b/pages.json
@@ -391,7 +391,7 @@
 		},{
 		    "path" : "myProject/myProject",
 		    "style" : {
-		        "navigationBarTitleText" : "我的任务",
+		        "navigationBarTitleText" : "我的申请",
 		        "navigationBarBackgroundColor" : "#FFFFFF",
 				"enablePullDownRefresh": true
 				
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 43fe18c..2d55825 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -110,7 +110,7 @@
             		</view>
             	</view>
             </view>
-            <view class="serviceItem" @click="">
+            <view class="serviceItem" @click="toNewProject">
             	<view class="serviceItemContent">
             		<view class="itemIcon">
             			<image class="Icon_size" src="../../static/img/index/shenqing.png" mode=""></image>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index a59010f..9895d7f 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -67,16 +67,16 @@
 				我的申请
 				<image src="../../static/img/right.svg" mode=""></image>
 			</view> -->
-			<view class="btnList" @click="go('/pageMy/my/set')">
-				<image src="../../static/img/set.svg" mode=""></image>
-				设置
-				<image src="../../static/img/right.svg" mode=""></image>
-			</view>
 			<view class="btnList" @click="go('/pageMy/help/help')">
 				<image src="../../static/img/help.svg" mode=""></image>
 				帮助与反馈
 				<image src="../../static/img/right.svg" mode=""></image>
 			</view>
+			<view class="btnList" @click="go('/pageMy/my/set')">
+				<image src="../../static/img/set.svg" mode=""></image>
+				设置
+				<image src="../../static/img/right.svg" mode=""></image>
+			</view>
 		</view>
 		<view class="bottom" @click="makePhoneCall">
 			客服电话 18500206848 工作时间 9:00-18:00
diff --git a/pages/projectInfo/projectInfo.vue b/pages/projectInfo/projectInfo.vue
index 35b2e6b..f5aaa29 100644
--- a/pages/projectInfo/projectInfo.vue
+++ b/pages/projectInfo/projectInfo.vue
@@ -20,7 +20,7 @@
 				工种类型：{{info.worktypeNames}}
 			</view>
 			<view class="fee">
-				{{info.wage}}{{wageUnit[info.wageUnitCategory]}}
+				{{info.wage}}
 			</view>
 		</view>
 		<view class="head">
diff --git a/vue.config.js b/vue.config.js
index 5394ebf..6bb6277 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,8 +3,8 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                // target: 'http://192.168.3.108:8000', // 本地服务接口地址
-				target: "http://39.98.184.58:8000",  // 阿里云后台地址
+                target: 'http://192.168.3.108:8000', // 本地服务接口地址
+				// target: "http://39.98.184.58:8000",  // 阿里云后台地址
 				// target: "http://192.168.0.101:8000",  // 本地网关
                 ws: true,
                 pathRewrite: {