From eccbae3b697e66e3760a6e8427c0757e8428a48a Mon Sep 17 00:00:00 2001
From: fy <>
Date: Thu, 22 Jan 2026 21:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/product.js                                |   38 +
 components/BrandSelector/BrandSelector.vue    |  269 +++++
 pages.json                                    |   35 +-
 pages/BrandSelector/BrandSelector.vue         |  184 +++
 pages/category/category.vue                   | 1048 +++++++++++++++++
 pages/edit/edit.vue                           |  273 ++++-
 pages/enter/enter.vue                         |    2 +-
 .../Import .vue => import/import.vue}         |    0
 pages/product/product.vue                     |    2 +-
 9 files changed, 1819 insertions(+), 32 deletions(-)
 create mode 100644 components/BrandSelector/BrandSelector.vue
 create mode 100644 pages/BrandSelector/BrandSelector.vue
 create mode 100644 pages/category/category.vue
 rename pages/{Import /Import .vue => import/import.vue} (100%)

diff --git a/api/product.js b/api/product.js
index 77fee46..457922b 100644
--- a/api/product.js
+++ b/api/product.js
@@ -312,4 +312,42 @@ export function updateBrand(data) {
     method: 'post',
     data: data
   })
+}
+
+// 新增分类
+export function addClassification(data) {
+  return request8081({
+    baseUrl: 'http://193.112.94.36:8081',
+    url: '/mall/classification/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取分类树状结构
+export function getClassificationTree(storeId) {
+  return request8081({
+    baseUrl: 'http://193.112.94.36:8081',
+    url: `/mall/classification/getTree/${storeId}`,
+    method: 'get'
+  })
+}
+
+// 修改分类名称
+export function updateClassification(data) {
+  return request8081({
+    baseUrl: 'http://193.112.94.36:8081',
+    url: '/mall/classification/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除分类
+export function deleteClassification(classificationId) {
+  return request8081({
+    baseUrl: 'http://193.112.94.36:8081',
+    url: `/mall/classification/delete/${classificationId}`,
+    method: 'delete'
+  })
 }
\ No newline at end of file
diff --git a/components/BrandSelector/BrandSelector.vue b/components/BrandSelector/BrandSelector.vue
new file mode 100644
index 0000000..ba1fdb3
--- /dev/null
+++ b/components/BrandSelector/BrandSelector.vue
@@ -0,0 +1,269 @@
+<template>
+  <view class="container">
+    <!-- 顶部导航栏 -->
+    <view class="navbar">
+      <view class="back-btn" @click="goBack">
+        <text class="back-icon">←</text>
+      </view>
+      <view class="title">选择品牌</view>
+    </view>
+
+    <!-- 搜索框 -->
+    <view class="search-box">
+      <input type="text" placeholder="搜索品牌名称" class="search-input" v-model="searchKeyword" />
+    </view>
+
+    <!-- 品牌树状列表 -->
+    <view class="brand-tree">
+      <!-- 一级品牌项 -->
+      <view v-for="(brand, index) in filteredBrandList" :key="index" class="level1-item">
+        <view class="level1-header">
+          <text class="expand-icon" @click="toggleExpand(index)">{{ brand.expanded ? '▼' : '▶' }}</text>
+          <text class="level1-name" @click="toggleExpand(index)">{{ brand.name }}</text>
+          <view class="action-buttons">
+            <!-- 选择一级品牌按钮 -->
+            <text class="select-btn" @click.stop="selectBrand(brand.name, brand.id, null)">选择</text>
+          </view>
+        </view>
+        <!-- 二级子品牌容器 -->
+        <view v-if="brand.expanded && brand.children && brand.children.length > 0" class="level2-container">
+          <!-- 二级品牌项 -->
+          <view v-for="(subBrand, subIndex) in brand.children" :key="subIndex" class="level2-item">
+            <text class="level2-name">{{ subBrand.name }}</text>
+            <text class="select-btn" @click.stop="selectBrand(brand.name, brand.id, subBrand.name, subBrand.id)">选择</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 底部添加按钮 -->
+    <view class="add-brand-btn" @click="goToAddBrand">
+      <text class="add-btn-icon">+</text>
+      <text>添加品牌</text>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getBrandTree } from '@/api/product'
+import { getStoreId } from '@/utils/auth'
+
+export default {
+  data() {
+    return {
+      brandList: [],
+      searchKeyword: '',
+      storeId: null
+    }
+  },
+  computed: {
+    // 过滤品牌列表
+    filteredBrandList() {
+      if (!this.searchKeyword.trim()) {
+        return this.brandList
+      }
+      const keyword = this.searchKeyword.toLowerCase().trim()
+      return this.brandList.filter(brand => {
+        // 检查一级品牌是否匹配
+        const matchesLevel1 = brand.name.toLowerCase().includes(keyword)
+        // 检查二级品牌是否有匹配项
+        const matchesLevel2 = brand.children && brand.children.some(subBrand => subBrand.name.toLowerCase().includes(keyword))
+        return matchesLevel1 || matchesLevel2
+      })
+    }
+  },
+  onLoad() {
+    // 获取门店ID
+    this.storeId = getStoreId()
+    // 加载品牌列表
+    this.loadBrandList()
+  },
+  methods: {
+    // 加载品牌列表
+    async loadBrandList() {
+      try {
+        const res = await getBrandTree()
+        if (res.code === 200) {
+          // 为每个一级品牌添加expanded属性，默认为true
+          this.brandList = res.data.map(brand => ({
+            ...brand,
+            expanded: true,
+            children: brand.children || []
+          }))
+        }
+      } catch (error) {
+        console.error('获取品牌列表失败:', error)
+      }
+    },
+    // 切换品牌展开/收起
+    toggleExpand(index) {
+      this.brandList[index].expanded = !this.brandList[index].expanded
+    },
+    // 选择品牌
+    selectBrand(brandName, brandId, subBrandName, subBrandId) {
+      // 构造返回数据
+      const selectedBrand = {
+        brandName: subBrandName || brandName,
+        brandId: subBrandId || brandId,
+        parentBrandName: subBrandName ? brandName : null,
+        parentBrandId: subBrandName ? brandId : null
+      }
+      // 返回结果给上一页
+      uni.navigateBack({
+        delta: 1,
+        success: () => {
+          // 触发品牌选择事件
+          uni.$emit('brandSelected', selectedBrand)
+        }
+      })
+    },
+    // 返回上一页
+    goBack() {
+      uni.navigateBack({ delta: 1 })
+    },
+    // 跳转到添加品牌页面
+    goToAddBrand() {
+      uni.navigateTo({
+        url: '/pages/addBrand/addBrand'
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.container {
+  background-color: #f5f5f5;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+/* 导航栏 */
+.navbar {
+  background-color: #e62318;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx 30rpx;
+  position: relative;
+  height: 88rpx;
+  box-sizing: border-box;
+}
+
+.title {
+  font-size: 34rpx;
+  font-weight: bold;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.back-icon {
+  font-size: 32rpx;
+}
+
+/* 搜索框 */
+.search-box {
+  background-color: #fff;
+  padding: 16rpx 30rpx;
+}
+
+.search-input {
+  background-color: #f5f5f5;
+  border-radius: 6rpx;
+  padding: 18rpx;
+  font-size: 28rpx;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+/* 品牌树 */
+.brand-tree {
+  flex: 1;
+  padding: 20rpx 30rpx;
+}
+
+.level1-item {
+  background-color: #fff;
+  border-radius: 8rpx;
+  margin-bottom: 20rpx;
+  overflow: hidden;
+}
+
+.level1-header {
+  display: flex;
+  align-items: center;
+  padding: 20rpx 30rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.expand-icon {
+  font-size: 24rpx;
+  margin-right: 15rpx;
+  color: #666;
+}
+
+.level1-name {
+  font-size: 28rpx;
+  flex: 1;
+}
+
+.action-buttons {
+  display: flex;
+  gap: 16rpx;
+}
+
+.select-btn {
+  background-color: #e62318;
+  color: #fff;
+  font-size: 24rpx;
+  padding: 10rpx 20rpx;
+  border-radius: 6rpx;
+}
+
+/* 二级子品牌容器 */
+.level2-container {
+  display: flex;
+  padding: 24rpx 30rpx;
+  gap: 24rpx;
+  flex-wrap: wrap;
+  background-color: #fff;
+}
+
+.level2-item {
+  background-color: #f5f5f5;
+  border-radius: 8rpx;
+  width: 180rpx;
+  height: 180rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 16rpx;
+}
+
+.level2-name {
+  font-size: 28rpx;
+  color: #333;
+}
+
+/* 底部添加按钮 */
+.add-brand-btn {
+  background-color: #e62318;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 24rpx;
+  font-size: 30rpx;
+  margin: 0 30rpx 30rpx 30rpx;
+  border-radius: 8rpx;
+}
+
+.add-btn-icon {
+  margin-right: 8rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 49e33d9..637147c 100644
--- a/pages.json
+++ b/pages.json
@@ -127,29 +127,18 @@
 	}
 },
 {
-		"path": "pages/Import /Import ",
-		"style": {
-			"navigationBarTitleText": ""
-		}
-	},
-	{
-		"path": "pages/userStores/userStores",
-		"style": {
-			"navigationBarTitleText": "用户门店关联"
-		}
-	},
+	"path": "pages/import/import",
+	"style": {
+		"navigationBarTitleText": ""
+	}
+},
 	{
 		"path": "pages/userStores/userStores",
 		"style": {
 			"navigationBarTitleText": ""
 		}
 	},
-	{
-		"path": "pages/expired/expired",
-		"style": {
-			"navigationBarTitleText": ""
-		}
-	},
+	
 	{
 		"path": "pages/expired/expired",
 		"style": {
@@ -167,6 +156,18 @@
 		"style": {
 			"navigationBarTitleText": ""
 		}
+	},
+	{
+		"path": "pages/BrandSelector/BrandSelector",
+		"style": {
+			"navigationBarTitleText": "选择品牌"
+		}
+	},
+	{
+		"path": "pages/category/category",
+		"style": {
+			"navigationBarTitleText": ""
+		}
 	}
 ],
   "tabBar": {
diff --git a/pages/BrandSelector/BrandSelector.vue b/pages/BrandSelector/BrandSelector.vue
new file mode 100644
index 0000000..d81b98c
--- /dev/null
+++ b/pages/BrandSelector/BrandSelector.vue
@@ -0,0 +1,184 @@
+<template>
+  <view v-if="visible" class="brand-selector-overlay" @click="handleClose">
+    <view class="brand-selector-container" @click.stop>
+      <!-- 头部 -->
+      <view class="selector-header">
+        <view class="header-left" @click="handleClose">
+          <text class="close-icon">×</text>
+        </view>
+        <view class="header-title">选择品牌</view>
+        <view class="header-right" @click="handleConfirm">
+          <text class="confirm-btn">完成</text>
+        </view>
+      </view>
+      
+      <!-- 搜索框 -->
+      <view class="search-box">
+        <input 
+          class="search-input" 
+          type="text" 
+          placeholder="搜索品牌名称"
+          v-model="searchKeyword"
+        />
+      </view>
+      
+      <!-- 品牌列表 -->
+      <view class="brand-list">
+        <view 
+          class="brand-item" 
+          :class="{active: selectedBrand === item.name}"
+          v-for="item in filteredBrandList" 
+          :key="item.name"
+          @click="selectBrand(item.name)"
+        >
+          {{ item.name }}
+        </view>
+      </view>
+      
+      <!-- 品牌管理入口 -->
+      <view class="brand-management" @click="handleToBrandManagement">
+        <text class="management-text">品牌管理</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'BrandSelector',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    defaultValue: {
+      type: String,
+      default: '默认品牌'
+    },
+    brandList: {
+      type: Array,
+      default: () => [{ name: '默认品牌' }]
+    }
+  },
+  data() {
+    return {
+      selectedBrand: this.defaultValue,
+      searchKeyword: ''
+    }
+  },
+  watch: {
+    defaultValue(newVal) {
+      this.selectedBrand = newVal
+    }
+  },
+  computed: {
+    filteredBrandList() {
+      if (!this.searchKeyword) return this.brandList
+      return this.brandList.filter(item => 
+        item.name.includes(this.searchKeyword)
+      )
+    }
+  },
+  methods: {
+    selectBrand(brandName) {
+      this.selectedBrand = brandName
+    },
+    handleConfirm() {
+      this.$emit('confirm', this.selectedBrand)
+      this.handleClose()
+    },
+    handleClose() {
+      this.$emit('close')
+    },
+    handleToBrandManagement() {
+      this.$emit('toBrandManagement')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.brand-selector-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: flex-end;
+  z-index: 999;
+}
+
+.brand-selector-container {
+  width: 100%;
+  background: #fff;
+  border-radius: 16rpx 16rpx 0 0;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.selector-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 30rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  .close-icon {
+    font-size: 36rpx;
+    color: #666;
+  }
+  .header-title {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #333;
+  }
+  .confirm-btn {
+    font-size: 30rpx;
+    color: #E62429;
+  }
+}
+
+.search-box {
+  padding: 20rpx 30rpx;
+  .search-input {
+    width: 100%;
+    padding: 20rpx;
+    background: #f5f5f5;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+  }
+}
+
+.brand-list {
+  flex: 1;
+  overflow-y: auto;
+  .brand-item {
+    padding: 30rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+    font-size: 30rpx;
+    color: #333;
+    position: relative;
+    &.active {
+      color: #E62429;
+      &::after {
+        content: "✓";
+        position: absolute;
+        right: 30rpx;
+        top: 50%;
+        transform: translateY(-50%);
+        font-size: 28rpx;
+      }
+    }
+  }
+}
+
+.brand-management {
+  padding: 30rpx;
+  text-align: center;
+  color: #1677FF;
+  font-size: 28rpx;
+  border-top: 1rpx solid #f0f0f0;
+}
+</style>
\ No newline at end of file
diff --git a/pages/category/category.vue b/pages/category/category.vue
new file mode 100644
index 0000000..202f391
--- /dev/null
+++ b/pages/category/category.vue
@@ -0,0 +1,1048 @@
+<template>
+	<view class="container">
+		<!-- 顶部导航栏 -->
+		<view class="navbar">
+			<view class="nav-back" @click="goBack">
+				<text class="iconfont">←</text>
+			</view>
+			<view class="nav-title">分类管理</view>
+			<view class="nav-more">
+				<text class="iconfont">···</text>
+			</view>
+		</view>
+
+		<!-- 搜索框 -->
+		<view class="search-bar">
+			<view class="search-input">
+				<text class="search-icon">🔍</text>
+				<input type="text" placeholder="搜索分类名称" v-model="searchText" class="input" />
+			</view>
+		</view>
+
+		<!-- 公告栏 -->
+		<view class="notice-bar">
+			<view class="notice-icon">ⓘ</view>
+			<text class="notice-text">线上渠道分类展示规则公告</text>
+			<view class="notice-action" @click="viewNotice">查看 &gt;</view>
+		</view>
+
+		<!-- 分类列表主体 -->
+		<view class="category-list">
+			<!-- 1. 非处方药(OTC) - 系统固定 -->
+			<view class="category-item">
+				<view class="category-header" @click="toggleExpand('otc')">
+					<text class="expand-icon">{{ expanded.otc ? '▼' : '▶' }}</text>
+					<text class="category-name">非处方药(OTC)</text>
+					<view class="category-actions" @click.stop="showActions('otc', 1)">
+						<text class="iconfont">···</text>
+					</view>
+				</view>
+				<view v-if="expanded.otc" class="sub-category-group level2">
+					<view class="sub-category-item">
+						<text class="sub-category-name">甲类非处方药</text>
+						<view class="category-actions" @click.stop="showActions('otc-1', 2)">
+							<text class="iconfont">···</text>
+						</view>
+					</view>
+					<view class="sub-category-item">
+						<text class="sub-category-name">乙类非处方药</text>
+						<view class="category-actions" @click.stop="showActions('otc-2', 2)">
+							<text class="iconfont">···</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 2. 处方药(RX) - 系统固定 -->
+			<view class="category-item">
+				<view class="category-header no-expand">
+					<text class="expand-icon placeholder"></text>
+					<text class="category-name">处方药(RX)</text>
+					<view class="category-actions" @click.stop="showActions('rx', 1)">
+						<text class="iconfont">···</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 3. 兽用非处方药 - 系统固定 -->
+			<view class="category-item">
+				<view class="category-header no-expand">
+					<text class="expand-icon placeholder"></text>
+					<text class="category-name">兽用非处方药</text>
+					<view class="category-actions" @click.stop="showActions('vetOtc', 1)">
+						<text class="iconfont">···</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 4. 兽用处方药 - 系统固定 -->
+			<view class="category-item">
+				<view class="category-header no-expand">
+					<text class="expand-icon placeholder"></text>
+					<text class="category-name">兽用处方药</text>
+					<view class="category-actions" @click.stop="showActions('vetRx', 1)">
+						<text class="iconfont">···</text>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 加载状态 -->
+			<view v-if="loading" class="loading">
+				<text>加载中...</text>
+			</view>
+			
+			<!-- 5. 自定义分类（从API获取） -->
+			<view v-for="category in categories" :key="category.id" class="category-item">
+				<!-- 一级分类头部 -->
+				<view 
+					class="category-header" 
+					@click="toggleExpand(category.id)"
+				>
+					<text class="expand-icon">{{ expanded[category.id] ? '▼' : '▶' }}</text>
+					<text class="category-name">{{ category.classificationName }}</text>
+					<view class="menu-container" style="position: relative;">
+						<view class="menu-btn" @click.stop="toggleMenuOptions(category.id, 1)">
+							<text class="menu-icon">···</text>
+						</view>
+						<!-- 菜单选项列表 -->
+						<view v-if="showMenuOptions && selectedCategoryId === category.id" class="menu-options">
+							<!-- 重命名选项 -->
+							<view class="menu-option" @click.stop="showRenameDialog(category.id)">
+								<text class="rename-icon">✏️</text>
+								<text>重命名</text>
+							</view>
+							<!-- 删除分类选项 -->
+							<view class="menu-option delete-option" @click.stop="showDeleteConfirm(category.id)">
+								<text class="trash-icon">🗑️</text>
+								<text>删除分类</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 二级分类区域 -->
+				<view v-if="expanded[category.id]" class="sub-category-group level2">
+					<!-- 循环渲染每一个二级分类 -->
+					<view v-for="subCategory in category.children" :key="subCategory.id">
+						
+						<!-- 二级分类条目 -->
+						<view 
+							class="sub-category-item"
+							@click="toggleExpand(subCategory.id)"
+						>
+							<text class="expand-icon">{{ expanded[subCategory.id] ? '▼' : '▶' }}</text>
+							<text class="sub-category-name">{{ subCategory.classificationName }}</text>
+							<view class="menu-container" style="position: relative;">
+								<view class="menu-btn" @click.stop="toggleMenuOptions(subCategory.id, 2)">
+									<text class="menu-icon">···</text>
+								</view>
+								<!-- 菜单选项列表 -->
+								<view v-if="showMenuOptions && selectedCategoryId === subCategory.id" class="menu-options">
+									<!-- 重命名选项 -->
+									<view class="menu-option" @click.stop="showRenameDialog(subCategory.id)">
+										<text class="rename-icon">✏️</text>
+										<text>重命名</text>
+									</view>
+									<!-- 删除分类选项 -->
+									<view class="menu-option delete-option" @click.stop="showDeleteConfirm(subCategory.id)">
+										<text class="trash-icon">🗑️</text>
+										<text>删除分类</text>
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<!-- 🔴 核心修改：三级区域直接放在二级循环内部 -->
+						<!-- 这样三级内容就会紧跟在对应的二级分类下面，不会乱跑 -->
+						<view v-if="expanded[subCategory.id]" class="sub-category-group level3">
+							<!-- 渲染三级分类列表 -->
+							<view 
+								v-for="thirdCategory in subCategory.children" 
+								:key="thirdCategory.id" 
+								class="sub-category-item no-expand"
+							>
+								<text class="expand-icon placeholder"></text>
+								<text class="sub-category-name">{{ thirdCategory.classificationName }}</text>
+								<view class="menu-container" style="position: relative;">
+									<view class="menu-btn" @click.stop="toggleMenuOptions(thirdCategory.id, 3)">
+										<text class="menu-icon">···</text>
+									</view>
+									<!-- 菜单选项列表 -->
+									<view v-if="showMenuOptions && selectedCategoryId === thirdCategory.id" class="menu-options">
+										<!-- 重命名选项 -->
+										<view class="menu-option" @click.stop="showRenameDialog(thirdCategory.id)">
+											<text class="rename-icon">✏️</text>
+											<text>重命名</text>
+										</view>
+										<!-- 删除分类选项 -->
+										<view class="menu-option delete-option" @click.stop="showDeleteConfirm(thirdCategory.id)">
+											<text class="trash-icon">🗑️</text>
+											<text>删除分类</text>
+										</view>
+									</view>
+								</view>
+							</view>
+							
+							<!-- 三级添加按钮 -->
+							<view class="add-sub-btn" @click="openCreateModal(subCategory.id, 3)">
+								<text class="add-icon">+</text>
+								<text>添加子分类</text>
+							</view>
+						</view>
+					</view>
+
+					<!-- 二级添加按钮（放在二级循环结束后，作为整个二级区域的最后一项） -->
+					<view class="add-sub-btn" @click="openCreateModal(category.id, 2)">
+						<text class="add-icon">+</text>
+						<text>添加子分类</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 添加一级分类按钮 -->
+		<view class="add-primary-btn" @click="openCreateModal('', 1)">
+			<text class="add-icon">+</text>
+			<text>添加一级分类</text>
+		</view>
+
+		<!-- 创建新分类弹窗 -->
+		<view v-if="createModal.show" class="modal-mask" @click="closeCreateModal">
+			<view class="modal-content" @click.stop>
+				<view class="modal-title">创建新分类</view>
+				<view class="modal-input-wrap">
+					<input 
+						type="text" 
+						placeholder="请输入分类名称" 
+						v-model="createModal.categoryName"
+						class="modal-input"
+					/>
+				</view>
+				<view class="modal-buttons">
+					<view class="modal-btn cancel" @click="closeCreateModal">取消</view>
+					<view class="modal-btn confirm" @click="createCategory">确定</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 操作菜单弹窗 -->
+		<view v-if="actionSheet.show" class="action-sheet-mask" @click="actionSheet.show = false">
+			<view class="action-sheet">
+				<view class="action-item" v-for="(action, index) in actionSheet.actions" :key="index" @click="handleActionSelect(index)">
+					{{ action.name }}
+				</view>
+			</view>
+		</view>
+		
+		<!-- 重命名分类弹窗 -->
+		<view v-if="renameDialogVisible" class="dialog-overlay">
+			<view class="dialog">
+				<view class="dialog-title">修改分类名称</view>
+				<!-- 输入框 -->
+				<view class="input-wrapper">
+					<input
+						v-model="renameCategoryName"
+						type="text"
+						class="dialog-input"
+						placeholder="请输入分类名称"
+					/>
+				</view>
+				<view class="dialog-buttons">
+					<view class="cancel-btn" @click="closeRenameDialog">取消</view>
+					<view class="confirm-btn" @click="confirmRename">确定</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { addClassification, getClassificationTree, updateClassification, deleteClassification } from '@/api/product'
+import { getStoreInfo } from '@/utils/auth'
+
+export default {
+	onLoad() {
+		this.loadClassificationTree();
+	},
+	data() {
+		return {
+			searchText: '',
+			categories: [],
+			loading: false,
+			expanded: {
+				otc: true
+			},
+			actionSheet: {
+				show: false,
+				actions: [],
+				current: { key: '', level: 0 }
+			},
+			createModal: {
+				show: false,
+				categoryName: '',
+				parentKey: '',
+				level: 0
+			},
+			// 菜单选项相关
+			showMenuOptions: false,
+			selectedCategoryId: null,
+			selectedCategoryLevel: null,
+			// 重命名弹窗相关
+			renameDialogVisible: false,
+			renameCategoryId: null,
+			renameCategoryName: ''
+		};
+	},
+	methods: {
+		initExpandedStates(categories) {
+			for (const category of categories) {
+				if (!this.expanded[category.id]) {
+					this.$set(this.expanded, category.id, true); // 默认展开
+				}
+				if (category.children && category.children.length > 0) {
+					this.initExpandedStates(category.children);
+				}
+			}
+		},
+		loadClassificationTree() {
+			this.loading = true;
+			const storeInfo = getStoreInfo();
+			const storeId = storeInfo ? storeInfo.storeId : 1;
+			
+			getClassificationTree(storeId)
+				.then(res => {
+					if (res.code === 200) {
+						this.categories = res.data || [];
+						this.initExpandedStates(this.categories);
+					} else {
+						uni.showToast({ title: '获取分类数据失败', icon: 'none' });
+					}
+				})
+				.catch(error => {
+					console.error('获取分类树失败:', error);
+					uni.showToast({ title: '网络请求失败', icon: 'none' });
+				})
+				.finally(() => {
+					this.loading = false;
+				});
+		},
+		goBack() {
+			uni.navigateBack();
+		},
+		viewNotice() {
+			uni.showToast({ title: '查看公告详情', icon: 'none' });
+		},
+		toggleExpand(key) {
+			this.$set(this.expanded, key, !this.expanded[key]);
+		},
+		showActions(key, level) {
+			this.actionSheet.current = { key, level };
+			const isSystemFixed = ['otc', 'rx', 'vetOtc', 'vetRx'].includes(key);
+			const isSystemChild = ['otc-1', 'otc-2'].includes(key);
+			let actions = [];
+
+			if (level === 1) {
+				actions = [{ name: '编辑' }];
+				if (!isSystemFixed) {
+					actions.push({ name: '添加子分类' }, { name: '删除' });
+				}
+			} else if (level === 2) {
+				actions = [{ name: '编辑' }];
+				if (!isSystemChild) {
+					actions.push({ name: '添加子分类' }, { name: '删除' });
+				}
+			} else if (level === 3) {
+				actions = [{ name: '编辑' }, { name: '删除' }];
+			}
+
+			this.actionSheet.actions = actions;
+			this.actionSheet.show = true;
+		},
+		handleActionSelect(index) {
+			const { key, level } = this.actionSheet.current;
+			const action = this.actionSheet.actions[index].name;
+
+			switch (action) {
+				case '编辑':
+					this.editCategory(key, level);
+					break;
+				case '添加子分类':
+					this.openCreateModal(key, level + 1);
+					break;
+				case '删除':
+					this.deleteCategory(key, level);
+					break;
+			}
+			this.actionSheet.show = false;
+		},
+		openCreateModal(parentKey, level) {
+			this.createModal = {
+				show: true,
+				categoryName: '',
+				parentKey,
+				level
+			};
+		},
+		closeCreateModal() {
+			this.createModal.show = false;
+			this.createModal.categoryName = '';
+		},
+		createCategory() {
+			if (!this.createModal.categoryName.trim()) {
+				uni.showToast({ title: '请输入分类名称', icon: 'none' });
+				return;
+			}
+
+			const { parentKey, level, categoryName } = this.createModal;
+			const storeInfo = getStoreInfo();
+			const storeId = storeInfo ? storeInfo.storeId : 2;
+			
+			const params = {
+				classificationName: categoryName,
+				parentId: parentKey || 0,
+				storeId: storeId
+			};
+			
+			addClassification(params)
+				.then(res => {
+					uni.showToast({ 
+						title: `成功创建${level === 1 ? '一级' : level === 2 ? '二级' : '三级'}分类`, 
+						icon: 'success' 
+					});
+					this.closeCreateModal();
+					this.loadClassificationTree();
+				})
+				.catch(error => {
+					console.error('创建分类失败:', error);
+					uni.showToast({ title: '创建分类失败', icon: 'none' });
+				});
+		},
+		findCategoryName(categories, id) {
+			for (const category of categories) {
+				if (category.id === id) return category.classificationName;
+				if (category.children && category.children.length > 0) {
+					const found = this.findCategoryName(category.children, id);
+					if (found) return found;
+				}
+			}
+			return '分类名称';
+		},
+		editCategory(key, level) {
+			let oldName;
+			const systemCategoryNames = {
+				otc: '非处方药(OTC)', rx: '处方药(RX)', vetOtc: '兽用非处方药', vetRx: '兽用处方药',
+				'otc-1': '甲类非处方药', 'otc-2': '乙类非处方药'
+			};
+			
+			if (systemCategoryNames[key]) {
+				oldName = systemCategoryNames[key];
+			} else {
+				oldName = this.findCategoryName(this.categories, key);
+			}
+			
+			uni.showModal({
+				title: '编辑分类名称',
+				editable: true,
+				content: oldName,
+				success: (res) => {
+					if (res.confirm && res.content) {
+						uni.showToast({ title: '编辑成功', icon: 'success' });
+						// TODO: 调用编辑API
+					}
+				}
+			});
+		},
+		// 切换菜单选项的显示/隐藏
+		toggleMenuOptions(categoryId, level) {
+			if (this.showMenuOptions && this.selectedCategoryId === categoryId) {
+				// 如果点击的是当前显示选项的分类，关闭选项
+				this.showMenuOptions = false;
+				this.selectedCategoryId = null;
+			} else {
+				// 否则显示当前分类的菜单选项
+				this.showMenuOptions = true;
+				this.selectedCategoryId = categoryId;
+				this.selectedCategoryLevel = level;
+			}
+		},
+		// 显示重命名弹窗
+		showRenameDialog(categoryId) {
+			// 关闭菜单选项
+			this.showMenuOptions = false;
+			this.selectedCategoryId = null;
+			
+			// 查找分类名称
+			const categoryName = this.findCategoryName(this.categories, categoryId);
+			
+			// 打开重命名弹窗
+			this.renameCategoryId = categoryId;
+			this.renameCategoryName = categoryName;
+			this.renameDialogVisible = true;
+		},
+		// 查找分类名称（递归）
+		findCategoryName(categories, id) {
+			for (const category of categories) {
+				if (category.id === id) {
+					return category.classificationName;
+				}
+				if (category.children && category.children.length > 0) {
+					const found = this.findCategoryName(category.children, id);
+					if (found) {
+						return found;
+					}
+				}
+			}
+			return '';
+		},
+		// 显示删除确认弹窗
+		showDeleteConfirm(categoryId) {
+			// 关闭菜单选项
+			this.showMenuOptions = false;
+			this.selectedCategoryId = null;
+			
+			// 使用现有的删除分类方法
+			this.deleteCategory(categoryId, this.selectedCategoryLevel);
+		},
+		// 删除分类
+		deleteCategory(key, level) {
+			uni.showModal({
+				title: '提示',
+				content: '确定删除该分类吗？',
+				success: (res) => {
+					if (res.confirm) {
+						// 调用删除API
+						deleteClassification(key)
+							.then(res => {
+								if (res.code === 200) {
+									uni.showToast({ title: '删除成功', icon: 'success' });
+									// 刷新分类列表
+									this.loadClassificationTree();
+								} else {
+									uni.showToast({ title: res.msg || '删除失败', icon: 'none' });
+								}
+							})
+							.catch(error => {
+								console.error('删除分类失败:', error);
+								uni.showToast({ title: '网络请求失败', icon: 'none' });
+							});
+					}
+				}
+			});
+		},
+		// 关闭重命名弹窗
+		closeRenameDialog() {
+			this.renameDialogVisible = false;
+			this.renameCategoryId = null;
+			this.renameCategoryName = '';
+		},
+		// 查找分类的parentId（递归）
+		findCategoryParentId(categories, id) {
+			for (const category of categories) {
+				// 检查当前分类的子分类
+				if (category.children && category.children.length > 0) {
+					for (const child of category.children) {
+						if (child.id === id) {
+							return category.id; // 返回父分类ID
+						}
+						// 检查三级分类
+						if (child.children && child.children.length > 0) {
+							const found = this.findCategoryParentId([child], id);
+							if (found) return found;
+						}
+					}
+					// 递归检查二级分类
+					const found = this.findCategoryParentId(category.children, id);
+					if (found) return found;
+				}
+			}
+			// 如果找不到（说明是一级分类），返回0
+			return 0;
+		},
+		
+		// 确认重命名
+		confirmRename() {
+			if (!this.renameCategoryName.trim()) {
+				uni.showToast({ title: '请输入分类名称', icon: 'none' });
+				return;
+			}
+			
+			// 获取storeId
+			const storeInfo = getStoreInfo();
+			const storeId = storeInfo ? storeInfo.storeId : 2;
+			
+			// 查找分类的parentId
+			const parentId = this.findCategoryParentId(this.categories, this.renameCategoryId);
+			
+			// 构造请求参数
+			const params = {
+				id: this.renameCategoryId,
+				classificationName: this.renameCategoryName,
+				parentId: parentId,
+				storeId: storeId
+			};
+			
+			// 调用重命名API
+			updateClassification(params)
+				.then(res => {
+					if (res.code === 200) {
+						uni.showToast({ title: '重命名成功', icon: 'success' });
+						this.closeRenameDialog();
+						this.loadClassificationTree();
+					} else {
+						uni.showToast({ title: res.msg || '重命名失败', icon: 'none' });
+					}
+				})
+				.catch(error => {
+					console.error('重命名分类失败:', error);
+					uni.showToast({ title: '网络请求失败', icon: 'none' });
+				});
+		}
+	}
+};
+</script>
+
+<style scoped>
+.container {
+	background-color: #F5F5F5;
+	min-height: 100vh;
+}
+
+.navbar {
+	background-color: #E62E24;
+	color: #FFFFFF;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 24rpx 20rpx;
+}
+
+.nav-back, .nav-more {
+	width: 60rpx;
+	text-align: center;
+	font-size: 30rpx;
+}
+
+.nav-title {
+	font-size: 34rpx;
+	font-weight: bold;
+}
+
+.search-bar {
+	padding: 20rpx;
+	background-color: #FFFFFF;
+}
+
+.search-input {
+	display: flex;
+	align-items: center;
+	background-color: #F5F5F5;
+	border-radius: 6rpx;
+	padding: 0 20rpx;
+	height: 72rpx;
+}
+
+.search-icon {
+	color: #999999;
+	margin-right: 12rpx;
+	font-size: 26rpx;
+}
+
+.input {
+	flex: 1;
+	height: 70rpx;
+	font-size: 28rpx;
+	color: #333333;
+	background: transparent;
+	border: none;
+}
+
+.notice-bar {
+	background-color: #FFF9E8;
+	display: flex;
+	align-items: center;
+	padding: 18rpx 20rpx;
+	font-size: 26rpx;
+	color: #8B572A;
+	margin: 0 20rpx 20rpx;
+	border-radius: 6rpx;
+}
+
+.notice-icon {
+	margin-right: 12rpx;
+	font-size: 24rpx;
+}
+
+.notice-action {
+	margin-left: auto;
+	color: #E62E24;
+	font-weight: 500;
+}
+
+.category-list {
+	padding: 0 20rpx 20rpx;
+}
+
+.category-item {
+	background-color: #FFFFFF;
+	border-radius: 8rpx;
+	margin-bottom: 16rpx;
+	box-shadow: 0 1rpx 2rpx rgba(0,0,0,0.05);
+}
+
+.category-header {
+	display: flex;
+	align-items: center;
+	padding: 32rpx 28rpx;
+	font-size: 30rpx;
+	color: #333333;
+	border-bottom: 1rpx solid #F0F0F0;
+}
+
+.no-expand {
+	pointer-events: none;
+}
+.no-expand .category-actions {
+	pointer-events: auto;
+}
+/* 恢复菜单容器和按钮的点击事件 */
+.no-expand .menu-container,
+.no-expand .menu-btn {
+	pointer-events: auto;
+}
+
+.expand-icon {
+	width: 32rpx;
+	text-align: center;
+	margin-right: 14rpx;
+	color: #999999;
+	font-size: 22rpx;
+}
+.expand-icon.placeholder {
+	visibility: hidden;
+}
+
+.category-name {
+	flex: 1;
+	font-weight: 500;
+}
+
+.category-actions {
+	color: #999999;
+	font-size: 26rpx;
+	line-height: 1;
+}
+
+/* 层级缩进样式 */
+.sub-category-group {
+	background-color: #FAFAFA;
+}
+.level2 {
+	padding-left: 56rpx;
+}
+.level3 {
+	padding-left: 112rpx;
+}
+
+.sub-category-item {
+	display: flex;
+	align-items: center;
+	padding: 26rpx 0;
+	font-size: 28rpx;
+	color: #333333;
+	border-bottom: 1rpx solid #F0F0F0;
+	margin: 0 28rpx;
+}
+
+/* 添加按钮样式 */
+.add-sub-btn {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	padding: 26rpx 0;
+	color: #1677FF;
+	font-size: 28rpx;
+	background-color: #FAFAFA;
+	margin: 0 28rpx;
+	border-radius: 6rpx;
+	margin-top: 10rpx;
+}
+
+.add-icon {
+	margin-right: 8rpx;
+	font-size: 24rpx;
+}
+
+.add-primary-btn {
+	background-color: #E62E24;
+	color: #FFFFFF;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 32rpx;
+	margin: 0 20rpx 20rpx;
+	border-radius: 8rpx;
+	font-size: 30rpx;
+	font-weight: 500;
+}
+
+/* 弹窗样式 */
+.modal-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0,0,0,0.4);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 1000;
+}
+
+.modal-content {
+	background: #FFFFFF;
+	width: 80%;
+	border-radius: 12rpx;
+	padding: 40rpx;
+}
+
+.modal-title {
+	text-align: center;
+	font-size: 32rpx;
+	font-weight: bold;
+	margin-bottom: 30rpx;
+}
+
+.modal-input-wrap {
+	margin-bottom: 40rpx;
+}
+
+.modal-input {
+	width: 100%;
+	height: 70rpx;
+	border: 1rpx solid #E5E5E5;
+	border-radius: 6rpx;
+	padding: 0 20rpx;
+	font-size: 28rpx;
+	outline: none;
+	box-sizing: border-box;
+}
+
+.modal-buttons {
+	display: flex;
+	justify-content: space-between;
+}
+
+.modal-btn {
+	width: 48%;
+	height: 70rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 6rpx;
+	font-size: 30rpx;
+}
+
+.modal-btn.cancel {
+	background: #F5F5F5;
+	color: #333333;
+}
+
+.modal-btn.confirm {
+	background: #E62E24;
+	color: #FFFFFF;
+}
+
+/* 菜单容器 */
+.menu-container {
+	position: relative;
+}
+
+/* 菜单按钮 */
+.menu-btn {
+	font-size: 24rpx;
+	color: #999;
+	letter-spacing: 4rpx;
+}
+
+/* 菜单选项列表 */
+.menu-options {
+	position: absolute;
+	top: 100%;
+	right: 0;
+	background-color: #fff;
+	border: 1rpx solid #f0f0f0;
+	border-radius: 8rpx;
+	box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
+	z-index: 1000;
+	margin-top: 10rpx;
+	min-width: 200rpx;
+}
+
+/* 菜单项 */
+.menu-option {
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	font-size: 28rpx;
+	padding: 20rpx 30rpx;
+	cursor: pointer;
+	white-space: nowrap;
+	transition: background-color 0.2s;
+}
+
+/* 菜单项 hover 效果 */
+.menu-option:active {
+	background-color: #f5f5f5;
+}
+
+/* 重命名选项 */
+.menu-option:not(.delete-option) {
+	color: #333;
+}
+
+/* 重命名图标 */
+.rename-icon {
+	font-size: 24rpx;
+}
+
+/* 删除分类选项 */
+.menu-option.delete-option {
+	color: #e62318;
+	border-top: 1rpx solid #f0f0f0;
+}
+
+/* 垃圾桶图标 */
+.menu-option .trash-icon {
+	font-size: 24rpx;
+}
+
+/* 加载状态样式 */
+.loading {
+	text-align: center;
+	padding: 60rpx;
+	color: #999999;
+	font-size: 28rpx;
+}
+
+/* 弹窗样式 */
+.dialog-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 1000;
+}
+
+.dialog {
+	background-color: #fff;
+	border-radius: 12rpx;
+	width: 85%;
+	max-width: 650rpx;
+	padding: 40rpx 50rpx;
+	box-sizing: border-box;
+	position: relative;
+	z-index: 1001;
+}
+
+.dialog-title {
+	font-size: 34rpx;
+	font-weight: 600;
+	text-align: center;
+	margin-bottom: 40rpx;
+	color: #333;
+}
+
+/* 输入框样式 */
+.input-wrapper {
+	position: relative;
+	margin-bottom: 40rpx;
+	width: 100%;
+}
+
+.dialog-input {
+	border: 1rpx solid #e5e5e5;
+	border-radius: 8rpx;
+	padding: 22rpx;
+	font-size: 30rpx;
+	width: 100%;
+	box-sizing: border-box;
+	outline: none;
+	background-color: #fff;
+	height: 88rpx;
+	line-height: normal;
+}
+
+.dialog-input:focus {
+	border-color: #e62318;
+	box-shadow: 0 0 0 2rpx rgba(230, 35, 24, 0.1);
+}
+
+/* 弹窗按钮 */
+.dialog-buttons {
+	display: flex;
+	gap: 24rpx;
+}
+
+.cancel-btn {
+	flex: 1;
+	background-color: #f5f5f5;
+	color: #666;
+	text-align: center;
+	padding: 24rpx;
+	border-radius: 8rpx;
+	font-size: 30rpx;
+	cursor: pointer;
+}
+
+.cancel-btn:active {
+	background-color: #e8e8e8;
+}
+
+.confirm-btn {
+	flex: 1;
+	background-color: #e62318;
+	color: #fff;
+	text-align: center;
+	padding: 24rpx;
+	border-radius: 8rpx;
+	font-size: 30rpx;
+	cursor: pointer;
+}
+
+.confirm-btn:active {
+	background-color: #d11f15;
+}
+
+.action-sheet-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0,0,0,0.4);
+	display: flex;
+	align-items: flex-end;
+	justify-content: center;
+	z-index: 999;
+}
+
+.action-sheet {
+	background: #FFFFFF;
+	width: 100%;
+	border-radius: 12rpx 12rpx 0 0;
+}
+
+.action-item {
+	padding: 30rpx;
+	text-align: center;
+	font-size: 30rpx;
+	color: #333333;
+	border-bottom: 1rpx solid #F0F0F0;
+}
+</style>
\ No newline at end of file
diff --git a/pages/edit/edit.vue b/pages/edit/edit.vue
index 3879e81..3449050 100644
--- a/pages/edit/edit.vue
+++ b/pages/edit/edit.vue
@@ -240,15 +240,85 @@
         />
       </view>
 
-      <!-- 商品品牌 -->
-      <view class="setting-item flex-row-between">
+      <!-- 商品品牌（点击触发弹窗） -->
+      <view class="setting-item flex-row-between" @click="showBrandSelector = true; getBrandData()">
         <view class="setting-label">商品品牌</view>
-        <input
-          class="item-input"
-          type="text"
-          placeholder="请输入商品品牌"
-          v-model="goodsInfo.brand"
-        />
+        <view class="flex-row">
+          <text class="selected-value">{{ goodsInfo.brand || '请选择品牌' }}</text>
+          <text class="right-arrow">></text>
+        </view>
+      </view>
+
+      <!-- 品牌选择弹窗（完全匹配参考代码+图片） -->
+      <view v-if="showBrandSelector" class="brand-selector-overlay" @click="closeBrandSelector">
+        <view class="brand-selector-container" @click.stop>
+          <!-- 头部 -->
+          <view class="selector-header">
+            <view class="header-left" @click="closeBrandSelector">
+              <text class="close-icon">×</text>
+            </view>
+            <view class="header-title">选择品牌</view>
+            <view class="header-right" @click="confirmSelectedBrand">
+              <text class="confirm-btn">完成</text>
+            </view>
+          </view>
+          
+          <!-- 搜索框 -->
+          <view class="search-box">
+            <input 
+              class="search-input" 
+              type="text" 
+              placeholder="搜索品牌名称"
+              v-model="brandSearchKeyword"
+            />
+          </view>
+          
+          <!-- 品牌列表（二级树状结构） -->
+          <view class="brand-list">
+            <!-- 普通品牌项 - 默认品牌 -->
+            <view 
+              class="brand-item" 
+              :class="{active: selectedBrand === '默认品牌'}"
+              @click="selectBrand('默认品牌')"
+            >
+              默认品牌
+            </view>
+
+            <!-- 动态生成品牌列表 -->
+            <template v-for="brand in brandData">
+              <!-- 父节点 -->
+              <view 
+                class="brand-parent-item" 
+                @click="toggleBrandExpand(brand.id)"
+                :key="brand.id"
+              >
+                <text 
+                  class="expand-icon" 
+                  :class="{expanded: expandedBrands[brand.id]}"
+                >▼</text>
+                <text class="parent-text">{{ brand.brandName }}</text>
+              </view>
+
+              <!-- 子节点（展开时显示） -->
+              <view v-if="expandedBrands[brand.id]" class="brand-child-item" :key="brand.id + '-children'">
+                <view 
+                  v-for="child in brand.children" 
+                  :key="child.id"
+                  class="brand-item child" 
+                  :class="{active: selectedBrand === child.brandName}"
+                  @click="selectBrand(child.brandName)"
+                >
+                  {{ child.brandName }}
+                </view>
+              </view>
+            </template>
+          </view>
+          
+          <!-- 品牌管理入口 -->
+          <view class="brand-management" @click="goToBrandManagement">
+            <text class="management-text">品牌管理</text>
+          </view>
+        </view>
       </view>
 
       <!-- 商品编码 -->
@@ -273,7 +343,6 @@
 <script>
 import { getProductDetail, updateProduct, updateProductWithFile } from '@/api/product'
 import { getStoreId } from '@/utils/auth'
-
 export default {
   name: 'GoodsEdit',
   data() {
@@ -288,7 +357,7 @@ export default {
         stock: 1,
         buyPrice: 1.0,
         category: '默认',
-        brand: '默认品牌',
+        brand: '那', // 匹配图片默认选中
         code: '1',
         shelfCode: '',
         productionDate: ''
@@ -314,7 +383,13 @@ export default {
         { label: '6个月', days: 180 },
         { label: '8个月', days: 240 },
         { label: '10个月', days: 300 }
-      ]
+      ],
+      // 品牌选择弹窗相关
+      showBrandSelector: false,
+      brandSearchKeyword: '',
+      selectedBrand: '那', // 匹配图片默认选中
+      brandData: [], // 品牌数据
+      expandedBrands: {} // 记录展开状态的对象
     }
   },
   onLoad(options) {
@@ -420,11 +495,12 @@ export default {
             stock: data.stockQuantity || this.goodsInfo.stock,
             buyPrice: data.costPrice || this.goodsInfo.buyPrice,
             category: this.goodsInfo.category,
-            brand: this.goodsInfo.brand,
+            brand: data.productBrand || this.goodsInfo.brand,
             code: data.productCode || this.goodsInfo.code
           };
           
           this.activePrice = data.storePrice || this.goodsInfo.salePrice;
+          this.selectedBrand = data.productBrand || this.goodsInfo.brand;
           
           if (data.shelfLife) {
             this.switchStatus.expire = true;
@@ -506,7 +582,8 @@ export default {
           shelfLife: this.switchStatus.expire ? this.expireSettings.days : null,
           approaching: this.switchStatus.expire ? this.expireSettings.warnDays : null,
           productionDate: this.goodsInfo.productionDate || '',
-          storeId: storeId
+          storeId: storeId,
+          productBrand: this.goodsInfo.brand
         };
         
         const res = await updateProductWithFile(this.goodsInfo.imageUrl || '', formData);
@@ -535,6 +612,54 @@ export default {
           icon: 'none'
         });
       }
+    },
+    // 获取品牌数据
+    async getBrandData() {
+      try {
+        const res = await uni.request({
+          url: 'http://193.112.94.36:8081/mall/brand/getTree/2',
+          method: 'GET'
+        });
+        
+        if (res[1] && res[1].data && res[1].data.code === 200) {
+          this.brandData = res[1].data.data;
+        } else {
+          uni.showToast({
+            title: '获取品牌数据失败',
+            icon: 'none'
+          });
+        }
+      } catch (error) {
+        console.error('获取品牌数据失败:', error);
+        uni.showToast({
+          title: '网络请求失败',
+          icon: 'none'
+        });
+      }
+    },
+    
+    // 品牌选择弹窗方法
+    selectBrand(brandName) {
+      this.selectedBrand = brandName;
+    },
+    confirmSelectedBrand() {
+      this.goodsInfo.brand = this.selectedBrand;
+      this.showBrandSelector = false;
+      this.brandSearchKeyword = '';
+    },
+    closeBrandSelector() {
+      this.showBrandSelector = false;
+      this.brandSearchKeyword = '';
+    },
+    toggleBrandExpand(brandId) {
+      this.$set(this.expandedBrands, brandId, !this.expandedBrands[brandId]);
+    },
+    goToBrandManagement() {
+      this.showBrandSelector = false;
+      uni.navigateTo({
+        url: '/pages/addBrand/addBrand'
+      });
+	  
     }
   }
 };
@@ -889,4 +1014,126 @@ export default {
     }
   }
 }
+
+// 商品品牌选中值样式
+.selected-value {
+  font-size: 30rpx;
+  color: #333;
+  margin-right: 10rpx;
+}
+
+// --------------------------
+// 品牌选择弹窗样式（完全匹配参考代码）
+// --------------------------
+.brand-selector-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: flex-end;
+  z-index: 999;
+}
+
+.brand-selector-container {
+  width: 100%;
+  background: #fff;
+  border-radius: 16rpx 16rpx 0 0;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.selector-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 30rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  .close-icon {
+    font-size: 36rpx;
+    color: #666;
+  }
+  .header-title {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #333;
+  }
+  .confirm-btn {
+    font-size: 30rpx;
+    color: #E62429;
+  }
+}
+
+.search-box {
+  padding: 20rpx 30rpx;
+  .search-input {
+    width: 100%;
+    padding: 20rpx;
+    background: #f5f5f5;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+  }
+}
+
+.brand-list {
+  flex: 1;
+  overflow-y: auto;
+  // 普通品牌项
+  .brand-item {
+    padding: 30rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+    font-size: 30rpx;
+    color: #333;
+    position: relative;
+    &.active {
+      color: #E62429;
+      &::after {
+        content: "✓";
+        position: absolute;
+        right: 30rpx;
+        top: 50%;
+        transform: translateY(-50%);
+        font-size: 28rpx;
+      }
+    }
+    // 子节点样式
+    &.child {
+      padding-left: 60rpx;
+      background-color: #fafafa;
+    }
+  }
+
+  // 父节点样式
+  .brand-parent-item {
+    padding: 30rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+    font-size: 30rpx;
+    color: #333;
+    display: flex;
+    align-items: center;
+    .expand-icon {
+      font-size: 24rpx;
+      margin-right: 10rpx;
+      color: #999;
+      transition: transform 0.2s ease;
+      &.expanded {
+        transform: rotate(180deg);
+      }
+    }
+    .parent-text {
+      flex: 1;
+    }
+  }
+}
+
+.brand-management {
+  padding: 30rpx;
+  text-align: center;
+  color: #1677FF;
+  font-size: 28rpx;
+  border-top: 1rpx solid #f0f0f0;
+}
 </style>
\ No newline at end of file
diff --git a/pages/enter/enter.vue b/pages/enter/enter.vue
index b69526c..a396dc8 100644
--- a/pages/enter/enter.vue
+++ b/pages/enter/enter.vue
@@ -145,7 +145,7 @@ export default {
       uni.navigateBack({ delta: 1 });
     },
     goImport() {
-      uni.navigateTo({ url: '/pages/Import/Import' });
+      uni.navigateTo({ url: '/pages/import/import' });
     },
     goNoCode() {
       uni.navigateTo({ url: '/pages/NoCode/NoCode' });
diff --git a/pages/Import /Import .vue b/pages/import/import.vue
similarity index 100%
rename from pages/Import /Import .vue
rename to pages/import/import.vue
diff --git a/pages/product/product.vue b/pages/product/product.vue
index 93434df..c16beff 100644
--- a/pages/product/product.vue
+++ b/pages/product/product.vue
@@ -423,7 +423,7 @@
 			goToCategoryManagement() {
 				this.$refs.popup.close();
 				uni.navigateTo({
-					url: '/pages/categoryManagement/categoryManagement'
+					url: '/pages/category/category'
 				});
 			},
 			// 品牌管理