From c2192303fe396164b82e7ffc54c86ae8e8eead47 Mon Sep 17 00:00:00 2001
From: fy <>
Date: Mon, 19 Jan 2026 20:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                |  12 +
 pages/asset/asset.vue     | 439 ++++++++++-----------
 pages/expired/expired.vue | 796 ++++++++++++++++++++++++++++++++++++++
 pages/product/product.vue |  36 +-
 static/Mask group.png     | Bin 0 -> 675 bytes
 5 files changed, 1047 insertions(+), 236 deletions(-)
 create mode 100644 pages/expired/expired.vue
 create mode 100644 static/Mask group.png

diff --git a/pages.json b/pages.json
index ee695a2..394eafb 100644
--- a/pages.json
+++ b/pages.json
@@ -143,6 +143,18 @@
 		"style": {
 			"navigationBarTitleText": ""
 		}
+	},
+	{
+		"path": "pages/expired/expired",
+		"style": {
+			"navigationBarTitleText": ""
+		}
+	},
+	{
+		"path": "pages/expired/expired",
+		"style": {
+			"navigationBarTitleText": ""
+		}
 	}
 ],
   "tabBar": {
diff --git a/pages/asset/asset.vue b/pages/asset/asset.vue
index de9fad8..75097d2 100644
--- a/pages/asset/asset.vue
+++ b/pages/asset/asset.vue
@@ -1,284 +1,275 @@
 <template>
-  <view class="page">
-    <!-- 顶部资产卡片 -->
+  <view class="page-wrapper">
+
+
+    <!-- 导航栏 -->
+    <view class="navbar">
+      <view class="nav-back" @click="goBack">
+        <!-- <text class="back-icon">＜</text> -->
+      </view>
+      <view class="nav-title">收入资产</view>
+      <view class="nav-refresh" @click="refresh">
+        <text class="refresh-icon">⟳</text>
+      </view>
+    </view>
+
+    <!-- 资产卡片 -->
     <view class="asset-card">
-      <view class="asset-title">我的资产</view>
-      <view class="asset-amount">¥0.00</view>
-      
-      <view class="asset-details">
-        <view class="detail-item">
-          <view class="label">可提现</view>
-          <view class="value">¥0.00</view>
+      <view class="card-header">
+        <text class="card-title">我的资产</text>
+      </view>
+      <view class="asset-amount">0.00</view>
+      <view class="asset-stats">
+        <view class="stat-item">
+          <text class="stat-label">可提现</text>
+          <text class="stat-value">0.00</text>
+        </view>
+        <view class="stat-item">
+          <text class="stat-label">待结算</text>
+          <text class="stat-value">0.00</text>
+          <text class="stat-tip">次日可提现</text>
+        </view>
+      </view>
+      <view class="card-actions">
+        <button class="action-btn recharge-btn">充值</button>
+        <button class="action-btn withdraw-btn">提现到银行卡</button>
+      </view>
+    </view>
+
+    <!-- 资金明细 -->
+    <view class="fund-section">
+      <view class="section-title">资金明细</view>
+      <view class="detail-list">
+        <view class="detail-item active">
+          <text class="detail-text">可提现</text>
+          <text class="detail-amount">￥0.00 ></text>
         </view>
-        <view class="divider"></view>
         <view class="detail-item">
-          <view class="label">待结算</view>
-          <view class="value">¥0.00</view>
-          <view class="hint">次日可提现</view>
+          <text class="detail-text">待结算（元）</text>
+          <text class="detail-amount">￥0.00 ></text>
+        </view>
+        <view class="detail-item">
+          <text class="detail-text">已提现（元）</text>
+          <text class="detail-amount">￥0.00 ></text>
+        </view>
+        <view class="detail-item">
+          <text class="detail-text">现金支付（元）</text>
+          <text class="detail-amount">￥0.00 ></text>
         </view>
       </view>
     </view>
 
-    <!-- 操作按钮 -->
-    <view class="action-buttons">
-      <button class="btn primary" @tap="handleRecharge">充值</button>
-      <button class="btn outline" @tap="handleWithdraw">提现到银行卡</button>
-    </view>
-
-    <!-- 资金明细标题 -->
-    <view class="section-title">资金明细</view>
-
-    <!-- 明细列表 -->
-    <view class="detail-list">
-      <view class="list-item" @tap="goToDetail('withdrawable')">
-        <view class="item-left">
-          <view class="item-icon withdrawable">可提现</view>
-          <view class="item-label">¥0.00</view>
-        </view>
-        <view class="item-arrow">></view>
-      </view>
-
-      <view class="list-item active" @tap="goToDetail('pending')">
-        <view class="item-left">
-          <view class="item-icon pending">待结算(元)</view>
-          <view class="item-label">¥0.00</view>
-        </view>
-        <view class="item-arrow">✓</view>
-      </view>
-
-      <view class="list-item" @tap="goToDetail('withdrawn')">
-        <view class="item-left">
-          <view class="item-icon withdrawn">已提现(元)</view>
-          <view class="item-label">¥0.00</view>
-        </view>
-        <view class="item-arrow">></view>
-      </view>
-
-      <view class="list-item" @tap="goToDetail('cash')">
-        <view class="item-left">
-          <view class="item-icon cash">现金支付(元)</view>
-          <view class="item-label">¥0.00</view>
-        </view>
-        <view class="item-arrow">></view>
-      </view>
-
-      <view class="list-item" @tap="goToBankCard">
-        <view class="item-left">
-          <view class="item-icon bank">我的银行卡</view>
-          <view class="item-label">未绑定</view>
-        </view>
-        <view class="item-arrow">></view>
+    <!-- 银行卡区域 -->
+    <view class="bank-section">
+      <view class="bank-item">
+        <text class="bank-text">我的银行卡</text>
+        <text class="bank-status">未绑定</text>
       </view>
     </view>
 
     <!-- 常见问题 -->
     <view class="faq-section">
-      <view class="faq-title">常见问题</view>
-      <!-- 这里可以展开常见问题列表 -->
+      <text class="faq-text">常见问题</text>
     </view>
   </view>
 </template>
 
 <script setup>
-const handleRecharge = () => {
-  uni.showToast({
-    title: '充值功能',
-    icon: 'none'
-  })
+const goBack = () => {
+  uni.navigateBack()
 }
-
-const handleWithdraw = () => {
+const refresh = () => {
   uni.showToast({
-    title: '提现功能',
-    icon: 'none'
-  })
-}
-
-const goToDetail = (type) => {
-  uni.showToast({
-    title: `查看${type}明细`,
-    icon: 'none'
-  })
-}
-
-const goToBankCard = () => {
-  uni.showToast({
-    title: '前往绑定银行卡',
+    title: '刷新成功',
     icon: 'none'
   })
 }
 </script>
 
-<style lang="scss" scoped>
-.page {
-  padding: 20rpx 30rpx;
-  background-color: #f8f8f8;
+<style scoped>
+/* 全局重置与基础样式 */
+page {
+  background-color: #f5f5f5;
+  font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.page-wrapper {
   min-height: 100vh;
+  background-color: #f5f5f5;
 }
 
-// 资产卡片
-.asset-card {
-  background: linear-gradient(135deg, #4a6ee0, #6a8eff);
-  border-radius: 20rpx;
-  padding: 40rpx 30rpx;
-  color: #fff;
-  margin-bottom: 40rpx;
-  box-shadow: 0 10rpx 20rpx rgba(74, 110, 224, 0.2);
-}
-
-.asset-title {
-  font-size: 28rpx;
-  opacity: 0.9;
-  margin-bottom: 20rpx;
-}
-
-.asset-amount {
-  font-size: 60rpx;
-  font-weight: bold;
-  margin-bottom: 50rpx;
-}
-
-.asset-details {
+/* 状态栏 */
+.status-bar {
   display: flex;
   justify-content: space-between;
+  padding: 10rpx 20rpx;
+  font-size: 24rpx;
+  color: #000;
+  background-color: #f5f5f5;
+}
+.status-icons {
+  display: flex;
   align-items: center;
+  gap: 4rpx;
+}
+.icon {
+  font-size: 20rpx;
 }
 
-.detail-item {
-  flex: 1;
+/* 导航栏 */
+.navbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx 30rpx;
+  background-color: #f5f5f5;
+  border-bottom: 1rpx solid #e5e5e5;
+}
+.nav-back {
+  width: 60rpx;
+}
+.back-icon {
+  font-size: 32rpx;
+  color: #333;
+  font-weight: 500;
+}
+.nav-title {
+  font-size: 34rpx;
+  font-weight: 500;
+  color: #333;
+}
+.nav-refresh {
+  width: 60rpx;
+  text-align: right;
+}
+.refresh-icon {
+  font-size: 28rpx;
+  color: #333;
+}
+
+/* 资产卡片 */
+.asset-card {
+  margin: 20rpx 30rpx;
+  padding: 40rpx 30rpx 30rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
   text-align: center;
 }
-
-.label {
+.card-header {
+  margin-bottom: 20rpx;
+}
+.card-title {
+  font-size: 28rpx;
+  color: #999;
+}
+.asset-amount {
+  font-size: 72rpx;
+  font-weight: 700;
+  color: #e63946;
+  margin-bottom: 40rpx;
+}
+.asset-stats {
+  display: flex;
+  justify-content: space-around;
+  margin-bottom: 40rpx;
+}
+.stat-item {
+  text-align: center;
+}
+.stat-label {
+  display: block;
   font-size: 26rpx;
-  opacity: 0.85;
-  margin-bottom: 10rpx;
+  color: #999;
+  margin-bottom: 8rpx;
 }
-
-.value {
-  font-size: 36rpx;
-  font-weight: bold;
+.stat-value {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #333;
 }
-
-.hint {
-  font-size: 24rpx;
-  opacity: 0.7;
-  margin-top: 8rpx;
+.stat-tip {
+  display: block;
+  font-size: 22rpx;
+  color: #999;
+  margin-top: 4rpx;
 }
-
-.divider {
-  width: 2rpx;
-  height: 80rpx;
-  background-color: rgba(255, 255, 255, 0.3);
-}
-
-// 操作按钮
-.action-buttons {
+.card-actions {
   display: flex;
   gap: 20rpx;
-  margin-bottom: 50rpx;
+}
+.action-btn {
+  flex: 1;
+  height: 80rpx;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  border: none;
+  background-color: #e9e9e9;
+  color: #999;
+}
+.withdraw-btn {
+  background-color: #1677ff;
+  color: #fff;
 }
 
-.btn {
-  flex: 1;
-  height: 90rpx;
-  border-radius: 45rpx;
+/* 资金明细 */
+.fund-section {
+  margin: 0 30rpx 30rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+.section-title {
+  padding: 30rpx;
   font-size: 30rpx;
   font-weight: 500;
-  border: none;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  
-  &.primary {
-    background-color: #4a6ee0;
-    color: #fff;
-  }
-  
-  &.outline {
-    background-color: transparent;
-    border: 2rpx solid #4a6ee0;
-    color: #4a6ee0;
-  }
-}
-
-// 分区标题
-.section-title {
-  font-size: 32rpx;
-  font-weight: bold;
   color: #333;
-  margin-bottom: 30rpx;
-  padding-left: 10rpx;
-}
-
-// 明细列表
-.detail-list {
-  background-color: #fff;
-  border-radius: 20rpx;
-  padding: 0 30rpx;
-  margin-bottom: 40rpx;
-  box-shadow: 0 5rpx 15rpx rgba(0, 0, 0, 0.03);
-}
-
-.list-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 30rpx 0;
   border-bottom: 1rpx solid #f0f0f0;
-  
-  &:last-child {
-    border-bottom: none;
-  }
-  
-  &.active {
-    .item-icon {
-      color: #4a6ee0;
-    }
-    .item-label {
-      color: #4a6ee0;
-    }
-  }
 }
-
-.item-left {
+.detail-list {
+  padding: 0;
+}
+.detail-item {
   display: flex;
   align-items: center;
-  gap: 20rpx;
-}
-
-.item-icon {
-  font-size: 30rpx;
-  color: #333;
-  
-  &.withdrawable::before { content: "💳 "; }
-  &.pending::before { content: "⏳ "; }
-  &.withdrawn::before { content: "💰 "; }
-  &.cash::before { content: "💵 "; }
-  &.bank::before { content: "🏦 "; }
-}
-
-.item-label {
+  justify-content: space-between;
+  padding: 30rpx;
   font-size: 28rpx;
-  color: #666;
+  color: #333;
+  border-bottom: 1rpx solid #f5f5f5;
 }
-
-.item-arrow {
-  font-size: 32rpx;
+.detail-item.active {
+  /* background-color: #f0f8ff; */
+  /* color: #1677ff; */
+}
+.detail-amount {
   color: #999;
 }
 
-// 常见问题
-.faq-section {
+/* 银行卡区域 */
+.bank-section {
+  margin: 0 30rpx 30rpx;
   background-color: #fff;
-  border-radius: 20rpx;
-  padding: 30rpx;
-  box-shadow: 0 5rpx 15rpx rgba(0, 0, 0, 0.03);
+  border-radius: 16rpx;
 }
-
-.faq-title {
-  font-size: 32rpx;
-  font-weight: bold;
+.bank-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 30rpx;
+  font-size: 28rpx;
   color: #333;
 }
+.bank-status {
+  color: #999;
+}
+
+/* 常见问题 */
+.faq-section {
+  text-align: center;
+  padding: 20rpx;
+}
+.faq-text {
+  font-size: 26rpx;
+  color: #1677ff;
+}
 </style>
\ No newline at end of file
diff --git a/pages/expired/expired.vue b/pages/expired/expired.vue
new file mode 100644
index 0000000..a7fd2fa
--- /dev/null
+++ b/pages/expired/expired.vue
@@ -0,0 +1,796 @@
+<template>
+	<view class="container">
+		<!-- 顶部状态栏/时间 -->
+		<view class="status-bar">
+			<text class="time">9:41</text>
+		</view>
+		
+		<!-- 搜索栏 -->
+		<view class="search-bar">
+			<view class="search-input">
+				<uni-icons type="search" size="18" color="#999"></uni-icons>
+				<input 
+					type="text" 
+					placeholder="搜索商品名称、条码" 
+					placeholder-class="placeholder"
+					v-model="searchText"
+					@confirm="onSearch"
+				/>
+				<uni-icons type="scan" size="18" color="#999"></uni-icons>
+			</view>
+		</view>
+		
+		<!-- 筛选标签 -->
+		<view class="filter-tabs">
+			<scroll-view class="tabs-scroll" scroll-x="true">
+				<view 
+					class="tab-item"
+					:class="{ active: currentTab === 'all' }"
+					@tap="switchTab('all')"
+				>
+					全部
+				</view>
+				<view 
+						class="tab-item"
+						:class="{ active: currentTab === 'expiring' }"
+						@tap="navigateToExpiredPage"
+					>
+						临期/过期<text class="badge">0</text>
+					</view>
+				<view 
+					class="tab-item"
+					:class="{ active: currentTab === 'outstock' }"
+					@tap="switchTab('outstock')"
+				>
+					缺货<text class="badge">0</text>
+				</view>
+				<view class="tab-item filter-btn" @tap="showFilter = !showFilter">
+					<text>筛选</text>
+					<uni-icons type="arrowdown" size="14" color="#666"></uni-icons>
+				</view>
+			</scroll-view>
+		</view>
+		
+		<!-- 微店状态栏 -->
+		<view class="store-status">
+			<view class="status-left-content">
+			  <!-- 快速处理卡片 -->
+				<view class="dui">
+							<image class="dui-img" src="/static/Mask group.png"></image>
+						</view>
+						<view class="status-left">
+							<text class="status-text">快速处理</text>
+							<text class="status-num">临期/过期食品</text>
+						</view>
+			</view>
+			<view class="status-right-buttons">
+			  <!-- 临期促销按钮 -->
+			  <view class="quick-btn pink-btn" @tap="goToPromotion">
+			    <text class="btn-text">临期促销</text>
+			    <uni-icons type="arrowright" size="12" color="#fff"></uni-icons>
+			  </view>
+			
+			  <!-- 过期出库按钮 -->
+			  <view class="quick-btn pink-btn" @tap="goToExpiredOut">
+			    <text class="btn-text">过期出库</text>
+			    <uni-icons type="arrowright" size="12" color="#fff"></uni-icons>
+			  </view>
+			</view>
+		</view>
+		
+		<!-- 商品列表 -->
+		<scroll-view class="goods-list" scroll-y="true">
+			<view class="goods-item" v-for="item in goodsList" :key="item.id">
+				<view class="goods-more-icon" @tap="toggleDeleteMenu(item)">
+					<uni-icons type="more-filled" size="18"></uni-icons>
+				</view>
+				<view class="goods-delete-menu" v-if="item.showDeleteMenu" @tap="showDeleteConfirm(item)">
+					<text class="delete-menu-text">删除商品</text>
+				</view>
+				<view class="goods-top"  @tap="goToStockDetail(item)">
+					<view class="goods-tou">
+						<image :src="item.mainImage ? 'http://193.112.94.36:8081' + item.mainImage : '/static/687b6f95b14eff60f4b77147b3726ab2.jpg'"></image>
+					</view>
+					<view class="goods-info">
+						<text class="goods-name">{{ item.productName }}</text>
+						<text class="goods-barcode">{{ item.productBarCode }}</text>
+						<text class="goods-price">￥{{ item.storePrice ? item.storePrice.toFixed(2) : '0.00' }}</text>
+					</view>
+				</view>
+				<view class="goods-divider"></view>
+				<view class="goods-stock" >
+					<text class="stock-label">总库存</text>
+					<text class="stock-num">{{ item.stockQuantity }} 件</text>
+					<text class="stock-arrow">></text>
+				</view>
+				<!-- <view class="goods-actions">
+					
+					<view class="action-btn add-btn" @tap="addGoodsStock(item)">
+						<text>添加商品/库存</text>
+					</view>
+				</view> -->
+			</view>
+		</scroll-view>
+		
+		<!-- 底部操作按钮 -->
+		<view class="bottom-actions">
+			<view class="action-btn more-btn" @tap="showMoreActions(item)">
+						<text>更多</text>
+			</view>
+			<button class="action-button primary" @tap="addNewGoods">
+				添加商品/库存
+			</button>
+			<!-- <button class="action-button" @tap="batchOperation">
+				批量操作
+			</button> -->
+		</view>
+		
+		<!-- 更多操作弹窗 -->
+		<uni-popup ref="popup" type="bottom">
+			<view class="popup-content">
+				<view class="popup-item" @tap="editGoods(selectedGoods)">
+					<uni-icons type="compose" size="20" color="#333"></uni-icons>
+					<text>编辑商品</text>
+				</view>
+				<view class="popup-item" @tap="adjustStock(selectedGoods)">
+					<uni-icons type="plus" size="20" color="#333"></uni-icons>
+					<text>调整库存</text>
+				</view>
+				<view class="popup-item" @tap="deleteGoods(selectedGoods)">
+					<uni-icons type="trash" size="20" color="#ff4444"></uni-icons>
+					<text style="color: #ff4444;">删除商品</text>
+				</view>
+				<view class="popup-item cancel" @tap="$refs.popup.close()">
+					<text>取消</text>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import { getProductList as fetchProductList, deleteProduct } from '@/api/product'
+	import { getToken, getStoreId } from '@/utils/auth'
+	
+	export default {
+		data() {
+			return {
+				currentTab: 'expiring',
+				searchText: '',
+				showFilter: false,
+				selectedGoods: null,
+				storeId: null, // 门店ID
+				goodsList: [
+					{
+						id: null,
+						productName: '',
+						productBarCode: '',
+						storePrice: 0.00,
+						stockQuantity: 0,
+					}
+				]
+			}
+		},
+		onLoad() {
+			// 获取门店ID
+			const storeId = getStoreId();
+			if (storeId) {
+				this.storeId = storeId;
+				console.log('当前门店ID:', storeId);
+			} else {
+				uni.showToast({
+						title: '请先选择门店',
+						icon: 'none'
+				});
+				setTimeout(() => {
+					uni.navigateBack();
+				}, 1500);
+				return;
+			}
+			
+			this.getProductList();
+		},
+		onShow() {
+			this.getProductList();
+		},
+		methods: {
+			async getProductList(searchParams = {}) {
+				try {
+					const token = getToken();
+					console.log('当前Token:', token);
+					console.log('Token是否存在:', !!token);
+					console.log('查询参数:', searchParams);
+					
+					// 添加门店ID参数
+					if (this.storeId) {
+						searchParams.storeId = this.storeId;
+					}
+					
+					const res = await fetchProductList(searchParams);
+					
+					console.log('商品列表接口返回:', res);
+					
+					
+					if (res && res.code === 200 && res.data) {
+						this.goodsList = res.data.map(item => ({
+							...item,
+							showDeleteMenu: false
+						}));
+						console.log('处理后的商品列表:', this.goodsList);
+					} else {
+						uni.showToast({
+							title: res?.msg || '获取商品列表失败',
+							icon: 'none'
+						});
+					}
+				} catch (error) {
+					console.error('获取商品列表失败:', error);
+					console.error('错误详情:', JSON.stringify(error));
+					uni.showToast({
+						title: '网络请求失败',
+						icon: 'none'
+					});
+				}
+			},
+			
+			switchTab(tab) {
+				if (tab === 'all' || tab === 'outstock') {
+					// 跳转到商品列表页面，并传递当前标签
+					uni.navigateTo({
+						url: `/pages/product/product?tab=${tab}`
+					});
+				} else {
+					this.currentTab = tab;
+					// 这里可以添加筛选逻辑
+					console.log('切换到标签:', tab);
+				}
+			},
+			
+			onSearch() {
+				console.log('搜索关键词:', this.searchText);
+				
+				if (!this.searchText || this.searchText.trim() === '') {
+					this.getProductList();
+					return;
+				}
+				
+				const searchText = this.searchText.trim();
+				let searchParams = {};
+				
+				if (/^\d+$/.test(searchText)) {
+					searchParams = { productName: searchText };
+					console.log('商品名称模糊查询:', searchParams);
+				} else {
+					searchParams = { productBarCode: searchText };
+					console.log('按条形码精准查询按:', searchParams);
+				}
+				
+				this.getProductList(searchParams);
+			},
+			
+			goToSettings() {
+				uni.navigateTo({
+					url: '/pages/settings/index'
+				});
+			},
+			
+			showMoreActions(goods) {
+				this.selectedGoods = goods;
+				this.$refs.popup.open();
+			},
+			
+			addGoodsStock(goods) {
+				console.log('添加商品库存:', goods);
+				uni.showModal({
+					title: '添加库存',
+					content: `为 ${goods.name} 添加库存`,
+					success: (res) => {
+						if (res.confirm) {
+							// 执行添加库存操作
+						}
+					}
+				});
+			},
+			
+			goToStockDetail(item) {
+				// 跳转到编辑页面，传递商品ID
+				uni.navigateTo({
+					url: `/pages/edit/edit?id=${item.id}`
+				});
+			},
+			
+			toggleDeleteMenu(item) {
+				item.showDeleteMenu = !item.showDeleteMenu;
+			},
+			
+			showDeleteConfirm(item) {
+				uni.showModal({
+					title: '确认删除',
+					content: `确定要删除商品"${item.productName}"吗？`,
+					success: async (res) => {
+						if (res.confirm) {
+							try {
+								const result = await deleteProduct(item.id);
+								console.log('删除商品结果:', result);
+								
+								if (result && result.code === 200) {
+									uni.showToast({
+										title: '删除成功',
+										icon: 'success'
+									});
+									// 重新加载商品列表
+									this.getProductList();
+								} else {
+									uni.showToast({
+										title: result?.msg || '删除失败',
+										icon: 'none'
+									});
+								}
+							} catch (error) {
+								console.error('删除商品失败:', error);
+								uni.showToast({
+									title: '删除失败',
+									icon: 'none'
+								});
+							}
+						}
+					}
+				});
+			},
+			
+			addNewGoods() {
+			uni.navigateTo({
+				url: '/pages/enter/enter'
+				// url: '/pages/addProduct/addProduct'
+			});
+		},
+		
+		// 临期/过期商品页面，不需要跳转
+			navigateToExpiredPage() {
+				console.log('当前已是临期/过期商品页面');
+			},
+			
+			batchOperation() {
+				uni.showActionSheet({
+					itemList: ['批量修改价格', '批量修改库存', '批量下架'],
+					success: (res) => {
+						console.log('选择了操作:', res.tapIndex);
+					}
+				});
+			},
+			
+			editGoods(goods) {
+				this.$refs.popup.close();
+				uni.navigateTo({
+					url: `/pages/goods/edit?id=${goods.id}`
+				});
+			},
+			
+			adjustStock(goods) {
+				this.$refs.popup.close();
+				uni.showModal({
+					title: '调整库存',
+					content: `调整 ${goods.name} 的库存数量`,
+					editable: true,
+					placeholderText: '请输入调整数量',
+					success: (res) => {
+						if (res.confirm && res.content) {
+							console.log('调整库存数量:', res.content);
+						}
+					}
+				});
+			},
+			
+			deleteGoods(goods) {
+				this.$refs.popup.close();
+				uni.showModal({
+					title: '确认删除',
+					content: `确定要删除商品"${goods.name}"吗？`,
+					success: (res) => {
+						if (res.confirm) {
+							console.log('删除商品:', goods);
+							uni.showToast({
+								title: '删除成功',
+								icon: 'success'
+							});
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.container {
+		background-color: #f5f5f5;
+		min-height: 100vh;
+	}
+	.goods-tou{
+		width: 100rpx;
+		height: 100rpx;
+		margin-right: 16rpx;
+		flex-shrink: 0;
+	}
+	
+	.goods-tou image {
+		width: 100%;
+		height: 100%;
+		border-radius: 8rpx;
+	}
+	/* 状态栏 */
+	.status-bar {
+		padding: 10px 16px;
+		background-color: #fff;
+	}
+	
+	.time {
+		font-size: 16px;
+		font-weight: 600;
+	}
+	/* 快速操作整行容器 */
+	.quick-actions-bar {
+	  display: flex;
+	  align-items: center;
+	  background: #fff;
+	  padding: 12rpx 16rpx;
+	  margin: 16rpx;
+	  border-radius: 12rpx;
+	  gap: 12rpx;
+	}
+	
+	/* 快速处理卡片 */
+	.quick-card {
+	  display: flex;
+	  align-items: center;
+	  background: #ff4d4f;
+	  padding: 12rpx 20rpx;
+	  border-radius: 30rpx;
+	  color: #fff;
+	  flex-shrink: 0;
+	}
+	
+	.card-icon {
+	  margin-right: 8rpx;
+	}
+	
+	.icon-img {
+	  width: 24rpx;
+	  height: 24rpx;
+	}
+	
+	.card-text {
+	  display: flex;
+	  flex-direction: column;
+	}
+	
+	.main-text {
+	  font-size: 26rpx;
+	  font-weight: 500;
+	  line-height: 1.2;
+	}
+	
+	.sub-text {
+	  font-size: 20rpx;
+	  opacity: 0.9;
+	  line-height: 1.2;
+	}
+	
+	/* 搜索栏 */
+	.search-bar {
+		padding: 12px 16px;
+		background-color: #fff;
+	}
+
+	.search-input {
+		display: flex;
+		align-items: center;
+		background-color: #f5f5f5;
+		border-radius: 8px;
+		padding: 10px 12px;
+	}
+
+	.search-input input {
+		flex: 1;
+		margin-left: 8px;
+		font-size: 14px;
+	}
+
+	.placeholder {
+		color: #999;
+	}
+
+	/* 筛选标签 */
+	.filter-tabs {
+		background-color: #fff;
+		padding: 12px 16px;
+		border-bottom: 1px solid #eee;
+	}
+
+	.tabs-scroll {
+		white-space: nowrap;
+	}
+
+	.tab-item {
+		display: inline-block;
+		padding: 6px 12px;
+		margin-right: 10px;
+		border-radius: 16px;
+		font-size: 14px;
+		background-color: #f5f5f5;
+		color: #666;
+	}
+
+	.tab-item.active {
+		background-color: #e8f4ff;
+		color: #007aff;
+	}
+
+	.badge {
+		margin-left: 4px;
+		color: #ff4444;
+	}
+
+	.filter-btn {
+		display: inline-flex;
+		align-items: center;
+	}
+
+	/* 微店状态栏 */
+	.store-status {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 12px 16px;
+		background-color: #fff;
+		border-radius: 20rpx;
+		margin-top: 8px;
+		border-bottom: 1px solid #eee;
+	}
+
+	.status-left-content {
+		display: flex;
+		align-items: center;
+	}
+
+	.status-right-buttons {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+	}
+
+	.dui {
+		margin-right: 12rpx;
+	}
+
+	.dui-img {
+		width: 24rpx;
+		height: 24rpx;
+	}
+
+	.status-left {
+		display: flex;
+		flex-direction: column;
+		margin-left: 0;
+	}
+
+	.status-text {
+		font-size: 14px;
+		color: #333;
+	}
+
+	.status-num {
+		font-size: 12px;
+		color: #666;
+		margin-top: 4px;
+	}
+
+	.status-right {
+		display: flex;
+		align-items: center;
+		margin-right: 1rpx;
+	}
+
+	.set-text {
+		font-size: 14px;
+		color: #666;
+		margin-right: 4px;
+	}
+	
+	/* 右侧粉色按钮通用样式 */
+	.quick-btn {
+	  display: flex;
+	  align-items: center;
+	  background: red;
+	  padding: 8rpx 16rpx;
+	  border-radius: 20rpx;
+	  color: white;
+	  font-size: 22rpx;
+	  gap: 4rpx;
+	  flex-shrink: 0;
+	}
+
+	.btn-text {
+	  font-size: 22rpx;
+	}
+	
+	/* 商品列表 */
+	.goods-list {
+		height: calc(100vh - 320px);
+		padding: 16px;
+	}
+	
+	.goods-item {
+		background-color: #fff;
+		border-radius: 8px;
+		padding: 16px;
+		margin-bottom: 12px;
+		box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+		position: relative;
+	}
+	
+	.goods-more-icon {
+		position: absolute;
+		top: 12px;
+		right: 12px;
+		z-index: 10;
+	}
+	
+	.goods-delete-menu {
+		position: absolute;
+		top: 40px;
+		right: 12px;
+		background-color: #fff;
+		border-radius: 8rpx;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);
+		padding: 12rpx 24rpx;
+		z-index: 9;
+	}
+	
+	.delete-menu-text {
+		font-size: 28rpx;
+		color: #ff4444;
+	}
+	
+	.goods-top {
+		display: flex;
+		align-items: flex-start;
+		margin-bottom: 12px;
+	}
+	
+	.goods-info {
+		flex: 1;
+		margin-bottom: 0;
+	}
+	
+	.goods-name {
+		display: block;
+		font-size: 16px;
+		font-weight: 500;
+		color: #333;
+		margin-bottom: 6px;
+	}
+	
+	.goods-barcode {
+		font-size: 12px;
+		color: #999;
+		display: block;
+		margin-bottom: 8px;
+	}
+	
+	.goods-price {
+		font-size: 18px;
+		color: #ff4444;
+		font-weight: 600;
+	}
+	
+	.goods-divider {
+		height: 1px;
+		border-bottom: 1px dashed #e0e0e0;
+		margin-bottom: 12px;
+	}
+	
+	.goods-stock {
+		display: flex;
+		align-items: center;
+		padding: 8px 0;
+		margin-bottom: 4px;
+	}
+	
+	.stock-arrow {
+		font-size: 20px;
+		color: #999;
+		margin-left: auto;
+	}
+	
+	.stock-label {
+		font-size: 14px;
+		color: #666;
+	}
+	
+	.stock-num {
+		font-size: 16px;
+		color: #333;
+		font-weight: 500;
+	}
+	
+	.goods-actions {
+		display: flex;
+		justify-content: space-between;
+	}
+	
+	.action-btn {
+		padding: 8px 16px;
+		border-radius: 6px;
+		font-size: 14px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	.more-btn {
+		background-color: #f5f5f5;
+		color: #666;
+	}
+	
+	.add-btn {
+		background-color: #e8f4ff;
+		color: #007aff;
+	}
+	
+	/* 底部操作按钮 */
+	.bottom-actions {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		display: flex;
+		padding: 16px;
+		background-color: #fff;
+		border-top: 1px solid #eee;
+	}
+	
+	.action-button {
+		flex: 1;
+		margin: 0 8px;
+		padding: 12px;
+		border-radius: 8px;
+		font-size: 16px;
+		background-color: #f5f5f5;
+		color: #333;
+		border: none;
+	}
+	
+	.action-button.primary {
+		background-color: #007aff;
+		color: #fff;
+	}
+	
+	/* 弹窗样式 */
+	.popup-content {
+		background-color: #fff;
+		border-radius: 16px 16px 0 0;
+		padding: 20px;
+	}
+	
+	.popup-item {
+		display: flex;
+		align-items: center;
+		padding: 16px 0;
+		border-bottom: 1px solid #f5f5f5;
+		font-size: 16px;
+	}
+	
+	.popup-item:last-child {
+		border-bottom: none;
+	}
+	
+	.popup-item text {
+		margin-left: 12px;
+	}
+	
+	.popup-item.cancel {
+		justify-content: center;
+		color: #666;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/product.vue b/pages/product/product.vue
index 6501aff..14ef3d3 100644
--- a/pages/product/product.vue
+++ b/pages/product/product.vue
@@ -31,12 +31,12 @@
 					全部
 				</view>
 				<view 
-					class="tab-item"
-					:class="{ active: currentTab === 'expiring' }"
-					@tap="switchTab('expiring')"
-				>
-					临期/过期<text class="badge">0</text>
-				</view>
+						class="tab-item"
+						:class="{ active: currentTab === 'expiring' }"
+						@tap="navigateToExpiredPage"
+					>
+						临期/过期<text class="badge">0</text>
+					</view>
 				<view 
 					class="tab-item"
 					:class="{ active: currentTab === 'outstock' }"
@@ -161,7 +161,7 @@
 				]
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			// 获取门店ID
 			const storeId = getStoreId();
 			if (storeId) {
@@ -178,6 +178,11 @@
 				return;
 			}
 			
+			// 获取传递过来的tab参数
+			if (options && options.tab) {
+				this.currentTab = options.tab;
+			}
+			
 			this.getProductList();
 		},
 		onShow() {
@@ -322,11 +327,18 @@
 			},
 			
 			addNewGoods() {
-				uni.navigateTo({
-					url: '/pages/enter/enter'
-					// url: '/pages/addProduct/addProduct'
-				});
-			},
+			uni.navigateTo({
+				url: '/pages/enter/enter'
+				// url: '/pages/addProduct/addProduct'
+			});
+		},
+		
+		// 导航到临期/过期商品页面
+		navigateToExpiredPage() {
+			uni.navigateTo({
+				url: '/pages/expired/expired'
+			});
+		},
 			
 			batchOperation() {
 				uni.showActionSheet({
diff --git a/static/Mask group.png b/static/Mask group.png
new file mode 100644
index 0000000000000000000000000000000000000000..b655b6d98e92be1ee4c1b1cf0cbfe999107bb578
GIT binary patch
literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0ys%TK~#7F%~efk
z6G0Sy?`<|QQbdXcL6o$%S-Nax6^|-jREj6*N$^xWi$4bsJ&Gss=g_O*$)i_659U~l
z#gOQxVAa%vh{z%$A>B=8d=plv$#!N_DfEM3-^|-L-}~FQ06PrK^3tl~93#s*%i>`~
zYyskXB&tl-YTy5h;G^fAlu|yF0H^wOd=~NJiEZ1r$E($!Llb;(-J9&`T^9F%-os{>
zXx6FMSJU*AcDUww*ZA`LTU{=MxX6!3O6EvPB*d$?zP~>c!Drtufs{8u10uS#Hw+hq
zl&5+7i`T)CIKG#OAdaHz$}7<0YHM`#HAPVkrCdzT=GR<z(nvsvvycrQ777biKCe9g
ztxP52oR;97>yEJZWylEbu=%8eg5Dm$*AnEq-F+|&5Dx^?(;hR4gmJ(=w|P_8*a+iX
zu7iE&I@m<@P1}JF@1F?9o6R;C?G0=bT)&EzK!Lq~3fqB{Az0RPBSEoPe9Xmb!jKS%
zi)piIfZ))|N{iEUxi{1@g1e_$9vi!prb`_aQ;o(F3UPtc^##m$A>;TQRw|t|rGA>a
z?hy`seJi~b;#s-TnA6=sI_1$I=taOO=<sFdxi-huf@ILKcOe*%sozmKLUe^Y<!kRi
z$}{|tWid4q@HIjz0wI?EdMt=aET7=n(=pkT=><;7vPu#EGV@%IqFQX!PSndLdt;pI
zGcyyB5HDGr=wp5`6$H0T_Sq82_~bZFo5)r&NAbf8f^V=J@CS=F$YSa|$Kn70002ov
JPDHLkV1ighIamMy

literal 0
HcmV?d00001