From fad455d8943bd6af1501f7dca62f9530ed7d19cc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 15:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mini-program/pages/details/details.vue |   86 ++++++++++++++++++++++++++----------------
 1 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/mini-program/pages/details/details.vue b/mini-program/pages/details/details.vue
index be3c8f6..ab0977e 100644
--- a/mini-program/pages/details/details.vue
+++ b/mini-program/pages/details/details.vue
@@ -1,35 +1,44 @@
 <template>
 	<view class="box">
-		<view class="item">
+		<view class="item" v-if="item">
 			<view class="item-tx">
-				<image src="/static/logo.png" mode="widthFix"></image>
+				<image :src="item.fullImgurl" mode="widthFix"></image>
 			</view>
 			<view class="item-info">
 				<view class="item-info-a">
-					<text>鍒樻案鎱�</text>
-					<text>P6锝滈攢鍞煿璁笀</text>
+					<text>{{item.name}}</text>
+					<template v-if="item.levelName && item.positon">
+						<text>{{item.levelName}}锝渰{item.positon}}</text>
+					</template>
+					<template v-if="item.levelName && !item.positon">
+						<text>{{item.levelName}}</text>
+					</template>
+					<template v-if="!item.levelName && item.positon">
+						<text>{{item.positon}}</text>
+					</template>
 				</view>
-				<view class="item-info-b">
-					<view class="item-info-b-row">甯傚満绫�</view>
-					<view class="item-info-b-row">鑾峰绫�</view>
-					<view class="item-info-b-row">鍩硅绫�</view>
+				<view class="item-info-b" v-if="item.typeList && item.typeList.length > 0">
+					<view class="item-info-b-row" v-for="(child, i) in item.typeList" :key="i">{{child.name}}</view>
 				</view>
 				<view class="item-info-c">
 					<view class="item-info-c-item">
 						<view class="item-info-c-item-label">浠庝笟骞撮檺锛�</view>
-						<view class="item-info-c-item-val">10骞�</view>
+						<view class="item-info-c-item-val">{{item.workYears}}骞�</view>
 					</view>
 					<view class="item-info-c-item">
 						<view class="item-info-c-item-label">杩戝崐骞存湇鍔″晢鍦烘暟锛�</view>
-						<view class="item-info-c-item-val">38涓�</view>
+						<view class="item-info-c-item-val">{{item.serveNum}}涓�</view>
 					</view>
 				</view>
-				<view class="item-info-d">
-					浠庝簨璁捐鍟嗕笟鍖栧凡鏈夊骞达紝鎿呴暱鍚勭椋庢牸锛屾湇鍔″ぇ瀹㈡埛瓒呰繃50鎴封��<text>鏇村</text>
+				<view class="item-info-d" v-if="item.isShow">
+					{{item.zhankai ? item.content : item.contentCopy}}<text @click.stop="zhankai(item)">{{item.zhankai ? '鏀惰捣' : '鏇村'}}</text>
+				</view>
+				<view class="item-info-d" v-else>
+					{{item.content}}
 				</view>
 				<view class="item-info-price">
 					<text>鏍囧噯鏀惰垂</text>
-					<text>2900</text>
+					<text>{{item.fee}}</text>
 				</view>
 			</view>
 		</view>
@@ -39,21 +48,9 @@
 				<text>鎿呴暱棰嗗煙</text>
 			</view>
 			<view class="card-list">
-				<view class="card-list-item">
-					<view class="card-list-item-title">杩愯惀鎿嶇洏锛�</view>
-					<view class="card-list-item-text">鍩庡競杩愯惀瑙勫垝锛屽鍏ラ棬搴楁棩甯告爣鍑嗗寲绠$悊銆佹爣鍑嗘暟鎹�乑7鍔ㄤ綔鎵ц绛夛紱</view>
-				</view>
-				<view class="card-list-item">
-					<view class="card-list-item-title">鍩硅鎻愬崌锛�</view>
-					<view class="card-list-item-text">鐞嗚瀹炶返鍩硅浠ュ強鍛樺伐缁煎悎鑳藉姏鏋勫缓锛�</view>
-				</view>
-				<view class="card-list-item">
-					<view class="card-list-item-title">涓诲姩钀ラ攢锛�</view>
-					<view class="card-list-item-text">杩�40浣欏満娆″ぇ鍨嬩富棰樿惀閿�鐖嗙牬娲诲姩钀藉湴锛氬紑涓氥�佸懆骞村簡銆佹柊鍝佸彂甯冧細绛夛紱鎿呴暱閰掑簵銆佸井鑱旂洘缁勫缓銆佸晢鍦轰腑搴�佸簵闈㈢垎鐮寸瓑锛�</view>
-				</view>
-				<view class="card-list-item">
-					<view class="card-list-item-title">澶у崟鎴愪氦锛�</view>
-					<view class="card-list-item-text">瀹㈡埛鍏ㄦ祦绋嬫湇鍔′互鍙婂ぇ瀹㈡埛璺熻釜鍜屾垚浜ゆ唇璋堬紱</view>
+				<view class="card-list-item" v-for="(child, index) in item.fieldList" :key="index">
+					<view class="card-list-item-title">{{child.name}}锛�</view>
+					<view class="card-list-item-text">{{child.remark}}</view>
 				</view>
 			</view>
 		</view>
@@ -63,14 +60,14 @@
 				<text>浼樼椤圭洰妗堜緥 (40)</text>
 			</view>
 			<view class="work">
-				<view class="work-item" v-for="(item, index) in 5" :key="index">
+				<view class="work-item" v-for="(child, index) in item.casesList" :key="index">
 					<view class="left">
-						<view class="left-title">浜戝崡-澶х悊銆婁笁搴楀悓搴嗗紑涓氭椿鍔ㄣ��</view>
+						<view class="left-title">{{child.name}}</view>
 						<view class="left-time">
 							<image src="/static/ic_time@2x.png" mode="widthFix"></image>
-							<text>2025-10-01 ~ 2025-10-15</text>
+							<text>{{child.startDate}} ~ {{child.endDate}}</text>
 						</view>
-						<view class="left-info">灞呯劧涔嬪鍟嗗満钀藉湴锛屽悎璁″畾鍗�150鍗曪紝鍚屾瘮澧為暱210%锛屾敹娆�280涓�</view>
+						<view class="left-info">{{child.detail}}</view>
 					</view>
 					<view class="right">
 						<image src="/static/logo.png" mode="widthFix"></image>
@@ -85,8 +82,31 @@
 	export default {
 		data() {
 			return {
-				
+				id: null,
+				item: null,
 			};
+		},
+		onLoad(option) {
+			this.id = option.id
+			this.getDetails()
+		},
+		methods: {
+			getDetails() {
+				this.$u.api.memberDetail({
+					id: this.id
+				}).then(res => {
+					if (res.code === 200) {
+						console.log(res)
+						res.data.isShow = false
+						if (res.data.content && res.data.content.length > 30) {
+							res.data.isShow = true
+							res.data.zhankai = false
+							res.data.contentCopy = res.data.content.substring(0, 30) + '...'
+						}
+						this.item = res.data
+					}
+				})
+			}
 		}
 	}
 </script>

--
Gitblit v1.9.3