From 322530a658ee4f60fb564014b9917a2a1cbdaf41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= <email@sample.com>
Date: Mon, 19 Jan 2026 14:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=8D=E5=90=8C=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=20=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                  |  32 +-
 common/tabbar.js                         | 106 ++++
 common/tabbarMixin.js                    |  49 ++
 components/CarCard/CarCard.vue           |  30 +
 components/CustomTabBar/CustomTabBar.vue | 143 +++++
 custom-tab-bar/index.vue                 | 145 +++++
 pages.json                               |  16 +-
 pages/index/changinfo.vue                |  59 +-
 pages/index/index - 副本.vue             | 374 -------------
 pages/index/index.vue                    |  63 ++-
 pages/index/mine - 副本.vue              | 365 ++++++++++--
 pages/index/mine.vue                     | 672 +++++------------------
 pages/index/myPublish.vue                | 661 ++++++++++++++++++++--
 pages/index/publish.vue                  |  13 +
 pages/index/ywPublish.vue                |  22 +
 pages/login/feishu-callback.vue          |  10 +
 static/image/mine/erwm.png               | Bin 0 -> 1712 bytes
 static/image/user.png                    | Bin 0 -> 4083 bytes
 18 files changed, 1697 insertions(+), 1063 deletions(-)
 create mode 100644 common/tabbar.js
 create mode 100644 common/tabbarMixin.js
 create mode 100644 components/CustomTabBar/CustomTabBar.vue
 create mode 100644 custom-tab-bar/index.vue
 delete mode 100644 pages/index/index - 副本.vue
 create mode 100644 pages/index/ywPublish.vue
 create mode 100644 static/image/mine/erwm.png
 create mode 100644 static/image/user.png

diff --git a/App.vue b/App.vue
index ede0bba..5612133 100644
--- a/App.vue
+++ b/App.vue
@@ -44,6 +44,23 @@
 			overflow-y: scroll;
 		}
 	}
+	
+	/* 设置所有页面最大宽度为 650px */
+	.uni-app {
+		max-width: 650px;
+		margin: 0 auto;
+		box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
+		position: relative;
+	}
+	
+	/* 确保页面内容也受最大宽度限制 */
+	uni-page-body {
+		max-width: 650px;
+		margin: 0 auto;
+		background-color: #F5F5F5 !important;
+		min-height: 100% !important;
+		height: auto !important;
+	}
 
 	/* 顶栏通栏样式 */
 	/* .uni-top-window {
@@ -51,16 +68,19 @@
 	    right: 0;
 	} */
 
-	uni-page-body {
-		background-color: #F5F5F5 !important;
-		min-height: 100% !important;
-		height: auto !important;
-	}
-
 	.uni-top-window uni-tabbar .uni-tabbar {
 		background-color: #fff !important;
 	}
 
+	/* 隐藏默认 tabBar（使用自定义 tabBar 时） */
+	/* #ifdef H5 */
+	.uni-tabbar,
+	.uni-tabbar__bd,
+	uni-tabbar {
+		display: none !important;
+	}
+	/* #endif */
+
 	.uni-app--showleftwindow .hideOnPc {
 		display: none !important;
 	}
diff --git a/common/tabbar.js b/common/tabbar.js
new file mode 100644
index 0000000..e4f93ca
--- /dev/null
+++ b/common/tabbar.js
@@ -0,0 +1,106 @@
+/**
+ * TabBar 配置管理
+ * 根据用户角色动态显示不同的 tabbar
+ * 
+ * 使用说明：
+ * 1. 在 tabBarConfig 中配置所有 tabbar 项
+ * 2. 通过 roles 数组配置哪些角色可以看到该 tabbar
+ *    - roles: [] 或 roles: undefined 表示所有角色都可以看到
+ *    - roles: ['user', 'admin'] 表示只有 user 和 admin 角色可以看到
+ * 3. 用户角色通过 getUserRole() 函数获取
+ *    - 默认从 uni.getStorageSync('userInfo').role 获取
+ *    - 也可以从 uni.getStorageSync('userRole') 或 uni.getStorageSync('role') 获取
+ *    - 如果都没有，默认返回 'user'
+ * 4. 修改用户角色后，需要重新调用 getVisibleTabBar() 来刷新 tabbar
+ */
+
+// 所有可用的 tabbar 配置
+export const tabBarConfig = [
+	{
+		pagePath: 'pages/index/index',
+		iconPath: '/static/image/home1.png',
+		selectedIconPath: '/static/image/home.png',
+		text: '首页',
+		roles: [] // 空数组表示所有角色都可以看到
+	},
+	{
+		pagePath: 'pages/index/publish',
+		iconPath: '/static/image/publish1.png',
+		selectedIconPath: '/static/image/publish.png',
+		text: '发布',
+		roles: ['2'] // 只有 user 和 admin 角色可以看到，可以根据实际需求修改
+	},
+	{
+		pagePath: 'pages/index/mine',
+		iconPath: '/static/image/mine1.png',
+		selectedIconPath: '/static/image/mine.png',
+		text: '我的',
+		roles: [] // 所有角色都可以看到
+	}
+]
+
+/**
+ * 根据用户角色获取可见的 tabbar 列表
+ * @param {string} userRole - 用户角色，如 'user', 'admin', 'guest' 等
+ * @returns {Array} 过滤后的 tabbar 列表
+ */
+export function getVisibleTabBar(userRole = '2') {
+	return tabBarConfig.filter(item => {
+		// 如果没有配置 roles 或 roles 为空数组，表示所有角色都可以看到
+		if (!item.roles || item.roles.length === 0) {
+			return true
+		}
+		// 检查用户角色是否在允许的角色列表中
+		return item.roles.includes(userRole)
+	})
+}
+
+/**
+ * 获取当前用户角色
+ * @returns {string} 用户角色
+ */
+export function getUserRole() {
+	try {
+		// 方式1: 从存储中获取
+		const userInfo = uni.getStorageSync('userInfo')
+		if (userInfo && userInfo.role) {
+			return userInfo.role
+		}
+		
+		// 方式2: 从其他存储字段获取（根据实际项目调整）
+		// 可能存储在 userRole、user_role、role 等字段
+		const role = uni.getStorageSync('userRole') || uni.getStorageSync('role')
+		if (role) {
+			return role
+		}
+		
+		// 方式3: 从 token 或其他地方获取
+		// const token = uni.getStorageSync('token')
+		// 可以解析 token 获取角色信息
+		
+		// 默认返回 'user'（可以根据实际需求调整默认角色）
+		return '2'
+	} catch (e) {
+		return '2'
+	}
+}
+
+/**
+ * 获取当前 tabbar 的索引
+ * @param {string} currentPath - 当前页面路径
+ * @returns {number} tabbar 索引，-1 表示不在 tabbar 中
+ */
+export function getCurrentTabIndex(currentPath) {
+	const userRole = getUserRole()
+	const visibleTabs = getVisibleTabBar(userRole)
+	
+	// 移除路径前缀的 / 进行匹配
+	const path = currentPath.startsWith('/') ? currentPath.slice(1) : currentPath
+	
+	const index = visibleTabs.findIndex(item => {
+		const itemPath = item.pagePath.startsWith('/') ? item.pagePath.slice(1) : item.pagePath
+		return itemPath === path
+	})
+	
+	return index
+}
diff --git a/common/tabbarMixin.js b/common/tabbarMixin.js
new file mode 100644
index 0000000..7becc49
--- /dev/null
+++ b/common/tabbarMixin.js
@@ -0,0 +1,49 @@
+/**
+ * TabBar Mixin
+ * 用于在页面中自动显示/隐藏自定义 tabbar
+ */
+import { getVisibleTabBar, getCurrentTabIndex } from '@/common/tabbar.js'
+
+export default {
+	data() {
+		return {
+			showTabBar: false,
+			tabBarCurrent: 0
+		}
+	},
+	onLoad() {
+		this.checkShowTabBar()
+	},
+	onShow() {
+		this.checkShowTabBar()
+		this.updateTabBarCurrent()
+	},
+	methods: {
+		checkShowTabBar() {
+			// 获取当前页面路径
+			const pages = getCurrentPages()
+			const currentPage = pages[pages.length - 1]
+			const currentPath = currentPage.route || currentPage.$route?.path || ''
+			
+			// 获取可见的 tabbar 列表
+			const visibleTabs = getVisibleTabBar()
+			
+			// 检查当前页面是否在 tabbar 列表中
+			const path = currentPath.startsWith('/') ? currentPath.slice(1) : currentPath
+			const isTabBarPage = visibleTabs.some(item => {
+				const itemPath = item.pagePath.startsWith('/') ? item.pagePath.slice(1) : item.pagePath
+				return itemPath === path
+			})
+			
+			this.showTabBar = isTabBarPage
+		},
+		updateTabBarCurrent() {
+			if (this.showTabBar) {
+				const pages = getCurrentPages()
+				const currentPage = pages[pages.length - 1]
+				const currentPath = currentPage.route || currentPage.$route?.path || ''
+				this.tabBarCurrent = getCurrentTabIndex(currentPath)
+			}
+		}
+	}
+}
diff --git a/components/CarCard/CarCard.vue b/components/CarCard/CarCard.vue
index 2665050..74f61fb 100644
--- a/components/CarCard/CarCard.vue
+++ b/components/CarCard/CarCard.vue
@@ -52,6 +52,9 @@
 				<view class="action-btn" @tap.stop="handleShare">
 					<u-icon name="share" size="18" /> 
 				</view>
+				<view class="action-btn" @tap.stop="handleSet(item)" v-if="item.status==1">
+					<u-icon name="setting" size="18" /> 
+				</view>
 			</view>
 		</view>
 	</view>
@@ -89,6 +92,33 @@
 			pdfchanges() {
 				this.$emit('pdfchange')
 			},
+			handleSet(item){
+				const that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认标记已售出？',
+					success: res => {
+						if (res.confirm) {
+							request({
+								url:'common/usedcar/update/status',
+								method:'post',
+								data: {id:item.id,status:2}
+							}).then(res => {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'none'
+								});
+								setTimeout(() => {
+									that.$emit('restchange')
+								}, 1000);
+								
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
 			handleCardTap() {
 				// 直接处理跳转，避免事件传递问题
 				if (this.item && this.item.id) {
diff --git a/components/CustomTabBar/CustomTabBar.vue b/components/CustomTabBar/CustomTabBar.vue
new file mode 100644
index 0000000..42737c8
--- /dev/null
+++ b/components/CustomTabBar/CustomTabBar.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="custom-tabbar" :style="{ paddingBottom: safeAreaInsets.bottom + 'px' }">
+		<view 
+			v-for="(item, index) in tabList" 
+			:key="index"
+			class="tab-item"
+			:class="{ active: current === index }"
+			@tap="switchTab(item, index)"
+		>
+			<image 
+				class="tab-icon" 
+				:src="current === index ? item.selectedIconPath : item.iconPath" 
+				mode="aspectFit"
+			/>
+			<text class="tab-text">{{ item.text }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getVisibleTabBar, getCurrentTabIndex, getUserRole } from '@/common/tabbar.js'
+
+	export default {
+		name: 'CustomTabBar',
+		data() {
+			return {
+				current: 0,
+				safeAreaInsets: {
+					bottom: 0
+				}
+			}
+		},
+		computed: {
+			tabList() {
+				// 根据权限获取可见的 tabbar 列表
+				const userRole = getUserRole()
+				return getVisibleTabBar(userRole)
+			}
+		},
+		onLoad() {
+			this.updateCurrent()
+			this.initSafeArea()
+		},
+		onShow() {
+			// 页面显示时更新当前 tab 索引
+			this.updateCurrent()
+		},
+		watch: {
+			// 监听 tabList 变化，当角色改变导致 tabbar 列表变化时，更新当前索引
+			tabList: {
+				handler() {
+					this.updateCurrent()
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			initSafeArea() {
+				// 获取安全区域信息（适配 iPhone X 等）
+				// #ifdef APP-PLUS || H5
+				try {
+					const systemInfo = uni.getSystemInfoSync()
+					this.safeAreaInsets = systemInfo.safeAreaInsets || { bottom: 0 }
+				} catch (e) {
+					this.safeAreaInsets = { bottom: 0 }
+				}
+				// #endif
+			},
+			updateCurrent() {
+				const pages = getCurrentPages()
+				if (pages.length === 0) return
+				
+				const currentPage = pages[pages.length - 1]
+				const currentPath = currentPage.route || currentPage.$route?.path || ''
+				const index = getCurrentTabIndex(currentPath)
+				// 如果当前页面不在可见的 tabbar 列表中，保持当前索引或设为 0
+				this.current = index >= 0 ? index : 0
+			},
+			switchTab(item, index) {
+				if (this.current === index) {
+					return
+				}
+				uni.switchTab({
+					url: '/' + item.pagePath,
+					fail: (err) => {
+						// 如果 switchTab 失败，可能是该页面不在 tabBar 中，使用 navigateTo
+						uni.navigateTo({
+							url: '/' + item.pagePath,
+							fail: () => {
+								console.error('导航失败:', err)
+							}
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.custom-tabbar {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		height: 100rpx;
+		background: #fff;
+		border-top: 1px solid #e5e5e5;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		z-index: 999;
+		box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.05);
+	}
+
+	.tab-item {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		transition: all 0.2s;
+	}
+
+	.tab-item.active {
+		.tab-text {
+			color: #3F435B;
+		}
+	}
+
+	.tab-icon {
+		width: 44rpx;
+		height: 44rpx;
+		margin-bottom: 8rpx;
+	}
+
+	.tab-text {
+		font-size: 24rpx;
+		color: #7A7E83;
+		transition: color 0.2s;
+	}
+</style>
diff --git a/custom-tab-bar/index.vue b/custom-tab-bar/index.vue
new file mode 100644
index 0000000..2817960
--- /dev/null
+++ b/custom-tab-bar/index.vue
@@ -0,0 +1,145 @@
+<template>
+	<view class="custom-tabbar" :style="{ paddingBottom: safeAreaInsets.bottom + 'px' }">
+		<view 
+			v-for="(item, index) in tabList" 
+			:key="index"
+			class="tab-item"
+			:class="{ active: current === index }"
+			@tap="switchTab(item, index)"
+		>
+			<image 
+				class="tab-icon" 
+				:src="current === index ? item.selectedIconPath : item.iconPath" 
+				mode="aspectFit"
+			/>
+			<text class="tab-text">{{ item.text }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getVisibleTabBar, getCurrentTabIndex, getUserRole } from '@/common/tabbar.js'
+
+	export default {
+		name: 'CustomTabBar',
+		data() {
+			return {
+				current: 0,
+				safeAreaInsets: {
+					bottom: 0
+				}
+			}
+		},
+		computed: {
+			tabList() {
+				// 根据权限获取可见的 tabbar 列表
+				const userRole = getUserRole()
+				return getVisibleTabBar(userRole)
+			}
+		},
+		created() {
+			this.initSafeArea()
+		},
+		mounted() {
+			this.updateCurrent()
+		},
+		onShow() {
+			// 页面显示时更新当前 tab 索引
+			this.updateCurrent()
+		},
+		watch: {
+			// 监听 tabList 变化，当角色改变导致 tabbar 列表变化时，更新当前索引
+			tabList: {
+				handler() {
+					this.updateCurrent()
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			initSafeArea() {
+				// 获取安全区域信息（适配 iPhone X 等）
+				// #ifdef APP-PLUS || H5
+				try {
+					const systemInfo = uni.getSystemInfoSync()
+					this.safeAreaInsets = systemInfo.safeAreaInsets || { bottom: 0 }
+				} catch (e) {
+					this.safeAreaInsets = { bottom: 0 }
+				}
+				// #endif
+			},
+			updateCurrent() {
+				const pages = getCurrentPages()
+				if (pages.length === 0) return
+				
+				const currentPage = pages[pages.length - 1]
+				const currentPath = currentPage.route || currentPage.$route?.path || ''
+				const index = getCurrentTabIndex(currentPath)
+				// 如果当前页面不在可见的 tabbar 列表中，保持当前索引或设为 0
+				this.current = index >= 0 ? index : 0
+			},
+			switchTab(item, index) {
+				if (this.current === index) {
+					return
+				}
+				uni.switchTab({
+					url: '/' + item.pagePath,
+					fail: (err) => {
+						// 如果 switchTab 失败，可能是该页面不在 tabBar 中，使用 navigateTo
+						uni.navigateTo({
+							url: '/' + item.pagePath,
+							fail: () => {
+								console.error('导航失败:', err)
+							}
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.custom-tabbar {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		height: 100rpx;
+		background: #fff;
+		border-top: 1px solid #e5e5e5;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		z-index: 999;
+		box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.05);
+	}
+
+	.tab-item {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		transition: all 0.2s;
+	}
+
+	.tab-item.active {
+		.tab-text {
+			color: #3F435B;
+		}
+	}
+
+	.tab-icon {
+		width: 44rpx;
+		height: 44rpx;
+		margin-bottom: 8rpx;
+	}
+
+	.tab-text {
+		font-size: 24rpx;
+		color: #7A7E83;
+		transition: color 0.2s;
+	}
+</style>
diff --git a/pages.json b/pages.json
index e019642..0f80ba1 100644
--- a/pages.json
+++ b/pages.json
@@ -94,6 +94,12 @@
 				"enablePullDownRefresh": true,
 				"navigationStyle":"custom"
 			}
+		},
+		{
+			"path": "pages/index/ywPublish",
+			"style": {
+				"navigationBarTitleText": ""
+			}
 		}
 	],
 	"subPackages":[],
@@ -115,26 +121,22 @@
 		}
 	},
 	"tabBar": {
+		"custom": true,
 		"color": "#7A7E83",
 		"selectedColor": "#3F435B",
 		"borderStyle": "white",
 		"backgroundColor": "#fff",
-		"list": [{
+		"list": [
+			{
 				"pagePath": "pages/index/index",
-				"iconPath": "/static/image/home1.png",
-				"selectedIconPath": "static/image/home.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/index/publish",
-				"iconPath": "/static/image/publish1.png",
-				"selectedIconPath": "static/image/publish.png",
 				"text": "发布"
 			},
 			{
 				"pagePath": "pages/index/mine",
-				"iconPath": "/static/image/mine1.png",
-				"selectedIconPath": "/static/image/mine.png",
 				"text": "我的"
 			}
 		]
diff --git a/pages/index/changinfo.vue b/pages/index/changinfo.vue
index fe0bafe..2a2701d 100644
--- a/pages/index/changinfo.vue
+++ b/pages/index/changinfo.vue
@@ -4,28 +4,41 @@
 		<view class="content">
 			<view class="topimg">
 				<uni-file-picker fileMediatype="image" limit="1" :list-styles="imageStyles" :del-icon="false" disable-preview @select="select" @delete="delfn('picture')">
-					<image class="user" :src="userinfo.avatar"mode=""></image>
+					<image class="user" :src="userinfo.avatar_pull"mode=""></image>
 				</uni-file-picker>
 				<view>点击更换头像</view>
 			</view>
+			<view class="cell1">
+				<view class="item">英文名</view>
+				<view class="right">
+					<input placeholder="请输入英文名" type="text" v-model="userinfo.name_en"></input>
+				</view>
+			</view>
 			<view class="cell1">
 				<view class="item">手机号</view>
 				<view class="right">
-					<input placeholder="请输入手机号" type="number" v-model="userinfo.email"></input>
+					<input placeholder="请输入手机号" type="number" v-model="userinfo.phone"></input>
 				</view>
 			</view>
 			<u-divider text=""></u-divider>
 			<view class="cell1">
 				<view class="item">邮箱</view>
 				<view class="right">
-					<input placeholder="请输入邮箱" type="text" v-model="userinfo.position"></input>
+					<input placeholder="请输入邮箱" type="text" v-model="userinfo.email"></input>
+				</view>
+			</view>
+			<u-divider text=""></u-divider>
+			<view class="cell1">
+				<view class="item">whatsapp</view>
+				<view class="right">
+					<input placeholder="请输入whatsapp" type="text" v-model="userinfo.whatsapp"></input>
 				</view>
 			</view>
 			<u-divider text=""></u-divider>
 			<view class="cell1">
 				<view class="item">二维码</view>
 				<view class="right">
-					<u-radio-group v-model="userinfo.socialize">
+					<u-radio-group v-model="userinfo.social">
 					  <u-radio name="微信" class="m-r-10">微信</u-radio>
 					  <u-radio name="WhatsApp">WhatsApp</u-radio>
 					</u-radio-group>
@@ -35,7 +48,7 @@
 				<view class="item">上传二维码</view>
 				<view class="right">
 					<uni-file-picker style="margin: 10px 0px;" fileMediatype="image" limit="1" :list-styles="imageStyles" :del-icon="false" disable-preview @select="selectewm" >
-						<image class="user" :src="userinfo.socialize_pic_url==null?'/static/image/mine/erwm.png':userinfo.socialize_pic_url " mode=""></image>
+						<image class="user" :src="userinfo.social_code_pull==null?'/static/image/mine/erwm.png':userinfo.social_code_pull " mode=""></image>
 					</uni-file-picker>
 				</view>
 			</view>
@@ -71,12 +84,13 @@
 					that.userinfo = res.data.data;
 				})
 			},
-			uploadfn(imgUrl,scene){
+			uploadfn(imgUrl,name,name1){
+				const that = this
 				uni.showLoading({
 					title: '上传中'
 				});
 				uni.uploadFile({
-					url: 'https://userdcar-server.hnxinyouhe.com/upload?scene='+scene, 
+					url: 'https://userdcar-server.hnxinyouhe.com/upload?scene=usedCarimg', 
 					filePath: imgUrl,
 					name: 'file',
 					header:{'Fdesk-Auth-Token': uni.getStorageSync('token'),'Fdesk-Login-Type': 'feishu','Fdesk-System-Code':'fdesk'},
@@ -88,44 +102,45 @@
 							icon:'none'
 						})
 						if(res && res.data && res.data.file_name){
-							that.userinfo[name1] = path.data.image_url
-							that.userinfo[name] = path.data.path
+							that.userinfo[name1] = res.data.file_url
+							that.userinfo[name] = res.data.file_name
 						}
 					},
 					fail: (err) => reject(err)
 				});
 			},
+			selectewm(e){
+				const tempFilePaths = e.tempFilePaths;
+				const imgUrl=tempFilePaths[0]
+				this.uploadfn(imgUrl,'social_code','social_code_pull')
+			},
 			select(e){
 				const tempFilePaths = e.tempFilePaths;
 				const imgUrl=tempFilePaths[0]
-				this.uploadfn(imgUrl,'avatar')
+				this.uploadfn(imgUrl,'avatar','avatar_url')
 			},
 			leftClick(){
 				uni.navigateBack({})
 			},
 			bcFn(){
 				request({
-					url:'user/save',
+					url:'common/user/edit',
 					method:'POST',
 					data:{
 						avatar:this.userinfo.avatar,
-						avatar_url:this.userinfo.avatar_url,
-						sex:this.userinfo.sex,
-						name:this.userinfo.name,
-						mobile:this.userinfo.mobile,
-						position:this.userinfo.position,
-						country_id:this.userinfo.country_id,
-						sign:this.userinfo.sign,
-						socialize:this.userinfo.socialize,
-						socialize_pic:this.userinfo.socialize_pic,
-						socialize_pic_url:this.userinfo.socialize_pic_url,
+						phone:this.userinfo.phone,
+						email:this.userinfo.email,
+						whatsapp:this.userinfo.whatsapp,
+						social:this.userinfo.social,
+						social_code:this.userinfo.social_code,
+						name_en:this.userinfo.name_en
 					}
 				}).then(res => {
 					uni.showToast({
 						title: res.data.message,
 						icon: 'none'
 					});
-					if(res.data.code ==0){
+					if(res.data.code ==0||res.data.code ==200){
 						setTimeout(() => {
 							uni.reLaunch({
 								url: '/pages/index/mine',// 替换为你要跳转的页面路径
diff --git a/pages/index/index - 副本.vue b/pages/index/index - 副本.vue
deleted file mode 100644
index 79e490d..0000000
--- a/pages/index/index - 副本.vue	
+++ /dev/null
@@ -1,374 +0,0 @@
-<template>
-	<view class="page">
-		
-		
-		<!-- 列表 -->
-		<z-paging  ref="paging"  v-model="list" @query="queryList" empty-view-text="暂无数据！">
-			<!-- <uni-nav-bar leftText=" " :fixed="true" :border="false" color="#fff" backgroundColor="#3F435B" :statusBar="true" title="首页"></uni-nav-bar> -->
-			<!-- 顶部：标题 + 搜索（不想要搜索可直接删除这一块） -->
-			<view class="page-head">
-				<view class="head-search">
-					<u-search
-					  v-model="keyword"
-					  placeholder="请输入关键词"
-					  :show-action="false"
-					  shape="round"
-					  @change="onKeywordChange"
-					  @search="onSearch"
-					  @clear="onSearch"
-					/>
-				</view>
-			</view>
-			<view class="list-wrap">
-				<CarCard
-					v-for="item in list"
-					:key="item.id"
-					:item="item"
-					@pdfchange="onSearch"
-					@request-price="onRequestPrice"
-				/>
-			</view>
-		</z-paging>
-		<uni-popup ref="inputDialog" type="dialog">
-		  <uni-popup-dialog
-		    mode="input"
-		    title="请输入价格"
-		    :value="priceDialogValue"
-		    placeholder="请输入车辆价格"
-		    @confirm="dialogInputConfirm"
-		  />
-		</uni-popup>
-		<!-- <uni-popup ref="inputDialog" type="dialog">
-		  <view class="popup-dialog">
-			<view class="popup-title">请输入价格</view>
-			<view class="popup-input-wrap">
-			  <input
-				class="popup-input"
-				type="number"
-				v-model="priceDialogValue"
-				placeholder="请输入车辆价格"
-			  />
-			</view>
-			<view class="popup-btns">
-			  <view class="popup-btn cancel" @click="close">取消</view>
-			  <view class="popup-btn confirm" @click="dialogInputConfirm">确定</view>
-			</view>
-		  </view>
-		</uni-popup> -->
-	</view>
-</template>
-
-<script>
-	import { request } from '@/api/apiT.js'
-	import CarCard from '@/components/CarCard/CarCard.vue'
-
-	export default {
-		components: {
-			CarCard
-		},
-		data() {
-			return {
-				priceDialogItem: null,
-				priceDialogIndex: -1,
-				priceDialogValue: '',
-				keyword: '',
-				page: 1,
-				pageSize: 10,
-				loading: false,
-				finished: false,
-				list: []
-			}
-		},
-		onLoad() {
-			this.initFeishuShare()
-			// H5：处理分享兜底参数 r（如果路由没命中/经历登录回跳，会先落到首页）
-			// #ifdef H5
-			try {
-				const u = new URL(window.location.href)
-				const r = u.searchParams.get('r')
-				if (r) {
-					const target = decodeURIComponent(r)
-					// 清理地址栏的 r，避免反复跳转
-					u.searchParams.delete('r')
-					window.history.replaceState({}, '', u.toString())
-					// 让首页加载完再跳
-					setTimeout(() => {
-						uni.navigateTo({ url: target })
-					}, 50)
-				}
-			} catch (e) {}
-			// #endif
-		},
-		methods: {
-			isFeishuEnv() {
-				// 飞书/ Lark 客户端内置浏览器 UA 通常包含 Feishu / Lark
-				try {
-					const ua = (navigator.userAgent || '').toLowerCase()
-					return ua.includes('feishu') || ua.includes('lark')
-				} catch (e) {
-					return false
-				}
-			},
-
-			loadFeishuJSSDK() {
-				// 动态加载飞书 H5 JS-SDK（避免你还要改 public/index.html）
-				return new Promise((resolve, reject) => {
-					try {
-						// 已加载
-						if (typeof window !== 'undefined' && window.h5sdk && window.tt) return resolve(true)
-						// H5 才有 document
-						if (typeof document === 'undefined') return reject(new Error('not in h5 environment'))
-						// 已插入但未 ready
-						const existed = document.querySelector('script[data-feishu-h5sdk="1"]')
-						if (existed) {
-							existed.addEventListener('load', () => resolve(true))
-							existed.addEventListener('error', () => reject(new Error('feishu sdk load error')))
-							return
-						}
-						const s = document.createElement('script')
-						s.async = true
-						s.src = 'https://lf-scm-cn.feishucdn.com/lark/op/h5-js-sdk-1.5.44.js'
-						s.onload = () => resolve(true)
-						s.onerror = () => reject(new Error('feishu sdk load error'))
-						document.head.appendChild(s)
-					} catch (e) {
-						reject(e)
-					}
-				})
-			},
-			getFeishuSignUrl() {
-				// 飞书签名通常要求“去掉 hash 的完整 URL”
-				try {
-					return window.location.href.split('#')[0]
-				} catch (e) {
-					return ''
-				}
-			},
-			initFeishuShare() {
-				try {
-					// 确保在飞书环境
-					// if (!this.isFeishuEnv()) return
-					// 动态加载 SDK
-					this.loadFeishuJSSDK()
-
-					// 这里需要后端提供签名接口：返回 { appId, timestamp, nonceStr, signature }
-					// 你可以按你后端习惯改成：request({ url: 'xxx', ... })
-					// const signUrl = encodeURIComponent(this.getFeishuSignUrl())
-					const signUrl = this.getFeishuSignUrl()
-					
-					request({
-						url:'common/auth/feishu/signature',
-						method:'get',
-						data: {url:signUrl,app_id:uni.getStorageSync('fsappid')}
-					}).then(res => {
-						var cfg = res.data.data;
-						window.h5sdk.config({
-							appId: cfg.appId || uni.getStorageSync('fsappid'),
-							timestamp: cfg.timestamp,
-							nonceStr: cfg.nonceStr,
-							signature: cfg.signature,
-							jsApiList: ['shareWebContent','share']
-						})
-						
-						window.h5sdk.ready(() => {
-							this._feishuReady = true
-						})
-						window.h5sdk.error((err) => {
-							this._feishuReady = false
-							console.error('Feishu JSSDK error:', err)
-						})
-					})
-				} catch (e) {
-					// 不要阻塞页面，失败就走 H5 的兜底分享
-					console.error('initFeishuShare failed:', e)
-				}
-			},
-			close() {
-			    this.$refs.inputDialog.close()
-			},
-			onRequestPrice(payload) {
-				// payload: { item, index }
-				this.priceDialogItem = payload && payload.item ? payload.item : null
-				this.priceDialogIndex = payload && typeof payload.index === 'number' ? payload.index : -1
-				this.priceDialogValue = ''
-				this.$nextTick(() => {
-					this.$refs.inputDialog && this.$refs.inputDialog.open()
-				})
-			},
-			// H5 下载：用 a 标签触发
-			downloadByAnchor(url, filename) {
-				try {
-					const a = document.createElement('a')
-					a.href = url
-					a.download = filename || ''
-					a.target = '_blank'
-					document.body.appendChild(a)
-					a.click()
-					document.body.removeChild(a)
-				} catch (e) {
-					// 兜底：直接打开
-					if (typeof window !== 'undefined') window.open(url, '_blank')
-				}
-			},
-			downloadpdf(item) {
-				request({
-					url: 'common/usedcar/pdf',
-					method: 'get',
-					data: { id: item.id }
-				}).then(res => {
-					if (res.data.code == 200) {
-						this.downloadByAnchor(res.data.data.pdf_url, res.data.data.file_name)
-					}
-				})
-			},
-			dialogInputConfirm(val) {
-				const item = this.priceDialogItem
-				const index = this.priceDialogIndex
-				const price = String(val || '').trim()
-
-				if (!item) return
-				if (!price) {
-					uni.showToast({ title: '请输入价格', icon: 'none' })
-					return
-				}
-				if (isNaN(price) || Number(price) <= 0) {
-					uni.showToast({ title: '请输入有效的价格', icon: 'none' })
-					return
-				}
-
-				request({
-					url: 'common/usedcar/produce/pdf',
-					method: 'get',
-					data: { id: item.id, price }
-				}).then(res => {
-					if (res.data.code == 200) {
-						// 通知刷新列表（你原来就是靠这个事件刷新）
-						this.onSearch()
-
-						this.downloadpdf(item)
-					} else {
-						uni.showToast({ title: res.data.msg || '生成失败', icon: 'none' })
-					}
-				})
-			},
-			onKeywordChange(val) {
-			    // val 是输入值（uView 通常会传）
-			    this.keyword = val
-			
-			    // 防抖：300ms 内持续输入只触发一次
-			    if (this._kwTimer) clearTimeout(this._kwTimer)
-			    this._kwTimer = setTimeout(() => {
-			      this.onSearch()
-			    }, 300)
-			},
-			onSearch() {
-				this.queryList(this.page,this.pageSize)
-			},
-			queryList(pageNo, pageSize, from) {
-				this.loading = true;
-				var that = this;
-				const params = {
-					current:pageNo,
-					status:1,
-					size:10
-				};
-				params.keyword = this.keyword;
-				request({
-					url:'common/usedcar/list',
-					method:'get',
-					data: params
-				}).then(res => {
-					if(res.data.code ==200){
-						var datas = res.data.data.records;
-						this.$refs.paging.complete(datas);
-					}else{
-					} 
-					uni.stopPullDownRefresh();
-					//
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.page {
-		min-height: 100vh;
-		background: #f4f6f8;
-	}
-
-	.page-head {
-		position: fixed;
-		width: 100%;
-		bottom: 50px;
-		z-index: 99;
-		// padding: 28rpx 24rpx 18rpx;
-		// background: linear-gradient(180deg, rgba(255, 151, 47, 0.22) 0%, rgba(255, 151, 47, 0.06) 55%, #f4f6f8 100%);
-	}
-
-	.head-search {
-		background: rgba(255, 255, 255, 1);
-		border-radius: 9px 9px 0px 0px;
-		padding: 20rpx 10px;
-		box-shadow: 0 10rpx 28rpx rgba(0, 0, 0, 0.06);
-	}
-
-	.list-wrap {
-		padding: 18rpx 24rpx 40rpx;
-	}
-
-	.loadmore {
-		padding: 18rpx 0 6rpx;
-	}
-	.popup-dialog {
-	  width: 620rpx;
-	  background: #fff;
-	  border-radius: 24rpx;
-	  overflow: hidden;
-	}
-	
-	.popup-title {
-	  text-align: center;
-	  font-size: 32rpx;
-	  // font-weight: 600;
-	  color: #656565;
-	  padding: 32rpx 20rpx 20rpx;
-	}
-	
-	.popup-input-wrap {
-	  padding: 0 40rpx 30rpx;
-	}
-	
-	.popup-input {
-	  height: 88rpx;
-	  border-radius: 12rpx;
-	  border: 1px solid #dfdfdf;
-	  padding: 0 24rpx;
-	  font-size: 30rpx;
-	  color: #333;
-	}
-	
-	.popup-btns {
-	  display: flex;
-	  border-top: 1rpx solid #eee;
-	}
-	
-	.popup-btn {
-	  flex: 1;
-	  height: 96rpx;
-	  line-height: 96rpx;
-	  text-align: center;
-	  font-size: 32rpx;
-	}
-	
-	.popup-btn.cancel {
-	  color: #666;
-	  border-right: 1rpx solid #eee;
-	}
-	
-	.popup-btn.confirm {
-	  color: #007aff; /* uni 主色 */
-	  font-weight: 500;
-	}
-
-</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7146a03..ea834cd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -17,7 +17,12 @@
 					  @search="onSearch"
 					  @clear="onSearch"
 					/>
+					<view class="statussearch" @click="show=true">
+						<text class="year-text">{{status_name || '状态'}}</text>
+						<u-icon name="arrow-down" size="14" color="#999"></u-icon>
+					</view>
 				</view>
+				<u-picker :show="show" :columns="columns" keyName="label" @confirm="onstatus" @cancel="show = false"></u-picker>
 			</view>
 			<view class="list-wrap">
 				<CarCard
@@ -26,6 +31,7 @@
 					:item="item"
 					@pdfchange="onSearch"
 					@request-price="onRequestPrice"
+					@restchange="onSearch"
 				/>
 			</view>
 		</z-paging>
@@ -95,18 +101,39 @@
 		    </view>
 		  </view>
 		</uni-popup>
+
+		<!-- #ifdef H5 -->
+		<CustomTabBar class="h5-custom-tabbar" />
+		<!-- #endif -->
 	</view>
 </template>
 
 <script>
 	import { request } from '@/api/apiT.js'
 	import CarCard from '@/components/CarCard/CarCard.vue'
+	import CustomTabBar from '@/custom-tab-bar/index.vue'
 	export default {
 		components: {
-			CarCard
+			CarCard,
+			CustomTabBar
 		},
 		data() {
 			return {
+				show: false,
+				status_id:1,
+				status_name:'',
+				columns: [
+					[{
+						label: '正常',
+						id: 1
+					}, {
+						label: '已售出',
+						id: 2
+					}, {
+						label: '已归档',
+						id: 3
+					}]
+				],
 				priceDialogItem: null,
 				priceDialogIndex: -1,
 				priceDialogValue: '',
@@ -379,15 +406,15 @@
 			    }, 300)
 			},
 			onSearch() {
-				this.queryList(this.page,this.pageSize)
+				this.$refs.paging && this.$refs.paging.reload()
 			},
 			queryList(pageNo, pageSize, from) {
 				this.loading = true;
 				var that = this;
 				const params = {
 					current:pageNo,
-					status:1,
-					size:10
+					status:this.status_id,
+					size:pageSize
 				};
 				params.keyword = this.keyword;
 				request({
@@ -403,6 +430,15 @@
 					uni.stopPullDownRefresh();
 					//
 				})
+			},
+			onstatus(e){
+				if (e.value && e.value[0]) {
+					const selectedItem = typeof e.value[0] === 'object' ? e.value[0] : { value: e.value[0], label: e.value[0].toString() };
+					this.status_name = selectedItem.label;
+					this.status_id = selectedItem.id;
+					this.show = false;
+					this.$refs.paging && this.$refs.paging.reload()
+				}
 			}
 		}
 	}
@@ -418,6 +454,13 @@
 		background: #f4f6f8;
 	}
 
+	/* #ifdef H5 */
+	.page {
+		/* 给自定义 TabBar 预留空间，避免内容被遮挡 */
+		padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
+	}
+	/* #endif */
+
 	.page-head {
 		position: fixed;
 		width: 100%;
@@ -428,11 +471,23 @@
 	}
 
 	.head-search {
+		display: flex;
+		align-items: center;
+		gap: 10px;
 		background: rgba(255, 255, 255, 1);
 		border-radius: 9px 9px 0px 0px;
 		padding: 20rpx 10px;
 		box-shadow: 0 10rpx 28rpx rgba(0, 0, 0, 0.06);
 	}
+	.statussearch{
+		border: 1px solid #eae9e9;
+		border-radius: 4px;
+		padding: 4px 8px;
+		font-size: 24rpx;
+		display: flex;
+		align-items: center;
+		gap: 6px;
+	}
 
 	.list-wrap {
 		padding: 18rpx 24rpx 40rpx;
diff --git a/pages/index/mine - 副本.vue b/pages/index/mine - 副本.vue
index fed412c..5edc9b2 100644
--- a/pages/index/mine - 副本.vue	
+++ b/pages/index/mine - 副本.vue	
@@ -26,6 +26,7 @@
 				>
 					<CarCard
 						:item="item"
+						:ismy="true"
 						@pdfchange="onSearch"
 						@request-price="onRequestPrice"
 					/>
@@ -33,24 +34,78 @@
 			</view>
 		</z-paging>
 		<uni-popup ref="inputDialog" type="dialog">
-		  <uni-popup-dialog
-		    mode="input"
-		    title="请输入价格"
-		    :value="priceDialogValue"
-		    placeholder="请输入车辆价格"
-		    @confirm="dialogInputConfirm"
-		  />
+		  <view class="price-dialog">
+			<view class="pd-title">设置价格</view>
+			<view class="pd-row">
+				<view class="pd-label">贸易条款</view>
+				<view class="pd-price-line">
+					<uni-data-select
+					  v-model="priceForm.trade_term"
+					  class="tradeTerm"
+					  :localdata="tradeTermOptions"
+					  :clear="false"
+					/>
+				</view>
+			</view>
+		    <view class="pd-row">
+				<view class="pd-label">价格</view>
+				<view class="pd-price-line">
+					<view class="pd-input-suffix-wrap">
+					  <input
+						class="pd-input pd-input-price pd-input-with-suffix"
+						v-model="priceForm.price"
+						type="number"
+						inputmode="decimal"
+						placeholder="请输入数字"
+						@input="onPriceInput"
+					  />
+					  <!-- 币种下拉：放在输入框内部右侧（无边框） -->
+					  <view class="pd-currency-suffix">
+						<uni-data-select
+						  class="pd-currency-select-suffix"
+						  v-model="priceForm.currency"
+						  :localdata="currencyOptions"
+						  :clear="false"
+						/>
+					  </view>
+					</view>
+				</view>
+			</view>
+		
+		    <!-- 语言单选 -->
+		    <view class="pd-row">
+		      <view class="pd-label">语言</view>
+				<radio-group class="pd-radio-group" @change="onLangChange">
+				  <label class="pd-radio" v-for="l in langOptions" :key="l.value">
+					<radio :value="l.value" :checked="priceForm.lang === l.value" />
+					<text class="pd-radio-text">{{ l.text }}</text>
+				  </label>
+				</radio-group>
+		    </view>
+		
+		    <!-- 操作按钮 -->
+		    <view class="pd-actions">
+		      <view class="pd-btn pd-cancel" @tap="closePriceDialog">取消</view>
+		      <view class="pd-btn pd-confirm" @tap="confirmPriceDialog">确认</view>
+		    </view>
+		  </view>
 		</uni-popup>
+
+		<!-- #ifdef H5 -->
+		<CustomTabBar class="h5-custom-tabbar" />
+		<!-- #endif -->
 	</view>
 </template>
 
 <script>
 	import { request } from '@/api/apiT.js'
 	import CarCard from '@/components/CarCard/CarCard.vue'
+	import CustomTabBar from '@/custom-tab-bar/index.vue'
 
 	export default {
 		components: {
-			CarCard
+			CarCard,
+			CustomTabBar
 		},
 		data() {
 			return {
@@ -62,12 +117,6 @@
 						style: {
 							backgroundColor: '#007aff'
 						}
-					},
-					{
-						text: '删除',
-						style: {
-							backgroundColor: '#F56C6C'
-						}
 					}
 				],
 				keyword: '',
@@ -75,7 +124,35 @@
 				pageSize: 10,
 				loading: false,
 				finished: false,
-				list: []
+				list: [],
+				priceForm: {
+					trade_term:'',
+					price: "",        // 只存数字字符串
+					currency: "USD",  // USD | RUB | AED | EUR
+					lang: "en"        // en | ru | es | ar
+				},
+				currencyOptions: [
+				  { value: "USD", text: "美元" },
+				  { value: "CNY", text: "人民币" },
+				  { value: "RUB", text: "卢布" },
+				  { value: "AED", text: "迪拉姆" },
+				  { value: "EUR", text: "欧元" }
+				],
+				langOptions: [
+					{ text: "英语", value: "en" },
+					{ text: "俄语", value: "ru" },
+					{ text: "西班牙语", value: "es" },
+					{ text: "阿拉伯语", value: "ar" }
+				],
+				tradeTermOptions: [
+				  { value: "FOB", text: "FOB" },
+				  { value: "CIF", text: "CIF" },
+				  { value: "EXW", text: "EXW" },
+				  { value: "DDP", text: "DDP" },
+				  { value: "CIP", text: "CIP" },
+				  { value: "FCA", text: "FCA" },
+				  { value: "CFR", text: "CFR" }
+				]
 			}
 		},
 		onLoad() {
@@ -187,6 +264,12 @@
 				this.priceDialogItem = payload && payload.item ? payload.item : null
 				this.priceDialogIndex = payload && typeof payload.index === 'number' ? payload.index : -1
 				this.priceDialogValue = ''
+				this.priceForm = {
+					trade_term:'',
+					price:"",
+					currency: "USD",
+					lang: "en"
+				}
 				this.$nextTick(() => {
 					this.$refs.inputDialog && this.$refs.inputDialog.open()
 				})
@@ -217,29 +300,77 @@
 					}
 				})
 			},
+			closePriceDialog() {
+			  this.$refs.inputDialog.close()
+			},
+					
+			// 只允许数字 + 可选1个小数点（你要“纯整数”也行，我后面给你一行改法）
+			onPriceInput(e) {
+			  let v = (e.detail && e.detail.value) ? String(e.detail.value) : String(this.priceForm.price || "")
+					
+			  // 过滤掉非数字和点
+			  v = v.replace(/[^\d.]/g, "")
+					
+			  // 只保留第一个小数点
+			  const parts = v.split(".")
+			  if (parts.length > 2) {
+				v = parts[0] + "." + parts.slice(1).join("")
+			  }
+					
+			  // 去掉开头多余 0（保留 0.xxx）
+			  v = v.replace(/^0+(\d)/, "$1")
+			  if (v.startsWith(".")) v = "0" + v
+					
+			  this.priceForm.price = v
+			},
+					
+			onCurrencyPickerChange(e) {
+			  const idx = Number(e.detail.value || 0)
+			  this.currencyIndex = idx
+			  this.priceForm.currency = this.currencyOptions[idx]?.value || "USD"
+			},
+					
+			onLangChange(e) {
+			  this.priceForm.lang = e.detail.value
+			},
+					
+			confirmPriceDialog() {
+				if (!this.priceForm.trade_term) {
+					return uni.showToast({ title: "请选择贸易条款", icon: "none" })
+				}
+				  // 校验
+				if (!this.priceForm.price) {
+					return uni.showToast({ title: "请输入价格", icon: "none" })
+				}
+						
+				const payload = {
+					trade_term:this.priceForm.trade_term,  
+					price: this.priceForm.price,         // 数字字符串
+					currency: this.priceForm.currency,   // USD/RUB/AED/EUR
+					lang: this.priceForm.lang            // en/ru/es/ar
+				}
+				console.log(payload)
+				this.closePriceDialog()
+				this.dialogInputConfirm(payload)
+			},
 			dialogInputConfirm(val) {
 				const item = this.priceDialogItem
 				const index = this.priceDialogIndex
-				const price = String(val || '').trim()
 			
 				if (!item) return
-				if (!price) {
+				if (!val.price) {
 					uni.showToast({ title: '请输入价格', icon: 'none' })
 					return
 				}
-				if (isNaN(price) || Number(price) <= 0) {
-					uni.showToast({ title: '请输入有效的价格', icon: 'none' })
-					return
-				}
-			
 				request({
 					url: 'common/usedcar/produce/pdf',
 					method: 'get',
-					data: { id: item.id, price }
+					data: { id: item.id, price:val.price,currency:val.currency,lang:val.lang,trade_term:val.trade_term }
 				}).then(res => {
 					if (res.data.code == 200) {
 						// 通知刷新列表（你原来就是靠这个事件刷新）
 						this.onSearch()
+			
 						this.downloadpdf(item)
 					} else {
 						uni.showToast({ title: res.data.msg || '生成失败', icon: 'none' })
@@ -287,45 +418,59 @@
 				let {
 					content
 				} = e;
-				if (content.text === '删除') {
-					uni.showModal({
-						title: '提示',
-						content: '是否删除',
-						success: res => {
-							if (res.confirm) {
-								request({
-									url:'common/usedcar/destroy',
-									method:'post',
-									data: {id:item.id}
-								}).then(res => {
-									uni.showToast({
-										title: res.data.message,
-										icon: 'none'
-									});
-									this.queryList()
-								})
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				} else {
-					const id = item.id
-					uni.navigateTo({
-						url: `/pages/index/publishedit?id=${id}`
-					})
-				}
+				const id = item.id
+				uni.navigateTo({
+					url: `/pages/index/publishedit?id=${id}`
+				})
+				// if (content.text === '删除') {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: '是否删除',
+				// 		success: res => {
+				// 			if (res.confirm) {
+				// 				request({
+				// 					url:'common/usedcar/destroy',
+				// 					method:'post',
+				// 					data: {id:item.id}
+				// 				}).then(res => {
+				// 					uni.showToast({
+				// 						title: res.data.message,
+				// 						icon: 'none'
+				// 					});
+				// 					this.queryList()
+				// 				})
+				// 			} else if (res.cancel) {
+				// 				console.log('用户点击取消');
+				// 			}
+				// 		}
+				// 	});
+				// } else {
+				// 	const id = item.id
+				// 	uni.navigateTo({
+				// 		url: `/pages/index/publishedit?id=${id}`
+				// 	})
+				// }
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.tradeTerm{
+		border: 1px solid #eae9e9;
+		border-radius: 6px;
+	}
 	.page {
 		min-height: 100vh;
 		background: #f4f6f8;
 	}
 
+	/* #ifdef H5 */
+	.page {
+		padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
+	}
+	/* #endif */
+
 	.page-head {
 		position: fixed;
 		width: 100%;
@@ -349,4 +494,122 @@
 	.loadmore {
 		padding: 18rpx 0 6rpx;
 	}
+	.price-dialog{
+	  width: 640rpx;
+	  background: #fff;
+	  border-radius: 24rpx;
+	  padding: 28rpx;
+	}
+	
+	.pd-title{
+	  font-size: 34rpx;
+	  font-weight: 600;
+	  color: #111;
+	  margin-bottom: 20rpx;
+	  text-align: center;
+	}
+	
+	.pd-row{
+	  display:flex;
+	  align-items:center;
+	  margin-top: 40rpx;
+	}
+	
+	.pd-row-col{
+	  flex-direction: column;
+	  align-items: flex-start;
+	}
+	
+	.pd-label{
+	  width: 120rpx;
+	  font-size: 28rpx;
+	  color:#333;
+	}
+	
+	.pd-input{
+	  flex:1;
+	  height: 66rpx;
+	  border: 1px solid #eee;
+	  border-radius: 16rpx;
+	  padding: 0 18rpx;
+	  font-size: 30rpx;
+	}
+	.pd-input-suffix-wrap{
+	  position: relative;
+	  flex: 1;
+	}
+	
+	.pd-input-with-suffix{
+	  padding-right: 180rpx; /* 给右侧币种留空间 */
+	}
+	
+	.pd-currency-suffix{
+	  position: absolute;
+	  right: 14rpx;
+	  top: 50%;
+	  transform: translateY(-50%);
+	  width: 140rpx;
+	  height: 80rpx;
+	  display: flex;
+	  align-items: center;
+	  justify-content: flex-end;
+	}
+	::v-deep .uni-select{
+		border: none !important;
+	}
+	.pd-radio-group{
+	  display:flex;
+	  flex-wrap: wrap;
+	  gap: 16rpx 22rpx;
+	  margin-top: 12rpx;
+	}
+	
+	.pd-radio{
+	  display:flex;
+	  align-items:center;
+	}
+	
+	.pd-radio-text{
+	  margin-left: 10rpx;
+	  font-size: 26rpx;
+	  color:#333;
+	}
+	
+	.pd-actions{
+	  display:flex;
+	  gap: 18rpx;
+	  margin-top: 40rpx;
+	}
+	
+	.pd-btn{
+	  flex:1;
+	  height: 84rpx;
+	  border-radius: 18rpx;
+	  display:flex;
+	  align-items:center;
+	  justify-content:center;
+	  font-size: 30rpx;
+	}
+	
+	.pd-cancel{
+	  background:#f5f5f5;
+	  color:#333;
+	}
+	
+	.pd-confirm{
+	  background:#3F435B; /* 你喜欢绿色风格 */
+	  color:#fff;
+	  font-weight:600;
+	}
+	.pd-price-line{
+	  flex: 1;
+	  display: flex;
+	  align-items: center;
+	  gap: 16rpx;
+	}
+	
+	.pd-input-price{
+	  flex: 1;
+	  min-width: 240rpx;
+	}
 </style>
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index f2154e1..241b4da 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -1,603 +1,183 @@
 <template>
 	<view class="page">
-		<!-- 列表 -->
-		<z-paging  ref="paging"  v-model="list" @query="queryList" empty-view-text="暂无数据！">
-			<!-- <uni-nav-bar leftText=" " :fixed="true" :border="false" color="#fff" backgroundColor="#3F435B" :statusBar="true" title="首页"></uni-nav-bar> -->
-			<!-- 顶部：标题 + 搜索（不想要搜索可直接删除这一块） -->
-			<view class="page-head">
-				<view class="head-search">
-					<u-search
-					  v-model="keyword"
-					  placeholder="请输入关键词"
-					  :show-action="false"
-					  shape="round"
-					  @change="onKeywordChange"
-					  @search="onSearch"
-					  @clear="onSearch"
-					/>
+		<!-- 用户信息卡片 -->
+		<view class="user-card" @click="goToChanginfo">
+			<view class="user-info">
+				<image 
+					class="avatar" 
+					:src="userInfo.avatar_pull || '/static/image/user.png'" 
+					mode="aspectFill"
+				/>
+				<view class="user-details">
+					<text class="nickname">{{ userInfo.name}}</text>
+					<text class="phone">{{ userInfo.name_en}}</text>
 				</view>
 			</view>
-			<view class="list-wrap">
-				<uni-swipe-action-item
-					v-for="item in list"
-					:key="item.id"
-					:right-options="options1"
-					@click="swipeClick($event, item)"
-				>
-					<CarCard
-						:item="item"
-						:ismy="true"
-						@pdfchange="onSearch"
-						@request-price="onRequestPrice"
-					/>
-				</uni-swipe-action-item>
-			</view>
-		</z-paging>
-		<uni-popup ref="inputDialog" type="dialog">
-		  <view class="price-dialog">
-			<view class="pd-title">设置价格</view>
-			<view class="pd-row">
-				<view class="pd-label">贸易条款</view>
-				<view class="pd-price-line">
-					<uni-data-select
-					  v-model="priceForm.trade_term"
-					  class="tradeTerm"
-					  :localdata="tradeTermOptions"
-					  :clear="false"
-					/>
+		</view>
+
+		<!-- 功能入口 -->
+		<view class="menu-section">
+			<view class="menu-item" @tap="goToMyPublish" v-if="this.userInfo.role==2">
+				<view class="menu-icon">
+					<u-icon name="list-dot" size="24" color="#3F435B"></u-icon>
+				</view>
+				<text class="menu-text">我的发布</text>
+				<view class="menu-arrow">
+					<u-icon name="arrow-right" size="18" color="#999"></u-icon>
 				</view>
 			</view>
-		    <view class="pd-row">
-				<view class="pd-label">价格</view>
-				<view class="pd-price-line">
-					<view class="pd-input-suffix-wrap">
-					  <input
-						class="pd-input pd-input-price pd-input-with-suffix"
-						v-model="priceForm.price"
-						type="number"
-						inputmode="decimal"
-						placeholder="请输入数字"
-						@input="onPriceInput"
-					  />
-					  <!-- 币种下拉：放在输入框内部右侧（无边框） -->
-					  <view class="pd-currency-suffix">
-						<uni-data-select
-						  class="pd-currency-select-suffix"
-						  v-model="priceForm.currency"
-						  :localdata="currencyOptions"
-						  :clear="false"
-						/>
-					  </view>
-					</view>
+			<view class="menu-item" @tap="goToMyPublish" v-if="this.userInfo.role==1">
+				<view class="menu-icon">
+					<u-icon name="list-dot" size="24" color="#3F435B"></u-icon>
+				</view>
+				<text class="menu-text">我的车库</text>
+				<view class="menu-arrow">
+					<u-icon name="arrow-right" size="18" color="#999"></u-icon>
 				</view>
 			</view>
-		
-		    <!-- 语言单选 -->
-		    <view class="pd-row">
-		      <view class="pd-label">语言</view>
-				<radio-group class="pd-radio-group" @change="onLangChange">
-				  <label class="pd-radio" v-for="l in langOptions" :key="l.value">
-					<radio :value="l.value" :checked="priceForm.lang === l.value" />
-					<text class="pd-radio-text">{{ l.text }}</text>
-				  </label>
-				</radio-group>
-		    </view>
-		
-		    <!-- 操作按钮 -->
-		    <view class="pd-actions">
-		      <view class="pd-btn pd-cancel" @tap="closePriceDialog">取消</view>
-		      <view class="pd-btn pd-confirm" @tap="confirmPriceDialog">确认</view>
-		    </view>
-		  </view>
-		</uni-popup>
+		</view>
+		<CustomTabBar class="h5-custom-tabbar" />
 	</view>
 </template>
 
 <script>
 	import { request } from '@/api/apiT.js'
-	import CarCard from '@/components/CarCard/CarCard.vue'
-
+	import CustomTabBar from '@/custom-tab-bar/index.vue'
 	export default {
 		components: {
-			CarCard
+			CustomTabBar
 		},
 		data() {
 			return {
-				priceDialogItem: null,
-				priceDialogIndex: -1,
-				priceDialogValue: '',
-				options1: [{
-						text: '编辑',
-						style: {
-							backgroundColor: '#007aff'
-						}
-					}
-				],
-				keyword: '',
-				page: 1,
-				pageSize: 10,
-				loading: false,
-				finished: false,
-				list: [],
-				priceForm: {
-					trade_term:'',
-					price: "",        // 只存数字字符串
-					currency: "USD",  // USD | RUB | AED | EUR
-					lang: "en"        // en | ru | es | ar
-				},
-				currencyOptions: [
-				  { value: "USD", text: "美元" },
-				  { value: "CNY", text: "人民币" },
-				  { value: "RUB", text: "卢布" },
-				  { value: "AED", text: "迪拉姆" },
-				  { value: "EUR", text: "欧元" }
-				],
-				langOptions: [
-					{ text: "英语", value: "en" },
-					{ text: "俄语", value: "ru" },
-					{ text: "西班牙语", value: "es" },
-					{ text: "阿拉伯语", value: "ar" }
-				],
-				tradeTermOptions: [
-				  { value: "FOB", text: "FOB" },
-				  { value: "CIF", text: "CIF" },
-				  { value: "EXW", text: "EXW" },
-				  { value: "DDP", text: "DDP" },
-				  { value: "CIP", text: "CIP" },
-				  { value: "FCA", text: "FCA" },
-				  { value: "CFR", text: "CFR" }
-				]
+				userInfo: {}
 			}
 		},
 		onLoad() {
-			this.initFeishuShare()
-			// H5：处理分享兜底参数 r（如果路由没命中/经历登录回跳，会先落到首页）
-			// #ifdef H5
-			try {
-				const u = new URL(window.location.href)
-				const r = u.searchParams.get('r')
-				if (r) {
-					const target = decodeURIComponent(r)
-					// 清理地址栏的 r，避免反复跳转
-					u.searchParams.delete('r')
-					window.history.replaceState({}, '', u.toString())
-					// 让首页加载完再跳
-					setTimeout(() => {
-						uni.navigateTo({ url: target })
-					}, 50)
-				}
-			} catch (e) {}
-			// #endif
+		},
+		onShow() {
+			// 页面显示时刷新用户信息
+			this.getUserInfo()
 		},
 		methods: {
-			isFeishuEnv() {
-				// 飞书/ Lark 客户端内置浏览器 UA 通常包含 Feishu / Lark
-				try {
-					const ua = (navigator.userAgent || '').toLowerCase()
-					return ua.includes('feishu') || ua.includes('lark')
-				} catch (e) {
-					return false
-				}
-			},
-			
-			loadFeishuJSSDK() {
-				// 动态加载飞书 H5 JS-SDK（避免你还要改 public/index.html）
-				return new Promise((resolve, reject) => {
-					try {
-						// 已加载
-						if (typeof window !== 'undefined' && window.h5sdk && window.tt) return resolve(true)
-						// H5 才有 document
-						if (typeof document === 'undefined') return reject(new Error('not in h5 environment'))
-						// 已插入但未 ready
-						const existed = document.querySelector('script[data-feishu-h5sdk="1"]')
-						if (existed) {
-							existed.addEventListener('load', () => resolve(true))
-							existed.addEventListener('error', () => reject(new Error('feishu sdk load error')))
-							return
-						}
-						const s = document.createElement('script')
-						s.async = true
-						s.src = 'https://lf-scm-cn.feishucdn.com/lark/op/h5-js-sdk-1.5.44.js'
-						s.onload = () => resolve(true)
-						s.onerror = () => reject(new Error('feishu sdk load error'))
-						document.head.appendChild(s)
-					} catch (e) {
-						reject(e)
-					}
-				})
-			},
-			getFeishuSignUrl() {
-				// 飞书签名通常要求“去掉 hash 的完整 URL”
-				try {
-					return window.location.href.split('#')[0]
-				} catch (e) {
-					return ''
-				}
-			},
-			initFeishuShare() {
-				try {
-					// 确保在飞书环境
-					// if (!this.isFeishuEnv()) return
-					// 动态加载 SDK
-					this.loadFeishuJSSDK()
-			
-					// 这里需要后端提供签名接口：返回 { appId, timestamp, nonceStr, signature }
-					// 你可以按你后端习惯改成：request({ url: 'xxx', ... })
-					// const signUrl = encodeURIComponent(this.getFeishuSignUrl())
-					const signUrl = this.getFeishuSignUrl()
-					
-					request({
-						url:'common/auth/feishu/signature',
-						method:'get',
-						data: {url:signUrl,app_id:uni.getStorageSync('fsappid')}
-					}).then(res => {
-						var cfg = res.data.data;
-						window.h5sdk.config({
-							appId: cfg.appId || uni.getStorageSync('fsappid'),
-							timestamp: cfg.timestamp,
-							nonceStr: cfg.nonceStr,
-							signature: cfg.signature,
-							jsApiList: ['shareWebContent','share']
-						})
-						
-						window.h5sdk.ready(() => {
-							this._feishuReady = true
-						})
-						window.h5sdk.error((err) => {
-							this._feishuReady = false
-							console.error('Feishu JSSDK error:', err)
-						})
-					})
-				} catch (e) {
-					// 不要阻塞页面，失败就走 H5 的兜底分享
-					console.error('initFeishuShare failed:', e)
-				}
-			},
-			onRequestPrice(payload) {
-				// payload: { item, index }
-				this.priceDialogItem = payload && payload.item ? payload.item : null
-				this.priceDialogIndex = payload && typeof payload.index === 'number' ? payload.index : -1
-				this.priceDialogValue = ''
-				this.priceForm = {
-					trade_term:'',
-					price:"",
-					currency: "USD",
-					lang: "en"
-				}
-				this.$nextTick(() => {
-					this.$refs.inputDialog && this.$refs.inputDialog.open()
-				})
-			},
-			// H5 下载：用 a 标签触发
-			downloadByAnchor(url, filename) {
-				try {
-					const a = document.createElement('a')
-					a.href = url
-					a.download = filename || ''
-					a.target = '_blank'
-					document.body.appendChild(a)
-					a.click()
-					document.body.removeChild(a)
-				} catch (e) {
-					// 兜底：直接打开
-					if (typeof window !== 'undefined') window.open(url, '_blank')
-				}
-			},
-			downloadpdf(item) {
+			// 获取用户信息
+			getUserInfo() {
 				request({
-					url: 'common/usedcar/pdf',
-					method: 'get',
-					data: { id: item.id }
+					url: 'common/user/info',
+					method: 'get'
 				}).then(res => {
-					if (res.data.code == 200) {
-						this.downloadByAnchor(res.data.data.pdf_url, res.data.data.file_name)
+					if (res.data.code == 0 || res.data.code == 200) {
+						this.userInfo = res.data.data
 					}
+				}).catch(() => {
+					// 获取失败时使用默认值
 				})
 			},
-			closePriceDialog() {
-			  this.$refs.inputDialog.close()
-			},
-					
-			// 只允许数字 + 可选1个小数点（你要“纯整数”也行，我后面给你一行改法）
-			onPriceInput(e) {
-			  let v = (e.detail && e.detail.value) ? String(e.detail.value) : String(this.priceForm.price || "")
-					
-			  // 过滤掉非数字和点
-			  v = v.replace(/[^\d.]/g, "")
-					
-			  // 只保留第一个小数点
-			  const parts = v.split(".")
-			  if (parts.length > 2) {
-				v = parts[0] + "." + parts.slice(1).join("")
-			  }
-					
-			  // 去掉开头多余 0（保留 0.xxx）
-			  v = v.replace(/^0+(\d)/, "$1")
-			  if (v.startsWith(".")) v = "0" + v
-					
-			  this.priceForm.price = v
-			},
-					
-			onCurrencyPickerChange(e) {
-			  const idx = Number(e.detail.value || 0)
-			  this.currencyIndex = idx
-			  this.priceForm.currency = this.currencyOptions[idx]?.value || "USD"
-			},
-					
-			onLangChange(e) {
-			  this.priceForm.lang = e.detail.value
-			},
-					
-			confirmPriceDialog() {
-				if (!this.priceForm.trade_term) {
-					return uni.showToast({ title: "请选择贸易条款", icon: "none" })
-				}
-				  // 校验
-				if (!this.priceForm.price) {
-					return uni.showToast({ title: "请输入价格", icon: "none" })
-				}
-						
-				const payload = {
-					trade_term:this.priceForm.trade_term,  
-					price: this.priceForm.price,         // 数字字符串
-					currency: this.priceForm.currency,   // USD/RUB/AED/EUR
-					lang: this.priceForm.lang            // en/ru/es/ar
-				}
-				console.log(payload)
-				this.closePriceDialog()
-				this.dialogInputConfirm(payload)
-			},
-			dialogInputConfirm(val) {
-				const item = this.priceDialogItem
-				const index = this.priceDialogIndex
-			
-				if (!item) return
-				if (!val.price) {
-					uni.showToast({ title: '请输入价格', icon: 'none' })
-					return
-				}
-				request({
-					url: 'common/usedcar/produce/pdf',
-					method: 'get',
-					data: { id: item.id, price:val.price,currency:val.currency,lang:val.lang,trade_term:val.trade_term }
-				}).then(res => {
-					if (res.data.code == 200) {
-						// 通知刷新列表（你原来就是靠这个事件刷新）
-						this.onSearch()
-			
-						this.downloadpdf(item)
-					} else {
-						uni.showToast({ title: res.data.msg || '生成失败', icon: 'none' })
-					}
-				})
-			},
-			onKeywordChange(val) {
-			    // val 是输入值（uView 通常会传）
-			    this.keyword = val
-			
-			    // 防抖：300ms 内持续输入只触发一次
-			    if (this._kwTimer) clearTimeout(this._kwTimer)
-			    this._kwTimer = setTimeout(() => {
-			      this.onSearch()
-			    }, 300)
-			},
-			onSearch() {
-				this.queryList(this.page,this.pageSize)
-			},
-			queryList(pageNo, pageSize, from) {
-				this.loading = true;
-				var that = this;
-				const params = {
-					current:pageNo,
-					status:1,
-					size:10
-				};
-				params.keyword = this.keyword;
-				params.scene = 'self';
-				request({
-					url:'common/usedcar/list',
-					method:'get',
-					data: params
-				}).then(res => {
-					if(res.data.code ==200){
-						var datas = res.data.data.records;
-						this.$refs.paging.complete(datas);
-					}else{
-					} 
-					uni.stopPullDownRefresh();
-					//
-				})
-			},
-			swipeClick(e,item){
-				let {
-					content
-				} = e;
-				const id = item.id
+			// 跳转到我的发布列表
+			goToMyPublish() {
 				uni.navigateTo({
-					url: `/pages/index/publishedit?id=${id}`
+					url: '/pages/index/myPublish'
 				})
-				// if (content.text === '删除') {
-				// 	uni.showModal({
-				// 		title: '提示',
-				// 		content: '是否删除',
-				// 		success: res => {
-				// 			if (res.confirm) {
-				// 				request({
-				// 					url:'common/usedcar/destroy',
-				// 					method:'post',
-				// 					data: {id:item.id}
-				// 				}).then(res => {
-				// 					uni.showToast({
-				// 						title: res.data.message,
-				// 						icon: 'none'
-				// 					});
-				// 					this.queryList()
-				// 				})
-				// 			} else if (res.cancel) {
-				// 				console.log('用户点击取消');
-				// 			}
-				// 		}
-				// 	});
-				// } else {
-				// 	const id = item.id
-				// 	uni.navigateTo({
-				// 		url: `/pages/index/publishedit?id=${id}`
-				// 	})
-				// }
-			}
+			},
+			// 跳转到个人信息
+			goToChanginfo() {
+				uni.navigateTo({
+					url: '/pages/index/changinfo'
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.tradeTerm{
-		border: 1px solid #eae9e9;
-		border-radius: 6px;
-	}
 	.page {
 		min-height: 100vh;
 		background: #f4f6f8;
+		padding: 20rpx;
 	}
 
-	.page-head {
-		position: fixed;
-		width: 100%;
-		bottom: 50px;
-		z-index: 99;
-		// padding: 28rpx 24rpx 18rpx;
-		// background: linear-gradient(180deg, rgba(255, 151, 47, 0.22) 0%, rgba(255, 151, 47, 0.06) 55%, #f4f6f8 100%);
-	}
-
-	.head-search {
-		background: rgba(255, 255, 255, 1);
+	.user-card {
+		background: rgba(255, 255, 255, 0.95);
 		border-radius: 18rpx;
-		padding: 20rpx 10px;
-		box-shadow: 0 10rpx 28rpx rgba(0, 0, 0, 0.06);
+		padding: 40rpx 30rpx;
+		margin-bottom: 20rpx;
+		box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.06);
 	}
 
-	.list-wrap {
-		padding: 18rpx 24rpx 40rpx;
+	.user-info {
+		display: flex;
+		align-items: center;
 	}
 
-	.loadmore {
-		padding: 18rpx 0 6rpx;
+	.avatar {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 50%;
+		background: #eef2f7;
+		margin-right: 30rpx;
 	}
-	.price-dialog{
-	  width: 640rpx;
-	  background: #fff;
-	  border-radius: 24rpx;
-	  padding: 28rpx;
+
+	.user-details {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		gap: 12rpx;
 	}
-	
-	.pd-title{
-	  font-size: 34rpx;
-	  font-weight: 600;
-	  color: #111;
-	  margin-bottom: 20rpx;
-	  text-align: center;
+
+	.nickname {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #111827;
 	}
-	
-	.pd-row{
-	  display:flex;
-	  align-items:center;
-	  margin-top: 40rpx;
+
+	.phone {
+		font-size: 26rpx;
+		color: #6b7280;
 	}
-	
-	.pd-row-col{
-	  flex-direction: column;
-	  align-items: flex-start;
+
+	.menu-section {
+		background: rgba(255, 255, 255, 0.95);
+		border-radius: 18rpx;
+		overflow: hidden;
+		box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.06);
 	}
-	
-	.pd-label{
-	  width: 120rpx;
-	  font-size: 28rpx;
-	  color:#333;
+
+	.menu-item {
+		display: flex;
+		align-items: center;
+		padding: 30rpx;
+		border-bottom: 1px solid #f0f0f0;
+		transition: background-color 0.2s;
 	}
-	
-	.pd-input{
-	  flex:1;
-	  height: 66rpx;
-	  border: 1px solid #eee;
-	  border-radius: 16rpx;
-	  padding: 0 18rpx;
-	  font-size: 30rpx;
+
+	.menu-item:last-child {
+		border-bottom: none;
 	}
-	.pd-input-suffix-wrap{
-	  position: relative;
-	  flex: 1;
+
+	.menu-item:active {
+		background-color: #f9fafb;
 	}
-	
-	.pd-input-with-suffix{
-	  padding-right: 180rpx; /* 给右侧币种留空间 */
+
+	.menu-icon {
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-right: 24rpx;
+		// background: #f3f4f6;
+		border-radius: 12rpx;
 	}
-	
-	.pd-currency-suffix{
-	  position: absolute;
-	  right: 14rpx;
-	  top: 50%;
-	  transform: translateY(-50%);
-	  width: 140rpx;
-	  height: 80rpx;
-	  display: flex;
-	  align-items: center;
-	  justify-content: flex-end;
+
+	.menu-text {
+		flex: 1;
+		font-size: 30rpx;
+		color: #111827;
+		font-weight: 500;
 	}
-	::v-deep .uni-select{
-		border: none !important;
-	}
-	.pd-radio-group{
-	  display:flex;
-	  flex-wrap: wrap;
-	  gap: 16rpx 22rpx;
-	  margin-top: 12rpx;
-	}
-	
-	.pd-radio{
-	  display:flex;
-	  align-items:center;
-	}
-	
-	.pd-radio-text{
-	  margin-left: 10rpx;
-	  font-size: 26rpx;
-	  color:#333;
-	}
-	
-	.pd-actions{
-	  display:flex;
-	  gap: 18rpx;
-	  margin-top: 40rpx;
-	}
-	
-	.pd-btn{
-	  flex:1;
-	  height: 84rpx;
-	  border-radius: 18rpx;
-	  display:flex;
-	  align-items:center;
-	  justify-content:center;
-	  font-size: 30rpx;
-	}
-	
-	.pd-cancel{
-	  background:#f5f5f5;
-	  color:#333;
-	}
-	
-	.pd-confirm{
-	  background:#3F435B; /* 你喜欢绿色风格 */
-	  color:#fff;
-	  font-weight:600;
-	}
-	.pd-price-line{
-	  flex: 1;
-	  display: flex;
-	  align-items: center;
-	  gap: 16rpx;
-	}
-	
-	.pd-input-price{
-	  flex: 1;
-	  min-width: 240rpx;
+
+	.menu-arrow {
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 </style>
diff --git a/pages/index/myPublish.vue b/pages/index/myPublish.vue
index b697274..2531d67 100644
--- a/pages/index/myPublish.vue
+++ b/pages/index/myPublish.vue
@@ -2,6 +2,13 @@
 	<view class="page">
 		<!-- 列表 -->
 		<z-paging  ref="paging"  v-model="list" @query="queryList" empty-view-text="暂无数据！">
+			<template #top>
+				<!-- 搜索抓取懂车帝 -->
+				<view class="dcd-search">
+					<u-search v-model="urls" placeholder="请输入抓取链接" :show-action="false" shape="round"></u-search>
+					<view class="bind-btn" @tap.stop="onBindByName">抓取</view>
+				</view>
+			</template>	
 			<!-- <uni-nav-bar leftText=" " :fixed="true" :border="false" color="#fff" backgroundColor="#3F435B" :statusBar="true" title="首页"></uni-nav-bar> -->
 			<!-- 顶部：标题 + 搜索（不想要搜索可直接删除这一块） -->
 			<view class="page-head">
@@ -15,7 +22,12 @@
 					  @search="onSearch"
 					  @clear="onSearch"
 					/>
+					<view class="statussearch" @click="show=true">
+						<text class="year-text">{{status_name || '状态'}}</text>
+						<u-icon name="arrow-down" size="14" color="#999"></u-icon>
+					</view>
 				</view>
+				<u-picker :show="show" :columns="columns" keyName="label" @confirm="onstatus" @cancel="show = false"></u-picker>
 			</view>
 			<view class="list-wrap">
 				<uni-swipe-action-item
@@ -26,20 +38,121 @@
 				>
 					<CarCard
 						:item="item"
+						:ismy="true"
 						@pdfchange="onSearch"
 						@request-price="onRequestPrice"
+						@restchange="onSearch"
 					/>
 				</uni-swipe-action-item>
 			</view>
 		</z-paging>
 		<uni-popup ref="inputDialog" type="dialog">
-		  <uni-popup-dialog
-		    mode="input"
-		    title="请输入价格"
-		    :value="priceDialogValue"
-		    placeholder="请输入车辆价格"
-		    @confirm="dialogInputConfirm"
-		  />
+		  <view class="price-dialog">
+			<view class="pd-title">设置价格</view>
+			<view class="pd-row">
+				<view class="pd-label">贸易条款</view>
+				<view class="pd-price-line">
+					<uni-data-select
+					  v-model="priceForm.trade_term"
+					  class="tradeTerm"
+					  :localdata="tradeTermOptions"
+					  :clear="false"
+					/>
+				</view>
+			</view>
+		    <view class="pd-row">
+				<view class="pd-label">价格</view>
+				<view class="pd-price-line">
+					<view class="pd-input-suffix-wrap">
+					  <input
+						class="pd-input pd-input-price pd-input-with-suffix"
+						v-model="priceForm.price"
+						type="number"
+						inputmode="decimal"
+						placeholder="请输入数字"
+						@input="onPriceInput"
+					  />
+					  <!-- 币种下拉：放在输入框内部右侧（无边框） -->
+					  <view class="pd-currency-suffix">
+						<uni-data-select
+						  class="pd-currency-select-suffix"
+						  v-model="priceForm.currency"
+						  :localdata="currencyOptions"
+						  :clear="false"
+						/>
+					  </view>
+					</view>
+				</view>
+			</view>
+		
+		    <!-- 语言单选 -->
+		    <view class="pd-row">
+		      <view class="pd-label">语言</view>
+				<radio-group class="pd-radio-group" @change="onLangChange">
+				  <label class="pd-radio" v-for="l in langOptions" :key="l.value">
+					<radio :value="l.value" :checked="priceForm.lang === l.value" />
+					<text class="pd-radio-text">{{ l.text }}</text>
+				  </label>
+				</radio-group>
+		    </view>
+		
+		    <!-- 操作按钮 -->
+		    <view class="pd-actions">
+		      <view class="pd-btn pd-cancel" @tap="closePriceDialog">取消</view>
+		      <view class="pd-btn pd-confirm" @tap="confirmPriceDialog">确认</view>
+		    </view>
+		  </view>
+		</uni-popup>
+		<!-- 抓取信息弹出层 -->
+		<uni-popup ref="crawlDialog" type="dialog">
+			<view class="crawl-dialog">
+				<view class="crawl-title">抓取信息</view>
+				<view class="crawl-content" v-if="crawlLoading">
+					<view class="crawl-loading">正在抓取中...</view>
+				</view>
+				<view class="crawl-content" v-else-if="crawlData">
+					<view class="crawl-item" v-if="crawlData.product_name">
+						<view class="crawl-label">车辆名称</view>
+						<view class="crawl-value">{{ crawlData.product_name }}</view>
+					</view>
+					<view class="crawl-item" v-if="crawlData.source_place">
+						<view class="crawl-label">车源地</view>
+						<view class="crawl-value">{{ crawlData.source_place }}</view>
+					</view>
+					<view class="crawl-item" v-if="crawlData.body_color">
+						<view class="crawl-label">车身颜色</view>
+						<view class="crawl-value">{{ crawlData.body_color }}</view>
+					</view>
+					<view class="crawl-item" v-if="crawlData.plate_time">
+						<view class="crawl-label">上牌时间</view>
+						<view class="crawl-value">{{ crawlData.plate_time }}</view>
+					</view>
+					<view class="crawl-item" v-if="crawlData.mileage">
+						<view class="crawl-label">里程</view>
+						<view class="crawl-value">{{ crawlData.mileage }}</view>
+					</view>
+					<view class="crawl-item" v-if="crawlData.price">
+						<view class="crawl-label">价格</view>
+						<view class="crawl-value">{{ crawlData.price }}</view>
+					</view>
+					<view class="crawl-item" v-if="crawlData.image_pull && crawlData.image_pull.length > 0">
+						<view class="crawl-label">图片</view>
+						<view class="crawl-images">
+							<image 
+								v-for="(img, idx) in crawlData.image_pull" 
+								:key="idx" 
+								:src="img" 
+								mode="aspectFill"
+								class="crawl-image"
+							/>
+						</view>
+					</view>
+				</view>
+				<view class="crawl-actions">
+					<view class="crawl-btn crawl-confirm1" @tap="closeCrawlDialog">关闭</view>
+					<view class="crawl-btn crawl-confirm" @tap="saveCrawlDialog">保存</view>
+				</view>
+			</view>
 		</uni-popup>
 	</view>
 </template>
@@ -54,6 +167,24 @@
 		},
 		data() {
 			return {
+				urls:'',
+				show: false,
+				status_id:1,
+				status_name:'',
+				crawlData: null,
+				crawlLoading: false,
+				columns: [
+					[{
+						label: '正常',
+						id: 1
+					}, {
+						label: '已售出',
+						id: 2
+					}, {
+						label: '已归档',
+						id: 3
+					}]
+				],
 				priceDialogItem: null,
 				priceDialogIndex: -1,
 				priceDialogValue: '',
@@ -62,12 +193,6 @@
 						style: {
 							backgroundColor: '#007aff'
 						}
-					},
-					{
-						text: '删除',
-						style: {
-							backgroundColor: '#F56C6C'
-						}
 					}
 				],
 				keyword: '',
@@ -75,7 +200,35 @@
 				pageSize: 10,
 				loading: false,
 				finished: false,
-				list: []
+				list: [],
+				priceForm: {
+					trade_term:'',
+					price: "",        // 只存数字字符串
+					currency: "USD",  // USD | RUB | AED | EUR
+					lang: "en"        // en | ru | es | ar
+				},
+				currencyOptions: [
+				  { value: "USD", text: "美元" },
+				  { value: "CNY", text: "人民币" },
+				  { value: "RUB", text: "卢布" },
+				  { value: "AED", text: "迪拉姆" },
+				  { value: "EUR", text: "欧元" }
+				],
+				langOptions: [
+					{ text: "英语", value: "en" },
+					{ text: "俄语", value: "ru" },
+					{ text: "西班牙语", value: "es" },
+					{ text: "阿拉伯语", value: "ar" }
+				],
+				tradeTermOptions: [
+				  { value: "FOB", text: "FOB" },
+				  { value: "CIF", text: "CIF" },
+				  { value: "EXW", text: "EXW" },
+				  { value: "DDP", text: "DDP" },
+				  { value: "CIP", text: "CIP" },
+				  { value: "FCA", text: "FCA" },
+				  { value: "CFR", text: "CFR" }
+				]
 			}
 		},
 		onLoad() {
@@ -187,6 +340,12 @@
 				this.priceDialogItem = payload && payload.item ? payload.item : null
 				this.priceDialogIndex = payload && typeof payload.index === 'number' ? payload.index : -1
 				this.priceDialogValue = ''
+				this.priceForm = {
+					trade_term:'',
+					price:"",
+					currency: "USD",
+					lang: "en"
+				}
 				this.$nextTick(() => {
 					this.$refs.inputDialog && this.$refs.inputDialog.open()
 				})
@@ -217,29 +376,77 @@
 					}
 				})
 			},
+			closePriceDialog() {
+			  this.$refs.inputDialog.close()
+			},
+					
+			// 只允许数字 + 可选1个小数点（你要“纯整数”也行，我后面给你一行改法）
+			onPriceInput(e) {
+			  let v = (e.detail && e.detail.value) ? String(e.detail.value) : String(this.priceForm.price || "")
+					
+			  // 过滤掉非数字和点
+			  v = v.replace(/[^\d.]/g, "")
+					
+			  // 只保留第一个小数点
+			  const parts = v.split(".")
+			  if (parts.length > 2) {
+				v = parts[0] + "." + parts.slice(1).join("")
+			  }
+					
+			  // 去掉开头多余 0（保留 0.xxx）
+			  v = v.replace(/^0+(\d)/, "$1")
+			  if (v.startsWith(".")) v = "0" + v
+					
+			  this.priceForm.price = v
+			},
+					
+			onCurrencyPickerChange(e) {
+			  const idx = Number(e.detail.value || 0)
+			  this.currencyIndex = idx
+			  this.priceForm.currency = this.currencyOptions[idx]?.value || "USD"
+			},
+					
+			onLangChange(e) {
+			  this.priceForm.lang = e.detail.value
+			},
+					
+			confirmPriceDialog() {
+				if (!this.priceForm.trade_term) {
+					return uni.showToast({ title: "请选择贸易条款", icon: "none" })
+				}
+				  // 校验
+				if (!this.priceForm.price) {
+					return uni.showToast({ title: "请输入价格", icon: "none" })
+				}
+						
+				const payload = {
+					trade_term:this.priceForm.trade_term,  
+					price: this.priceForm.price,         // 数字字符串
+					currency: this.priceForm.currency,   // USD/RUB/AED/EUR
+					lang: this.priceForm.lang            // en/ru/es/ar
+				}
+				console.log(payload)
+				this.closePriceDialog()
+				this.dialogInputConfirm(payload)
+			},
 			dialogInputConfirm(val) {
 				const item = this.priceDialogItem
 				const index = this.priceDialogIndex
-				const price = String(val || '').trim()
 			
 				if (!item) return
-				if (!price) {
+				if (!val.price) {
 					uni.showToast({ title: '请输入价格', icon: 'none' })
 					return
 				}
-				if (isNaN(price) || Number(price) <= 0) {
-					uni.showToast({ title: '请输入有效的价格', icon: 'none' })
-					return
-				}
-			
 				request({
 					url: 'common/usedcar/produce/pdf',
 					method: 'get',
-					data: { id: item.id, price }
+					data: { id: item.id, price:val.price,currency:val.currency,lang:val.lang,trade_term:val.trade_term }
 				}).then(res => {
 					if (res.data.code == 200) {
 						// 通知刷新列表（你原来就是靠这个事件刷新）
 						this.onSearch()
+			
 						this.downloadpdf(item)
 					} else {
 						uni.showToast({ title: res.data.msg || '生成失败', icon: 'none' })
@@ -257,15 +464,15 @@
 			    }, 300)
 			},
 			onSearch() {
-				this.queryList(this.page,this.pageSize)
+				this.$refs.paging && this.$refs.paging.reload()
 			},
 			queryList(pageNo, pageSize, from) {
 				this.loading = true;
 				var that = this;
 				const params = {
 					current:pageNo,
-					status:1,
-					size:10
+					status:this.status_id,
+					size:pageSize
 				};
 				params.keyword = this.keyword;
 				params.scene = 'self';
@@ -283,49 +490,167 @@
 					//
 				})
 			},
+			onstatus(e){
+				if (e.value && e.value[0]) {
+					const selectedItem = typeof e.value[0] === 'object' ? e.value[0] : { value: e.value[0], label: e.value[0].toString() };
+					this.status_name = selectedItem.label;
+					this.status_id = selectedItem.id;
+					this.show = false;
+					this.$refs.paging && this.$refs.paging.reload()
+				}
+			},
 			swipeClick(e,item){
 				let {
 					content
 				} = e;
-				if (content.text === '删除') {
-					uni.showModal({
-						title: '提示',
-						content: '是否删除',
-						success: res => {
-							if (res.confirm) {
-								request({
-									url:'common/usedcar/destroy',
-									method:'post',
-									data: {id:item.id}
-								}).then(res => {
-									uni.showToast({
-										title: res.data.message,
-										icon: 'none'
-									});
-									this.queryList()
-								})
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				} else {
-					const id = item.id
-					uni.navigateTo({
-						url: `/pages/index/publishedit?id=${id}`
-					})
+				const id = item.id
+				uni.navigateTo({
+					url: `/pages/index/publishedit?id=${id}`
+				})
+				// if (content.text === '删除') {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: '是否删除',
+				// 		success: res => {
+				// 			if (res.confirm) {
+				// 				request({
+				// 					url:'common/usedcar/destroy',
+				// 					method:'post',
+				// 					data: {id:item.id}
+				// 				}).then(res => {
+				// 					uni.showToast({
+				// 						title: res.data.message,
+				// 						icon: 'none'
+				// 					});
+				// 					this.queryList()
+				// 				})
+				// 			} else if (res.cancel) {
+				// 				console.log('用户点击取消');
+				// 			}
+				// 		}
+				// 	});
+				// } else {
+				// 	const id = item.id
+				// 	uni.navigateTo({
+				// 		url: `/pages/index/publishedit?id=${id}`
+				// 	})
+				// }
+			},
+			onBindByName(){
+				if (!this.urls || !this.urls.trim()) {
+					uni.showToast({ title: '请输入抓取链接', icon: 'none' })
+					return
 				}
+				
+				this.crawlLoading = true
+				this.crawlData = null
+				this.$nextTick(() => {
+					this.$refs.crawlDialog && this.$refs.crawlDialog.open()
+				})
+				
+				request({
+					url:'common/usedcar/url_crawl',
+					method:'get',
+					data: {url:this.urls}
+				}).then(res => {
+					this.crawlLoading = false
+					if (res.data.code == 200) {
+						this.crawlData = res.data.data || res.data
+						uni.showToast({ title: '抓取成功', icon: 'success' })
+					} else {
+						uni.showToast({ title: res.data.msg || '抓取失败', icon: 'none' })
+						this.crawlData = null
+					}
+				}).catch(err => {
+					this.crawlLoading = false
+					this.crawlData = null
+					console.error('抓取失败', err)
+					uni.showToast({ title: '抓取失败', icon: 'none' })
+				})
+			},
+			closeCrawlDialog() {
+				this.$refs.crawlDialog && this.$refs.crawlDialog.close()
+				this.crawlData = null
+				this.crawlLoading = false
+			},
+			saveCrawlDialog(){
+				function formatCnYearMonth(str) {
+				  const match = str.match(/(\d{4})年(\d{1,2})月/)
+				  if (!match) return str
+				
+				  const year = match[1]
+				  const month = match[2].padStart(2, '0')
+				
+				  return `${year}-${month}-01`
+				}
+				const payload = {
+				    ...this.crawlData,
+					plate_time:formatCnYearMonth(this.crawlData.plate_time),
+				    // images 数组 => "url1,url2,url3"
+				    images: (this.crawlData.images || [])
+				      .map(s => String(s || '').trim())
+				      .filter(Boolean)
+				      .join(',')
+				}
+				request({
+					url:'common/usedcar/store',
+					method:'post',
+					data:payload
+				}).then(res => {
+					this.$refs.crawlDialog && this.$refs.crawlDialog.close()
+					this.crawlData = null
+					this.crawlLoading = false
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none'
+					});
+					setTimeout(() => {
+						this.$refs.paging && this.$refs.paging.reload()
+					}, 1000);
+					
+				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.tradeTerm{
+		border: 1px solid #eae9e9;
+		border-radius: 6px;
+	}
 	.page {
 		min-height: 100vh;
 		background: #f4f6f8;
 	}
 
+	/* #ifdef H5 */
+	.page {
+		padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
+	}
+	/* #endif */
+	.dcd-search{
+		display: flex;
+		align-items: center;
+		gap: 12px;
+		padding: 12px;
+		background: #fff;
+	}
+	
+	.bind-btn {
+		padding: 8px 24px;
+		background: #3F435B;
+		color: #fff;
+		border-radius: 8px;
+		font-size: 28rpx;
+		white-space: nowrap;
+		cursor: pointer;
+	}
+	
+	.bind-btn:active {
+		opacity: 0.8;
+	}
+
 	.page-head {
 		position: fixed;
 		width: 100%;
@@ -336,12 +661,23 @@
 	}
 
 	.head-search {
+		display: flex;
+		align-items: center;
+		gap: 10px;
 		background: rgba(255, 255, 255, 1);
 		border-radius: 18rpx;
 		padding: 20rpx 10px;
 		box-shadow: 0 10rpx 28rpx rgba(0, 0, 0, 0.06);
 	}
-
+	.statussearch{
+		border: 1px solid #eae9e9;
+		border-radius: 4px;
+		padding: 4px 8px;
+		font-size: 24rpx;
+		display: flex;
+		align-items: center;
+		gap: 6px;
+	}
 	.list-wrap {
 		padding: 18rpx 24rpx 40rpx;
 	}
@@ -349,4 +685,223 @@
 	.loadmore {
 		padding: 18rpx 0 6rpx;
 	}
+	.price-dialog{
+	  width: 640rpx;
+	  background: #fff;
+	  border-radius: 24rpx;
+	  padding: 28rpx;
+	}
+	
+	.pd-title{
+	  font-size: 34rpx;
+	  font-weight: 600;
+	  color: #111;
+	  margin-bottom: 20rpx;
+	  text-align: center;
+	}
+	
+	.pd-row{
+	  display:flex;
+	  align-items:center;
+	  margin-top: 40rpx;
+	}
+	
+	.pd-row-col{
+	  flex-direction: column;
+	  align-items: flex-start;
+	}
+	
+	.pd-label{
+	  width: 120rpx;
+	  font-size: 28rpx;
+	  color:#333;
+	}
+	
+	.pd-input{
+	  flex:1;
+	  height: 66rpx;
+	  border: 1px solid #eee;
+	  border-radius: 16rpx;
+	  padding: 0 18rpx;
+	  font-size: 30rpx;
+	}
+	.pd-input-suffix-wrap{
+	  position: relative;
+	  flex: 1;
+	}
+	
+	.pd-input-with-suffix{
+	  padding-right: 180rpx; /* 给右侧币种留空间 */
+	}
+	
+	.pd-currency-suffix{
+	  position: absolute;
+	  right: 14rpx;
+	  top: 50%;
+	  transform: translateY(-50%);
+	  width: 140rpx;
+	  height: 80rpx;
+	  display: flex;
+	  align-items: center;
+	  justify-content: flex-end;
+	}
+	::v-deep .uni-select{
+		border: none !important;
+	}
+	.pd-radio-group{
+	  display:flex;
+	  flex-wrap: wrap;
+	  gap: 16rpx 22rpx;
+	  margin-top: 12rpx;
+	}
+	
+	.pd-radio{
+	  display:flex;
+	  align-items:center;
+	}
+	
+	.pd-radio-text{
+	  margin-left: 10rpx;
+	  font-size: 26rpx;
+	  color:#333;
+	}
+	
+	.pd-actions{
+	  display:flex;
+	  gap: 18rpx;
+	  margin-top: 40rpx;
+	}
+	
+	.pd-btn{
+	  flex:1;
+	  height: 84rpx;
+	  border-radius: 18rpx;
+	  display:flex;
+	  align-items:center;
+	  justify-content:center;
+	  font-size: 30rpx;
+	}
+	
+	.pd-cancel{
+	  background:#f5f5f5;
+	  color:#333;
+	}
+	
+	.pd-confirm{
+	  background:#3F435B; /* 你喜欢绿色风格 */
+	  color:#fff;
+	  font-weight:600;
+	}
+	.pd-price-line{
+	  flex: 1;
+	  display: flex;
+	  align-items: center;
+	  gap: 16rpx;
+	}
+	
+	.pd-input-price{
+	  flex: 1;
+	  min-width: 240rpx;
+	}
+	
+	/* 抓取信息弹出层样式 */
+	.crawl-dialog {
+		width: 680rpx;
+		max-height: 80vh;
+		background: #fff;
+		border-radius: 24rpx;
+		padding: 28rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.crawl-title {
+		font-size: 36rpx;
+		font-weight: 600;
+		color: #111;
+		margin-bottom: 30rpx;
+		text-align: center;
+	}
+	
+	.crawl-content {
+		flex: 1;
+		overflow-y: auto;
+		max-height: 60vh;
+	}
+	
+	.crawl-loading {
+		text-align: center;
+		padding: 60rpx 0;
+		font-size: 28rpx;
+		color: #999;
+	}
+	
+	.crawl-item {
+		margin-bottom: 24rpx;
+		padding-bottom: 24rpx;
+		border-bottom: 1px solid #f0f0f0;
+	}
+	
+	.crawl-item:last-child {
+		border-bottom: none;
+		margin-bottom: 0;
+		padding-bottom: 0;
+	}
+	
+	.crawl-label {
+		font-size: 26rpx;
+		color: #999;
+		margin-bottom: 12rpx;
+	}
+	
+	.crawl-value {
+		font-size: 30rpx;
+		color: #333;
+		word-break: break-all;
+		line-height: 1.6;
+	}
+	
+	.crawl-images {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12rpx;
+		margin-top: 12rpx;
+	}
+	
+	.crawl-image {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 12rpx;
+		background: #f5f5f5;
+	}
+	
+	.crawl-actions {
+		display: flex;
+		gap: 18rpx;
+		margin-top: 30rpx;
+		padding-top: 30rpx;
+		border-top: 1px solid #f0f0f0;
+	}
+	
+	.crawl-btn {
+		flex: 1;
+		height: 84rpx;
+		border-radius: 18rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+	}
+	.crawl-confirm1 {
+		border:1px solid  #3F435B;
+		font-weight: 600;
+	}
+	.crawl-confirm {
+		background: #3F435B;
+		color: #fff;
+		font-weight: 600;
+	}
 </style>
+
diff --git a/pages/index/publish.vue b/pages/index/publish.vue
index 42412f2..fb0a3cc 100644
--- a/pages/index/publish.vue
+++ b/pages/index/publish.vue
@@ -176,11 +176,19 @@
 				</view>
 			</view>
 		</view>
+
+		<!-- #ifdef H5 -->
+		<CustomTabBar class="h5-custom-tabbar" />
+		<!-- #endif -->
 	</view>
 </template>
 <script>
 	import { request,showToast } from '@/api/apiT.js'
+	import CustomTabBar from '@/custom-tab-bar/index.vue'
 	export default {
+		components:{
+			CustomTabBar
+		},
 		data() {
 			return {
 				maxMedia:20,
@@ -508,6 +516,11 @@
 	.pages{
 		max-width: 650px;
 	}
+	/* #ifdef H5 */
+	.pages{
+		padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
+	}
+	/* #endif */
 	.uniui-right{
 		position: absolute;
 		top: 2px;
diff --git a/pages/index/ywPublish.vue b/pages/index/ywPublish.vue
new file mode 100644
index 0000000..87b6899
--- /dev/null
+++ b/pages/index/ywPublish.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/login/feishu-callback.vue b/pages/login/feishu-callback.vue
index ff00e5a..717de38 100644
--- a/pages/login/feishu-callback.vue
+++ b/pages/login/feishu-callback.vue
@@ -102,6 +102,16 @@
 
 					uni.setStorageSync('token', token)
 
+					// ===== 角色/权限：用于动态 TabBar =====
+					// 兼容多种后端返回结构：role / user.role / userInfo.role
+					const role = res?.data?.data?.role
+					if (role) {
+						// 1) 给 tabbar.js 直接读取
+						uni.setStorageSync('userRole', role)
+						// 通知自定义 TabBar 立刻刷新
+						uni.$emit && uni.$emit('userRoleChanged')
+					}
+
 					this.title = '登录成功'
 					this.desc = '正在进入页面'
 
diff --git a/static/image/mine/erwm.png b/static/image/mine/erwm.png
new file mode 100644
index 0000000000000000000000000000000000000000..dff4b0ed1383ebc21ec2262fdfa28820e4d5d6db
GIT binary patch
literal 1712
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

literal 0
HcmV?d00001

diff --git a/static/image/user.png b/static/image/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..479aa951211c58b5cae8fe93dfa1766c9e582361
GIT binary patch
literal 4083
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

literal 0
HcmV?d00001