From 47ad1c4f463c5412ed45affb863d5dc71fa9b1a3 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sun, 13 Oct 2024 12:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                            |   1 +
 common.scss                                        |  53 +++
 components/base/navbar.vue                         |  13 +-
 components/bottom/bottomBtn.vue                    |  81 -----
 .../list/{workList.vue => workList/index.vue}      |   0
 components/list/{ => workList}/workItem.vue        |  11 -
 components/list/workList/workListSwipe.vue         |  53 +++
 pages.json                                         |  12 +-
 pages/index/center.vue                             |  10 +-
 pages/index/index.vue                              |   2 +-
 .../components/commodity/commoditySelect.vue       |  93 ------
 .../components/statistics/statisticsNumber.vue     |  47 +++
 pages_order/components/user/userHead.vue           | 106 ++++--
 pages_order/mine/collect.vue                       |  51 +++
 pages_order/mine/contactRecord.vue                 |  23 ++
 pages_order/mine/releaseWork.vue                   |  62 ++++
 pages_order/order/refundsOrExchange.vue            | 366 ---------------------
 pages_order/work/workDetail.vue                    | 103 +++++-
 utils/utils.js                                     |  40 +--
 19 files changed, 494 insertions(+), 633 deletions(-)
 create mode 100644 common.scss
 delete mode 100644 components/bottom/bottomBtn.vue
 rename components/list/{workList.vue => workList/index.vue} (100%)
 rename components/list/{ => workList}/workItem.vue (87%)
 create mode 100644 components/list/workList/workListSwipe.vue
 delete mode 100644 pages_order/components/commodity/commoditySelect.vue
 create mode 100644 pages_order/components/statistics/statisticsNumber.vue
 create mode 100644 pages_order/mine/collect.vue
 create mode 100644 pages_order/mine/contactRecord.vue
 create mode 100644 pages_order/mine/releaseWork.vue
 delete mode 100644 pages_order/order/refundsOrExchange.vue

diff --git a/App.vue b/App.vue
index 9d63b66..2e2c3d3 100644
--- a/App.vue
+++ b/App.vue
@@ -11,6 +11,7 @@
 </script>
 
 <style>
+	@import url("common.scss");
 	/*每个页面公共css */
 	body{
 		background-color: #f3f3f3;
diff --git a/common.scss b/common.scss
new file mode 100644
index 0000000..405c309
--- /dev/null
+++ b/common.scss
@@ -0,0 +1,53 @@
+
+// 文字益处处理
+.text-ellipsis{
+	overflow:hidden; //超出的文本隐藏
+	text-overflow:ellipsis; //溢出用省略号显示
+	white-space:nowrap; //溢出不换行
+}
+.text-ellipsis-2{
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display:-webkit-box; //作为弹性伸缩盒子模型显示。
+	-webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+	-webkit-line-clamp:2; //显示的行
+}
+.text-ellipsis-3{
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display:-webkit-box; //作为弹性伸缩盒子模型显示。
+	-webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+	-webkit-line-clamp:3; //显示的行
+}
+
+
+.share{
+	padding: 0;
+	margin: 0;
+	background-color: #fff;
+	display: flex !important;
+	flex-direction: column !important;
+	justify-content: center !important;
+	align-items: center !important;
+	font-size: 26rpx;
+}
+.share::after{
+	border: none;
+	padding: 0;
+	margin: 0;
+	width: 0;
+	height: 0;
+}
+
+
+.tag-list{
+	display: flex;
+	flex-wrap: wrap;
+}
+.tag-list > view{
+	margin: 10rpx;
+	padding: 10rpx;
+	background-color: #EFF2F1;
+	font-size: 24rpx;
+	border-radius: 10rpx;
+}
\ No newline at end of file
diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index d8e0a12..1650efd 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -2,27 +2,27 @@
 <!-- 	<view class="navbar"
 	:style="{backgroundColor : bgColor}"> -->
 		<view class="title"
-		:style="{backgroundColor : bgColor}">
+		:style="{backgroundColor : bgColor,color}">
 			<view class="left">
 				<uv-icon name="arrow-left"
 				v-if="leftClick"
 				@click="$emit('leftClick')"
-				color="#333" size="46rpx"></uv-icon>
+				:color="color" size="46rpx"></uv-icon>
 			</view>
 			<view>{{ title }}</view>
 			<view class="icon">
 				
 				<uv-icon name="search"
 				v-if="isSearch"
-				color="#333" size="58rpx"></uv-icon>
+				:color="color" size="58rpx"></uv-icon>
 				
-				<uv-icon name="plus-circle" color="#333" 
+				<uv-icon name="plus-circle" :color="color" 
 				v-if="isPlus"
 				@click="plusCircleShow = true"
 				size="46rpx" style="margin-left: 30rpx;"></uv-icon>
 				
 				<view v-if="moreClick" style="margin-left: 30rpx;">
-					<uv-icon name="more-dot-fill" color="#333"
+					<uv-icon name="more-dot-fill" :color="color"
 					v-if="!moreText"
 					@click="moreClick()"
 					size="46rpx"></uv-icon>
@@ -64,6 +64,9 @@
 			},
 			bgColor : {
 				default : '#F9FEFE'
+			},
+			color : {
+				default : '#333'
 			}
 		},
 		created() {
diff --git a/components/bottom/bottomBtn.vue b/components/bottom/bottomBtn.vue
deleted file mode 100644
index eb9ddf1..0000000
--- a/components/bottom/bottomBtn.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-	<view @click="$emit('confirm')" :style="{ 
-      position: 'fixed', 
-      display: 'flex', 
-      justifyContent: 'center', 
-      alignItems: 'center', 
-      width: '100vw', 
-      bottom: bottom  
-    }">
-		<button :style="{
-			     color: color,
-			     backgroundColor: backgroundColor,
-			     fontSize: fontSize,
-			     width: width,
-			     height: height,
-			     borderRadius: borderRadius
-			   }">
-			{{ text }}
-		</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			color: {
-				default: '#000000' // 设置默认颜色值
-			},
-			backgroundColor: {
-				default: '#FFFFFF' // 设置默认背景颜色
-			},
-			fontSize: {
-				default: '36rpx' // 设置默认字体大小
-			},
-			text: {
-				default: '按钮' // 设置默认文本内容
-			},
-			width: {
-				default: '150rpx' // 设置默认宽度
-			},
-			height: {
-				default: '60rpx' // 设置默认高度
-			},
-			borderRadius: {
-				default: '40rpx' // 设置默认高度
-			},
-			bottom: {
-				default: '40rpx' // 设置默认距离底部高度
-			},
-
-		},
-
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style scoped lang="less">
-	// .container {
-	// 	position: fixed;
-	// 	display: flex;
-	// 	justify-content: center;
-	// 	/* 水平居中 */
-	// 	align-items: center;
-	// 	/* 垂直居中 */
-	// 	width: 100%;
-	// 	/* 使容器宽度覆盖整个屏幕 */
-	// }
-
-	button {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-</style>
\ No newline at end of file
diff --git a/components/list/workList.vue b/components/list/workList/index.vue
similarity index 100%
rename from components/list/workList.vue
rename to components/list/workList/index.vue
diff --git a/components/list/workItem.vue b/components/list/workList/workItem.vue
similarity index 87%
rename from components/list/workItem.vue
rename to components/list/workList/workItem.vue
index befd9f8..7024b1a 100644
--- a/components/list/workItem.vue
+++ b/components/list/workList/workItem.vue
@@ -58,17 +58,6 @@
 			color: $uni-color;
 		}
 	}
-	.tag-list{
-		display: flex;
-		flex-wrap: wrap;
-		&>view{
-			margin: 10rpx;
-			padding: 10rpx;
-			background-color: #EFF2F1;
-			font-size: 24rpx;
-			border-radius: 10rpx;
-		}
-	}
 	.bottom{
 		display: flex;
 		justify-content: space-between;
diff --git a/components/list/workList/workListSwipe.vue b/components/list/workList/workListSwipe.vue
new file mode 100644
index 0000000..651a1aa
--- /dev/null
+++ b/components/list/workList/workListSwipe.vue
@@ -0,0 +1,53 @@
+<template>
+	<uv-swipe-action>
+		<view
+		v-for="(item, index) in list"
+		:key="index"
+		>
+			<view style="margin-top: 20rpx;"></view>
+			<uv-swipe-action-item 
+			@click="e => clickSwipeAction(e, item)"
+			:options="options">
+				<workItem/>
+			</uv-swipe-action-item>
+		</view>
+	</uv-swipe-action>
+</template>
+
+<script>
+	import workItem from './workItem.vue'
+	export default {
+		components : {
+			workItem
+		},
+		props : {
+			options : {
+				default : [
+					{
+						text: '删除',
+						style: {
+							backgroundColor: '#FA5A0A'
+						}
+					}, 
+				],
+			},
+			list : {
+				default : []
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			clickSwipeAction(e, item){
+				this.$emit('clickSwipeAction', {e, item})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages.json b/pages.json
index 3a8a43f..4d8ac00 100644
--- a/pages.json
+++ b/pages.json
@@ -47,9 +47,6 @@
 			{
 				"path": "product/productDetail"
 			},
-			{
-				"path": "order/refundsOrExchange"
-			},
 			{
 				"path": "auth/wxLogin"
 			},
@@ -64,6 +61,15 @@
 			},
 			{
 				"path": "work/workDetail"
+			},
+			{
+				"path": "mine/collect"
+			},
+			{
+				"path": "mine/contactRecord"
+			},
+			{
+				"path": "mine/releaseWork"
 			}
 		]
 	}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 0826782..925dbe6 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -68,7 +68,8 @@
 					</view>
 				</view>
 				
-				<view class="item">
+				<view class="item"
+				@click="$utils.navigateTo('/pages_order/mine/collect')">
 					<view class="">
 						30000
 					</view>
@@ -77,7 +78,8 @@
 					</view>
 				</view>
 				
-				<view class="item">
+				<view class="item"
+				@click="$utils.navigateTo('/pages_order/mine/contactRecord')">
 					<view class="">
 						30000
 					</view>
@@ -92,14 +94,14 @@
 					我的工作
 				</view>
 				<uv-grid :col="4" :border="false">
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/address')">
+					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/releaseWork')">
 						<image class="image" src="/static/image/center/5.png" mode=""></image>
 						<text class="grid-text">我的找活</text>
 					</uv-grid-item>
 			
 					<uv-grid-item @click="$utils.redirectTo('/index/order')">
 						<image class="image" src="/static/image/center/5.png" mode=""></image>
-						<text class="grid-text">谁看过我的简历</text>
+						<text class="grid-text">谁看过我</text>
 					</uv-grid-item>
 				</uv-grid>
 			</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 088e06d..3dc8820 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -49,7 +49,7 @@
 
 <script>
 	import PrivacyAgreementPoup from '@/components/config/PrivacyAgreementPoup.vue'
-	import workList from '@/components/list/workList.vue'
+	import workList from '@/components/list/workList/index.vue'
 	import tabber from '@/components/base/tabbar.vue'
 	export default {
 		components : {
diff --git a/pages_order/components/commodity/commoditySelect.vue b/pages_order/components/commodity/commoditySelect.vue
deleted file mode 100644
index c068258..0000000
--- a/pages_order/components/commodity/commoditySelect.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <view style="">
-    <view v-for="item in commodityList" :key="item.title" class="address-item">
-      <view class="itme1" @click="selectSp(item)">
-        <view class="left">
-          <img src="../../../static/image/center/1.png" alt="" style="width: 100%;height: 100%;">
-        </view>
-        <view class="center">
-          <view>{{ item.title }}</view>
-          <view>{{ item.smallTitle }}</view>
-        </view>
-        <view class="right">×{{item.total}}</view>
-      </view>
-      <uv-line></uv-line>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  props: {
-    commodityList: {
-      default: [],
-      type: Array,
-    }
-  },
-  data() {
-    return {
-      selectAddress: 0,
-    }
-  },
-  methods: {
-    // 打开商品选择
-    openCommodity() {
-      this.$emit('openSpPopup')
-    },
-    // 选择了商品
-    selectSp(e) {
-      console.log(this.commodityList,"this.csss")
-      console.log(e, '选择了商品')
-      this.$emit('selectSp', e)
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.itme1 {
-  display: flex;
-  height: 150rpx;
-  width: 100vw;
-  background-color: #ffffff;
-
-  .left {
-    padding: 40rpx;
-    width: 20%;
-    border-radius: 10rpx;
-    background-color: #ffffff;
-  }
-
-  .center {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    gap: 20rpx;
-    width: 70%;
-    padding: 0rpx 0 0 20rpx;
-    background-color: #ffffff;
-
-    // 给第一个 view 设置样式
-    > view:first-of-type {
-      font-size: 36rpx;
-      color: #333;
-    }
-
-    // 给第二个 view 设置样式
-    > view:nth-of-type(2) {
-      font-size: 28rpx;
-      color: #666666;
-    }
-  }
-
-  .right {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 10%;
-    color: #666666;
-    background-color: #ffffff;
-  }
-}
-
-</style>
diff --git a/pages_order/components/statistics/statisticsNumber.vue b/pages_order/components/statistics/statisticsNumber.vue
new file mode 100644
index 0000000..6225884
--- /dev/null
+++ b/pages_order/components/statistics/statisticsNumber.vue
@@ -0,0 +1,47 @@
+<template>
+	<view class="const">
+		<view class="title">
+			{{ title }}
+		</view>
+		<view class="num">
+			{{ num }}
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props : {
+			title : {
+				default : '您当前的找活'
+			},
+			num : {
+				default : 0
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.const{
+	padding: 30rpx;
+	background: $uni-color;
+	color: #fff;
+	font-weight: 900;
+	.title{
+		font-size: 34rpx;
+	}
+	.num{
+		padding: 20rpx 0;
+		font-size: 38rpx;
+	}
+}
+</style>
diff --git a/pages_order/components/user/userHead.vue b/pages_order/components/user/userHead.vue
index 6a6e488..d0471fe 100644
--- a/pages_order/components/user/userHead.vue
+++ b/pages_order/components/user/userHead.vue
@@ -5,10 +5,16 @@
 		</view>
 		<view class="info">
 			<view class="name">
-				倾心. 
+				{{ name }}
 			</view>
 			<view class="tips">
-				手机号：1300000000
+				{{ tips }}
+			</view>
+		</view>
+		<view class="right">
+			<view class="phone">
+				<image src="/static/image/home/phone.png" mode=""></image>
+				{{ phone }}
 			</view>
 		</view>
 	</view>
@@ -16,52 +22,80 @@
 
 <script>
 	export default {
+		props : {
+			name : {
+				default : '倾心.'
+			},
+			tips : {
+				default : '手机号：1300000000'
+			},
+			phone : {
+				default : '联系老板'
+			},
+		},
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-.head {
-			display: flex;
-			align-items: center;
-			position: relative;
-			image{
-				width: 100%;
-				height: 100%;
-			}
-			.headImage {
-				width: 70rpx;
-				height: 70rpx;
-				background-size: 100% 100%;
-				overflow: hidden;
-				border-radius: 50%;
-				margin-right: 40rpx;
-			}
-		
-			.info {
-				font-size: 28rpx;
-				.name {
-					font-size: 32rpx;
+	.head {
+		display: flex;
+		align-items: center;
+		position: relative;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.headImage {
+			width: 70rpx;
+			height: 70rpx;
+			background-size: 100% 100%;
+			overflow: hidden;
+			border-radius: 50%;
+			margin-right: 40rpx;
+		}
+
+		.info {
+			font-size: 28rpx;
+
+			.name {
+				font-size: 32rpx;
+				display: flex;
+				padding-bottom: 10rpx;
+
+				view {
 					display: flex;
-					padding-bottom: 10rpx;
-					view{
-						display: flex;
-						font-size: 20rpx;
-						align-items: center;
-						padding-left: 20rpx;
-					}
+					font-size: 20rpx;
+					align-items: center;
+					padding-left: 20rpx;
 				}
-		
-				.tips {
-					font-size: 26rpx;
+			}
+
+			.tips {
+				font-size: 26rpx;
+			}
+		}
+		.right{
+			margin-left: auto;
+			.phone{
+				background-color: rgba($uni-color, 0.2);
+				color: $uni-color;
+				padding: 8rpx 16rpx;
+				border-radius: 10rpx;
+				image{
+					width: 24rpx;
+					height: 24rpx;
 				}
 			}
 		}
-</style>
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/mine/collect.vue b/pages_order/mine/collect.vue
new file mode 100644
index 0000000..bcb0570
--- /dev/null
+++ b/pages_order/mine/collect.vue
@@ -0,0 +1,51 @@
+<template>
+	<view class="page">
+		
+		<navbar title="我的收藏" 
+		bgColor="#3796F8" 
+		leftClick 
+		color="#fff"
+		@leftClick="$utils.navigateBack"/>
+		
+		<workListSwipe 
+		:options="options" 
+		@clickSwipeAction="clickSwipeAction"
+		:list="10"/>
+	</view>
+</template>
+
+<script>
+	import workListSwipe from '@/components/list/workList/workListSwipe.vue'
+	import mixinList from '@/mixins/list.js'
+	export default {
+		mixins : [mixinList],
+		components : {
+			workListSwipe
+		},
+		data() {
+			return {
+				options: [
+					{
+						text: '删除',
+						style: {
+							backgroundColor: '#FA5A0A'
+						}
+					}, 
+				],
+			}
+		},
+		methods: {
+			clickSwipeAction({e, item}){
+				console.log(e, item);
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	/deep/ .uv-swipe-action{
+		width: 100%;
+	}
+}
+</style>
diff --git a/pages_order/mine/contactRecord.vue b/pages_order/mine/contactRecord.vue
new file mode 100644
index 0000000..f89ff3a
--- /dev/null
+++ b/pages_order/mine/contactRecord.vue
@@ -0,0 +1,23 @@
+<template>
+	<!-- 联系记录 -->
+	<view class="page">
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages_order/mine/releaseWork.vue b/pages_order/mine/releaseWork.vue
new file mode 100644
index 0000000..a7c6a8b
--- /dev/null
+++ b/pages_order/mine/releaseWork.vue
@@ -0,0 +1,62 @@
+<template>
+	<!-- 我发布的招工 -->
+	<view class="page">
+		
+		<navbar title="我的找活" 
+		bgColor="#3796F8" 
+		leftClick 
+		color="#fff"
+		@leftClick="$utils.navigateBack"/>
+		
+		<statisticsNumber/>
+		
+		<workListSwipe 
+		:options="options" 
+		@clickSwipeAction="clickSwipeAction"
+		:list="10"/>
+	</view>
+</template>
+
+<script>
+	import workListSwipe from '@/components/list/workList/workListSwipe.vue'
+	import statisticsNumber from '../components/statistics/statisticsNumber.vue'
+	import mixinList from '@/mixins/list.js'
+	export default {
+		mixins : [mixinList],
+		components : {
+			workListSwipe,
+			statisticsNumber
+		},
+		data() {
+			return {
+				options: [
+					{
+						text: '修改',
+						style: {
+							backgroundColor: '#ffa12c'
+						}
+					}, 
+					{
+						text: '删除',
+						style: {
+							backgroundColor: '#FA5A0A'
+						}
+					}, 
+				],
+			}
+		},
+		methods: {
+			clickSwipeAction({e, item}){
+				console.log(e, item);
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	/deep/ .uv-swipe-action{
+		width: 100%;
+	}
+}
+</style>
diff --git a/pages_order/order/refundsOrExchange.vue b/pages_order/order/refundsOrExchange.vue
deleted file mode 100644
index 3bce4d8..0000000
--- a/pages_order/order/refundsOrExchange.vue
+++ /dev/null
@@ -1,366 +0,0 @@
-<template>
-  <view class="refundsOrExchange">
-    <navbar :title="title[titleIndex]" leftClick @leftClick="$utils.navigateBack"/>
-
-    <view class="frame">
-
-      <!-- 商品简介 -->
-      <view class="itme1" @click="openSpPopup">
-        <view class="left">
-          <img src="../../static/image/center/1.png" alt="" style="width: 100%;height: 100%;">
-        </view>
-        <view class="center">
-          <view>{{ commodity.title }}</view>
-          <view>{{ commodity.smallTitle }}</view>
-        </view>
-        <view class="right">×{{ commodity.total }}</view>
-      </view>
-
-
-      <!--<commoditySelect ></commoditySelect>-->
-
-      <!-- 申请类型&申请原因 -->
-      <view class="item2">
-        <view class="type">
-          <span>申请类型</span>
-          <span>退货退款</span>
-        </view>
-        <uv-line></uv-line>
-        <view class="reason">
-          <view>申请原因</view>
-          <view>
-            <uv-input placeholder="请输入申请原因" border="none" clearable></uv-input>
-          </view>
-        </view>
-      </view>
-
-      <!--  退货数量&申请金额-->
-      <view class="item3">
-        <view class="type">
-          <span>{{ titleIndex == 0 ? '退货数量' : '换货数量' }}</span>
-          <span>
-						<uv-number-box :min="1" :max="100"></uv-number-box>
-					</span>
-        </view>
-        <uv-line v-if='titleIndex == 0 ? true :false'></uv-line>
-        <view class="reason" v-if='titleIndex == 0 ? true :false'>
-          <view>申请原因</view>
-          <view>
-            <uv-input disabled placeholder="$" border="none" clearable></uv-input>
-          </view>
-        </view>
-      </view>
-
-      <!-- 申请说明 -->
-      <view class="item4">
-        <view>申请说明(选填)</view>
-        <view>
-          <uv-input placeholder="请您详细填写申请说明" border="none" clearable></uv-input>
-        </view>
-        <view>
-          <uv-upload :fileList="fileList" :maxCount="5" multiple width="150rpx" height="150rpx"
-                     @delete="deleteImage" @afterRead="afterRead" :previewFullImage="true"></uv-upload>
-        </view>
-      </view>
-
-
-      <!-- 联系电话 -->
-      <view class="item5">
-        <view class="phone">
-          <view>联系电话</view>
-          <view>
-            <uv-input placeholder="请输入联系电话" border="none" clearable></uv-input>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 底部按钮 -->
-    <bottomBtn @confirm='confirm()' :color='bottomBtnStyle.color' :backgroundColor='bottomBtnStyle.backgroundColor'
-               :fontSize='bottomBtnStyle.fontSize' :text='bottomBtnStyle.text' :width="bottomBtnStyle.width"
-               :height="bottomBtnStyle.height" :borderRadius='bottomBtnStyle.borderRadius'
-			   :bottom='bottomBtnStyle.bottom'
-			   >
-    </bottomBtn>
-
-    <!--商品选择-->
-    <uv-popup ref="spPopup" :round="30">
-      <commoditySelect
-          :commodityList="commodityList"
-          @selectSp="selectCommodity"
-      />
-    </uv-popup>
-
-  </view>
-</template>
-
-<script>
-import bottomBtn from "../../components/bottom/bottomBtn.vue"
-import commoditySelect from "../components/commodity/commoditySelect.vue"
-
-export default {
-  onLoad(option) {
-    this.titleIndex = option.index
-  },
-  components: {
-    bottomBtn, commoditySelect
-  },
-  data() {
-    return {
-      titleIndex: 0,
-      title: ['申请换货', '申请退货'],
-      fileList: [],
-      bottomBtnStyle: {
-        color: '#FFF',
-        backgroundColor: '#fd5100',
-        fontSize: '34rpx',
-        text: '提交申请',
-        width: '400rpx',
-        height: '80rpx',
-        borderRadius: '100rpx',
-        bottom: '40rpx'
-      },
-      commodityList: [
-        {
-
-          title: '商品名称',
-          smallTitle: '产品规格：120*4*75【桌子尺寸】',
-          total:1,
-        },
-        {
-          title: '商品名称1',
-          smallTitle: '产品规格：120*4*75【桌子尺寸】',
-          total:1,
-        },
-        {
-          title: '商品名称2',
-          smallTitle: '产品规格：120*4*75【桌子尺寸】',
-          total:1,
-
-        }
-      ],
-      commodity: {
-        title: '商品名称',
-        smallTitle: '产品规格：120*4*75【桌子尺寸】',
-        total:1,
-
-      },
-
-    }
-  },
-  mounted() {
-
-  },
-  methods: {
-
-    openSpPopup() {
-      this.$refs.spPopup.open('bottom');
-    },
-
-    // 选择退换货商品回调
-    selectCommodity(e) {
-      console.log(e, "selectCommodity--e")
-      this.commodity = e
-      this.$refs.spPopup.close()
-    },
-
-    confirm() {
-      console.log("===");
-    },
-    deleteImage(e) {
-      this.fileList.splice(e.index, 1)
-    },
-    afterRead(e) {
-      let self = this
-      e.file.forEach(file => {
-        self.$Oss.ossUpload(file.url).then(url => {
-          self.fileList.push({
-            url
-          })
-        })
-      })
-    },
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-* {
-  box-sizing: border-box;
-}
-
-.refundsOrExchange {
-  .frame {
-
-    display: flex;
-    flex-direction: column;
-    gap: 30rpx;
-    width: 100%;
-    padding-top: 40rpx;
-    background-color: #f5f5f5;
-
-
-    .itme1 {
-      display: flex;
-      height: 200rpx;
-      background-color: #ffffff;
-
-      .left {
-        padding: 40rpx;
-        width: 20%;
-        border-radius: 10rpx;
-        background-color: #ffffff;
-      }
-
-      .center {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        gap: 20rpx;
-        width: 60%;
-        padding: 0rpx 0 0 20rpx;
-        background-color: #ffffff;
-
-        // 给第一个 view 设置样式
-        > view:first-of-type {
-          font-size: 36rpx;
-          color: #333;
-        }
-
-        // 给第二个 view 设置样式
-        > view:nth-of-type(2) {
-          font-size: 28rpx;
-          color: #666666;
-        }
-      }
-
-      .right {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 10%;
-        color: #666666;
-        background-color: #ffffff;
-      }
-    }
-
-    .item2 {
-      width: 100vw;
-
-      .type {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        padding: 0 0 0 20rpx;
-
-        > span:nth-of-type(1) {
-          width: 30%;
-        }
-
-        > span:nth-of-type(2) {
-          width: 70%;
-        }
-      }
-
-      .reason {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        padding: 10rpx 0 0 20rpx;
-
-        > view:nth-of-type(1) {
-          width: 30%;
-        }
-
-        > view:nth-of-type(2) {
-          width: 70%;
-          padding: 0 20rpx 0 0;
-        }
-      }
-    }
-
-    .item3 {
-      width: 100vw;
-
-      .type {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        padding: 0 0 0 20rpx;
-
-        > span:nth-of-type(1) {
-          width: 70%;
-        }
-
-        > span:nth-of-type(2) {
-          width: 30%;
-        }
-      }
-
-      .reason {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        padding: 10rpx 0 0 20rpx;
-
-        > view:nth-of-type(1) {
-          width: 30%;
-        }
-
-        > view:nth-of-type(2) {
-          width: 70%;
-          padding: 0 20rpx 0 0;
-        }
-      }
-    }
-
-    .item4 {
-      display: flex;
-      flex-direction: column;
-      padding: 10rpx 0 0 20rpx;
-      background-color: #FFF;
-
-      > view:nth-of-type(1) {
-        background-color: #FFF;
-      }
-
-      > view:nth-of-type(2) {
-        margin: 10rpx 0 10rpx 0;
-        background-color: #FFF;
-
-      }
-    }
-
-    .item5 {
-      display: flex;
-      flex-direction: column;
-      padding: 0 0 0 20rpx;
-      background-color: #FFF;
-
-      .phone {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        padding: 10rpx 0 0 20rpx;
-
-        > view:nth-of-type(1) {
-          width: 30%;
-        }
-
-        > view:nth-of-type(2) {
-          width: 70%;
-          padding: 0 20rpx 0 0;
-        }
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/pages_order/work/workDetail.vue b/pages_order/work/workDetail.vue
index f181c24..be5d7c9 100644
--- a/pages_order/work/workDetail.vue
+++ b/pages_order/work/workDetail.vue
@@ -26,16 +26,78 @@
 				</view>
 			</view>
 			
-			<view class="">
+			<view class="line">
+				该职位位于昨日新发布
+			</view>
+			
+			<view class="userHead">
 				<userHead/>
 			</view>
 			
+			<view class="address">
+				<view class="title2">
+					工作地址
+				</view>
+				<view class="line">
+					深圳罗湖区深圳市百货广场大厦罗湖区百货广场大厦东深圳罗湖区深圳市百货广场大厦罗湖区百货广场大厦东
+					<uv-icon 
+					size="30rpx"
+					color="666"
+					name="arrow-right"
+					></uv-icon>
+				</view>
+				
+				<view class="tag-list">
+					<view>
+						距您14.6千米
+					</view>
+				</view>
+			</view>
+			
+			<view class="info">
+				<view class="title2">
+					<text>职位详情</text>
+					
+					<view>
+						<uv-icon
+						size="30rpx"
+						color="666"
+						name="arrow-right"
+						></uv-icon>
+						收藏
+					</view>
+				</view>
+				
+				<view class="tag-list">
+					<view>
+						不接受居家办公
+					</view>
+					<view>
+						不接受居家办公
+					</view>
+					<view>
+						不接受居家办公
+					</view>
+				</view>
+				
+				<view 
+				class="text" 
+				v-html="text">
+				</view>
+			</view>
 			
 		</view>
 	</view>
 </template>
 
 <script>
+	let text = `岗位要求
+	1、全日制大专以上学历，艺术设计类相关专业;
+	2、两年以上平面、品牌、视觉设计等相关工作经验，能独立完成项目的设计工作，有 3C数码/个护健 康 类产品服务经验优先，有乙方工作经验佳;
+	3、具备一定的设计提案能力，能完整的呈现设计思路与创意，能清晰的表达设计逻辑与思考;
+	4、热爱设计，平面基本功扎实，拥有优良的审美与创意想法，对版式、色彩把控能力强;对工作富有责任心，具备团队沟通与协作能力;
+	5、精通 PS、AI、CDR 等平面设计软件，能独立完成日常平面设计工作内容，熟练使用 PPT/Keynote，能完成提案内容的材料美化工作。
+	`
 	import userHead from '../components/user/userHead.vue'
 	export default {
 		components : {
@@ -43,9 +105,12 @@
 		},
 		data() {
 			return {
-				
+				text : '',
 			}
 		},
+		onShow() {
+			this.text = this.$utils.stringFormatHtml(text)
+		},
 		methods: {
 			
 		}
@@ -63,6 +128,18 @@
 			font-weight: 900;
 			padding-bottom: 20rpx;
 		}
+		.title2{
+			font-size: 28rpx;
+			font-weight: 900;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			view{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
 		.price{
 			font-size: 30rpx;
 			font-weight: 900;
@@ -70,7 +147,7 @@
 		}
 		.line{
 			display: flex;
-			font-size: 22rpx;
+			font-size: 24rpx;
 			color: #666666;
 			margin-top: 30rpx;
 			image{
@@ -84,6 +161,26 @@
 				align-items: center;
 			}
 		}
+		
+		.userHead{
+			padding: 50rpx 0;
+			border-bottom: 1px solid #00000011;
+		}
+		
+		.address{
+			padding: 30rpx 0;
+			.line{
+				margin-top: 20rpx;
+			}
+		}
+		
+		.info{
+			.text{
+				font-size: 24rpx;
+				color: #666666;
+				line-height: 44rpx;
+			}
+		}
 	}
 }
 </style>
diff --git a/utils/utils.js b/utils/utils.js
index dabe1e0..65ef9ef 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -57,35 +57,6 @@ function verificationAll(data, msg){
 			return true
 	    }
 	}
-	
-	
-	// let Msgs = {
-	// 	default : msg || '表单数据未填写'
-	// }
-	
-	// if(typeof msg == 'object'){
-	// 	Msgs = {
-	// 		default : '表单数据未填写',
-	// 		...msg,
-	// 	}
-	// }
-	
-	// if (!data){
-	// 	uni.showToast({
-	// 		title: Msgs.default,
-	// 		icon: "none"
-	// 	})
-	// 	return true
-	// }
-	// for (let key in data) {
-	//     if (!data[key] || data[key] === "") {
-	// 		uni.showToast({
-	// 			title: (Msgs[key] || Msgs.default),
-	// 			icon: "none"
-	// 		})
-	// 		return true
-	//     }
-	// }
 	return false
 }
 
@@ -115,6 +86,14 @@ export function getHrefParams(name) {
 }
 
 
+// 将字符串中的文本格式化html
+export function stringFormatHtml(str){
+	return str && str.replace(/\n/gi, '<br>')
+	.replace(/ /gi, ' ')
+}
+
+
+
 //深度对比合并两个对象，相同属性b会覆盖a
 export function deepMergeObject(a, b){
 	let data = JSON.parse(JSON.stringify(a))
@@ -185,5 +164,6 @@ export default {
 	navigateTo,
 	navigateBack,
 	redirectTo,
-	copyText
+	copyText,
+	stringFormatHtml
 }
\ No newline at end of file