diff --git a/java-mall-app-shop-admin/api/order.js b/java-mall-app-shop-admin/api/order.js
index 872b96e..5ea888a 100644
--- a/java-mall-app-shop-admin/api/order.js
+++ b/java-mall-app-shop-admin/api/order.js
@@ -14,14 +14,15 @@ import config from "../config/config";
  *  status: 1, 1-进行中；2-超时的订单；3-退款的订单
  *  }
  * @returns {  }
- * @see https://mall.gpxscs.cn/mobile/shop/userOrder/mch/order/list
+ * @see https://mall.gpxscs.cn/admin/shop/shop-order-base/mch/order/list
  */
 
 export function GetOrderList(params) {
   return http({
-    url: "/shop/userOrder/mch/order/list",
+    url: "/shop/shop-order-base/mch/order/list",
     method: "post",
     data: params,
+    baseURL: config.adminApi,
   });
 }
 
diff --git a/java-mall-app-shop-admin/api/warehouse/classifyList.js b/java-mall-app-shop-admin/api/warehouse/classifyList.js
new file mode 100644
index 0000000..b110804
--- /dev/null
+++ b/java-mall-app-shop-admin/api/warehouse/classifyList.js
@@ -0,0 +1,52 @@
+import http from "../../utils/http";
+import config from "../../config/config";
+
+/** 获取店铺商品分类
+ *
+ * @author Seven
+ * @data 2025-7-11
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-base-product-category/list
+ */
+
+export function GetCommodityClassify() {
+  return http({
+    url: "/shop/shop-base-product-category/list",
+    method: "get",
+    baseURL: config.adminApi,
+  });
+}
+
+/** 修改店铺商品分类
+ *
+ * @author Seven
+ * @data 2025-7-13
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-base-product-category/edit
+ */
+
+export function UpdateCommodityClassify(params) {
+  return http({
+    url: "/shop/shop-base-product-category/edit",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/** 删除店铺商品分类
+ *
+ * @author Seven
+ * @data 2025-7-13
+ * @returns {  category_id }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-base-product-category/delete
+ */
+
+export function DelectCommodityClassify(params) {
+  return http({
+    url: "/shop/shop-base-product-category/delete",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
diff --git a/java-mall-app-shop-admin/api/warehouse/productList.js b/java-mall-app-shop-admin/api/warehouse/productList.js
index 6aafee6..9cec28a 100644
--- a/java-mall-app-shop-admin/api/warehouse/productList.js
+++ b/java-mall-app-shop-admin/api/warehouse/productList.js
@@ -70,3 +70,21 @@ export function DelectCommodity(params) {
     baseURL: config.adminApi,
   });
 }
+
+/** 获取商品规格 库存 和 价格
+ *
+ * @author Seven
+ * @data 2025-7-6
+ * @param { product_id }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-item/items?product_id=23591&source_lang=zh_CN
+ */
+
+export function GetCommoditSpecification(params) {
+  return http({
+    url: "/shop/shop-product-item/items",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
diff --git a/java-mall-app-shop-admin/api/warehouse/typeManage.js b/java-mall-app-shop-admin/api/warehouse/typeManage.js
new file mode 100644
index 0000000..b5a1036
--- /dev/null
+++ b/java-mall-app-shop-admin/api/warehouse/typeManage.js
@@ -0,0 +1,23 @@
+import http from "../../utils/http";
+import config from "../../config/config";
+
+/** 获取店铺商品分类
+ *
+ * @author Seven
+ * @data 2025-7-12
+ * @params {
+ *  pageNum
+ *  pageSize
+ * }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-base-product-type/list
+ */
+
+export function GetTypeManageList(params) {
+  return http({
+    url: "/shop/shop-base-product-type/list",
+    method: "get",
+    params,
+    baseURL: config.adminApi,
+  });
+}
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue b/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
index d55bdaf..cbec742 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
@@ -573,7 +573,7 @@ export default {
       height: 0, //scroll-view高度
       top: 0,
       currentTab: 0, //预设当前项的值
-      current: -1, // 手风琴状态
+      current: 0, // 手风琴状态
       scrollViewId: "id_0",
       commodityStatusList: [
         {
@@ -638,19 +638,7 @@ export default {
       showRightPopup: false,
     };
   },
-  computed: {
-    hasCheckboxValue() {
-      // 递归检查 checkboxList 是否有值
-      const check = (items) => {
-        for (const item of items) {
-          if (item.checkboxList?.length > 0) return true;
-          if (item.children?.length > 0 && check(item.children)) return true;
-        }
-        return false;
-      };
-      return check(this.tabbar);
-    },
-  },
+  computed: {},
   onLoad: function (options) {
     setTimeout(() => {
       uni.getSystemInfo({
@@ -727,9 +715,8 @@ export default {
         // 应用递归函数处理整个 tabbar
         this.tabbar = resetCheckboxLists(res.data);
 
-        console.log(this.tabbar);
         if (this.tabbar.length > 0) {
-          if (this.tabbar[0].children.length) {
+          if (this.tabbar[0].children.length > 0) {
             this.current = 0; // 打开手风琴
             this.currentTab = this.tabbar[0].children[0].id;
             this.currCategoryId = this.tabbar[0].children[0].id;
@@ -980,7 +967,6 @@ export default {
       let index = e.index;
       //手风琴展开状态  -1 == 不展开
       const oldCategoryId = this.currCategoryId;
-
       this.current = this.current == index ? -1 : e.index;
 
       // 如果current没有实际变化（点击的是已经展开的项），直接返回
@@ -1318,9 +1304,14 @@ export default {
       if (res && res.status == 200) {
         uni.$u.toast("操作成功");
 
+        this.commodityList = this.commodityList.filter(
+          (item) => !productIds.includes(item.product_id)
+        );
+
         await this.updateCommodityStatistics();
 
         this.clearCheckboxLists(this.tabbar);
+
         this.selectCommodityList = [];
       }
 
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue b/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
index c8c50de..7565d35 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
@@ -460,8 +460,8 @@ export default {
       this.checkboxAllList = [];
       if (this.isNoDownCommodityData) return;
       this.loadingDownCommodityData = true;
+      this.pageNum = this.pageNum + 1;
       this.time = setTimeout(() => {
-        this.pageNum = this.pageNum + 1;
         this.getProductList();
       }, 500);
     },
@@ -791,6 +791,12 @@ export default {
     }
   }
 
+  .commodity-type-popup {
+    .commodity-type-popup-content {
+      height: 500px;
+    }
+  }
+
   .no-data {
     .no-data-bg {
       margin: 60% auto;
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue b/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
index e69de29..782780e 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
@@ -0,0 +1,1139 @@
+<template>
+  <view class="classifyList-container">
+    <view class="tips">
+      一级分类数量过多，将严重影响买家进店转化 。我们建议25个为宜
+    </view>
+    <view class="no-data" v-if="classifyList.length <= 0 && !loading">
+      <view class="no-data-bg"></view>
+      <view class="no-data-tips">暂无分类</view>
+    </view>
+    <view class="classifyList-content">
+      <favorite-loading
+        class="classifyList-loading"
+        v-show="loading"
+        :color="'#fe4119'"
+        text=""
+        animation="spinner15"
+      ></favorite-loading>
+
+      <scroll-view
+        v-if="classifyList.length > 0 && !loading"
+        scroll-y
+        scroll-with-animation
+        :show-scrollbar="false"
+        class="classifyList-scroll"
+      >
+        <block v-for="(item, index) of classifyList" :key="index">
+          <tui-collapse
+            :index="index"
+            :current="current"
+            hdBgColor="#fff"
+            :arrow="item.sub.length > 0 ? true : false"
+            @click="handerCollApse($event, item)"
+          >
+            <template v-slot:title>
+              <view class="stair-item">
+                <view class="classify-info">
+                  <view class="stair-name">{{ item.category_name }}</view>
+                  <view class="stair-tips" v-if="item.sub.length > 0">
+                    二级分类{{ item.category_order }}
+                  </view>
+                  <view class="stair-tips" v-else>
+                    一级分类{{ item.category_order }}
+                  </view>
+                </view>
+                <view
+                  class="classify-btn-content"
+                  @click.stop="handerSetting($event, item)"
+                >
+                  <u-button
+                    class="classify-btn-item"
+                    :hairline="true"
+                    :plain="true"
+                    shape="circle"
+                  >
+                    设置
+                  </u-button>
+                </view>
+              </view>
+            </template>
+            <template v-slot:content v-if="item.sub.length > 0">
+              <view
+                class="second-level-item"
+                v-for="(group, index2) of item.sub"
+                @click="handerCollApseChildren(group)"
+              >
+                <view
+                  class="second-level-item-info"
+                  :style="
+                    item.sub.length >= 2 && index2 !== item.sub.length - 1
+                      ? 'padding-bottom: 40rpx'
+                      : ''
+                  "
+                >
+                  <view class="second-level-item-info-name">
+                    {{ group.category_name }}
+                  </view>
+                  <view class="second-level-item-info-sort">
+                    排序{{ group.category_order }}
+                  </view>
+                </view>
+                <view class="classify-btn-content">
+                  <u-button
+                    class="classify-btn-item"
+                    :hairline="true"
+                    :plain="true"
+                    shape="circle"
+                    @click="handersecondlevelSetting(item, group)"
+                  >
+                    设置
+                  </u-button>
+                </view>
+              </view>
+            </template>
+          </tui-collapse>
+        </block>
+      </scroll-view>
+    </view>
+    <view class="classifyList-bottom">
+      <view class="bottom-list">
+        <u-button
+          class="bottom-btn-item"
+          :hairline="true"
+          :plain="true"
+          shape="circle"
+          @click="handerAddStairClassify()"
+        >
+          <u-icon class="bottom-icon" name="plus-circle"></u-icon>
+          新建分类
+        </u-button>
+      </view>
+    </view>
+    <!--设置一级分类底部弹窗-->
+    <u-popup
+      class="stair-popup"
+      :show="showBottomStairPopup"
+      mode="bottom"
+      zIndex="10075"
+      @close="handerCloseBottomStairPopup"
+    >
+      <view class="stair-popup-content">
+        <view
+          class="stair-bottom-item"
+          @click="handerShowRightEditNamePopup(false)"
+        >
+          修改名称
+        </view>
+        <view class="stair-bottom-item" v-if="typeManageList.length > 0">
+          <view
+            :class="{
+              'stair-bottom-item-disabled': currStairItem.type_id != 0,
+            }"
+            @click="handerShowRightPopup(true)"
+          >
+            修改类型
+          </view>
+          <view
+            class="stair-bottom-item-tips"
+            v-if="currStairItem.type_id != 0"
+          >
+            已经添加有商品类型无法修改
+          </view>
+        </view>
+        <view class="stair-bottom-item" @click="handerShowRightAddSecondLevel">
+          新增二级分类
+        </view>
+        <view
+          class="stair-bottom-item stair-bottom-item-delect"
+          @click="handerShowDelectPopup(false)"
+        >
+          删除
+        </view>
+        <view
+          class="stair-bottom-item stair-bottom-item-cancel"
+          @click="showBottomStairPopup = false"
+        >
+          取消
+        </view>
+      </view>
+    </u-popup>
+    <!--设置二级分类底部弹窗-->
+    <u-popup
+      class="stair-popup"
+      :show="showBottomSecondLevelPopup"
+      mode="bottom"
+      zIndex="10075"
+      @close="handerCloseBottomSecondLevelPopup"
+    >
+      <view class="stair-popup-content">
+        <view
+          class="stair-bottom-item"
+          @click="handerShowRightEditNamePopup(true)"
+        >
+          修改名称
+        </view>
+        <view class="stair-bottom-item" v-if="typeManageList.length > 0">
+          <view
+            :class="{
+              'stair-bottom-item-disabled': currSecondLevelItem.type_id != 0,
+            }"
+            @click="handerShowRightPopup(false)"
+          >
+            修改类型
+          </view>
+          <view
+            class="stair-bottom-item-tips"
+            v-if="currStairItem.type_id != 0"
+          >
+            已经添加有商品类型无法修改
+          </view>
+        </view>
+        <view
+          class="stair-bottom-item stair-bottom-item-delect"
+          @click="handerShowDelectPopup(true)"
+        >
+          删除
+        </view>
+        <view
+          class="stair-bottom-item stair-bottom-item-cancel"
+          @click="showBottomSecondLevelPopup = false"
+        >
+          取消
+        </view>
+      </view>
+    </u-popup>
+    <!--确认删除弹窗-->
+    <u-popup
+      class="affirm-popup"
+      zIndex="10077"
+      :show="showDelectPopup"
+      mode="center"
+    >
+      <view class="affirm-popup-content">
+        <view class="affirm-popup-title">
+          确认删除"{{ delectClassifyItem.category_name }}"?
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showDelectPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerDelectClassify"
+          >
+            确认
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <!--商品类型弹窗-->
+    <u-popup
+      class="commodity-type-popup"
+      :show="showCommodityTypePopup"
+      mode="bottom"
+      zIndex="10080"
+      closeable
+      @close="handerCloseTypePopup"
+    >
+      <view class="commodity-type-popup-content">
+        <view class="commodity-type-popup-title">选择商品类型</view>
+        <view class="no-commodity-type" v-if="typeManageList.length <= 0">
+          <view class="no-commodity-type-bg"></view>
+          <view class="no-commodity-type-tips" @click="skipuBrandList">
+            暂无商品，马上添加
+            <u-icon
+              style="display: inline-block"
+              name="arrow-right"
+              color="red"
+            ></u-icon>
+          </view>
+        </view>
+
+        <scroll-view
+          v-if="typeManageList.length > 0"
+          scroll-y
+          class="commodity-type-search-scroll"
+          :show-scrollbar="false"
+          @scrolltolower="handerScrolltolower"
+          refresher-enabled
+          :refresher-triggered="isRefreshing"
+          @refresherrefresh="handleRefresh"
+          :style="{
+            maxHeight: typeManageList.length >= 2 ? '500px' : 'none',
+            overflowY: typeManageList.length >= 2 ? 'auto' : 'visible',
+          }"
+        >
+          <u-radio-group
+            class="commodity-type-radio-group"
+            v-model="radioValue"
+            placement="column"
+          >
+            <u-radio
+              class="commodity-type-radio"
+              v-for="(item, index) in typeManageList"
+              :key="index"
+              :label="item.type_name"
+              :name="item.type_id"
+            ></u-radio>
+          </u-radio-group>
+          <view
+            class="m-loading-box"
+            v-if="typeManageList.length > 0 && !isNotypeManageData"
+          >
+            <block v-if="loadingDownTypeManageData">
+              <view class="u-loadmore">
+                <view class="u-loading"></view>
+                <text class="u-loadmore-tips">正在加载...</text>
+              </view>
+            </block>
+            <block v-else>
+              <view class="u-loadmore u-loadmore-line">
+                <text class="u-loadmore-tips">没有更多商品类型了 ~</text>
+              </view>
+            </block>
+          </view>
+        </scroll-view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerCancelCommodityTpye"
+          >
+            取消
+          </u-button>
+          <u-button
+            v-show="typeManageList.length > 0"
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerAffirmCommodityType"
+          >
+            确认
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <!--新建一级分类弹窗-->
+    <u-popup
+      class="add-popup"
+      zIndex="10077"
+      :show="showAddStairClassifyPopup"
+      mode="center"
+    >
+      <view class="add-popup-content">
+        <view class="add-popup-title">新建分类</view>
+        <view class="add-tips">
+          注意，确认商品类型后不可修改名称，商品类型，虚拟商品!
+        </view>
+        <u--form
+          labelPosition="left"
+          :model="form"
+          ref="uForm"
+          label-width="100"
+          :rules="rules"
+        >
+          <u-form-item
+            label="分类名称"
+            prop="category_name"
+            class="form-item"
+            required
+          >
+            <u--textarea
+              class="u-textarea"
+              v-model="form.category_name"
+              count
+              autoHeight
+              maxlength="8"
+              placeholder="请输入二级分类名称"
+            ></u--textarea>
+          </u-form-item>
+          <u-form-item
+            label="商品类型"
+            prop="type_name"
+            class="form-item"
+            @click="hadnerShowCommodityTypePopup()"
+          >
+            <u--input
+              v-model="form.type_name"
+              disabled
+              disabledColor="#ffffff"
+              placeholder="请选择商品类型"
+              border="none"
+              @click="hideKeyboard()"
+            ></u--input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <u-form-item label="分类排序" prop="category_order" class="form-item">
+            <u--input
+              v-model="form.category_order"
+              type="number"
+              placeholder="请输入商品排序"
+              border="none"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="允许虚拟商品"
+            prop="category_order"
+            class="form-item form-item-switch"
+          >
+            <u-switch
+              v-model="form.category_virtual_enable"
+              :activeValue="1"
+              :inactiveValue="0"
+              activeColor="#5ac725"
+              inactiveColor="#fe411b"
+            ></u-switch>
+          </u-form-item>
+        </u--form>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showAddStairClassifyPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerAffirmEditClassify"
+          >
+            添加
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <!--编辑弹窗-->
+    <u-popup
+      class="right-popup"
+      zIndex="10076"
+      :overlay="false"
+      :show="showRightPopup"
+      mode="right"
+    >
+      <editClassify
+        :classifyItem="currStairItem"
+        :currSecondLevelItem="currSecondLevelItem"
+        :isEditStairType="isEditStairType"
+        :isEditSecondLevelName="isEditSecondLevelName"
+        :isEditSecondLevelType="isEditSecondLevelType"
+        :isAddSecondLevelClassify="isAddSecondLevelClassify"
+        @pageBack="handerEditPage()"
+        @updateClassify="handerUpdateClassify"
+        @addClassify="handerUpdateAddClassify"
+        :isEdit="isEdit"
+      ></editClassify>
+    </u-popup>
+    <u-toast ref="uToast"></u-toast>
+  </view>
+</template>
+
+<script>
+import {
+  GetCommodityClassify,
+  UpdateCommodityClassify,
+  DelectCommodityClassify,
+} from "@/api/warehouse/classifyList";
+import { GetTypeManageList } from "@/api/warehouse/typeManage";
+import tuiCollapse from "../manage/components/tui-collapse/classify-collapse.vue";
+import editClassify from "../manage/editClassify.vue";
+export default {
+  name: "classifyList",
+  components: {
+    tuiCollapse,
+    editClassify,
+  },
+  data() {
+    return {
+      classifyList: [],
+      current: -1,
+      loading: false,
+      showBottomStairPopup: false,
+      showBottomSecondLevelPopup: false,
+      showRightPopup: false,
+      currStairItem: {
+        sub: [],
+      },
+      currSecondLevelItem: {},
+      typeManageList: [],
+      pageNum: 1,
+      pageSize: 20,
+      isEdit: true,
+      isEditStairType: false,
+      isEditSecondLevelType: false,
+      showDelectPopup: false,
+      delectClassifyItem: {},
+      isDelectSubset: false,
+      isEditSecondLevelName: false,
+      isAddSecondLevelClassify: false,
+      showAddStairClassifyPopup: false,
+      showCommodityTypePopup: false,
+      isRefreshing: false,
+      isNotypeManageData: false,
+      isNoDownTypeManageData: false,
+      loadingDownTypeManageData: false,
+      radioValue: "",
+      time: null,
+      form: {
+        type_category_id: 0,
+        category_name: "",
+        category_virtual_enable: 0,
+        type_name: "",
+      },
+      rules: {
+        contact_name: [
+          {
+            required: true,
+            message: "请输入联系人",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+        ],
+      },
+      rules2: {
+        contact_name: [
+          {
+            required: true,
+            message: "请输入联系人",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+        ],
+      },
+    };
+  },
+  computed: {},
+  onLoad: function (options) {},
+  onReady() {
+    // this.$refs["uForm"].setRules(this.rule2);
+  },
+  onShow() {
+    this.getCommodityClassify();
+    this.getTypeManageList();
+  },
+
+  mounted() {},
+  methods: {
+    async getCommodityClassify(isAdd = false) {
+      if (!isAdd) {
+        this.loading = true;
+      }
+      let res = await GetCommodityClassify();
+      if (res && res.status == 200) {
+        this.classifyList = res.data;
+      }
+      this.loading = false;
+    },
+    async getTypeManageList() {
+      if (this.isRefreshing) {
+        this.pageNum = 1;
+        this.isNotypeManageData = false;
+        this.isNoDownTypeManageData = false;
+      }
+
+      let params = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+      };
+
+      let res = await GetTypeManageList(params);
+      if (res && res.status == 200) {
+        if (this.loadingDownTypeManageData) {
+          if (res.data.items.length <= 0) {
+            this.loadingDownTypeManageData = false;
+            this.isNoDownTypeManageData = true;
+            return;
+          } else {
+            this.typeManageList = [...this.typeManageList, ...res.data.items];
+          }
+        } else {
+          this.typeManageList = res.data.items;
+        }
+
+        if (this.typeManageList.length <= 0) {
+          this.isNotypeManageData = true;
+        }
+      }
+      this.loadingDownTypeManageData = false;
+      this.isRefreshing = false;
+    },
+
+    handerScrolltolower() {
+      clearTimeout(this.time);
+      if (this.isNoDownTypeManageData) return;
+      this.loadingDownTypeManageData = true;
+      this.pageNum = this.pageNum + 1;
+      this.time = setTimeout(() => {
+        this.getTypeManageList();
+      }, 500);
+    },
+    handleRefresh() {
+      this.isRefreshing = true;
+      this.pageNum = 1;
+      this.getTypeManageList();
+    },
+    handerUpdateAddClassify(list) {
+      this.classifyList = list;
+    },
+    handerEditPage() {
+      this.showRightPopup = false;
+    },
+    handerUpdateClassify(item) {
+      // 找到匹配的索引
+      const index = this.classifyList.findIndex(
+        (group) => group.category_id === item.category_id
+      );
+
+      if (index !== -1) {
+        this.$set(this.classifyList, index, item);
+      }
+
+      console.log(this.classifyList);
+    },
+    handerCollApse(e, item, isStair) {
+      this.current = this.current == e.index ? -1 : e.index;
+    },
+    handerSetting(event, item) {
+      event.stopPropagation();
+      this.currStairItem = item;
+      this.showBottomStairPopup = true;
+    },
+    handerCloseTypePopup() {
+      this.showCommodityTypePopup = false;
+    },
+    handerCloseBottomStairPopup() {
+      this.showBottomStairPopup = false;
+    },
+    handersecondlevelSetting(item, group) {
+      this.showBottomSecondLevelPopup = true;
+      this.currStairItem = item;
+      this.currSecondLevelItem = group;
+    },
+    handerCloseBottomSecondLevelPopup() {
+      this.showBottomSecondLevelPopup = false;
+    },
+    handerShowRightAddSecondLevel() {
+      this.isAddSecondLevelClassify = true;
+      this.showBottomStairPopup = false;
+      this.showRightPopup = true;
+    },
+    hadnerShowCommodityTypePopup() {
+      this.showCommodityTypePopup = true;
+    },
+    handerCancelCommodityTpye() {
+      this.showCommodityTypePopup = false;
+      this.radioValue = "";
+    },
+    handerAffirmCommodityType() {
+      const matchedItem = this.typeManageList.find(
+        (item) => item.type_id === this.radioValue
+      );
+
+      if (matchedItem && Object.keys(matchedItem).length > 0) {
+        this.form.type_name = matchedItem.type_name;
+      }
+
+      this.showCommodityTypePopup = false;
+    },
+    handerAffirmEditClassify() {
+      console.log(this.radioValue);
+
+      this.$refs.uForm.validate().then(async (valid) => {
+        let params = {
+          category_image: "",
+          category_virtual_enable: this.form.category_virtual_enable,
+          category_id: "",
+          type_id: this.radioValue,
+          category_parent_id: 0,
+          category_name: this.form.category_name,
+          category_order: this.form.category_order,
+        };
+
+        let res = await UpdateCommodityClassify(params);
+        if (res && res.status == 200) {
+          this.$refs.uToast.show({
+            message: "添加成功",
+            type: "succeed",
+            duration: 1000,
+          });
+          await this.getCommodityClassify(true);
+        }
+        this.showAddStairClassifyPopup = false;
+        this.radioValue = "";
+      });
+    },
+    handerCollApseChildren(item) {},
+    handerShowRightEditNamePopup(isEditSecondLevelName) {
+      this.showRightPopup = true;
+      this.showBottomStairPopup = false;
+      this.isEditStairType = false;
+      this.isEditSecondLevelType = false;
+      this.isEditSecondLevelName = isEditSecondLevelName;
+    },
+    handerShowRightPopup(isStair) {
+      if (isStair && this.currStairItem.type_id == 0) {
+        this.isEditStairType = true;
+        this.showRightPopup = true;
+        this.showBottomStairPopup = false;
+      }
+
+      if (!isStair && this.currSecondLevelItem.type_id == 0) {
+        this.isEditSecondLevelType = true;
+        this.showRightPopup = true;
+        this.showBottomSecondLevelPopup = false;
+      }
+    },
+    handerAddStairClassify() {
+      this.showAddStairClassifyPopup = true;
+      // setTimeout(() => {
+      //   this.$refs["uForm"].setRules(this.rules);
+      // }, 0);
+    },
+    handerShowDelectPopup(isDelectSubset) {
+      if (!isDelectSubset) {
+        this.delectClassifyItem = this.currStairItem;
+      } else {
+        this.delectClassifyItem = this.currSecondLevelItem;
+      }
+
+      this.isDelectSubset = isDelectSubset;
+      this.showDelectPopup = true;
+    },
+    async handerDelectClassify() {
+      const categoryId = this.delectClassifyItem.category_id;
+
+      let params = {
+        category_id: categoryId,
+      };
+
+      let res = await DelectCommodityClassify(params);
+      if (res && res.status == 200) {
+        if (!this.isDelectSubset) {
+          this.classifyList = this.classifyList.filter(
+            (item) => item.category_id !== categoryId
+          );
+        } else {
+          this.classifyList = this.classifyList.map((parent) => {
+            if (
+              parent.sub &&
+              parent.sub.some((child) => child.category_id === categoryId)
+            ) {
+              return {
+                ...parent,
+                sub: parent.sub.filter(
+                  (child) => child.category_id !== categoryId
+                ),
+              };
+            }
+            return parent;
+          });
+        }
+
+        this.$refs.uToast.show({
+          message: "删除成功",
+          type: "succeed",
+          duration: 1000,
+        });
+      }
+      this.showDelectPopup = false;
+
+      if (!this.isDelectSubset) {
+        this.showBottomStairPopup = false;
+      } else {
+        this.showBottomSecondLevelPopup = false;
+      }
+    },
+    skipuBrandList() {
+      uni.navigateTo({
+        url: "test?id=1&name=uniapp",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/variables.scss";
+.classifyList-container {
+  height: calc(100vh - 148rpx);
+  background: #f5f6fa;
+
+  overflow: hidden;
+
+  .tips {
+    padding: 24rpx 40rpx;
+    font-size: 13px;
+    background: #fdf6f2;
+    border: 1px solid #efe8e2;
+    border-radius: 16rpx;
+    color: #3a3230;
+    margin: 32rpx;
+  }
+
+  .classifyList-content {
+    margin-top: 32rpx;
+    margin: 32rpx;
+    padding: 0 24rpx;
+    background: #fff;
+    border-top-left-radius: 16rpx;
+    border-top-right-radius: 16rpx;
+
+    .stair-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 20rpx 0;
+      margin-left: 40rpx;
+
+      .classify-info {
+        .stair-name {
+          font-size: 17px;
+          font-weight: 600;
+        }
+
+        .stair-tips {
+          margin: 16rpx 0;
+          font-size: 15px;
+          color: #606060;
+        }
+      }
+    }
+  }
+
+  ::v-deep.tui-collapse-body {
+    margin: 20rpx 0;
+  }
+
+  .classifyList-scroll {
+    -ms-overflow-style: none; /* IE和Edge */
+    scrollbar-width: none; /* Firefox */
+    height: calc(100vh - 230px);
+  }
+
+  .classifyList-scroll::-webkit-scrollbar {
+    display: none; /* Chrome, Safari, Opera */
+  }
+
+  .second-level-item {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-left: 40rpx;
+
+    &::before {
+      content: "";
+      position: absolute;
+      height: 100%;
+      border: 1px solid #eeeeee;
+    }
+
+    .second-level-item-info {
+      display: flex;
+      flex-flow: column;
+      justify-content: space-between;
+      padding-left: 20rpx;
+      height: 100rpx;
+
+      .second-level-item-info-name {
+        font-size: 17px;
+        font-weight: 400;
+      }
+
+      .second-level-item-info-sort {
+        font-size: 14px;
+        color: #606060;
+      }
+    }
+  }
+
+  .no-data {
+    .no-data-bg {
+      margin: 50% auto;
+      margin-bottom: 0;
+      width: 300rpx;
+      height: 200rpx;
+      background-image: url("../../../static/warehouse/no-classify.png");
+      background-size: 100%;
+    }
+    .no-data-tips {
+      margin: 80rpx auto;
+      color: #aaaaaa;
+      text-align: center;
+    }
+  }
+
+  .no-commodity-type {
+    .no-commodity-type-bg {
+      margin: 6% auto;
+      margin-bottom: 0;
+      width: 300rpx;
+      height: 200rpx;
+      background-image: url("../../../static/warehouse/no-commodity-type.png");
+      background-size: 100%;
+    }
+
+    .no-commodity-type-tips {
+      margin: 80rpx auto;
+      color: red;
+      text-align: center;
+    }
+  }
+
+  .classify-btn-content {
+    .classify-btn-item {
+      margin: 0;
+      margin-right: 20rpx;
+      width: 120rpx;
+      height: 60rpx;
+      font-size: 24rpx;
+      border-color: #d2d2d2;
+      color: #000;
+
+      &::after {
+        border: none;
+      }
+    }
+  }
+
+  .m-loading-box {
+    text-align: center;
+    padding: 40rpx;
+    color: #aaaa;
+    font-size: 28rpx;
+  }
+
+  .classifyList-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 172rpx;
+    background: #fff;
+    border-top: 2px solid #eeeeee;
+    z-index: 2;
+
+    .bottom-list {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      margin-top: 40rpx;
+
+      .bottom-btn-item {
+        margin: 0;
+        margin-right: 20rpx;
+        width: 400rpx;
+        height: 88rpx;
+        font-size: 32rpx;
+        border-color: #d2d2d2;
+        color: #000;
+
+        .bottom-icon {
+          margin-right: 8rpx;
+        }
+
+        &::after {
+          border: none;
+        }
+      }
+    }
+  }
+
+  .commodity-type-popup {
+    .commodity-type-popup-content {
+      .commodity-type-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .commodity-type-search-scroll {
+      }
+
+      .commodity-type-radio-group {
+        margin: 40rpx;
+
+        .commodity-type-radio {
+          margin-bottom: 40rpx;
+        }
+      }
+    }
+
+    .popup-btn-list {
+      display: flex;
+      margin: 50rpx;
+
+      .btn-item {
+        width: 46%;
+        height: 80rpx;
+        border-color: #909193;
+
+        &::after {
+          border: none;
+        }
+      }
+
+      .btn-item-2 {
+        background: $base-color;
+        color: #fff;
+        border: none;
+      }
+    }
+  }
+
+  .add-popup {
+    ::v-deep.u-popup__content {
+      border-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10076 !important;
+    }
+
+    .add-popup-content {
+      width: 700rpx;
+
+      .add-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .add-tips {
+        text-align: center;
+        color: red;
+      }
+
+      .u-form {
+        margin: 0 40rpx;
+
+        .form-item {
+          margin: 28rpx 0;
+        }
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 80rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+
+  .affirm-popup {
+    ::v-deep.u-popup__content {
+      border-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10076 !important;
+    }
+
+    .affirm-popup-content {
+      width: 600rpx;
+
+      .affirm-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .affirm-popup-tips {
+        padding: 0 60rpx;
+        font-size: 28rpx;
+        text-align: center;
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 80rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+
+  .stair-popup {
+    ::v-deep.u-popup__content {
+      border-top-left-radius: 24rpx;
+      border-top-right-radius: 24rpx;
+    }
+
+    .stair-popup-content {
+      .stair-bottom-item {
+        padding: 32rpx;
+        text-align: center;
+        border-bottom: 1px solid #eeeeee;
+
+        .stair-bottom-item-tips {
+          margin-top: 8rpx;
+          font-size: 24rpx;
+          color: #cccccc;
+        }
+      }
+
+      .stair-bottom-item-disabled {
+        color: #cccccc;
+      }
+
+      .stair-bottom-item-delect {
+        color: $base-color;
+      }
+
+      .stair-bottom-item-cancel {
+        border: none;
+      }
+    }
+  }
+
+  .classifyList-loading {
+    margin: 70% auto;
+    display: flex;
+  }
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/components/tui-collapse/classify-collapse.vue b/java-mall-app-shop-admin/pages/warehouse/manage/components/tui-collapse/classify-collapse.vue
new file mode 100644
index 0000000..5ee9f1b
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/components/tui-collapse/classify-collapse.vue
@@ -0,0 +1,187 @@
+<template>
+  <view class="tui-collapse" :style="{ backgroundColor: bgColor }">
+    <view
+      class="tui-collapse-head"
+      :style="{ backgroundColor: hdBgColor }"
+      @tap.stop="handleClick"
+    >
+      <view class="tui-header" :class="{ 'tui-opacity': disabled }">
+        <view
+          class="tui-collapse-icon tui-icon-arrow"
+          :class="{ 'tui-icon-active': isOpen }"
+          :style="{ color: arrowColor }"
+          v-if="arrow"
+        ></view>
+        <slot name="title"></slot>
+      </view>
+    </view>
+    <view
+      v-if="arrow"
+      class="tui-collapse-body_box"
+      :style="{ backgroundColor: bdBgColor, height: isOpen ? height : '0rpx' }"
+    >
+      <view
+        class="tui-collapse-body"
+        :class="{
+          'tui-collapse-transform': height == 'auto',
+          'tui-collapse-body_show': isOpen && height == 'auto',
+        }"
+      >
+        <slot name="content"></slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "tuiCollapse",
+  emits: ["click"],
+  props: {
+    //collapse背景颜色
+    bgColor: {
+      type: String,
+      default: "transparent",
+    },
+    //collapse-head 背景颜色
+    hdBgColor: {
+      type: String,
+      default: "#fff",
+    },
+    //collapse-body 背景颜色
+    bdBgColor: {
+      type: String,
+      default: "transparent",
+    },
+    //collapse-body实际高度 open时使用
+    height: {
+      type: String,
+      default: "auto",
+    },
+    //索引
+    index: {
+      type: Number,
+      default: 0,
+    },
+    //当前索引，index==current时展开
+    current: {
+      type: Number,
+      default: -1,
+    },
+    // 是否禁用
+    disabled: {
+      type: [Boolean, String],
+      default: false,
+    },
+    //是否带箭头
+    arrow: {
+      type: [Boolean, String],
+      default: true,
+    },
+    //箭头颜色
+    arrowColor: {
+      type: String,
+      default: "#333",
+    },
+  },
+  watch: {
+    current() {
+      this.updateCurrentChange();
+    },
+  },
+  created() {
+    this.updateCurrentChange();
+  },
+  data() {
+    return {
+      isOpen: false,
+    };
+  },
+  methods: {
+    updateCurrentChange() {
+      this.isOpen = this.index == this.current;
+    },
+    handleClick() {
+      if (this.disabled) return;
+      this.$emit("click", {
+        index: Number(this.index),
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+@font-face {
+  font-family: "tuiCollapse";
+  src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAAQ4AA0AAAAABlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAEHAAAABoAAAAciRx3B0dERUYAAAP8AAAAHgAAAB4AKQAKT1MvMgAAAaAAAABCAAAAVjxuR/JjbWFwAAAB9AAAAD4AAAFCAA/pq2dhc3AAAAP0AAAACAAAAAj//wADZ2x5ZgAAAkAAAABEAAAARCs1U/toZWFkAAABMAAAADAAAAA2FpaT+mhoZWEAAAFgAAAAHQAAACQHngOFaG10eAAAAeQAAAAPAAAAEAwAAEBsb2NhAAACNAAAAAoAAAAKACIAAG1heHAAAAGAAAAAHwAAACABDwAdbmFtZQAAAoQAAAFJAAACiCnmEVVwb3N0AAAD0AAAACMAAAA1DunpUnjaY2BkYGAAYja/oO54fpuvDNwsDCBwc4/6fzjtwNDNfICpBMjlYGACiQIAGVAKZnjaY2BkYGBu+N/AEMPCAALMBxgYGVABCwBVNgMsAAAAeNpjYGRgYGBhEGQA0QwMTEDMBYQMDP/BfAYACnYBLQB42mNgZGFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDA7PGJ4xMDf8b2CIYW5gaAAKM4LkANq9C9sAAHjaY2GAABYIdgAAAMAATQB42mNgYGBmgGAZBkYGELAB8hjBfBYGBSDNAoRA/jOG//8hpBQzVCUDIxsDjMnAyAQkmBhQASPDsAcAMCAGoQAAAAAAAAAAAAAAIgAAAAEAQACLA8ACdAAQAAAlASYiBhQXARYyNwE2NCYiBwIA/oYNIBkMAZcNIA0BlwwZIA3uAXoMGSAN/mkMDAGXDSAZDAB42n2QPU4DMRCFn/MHJBJCIKhdUQDa/JQpEyn0CKWjSDbekGjXXnmdSDkBLRUHoOUYHIAbINFyCl6WSZMia+3o85uZ57EBnOMbCv/fJe6EFY7xKFzBETLhKvUX4Rr5XbiOFj6FG9R/hJu4VQPhFi7UGx1U7YS7m9JtywpnGAhXcIon4Sr1lXCN/CpcxxU+hBvUv4SbGONXuIVrZakM4WEwQWCcQWOKDeMCMRwskjIG1qE59GYSzExPN3oRO5s4GyjvV2KXAx5oOeeAKe09t2a+Sif+YMuB1JhuHgVLtimNLiJ0KBtfLJzV3ahzsP2e7ba02L9rgTXH7FENbNT8Pdsz0khsDK+QkjXyMrekElOPaGus8btnKdbzXgiJTrzL9IjHmjR1OvduaeLA4ufyjBx9tLmSPfeoHD5jWQh5v91OxCCKXYY/k9hxGQAAAHjaY2BigAAuMMnIgA5YwKJMjExciUVF+eW6KfnleQAZ0wQyAAAAAAH//wACAAEAAAAMAAAAFgAAAAIAAQADAAMAAQAEAAAAAgAAAAB42mNgYGBkAIKrS9Q5QPTNPer/YTQAQ+0HIAAA)
+    format("woff");
+  font-weight: normal;
+  font-style: normal;
+}
+
+.tui-collapse-icon {
+  font-family: "tuiCollapse" !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.tui-icon-arrow:before {
+  content: "\e600";
+}
+
+.tui-icon-arrow {
+  font-size: 20rpx;
+  transform: rotate(267deg);
+  transform-origin: center center;
+  transition: all 0.3s;
+  position: absolute;
+  top: 12%;
+  left: 0;
+  z-index: 9;
+}
+
+.tui-arrow-padding {
+  padding-right: 62rpx;
+  box-sizing: border-box;
+}
+
+.tui-icon-active {
+  transform: rotate(360deg);
+  transform-origin: center center;
+}
+
+.tui-header {
+  position: relative;
+  z-index: 2;
+}
+.tui-collapse-body_box {
+  transition: all 0.25s;
+  overflow: hidden;
+}
+.tui-collapse-body {
+  transition: all 0.25s;
+  overflow: hidden;
+  position: relative;
+  z-index: 1;
+}
+
+.tui-collapse-transform {
+  opacity: 0;
+  visibility: hidden;
+  -webkit-transform: translateY(-40%);
+  transform: translateY(-40%);
+}
+
+.tui-collapse-body_show {
+  opacity: 1;
+  visibility: visible;
+  -webkit-transform: translateY(0);
+  transform: translateY(0);
+}
+
+.tui-opacity {
+  opacity: 0.6;
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue b/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
new file mode 100644
index 0000000..994886a
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
@@ -0,0 +1,1005 @@
+<template>
+  <view class="editClassify-container">
+    <navBar
+      class="nav-bar"
+      :statusBar="true"
+      :border="false"
+      :fixed="true"
+      :height="'44px'"
+      rightWidth="0"
+      :leftWidth="30"
+      title="编辑分类"
+      backgroundColor="#fff"
+    >
+      <block slot="left">
+        <u-icon
+          name="arrow-left"
+          color="#000"
+          size="20"
+          @click="pageBack()"
+        ></u-icon>
+      </block>
+    </navBar>
+    <u-alert
+      title="注意，确认商品类型后不可修改名称，商品类型，虚拟商品!"
+      :center="true"
+      type="error"
+    ></u-alert>
+    <view class="edit-item">
+      <view class="item-name">一级分类</view>
+      <u--form labelPosition="left" :model="form" ref="uForm" label-width="100">
+        <u-form-item
+          label="分类名称"
+          prop="category_name"
+          class="form-item"
+          required
+        >
+          <u--textarea
+            class="u-textarea"
+            v-model="form.category_name"
+            count
+            autoHeight
+            maxlength="8"
+            placeholder="请输入分类名称"
+            :disabled="form.type_id != 0"
+          ></u--textarea>
+        </u-form-item>
+        <u-form-item
+          label="商品类型"
+          prop="type_name"
+          class="form-item"
+          @click="hadnerShowCommodityTypePopup(false)"
+        >
+          <u--input
+            v-model="form.type_name"
+            disabled
+            disabledColor="#ffffff"
+            placeholder="请选择商品类型"
+            border="none"
+            @click="hideKeyboard()"
+          ></u--input>
+          <u-icon
+            slot="right"
+            name="arrow-right"
+            v-if="form.type_id == 0"
+          ></u-icon>
+        </u-form-item>
+        <u-form-item label="分类排序" prop="category_order" class="form-item">
+          <u--input
+            v-model="form.category_order"
+            type="number"
+            placeholder="请输入商品排序"
+            border="none"
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          label="允许虚拟商品"
+          prop="category_order"
+          class="form-item form-item-switch"
+        >
+          <u-switch
+            v-model="form.category_virtual_enable"
+            :disabled="form.type_id != 0"
+            :activeValue="1"
+            :inactiveValue="0"
+            activeColor="#5ac725"
+            inactiveColor="#fe411b"
+          ></u-switch>
+        </u-form-item>
+      </u--form>
+    </view>
+    <view class="edit-item edit-item-2">
+      <view class="second-level-item">
+        <view class="item-name">二级分类</view>
+        <u-icon
+          class="u-icon-jiahao"
+          @click="handerShowEeditPopup(true)"
+          custom-prefix="custom-icon-jiahao custom-icon"
+          size="20"
+        ></u-icon>
+      </view>
+      <view class="second-level-item-input" v-for="(item, index) of form.sub">
+        <u--input
+          placeholder="请输入"
+          border="surround"
+          v-model="item.category_name"
+          @change="handerLeveInputChange"
+          maxlength="8"
+          readonly
+          @focus="handerInputFocus(index)"
+          @blur="handerInputBlur(index)"
+        >
+          <template slot="suffix">
+            <view class="statistics" v-if="isIntpufocus && index == focusIndex">
+              {{ item.category_name.length }} / 8
+            </view>
+
+            <view v-else class="icon-list">
+              <u-icon
+                class="u-icon-jianhao"
+                custom-prefix="custom-icon-jianhao custom-icon"
+                size="20"
+                @click="handerShowDelectPopup(item)"
+              ></u-icon>
+              <u-icon
+                class="u-icon-bianji"
+                @click="handerShowEeditPopup(false, item)"
+                custom-prefix="custom-icon-icon_519 custom-icon"
+                size="24"
+              ></u-icon>
+            </view>
+          </template>
+        </u--input>
+      </view>
+    </view>
+    <view class="bottom">
+      <u-button
+        class="save-btn-item"
+        :hairline="true"
+        :plain="true"
+        shape="circle"
+        @click="handerSave"
+      >
+        保存
+      </u-button>
+    </view>
+    <u-popup
+      class="affirm-popup"
+      zIndex="10077"
+      :show="showDelectPopup"
+      mode="center"
+    >
+      <view class="affirm-popup-content">
+        <view class="affirm-popup-title">
+          确认删除"{{ delectClassifyItem.category_name }}"?
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showDelectPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerDelectClassify"
+          >
+            确认
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <u-popup
+      class="add-popup"
+      zIndex="10077"
+      :show="showEditPopup"
+      mode="center"
+    >
+      <view class="add-popup-content">
+        <view class="add-popup-title">
+          {{
+            isAddClassify
+              ? "添加二级分类"
+              : `编辑二级"${this.form2.category_name}"分类`
+          }}
+        </view>
+        <view class="tips">
+          注意，确认商品类型后不可修改名称，商品类型，虚拟商品!
+        </view>
+        <u--form
+          labelPosition="left"
+          :model="form2"
+          ref="uForm2"
+          label-width="100"
+          :rules="rules2"
+        >
+          <u-form-item
+            label="分类名称"
+            prop="category_name"
+            class="form-item"
+            required
+          >
+            <u--textarea
+              class="u-textarea"
+              v-model="form2.category_name"
+              :disabled="form2.type_id != 0"
+              count
+              autoHeight
+              maxlength="8"
+              placeholder="请输入二级分类名称"
+            ></u--textarea>
+          </u-form-item>
+          <u-form-item
+            label="商品类型"
+            prop="type_name"
+            class="form-item"
+            @click="hadnerShowCommodityTypePopup(true)"
+          >
+            <u--input
+              v-model="form2.type_name"
+              disabled
+              disabledColor="#ffffff"
+              placeholder="请选择商品类型"
+              border="none"
+              @click="hideKeyboard()"
+            ></u--input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <u-form-item label="分类排序" prop="category_order" class="form-item">
+            <u--input
+              v-model="form2.category_order"
+              type="number"
+              placeholder="请输入商品排序"
+              border="none"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="允许虚拟商品"
+            prop="category_order"
+            class="form-item form-item-switch"
+          >
+            <u-switch
+              v-model="form2.category_virtual_enable"
+              :activeValue="1"
+              :inactiveValue="0"
+              activeColor="#5ac725"
+              inactiveColor="#fe411b"
+              :disabled="form2.type_id != 0"
+            ></u-switch>
+          </u-form-item>
+        </u--form>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showEditPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerAffirmEditClassify"
+          >
+            确认
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <u-popup
+      class="commodity-type-popup"
+      :show="showCommodityTypePopup"
+      mode="bottom"
+      zIndex="10080"
+      closeable
+      @close="handerCloseTypePopup"
+    >
+      <view class="commodity-type-popup-content">
+        <view class="commodity-type-popup-title">选择商品类型</view>
+        <scroll-view
+          scroll-y
+          class="commodity-type-search-scroll"
+          :show-scrollbar="false"
+          @scrolltolower="handerScrolltolower"
+          refresher-enabled
+          :refresher-triggered="isRefreshing"
+          @refresherrefresh="handleRefresh"
+          :style="{
+            maxHeight: typeManageList.length >= 2 ? '500px' : 'none',
+            overflowY: typeManageList.length >= 2 ? 'auto' : 'visible',
+          }"
+        >
+          <u-radio-group
+            class="commodity-type-radio-group"
+            v-model="radioValue"
+            placement="column"
+            @change="handerRadioChange"
+          >
+            <u-radio
+              class="commodity-type-radio"
+              v-for="(item, index) in typeManageList"
+              :key="index"
+              :label="item.type_name"
+              :name="item.type_id"
+              @change="radioChange"
+            ></u-radio>
+          </u-radio-group>
+          <view
+            class="m-loading-box"
+            v-if="typeManageList.length > 0 && !isNotypeManageData"
+          >
+            <block v-if="loadingDownTypeManageData">
+              <view class="u-loadmore">
+                <view class="u-loading"></view>
+                <text class="u-loadmore-tips">正在加载...</text>
+              </view>
+            </block>
+            <block v-else>
+              <view class="u-loadmore u-loadmore-line">
+                <text class="u-loadmore-tips">没有更多商品类型了 ~</text>
+              </view>
+            </block>
+          </view>
+        </scroll-view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerCancelCommodityTpye"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerAffirmCommodityType"
+          >
+            确认
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <u-toast ref="uToast"></u-toast>
+  </view>
+</template>
+
+<script>
+import { GetTypeManageList } from "@/api/warehouse/typeManage";
+import {
+  GetCommodityClassify,
+  UpdateCommodityClassify,
+  DelectCommodityClassify,
+} from "@/api/warehouse/classifyList";
+import navBar from "@/components/uni-nav-bar/uni-nav-bar";
+export default {
+  name: "editClassify",
+  props: {
+    classifyItem: {
+      type: Object,
+      default: {
+        category_name: "",
+      },
+    },
+    currSecondLevelItem: {
+      type: Object,
+      default: {
+        category_name: "",
+      },
+    },
+    isEdit: {
+      type: Boolean,
+      default: false,
+    },
+    isEditStairType: {
+      type: Boolean,
+      default: false,
+    },
+    isEditSecondLevelType: {
+      type: Boolean,
+      default: false,
+    },
+    isEditSecondLevelName: {
+      type: Boolean,
+      default: false,
+    },
+    isAddSecondLevelClassify: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  components: {
+    navBar,
+  },
+  data() {
+    return {
+      pageNum: 1,
+      pageSize: 20,
+      typeManageList: [],
+      form: {
+        type_category_id: 0,
+        category_name: "",
+        category_virtual_enable: 0,
+        type_name: "",
+      },
+      rules: {
+        contact_name: [
+          {
+            required: true,
+            message: "请输入联系人",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+        ],
+      },
+      secondLevel: [],
+      isIntpufocus: false,
+      focusIndex: 0,
+      delectClassifyItem: {
+        category_name: "",
+      },
+      showDelectPopup: false,
+      showEditPopup: false,
+      form2: {
+        category_name: "",
+        category_virtual_enable: 0,
+        type_name: "",
+        type_id: 0,
+      },
+      rules2: {
+        category_name: [
+          {
+            required: true,
+            message: "请输入二级分类名称",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+        ],
+      },
+      radioValue: "",
+      isRefreshing: false,
+      isNotypeManageData: false,
+      isNoDownTypeManageData: false,
+      loadingDownTypeManageData: false,
+      showCommodityTypePopup: false,
+      isSubsetSelect: false,
+      classifyList: [],
+      isAddClassify: false,
+      time: null,
+    };
+  },
+  computed: {},
+  onLoad: function (options) {},
+  onReady() {},
+  onShow() {
+    // this.classifyItem = form;
+  },
+
+  mounted() {
+    this.getTypeManageList();
+
+    if (this.isEditStairType) {
+      this.hadnerShowCommodityTypePopup(false);
+    }
+
+    if (this.isEditSecondLevelName) {
+      this.showEditPopup = true;
+      this.form2 = this.currSecondLevelItem;
+    }
+
+    if (this.isAddSecondLevelClassify) {
+      this.isAddClassify = true;
+      this.showEditPopup = true;
+    }
+
+    if (this.isEdit) {
+      this.form = JSON.parse(JSON.stringify(this.classifyItem));
+    }
+    console.log(this.form);
+    console.log(this.classifyItem);
+    this.$refs["uForm"].setRules(this.rules);
+  },
+  methods: {
+    pageBack() {
+      this.$emit("pageBack");
+    },
+    handerPageBack() {
+      this.$emit("pageBack");
+    },
+    handerRadioChange() {},
+    radioChange() {},
+    handerInputFocus(index) {
+      this.isIntpufocus = true;
+      this.focusIndex = index;
+    },
+    handerInputBlur(e) {
+      this.isIntpufocus = false;
+    },
+    handerLeveInputChange() {},
+    async getTypeManageList() {
+      if (this.isRefreshing) {
+        this.pageNum = 1;
+        this.isNotypeManageData = false;
+        this.isNoDownTypeManageData = false;
+      }
+
+      let params = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+      };
+
+      let res = await GetTypeManageList(params);
+      if (res && res.status == 200) {
+        if (this.loadingDownTypeManageData) {
+          if (res.data.items.length <= 0) {
+            this.loadingDownTypeManageData = false;
+            this.isNoDownTypeManageData = true;
+            return;
+          } else {
+            this.typeManageList = [...this.typeManageList, ...res.data.items];
+          }
+        } else {
+          this.typeManageList = res.data.items;
+        }
+
+        if (this.typeManageList.length > 0) {
+          const matchedItem = this.typeManageList.find(
+            (item) => item.type_category_id === this.classifyItem.category_id
+          );
+          if (matchedItem) {
+            this.form.type_name = matchedItem.type_name;
+          }
+        }
+
+        if (this.typeManageList.length <= 0) {
+          this.isNotypeManageData = true;
+        }
+      }
+      this.loadingDownTypeManageData = false;
+      this.isRefreshing = false;
+    },
+
+    handerScrolltolower() {
+      clearTimeout(this.time);
+      if (this.isNoDownTypeManageData) return;
+      this.loadingDownTypeManageData = true;
+      this.pageNum = this.pageNum + 1;
+      this.time = setTimeout(() => {
+        this.getTypeManageList();
+      }, 500);
+    },
+    handleRefresh() {
+      this.isRefreshing = true;
+      this.pageNum = 1;
+      this.getTypeManageList();
+    },
+    handerSave() {
+      console.log(this.form);
+
+      this.$refs.uForm.validate().then(async (valid) => {
+        let params = {
+          category_parent_id: this.form.category_parent_id,
+          type_id: this.form.type_id,
+          type_id_disable: false,
+          category_name: this.form.category_name,
+          category_image: this.form.category_image,
+          category_virtual_enable: this.form.category_virtual_enable,
+          category_commission_rate: this.form.category_commission_rate,
+          category_order: this.form2.category_order,
+          page_id: this.form.page_id,
+          category_id: this.form.category_id,
+        };
+
+        let res = await UpdateCommodityClassify(params);
+        if (res && res.status == 200) {
+          this.$refs.uToast.show({
+            message: "修改成功",
+            type: "succeed",
+            duration: 1000,
+          });
+        }
+      });
+    },
+    handerAffirmEditClassify() {
+      console.log(this.radioValue);
+
+      this.$refs.uForm2.validate().then(async (valid) => {
+        let params = {
+          category_image: "",
+          category_virtual_enable: this.form2.category_virtual_enable,
+          category_id: this.form2.category_id,
+          type_id: this.radioValue,
+          category_parent_id: this.form.category_id,
+          category_name: this.form2.category_name,
+          category_order: this.form.category_order,
+        };
+
+        console.log(this.form2);
+
+        let res = await UpdateCommodityClassify(params);
+        if (res && res.status == 200) {
+          this.$refs.uToast.show({
+            message: this.isAddClassify ? "添加成功" : "修改成功",
+            type: "succeed",
+            duration: 1000,
+          });
+          await this.getCommodityClassify();
+        }
+        this.showEditPopup = false;
+        this.radioValue = "";
+      });
+    },
+    async getCommodityClassify() {
+      let res = await GetCommodityClassify();
+      if (res && res.status == 200) {
+        let list = res.data;
+
+        if (list.length > 0) {
+          const newList = list.find(
+            (item) => item.category_id === this.classifyItem.category_id
+          );
+
+          this.form = newList;
+
+          console.log("更新后:", this.form);
+
+          if (this.typeManageList.length > 0) {
+            const matchedItem = this.typeManageList.find(
+              (item) => item.type_category_id === this.classifyItem.category_id
+            );
+            if (matchedItem) {
+              this.form.type_name = matchedItem.type_name;
+            }
+          }
+        }
+
+        this.$emit("addClassify", res.data);
+      }
+    },
+    handerCloseTypePopup() {
+      this.showCommodityTypePopup = false;
+      this.radioValue = "";
+    },
+    handerShowDelectPopup(item) {
+      this.delectClassifyItem = item;
+      this.showDelectPopup = true;
+    },
+    handerShowEeditPopup(isAddClassify, item) {
+      this.isAddClassify = isAddClassify;
+
+      if (!isAddClassify) {
+        this.form2 = item;
+      } else {
+        this.form2 = {
+          type_category_id: 0,
+          category_name: "",
+          category_virtual_enable: 0,
+          type_name: "",
+          type_id: 0,
+        };
+      }
+
+      this.showEditPopup = true;
+
+      setTimeout(() => {
+        this.$refs["uForm2"].setRules(this.rules2);
+      }, 0);
+    },
+    async handerDelectClassify() {
+      const categoryId = this.delectClassifyItem.category_id;
+
+      let params = {
+        category_id: categoryId,
+      };
+
+      let res = await DelectCommodityClassify(params);
+      if (res && res.status == 200) {
+        this.form.sub = this.form.sub.filter(
+          (item) => item.category_id !== categoryId
+        );
+
+        this.$refs.uToast.show({
+          message: "删除成功",
+          type: "succeed",
+          duration: 1000,
+        });
+
+        this.$emit("updateClassify", this.form);
+      }
+      this.showDelectPopup = false;
+    },
+    hadnerShowCommodityTypePopup(isSubsetSelect) {
+      this.isSubsetSelect = isSubsetSelect;
+
+      if ((!isSubsetSelect && this.form.type_id == 0) || !this.form.type_id) {
+        this.showCommodityTypePopup = true;
+      }
+
+      if ((isSubsetSelect && this.form2.type_id == 0) || !this.form2.type_id) {
+        this.showCommodityTypePopup = true;
+      }
+    },
+    handerCancelCommodityTpye() {
+      this.showCommodityTypePopup = false;
+      this.radioValue = "";
+    },
+    handerAffirmCommodityType() {
+      console.log(this.radioValue);
+
+      const matchedItem = this.typeManageList.find(
+        (item) => item.type_id === this.radioValue
+      );
+
+      if (this.isSubsetSelect) {
+        this.form2.type_name = matchedItem.type_name;
+      } else {
+        this.form.type_name = matchedItem.type_name;
+      }
+
+      this.showCommodityTypePopup = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/variables.scss";
+
+.editClassify-container {
+  width: 100vw;
+  height: calc(100vh - 166rpx);
+  background: #f5f6fa;
+  overflow-y: auto;
+
+  .nav-bar {
+    ::v-deep.uni-navbar__header-container-inner {
+      font-size: 16px;
+      font-weight: bold;
+
+      .uni-nav-bar-text {
+        font-size: 16px;
+      }
+    }
+  }
+
+  ::v-deep.u-textarea {
+    padding: 0 !important;
+  }
+
+  .edit-item {
+    margin: 24rpx;
+    padding: 24rpx 32rpx;
+    border-radius: 16rpx;
+    background: #fff;
+    box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.1);
+
+    .item-name {
+      margin: 20rpx 0;
+      font-size: 17px;
+      font-weight: 500;
+    }
+
+    .form-item {
+      margin: 20rpx 0;
+    }
+
+    .form-item-switch {
+      ::v-deep.u-form-item__body__right__content__slot {
+        align-items: end;
+        flex-direction: column;
+      }
+    }
+
+    .second-level-item {
+      position: sticky;
+      top: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+
+      .u-icon {
+        margin-right: 40rpx;
+
+        ::v-deep.custom-icon-jiahao {
+          color: $base-color !important;
+        }
+      }
+    }
+  }
+
+  .second-level-item-input {
+    margin: 40rpx 0;
+    font-weight: 500;
+
+    .statistics {
+      font-size: 12px;
+      color: #909193;
+      margin-right: 20rpx;
+    }
+  }
+
+  .m-loading-box {
+    text-align: center;
+    padding: 40rpx;
+    color: #aaaa;
+    font-size: 28rpx;
+  }
+
+  .commodity-type-popup {
+    .commodity-type-popup-content {
+      .commodity-type-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .commodity-type-search-scroll {
+      }
+
+      .commodity-type-radio-group {
+        margin: 40rpx;
+
+        .commodity-type-radio {
+          margin-bottom: 40rpx;
+        }
+      }
+    }
+
+    .popup-btn-list {
+      display: flex;
+      margin: 50rpx;
+
+      .btn-item {
+        width: 46%;
+        height: 80rpx;
+        border-color: #909193;
+
+        &::after {
+          border: none;
+        }
+      }
+
+      .btn-item-2 {
+        background: $base-color;
+        color: #fff;
+        border: none;
+      }
+    }
+  }
+
+  .add-popup {
+    ::v-deep.u-popup__content {
+      border-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10076 !important;
+    }
+
+    .add-popup-content {
+      width: 700rpx;
+
+      .add-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .tips {
+        text-align: center;
+        color: red;
+      }
+
+      .u-form {
+        margin: 0 40rpx;
+
+        .form-item {
+          margin: 28rpx 0;
+        }
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 80rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+
+  .affirm-popup {
+    ::v-deep.u-popup__content {
+      border-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10076 !important;
+    }
+
+    .affirm-popup-content {
+      width: 600rpx;
+
+      .affirm-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .affirm-popup-tips {
+        padding: 0 60rpx;
+        font-size: 28rpx;
+        text-align: center;
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 80rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+
+  .bottom {
+    position: fixed;
+    width: 92%;
+    bottom: 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    padding-bottom: 40rpx;
+    background: #fff;
+    height: 120rpx;
+
+    .save-btn-item {
+      margin: 0;
+      margin-right: 20rpx;
+      width: 100%;
+      height: 38px;
+      font-size: 28rpx;
+      border: none;
+      color: #fff;
+      background: $base-color;
+
+      &::after {
+        border: none;
+      }
+    }
+  }
+
+  .icon-list {
+    display: flex;
+
+    .u-icon-jianhao {
+      margin-right: 60rpx;
+
+      ::v-deep.custom-icon-jianhao {
+        color: $base-color !important;
+      }
+    }
+  }
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
index a537b7f..89e001a 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
@@ -142,6 +142,7 @@
               </view>
               <view class="commodity-btn-content">
                 <u-button
+                  @click="handerShowPricePopup(item)"
                   class="commodity-btn-item"
                   :hairline="true"
                   :plain="true"
@@ -220,6 +221,67 @@
         <view class="bottom-item-name">商品新建</view>
       </view>
     </view>
+    <u-popup
+      class="productList-price-popup"
+      :show="showBottomPopup"
+      mode="bottom"
+      :closeable="true"
+      zIndex="10075"
+      @close="handerClosePopup"
+    >
+      <view
+        class="productList-price-popup-content"
+        v-if="currSpecificationList.length > 0"
+      >
+        <view class="productList-price-popup-title">价格/库存修改</view>
+        <view class="select-commodity-price-list">
+          <scroll-view
+            scroll-y
+            class="select-commodity-list-price-scroll-view"
+            :show-scrollbar="false"
+            :style="{
+              maxHeight: currSpecificationList.length >= 2 ? '500px' : 'none',
+              overflowY: currSpecificationList.length >= 2 ? 'auto' : 'visible',
+            }"
+          >
+            <view
+              class="commodity-item"
+              v-for="(item, index) of currSpecificationList"
+              :key="index"
+            >
+              <view class="commodity-info">
+                <view class="commodity-info-box">
+                  <!-- <view class="commodity-name">
+                    {{ item.product_name }}
+                  </view> -->
+                  <!-- <view class="commodity-price">
+                    <u--input
+                      placeholder="请输入内容"
+                      border="surround"
+                      v-model="value"
+                      @change="change"
+                    ></u--input>
+                  </view>
+                  <view class="commodity-inventory">
+                    库存{{ item.itemQuantity }}
+                  </view> -->
+                </view>
+              </view>
+              <!-- <view
+                class="icon-content"
+                @click="delectSelectCommodity(item, index)"
+              >
+                <u-icon
+                  class="u-icon-jianhao"
+                  custom-prefix="custom-icon-jianhao custom-icon"
+                  size="20"
+                ></u-icon>
+              </view> -->
+            </view>
+          </scroll-view>
+        </view>
+      </view>
+    </u-popup>
   </view>
 </template>
 
@@ -228,6 +290,7 @@ import {
   GetProductCategoryTree,
   GetProductList,
   UpdateProductPutaway,
+  GetCommoditSpecification,
 } from "@/api/warehouse/productList";
 import navBar from "@/components/uni-nav-bar/uni-nav-bar";
 import tuiCollapse from "../manage/components/tui-collapse/tui-collapse.vue";
@@ -306,6 +369,8 @@ export default {
       isRefreshing: false,
       time: null,
       time2: null,
+      showBottomPopup: false,
+      currSpecificationList: [],
     };
   },
   computed: {},
@@ -353,6 +418,21 @@ export default {
         this.scrollViewId = `id_0`;
       }
     },
+    handerClosePopup() {
+      this.showBottomPopup = false;
+    },
+    async handerShowPricePopup(item) {
+      let params = {
+        product_id: item.product_id,
+      };
+
+      let res = await GetCommoditSpecification(params);
+
+      if (res && res.status == 200) {
+        this.showBottomPopup = true;
+        this.currSpecificationList = res.data.items;
+      }
+    },
     async getProductCategoryTree() {
       let res = await GetProductCategoryTree();
       if (res && res.status == 200) {
@@ -966,6 +1046,107 @@ export default {
     }
   }
 
+  .productList-price-popup {
+    ::v-deep.u-popup__content {
+      border-top-left-radius: 16rpx;
+      border-top-right-radius: 16rpx;
+    }
+
+    .productList-price-popup-content {
+      // width: 100%;
+
+      .productList-price-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .select-commodity-price-list {
+        padding: 20rpx;
+
+        .commodity-item {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-bottom: 40rpx;
+          padding: 0 40rpx;
+
+          .u-icon-jianhao {
+            ::v-deep.u-icon__icon {
+              color: $base-color !important;
+            }
+          }
+
+          .commodity-info {
+            display: flex;
+
+            .commodity-img {
+              position: relative;
+              margin-right: 20rpx;
+              width: 60px;
+              height: 60px;
+              border: 1px solid #ebebeb;
+              border-radius: 16rpx;
+            }
+
+            .commodity-img-sold-out {
+              &::before {
+                position: absolute;
+                bottom: 0;
+                width: 100%;
+                height: 20px;
+                line-height: 20px;
+                content: "已下架";
+                text-align: center;
+                background: rgba(0, 0, 0, 0.6);
+                color: #fff;
+                z-index: 99;
+                font-size: 14px;
+                border-bottom-left-radius: 16rpx;
+                border-bottom-right-radius: 16rpx;
+              }
+            }
+
+            .commodity-info-box {
+              display: flex;
+              flex-flow: column;
+              justify-content: space-between;
+
+              .commodity-name {
+                font-weight: bold;
+                font-size: 34rpx;
+                word-break: break-all; /* 允许在任意字符间断行 */
+                overflow-wrap: break-word; /* 优先在单词间断行 */
+                display: -webkit-box;
+                -webkit-line-clamp: 2; /* 限制最多2行 */
+                -webkit-box-orient: vertical;
+                overflow: hidden;
+                text-overflow: ellipsis; /* 超出部分显示省略号 */
+              }
+
+              .commodity-inventory {
+                margin: 6rpx 0;
+                font-size: 25rpx;
+                color: #626262;
+              }
+
+              .commodity-price {
+                font-size: 32rpx;
+                font-weight: bold;
+                color: #ea3938;
+
+                .currency {
+                  margin-right: 4px;
+                  font-size: 24rpx;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
   .commodity-loading {
     margin: 70% auto;
     display: flex;
diff --git a/java-mall-app-shop-admin/pages/warehouse/warehouse.vue b/java-mall-app-shop-admin/pages/warehouse/warehouse.vue
index ed81db4..fd050d4 100644
--- a/java-mall-app-shop-admin/pages/warehouse/warehouse.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/warehouse.vue
@@ -2,47 +2,77 @@
   <view class="warehouse-container">
     <status-bar :backgroundColor="'#fff'" v-if="true"></status-bar>
     <view class="shop-name">{{ dashboardInfo.store_info.store_name }}</view>
-    <view class="warehouse-list">
-      <view class="warehouse-item" @click="skipu('productList')">
-        <view class="warehouse-item-img">
-          <u--image
-            src="../../static/warehouse/brand-2.png"
-            :width="44"
-            :height="44"
-          ></u--image>
+    <view class="warehouse-content">
+      <view class="warehouse-list">
+        <view class="warehouse-item" @click="skipu('productList')">
+          <view class="warehouse-item-img">
+            <u--image
+              src="../../static/warehouse/brand-2.png"
+              :width="44"
+              :height="44"
+            ></u--image>
+          </view>
+          <view class="warehouse-item-name">商品管理</view>
         </view>
-        <view class="warehouse-item-name">商品管理</view>
-      </view>
-      <view class="warehouse-item" @click="skipu('brandList')">
-        <view class="warehouse-item-img">
-          <u--image
-            src="../../static/warehouse/brand-3.png"
-            :width="44"
-            :height="44"
-          ></u--image>
+        <view class="warehouse-item" @click="skipu('productList')">
+          <view class="warehouse-item-img">
+            <u--image
+              src="../../static/warehouse/specification.png"
+              :width="44"
+              :height="44"
+            ></u--image>
+          </view>
+          <view class="warehouse-item-name">规格管理</view>
         </view>
-        <view class="warehouse-item-name">品牌管理</view>
-      </view>
-      <view class="warehouse-item" @click="skipu('photoGallery')">
-        <view class="warehouse-item-img">
-          <u--image
-            src="../../static/warehouse/classify.png"
-            :width="44"
-            :height="44"
-          ></u--image>
+        <view
+          class="warehouse-item warehouse-item-2"
+          @click="skipu('brandList')"
+        >
+          <view class="warehouse-item-img">
+            <u--image
+              src="../../static/warehouse/commodity-type.png"
+              :width="44"
+              :height="44"
+            ></u--image>
+          </view>
+          <view class="warehouse-item-name">类型管理</view>
         </view>
-        <view class="warehouse-item-name">分类管理</view>
-      </view>
-      <view class="warehouse-item" @click="skipu('classifyList')">
-        <view class="warehouse-item-img">
-          <u--image
-            src="../../static/warehouse/photo-gallery-1.png"
-            :width="44"
-            :height="44"
-          ></u--image>
+        <view class="warehouse-item" @click="skipu('classifyList')">
+          <view class="warehouse-item-img">
+            <u--image
+              src="../../static/warehouse/classify.png"
+              :width="44"
+              :height="44"
+            ></u--image>
+          </view>
+          <view class="warehouse-item-name">分类管理</view>
         </view>
-        <view class="warehouse-item-name">商品图库</view>
       </view>
+      <!-- <view class="warehouse-list warehouse-list-2">
+        <view class="warehouse-item" @click="skipu('brandList')">
+          <view class="warehouse-item-img">
+            <u--image
+              src="../../static/warehouse/brand-3.png"
+              :width="44"
+              :height="44"
+            ></u--image>
+          </view>
+          <view class="warehouse-item-name">品牌管理</view>
+        </view>
+        <view
+          class="warehouse-item warehouse-item-2"
+          @click="skipu('photoGallery')"
+        >
+          <view class="warehouse-item-img">
+            <u--image
+              src="../../static/warehouse/photo-gallery-1.png"
+              :width="44"
+              :height="44"
+            ></u--image>
+          </view>
+          <view class="warehouse-item-name">商品图库</view>
+        </view>
+      </view> -->
     </view>
     <tabbar tabbarName="warehouse"></tabbar>
   </view>
@@ -105,23 +135,35 @@ export default {
     background: #fff;
   }
 
-  .warehouse-list {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
+  .warehouse-content {
     margin: 10px;
     padding: 20px;
+    border-radius: 24rpx;
     background: #fff;
     box-shadow: 0 12rpx 16rpx 0 rgba(0, 0, 0, 0.1);
-    border-radius: 24rpx;
 
-    .warehouse-item {
+    .warehouse-list {
       display: flex;
-      flex-flow: column;
       align-items: center;
+      justify-content: space-between;
 
-      .warehouse-item-img {
-        margin-bottom: 20rpx;
+      .warehouse-item {
+        display: flex;
+        flex-flow: column;
+        align-items: center;
+
+        .warehouse-item-img {
+          margin-bottom: 20rpx;
+        }
+      }
+    }
+
+    .warehouse-list-2 {
+      margin-top: 40rpx;
+      justify-content: flex-start;
+
+      .warehouse-item-2 {
+        margin-left: 48rpx;
       }
     }
   }
diff --git a/java-mall-app-shop-admin/static/font/iconfont.css b/java-mall-app-shop-admin/static/font/iconfont.css
index a91cfd8..9456be8 100644
--- a/java-mall-app-shop-admin/static/font/iconfont.css
+++ b/java-mall-app-shop-admin/static/font/iconfont.css
@@ -21,6 +21,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.custom-icon-jiahao:before {
+  content: "\e640";
+}
+
 .custom-icon-jianhao:before {
   content: "\e664";
 }
diff --git a/java-mall-app-shop-admin/static/font/iconfont.ttf b/java-mall-app-shop-admin/static/font/iconfont.ttf
index a0c4c98..856fbc1 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.ttf and b/java-mall-app-shop-admin/static/font/iconfont.ttf differ
diff --git a/java-mall-app-shop-admin/static/font/iconfont.woff b/java-mall-app-shop-admin/static/font/iconfont.woff
index 84885ba..6479da0 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.woff and b/java-mall-app-shop-admin/static/font/iconfont.woff differ
diff --git a/java-mall-app-shop-admin/static/font/iconfont.woff2 b/java-mall-app-shop-admin/static/font/iconfont.woff2
index b70e688..b9e768e 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.woff2 and b/java-mall-app-shop-admin/static/font/iconfont.woff2 differ
diff --git a/java-mall-app-shop-admin/static/warehouse/commodity-type.png b/java-mall-app-shop-admin/static/warehouse/commodity-type.png
new file mode 100644
index 0000000..1906dbd
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/commodity-type.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/no-classify.png b/java-mall-app-shop-admin/static/warehouse/no-classify.png
new file mode 100644
index 0000000..8e1a22a
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/no-classify.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/no-commodity-type.png b/java-mall-app-shop-admin/static/warehouse/no-commodity-type.png
new file mode 100644
index 0000000..8db15bb
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/no-commodity-type.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/specification.png b/java-mall-app-shop-admin/static/warehouse/specification.png
new file mode 100644
index 0000000..c15499a
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/specification.png differ