diff --git a/java-mall-app-shop-admin/App.vue b/java-mall-app-shop-admin/App.vue
index 426fbf3..d5ba577 100644
--- a/java-mall-app-shop-admin/App.vue
+++ b/java-mall-app-shop-admin/App.vue
@@ -3,6 +3,7 @@
 import APPUpdate, { getCurrentNo } from "@/config/appUpdate";
 // #endif
 import { mapState, mapActions } from "vuex";
+import { webSocketManager } from "@/utils/socket.js";
 export default {
   data() {
     return {
@@ -27,7 +28,7 @@ export default {
     // #endif
   },
   computed: {
-    ...mapState("user", ["uid", "userInfo", "socket"]),
+    ...mapState("user", ["uid", "userInfo"]),
   },
   onShow: function () {
     this.globalData.isAppActive = true;
@@ -40,6 +41,7 @@ export default {
   },
   onHide: function () {
     this.globalData.isAppActive = false;
+    webSocketManager.closeAllGlobalConnections();
   },
   globalData: {
     isAppActive: false,
diff --git a/java-mall-app-shop-admin/api/warehouse/commodity.js b/java-mall-app-shop-admin/api/warehouse/commodity.js
new file mode 100644
index 0000000..7616cf0
--- /dev/null
+++ b/java-mall-app-shop-admin/api/warehouse/commodity.js
@@ -0,0 +1,174 @@
+import http from "../../utils/http";
+import config from "../../config/config";
+
+/** 添加商品和编辑商品
+ *
+ * @author Seven
+ * @data 2025-7-22
+ * @params {
+ *    productObj{},
+ *    productItems:{}
+ *  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-base/saveProduct
+ */
+
+export function UpdateCommodityInfo(params) {
+  return http({
+    url: "/shop/shop-product-base/saveProduct",
+    method: "post",
+    baseURL: config.adminApi,
+    headers: {
+      "content-type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+    params,
+  });
+}
+
+/** 添加商品和编辑商品
+ *
+ * @author Seven
+ * @data 2025-7-22
+ * @params {
+ *    product_id : 33002
+      item_id : 66419
+      item_unit_price :10
+      item_quantity :20
+ *  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-item/editQuantity
+ */
+
+export function UpdateCommodityPriceAndQuantity(params) {
+  return http({
+    url: "/shop/shop-product-item/editQuantity",
+    method: "post",
+    baseURL: config.adminApi,
+    headers: {
+      "content-type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+    params,
+  });
+}
+
+/** 获取分类详情
+ *
+ * @author Seven
+ * @data 2025-7-22
+ * @params { category_id }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-base-product-category/get
+ */
+
+export function GetClassifyInfo(params) {
+  return http({
+    url: "/shop/shop-base-product-category/get",
+    method: "get",
+    baseURL: config.adminApi,
+    params,
+  });
+}
+
+/** 获取商品base详情
+ *
+ * @author Seven
+ * @data 2025-7-22
+ * @params { product_id : number }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-info/productInfoByPid
+ */
+
+export function GetCommodityBaseInfo(params) {
+  return http({
+    url: "/shop/shop-product-info/productInfoByPid",
+    method: "get",
+    baseURL: config.adminApi,
+    params,
+  });
+}
+
+/** 获取商品规格 库存 和 价格
+ *
+ * @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: "get",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/** 获取商品规格 品牌 信息
+ *
+ * @author Seven
+ * @data 2025-7-22
+ * @param { spec_id }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-base-product-type/get
+ */
+
+export function GetCommoditSpecificationBaseInfo(params) {
+  return http({
+    url: "/shop/shop-base-product-type/get",
+    method: "get",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/** 添加商品规格
+ *
+ * @author Seven
+ * @data 2025-7-22
+ * @param { spec_id : number , spec_item_name : 10 }
+ * @returns {   }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-spec-item/edit
+ */
+
+export function UpdateCommoditSpecification(params) {
+  return http({
+    url: "/shop/shop-product-spec-item/edit",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/** 删除商品规格
+ *
+ * @author Seven
+ * @data 2025-7-22
+ * @param { spec_item_id : number }
+ * @returns {   }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-spec-item/delete
+ */
+
+export function DelectCommoditSpecification(params) {
+  return http({
+    url: "/shop/shop-product-spec-item/delete",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/** 获取当前分类规格列表
+ *
+ * @author Seven
+ * @data 2025-7-22
+ * @param { spec_item_id : number }
+ * @returns {   }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-spec-item/specItems
+ */
+
+export function GetClassifySpecificationList(params) {
+  return http({
+    url: "/shop/shop-product-spec-item/specItems",
+    method: "get",
+    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 0f90f8d..6aafee6 100644
--- a/java-mall-app-shop-admin/api/warehouse/productList.js
+++ b/java-mall-app-shop-admin/api/warehouse/productList.js
@@ -70,21 +70,3 @@ 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: "get",
-    params,
-    baseURL: config.adminApi,
-  });
-}
diff --git a/java-mall-app-shop-admin/components/poiuy-uImgUpload/README.md b/java-mall-app-shop-admin/components/poiuy-uImgUpload/README.md
new file mode 100644
index 0000000..46241f3
--- /dev/null
+++ b/java-mall-app-shop-admin/components/poiuy-uImgUpload/README.md
@@ -0,0 +1,165 @@
+
+
+插件安装
+	
+图片上传组件 将组件放在自己的组件库里导入即可
+
+### 注意
+
+1.最好在回调结果后使用debugger看一下结果！
+
+2.请先看一下示范代码。
+
+3.如果有问题和建议可以联系我，也可以自己修改成符合自己项目的。
+
+4.注意，一定要去看看接口的返回值和插件写的返回值是否一样，如果不一样，可以在下面写注释的地方修改。
+	
+#### 导入：  
+> import imgUpload from '@/components/my-components/uImgUpload.vue';
+
+-------------------------------------   
+
+#### 属性 attribute
+
+| 属性名            | 类型     | 介绍          | 默认值              |
+|----------------|--------|-------------|------------------|
+| imgArr         | Array  | 图片展示列表      | \[\]             |
+| uploadImgCount | Number | 一次可选多少张图片   | 3                |
+| imgCount       | Number | 一共可以上传多少张图片 | 3                |
+| imgSize        | Number | 上传图片的大小     | 2 \(M\)          |
+| imgType        | Array  | 能上传图片的类型(注：小程序下不兼容)    | \["jepg","png"\] |
+| closeTip        | Boolean  | 是否关闭提示    | false |
+| formData       | Object  | 提交时携带数据   | {}  |
+| loading        | Boolean  | 是否存在加载动画    | true |
+| url        | String  | 上传图片的url (1.1.0版本新增)     | "" |
+| async        | Boolean  | 是否选择图片后直接上传 (1.1.0版本新增)    | false |
+| header        | Array  | 请求头添加新的属性值 (1.1.1版本新增)    | [] |
+| previewMany   | Boolean  | 是否开启多图预览 (1.1.2版本新增)    | false |
+| config        | Object  | 配置对象 **已经设置默认值** (1.1.2版本新增)    | {} |
+| pressImg   | Number  | 是否开启图片压缩,0-100为压缩值 (1.1.3版本新增)    | -1(不开启) |
+| single   | Boolean  | 单图模式，上传一张后不会再出现上传按钮 (1.1.7版本新增)    | false |
+| disabled   | Boolean  | 禁用，用于回显展示 (1.1.7版本新增)    | false |
+------------------------------------- 
+
+>>config对象参数
+
+| 属性名            | 类型     | 介绍          | 默认值              |
+|----------------|--------|-------------|------------------|
+| delIcon         | String  | 删除图片的icon[使用图片链接]       | ""            |
+| resultTip | Boolean | 是否显示结果提示   | true                |
+| resultType       | String | 结果展示类型 [正在开发2风格] | 1                |
+| loadIcon        | String | 加载时的图标[使用图片链接]      | ""         |
+| loadText        | String  | 加载时的文字    | "" |
+| borderStyle        | String  | 上传框的样式[完全自定义]    | 'border:2px dotted #dadada' |
+| addStyle        | String  | 上传图片的中间icon[1(图片标识)/2(加号标识)]    | "1" |
+
+------------------------------------- 
+
+#### 方法 method
+
+>当**async**为**true**的时候
+>存在两个方法
+
+| 方法名    | 介绍                     |
+|--------|------------------------|
+| result | 上传后的返回结果\(成功对象\)，存在all和new两种类型(详细解释见下)       |
+| delImg | 删除图片返回下标\(传入的图片数组的下标\)*与async值无关* |
+------------------------------------- 
+**all： 将会把之前传的和新传入的图片数组一起返回出来。**
+
+**new： 将新传输的图片以数组的方式直接返回，格式为["图片1","图片2"],可以直接用数组合并在提交数据上。**
+
+-------------------------------------
+
+>当**async**为**false**的时候
+>开始上传图片 在父页面中调用该方法（当async为false,也就是默认值的时候使用）
+> *注意* 一定要给组件 **ref="imgUpload"**
+
+-------------------------------------
+
+####示范代码
+
+```
+
+<template>
+<!--里面一些属性是示范作用才写上去的，具体需要使用哪些属性可自由调整-->
+<!--直接上传图片-->
+<imgUpload config:"config" previewMany :imgArr="imgArray" loading async url="xxx(上传图片的url)" @result="resultUrl" @delImg="delImg"></imgUpload>
+<!--点击按钮一次提交-->
+<imgUpload :imgArr="imgArray" imgCount="9" ref="imgUpload" url="xxx(上传图片的url)"></imgUpload>
+<button type="default" @click="submit">提交</button>
+</template>
+
+<script>
+	import imgUpload from '@/components/my-components/imgUpload.vue';
+	export default {
+		components: {
+			imgUpload
+		},
+		data() {
+			return {
+				imgArray:[],
+				head:[{token:"zx6c54asdq89w7eqw6e46ad4"},{sign:'s6d5a4dqwe7q9w87a6'}],  //示范格式 JSON   使用方式header="head"
+				config:{
+						delIcon: '', //删除图片icon
+						resultTip: true, //结果提示
+						resultType:'1', //结果展示类型
+						loadIcon: '', //加载时的图标
+						loadText: ''  //加载时的文字
+					}
+			}
+		},
+		# methods: {
+		  submit(){
+			 //开始上传图片
+           this.$refs.imgUpload.upload(res=>{
+			   if(res.code==0){
+			   		//0为正常返回，将回调的线上图片数组 赋值给需要提交的表单里
+					//res.urlArray 线上路径图片数组对象
+					//TODO
+				}else{
+					//用户没有上传图片的返回 code码为400
+				}
+
+				//可以在下面继续写提交代码
+		   });
+	},
+	//直接上传的方法
+	resultUrl(e){
+				console.log(e); 
+				//成功默认为0
+				if(e.code==0){
+				//e在单图(single=true)情况下 e.url 可得到。多图情况下e是一个数组
+					this.imgArr.push(...e.new);
+				}
+	},
+	delImg(e){
+		this.imgArr.splice(e,1) //为删除图片数组的下标
+	}
+}
+</script>
+
+```
+
+
+-------------------------------------
+
+###[彩蛋提示]
+可以在组件里修改组件小提示的颜色哦！只需要修改成功失败警告的颜色即可。
+
+```
+tipObj: {
+					prompt: '',
+					typeColor: '#009100',
+					success: '#009100', //成功-#009100; 可自定义修改
+					warning: '#d3d300', // 警告 -#d3d300; 可自定义修改
+					error: '#FF0000' // 失败--#FF0000; 可自定义修改
+				},
+
+```
+ 
+	
+
+
+
+	
\ No newline at end of file
diff --git a/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.eot b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.eot
new file mode 100644
index 0000000..d134a2f
Binary files /dev/null and b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.eot differ
diff --git a/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.svg b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.svg
new file mode 100644
index 0000000..e1eef05
--- /dev/null
+++ b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="shanchu2" unicode="&#59269;" d="M571.733333 384l226.133334 226.133333c17.066667 17.066667 17.066667 42.666667 0 59.733334s-42.666667 17.066667-59.733334 0L512 443.733333 285.866667 669.866667c-17.066667 17.066667-42.666667 17.066667-59.733334 0s-17.066667-42.666667 0-59.733334l226.133334-226.133333-226.133334-226.133333c-17.066667-17.066667-17.066667-42.666667 0-59.733334 8.533333-8.533333 17.066667-12.8 29.866667-12.8s21.333333 4.266667 29.866667 12.8l226.133333 226.133334 226.133333-226.133334c8.533333-8.533333 21.333333-12.8 29.866667-12.8s21.333333 4.266667 29.866667 12.8c17.066667 17.066667 17.066667 42.666667 0 59.733334L571.733333 384z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="jiazai2" unicode="&#59169;" d="M227.9 411.1c11.6-11.6 17.3-25.5 17.3-41.9s-5.8-30.2-17.3-41.9S202.4 310 186 310s-30.2 5.8-41.9 17.3-17.3 25.5-17.3 41.9 5.8 30.2 17.3 41.9c11.6 11.6 25.5 17.3 41.9 17.3s30.3-5.8 41.9-17.3zM333.7 652c14.5-14.5 21.8-32 21.8-52.3s-7.3-37.7-21.8-52.3c-14.5-14.6-32-21.9-52.3-21.9-20.3 0-37.7 7.2-52.3 21.8s-21.8 32-21.8 52.3c0 20.3 7.2 37.7 21.8 52.3s32 21.8 52.3 21.8c20.3 0 37.7-7.2 52.3-21.7z m-10.4-471.6c11.6-11.6 17.3-25.5 17.3-41.9s-5.8-30.2-17.3-41.9c-11.6-11.6-25.5-17.3-41.9-17.3-16.1 0-29.9 5.9-41.7 17.6-11.7 11.7-17.6 25.6-17.6 41.7 0 16.4 5.8 30.2 17.3 41.9 11.6 11.6 25.5 17.3 41.9 17.3s30.4-5.8 42-17.4zM575 758.1c17.2-17.3 25.9-38.2 25.9-63s-8.7-45.6-25.9-63c-17.3-17.3-38.2-25.9-63-25.9s-45.6 8.7-63 25.9c-17.3 17.2-25.9 38.2-25.9 63s8.7 45.6 25.9 63c17.2 17.2 38.2 25.9 63 25.9 24.7 0 45.6-8.7 63-25.9z m-21.2-673c11.6-11.6 17.3-25.5 17.3-41.9s-5.8-30.2-17.3-41.9c-11.6-11.6-25.5-17.3-41.9-17.3s-30.2 5.8-41.9 17.3c-11.7 11.6-17.3 25.5-17.3 41.9s5.8 30.2 17.3 41.9c11.6 11.6 25.5 17.3 41.9 17.3s30.3-5.8 41.9-17.3z m292.4 514.5c0-28.7-10.2-53.2-30.6-73.4-20.3-20.2-44.8-30.2-73.1-30.2-28.7 0-53.2 10.1-73.4 30.2-20.2 20.2-30.2 44.7-30.2 73.4 0 28.4 10.1 52.8 30.2 73.1 20.2 20.3 44.7 30.6 73.4 30.6 28.4 0 52.8-10.2 73.1-30.6 20.4-20.2 30.6-44.6 30.6-73.1z m-44.5-461.1c0-16.1-5.9-29.9-17.6-41.7-11.7-11.7-25.6-17.6-41.7-17.6-16.4 0-30.2 5.8-41.9 17.3-11.6 11.6-17.3 25.5-17.3 41.9s5.8 30.2 17.3 41.9c11.6 11.6 25.5 17.3 41.9 17.3s30.2-5.8 41.9-17.3c11.6-11.5 17.4-25.4 17.4-41.8z m78.1 272.6c11.6-11.6 17.3-25.5 17.3-41.9s-5.8-30.2-17.3-41.9S854.3 310 838 310s-30.2 5.8-41.9 17.3c-11.6 11.6-17.3 25.5-17.3 41.9s5.8 30.2 17.3 41.9c11.6 11.6 25.5 17.3 41.9 17.3 16.2 0 30.3-5.8 41.8-17.3z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icontianjiatupian" unicode="&#58901;" d="M986.4068 632.333902l-75.878155 0 0-75.877131c0-20.937868-16.997116-37.936007-37.934984-37.936007-20.945031 0-37.942147 16.999163-37.942147 37.936007l0 75.877131L758.774383 632.333902c-20.942985 0-37.936007 16.999163-37.936007 37.942147 0 20.942985 16.993023 37.934984 37.936007 37.934984l75.877131 0 0 75.878155c0 20.942985 16.997116 37.940101 37.942147 37.940101 20.937868 0 37.934984-16.997116 37.934984-37.940101l0-75.878155 75.878155 0c20.942985 0 37.940101-16.991999 37.940101-37.934984C1024.346901 649.332041 1007.349785 632.333902 986.4068 632.333902L986.4068 632.333902zM758.774383 499.552759c0-31.41243-25.491581-56.909128-56.909128-56.909128-31.413454 0-56.904011 25.497721-56.904011 56.909128s25.490557 56.904011 56.904011 56.904011C733.281779 556.45677 758.774383 530.964166 758.774383 499.552759L758.774383 499.552759zM607.019097 632.333902 75.877131 632.333902l0-528.748453c0.076748 0.265036 83.047438 372.255259 225.244021 372.255259 93.66731 0 188.932-287.689235 248.310366-374.648772 0 0 46.549176 188.480722 126.866433 189.69641 79.44233 1.177825 120.417557-187.301873 120.417557-187.301873l37.936007 0L834.651514 328.824353c0 20.942985 16.997116 37.942147 37.942147 37.942147 20.937868 0 37.934984-16.999163 37.934984-37.942147l0-303.509549c0-41.919738-33.989115-75.877131-75.877131-75.877131L75.877131-50.562327c-41.919738 0-75.877131 33.957393-75.877131 75.877131L0 632.333902c0 41.924855 33.957393 75.877131 75.877131 75.877131l531.141966 0c20.942985 0 37.942147-16.991999 37.942147-37.934984C644.961244 649.332041 627.962082 632.333902 607.019097 632.333902L607.019097 632.333902zM607.019097 632.333902"  horiz-adv-x="1040" />
+
+    
+    <glyph glyph-name="shanchu" unicode="&#59120;" d="M590.514383 407.959051 952.888054 44.874737C981.253371 16.453832 981.11016-29.804176 952.546629-58.423734 923.783934-87.242895 877.825294-87.196523 849.450322-58.76589L487.076651 304.318424 124.70298-58.76589C96.337663-87.186795 50.170204-87.043365 21.606672-58.423734-7.156023-29.604646-7.109798 16.444104 21.265175 44.874737L383.638845 407.959051 21.265175 771.043365C-7.100143 799.46427-6.956932 845.722278 21.606672 874.341836 50.369368 903.160997 96.328008 903.114625 124.70298 874.683992L487.076651 511.599678 849.450322 874.683992C877.815566 903.104897 923.983025 902.961467 952.546629 874.341836 981.309325 845.522748 981.263026 799.473998 952.888054 771.043365L590.514383 407.959051 590.514383 407.959051Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chenggong" unicode="&#58982;" d="M1001.305115 620.125859 431.461709 50.281429c-28.221762-28.221762-73.977875-28.221762-102.20066 0L22.661116 356.883409c-28.222785 28.221762-28.222785 73.979922 0 102.20066 28.221762 28.221762 73.977875 28.221762 102.20066 0l255.500115-255.502162 518.743588 518.743588c28.221762 28.221762 73.977875 28.221762 102.199637 0C1029.5279 694.10578 1029.5279 648.34762 1001.305115 620.125859z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="caozuochenggong" unicode="&#59384;" d="M376.87958 282.097122 158.344355 461.137845 61.411675 379.974313l377.931538-401.503397C504.790808 152.298917 710.793602 492.277052 962.587302 733.914438l-23.063275 55.614645C665.199171 614.05049 466.434222 393.327436 376.87958 282.097122z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shanchu1" unicode="&#59007;" d="M512 384m-512 0a512 512 0 1 1 1024 0 512 512 0 1 1-1024 0ZM729.6 512H294.4c-7.68 0-12.8 5.12-12.8 12.8v25.6c0 7.68 5.12 12.8 12.8 12.8h115.2v25.6c0 14.08 11.52 25.6 25.6 25.6h153.6c14.08 0 25.6-11.52 25.6-25.6v-25.6h115.2c7.68 0 12.8-5.12 12.8-12.8v-25.6c0-7.68-5.12-12.8-12.8-12.8z m-371.2-38.4h307.2c28.16 0 51.2-23.04 51.2-51.2v-217.6c0-28.16-23.04-51.2-51.2-51.2H358.4c-28.16 0-51.2 23.04-51.2 51.2V422.4c0 28.16 23.04 51.2 51.2 51.2z m192-243.2c0-7.68 5.12-12.8 12.8-12.8s12.8 5.12 12.8 12.8V358.4c0 7.68-5.12 12.8-12.8 12.8s-12.8-5.12-12.8-12.8v-128z m-102.4 0c0-7.68 5.12-12.8 12.8-12.8s12.8 5.12 12.8 12.8V358.4c0 7.68-5.12 12.8-12.8 12.8s-12.8-5.12-12.8-12.8v-128z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="jia" unicode="&#58886;" d="M512.17594-127.648121c-29.52585 0-58.347943 6.397801-58.347943 37.395145V331.969885H37.459123c-23.76783 0-37.459123 22.392303-37.459123 51.182406 0 26.614851 10.076536 51.790197 35.187904 51.790198h425.005904V852.111087c0 28.054356 20.888819 43.888913 51.854176 43.888913 28.790103 0 51.182406-12.795602 51.182406-37.395145v-416.49683h430.156133c28.790103 0 30.261598-34.516135 30.261598-58.283965s-7.933273-51.182406-36.723376-51.182406H563.326357v-422.926619c0.735747-24.40761-21.592578-37.363156-51.150417-37.363156z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="jiazai" unicode="&#58902;" d="M512.75 512.13c-11.24 0-20.55 8.74-21.25 19.96l-16.26 260.04c-1.35 21.63 15.83 39.92 37.5 39.92 21.68 0 38.86-18.29 37.5-39.92l-16.26-260.04c-0.69-11.22-9.99-19.96-21.23-19.96zM512.75 256.01c11.24 0 20.55-8.74 21.25-19.96l16.26-260.04c1.35-21.63-15.83-39.92-37.5-39.92-21.68 0-38.86 18.29-37.5 39.92l16.26 260.04c0.68 11.22 9.98 19.96 21.23 19.96zM640.19 382.78c0 11.24 8.74 20.55 19.96 21.25l260.04 16.26c21.63 1.35 39.92-15.83 39.92-37.5 0-21.68-18.29-38.86-39.92-37.5l-260.04 16.26c-11.22 0.68-19.96 9.98-19.96 21.23zM605.79 290.89c7.95 7.95 20.71 8.35 29.14 0.91L830.3 119.42c16.25-14.34 17.04-39.42 1.71-54.75-15.33-15.33-40.41-14.54-54.75 1.71L604.88 261.75c-7.44 8.43-7.04 21.19 0.91 29.14zM601.79 474.33c-7.95 7.95-8.35 20.71-0.91 29.14l172.38 195.37c14.34 16.25 39.42 17.04 54.75 1.71 15.33-15.33 14.54-40.41-1.71-54.75L630.93 473.42c-8.43-7.43-21.19-7.03-29.14 0.91zM383.26 382.44c0-11.24-8.74-20.55-19.96-21.25l-260.04-16.26c-21.63-1.35-39.92 15.83-39.92 37.5 0 21.68 18.29 38.86 39.92 37.5l260.04-16.26c11.21-0.68 19.96-9.98 19.96-21.23zM417.66 474.33c-7.95-7.95-20.71-8.35-29.14-0.91L193.15 645.81c-16.25 14.34-17.04 39.42-1.71 54.75 15.33 15.33 40.41 14.54 54.75-1.71l172.38-195.37c7.44-8.44 7.04-21.2-0.91-29.15zM421.66 290.89c7.95-7.95 8.35-20.71 0.91-29.14L250.19 66.38c-14.34-16.25-39.42-17.04-54.75-1.71-15.33 15.33-14.54 40.41 1.71 54.75L392.52 291.8c8.43 7.43 21.19 7.04 29.14-0.91z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="jiazai1" unicode="&#59040;" d="M512.1 831.8c-35.4 0-64-28.7-64-64v-128c0-35.4 28.7-64 64-64 35.4 0 64 28.7 64 64v128c0 35.3-28.6 64-64 64zM320.4 567.7l-110.8 64c-30.6 17.7-69.8 7.2-87.4-23.4-17.7-30.6-7.2-69.8 23.4-87.4l110.8-64c30.6-17.7 69.8-7.2 87.4 23.4 17.7 30.6 7.2 69.8-23.4 87.4zM342.4 286.8c-17.7 30.6-56.8 41.1-87.4 23.4l-110.8-64c-30.6-17.7-41.1-56.8-23.4-87.4 17.7-30.6 56.8-41.1 87.4-23.4l110.8 64c30.6 17.7 41.1 56.8 23.4 87.4zM509.2 188.9c-35.4 0-64-28.7-64-64v-128c0-35.4 28.7-64 64-64 35.4 0 64 28.7 64 64v128c0 35.3-28.6 64-64 64zM875.8 243.8l-110.8 64c-30.6 17.7-69.8 7.2-87.4-23.4-17.7-30.6-7.2-69.8 23.4-87.4l110.8-64c30.6-17.7 69.8-7.2 87.4 23.4 17.7 30.6 7.2 69.7-23.4 87.4zM678.9 477.8c17.7-30.6 56.8-41.1 87.4-23.4l110.8 64c30.6 17.7 41.1 56.8 23.4 87.4-17.7 30.6-56.8 41.1-87.4 23.4l-110.8-64c-30.6-17.6-41.1-56.8-23.4-87.4z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>
diff --git a/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.ttf b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.ttf
new file mode 100644
index 0000000..a3f9005
Binary files /dev/null and b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.ttf differ
diff --git a/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.woff b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.woff
new file mode 100644
index 0000000..9e7fb70
Binary files /dev/null and b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.woff differ
diff --git a/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.woff2 b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.woff2
new file mode 100644
index 0000000..88b0d01
Binary files /dev/null and b/java-mall-app-shop-admin/components/poiuy-uImgUpload/font/font_2170343_nij8dm8i18.woff2 differ
diff --git a/java-mall-app-shop-admin/components/poiuy-uImgUpload/imgUpload.vue b/java-mall-app-shop-admin/components/poiuy-uImgUpload/imgUpload.vue
new file mode 100644
index 0000000..2dd9cbb
--- /dev/null
+++ b/java-mall-app-shop-admin/components/poiuy-uImgUpload/imgUpload.vue
@@ -0,0 +1,950 @@
+<!-- 
+项目：图片上传插件
+时间：2020.9.24
+备注：接口的返回值是否符合插件所写的code=0，如果不是请复制 upload 和 asyncUpload 查找该方法 在注释的地方修改。
+-->
+
+<template>
+  <view class="w-100 imgupload">
+    <view class="w-100 flex_wrap">
+      <view
+        :class="single ? 'single-css' : 'imgs-view'"
+        v-for="(v, i) in imgArray"
+        :key="i"
+      >
+        <image @click="preview(v, i)" :src="v.url"></image>
+        <view
+          v-if="!disabled"
+          :class="conf.style ? 'del-btn-style-' + conf.style : 'del-btn'"
+          @click="delImg(i)"
+        >
+          <image v-if="conf.delIcon" :src="conf.delIcon"></image>
+          <text v-if="!conf.delIcon && conf.style == 1" class="icon_upload">
+            &#xe785;
+          </text>
+          <text v-if="!conf.delIcon && conf.style == 2" class="icon_upload">
+            &#xe785;
+          </text>
+        </view>
+        <view
+          class="uploading flex_xy_center"
+          :class="single ? 'single-css' : 'imgs-view'"
+          v-if="!v.upload && loading && startUpload"
+        >
+          <view>
+            <image v-if="conf.loadIcon" :src="conf.loadIcon"></image>
+            <text v-if="!conf.loadIcon && conf.style == 1" class="icon_upload">
+              &#xe6a0;
+            </text>
+            <text v-if="!conf.loadIcon && conf.style == 2" class="icon_upload">
+              &#xe616;
+            </text>
+            <view class="upload-txt">{{ conf.loadText || "上传中..." }}</view>
+          </view>
+        </view>
+
+        <view class="result" v-if="!conf.style && conf.resultTip && v.upload">
+          <label class="success" v-if="v.result === true">上传成功</label>
+          <label class="error" v-if="v.result === false">上传失败</label>
+        </view>
+
+        <view
+          v-if="conf.style == 1 && conf.resultTip && v.upload && !disabled"
+          class="result-style"
+          :class="'result-' + (v.result ? 1 : 2)"
+        >
+          <view v-if="v.result == true">
+            <text class="icon_upload">&#xe666;</text>
+            上传成功
+          </view>
+          <view v-if="v.result == false">
+            <text class="icon_upload">&#xe785;</text>
+            上传失败
+          </view>
+        </view>
+      </view>
+      <view
+        v-if="imgArray.length < imgCount && !disabled"
+        :style="conf.borderStyle"
+        class="flex_xy_center"
+        :class="single ? 'single-add' : 'upload-img-view'"
+        @click="upPhoto"
+      >
+        <text v-if="conf.addStyle == '1'" class="icon_upload">&#xe615;</text>
+        <text v-if="conf.addStyle == '2'" class="icon_upload add">
+          &#xe606;
+        </text>
+      </view>
+    </view>
+    <view v-if="!closeTip && !tipObj.prompt" class="imgupload__tip">
+      * 最多上传{{ imgCount }}张图片(
+      <label>{{ imgArray.length }}</label>
+      /{{ imgCount }})
+    </view>
+    <view
+      class="imgupload__tip"
+      :style="{ color: tipObj.typeColor }"
+      v-show="tipObj.prompt || tipObj.must"
+    >
+      {{ tipObj.prompt }}
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "imgUpload",
+  props: {
+    imgArr: {
+      //图片数组
+      type: [Array],
+    },
+    uploadImgCount: {
+      //一次上传图片数
+      type: String,
+      default: "3",
+    },
+    imgCount: {
+      //可上传图片总数
+      type: String,
+      default: "3",
+    },
+    imgSize: {
+      //图片大小 单位M
+      type: Number,
+      default: 2,
+    },
+    disabled: {
+      //禁用
+      type: Boolean,
+      default: false,
+    },
+    formData: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+    imgType: {
+      //如果是小程序，这个值则没用作用
+      type: [Array],
+      default: function () {
+        return ["jpeg", "png", "jpg"];
+      },
+    },
+    single: {
+      //只上传一张图片
+      type: Boolean,
+      default: false,
+    },
+    closeTip: {
+      type: Boolean,
+      default: false,
+    },
+    loading: {
+      type: Boolean,
+      default: true,
+    },
+    url: {
+      //上传图片Url
+      type: String,
+    },
+    async: {
+      type: Boolean,
+      default: false,
+    },
+    header: {
+      type: Array,
+      default: function () {
+        return [];
+      },
+    },
+    previewMany: {
+      //多图预览
+      type: Boolean,
+      default: false,
+    },
+    pressImg: {
+      //压缩图片 H5暂不支持压缩api
+      type: Number,
+      default: -1,
+    },
+    config: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+    isAdd: {
+      typeof: Object,
+      return: true,
+    },
+  },
+  data() {
+    return {
+      sysInfo: {},
+      imgArray: [],
+      canUpCount: "",
+      startUpload: false,
+      tipObj: {
+        prompt: "",
+        typeColor: "#009100",
+        must: false, //必须要存在的时候
+        success: "#009100", //成功-#009100; 可自定义修改
+        // warning: '#bb9300', // 警告 -#bb9300; 可自定义修改
+        error: "#FF0000", // 失败--#FF0000; 可自定义修改
+        warning: "#FF0000",
+      },
+      conf: {
+        delIcon: "", //删除图片icon
+        resultTip: true, //结果提示
+        style: "1", //组件默认风格
+        loadIcon: "", //加载时的图标
+        loadText: "", //加载时的文字
+        borderStyle: "border:2px dotted #dadada",
+        addStyle: "2", //添加风格 1 图片标 2 加号标
+      },
+      headers: {},
+      curPlatform: "",
+      currIndex: null,
+    };
+  },
+  created() {
+    this.getSysInfo();
+    this.imgArray = this.imgArr || [];
+    this.changeImgArr(true);
+    this.canUpCount = this.single ? 1 : Number(this.uploadImgCount);
+    if (this.url) {
+      this.tipObj.prompt = "";
+    } else {
+      this.tipObj.prompt = "你没有传入上传url,请检查传入参数";
+      this.tipObj.typeColor = this.tipObj.error;
+    }
+    this.changeHeader(this.header);
+    // 参数合并
+    this.conf = Object.assign(this.conf, this.config);
+
+    console.log(this.isAdd);
+  },
+  watch: {
+    imgArr(n, o) {
+      this.imgArray = n || [];
+      this.changeImgArr(true);
+    },
+    imgCount(n, o) {
+      this.uploadImgCount = n;
+      this.canUpCount = this.single ? 1 : Number(this.uploadImgCount);
+    },
+    url(n, o) {
+      if (n) {
+        this.tipObj.prompt = "";
+      } else {
+        this.tipObj.prompt = "你没有传入上传url,请检查传入参数";
+        this.tipObj.typeColor = this.tipObj.error;
+      }
+    },
+    header(n, o) {
+      this.changeHeader(n);
+    },
+    config(n, o) {
+      this.conf = Object.assign(this.conf, this.config);
+    },
+  },
+  methods: {
+    upPhoto() {
+      let that = this;
+      if (!that.url) {
+        that.tipObj.prompt = "你没有传入上传url,请检查！";
+        that.tipObj.typeColor = that.tipObj.error;
+        return;
+      }
+      if (
+        Number(that.imgCount - that.imgArray.length) <
+        Number(that.uploadImgCount)
+      ) {
+        that.canUpCount = Number(that.imgCount - that.imgArray.length);
+      }
+      if (!that.tipObj.must) {
+        that.tipObj.prompt = "";
+      }
+      that.tipObj.must = false;
+      uni.showActionSheet({
+        itemList: ["拍照上传", "从相册中选择"],
+        success: function (res) {
+          if (res.tapIndex == 0) {
+            uni.chooseImage({
+              count: Number(that.canUpCount),
+              sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
+              sourceType: ["camera"], //从相册选择
+              success: function (res) {
+                if (res) {
+                  if (res.tempFiles) {
+                    for (let item of res.tempFiles) {
+                      if (item.size > that.imgSize * 1024 * 1024) {
+                        uni.showToast({
+                          title: `图片不能大于${that.imgSize}M`,
+                          icon: "none",
+                        });
+                        return false;
+                      }
+                      if (item.type) {
+                        let r = that.imgType.some((v) => {
+                          let type = item.type.split("/");
+                          if (type.length) return v === type[1];
+                        });
+                        if (!r) {
+                          uni.showToast({
+                            title: `只允许上传${that.imgType}的类型`,
+                            icon: "none",
+                          });
+                          return false;
+                        }
+                      }
+                    }
+                  }
+                  that.currIndex = that.imgArray.length;
+                  that.imgArray = [...that.imgArray, ...res.tempFilePaths];
+                  that.changeImgArr(false);
+                  if (that.pressImg >= 0) {
+                    //存在图片压缩 开启图片压缩
+                    if (that.checkPlatform()) {
+                      // H5环境下不支持
+                      that.pressImages();
+                    }
+                  } else {
+                    //正常异步提交
+                    that.hasAysnc();
+                  }
+                }
+              },
+            });
+          } else if (res.tapIndex == 1) {
+            uni.chooseImage({
+              count: Number(that.canUpCount),
+              sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
+              sourceType: ["album"], //从相册选择
+              success: function (res) {
+                if (res) {
+                  if (res.tempFiles) {
+                    for (let item of res.tempFiles) {
+                      if (item.size > that.imgSize * 1024 * 1024) {
+                        uni.showToast({
+                          title: `图片不能大于${that.imgSize}M`,
+                          icon: "none",
+                        });
+                        return false;
+                      }
+                      if (item.type) {
+                        let r = that.imgType.some((v) => {
+                          let type = item.type.split("/");
+                          if (type.length) return v === type[1];
+                        });
+                        if (!r) {
+                          uni.showToast({
+                            title: `只允许上传${that.imgType}的类型`,
+                            icon: "none",
+                          });
+                          return false;
+                        }
+                      }
+                    }
+                  }
+                  that.currIndex = that.imgArray.length;
+                  that.imgArray = [...that.imgArray, ...res.tempFilePaths];
+                  that.changeImgArr(false);
+                  if (that.pressImg >= 0) {
+                    //存在图片压缩 开启图片压缩
+                    if (that.checkPlatform()) {
+                      // H5环境下不支持
+                      that.pressImages();
+                    }
+                  } else {
+                    //正常异步提交
+                    that.hasAysnc();
+                  }
+                }
+              },
+            });
+          }
+        },
+        fail: function (res) {
+          console.log(res.errMsg);
+        },
+      });
+    },
+    preview(obj, index) {
+      if (this.previewMany) {
+        let urls = [];
+        urls.push(obj.url);
+        this.imgArray.map((item) => {
+          if (obj.id != item.id) {
+            urls.push(item.url);
+          }
+        });
+        uni.previewImage({
+          urls: urls,
+        });
+      } else {
+        // 预览图片(单张)
+        uni.previewImage({
+          urls: [obj.url],
+        });
+      }
+    },
+
+    changeImgArr(type) {
+      for (let index in this.imgArray) {
+        let item = this.imgArray[index];
+        if (!item.upload) {
+          if (item.upload === false) {
+            this.imgArray[index].url = item.url;
+          } else {
+            this.imgArray[index] = {
+              id: index,
+              upload: type,
+              url: item,
+              result: type,
+            };
+          }
+        }
+      }
+    },
+
+    pressImages() {
+      const _this = this;
+      let success = 0;
+      let completeNum = 0;
+      for (let item of _this.imgArray) {
+        uni.compressImage({
+          src: item.url,
+          quality: _this.pressImg,
+          success: (res) => {
+            ++success;
+            item.pressUrl = res.tempFilePath;
+          },
+          error: (res) => {
+            console.log(res);
+          },
+          complete: (res) => {
+            ++completeNum;
+            //等待全部压缩完成
+            if (completeNum === _this.imgArray.length) {
+              console.log(success);
+              if (success >= _this.imgArray.length) {
+                _this.tipObj.prompt = "全部压缩成功！";
+                _this.tipObj.typeColor = _this.tipObj.success;
+              } else {
+                let errorNum = _this.imgArray.length - success;
+                _this.tipObj.prompt = `${errorNum}个文件压缩失败`;
+                _this.tipObj.typeColor = _this.tipObj.warning;
+              }
+              console.log("res", _this.imgArray);
+              if (_this.async) {
+                //直接上传
+                _this.asyncUpload();
+              }
+            }
+          },
+        });
+      }
+    },
+
+    asyncUpload() {
+      const _this = this;
+      if (_this.imgArray.length) {
+        let length = _this.imgArray.length;
+        _this.startUpload = true;
+        _this.tipObj.prompt = "";
+        let result = [];
+        //_this.currIndex;
+        for (let i = 0; i < length; i++) {
+          let item = _this.imgArray[i];
+          let subUrl = _this.pressImg >= 0 ? item.pressUrl : item.url;
+
+          if (!item.upload) {
+            _this.asyncUploadMethod(subUrl, i, (res) => {
+              if (res) {
+                result.push(res);
+
+                if (_this.single) {
+                  _this.$emit("result", _this.imgArray[0]);
+                } else {
+                  console.log("resultlist", _this.imgArray);
+                  _this.$emit("result", {
+                    all: _this.imgArray,
+                    new: result,
+                  });
+                }
+              }
+            });
+          }
+        }
+      }
+    },
+
+    asyncUploadMethod(url, i, callback) {
+      const _this = this;
+      uni.uploadFile({
+        url: _this.url,
+        filePath: url,
+        name: "upfile",
+        header: _this.headers,
+        formData: _this.formData,
+        success: (uploadFileRes) => {
+          if (uploadFileRes.statusCode == 200) {
+            let res = JSON.parse(uploadFileRes.data);
+            /*注意 如果返回的结果字段不一样，请在这里做修改[res.code]*/
+            if (res.code === 0 || res.code === "0") {
+              //成功情况下
+              _this.imgArray[i].result = true;
+              res.code = 0;
+              _this.imgArray[i].url = res.data.url; //这里
+              callback(res.data.url);
+            } else {
+              _this.imgArray[i].result = false;
+              _this.tipObj.prompt = "上传失败，请检查！";
+              _this.tipObj.typeColor = _this.tipObj.error;
+            }
+          } else {
+            _this.imgArray[i].result = false;
+          }
+        },
+        fail: (e) => {
+          _this.imgArray[i].result = false;
+          _this.tipObj.prompt = "上传失败，请检查！";
+          _this.tipObj.typeColor = _this.tipObj.error;
+          console.log(e);
+        },
+        complete: () => {
+          _this.imgArray[i].upload = true;
+          _this.startUpload = false;
+          _this.$forceUpdate();
+        },
+      });
+    },
+
+    delImg(i) {
+      const _this = this;
+      uni.showModal({
+        title: "提示",
+        content: "是否删除这张照片？",
+        success: function (res) {
+          if (res.confirm) {
+            _this.imgArray.splice(i, 1);
+            if (_this.async) {
+              _this.$emit("delImg", i);
+            }
+          } else if (res.cancel) {
+          }
+        },
+      });
+    },
+
+    upload(callback) {
+      const _this = this;
+      if (!_this.async) {
+        _this.tipObj.prompt = "";
+        if (_this.imgArray.length) {
+          this.startUpload = true;
+          let successNum = 0;
+          let urlArr = [];
+          for (let item of _this.imgArray) {
+            _this.uploadImg(item, (res) => {
+              /*注意 如果返回的结果字段不一样，请在这里做修改[res.code]*/
+              if (res.code == 0) {
+                successNum++;
+                urlArr.push(res.url); /*需要线上图片地址[res.fileVo]*/
+                item.result = true;
+              } else {
+                urlArr.push(res);
+                item.result = false;
+              }
+              item.upload = true;
+              _this.$forceUpdate();
+              _this.tipObj.prompt =
+                "正在上传...(成功" + successNum + "张/" + urlArr.length + "张)";
+              _this.tipObj.typeColor = _this.tipObj.success;
+              if (urlArr.length == _this.imgArray.length) {
+                _this.tipObj.prompt = "已全部上传完成！";
+                _this.tipObj.typeColor = _this.tipObj.success;
+                if (successNum > 0) {
+                  _this.startUpload = false;
+                  callback(_this.result(urlArr, successNum));
+                } else {
+                  _this.startUpload = false;
+                  callback(urlArr); //错误的返回
+                }
+              }
+            });
+          }
+        } else {
+          _this.tipObj.prompt = "请先选择图片后上传！";
+          _this.tipObj.typeColor = _this.tipObj.warning;
+        }
+      } else {
+        _this.tipObj.prompt = "在异步模式下无法调用upload方法。";
+        _this.tipObj.typeColor = _this.tipObj.warning;
+      }
+    },
+
+    result(urlArr, successNum) {
+      let result = {
+        result: "success",
+        code: 0,
+        urlArray: urlArr,
+        success: successNum,
+      };
+      return result;
+    },
+
+    uploadImg(item, callback) {
+      const _this = this;
+      let subUrl = _this.pressImg >= 0 ? item.pressUrl : item.url;
+      uni.uploadFile({
+        url: _this.url,
+        filePath: subUrl,
+        formData: _this.formData,
+        header: _this.headers,
+        name: "upfile",
+        success: (uploadFileRes) => {
+          if (uploadFileRes) {
+            let res = JSON.parse(uploadFileRes.data);
+            res.resCode = 0;
+            callback(res);
+          }
+        },
+        fail: (e) => {
+          callback({
+            resCode: 500,
+            msg: "图片上传失败",
+            localUrl: item,
+            reason: e,
+          });
+        },
+      });
+    },
+
+    changeHeader(header) {
+      const _this = this;
+      if (Array.isArray(header)) {
+        for (let item of header) {
+          for (let key in item) {
+            _this.headers[key] = item[key];
+          }
+        }
+      } else {
+        _this.tipObj.prompt = "请使用数组格式的Header传参";
+        _this.tipObj.typeColor = _this.tipObj.error;
+      }
+    },
+
+    //是异步方法的提交
+    hasAysnc() {
+      const that = this;
+      if (that.async) {
+        let startIndex = that.imgArray.length;
+        //直接上传
+        that.asyncUpload(startIndex);
+      } else {
+        that.$emit("result", {
+          code: 500,
+          msg: "同步模式下,我不会被调用哦~",
+        });
+      }
+    },
+
+    checkPlatform() {
+      const that = this;
+      let canUse = true;
+      //#ifdef H5
+      that.tipObj.prompt = "该环境不支持图片压缩，图片压缩功能不会生效。";
+      that.tipObj.must = true;
+      that.tipObj.typeColor = that.tipObj.warning;
+      canUse = false;
+      that.hasAysnc();
+      //#endif
+      return canUse;
+    },
+
+    getSysInfo() {
+      const that = this;
+      try {
+        const res = uni.getSystemInfoSync();
+        that.sysInfo = {
+          screenWidth: res.screenWidth,
+          screenHeight: res.screenHeight,
+        };
+      } catch (e) {
+        // error
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+@font-face {
+  font-family: "icon_upload";
+  /* project id 2170343 */
+  src: url("./font/font_2170343_nij8dm8i18.eot");
+  src: url("./font/font_2170343_nij8dm8i18.eot?#iefix")
+      format("embedded-opentype"),
+    url("./font/font_2170343_nij8dm8i18.woff2") format("woff2"),
+    url("./font/font_2170343_nij8dm8i18.woff") format("woff"),
+    url("./font/font_2170343_nij8dm8i18.ttf") format("truetype"),
+    url("./font/font_2170343_nij8dm8i18.svg") format("svg");
+}
+
+.icon_upload {
+  font-family: "icon_upload" !important;
+  font-size: 30rpx;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -webkit-text-stroke-width: 0.2px;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.w-100 {
+  width: 100%;
+}
+
+.flex {
+  /* 转为弹性盒模型*/
+  display: flex;
+}
+
+.flex_bet {
+  /* 两端左右*/
+  display: flex;
+  justify-content: space-between;
+}
+
+.flex_wrap {
+  /* 转为弹性盒模型并自动换行*/
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.flex_xy_center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.imgupload image {
+  height: 100%;
+  width: 100%;
+}
+
+.upload-img-view {
+  height: 136rpx;
+  width: 136rpx;
+  border-radius: 10rpx;
+  border: 4rpx dotted #f1f1f1;
+  /* background-color: #F1F1F1; */
+}
+
+.single-add {
+  width: 100%;
+  height: inherit;
+  min-height: 200rpx;
+  border-radius: 10rpx;
+  border: 4rpx dotted #f1f1f1;
+}
+
+.upload-img-view > text,
+.single-add > text {
+  font-size: 70rpx;
+  color: #949494;
+}
+
+.upload-img-view .add,
+.single-add .add {
+  font-size: 55rpx;
+}
+
+.upload-txt {
+  font-size: 24rpx;
+  color: #ffffff;
+}
+
+.imgs-view {
+  height: 136rpx;
+  width: 136rpx;
+  border-radius: 10rpx;
+  margin-right: 1.8%;
+  margin-bottom: 16rpx;
+  border: 1rpx solid #f1f1f1;
+  box-sizing: border-box;
+  position: relative;
+}
+
+.single-css {
+  width: 100%;
+  height: inherit;
+  min-height: 200rpx;
+  border-radius: 10rpx;
+  border: 1rpx solid #f1f1f1;
+  box-sizing: border-box;
+  position: relative;
+}
+
+.result {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 45rpx;
+  font-size: 26rpx;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.6);
+  text-align: center;
+  line-height: 45rpx;
+  border-bottom-left-radius: 10rpx;
+  border-bottom-right-radius: 10rpx;
+}
+
+.result > .success {
+  color: #00b900;
+}
+
+.result > .error {
+  color: #b52e25;
+}
+
+.uploading {
+  position: absolute;
+  background-color: rgba(0, 0, 0, 0.5);
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  line-height: 100%;
+  z-index: 988;
+}
+
+.uploading image {
+  width: 60rpx;
+  height: 60rpx;
+  z-index: 989;
+  animation: rotation 1s linear infinite;
+  -moz-animation: rotation 1s linear infinite;
+  -webkit-animation: rotation 1s linear infinite;
+  -o-animation: rotation 1s linear infinite;
+}
+
+.uploading text {
+  display: inline-block;
+  font-size: 50rpx;
+  color: #fffdef;
+  z-index: 989;
+  animation: rotation 1s linear infinite;
+  -moz-animation: rotation 1s linear infinite;
+  -webkit-animation: rotation 1s linear infinite;
+  -o-animation: rotation 1s linear infinite;
+}
+
+@keyframes rotation {
+  from {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+  }
+
+  to {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+    -moz-transform: rotate(360deg);
+    -o-transform: rotate(360deg);
+  }
+}
+
+.imgs-view > image,
+.single-css > image {
+  width: 100%;
+  height: 100%;
+  border-radius: 10rpx;
+}
+
+.imgupload__tip {
+  font-size: 24rpx;
+  color: #ff0000;
+  margin: 10rpx auto;
+}
+
+.imgupload__tip > label {
+  color: #009100;
+}
+
+.del-btn {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 32rpx;
+  height: 32rpx;
+  z-index: 988;
+}
+
+.del-btn > image {
+  width: 100%;
+  height: 100%;
+  display: flex;
+}
+
+.del-btn-style-2 {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 32rpx;
+  height: 32rpx;
+  z-index: 988;
+}
+
+.del-btn-style-1 {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 44rpx;
+  height: 44rpx;
+  z-index: 988;
+  background: rgba(0, 0, 0, 0.3);
+  color: #ececec;
+  border-bottom-left-radius: 30rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 24rpx;
+}
+
+.result-style {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 44rpx;
+  border-top-right-radius: 50rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transition: all 0.5s ease;
+  transform: translateX(-100%);
+  opacity: 0.4;
+}
+
+.result-1 {
+  background: rgba(7, 169, 19, 0.75);
+  color: white;
+  transform: translateX(0%);
+  font-size: 24rpx;
+  opacity: 1;
+}
+
+.result-2 {
+  background: rgba(239, 0, 5, 0.7);
+  color: #dadada;
+  font-size: 24rpx;
+  transform: translateX(0%);
+  opacity: 1;
+}
+</style>
diff --git a/java-mall-app-shop-admin/components/uni-nav-bar/uni-nav-bar.vue b/java-mall-app-shop-admin/components/uni-nav-bar/uni-nav-bar.vue
index 6f2e56a..778e8c7 100644
--- a/java-mall-app-shop-admin/components/uni-nav-bar/uni-nav-bar.vue
+++ b/java-mall-app-shop-admin/components/uni-nav-bar/uni-nav-bar.vue
@@ -32,9 +32,9 @@
               class="uni-navbar-btn-text"
               v-if="leftText.length"
             >
-              <text :style="{ color: themeColor, fontSize: '12px' }">{{
-                leftText
-              }}</text>
+              <text :style="{ color: themeColor, fontSize: '12px' }">
+                {{ leftText }}
+              </text>
             </view>
           </slot>
         </view>
@@ -47,8 +47,9 @@
               <text
                 class="uni-nav-bar-text uni-ellipsis-1"
                 :style="{ color: themeColor }"
-                >{{ title }}</text
               >
+                {{ title }}
+              </text>
             </view>
           </slot>
         </view>
@@ -68,8 +69,9 @@
               <text
                 class="uni-nav-bar-right-text"
                 :style="{ color: themeColor }"
-                >{{ rightText }}</text
               >
+                {{ rightText }}
+              </text>
             </view>
           </slot>
         </view>
@@ -247,6 +249,7 @@ $nav-height: 44px;
   /* #ifndef APP-PLUS */
   font-size: 14px;
   /* #endif */
+  font-weight: bold;
 }
 
 .uni-nav-bar-right-text {
diff --git a/java-mall-app-shop-admin/config/componentConfig.js b/java-mall-app-shop-admin/config/componentConfig.js
index 4380af0..c6fe2b3 100644
--- a/java-mall-app-shop-admin/config/componentConfig.js
+++ b/java-mall-app-shop-admin/config/componentConfig.js
@@ -70,8 +70,6 @@ export default {
         break;
     }
 
-    console.log("marketId", marketId);
-    console.log("phoneInfo.brand", phoneInfo.brand);
 
     let params = {
       marketId: 100,
diff --git a/java-mall-app-shop-admin/main.js b/java-mall-app-shop-admin/main.js
index aa2c81c..11c0451 100644
--- a/java-mall-app-shop-admin/main.js
+++ b/java-mall-app-shop-admin/main.js
@@ -4,14 +4,11 @@ import store from "./store";
 import uView from "@/uni_modules/uview-ui";
 import "./uni.promisify.adaptor";
 import tui from "./utils/httpRequest";
-import Socket from "./utils/socket.js";
 
 Vue.use(uView);
 
 Vue.config.productionTip = false;
-// Vue.prototype.$utils = Utils
 Vue.prototype.tui = tui;
-Vue.prototype.$Socket = Socket;
 
 App.mpType = "app";
 const app = new Vue({
diff --git a/java-mall-app-shop-admin/manifest.json b/java-mall-app-shop-admin/manifest.json
index 74e0f54..04364a9 100644
--- a/java-mall-app-shop-admin/manifest.json
+++ b/java-mall-app-shop-admin/manifest.json
@@ -4,7 +4,7 @@
     "package" : "com.xiaofa.shopAdmin",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : 102,
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -17,19 +17,13 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "ios" : {
-            "capabilities" : {
-                "com.apple.SafariKeychain" : true
-            }
-        },
         /* 模块配置 */
         "modules" : {
             "Maps" : {},
             "Camera" : {},
             "Record" : {},
             "VideoPlayer" : {},
-            "UIWebview" : {},
-            "Push" : {}
+            "UIWebview" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -68,25 +62,7 @@
             },
             /* SDK配置 */
             "sdkConfigs" : {
-                "maps" : {},
-                "push" : {
-                    "igexin" : {
-                        "appid" : "rQxaGAKl7t83KlTubAaKC3",
-                        "appkey" : "QSElTn6ttq5nmrIZtFhCT",
-                        "appsecret" : "zbC1MMuzaf7kW91fdhm9v8"
-                    },
-                    "unipush" : {
-                        "version" : "2",
-                        "offline" : false,
-                        "hms" : {},
-                        "oppo" : {},
-                        "vivo" : {},
-                        "mi" : {},
-                        "meizu" : {},
-                        "honor" : {},
-                        "fcm" : {}
-                    }
-                }
+                "maps" : {}
             },
             "icons" : {
                 "android" : {
@@ -121,7 +97,7 @@
                 }
             },
             "splashscreen" : {
-                "androidStyle" : "common"
+                "androidStyle" : "default"
             }
         }
     },
diff --git a/java-mall-app-shop-admin/pages/IM/IM.vue b/java-mall-app-shop-admin/pages/IM/IM.vue
index 85a8673..259913f 100644
--- a/java-mall-app-shop-admin/pages/IM/IM.vue
+++ b/java-mall-app-shop-admin/pages/IM/IM.vue
@@ -6,7 +6,8 @@
         <image
           class="img"
           :src="
-            msgInfo.mine.user_avatar || '../../static/images/user-avatar.jpg'
+            msgInfo.mine.user_avatar ||
+            '../../static/images/chat/user-avatar.jpg'
           "
         />
         <text>{{ msgInfo.mine.user_nickname }}</text>
@@ -149,7 +150,7 @@ export default {
   },
   onLoad() {},
   computed: {
-    ...mapState("user", ["uid", "userInfo", "socket", "imWeidu", "getMsg"]),
+    ...mapState("user", ["uid", "userInfo", "imWeidu", "getMsg"]),
   },
   watch: {
     imWeidu: {
@@ -198,9 +199,9 @@ export default {
       this.loading = true;
       let res = await GetImConfig({ type: "json", uid: this.uid });
 
+      console.log(res);
       if (res && res.status == 200) {
         this.msgInfo = res.data;
-
         if (res.data.friend.length > 0) {
           let _imWeiDu = uni.getStorageSync("imWeiDu");
           if (_imWeiDu) {
@@ -217,6 +218,7 @@ export default {
             this.msgList = res.data.friend[0].list;
           }
         }
+        // this.connectSocket(this.userInfo);
       }
       this.loading = false;
     },
@@ -279,11 +281,12 @@ export default {
     .IM-status {
       display: flex;
       align-items: center;
-      gap: 10rpx;
+      gap: 20rpx;
       .img {
         width: 88rpx;
         height: 88rpx;
-        border-radius: 10rpx;
+        border-radius: 100%;
+        margin-right: 20rpx;
       }
     }
 
@@ -384,7 +387,7 @@ export default {
   }
 
   .icon-kefu {
-    // margin-right: 40rpx;
+    margin-right: 40rpx;
   }
 
   .IM-loading {
diff --git a/java-mall-app-shop-admin/pages/IM/IMmsgContent.vue b/java-mall-app-shop-admin/pages/IM/IMmsgContent.vue
index 6f64fc8..dad1a7e 100644
--- a/java-mall-app-shop-admin/pages/IM/IMmsgContent.vue
+++ b/java-mall-app-shop-admin/pages/IM/IMmsgContent.vue
@@ -144,6 +144,7 @@ import tChatBar from "@/components/t-chat-bar/t-chat-bar";
 import tuiBadge from "@/components/tui-badge/tui-badge.vue";
 import emoji from "../../static/im/emojiData.js";
 import { mapState } from "vuex";
+import { webSocketManager } from "@/utils/socket.js";
 export default {
   components: {
     tChatBar,
@@ -178,7 +179,6 @@ export default {
       RECORDER: uni.getRecorderManager(),
       playMsgid: "",
       isPlayVoice: false,
-      // socket: {},
       chattype: "user",
       isHideKeyBoard: false,
       emojiPath: "https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/",
@@ -326,7 +326,7 @@ export default {
     },
   },
   computed: {
-    ...mapState("user", ["uid", "userInfo", "socket", "getMsg"]),
+    ...mapState("user", ["uid", "userInfo", "getMsg"]),
   },
   methods: {
     async setMsgRead(lastid) {
@@ -515,26 +515,7 @@ export default {
         // }
       }
     },
-    // socketServer() {
-    //   console.log(this.userInfo.im.node_site_url);
 
-    //   this.socket = new this.$Socket({
-    //     url: this.userInfo.im.node_site_url,
-    //     maxInterValCount: 5,
-    //     interValTime: 2000,
-    //     onClose: (res) => {
-    //       console.log("socket关闭");
-    //     },
-    //     onOpen: (res) => {
-    //       console.log("socket连接成功");
-    //     },
-    //     onMsg: (res) => {
-    //       console.log("onMsg", res);
-    //     },
-    //   });
-
-    //   this.socket.connectserver(this.userInfo.im);
-    // },
     processTimeString(timeStr) {
       const parts = timeStr.split(":");
 
@@ -800,7 +781,9 @@ export default {
       if (res && res.status == 200) {
         chat_data.mine.message_id = res.data.message_other_id;
 
-        this.socket.nsend(chat_data);
+        let connection = webSocketManager.getConnection("ws1");
+
+        connection.send(chat_data);
         let lastid = res.data.message_other_id;
         let tempmy = this.userInfo.im;
         ///TOID现在是模拟的
diff --git a/java-mall-app-shop-admin/pages/audit/checkAudit.vue b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
index c8839dc..35397b9 100644
--- a/java-mall-app-shop-admin/pages/audit/checkAudit.vue
+++ b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
@@ -276,6 +276,7 @@
             :placeholder="item.placeholder"
             :readonly="item.isReadonly"
             :maxlength="item.maxLength"
+            clearable
           />
           <u-icon
             v-if="item.type == 'select'"
@@ -366,6 +367,7 @@
           v-model="branchSearchText"
           placeholder="搜索开户银行关键词"
           @change="onBranchBankChange"
+          clearable
         />
         <view class="branch_list">
           <template v-if="bankList.length">
diff --git a/java-mall-app-shop-admin/pages/audit/mapAddress.vue b/java-mall-app-shop-admin/pages/audit/mapAddress.vue
index cb94598..ba16578 100644
--- a/java-mall-app-shop-admin/pages/audit/mapAddress.vue
+++ b/java-mall-app-shop-admin/pages/audit/mapAddress.vue
@@ -29,6 +29,7 @@
           v-model="form.searchAddress"
           placeholder="搜索地址，更快填写"
           @input="handerSearchAddress"
+          clearable
         />
       </u-form-item>
     </u-form>
diff --git a/java-mall-app-shop-admin/pages/audit/shop1.vue b/java-mall-app-shop-admin/pages/audit/shop1.vue
index 806bbb8..efaa946 100644
--- a/java-mall-app-shop-admin/pages/audit/shop1.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop1.vue
@@ -35,6 +35,7 @@
           class="form-input"
           v-model="form.contact_name"
           placeholder="请输入联系人"
+          clearable
         />
       </u-form-item>
       <u-form-item
@@ -62,6 +63,7 @@
           class="form-input"
           v-model="form.store_name"
           placeholder="请输入门店名称"
+          clearable
         />
         <u-button
           slot="right"
@@ -97,6 +99,7 @@
           v-model="form.store_address"
           @input="handleStoreAddressInput"
           placeholder="详细地址:如:人民大道205号2楼213"
+          clearable
         />
       </u-form-item>
       <u-form-item label="门脸图" prop="front_facade_image">
diff --git a/java-mall-app-shop-admin/pages/audit/shop2.vue b/java-mall-app-shop-admin/pages/audit/shop2.vue
index 109472c..fc559cd 100644
--- a/java-mall-app-shop-admin/pages/audit/shop2.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop2.vue
@@ -66,6 +66,7 @@
                 class="form-input"
                 v-model="form.biz_license_company"
                 placeholder="请输入公司名称"
+                clearable
               />
             </u-form-item>
             <u-form-item label="法人姓名" prop="legal_person_name" required>
@@ -73,6 +74,7 @@
                 class="form-input"
                 v-model="form.legal_person_name"
                 placeholder="请输入法人姓名"
+                clearable
               />
             </u-form-item>
             <u-form-item label="注册号" prop="biz_license_number" required>
@@ -80,6 +82,7 @@
                 class="form-input"
                 v-model="form.biz_license_number"
                 placeholder="请输入注册号"
+                clearable
               />
             </u-form-item>
             <u-form-item label="法人手机号" prop="legal_person_mobile" required>
@@ -88,6 +91,7 @@
                 class="form-input"
                 v-model="form.legal_person_mobile"
                 placeholder="请输入法人手机号"
+                clearable
               />
             </u-form-item>
             <u-form-item label="经营范围" prop="biz_license_content" required>
@@ -96,6 +100,7 @@
                 class="form-input"
                 v-model="form.biz_license_content"
                 placeholder="请输入经营范围"
+                clearable
               />
             </u-form-item>
             <u-form-item
diff --git a/java-mall-app-shop-admin/pages/login/login.vue b/java-mall-app-shop-admin/pages/login/login.vue
index d9a8f0a..8713afd 100644
--- a/java-mall-app-shop-admin/pages/login/login.vue
+++ b/java-mall-app-shop-admin/pages/login/login.vue
@@ -149,10 +149,10 @@
             登录
           </u-button>
         </view>
-        <!-- <view class="agreement-content">
+        <view class="agreement-content">
           登录代表你已经同意
           <text @click="handerSkip()" class="agreement-item">《用户协议》</text>
-        </view> -->
+        </view>
       </view>
     </view>
     <u-toast ref="uToast" />
@@ -496,7 +496,7 @@ export default {
     }
 
     .input_icon {
-     ::v-deep .u-icon__icon {
+      ::v-deep .u-icon__icon {
         font-size: 36rpx !important;
       }
     }
diff --git a/java-mall-app-shop-admin/pages/order/order.vue b/java-mall-app-shop-admin/pages/order/order.vue
index f874b12..68139b2 100644
--- a/java-mall-app-shop-admin/pages/order/order.vue
+++ b/java-mall-app-shop-admin/pages/order/order.vue
@@ -1265,7 +1265,6 @@ export default {
         this.showOrderLoading = true;
       }
 
-      console.log(this.dashboardInfo.store_info.store_id);
 
       this.params = {
         storeId: this.dashboardInfo.store_info.store_id,
diff --git a/java-mall-app-shop-admin/pages/register/register.vue b/java-mall-app-shop-admin/pages/register/register.vue
index 8de9ade..0daba9f 100644
--- a/java-mall-app-shop-admin/pages/register/register.vue
+++ b/java-mall-app-shop-admin/pages/register/register.vue
@@ -57,9 +57,10 @@
 
         <view class="btn-content">
           <view class="tool">
-            <view class="right" @click="goLoginPage"
-              >已有账号? <text>立即登录</text></view
-            >
+            <view class="right" @click="goLoginPage">
+              已有账号?
+              <text>立即登录</text>
+            </view>
           </view>
           <u-button
             class="btn-register"
@@ -71,11 +72,10 @@
             注册
           </u-button>
         </view>
-        <!-- <view class="agreement-content">
-          注册代表你已经同意<text @click="handerSkip()" class="agreement-item"
-            >《用户协议》</text
-          >
-        </view> -->
+        <view class="agreement-content">
+          注册代表你已经同意
+          <text @click="handerSkip()" class="agreement-item">《用户协议》</text>
+        </view>
       </view>
     </view>
     <u-toast ref="uToast" />
@@ -270,7 +270,7 @@ export default {
     }
 
     .input_icon {
-       ::v-deep.u-icon__icon {
+      ::v-deep.u-icon__icon {
         font-size: 36rpx !important;
       }
     }
@@ -372,7 +372,7 @@ export default {
     .agreement-content {
       position: fixed;
       bottom: 10%;
-      width: 90%;
+      width: 83%;
       text-align: center;
       font-size: 28rpx;
       color: #ccc;
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
index 1ac0981..7caf3d3 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/addAndEditProduct.vue
@@ -6,9 +6,9 @@
       :border="false"
       :fixed="true"
       :height="'44px'"
-      rightWidth="0"
+      :rightWidth="40"
       :leftWidth="30"
-      title="编辑分类"
+      :title="isAdd ? '添加商品' : '编辑商品'"
       backgroundColor="#fff"
     >
       <block slot="left">
@@ -19,6 +19,7 @@
           @click="pageBack()"
         ></u-icon>
       </block>
+      <block slot="right" v-if="!isAdd">删除</block>
     </navBar>
     <view class="addAndEditProduct-content">
       <u--form
@@ -28,21 +29,28 @@
         label-width="100"
         :rules="rules"
       >
-        <u-form-item label="商品名称" prop="product_name" class="form-item">
+        <u-form-item
+          label="商品名称"
+          prop="product_name"
+          class="form-item"
+          required
+        >
           <u--input
             v-model="form.product_name"
-            placeholder="有输入商品名称"
+            placeholder="请输入商品名称"
             border="none"
+            clearable
           ></u--input>
         </u-form-item>
         <u-form-item
           label="商品分类"
-          prop="type_category_name"
+          prop="category_name"
           class="form-item"
+          required
           @click="hadnerShowClassifyListPopup()"
         >
           <u--input
-            v-model="form.type_category_name"
+            v-model="form.category_name"
             disabled
             disabledColor="#ffffff"
             placeholder="请选择商品分类"
@@ -51,30 +59,378 @@
           ></u--input>
           <u-icon slot="right" name="arrow-right"></u-icon>
         </u-form-item>
+        <u-form-item label="商品主图" prop="img" class="form-item" required>
+          <!-- <u-upload
+            class="shop2-2-upload"
+            @afterRead="afterRead($event, 'businessLicense')"
+            @delete="deletePic($event, 'businessLicense')"
+            accept="image"
+            :fileList="form.businessLicenseFiles"
+            :max-count="1"
+            width="125"
+            height="88"
+            :maxSize="maxSize"
+            @oversize="overSize"
+            uploadText="上传图片"
+          ></u-upload> -->
+          <imgUpload
+            :imgArr="primaryImg"
+            uploadImgCount="1"
+            imgCount="1"
+            :imgSize="8"
+            :header="header"
+            :async="true"
+            :config="config"
+            :isAdd="isAdd"
+            url="https://mall.gpxscs.cn/mobile/shop/oss/upload"
+            :formData="formData"
+            @result="handerResultUrl($event, 'primary')"
+          ></imgUpload>
+        </u-form-item>
+        <u-form-item label="商品附图" class="form-item">
+          <imgUpload
+            :imgArr="viceImg"
+            uploadImgCount="1"
+            imgCount="5"
+            :imgSize="8"
+            :header="header"
+            :async="true"
+            :config="config"
+            :isAdd="isAdd"
+            url="https://mall.gpxscs.cn/mobile/shop/oss/upload"
+            :formData="formData"
+            @result="handerResultUrl($event, 'vice')"
+          ></imgUpload>
+        </u-form-item>
+        <u-form-item
+          label="商品卖点"
+          prop="product_tips"
+          :class="[
+            'form-item',
+            { 'form-item-margin-top-20': isUnfold },
+            { 'form-item-margin-20': !isUnfold },
+          ]"
+        >
+          <u--textarea
+            v-model="form.product_tips"
+            placeholder="15字以内突出商品特点"
+            count
+            :autoHeight="true"
+            maxlength="15"
+          ></u--textarea>
+        </u-form-item>
+        <u-form-item
+          label="商品类型"
+          class="form-item"
+          labelWidth="80"
+          v-if="form.category_name"
+        >
+          <u-radio-group v-model="form.kind_id" placement="row" shape="circle">
+            <u-radio
+              :customStyle="{ marginRight: '28rpx' }"
+              v-for="(item, index) in commodityTypeRadioList"
+              :key="index"
+              :label="item.name"
+              :name="item.value"
+              :disabled="!categoryVirtualEnable"
+            ></u-radio>
+          </u-radio-group>
+        </u-form-item>
+
+        <u-form-item
+          v-if="isUnfold"
+          label="商品货号"
+          prop="product_number"
+          class="form-item"
+        >
+          <u--input
+            v-model="form.product_number"
+            placeholder="请输入商品货号"
+            border="none"
+            clearable
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          v-if="isUnfold"
+          label="购买上限"
+          prop="product_buy_limit"
+          class="form-item"
+        >
+          <u--input
+            v-model="form.product_buy_limit"
+            placeholder="请输入购买上限"
+            border="none"
+            clearable
+          ></u--input>
+        </u-form-item>
+        <u-form-item
+          v-if="isUnfold"
+          label="开售时间"
+          prop="product_state_id"
+          class="form-item form-sale-time-item"
+        >
+          <u-radio-group
+            v-model="form.product_state_id"
+            placement="row"
+            shape="circle"
+          >
+            <u-radio
+              :customStyle="{ marginRight: '28rpx' }"
+              v-for="(item, index) in saleTimeRadioList"
+              :key="index"
+              :label="item.name"
+              :name="item.value"
+            ></u-radio>
+          </u-radio-group>
+          <view
+            class="sale-time"
+            v-if="form.product_state_id == 1002"
+            @click="showSaleTime = true"
+          >
+            {{ form.product_sale_time || "预计上架时间" }}
+          </view>
+        </u-form-item>
+        <u-form-item
+          v-if="isUnfold"
+          label="库存锁定"
+          prop="product_inventory_lock"
+          class="form-item"
+        >
+          <u-radio-group
+            v-model="form.product_inventory_lock"
+            placement="row"
+            shape="circle"
+          >
+            <u-radio
+              :customStyle="{ marginRight: '28rpx' }"
+              v-for="(item, index) in inventoryRadioList"
+              :key="index"
+              :label="item.name"
+              :name="item.value"
+            ></u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item
+          v-if="isUnfold"
+          style="margin-bottom: 40rpx"
+          label="商品描述"
+          prop="product_detail"
+          class="form-item"
+        >
+          <u--textarea
+            v-model="form.product_detail"
+            placeholder="200字以内介绍商品描述"
+            count
+            :autoHeight="true"
+            maxlength="200"
+          ></u--textarea>
+        </u-form-item>
+        <u-form-item
+          label="售卖规格"
+          class="form-item form-item-specification"
+          labelWidth="80"
+          @click="handerRightPopup"
+          required
+        >
+          <view class="total-content">
+            <view class="total-name">
+              共{{ specificationInfoList.length }}个规格
+            </view>
+            <u-icon name="arrow-right"></u-icon>
+          </view>
+          <view class="specification-content">
+            <view
+              class="specification-item"
+              v-for="(item, index) of specificationInfoList"
+            >
+              <view class="specification-name">{{ item.spec_item_name }}</view>
+              <view class="specification-info">
+                <view class="info-item">
+                  <view class="specification-num">
+                    属性编号：{{ item.item_number }}
+                  </view>
+                  <view class="specification-num">
+                    库存：{{ item.item_quantity || item.item_quantity_2 }}
+                  </view>
+                </view>
+                <view class="info-item">
+                  <view class="specification-num">
+                    市场价：{{
+                      item.item_market_price || item.item_market_price_2
+                    }}
+                  </view>
+                  <view class="specification-num">
+                    零售价：{{ item.item_unit_price || item.item_unit_price_2 }}
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </u-form-item>
       </u--form>
+      <view class="tips-content">
+        <view class="tips">
+          还可以设置购买上限、店内码/货号、商品描述、 开售时间、 库存锁定
+        </view>
+
+        <u-button
+          :plain="true"
+          :hairline="true"
+          shape="circle"
+          class="btn-unfold"
+          @click="isUnfold = !isUnfold"
+        >
+          <block>
+            {{ isUnfold ? "收起部分" : "  展示全部" }}
+
+            <u-icon
+              style="display: inline-block; margin-left: 8rpx"
+              name="arrow-up"
+              color="#000"
+              v-if="isUnfold"
+              size="12"
+            ></u-icon>
+            <u-icon
+              style="display: inline-block; margin-left: 8rpx"
+              name="arrow-down"
+              color="#000"
+              size="12"
+              v-else
+            ></u-icon>
+          </block>
+        </u-button>
+      </view>
+      <view class="bottom-btn">
+        <view class="bottom-list">
+          <u-button
+            class="bottom-btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerAddAndEditPopup()"
+          >
+            {{ isAdd ? "添加" : "保存" }}
+          </u-button>
+        </view>
+      </view>
     </view>
+    <u-popup
+      class="right-popup"
+      zIndex="998"
+      :overlay="false"
+      :show="showRightPopup"
+      mode="right"
+    >
+      <specificationOfGood
+        :commoditSpecificationBaseInfo="commoditSpecificationBaseInfo"
+        :sonSpecificationInfoList="specificationInfoList"
+        :productInfoByPid="productInfoByPid"
+        :typeId="typeId"
+        @handerSpecificationInfoList="handerSpecificationInfoList"
+        @pageBack="showRightPopup = false"
+        :isAdd="isAdd"
+      ></specificationOfGood>
+    </u-popup>
+    <u-popup
+      class="affirm-popup"
+      zIndex="10077"
+      :show="showBackPopup"
+      mode="center"
+    >
+      <view class="affirm-popup-content">
+        <view class="affirm-popup-title">确认退出</view>
+        <view class="affirm-popup-tips">
+          退出后已编辑商品信息将不被保存，是否退出
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showBackPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerPageBack"
+          >
+            退出
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <tki-tree
+      ref="tkitree"
+      :range="baTreePickerList"
+      :foldAll="true"
+      rangeKey="category_name"
+      idKey="category_id"
+      title="选择商品分类"
+      @confirm="treeConfirm"
+      @cancel="treeCancel"
+    ></tki-tree>
+    <u-datetime-picker
+      ref="datetimePicker"
+      :show="showSaleTime"
+      v-model="productSaleTime"
+      @cancel="showSaleTime = false"
+      @confirm="handerConfirmSaleTime"
+      mode="datetime"
+    ></u-datetime-picker>
     <u-toast ref="uToast"></u-toast>
+    <u-loading-page
+      class="loading-page"
+      :loading="loadingPage"
+      loading-text="加载中..."
+    ></u-loading-page>
   </view>
 </template>
 
 <script>
 import navBar from "@/components/uni-nav-bar/uni-nav-bar";
+import { mapState } from "vuex";
+import { GetCommodityClassify } from "@/api/warehouse/classifyList";
+import imgUpload from "@/components/poiuy-uImgUpload/imgUpload.vue";
+import {
+  UpdateCommodityInfo,
+  GetCommoditSpecification,
+  GetCommodityBaseInfo,
+  GetClassifyInfo,
+  GetCommoditSpecificationBaseInfo,
+} from "@/api/warehouse/commodity";
+import tkiTree from "./components/tree/tree";
+import specificationOfGood from "./specificationOfGood.vue";
+import store from "../../../store";
 export default {
   name: "addAndEditProduct",
   props: {
     productItem: {
       type: Object,
-      default: {},
+      default: () => ({
+        product_id: null,
+      }),
+    },
+    isAdd: {
+      type: Boolean,
+      default: true,
     },
   },
   components: {
     navBar,
+    imgUpload,
+    tkiTree,
+    specificationOfGood,
   },
   data() {
     return {
       form: {
         product_video: "",
-        product_buy_limit: undefined,
+        product_buy_limit: 0, // 购买上限
         product_sale_time: "",
         product_number: "",
         product_name: "", // 商品名称
@@ -84,7 +440,7 @@ export default {
         product_state_id: 1001,
         contract_type_ids: [],
         product_transport_id: [],
-        transport_type_id: undefined,
+        transport_type_id: 38,
         store_category_ids: [],
         product_service: "",
         product_param: "",
@@ -94,21 +450,601 @@ export default {
         voucher_activity_id: "",
         category_id: "",
         category_name: "",
+        kind_id: 1201,
+        coupon_type_id: "",
+        store_id: 0,
+      },
+      productDetail: {
+        product_detail: "",
+        product_tags: [],
+      },
+      valid: {
+        product_service_contactor_flag: 1,
+        product_service_date_flag: 0,
+        product_valid_period: 1001,
+        product_valid_type: 1001,
+      },
+      rules: {
+        product_name: [
+          {
+            required: true,
+            message: "请输入规格名称",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+        ],
+        type_category_name: [
+          {
+            required: true,
+            message: "请选择商品分类",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+        ],
+      },
+      maxSize: 10 * 1024 * 1024,
+      primaryImg: [],
+      header: [],
+      config: {
+        delIcon: "", //删除图片icon
+        resultTip: true, //结果提示
+        resultType: "1", //结果展示类型
+        loadIcon: "", //加载时的图标
+        loadText: "", //加载时的文字
+      },
+      formData: {
+        perm_key: "",
+      },
+      viceImg: [],
+      isUnfold: false,
+      saleTimeRadioList: [
+        {
+          name: "立即开售",
+          value: 1001,
+        },
+        {
+          name: "定时开售",
+          value: 1002,
+        },
+      ],
+      inventoryRadioList: [
+        {
+          name: "下单锁定",
+          value: 1001,
+        },
+        {
+          name: "支付锁定",
+          value: 1002,
+        },
+      ],
+      commodityTypeRadioList: [
+        {
+          name: "实体商品",
+          value: 1201,
+        },
+        {
+          name: "虚拟商品",
+          value: 1202,
+        },
+        {
+          name: "电子卡券",
+          value: 1203,
+        },
+      ],
+      showSaleTime: false,
+      productSaleTime: Number(new Date()),
+      baTreePickerList: [],
+      showRightPopup: false,
+      commoditSpecificationBaseInfo: {},
+      selectCommodisItems: [],
+      typeId: 0,
+      specificationInfoList: [],
+      categoryVirtualEnable: false,
+      showBackPopup: false,
+      loadingPage: false,
+      productInfoByPid: {
+        shop_product_assist_index: [],
+        shop_product_detail: {},
+        shop_product_image: [],
+        shop_product_index: {},
+        shop_product_info: {},
       },
     };
   },
-  computed: {},
+  computed: {
+    ...mapState(["user", "ukey"]),
+  },
   onLoad: function (options) {},
   onReady() {},
   onShow() {
     // this.classifyItem = form;
   },
 
-  mounted() {},
+  mounted() {
+    this.formData.perm_key = uni.getStorageSync("ukey") || "";
+    this.getCommodityClassify();
+    if (!this.isAdd) {
+      this.form = { ...this.form, ...this.productItem };
+
+      console.log(this.form);
+
+      this.loadingPage = true;
+      this.getCommodityBaseInfo(this.productItem.product_id);
+    }
+  },
   methods: {
     pageBack() {
+      this.showBackPopup = true;
+    },
+    handerPageBack() {
       this.$emit("pageBack");
     },
+    overSize(e) {
+      uni.$u.toast("上传图片大小不能超过10MB!");
+    },
+    handerResultUrl(e, type) {
+      if (type == "primary") {
+        this.primaryImg = [...new Set([...this.primaryImg, ...e.all])];
+      } else {
+        this.viceImg = [...new Set([...this.viceImg, ...e.all])];
+
+        console.log(this.viceImg);
+      }
+    },
+    async getCommodityBaseInfo(product_id) {
+      let params = {
+        product_id: product_id,
+      };
+
+      let res = await GetCommodityBaseInfo(params);
+      if (res && res.status == 200) {
+        this.productInfoByPid = res.data;
+
+        this.primaryImg = this.productInfoByPid.shop_product_image.map(
+          (item) => item.item_image_default
+        );
+
+        if (
+          this.productInfoByPid.shop_product_image[0].item_image_other.length >
+          0
+        ) {
+          this.viceImg =
+            this.productInfoByPid.shop_product_image[0].item_image_other.split(
+              ","
+            );
+        } else {
+          this.viceImg = [];
+        }
+
+        console.log(this.viceImg);
+        await this.getClassifyInfo(
+          this.productInfoByPid.shop_product_index.category_id
+        );
+        await this.getCommoditSpecificationBaseInfo(
+          this.productInfoByPid.shop_product_index.type_id,
+          product_id
+        );
+      }
+    },
+    async getClassifyInfo(category_id) {
+      let params = {
+        category_id: category_id,
+      };
+      let res = await GetClassifyInfo(params);
+      if (res && res.status == 200) {
+        this.form.category_name = res.data.category_name;
+        this.form.category_id = res.data.category_id;
+      }
+    },
+    async getCommodityClassify() {
+      this.loadingClassIfy = true;
+      let res = await GetCommodityClassify();
+      if (res && res.status == 200) {
+        const classifyList = res.data;
+        if (classifyList.length > 0) {
+          this.baTreePickerList = classifyList.map((item) => {
+            // 创建父节点，并保留所有原始字段
+            const parentNode = {
+              ...item, // 保留所有原始数据
+              children: null, // 先初始化为 null
+            };
+
+            // 如果有子分类，递归处理
+            if (item.sub && item.sub.length > 0) {
+              parentNode.children = item.sub.map((subItem) => ({
+                ...subItem, // 保留所有子分类的原始数据
+              }));
+            }
+
+            return parentNode;
+          });
+        }
+      }
+      this.loadingClassIfy = false;
+    },
+    async getCommoditSpecification() {
+      let params = {
+        product_id: this.productItem.product_id,
+      };
+
+      let res = await GetCommoditSpecification(params);
+      if (res && res.status == 200) {
+        this.selectCommodisItems = res.data;
+
+        // 1. 解析产品规格模板
+        let productSpec = this.productInfoByPid.shop_product_info.product_spec;
+        try {
+          productSpec = JSON.parse(productSpec);
+          if (!Array.isArray(productSpec)) {
+            productSpec = [productSpec]; // 确保是数组格式
+          }
+
+          // 2. 创建规格项映射表 {itemId: 完整规格信息}
+          const specItemMap = [];
+          productSpec.forEach((specGroup) => {
+            if (specGroup.item && Array.isArray(specGroup.item)) {
+              specGroup.item.forEach((item) => {
+                specItemMap.push(item.id);
+              });
+            }
+          });
+
+          const specificationInfoList1 = this.selectCommodisItems
+            .map((item) => {
+              try {
+                // 解析规格数据（兼容字符串和对象）
+                const itemSpec =
+                  typeof item.item_spec === "string"
+                    ? JSON.parse(item.item_spec)
+                    : item.item_spec;
+
+                if (Array.isArray(itemSpec) && itemSpec.length > 0) {
+                  const firstSpec = itemSpec[0];
+
+                  // 匹配规格逻辑
+                  if (firstSpec.item && firstSpec.item.id) {
+                    const matchedSpec = specItemMap.find(
+                      (id) => id == firstSpec.item.id
+                    );
+
+                    if (matchedSpec) {
+                      return {
+                        ...item,
+                        spec_item_id: matchedSpec,
+                        item_is_default: Boolean(item.item_is_default),
+                        // 保留原始数据（调试用）
+                      };
+                    }
+                  }
+                }
+              } catch (e) {
+                console.error(`处理商品 ${item.item_id} 时出错:`, e);
+              }
+            })
+            .filter((item) => item != undefined);
+
+          const specificationInfoList2 =
+            this.commoditSpecificationBaseInfo.specs[0].specItems
+              .map((item) => {
+                if (specItemMap.includes(item.spec_item_id)) {
+                  return item;
+                }
+              })
+              .filter((item) => item != undefined);
+
+          this.specificationInfoList = specificationInfoList1.map((item) => {
+            // 找到匹配的 specItem
+            const matchedSpecItem = specificationInfoList2.find(
+              (specItem) => specItem.spec_item_id === item.spec_item_id
+            );
+
+            // 如果找到匹配项，则合并
+            if (matchedSpecItem) {
+              return {
+                ...item, // 保留原 item 的所有属性
+                ...matchedSpecItem, // 覆盖或添加 specItem 的属性
+              };
+            }
+            return item; // 如果没有匹配项，返回原 item
+          });
+
+          console.log(this.specificationInfoList);
+        } catch (e) {
+          console.error("解析productSpec失败:", e);
+        }
+      }
+
+      this.loadingPage = false;
+    },
+    async getCommoditSpecificationBaseInfo(type_id) {
+      let params = {
+        type_id: type_id,
+        product_id: this.productItem.product_id,
+      };
+
+      let res = await GetCommoditSpecificationBaseInfo(params);
+      if (res && res.status == 200) {
+        this.commoditSpecificationBaseInfo = res.data;
+
+        if (!this.isAdd) {
+          this.getCommoditSpecification();
+        }
+      }
+    },
+    handerConfirmSaleTime(e) {
+      this.productSaleTime = e.value;
+      this.form.product_sale_time = this.$u.timeFormat(
+        this.productSaleTime,
+        "yyyy-mm-dd hh:MM"
+      );
+
+      this.showSaleTime = false;
+    },
+    hadnerShowClassifyListPopup() {
+      this.$refs.tkitree._show();
+    },
+    handerRightPopup() {
+      if (this.form.category_name == "") {
+        this.$refs.uToast.show({
+          message: "请选择分类",
+          type: "error",
+          duration: 1000,
+        });
+
+        return;
+      }
+
+      this.showRightPopup = true;
+    },
+    treeConfirm(list) {
+      if (list.length > 1) {
+        this.form.category_name = list[1].category_name;
+        this.form.category_id = list[1].category_id;
+      } else {
+        this.form.category_name = list[0].category_name;
+        this.form.category_id = list[0].category_id;
+      }
+      const typeId = list.length > 1 ? list[1].type_id : list[0].type_id;
+      this.categoryVirtualEnable =
+        list.length > 1
+          ? list[1].category_virtual_enable
+          : list[0].category_virtual_enable;
+
+      this.typeId = typeId;
+      this.getCommoditSpecificationBaseInfo(typeId);
+    },
+    treeCancel() {
+      this.$refs.tkitree._hide();
+    },
+    handerSpecificationInfoList(specificationInfoList) {
+      this.specificationInfoList = specificationInfoList;
+
+      console.log(this.specificationInfoList);
+    },
+    handerAddAndEditPopup() {
+      this.$refs.uForm.validate().then(async (valid) => {
+        if (this.primaryImg.length <= 0) {
+          this.$refs.uToast.show({
+            message: "请选择上传主图",
+            type: "error",
+            duration: 1000,
+          });
+
+          return;
+        }
+
+        if (this.specificationInfoList.length <= 0) {
+          this.$refs.uToast.show({
+            message: "请选择选择规格",
+            type: "error",
+            duration: 1000,
+          });
+
+          return;
+        }
+
+        const productItems = this.specificationInfoList.map((item) => {
+          const key = String(item.spec_id) || item.spec_item_ids;
+          const key2 = String(item.spec_id) + "_" + String(item.spec_item_id);
+          const color_img = this.viceImg.map((item) => item.url);
+          const mainMColorimg = this.primaryImg.map((item) => item.url);
+          let obj = {
+            color_img: color_img,
+            item_is_default: item.item_is_default,
+            item_market_price:
+              item.item_market_price_2 || item.item_market_price,
+            item_number: item.item_number,
+            item_quantity: item.item_quantity_2 || item.item_quantity,
+            item_unit_points: "0", //积分
+            item_unit_price: item.item_unit_price_2 || item.item_unit_price,
+            main_color_img: mainMColorimg.toString(),
+            product_spec:
+              item.spec_item_id > 0
+                ? JSON.stringify([
+                    {
+                      id: item.spec_id,
+                      name: this.commoditSpecificationBaseInfo.specs[0]
+                        .spec_name,
+                      item: {
+                        id: item.spec_item_id,
+                        name: item.spec_item_name,
+                      },
+                    },
+                  ])
+                : "[]",
+          };
+
+          if (this.isAdd) {
+            obj.category_id = this.form.category_id;
+            obj.siid = String(item.spec_item_id || "");
+          }
+
+          if (item.spec_item_name && item.spec_item_id) {
+            obj[key] = item.spec_item_name;
+            obj[key2] = item.spec_item_id;
+          }
+
+          if (!this.isAdd) {
+            obj.color_id = 0;
+            obj.item_advice_price = 0;
+            obj.colorImg = color_img;
+            obj.siid = String(item.spec_item_id);
+          }
+
+          if (item.item_enable) {
+            obj.item_enable = item.item_enable;
+          } else {
+            obj.item_enable = 1001;
+          }
+
+          if (item.item_barcode) {
+            obj.item_barcode = item.item_barcode;
+          }
+
+          if (item.item_id) {
+            obj.item_id = item.item_id;
+          }
+
+          return obj;
+        });
+
+        const productSpec = this.specificationInfoList.reduce((acc, item) => {
+          const existingSpec = acc.find((spec) => spec.id === item.spec_id);
+
+          if (existingSpec) {
+            existingSpec.item.push({
+              id: item.spec_item_id,
+              name: item.spec_item_name,
+            });
+          } else {
+            acc.push({
+              id: item.spec_id,
+              item: [
+                {
+                  id: item.spec_item_id,
+                  name: item.spec_item_name,
+                },
+              ],
+            });
+          }
+
+          return acc;
+        }, []);
+
+        console.log(this.form.product_param);
+
+        let params = {
+          productObj: {
+            assists: {},
+            assistsIndex: [],
+            brand_id: 0,
+            productBase: {
+              category_id: this.form.category_id,
+              contract_type_ids: [],
+              kind_id: this.form.kind_id || 1201,
+              product_detail: "",
+              product_inventory_lock: this.form.product_inventory_lock,
+              product_name: this.form.product_name,
+              product_number: this.form.product_number,
+              product_param: this.form.product_param || "",
+              product_sale_time: this.form.product_sale_time,
+              product_service: this.form.product_service || "",
+              product_state_id: this.form.product_state_id,
+              product_tips: this.form.product_tips,
+              product_transport_id: this.form.product_transport_id,
+              product_video: this.form.product_video,
+              store_category_ids: this.form.store_category_ids || [],
+              text_category_id: this.form.category_name,
+              transport_type_id: this.form.transport_type_id,
+            },
+            productDetail: this.productDetail,
+            productSpec: productSpec,
+            valid: this.isAdd ? {} : this.valid,
+          },
+          productItems: productItems,
+        };
+
+        console.log("未编辑params", params);
+
+        if (!this.isAdd) {
+          var productTransportId =
+            this.productInfoByPid.shop_product_index.product_transport_id
+              .split(",")
+              .map((item) => Number(item));
+
+          var voucherAactivityId =
+            this.productInfoByPid.shop_product_index.voucher_activity_id;
+
+          params.productObj.productBase = {
+            ...params.productObj.productBase,
+            category_name: this.form.category_name,
+            coupon_type_id: this.form.coupon_type_id || "",
+            payment_type_id: this.form.payment_type_id || 0,
+            product_buy_limit: this.form.product_buy_limit,
+            product_id: this.form.product_id,
+            product_transport_id: productTransportId,
+            voucher_activity_id:
+              voucherAactivityId || Number(voucherAactivityId),
+            store_id: this.form.store_id,
+          };
+
+          delete params.productObj.productBase.text_category_id;
+
+          params.productObj.productDetail = {
+            product_detail: this.form.product_detail || "",
+            product_param: "",
+            product_service: "",
+            product_tags: [],
+          };
+        }
+
+        console.log(params);
+
+        let res = await UpdateCommodityInfo({
+          productObj: JSON.stringify(params.productObj),
+          productItems: JSON.stringify(params.productItems),
+        });
+        // let res = {};
+        if (res && res.status == 200) {
+          this.$refs.uToast.show({
+            message: this.isAdd ? "添加成功" : "修改成功",
+            type: "succeed",
+            duration: 1000,
+            zIndex: 12000,
+            position: "top",
+          });
+          if (this.isAdd) {
+            this.form = {
+              product_video: "",
+              product_buy_limit: undefined,
+              product_sale_time: "",
+              product_number: "",
+              product_name: "", // 商品名称
+              kind_id: 1201,
+              product_inventory_lock: 1001,
+              payment_type_id: 0,
+              product_state_id: 1001,
+              contract_type_ids: [],
+              product_transport_id: [],
+              transport_type_id: 38,
+              store_category_ids: [],
+              product_service: "",
+              product_param: "",
+              product_detail: "",
+              product_id: undefined,
+              product_tips: "",
+              voucher_activity_id: "",
+              category_id: "",
+              category_name: "",
+              kind_id: 1201,
+            };
+            this.primaryImg = [];
+            this.viceImg = [];
+            this.specificationInfoList = [];
+          }
+        }
+      });
+    },
   },
 };
 </script>
@@ -117,5 +1053,255 @@ export default {
 @import "@/styles/variables.scss";
 
 .addAndEditProduct-container {
+  width: 100vw;
+  height: calc(100vh - 120rpx);
+  overflow: auto;
+
+  .nav-bar {
+    ::v-deep.uni-navbar__content {
+      z-index: 1100;
+    }
+  }
+
+  .addAndEditProduct-content {
+    .u-form {
+      background: #f5f6fa;
+
+      .form-item {
+        background: #fff;
+        padding: 0 40rpx;
+      }
+
+      .form-item-margin-top-20 {
+        margin-top: 40rpx;
+      }
+
+      .form-item-margin-20 {
+        margin: 40rpx 0;
+      }
+
+      .form-sale-time-item {
+        ::v-deep.u-form-item__body__right__content__slot {
+          display: flex;
+          flex-flow: column;
+          align-items: normal;
+        }
+
+        .sale-time {
+          margin: 40rpx 0;
+          background: #eeeeee;
+          padding: 20rpx;
+          color: #6666;
+        }
+      }
+
+      .form-item-specification {
+        ::v-deep.u-form-item__body__right__content__slot {
+          display: flex;
+          flex-flow: column;
+          align-items: normal;
+        }
+
+        .total-content {
+          display: flex;
+          justify-content: space-between;
+          margin: 8px 0 8px 8px;
+          font-weight: bold;
+        }
+
+        .specification-content {
+          background: #f5f6fa;
+          border-radius: 16rpx;
+
+          .specification-item {
+            display: flex;
+            flex-flow: column;
+            justify-content: space-between;
+            padding: 8px;
+
+            .specification-name {
+              margin: 3px 0;
+              font-size: 16px;
+              font-weight: bold;
+            }
+
+            .specification-info {
+              display: flex;
+              justify-content: space-between;
+              height: 96rpx;
+              font-size: 24rpx;
+              color: #626262;
+            }
+
+            .info-item {
+              display: flex;
+              flex-flow: column;
+              justify-content: space-around;
+            }
+          }
+        }
+      }
+    }
+
+    .tips-content {
+      padding: 40rpx 20rpx;
+      background: #f5f6fa;
+
+      .tips {
+        font-size: 28rpx;
+        color: #666666;
+      }
+
+      .btn-unfold {
+        margin: 52rpx auto 20rpx;
+        width: 200rpx;
+        font-size: 24rpx;
+        height: 60rpx;
+
+        &::after {
+          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: bold;
+      }
+
+      .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;
+        }
+      }
+    }
+  }
+
+  .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: bold;
+        font-size: 36rpx;
+      }
+
+      .add-tips {
+        padding: 0 24rpx;
+        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;
+        }
+      }
+    }
+  }
+
+  .bottom-btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 20rpx;
+    background: #fff;
+    border-top: 2rpx solid $uni-border-color;
+    z-index: 2;
+
+    .bottom-list {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+
+      .bottom-btn-item {
+        font-size: 28rpx;
+        border-color: $base-color;
+        color: #fff;
+        background: $base-color;
+
+        .bottom-icon {
+          margin-right: 8rpx;
+        }
+
+        &::after {
+          border: none;
+        }
+      }
+    }
+  }
+
+  .loading-page {
+    z-index: 1099;
+  }
 }
 </style>
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 fdcd0c7..aadc1a8 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
@@ -179,7 +179,7 @@
             shape="circle"
             @click="handerPageBack"
           >
-            确认
+            退出
           </u-button>
         </view>
       </view>
@@ -759,7 +759,7 @@ export default {
       .affirm-popup-title {
         padding: 40rpx;
         text-align: center;
-         font-weight: bold;
+        font-weight: bold;
       }
 
       .affirm-popup-tips {
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 1168658..cd5597b 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
@@ -381,6 +381,7 @@
               type="number"
               placeholder="请输入商品排序"
               border="none"
+              clearable
             ></u--input>
           </u-form-item>
           <u-form-item
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue b/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
index e7ba883..9591591 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/editClassify.vue
@@ -57,6 +57,7 @@
             disabledColor="#ffffff"
             placeholder="请选择商品类型"
             border="none"
+            clearable
             @click="hideKeyboard()"
           ></u--input>
           <u-icon
@@ -71,6 +72,7 @@
             type="number"
             placeholder="请输入商品排序"
             border="none"
+            clearable
           ></u--input>
         </u-form-item>
         <u-form-item
@@ -107,6 +109,7 @@
           @change="handerLeveInputChange"
           maxlength="8"
           readonly
+          clearable
           @focus="handerInputFocus(index)"
           @blur="handerInputBlur(index)"
         >
@@ -229,6 +232,7 @@
             <u--input
               v-model="form2.type_name"
               disabled
+              clearable
               disabledColor="#ffffff"
               placeholder="请选择商品类型"
               border="none"
@@ -240,6 +244,7 @@
             <u--input
               v-model="form2.category_order"
               type="number"
+              clearable
               placeholder="请输入商品排序"
               border="none"
             ></u--input>
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 0556fe9..5bcdbce 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
@@ -6,9 +6,9 @@
       :border="false"
       :fixed="true"
       :height="'44px'"
-      rightWidth="0"
+      :rightWidth="0"
       :leftWidth="30"
-       backgroundColor="#f5f6fa"
+      backgroundColor="#f5f6fa"
     >
       <block slot="left">
         <u-icon
@@ -160,11 +160,16 @@
                   @click="updateProductPutaway(item, index, 1002)"
                 >
                   下架
-                </view>
-                <view
-                  class="commodity-btn-item"
-                >
-                  编辑
+
+                  <u-button
+                    class="commodity-btn-item commodity-btn-item-2"
+                    :hairline="true"
+                    :plain="true"
+                    shape="circle"
+                    @click="handerProductEdit(item)"
+                  >
+                    编辑
+                  </u-button>
                 </view>
               </view>
             </view>
@@ -189,32 +194,25 @@
       </view>
     </view>
     <view class="productList-bottom">
+      <<<<<<< Updated upstream =======
+      <view class="bottom-item" @click="skipuClassify">分类管理</view>
+      >>>>>>> Stashed changes
       <view class="bottom-item">
-         <u-icon
-          class="u-icon"
-          name="grid"
-          size="16"
-          color="#222"
-        ></u-icon>
-         <view class="bottom-item-name">分类管理</view>
+        <u-icon class="u-icon" name="grid" size="16" color="#222"></u-icon>
+        <view class="bottom-item-name">分类管理</view>
       </view>
       <view class="bottom-item">
-       <u-icon
-          class="u-icon"
-          name="list-dot"
-          size="16"
-          color="#222"
-        ></u-icon>
+        <u-icon class="u-icon" name="list-dot" size="16" color="#222"></u-icon>
         <view class="bottom-item-name" @click="skipuBatch">批量操作</view>
       </view>
       <view class="bottom-item">
-         <u-icon
-          class="u-icon"
-          name="bag"
-          size="16"
-          color="#222"
-        ></u-icon>
-        <view class="bottom-item-name">商品新建</view>
+        <u-icon class="u-icon" name="bag" size="16" color="#222"></u-icon>
+        <view
+          class="bottom-item-name"
+          @click="(showRightPopup = true), (isAdd = true)"
+        >
+          商品新建
+        </view>
       </view>
     </view>
     <u-popup
@@ -255,10 +253,10 @@
                     class="input-price"
                     :placeholder="String(item.item_unit_price)"
                     border="surround"
+                    clearable
                     v-model="item.item_unit_price_2"
                     prefixIcon="¥"
                     type="number"
-                    @change="haderPopupPriceInputChange($event, index)"
                   ></u--input>
                 </view>
                 <view class="commodity-info-item">
@@ -268,8 +266,8 @@
                     :placeholder="String(item.item_quantity)"
                     border="surround"
                     type="number"
+                    clearable
                     v-model="item.item_quantity_2"
-                    @change="haderPopupRepertoryInputChange($event, index)"
                   ></u--input>
                 </view>
               </view>
@@ -282,13 +280,27 @@
             :hairline="true"
             :plain="true"
             shape="circle"
-            @click="handerSave"
+            @click="updateCommodityPriceAndQuantity"
           >
             保存
           </u-button>
         </view>
       </view>
     </u-popup>
+    <u-popup
+      class="right-popup"
+      zIndex="998"
+      :overlay="false"
+      :show="showRightPopup"
+      mode="right"
+    >
+      <addAndEditProduct
+        @pageBack="showRightPopup = false"
+        :productItem="productItem"
+        :isAdd="isAdd"
+      ></addAndEditProduct>
+    </u-popup>
+    <u-toast ref="uToast"></u-toast>
   </view>
 </template>
 
@@ -297,18 +309,22 @@ import {
   GetProductCategoryTree,
   GetProductList,
   UpdateProductPutaway,
-  GetCommoditSpecification,
 } from "@/api/warehouse/productList";
+import {
+  GetCommoditSpecification,
+  UpdateCommodityPriceAndQuantity,
+} from "@/api/warehouse/commodity";
 import navBar from "@/components/uni-nav-bar/uni-nav-bar";
 import tuiCollapse from "../manage/components/tui-collapse/tui-collapse.vue";
 import favoriteLoading from "@/components/favorite-loading/favorite-loading.vue";
-
+import addAndEditProduct from "./addAndEditProduct.vue";
 export default {
   name: "productList",
   components: {
     navBar,
     tuiCollapse,
     favoriteLoading,
+    addAndEditProduct,
   },
   data() {
     return {
@@ -372,6 +388,10 @@ export default {
       time2: null,
       showBottomPopup: false,
       currSpecificationList: [],
+      showRightPopup: false,
+      productItem: {},
+      isAdd: true,
+      selectCommodisItems: [],
     };
   },
   computed: {},
@@ -431,9 +451,61 @@ export default {
       };
 
       let res = await GetCommoditSpecification(params);
-
       if (res && res.status == 200) {
-        this.currSpecificationList = res.data;
+        this.selectCommodisItems = res.data;
+
+        // 1. 解析产品规格模板
+        let productSpec = JSON.parse(JSON.stringify(item.product_spec));
+
+        productSpec = JSON.parse(productSpec);
+        if (!Array.isArray(productSpec)) {
+          productSpec = [productSpec]; // 确保是数组格式
+        }
+
+        const specItemMap = [];
+
+        productSpec.forEach((specGroup) => {
+          if (specGroup.item && Array.isArray(specGroup.item)) {
+            specGroup.item.forEach((item) => {
+              specItemMap.push(item.id);
+            });
+          }
+        });
+
+        this.currSpecificationList = this.selectCommodisItems
+          .map((item) => {
+            try {
+              // 解析规格数据（兼容字符串和对象）
+              const itemSpec =
+                typeof item.item_spec === "string"
+                  ? JSON.parse(item.item_spec)
+                  : item.item_spec;
+
+              if (Array.isArray(itemSpec) && itemSpec.length > 0) {
+                const firstSpec = itemSpec[0];
+
+                // 匹配规格逻辑
+                if (firstSpec.item && firstSpec.item.id) {
+                  const matchedSpec = specItemMap.find(
+                    (id) => id == firstSpec.item.id
+                  );
+
+                  if (matchedSpec) {
+                    return {
+                      ...item,
+                      spec_item_id: matchedSpec,
+                      item_is_default: Boolean(item.item_is_default),
+                      // 保留原始数据（调试用）
+                    };
+                  }
+                }
+              }
+            } catch (e) {
+              console.error(`处理商品 ${item.item_id} 时出错:`, e);
+            }
+          })
+          .filter((item) => item != undefined);
+        console.log(this.currSpecificationList);
         this.showBottomPopup = true;
       }
     },
@@ -642,18 +714,49 @@ export default {
         url: "../../news/search/search",
       });
     },
-    haderPopupPriceInputChange(e, index) {
-      this.currSpecificationList[index].item_unit_price_2 = e;
+    async updateCommodityPriceAndQuantity(item) {
+      let params = {};
+
+      let res = await UpdateCommodityPriceAndQuantity(params);
+      if (res && res.status) {
+        this.$refs.uToast.show({
+          message: "修改成功",
+          type: "succeed",
+          duration: 1000,
+        });
+
+        // 静默更新数组
+        let listParams = {
+          kind_id: "1201,1202,1203",
+          pageNum: 9999,
+          pageSize: this.pageSize,
+          product_state_id: this.currProductStateId,
+          category_id: this.currCategoryId,
+          openCount: true,
+        };
+
+        let result = await GetProductList(listParams);
+        if (result && result.status == 200) {
+          this.commodityList = res.data.items;
+        }
+      }
+      this.showBottomPopup = false;
     },
-    haderPopupRepertoryInputChange(e, index) {
-      this.currSpecificationList[index].item_quantity_2 = e;
-    },
-    handerSave() {},
     skipuBatch() {
       uni.navigateTo({
         url: "/pages/warehouse/manage/batch",
       });
     },
+    skipuClassify() {
+      uni.navigateTo({
+        url: "/pages/warehouse/manage/classifyList",
+      });
+    },
+    handerProductEdit(item) {
+      this.productItem = item;
+      this.showRightPopup = true;
+      this.isAdd = false;
+    },
   },
 };
 </script>
@@ -661,14 +764,14 @@ export default {
 <style lang="scss" scoped>
 @import "@/styles/variables.scss";
 
-page{
+page {
   background: #f5f6fa;
 }
 
 .productList-container {
   height: calc(100vh);
 
-  ::v-deep .uni-navbar{
+  ::v-deep .uni-navbar {
     border-bottom: 2rpx solid $uni-border-color;
   }
 
@@ -749,7 +852,7 @@ page{
     word-break: break-all;
   }
 
-  ::v-deep .tui-icon-arrow{
+  ::v-deep .tui-icon-arrow {
     left: 8rpx;
   }
 
@@ -760,7 +863,7 @@ page{
   }
 
   .tab-bar-item-2 {
-     min-height: 96rpx;
+    min-height: 96rpx;
     font-size: 24rpx;
     background: #fff !important;
   }
@@ -772,7 +875,7 @@ page{
   .active::before {
     content: "";
     position: absolute;
-    border-left: 4rpx solid #FE411B;
+    border-left: 4rpx solid #fe411b;
     height: 30rpx;
     left: 0;
     top: 50%;
@@ -941,7 +1044,7 @@ page{
     .commodity-item {
       margin-bottom: 32rpx;
       clear: both;
-    overflow: hidden;
+      overflow: hidden;
 
       .commodity-info {
         display: flex;
@@ -989,7 +1092,7 @@ page{
             -webkit-box-orient: vertical;
             overflow: hidden;
             text-overflow: ellipsis; /* 超出部分显示省略号 */
-             color: #000;
+            color: #000;
           }
 
           .commodity-inventory {
@@ -998,7 +1101,7 @@ page{
 
           .commodity-price {
             font-size: 28rpx;
-            color: #FE411B;
+            color: #fe411b;
 
             .currency {
               margin-right: 4px;
@@ -1009,7 +1112,7 @@ page{
       }
 
       .commodity-btn-content {
-          border-bottom: 2rpx solid #eee;
+        border-bottom: 2rpx solid #eee;
         display: flex;
         justify-content: flex-end;
         float: right;
@@ -1065,8 +1168,8 @@ page{
     background: #fff;
     border-top: 2rpx solid $uni-border-color;
     display: flex;
-      align-items: center;
-      justify-content: center;
+    align-items: center;
+    justify-content: center;
 
     .bottom-item {
       flex: 1;
@@ -1074,10 +1177,10 @@ page{
       align-items: center;
       justify-content: center;
 
-        .bottom-item-name{
-          font-size: 28rpx;
-          color: #222;
-        }
+      .bottom-item-name {
+        font-size: 28rpx;
+        color: #222;
+      }
 
       .u-icon {
         margin-right: 8rpx;
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/specification.vue b/java-mall-app-shop-admin/pages/warehouse/manage/specification.vue
index 9bfd3e3..3d2072e 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/specification.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/specification.vue
@@ -41,20 +41,24 @@
             <view class="specification-sort">排序：{{ item.spec_order }}</view>
           </view>
           <view class="specification-btn-content">
-            <view class="btn_item"  @click="handerShowDelectPopup(item)">
+            <view class="btn_item" @click="handerShowDelectPopup(item)">
               <u-icon
-              class="u-icon-jianhao"
-              custom-prefix="custom-icon-jianhao_fangxing custom-icon"
-              size="18"
-              color="#FE411B"
-            ></u-icon>删除
+                class="u-icon-jianhao"
+                custom-prefix="custom-icon-jianhao_fangxing custom-icon"
+                size="18"
+                color="#FE411B"
+              ></u-icon>
+              删除
+            </view>
+            <view class="btn_item" @click="handerShowEeditPopup(item)">
+              <u-icon
+                class="u-icon-bianji"
+                custom-prefix="custom-icon-icon_519 custom-icon"
+                size="18"
+                color="#FE411B"
+              ></u-icon>
+              编辑
             </view>
-            <view class="btn_item"  @click="handerShowEeditPopup(item)"><u-icon
-              class="u-icon-bianji"
-              custom-prefix="custom-icon-icon_519 custom-icon"
-              size="18"
-                  color="#FE411B"
-            ></u-icon>编辑</view>
           </view>
         </view>
         <view
@@ -84,7 +88,12 @@
           shape="circle"
           @click="handerAddAndEditPopup(true)"
         >
-          <u-icon color="#fff" size="20" class="bottom-icon" name="plus-circle"></u-icon>
+          <u-icon
+            color="#fff"
+            size="20"
+            class="bottom-icon"
+            name="plus-circle"
+          ></u-icon>
           新建规格
         </u-button>
       </view>
@@ -134,6 +143,7 @@
               disabledColor="#ffffff"
               placeholder="请选择商品分类"
               border="none"
+              clearable
               @click="hideKeyboard()"
             ></u--input>
             <u-icon slot="right" name="arrow-right"></u-icon>
@@ -142,6 +152,7 @@
             <u--input
               v-model="form.spec_order"
               type="number"
+              clearable
               placeholder="请输入商品排序"
               border="none"
             ></u--input>
@@ -567,7 +578,7 @@ export default {
         justify-content: flex-end;
         gap: 20rpx;
 
-        .btn_item{
+        .btn_item {
           gap: 4rpx;
           font-size: 24rpx;
           display: flex;
@@ -713,10 +724,10 @@ export default {
   }
 }
 
-::v-deep .u-textarea{
+::v-deep .u-textarea {
   padding: 0;
 }
-::v-deep .u-textarea__count{
+::v-deep .u-textarea__count {
   bottom: 0rpx;
 }
 </style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/specificationOfGood.vue b/java-mall-app-shop-admin/pages/warehouse/manage/specificationOfGood.vue
new file mode 100644
index 0000000..da1e9d9
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/specificationOfGood.vue
@@ -0,0 +1,1165 @@
+<template>
+  <view class="specificationOfGood-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>
+    <view class="tips">
+      注意！，这个是每个分类下对应的规格，不是当前商品的规格。
+    </view>
+    <view class="specificationOfGood-content">
+      <view class="specificationOfGood-tips">
+        <view class="">
+          {{ commoditSpecificationBaseInfo2.specs[0].spec_name }}
+        </view>
+        <view>
+          <text
+            @click="handerShowAddClassifySpecification(true)"
+            style="margin-right: 40rpx"
+          >
+            新增
+          </text>
+          <text @click="handerShowClassifySpeciflcationList">编辑</text>
+        </view>
+      </view>
+      <view
+        class="specificationOfGood-tips-name"
+        v-if="commoditSpecificationBaseInfo2.specs[0].specItems.length > 0"
+      >
+        规格列表
+      </view>
+
+      <!-- <view
+        class="specificationOfGood-input-content"
+        v-for="(item, index) of specificationList"
+        :key="index"
+      >
+        <u--input
+          class="specification-input"
+          placeholder="请输入自定义规格值"
+          :border="'surround'"
+          v-model="item.spec_item_name"
+          @change="handerAddInfo($event, index)"
+        ></u--input>
+        <u-icon
+          name="trash"
+          class="specification-icon"
+          size="20"
+          @click="handerDelectSpecification(index)"
+        ></u-icon>
+      </view>
+      <u-button
+        class="add-btn"
+        :hairline="true"
+        :plain="true"
+        shape="circle"
+        @click="handerAddItem()"
+      >
+        <u-icon
+          name="plus"
+          size="10"
+          style="margin-right: 16rpx"
+          color="#000"
+        ></u-icon>
+        添加规格值
+      </u-button> -->
+
+      <u-checkbox-group
+        v-if="classifySpecificationList.length > 0"
+        v-model="checkboxValue"
+        placement="row"
+        class="checkbox-group"
+        @change="handerChangeCheckboxGroup"
+      >
+        <u-checkbox
+          class="checkbox-item"
+          :customStyle="{ marginBottom: '8px' }"
+          v-for="(item, index) in classifySpecificationList"
+          :key="index"
+          :label="item.spec_item_name"
+          :name="item.spec_item_id"
+        ></u-checkbox>
+      </u-checkbox-group>
+      <view
+        class="specificationOfGood-tips"
+        v-if="specificationInfoList.length > 0"
+      >
+        设置售卖信息
+      </view>
+      <view class="commodity-content" v-if="specificationInfoList.length > 0">
+        <view
+          class="commodity-item"
+          v-for="(item, index) of specificationInfoList"
+          :key="index"
+        >
+          <view class="commodity-info">
+            <view class="commodity-info-name-content">
+              <view class="commodity-info-name">
+                规格{{ index + 1 }} {{ item.spec_item_name }}
+              </view>
+              <view class="commodity-info-switch">
+                <text class="switch-label">是否默认</text>
+                <u-switch
+                  v-model="item.item_is_default"
+                  :activeValue="true"
+                  :inactiveValue="false"
+                  activeColor="#5ac725"
+                ></u-switch>
+              </view>
+            </view>
+            <view class="commodity-info-item">
+              <view class="commodity-info-lable">属性编号</view>
+              <u--input
+                class="input-price"
+                placeholder="请输入属性编号（货号）"
+                border="surround"
+                v-model="item.item_number"
+                type="number"
+                clearable
+              ></u--input>
+            </view>
+            <view class="commodity-info-item">
+              <view class="commodity-info-lable required-label">市场价</view>
+              <u--input
+                class="input-price"
+                :placeholder="String(item.item_market_price) || '请输入'"
+                border="surround"
+                v-model="item.item_market_price_2"
+                prefixIcon="¥"
+                type="number"
+                clearable
+                @change="handerChangeMarketPrice($event, index)"
+              ></u--input>
+            </view>
+            <view class="commodity-info-item">
+              <view class="commodity-info-lable required-label">零售价</view>
+              <u--input
+                class="input-price"
+                :placeholder="String(item.item_unit_price) || '请输入'"
+                border="surround"
+                v-model="item.item_unit_price_2"
+                prefixIcon="¥"
+                type="number"
+                clearable
+                @change="handerChangeUnitPrice($event, index)"
+              ></u--input>
+            </view>
+            <view class="commodity-info-item">
+              <view class="commodity-info-lable required-label">库存</view>
+              <u--input
+                class="input-price"
+                :placeholder="String(item.item_quantity) || '请填写商品库存'"
+                border="surround"
+                type="number"
+                clearable
+                v-model="item.item_quantity_2"
+                @change="handerChangeQuantity($event, index)"
+              ></u--input>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="bottom-btn">
+      <view class="bottom-list">
+        <u-button
+          class="bottom-btn-item"
+          :hairline="true"
+          :plain="true"
+          shape="circle"
+          @click="handerAddAndEditPopup()"
+        >
+          保存
+        </u-button>
+      </view>
+    </view>
+    <u-popup
+      class="classify-specification-popup"
+      :show="showBottomPopup"
+      mode="bottom"
+      :closeable="true"
+      zIndex="10075"
+      @close="handerCloseBottomPopup"
+    >
+      <view class="classify-specification-popup-content">
+        <view class="classify-specification-popup-title">管理分类规格</view>
+        <view class="classify-specification-list">
+          <scroll-view
+            v-if="classifySpecificationList.length > 0"
+            scroll-y
+            class="classify-specification-scroll-view"
+            :show-scrollbar="false"
+            :style="{
+              maxHeight:
+                classifySpecificationList.length >= 7 ? '500px' : 'none',
+              overflowY:
+                classifySpecificationList.length >= 7 ? 'auto' : 'visible',
+            }"
+          >
+            <view
+              class="classify-specification-item"
+              v-for="(item, index) of classifySpecificationList"
+              :key="index"
+            >
+              <view class="classify-specification-name">
+                {{ item.spec_item_name }}
+              </view>
+              <view class="classify-specification-btn-list">
+                <view class="btn_item" @click="handerShowDelectPopup(item)">
+                  <u-icon
+                    class="u-icon-jianhao"
+                    custom-prefix="custom-icon-jianhao_fangxing custom-icon"
+                    size="18"
+                    color="#FE411B"
+                  ></u-icon>
+                  删除
+                </view>
+                <view
+                  class="btn_item"
+                  @click="handerShowAddClassifySpecification(false, item)"
+                >
+                  <u-icon
+                    class="u-icon-bianji"
+                    custom-prefix="custom-icon-icon_519 custom-icon"
+                    size="18"
+                    color="#FE411B"
+                  ></u-icon>
+                  编辑
+                </view>
+              </view>
+            </view>
+          </scroll-view>
+          <view class="no-data" v-if="classifySpecificationList.length <= 0">
+            <view class="no-data-bg"></view>
+            <view
+              class="no-data-tips"
+              @click="handerShowAddClassifySpecification"
+            >
+              还无更多规格，立即添加
+              <u-icon
+                style="display: inline-block"
+                name="arrow-right"
+                color="red"
+              ></u-icon>
+            </view>
+          </view>
+        </view>
+      </view>
+    </u-popup>
+    <u-popup
+      class="add-popup"
+      zIndex="10077"
+      :show="showAddAndEditClassifySpecification"
+      mode="center"
+      @close="closeAddAndEditClassifySpecification"
+    >
+      <view class="add-popup-content">
+        <view class="add-popup-title">
+          {{ isAddClassifySpecification ? "新建" : "编辑" }} 分类规格
+        </view>
+        <view class="add-tips">
+          注意，绑定商品后不可修改名称，和删除分类规格!
+        </view>
+        <u--form
+          labelPosition="left"
+          :model="form"
+          ref="uForm"
+          label-width="100"
+          :rules="rules"
+        >
+          <u-form-item
+            label="规格名称"
+            prop="spec_item_name"
+            class="form-item"
+            required
+          >
+            <u--textarea
+              class="u-textarea"
+              v-model="form.spec_item_name"
+              count
+              autoHeight
+              maxlength="8"
+              placeholder="请输入规格名称"
+            ></u--textarea>
+          </u-form-item>
+          <u-form-item
+            label="规格排序"
+            prop="spec_item_order"
+            class="form-item"
+          >
+            <u--input
+              v-model="form.spec_item_order"
+              type="number"
+              placeholder="请输入规格排序"
+              border="none"
+              clearable
+            ></u--input>
+          </u-form-item>
+        </u--form>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showAddAndEditClassifySpecification = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="updateCommoditSpecification"
+          >
+            {{ isAddClassifySpecification ? "添加" : "修改" }}
+          </u-button>
+        </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">
+          确认删除"{{ currDelectItem.spec_item_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="affirm-popup"
+      zIndex="10077"
+      :show="showBackPopup"
+      mode="center"
+    >
+      <view class="affirm-popup-content">
+        <view class="affirm-popup-title">确认退出</view>
+        <view class="affirm-popup-tips">
+          退出后已编辑规格信息将不被保存，是否退出
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showBackPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerPageBack"
+          >
+            退出
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
+    <u-toast ref="uToast" zIndex="12000" class="u-toast"></u-toast>
+  </view>
+</template>
+
+<script>
+import navBar from "@/components/uni-nav-bar/uni-nav-bar";
+import {
+  GetCommoditSpecification,
+  UpdateCommoditSpecification,
+  DelectCommoditSpecification,
+  GetClassifySpecificationList,
+} from "@/api/warehouse/commodity";
+export default {
+  name: "specificationOfGood",
+  props: {
+    classifyName: {
+      type: String,
+      default: "",
+    },
+    isAdd: {
+      type: Boolean,
+      default: true,
+    },
+    commoditSpecificationBaseInfo: {
+      type: Object,
+      default: () => ({
+        assists: [],
+        brands: {},
+        specs: [
+          {
+            specItems: [],
+            spec_name: "",
+          },
+        ],
+      }),
+    },
+    productInfoByPid: {
+      type: Object,
+      default: () => ({
+        shop_product_assist_index: [],
+        shop_product_detail: {},
+        shop_product_image: [],
+        shop_product_index: {},
+        shop_product_info: {},
+      }),
+    },
+    typeId: {
+      type: Number,
+      default: 0,
+    },
+    sonSpecificationInfoList: {
+      typeof: Object,
+      default: () => [],
+    },
+  },
+  components: {
+    navBar,
+  },
+  data() {
+    return {
+      specificationList: [
+        {
+          spec_item_name: "",
+          spec_item_order: "",
+        },
+      ],
+      specificationInfoList: [
+        {
+          item_is_default: false,
+          item_number: "",
+          item_market_price_2: "",
+          item_market_price: "",
+          item_unit_price: "",
+          item_unit_price_2: "",
+          item_quantity: "",
+          item_quantity_2: "",
+        },
+      ],
+      time: null,
+      checkboxValue: [],
+      showBottomPopup: false,
+      classifySpecificationList: [],
+      form: {
+        spec_id: "",
+        spec_item_name: "",
+        spec_item_order: "",
+      },
+      isAddClassifySpecification: true,
+      showAddAndEditClassifySpecification: false,
+      rules: {
+        spec_item_name: [
+          {
+            required: true,
+            message: "请输入规格名称",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+        ],
+      },
+      commoditSpecificationBaseInfo2: {
+        assists: [],
+        brands: {},
+        specs: [
+          {
+            specItems: [],
+            spec_name: "",
+          },
+        ],
+      },
+      showDelectPopup: false,
+      currDelectItem: {},
+      showBackPopup: false,
+    };
+  },
+  computed: {},
+  onLoad: function (options) {},
+  onReady() {},
+  onShow() {
+    // this.classifyItem = form;
+  },
+
+  mounted() {
+    this.commoditSpecificationBaseInfo2 = JSON.parse(
+      JSON.stringify(this.commoditSpecificationBaseInfo)
+    );
+
+    if (this.commoditSpecificationBaseInfo2.specs[0].specItems.length > 0) {
+      console.log(this.commoditSpecificationBaseInfo2);
+    }
+
+    this.checkboxValue = this.sonSpecificationInfoList.map(
+      (item) => item.spec_item_id
+    );
+
+    console.log(this.checkboxValue);
+
+    if (this.sonSpecificationInfoList.length > 0) {
+      this.specificationInfoList = JSON.parse(
+        JSON.stringify(this.sonSpecificationInfoList)
+      );
+    }
+
+    this.getClassifySpecificationList();
+  },
+  methods: {
+    pageBack(isSave = false) {
+      if (!isSave && this.specificationInfoList.length > 0) {
+        this.showBackPopup = true;
+      } else {
+        this.$emit("pageBack");
+      }
+    },
+    handerPageBack() {
+      this.$emit("pageBack");
+    },
+    handerAddItem() {
+      this.specificationList.push({
+        spec_item_name: "",
+        spec_item_order: "",
+      });
+    },
+
+    handerDelectSpecification(index) {
+      this.specificationList.splice(index, 1);
+      this.specificationInfoList.splice(index, 1);
+    },
+    handerShowClassifySpeciflcationList() {
+      this.showBottomPopup = true;
+    },
+    async getClassifySpecificationList() {
+      let params = {
+        spec_id: this.commoditSpecificationBaseInfo2.specs[0].spec_id,
+      };
+
+      let res = await GetClassifySpecificationList(params);
+      if (res && res.status == 200) {
+        this.classifySpecificationList = res.data;
+      }
+      this.showBottomPopup = false;
+    },
+    handerCloseBottomPopup() {
+      this.showBottomPopup = false;
+    },
+    async updateCommoditSpecification() {
+      this.form.spec_id = this.commoditSpecificationBaseInfo2.specs[0].spec_id;
+      let params = this.form;
+
+      let res = await UpdateCommoditSpecification(params);
+      if (res && res.status == 200) {
+        this.$refs.uToast.show({
+          message: this.isAddClassifySpecification ? "添加成功" : "修改成功",
+          type: "succeed",
+          duration: 1000,
+          zIndex: 12000,
+          position: "top",
+        });
+        this.getClassifySpecificationList();
+      }
+      this.showAddAndEditClassifySpecification = false;
+    },
+    handerChangeCheckboxGroup(e) {
+      if (e.length === 0) {
+        this.specificationInfoList = [
+          {
+            item_is_default: false,
+            item_number: "",
+            item_market_price_2: "",
+            item_market_price: "",
+            item_unit_price: "",
+            item_unit_price_2: "",
+            item_quantity: "",
+            item_quantity_2: "",
+          },
+        ];
+        return;
+      }
+
+      // 1. 处理取消勾选的规格（从specificationInfoList中移除）
+      this.specificationInfoList = this.specificationInfoList.filter((item) =>
+        e.includes(item.spec_item_id)
+      );
+
+      // 2. 处理新增勾选的规格（添加到specificationInfoList）
+      e.forEach((specItemId) => {
+        // 检查是否已存在
+        const exists = this.specificationInfoList.some(
+          (item) => item.spec_item_id === specItemId
+        );
+
+        if (!exists) {
+          // 从分类规格列表中查找对应的规格
+          const selectedItem = this.classifySpecificationList.find(
+            (item) => item.spec_item_id === specItemId
+          );
+
+          if (selectedItem) {
+            this.specificationInfoList.push({
+              spec_item_id: selectedItem.spec_item_id,
+              spec_item_name: selectedItem.spec_item_name,
+              item_is_default: false, // 默认不选中
+              item_number: "",
+              item_market_price_2: "",
+              item_market_price: "",
+              item_unit_price: "",
+              item_unit_price_2: "",
+              item_quantity: "",
+              ...selectedItem,
+            });
+          }
+        }
+      });
+    },
+    handerShowAddClassifySpecification(isAddClassifySpecification, item) {
+      if (!isAddClassifySpecification) {
+        this.form = JSON.parse(JSON.stringify(item));
+      } else {
+        this.form = {
+          spec_item_name: "",
+          spec_item_order: "",
+        };
+      }
+
+      this.isAddClassifySpecification = isAddClassifySpecification;
+      this.showAddAndEditClassifySpecification = true;
+    },
+    closeAddAndEditClassifySpecification() {
+      this.showAddAndEditClassifySpecification = false;
+    },
+    handerShowDelectPopup(item) {
+      this.currDelectItem = item;
+      this.showDelectPopup = true;
+    },
+    async handerDelectClassify() {
+      let params = {
+        spec_item_id: this.currDelectItem.spec_item_id,
+      };
+
+      let res = await DelectCommoditSpecification(params);
+      if (res && res.status == 200) {
+        this.$refs.uToast.show({
+          message: "删除成功",
+          type: "succeed",
+          duration: 1000,
+        });
+
+        this.getClassifySpecificationList();
+      }
+      this.showDelectPopup = false;
+    },
+    handerChangeMarketPrice(e, index) {
+      this.specificationInfoList[index].item_market_price = e;
+    },
+    handerChangeUnitPrice(e, index) {
+      this.specificationInfoList[index].item_unit_price = e;
+    },
+    handerChangeQuantity(e, index) {
+      this.specificationInfoList[index].item_quantity = e;
+    },
+    handerAddAndEditPopup() {
+      let isVerify = true;
+
+      if (this.isAdd) {
+        for (let i = 0; i < this.specificationInfoList.length; i++) {
+          const item = this.specificationInfoList[i];
+
+          if (item.item_market_price_2 == "") {
+            this.$refs.uToast.show({
+              message: "存在未填写的市场价",
+              type: "error",
+              duration: 1000,
+            });
+            this.isVerify = false;
+            break;
+          }
+
+          if (item.item_unit_price_2 == "") {
+            this.$refs.uToast.show({
+              message: "存在未填写的零售价",
+              type: "error",
+              duration: 1000,
+            });
+            this.isVerify = false;
+            break;
+          }
+
+          if (item.item_quantity_2 == "") {
+            this.$refs.uToast.show({
+              message: "存在未填写的库存",
+              type: "error",
+              duration: 1000,
+            });
+            this.isVerify = false;
+            break;
+          }
+        }
+      } else {
+        for (let i = 0; i < this.specificationInfoList.length; i++) {
+          const item = this.specificationInfoList[i];
+
+          if (item.item_market_price == "") {
+            this.$refs.uToast.show({
+              message: "存在未填写的市场价",
+              type: "error",
+              duration: 1000,
+            });
+            this.isVerify = false;
+            break;
+          }
+
+          if (item.item_unit_price == "") {
+            this.$refs.uToast.show({
+              message: "存在未填写的零售价",
+              type: "error",
+              duration: 1000,
+            });
+            this.isVerify = false;
+            break;
+          }
+
+          if (item.item_unit_price == 0) {
+            this.$refs.uToast.show({
+              message: "零售价不能为0",
+              type: "error",
+              duration: 1000,
+            });
+            this.isVerify = false;
+            break;
+          }
+
+          if (item.item_quantity == "") {
+            this.$refs.uToast.show({
+              message: "存在未填写的库存",
+              type: "error",
+              duration: 1000,
+            });
+            this.isVerify = false;
+            break;
+          }
+        }
+      }
+
+      if (!isVerify) return;
+
+      this.$emit("handerSpecificationInfoList", this.specificationInfoList);
+      this.pageBack(true);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/variables.scss";
+
+.specificationOfGood-container {
+  width: 100vw;
+  height: calc(100vh - 120rpx);
+  overflow: auto;
+
+  .tips {
+    margin: 20rpx;
+    padding: 20rpx;
+    border-radius: 16rpx;
+    background: #f5f6fa;
+    color: red;
+  }
+
+  .specificationOfGood-content {
+    .specificationOfGood-tips {
+      display: flex;
+      justify-content: space-between;
+      padding: 28rpx;
+      font-size: 30rpx;
+      background: #f5f6fa;
+      color: #5b5b5b;
+    }
+
+    .specificationOfGood-tips-name {
+      padding: 28rpx;
+      font-weight: bold;
+    }
+
+    .specificationOfGood-input-content {
+      display: flex;
+      margin-bottom: 20rpx;
+      padding: 0 24rpx;
+
+      .specification-input {
+        border: 1px solid #e7e7e7;
+      }
+
+      .specification-icon {
+        margin-left: 24rpx;
+      }
+    }
+
+    .add-btn {
+      width: 94%;
+      margin: 28rpx;
+      border-color: #979797;
+      color: #000;
+
+      &::after {
+        border: none;
+      }
+    }
+
+    .commodity-content {
+      background: #f5f6fa;
+
+      .commodity-item {
+        margin-bottom: 20px;
+        background: #fff;
+
+        .commodity-info {
+          .commodity-info-name-content {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 20rpx 24rpx;
+
+            .commodity-info-name {
+              font-size: 36rpx;
+              font-weight: bold;
+            }
+
+            .commodity-info-switch {
+              display: flex;
+              align-items: center;
+              .switch-label {
+                margin-right: 20rpx;
+              }
+            }
+          }
+
+          .commodity-info-item {
+            display: flex;
+            align-items: center;
+            padding: 24rpx 36rpx;
+            border-bottom: 1px solid #efefef;
+            background: #fff;
+
+            .commodity-info-lable {
+              position: relative;
+              margin-right: 60rpx;
+            }
+
+            .required-label {
+              &::before {
+                content: "*";
+                position: absolute;
+                left: -20rpx;
+                top: 8rpx;
+                color: red;
+              }
+            }
+
+            ::v-deep .input-price {
+              font-weight: bold;
+              color: 0 !important;
+              .u-icon__icon {
+                color: #000 !important;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .no-data {
+    .no-data-bg {
+      margin: 15% 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: red;
+      text-align: center;
+    }
+  }
+
+  .checkbox-group {
+    flex-flow: wrap;
+    padding: 0 20rpx;
+
+    .checkbox-item {
+      margin: 20rpx;
+    }
+  }
+
+  .classify-specification-popup {
+    ::v-deep.u-popup__content {
+      border-top-left-radius: 16rpx;
+      border-top-right-radius: 16rpx;
+      background: #f8f8f8;
+    }
+
+    .classify-specification-popup-content {
+      // width: 100%;
+
+      .classify-specification-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+        background: #fff;
+        border-top-left-radius: 16rpx;
+        border-top-right-radius: 16rpx;
+      }
+
+      .classify-specification-list {
+        background: #f8f8f8;
+      }
+
+      .classify-specification-item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 40rpx;
+        padding-bottom: 20px;
+        background: #fff;
+
+        .classify-specification-btn-list {
+          display: flex;
+          align-items: center;
+
+          .btn_item {
+            margin-right: 20rpx;
+            display: flex;
+            align-items: center;
+          }
+        }
+
+        .popup-commodity-info {
+          .popup-commodity-info-name {
+            font-size: 36rpx;
+            font-weight: bold;
+            padding-left: 24rpx;
+            padding-top: 20rpx;
+          }
+
+          .commodity-info-item {
+            display: flex;
+            align-items: center;
+            padding: 12px;
+            border-bottom: 1px solid #efefef;
+
+            .popup-commodity-info-lable {
+              margin-right: 60px;
+            }
+
+            ::v-deep .input-price {
+              font-weight: bold;
+              color: 0 !important;
+              .u-icon__icon {
+                color: #000 !important;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .classify-specification-bottom-btn {
+      padding: 40rpx;
+      background: #fff;
+
+      .btn-item {
+        height: 80rpx;
+        background: $base-color;
+        color: #fff;
+
+        &::after {
+          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: bold;
+      }
+
+      .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;
+        }
+      }
+    }
+  }
+
+  .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: bold;
+        font-size: 36rpx;
+      }
+
+      .add-tips {
+        padding: 0 24rpx;
+        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;
+        }
+      }
+    }
+  }
+
+  .u-toast {
+    ::v-deep.u-transition {
+      z-index: 12000;
+    }
+  }
+
+  .bottom-btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 20rpx;
+    background: #fff;
+    border-top: 2rpx solid $uni-border-color;
+    z-index: 2;
+
+    .bottom-list {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+
+      .bottom-btn-item {
+        font-size: 28rpx;
+        border-color: $base-color;
+        color: #fff;
+        background: $base-color;
+
+        .bottom-icon {
+          margin-right: 8rpx;
+        }
+
+        &::after {
+          border: none;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/typeManagement.vue b/java-mall-app-shop-admin/pages/warehouse/manage/typeManagement.vue
index a014b9c..62aa5ce 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/typeManagement.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/typeManagement.vue
@@ -15,44 +15,46 @@
         :refresher-triggered="isRefreshing"
         @refresherrefresh="handleRefresh"
       >
-      <view class="typeManagement_list">
- <view
-          class="typeManagement-item"
-          v-for="(item, index) of typeManageList"
-          :key="index"
-        >
-          <view class="typeManagement-info">
-            <view class="type-name">{{ item.type_name }}</view>
-            <view class="type-catergory-name">
-              {{ item.type_category_name }}
+        <view class="typeManagement_list">
+          <view
+            class="typeManagement-item"
+            v-for="(item, index) of typeManageList"
+            :key="index"
+          >
+            <view class="typeManagement-info">
+              <view class="type-name">{{ item.type_name }}</view>
+              <view class="type-catergory-name">
+                {{ item.type_category_name }}
+              </view>
             </view>
-          </view>
 
-          <view class="specification-btn-content">
-            <view class="btn_item"  @click="handerShowDelectPopup(item)">
- <u-icon
-              class="u-icon-jianhao"
-              custom-prefix="custom-icon-jianhao_fangxing custom-icon"
-             size="18"
-              color="#FE411B"
-             
-            ></u-icon>删除
+            <view class="specification-btn-content">
+              <view class="btn_item" @click="handerShowDelectPopup(item)">
+                <u-icon
+                  class="u-icon-jianhao"
+                  custom-prefix="custom-icon-jianhao_fangxing custom-icon"
+                  size="18"
+                  color="#FE411B"
+                ></u-icon>
+                删除
+              </view>
+
+              <view
+                class="btn_item"
+                @click="handerAddAndEditPopup(false, item)"
+              >
+                <u-icon
+                  class="u-icon-bianji"
+                  custom-prefix="custom-icon-icon_519 custom-icon"
+                  size="18"
+                  color="#FE411B"
+                ></u-icon>
+                编辑
+              </view>
             </view>
-           
-<view class="btn_item"    @click="handerAddAndEditPopup(false, item)">
-  <u-icon
-    class="u-icon-bianji"
- 
-    custom-prefix="custom-icon-icon_519 custom-icon"
-    size="18"
-              color="#FE411B"
-  ></u-icon>编辑
-</view>
-
           </view>
         </view>
-      </view>
-       
+
         <view
           class="m-loading-box"
           v-if="typeManageList.length > 0 && !isNotypeManageData"
@@ -80,7 +82,12 @@
           shape="circle"
           @click="handerAddAndEditPopup(true)"
         >
-        <u-icon color="#fff" size="20" class="bottom-icon" name="plus-circle"></u-icon>
+          <u-icon
+            color="#fff"
+            size="20"
+            class="bottom-icon"
+            name="plus-circle"
+          ></u-icon>
           新建商品类型
         </u-button>
       </view>
@@ -209,7 +216,10 @@
             v-for="(item, index) in allSpecificationList"
             :key="index"
           >
-            <view class="specification-name"><u-icon name="tags" color="#666" size="18"></u-icon>分类名称：{{ item.name }}</view>
+            <view class="specification-name">
+              <u-icon name="tags" color="#666" size="18"></u-icon>
+              分类名称：{{ item.name }}
+            </view>
             <u-checkbox-group
               class="specification-checkbox-gourp"
               v-model="item.checkboxList"
@@ -684,7 +694,7 @@ export default {
     font-size: 28rpx;
   }
 
-  .typeManagement_list{
+  .typeManagement_list {
     margin: 24rpx;
     padding: 24rpx;
     background: #fff;
@@ -696,9 +706,9 @@ export default {
     justify-content: space-around;
     align-items: center;
     padding: 24rpx 0;
-    border-bottom: 1rpx solid rgba(238, 238, 238, .5);
+    border-bottom: 1rpx solid rgba(238, 238, 238, 0.5);
 
-    &:last-child{
+    &:last-child {
       border-bottom: none;
       padding-bottom: 0;
     }
@@ -706,7 +716,7 @@ export default {
     .typeManagement-info {
       flex: 1;
       display: flex;
-        font-size: 28rpx;
+      font-size: 28rpx;
 
       .type-name {
         max-width: 160rpx;
@@ -718,25 +728,24 @@ export default {
         -webkit-box-orient: vertical;
         overflow: hidden;
         text-overflow: ellipsis; /* 超出部分显示省略号 */
-       
       }
 
-      .type-catergory-name{
+      .type-catergory-name {
         color: #666;
       }
     }
 
     .specification-btn-content {
-       display: flex;
-        justify-content: flex-end;
-        gap: 20rpx;
+      display: flex;
+      justify-content: flex-end;
+      gap: 20rpx;
 
-          .btn_item{
-          gap: 4rpx;
-          font-size: 24rpx;
-          display: flex;
-          align-items: center;
-        }
+      .btn_item {
+        gap: 4rpx;
+        font-size: 24rpx;
+        display: flex;
+        align-items: center;
+      }
 
       .u-icon-jianhao {
         ::v-deep.custom-icon-jianhao_fangxing {
@@ -799,9 +808,9 @@ export default {
       margin: 50rpx;
 
       .btn-item {
-       width: 46%;
-          height: 64rpx;
-          border-color: #909193;
+        width: 46%;
+        height: 64rpx;
+        border-color: #909193;
 
         &::after {
           border: none;
@@ -862,7 +871,7 @@ export default {
 
         .btn-item {
           width: 46%;
-          height:64rpx;
+          height: 64rpx;
           border-color: #909193;
 
           &::after {
@@ -930,7 +939,7 @@ export default {
   }
 
   .typeManagement-bottom {
-      position: fixed;
+    position: fixed;
     bottom: 0;
     left: 0;
     right: 0;
@@ -978,10 +987,10 @@ export default {
   }
 }
 
-::v-deep .u-textarea{
+::v-deep .u-textarea {
   padding: 0;
 }
-::v-deep .u-textarea__count{
+::v-deep .u-textarea__count {
   bottom: 0rpx;
 }
 </style>
diff --git a/java-mall-app-shop-admin/store/modules/user.js b/java-mall-app-shop-admin/store/modules/user.js
index ed04423..649f3c9 100644
--- a/java-mall-app-shop-admin/store/modules/user.js
+++ b/java-mall-app-shop-admin/store/modules/user.js
@@ -1,7 +1,7 @@
 import { GetAuditInfo, GetAuditStatus } from "../../api/audit";
 import { GetAccountLogin, GetLogin } from "../../api/login";
 import { OutLogin } from "../../api/user";
-import $Socket from "../../utils/socket";
+import { webSocketManager } from "@/utils/socket.js";
 import Vue from "vue";
 // import $cookies from '../../utils/vue-cookies'
 
@@ -72,10 +72,12 @@ const mutations = {
     state.imWeidu = {};
     state.dashboardInfo = {};
   },
-  CONNECT_SOCKET(state, { socket }) {
-    state.socket = socket;
+  CONNECT_SOCKET(state, { webSocketManager }) {
+    state.socket = webSocketManager;
   },
   GET_IM_MSG(state, { msg }) {
+    console.log("GET_IM_MSG", msg);
+    if (!msg.id) return;
     state.getMsg = msg;
     var im = {};
     let _imWeiDu = uni.getStorageSync("imWeiDu");
@@ -121,8 +123,7 @@ const actions = {
 
     // #endif
 
-    params.cid = "ae9c4517a4ae17ea33570839a0f5fdba";
-    params.osType = 1;
+    console.log("push_clientid");
 
     const res = await GetAccountLogin(params);
 
@@ -195,6 +196,8 @@ const actions = {
     }
   },
   async LoginOut({ commit }, isTokenExpires) {
+    webSocketManager.closeAllGlobalConnections();
+
     if (isTokenExpires) {
       await OutLogin();
 
@@ -379,27 +382,22 @@ const actions = {
   },
   connectSocket({ commit }, userInfo) {
     if (!userInfo) return;
-    var socket = new $Socket({
-      url: userInfo.im.node_site_url,
-      maxInterValCount: 5,
-      interValTime: 20000,
-      onClose: (res) => {
-        console.log("sockrt关闭");
-      },
-      onOpen: (res) => {
-        console.log("sockrt连接成功");
-      },
-      onMsg: (res) => {
-        console.log("onMsg", res);
-        if (res) {
-          let msg = JSON.parse(res.data);
-          commit("GET_IM_MSG", { msg });
-        }
-      },
-    });
-    socket.connectserver(userInfo.im);
 
-    commit("CONNECT_SOCKET", { socket });
+    webSocketManager.createGlobalConnection(
+      "ws1",
+      userInfo.im.node_site_url,
+      2000
+    );
+
+    webSocketManager.getConnection("ws1").onMessage((res) => {
+      // 处理消息逻辑
+      if (res) {
+        let msg = res;
+
+        console.log("ws1收到的消息:", msg);
+        commit("GET_IM_MSG", { msg });
+      }
+    });
   },
 };
 
diff --git a/java-mall-app-shop-admin/styles/variables.scss b/java-mall-app-shop-admin/styles/variables.scss
index e582cee..e32cfd0 100644
--- a/java-mall-app-shop-admin/styles/variables.scss
+++ b/java-mall-app-shop-admin/styles/variables.scss
@@ -1,4 +1,3 @@
 /*主颜色*/
-$base-color: #FE411B; // 蓝色 #4b71ff
-
-$base-btn-bg-color: #FE411B;
+$base-color: #fe411b; // 蓝色 #4b71ff
+$base-btn-bg-color: #fe411b;
diff --git a/java-mall-app-shop-admin/uni_modules/uview-ui/components/u-toast/u-toast.vue b/java-mall-app-shop-admin/uni_modules/uview-ui/components/u-toast/u-toast.vue
index f194830..f2a7fce 100644
--- a/java-mall-app-shop-admin/uni_modules/uview-ui/components/u-toast/u-toast.vue
+++ b/java-mall-app-shop-admin/uni_modules/uview-ui/components/u-toast/u-toast.vue
@@ -1,291 +1,306 @@
 <template>
-	<view class="u-toast">
-		<u-overlay
-			:show="isShow"
-			:custom-style="overlayStyle"
-		>
-			<view
-				class="u-toast__content"
-				:style="[contentStyle]"
-				:class="['u-type-' + tmpConfig.type, (tmpConfig.type === 'loading' || tmpConfig.loading) ?  'u-toast__content--loading' : '']"
-			>
-				<u-loading-icon
-					v-if="tmpConfig.type === 'loading'"
-					mode="circle"
-					color="rgb(255, 255, 255)"
-					inactiveColor="rgb(120, 120, 120)"
-					size="25"
-				></u-loading-icon>
-				<u-icon
-					v-else-if="tmpConfig.type !== 'defalut' && iconName"
-					:name="iconName"
-					size="17"
-					:color="tmpConfig.type"
-					:customStyle="iconStyle"
-				></u-icon>
-				<u-gap
-					v-if="tmpConfig.type === 'loading' || tmpConfig.loading"
-					height="12"
-					bgColor="transparent"
-				></u-gap>
-				<text
-					class="u-toast__content__text"
-					:class="['u-toast__content__text--' + tmpConfig.type]"
-					style="max-width: 400rpx;"
-				>{{ tmpConfig.message }}</text>
-			</view>
-		</u-overlay>
-	</view>
+  <view class="u-toast">
+    <u-overlay :show="isShow" :custom-style="overlayStyle">
+      <view
+        class="u-toast__content"
+        :style="[contentStyle]"
+        :class="[
+          'u-type-' + tmpConfig.type,
+          tmpConfig.type === 'loading' || tmpConfig.loading
+            ? 'u-toast__content--loading'
+            : '',
+        ]"
+      >
+        <u-loading-icon
+          v-if="tmpConfig.type === 'loading'"
+          mode="circle"
+          color="rgb(255, 255, 255)"
+          inactiveColor="rgb(120, 120, 120)"
+          size="25"
+        ></u-loading-icon>
+        <u-icon
+          v-else-if="tmpConfig.type !== 'defalut' && iconName"
+          :name="iconName"
+          size="17"
+          :color="tmpConfig.type"
+          :customStyle="iconStyle"
+        ></u-icon>
+        <u-gap
+          v-if="tmpConfig.type === 'loading' || tmpConfig.loading"
+          height="12"
+          bgColor="transparent"
+        ></u-gap>
+        <text
+          class="u-toast__content__text"
+          :class="['u-toast__content__text--' + tmpConfig.type]"
+          style="max-width: 400rpx"
+        >
+          {{ tmpConfig.message }}
+        </text>
+      </view>
+    </u-overlay>
+  </view>
 </template>
 
 <script>
-	/**
-	 * toast 消息提示
-	 * @description 此组件表现形式类似uni的uni.showToastAPI，但也有不同的地方。
-	 * @tutorial https://www.uviewui.com/components/toast.html
-	 * @property {String | Number}	zIndex		toast展示时的zIndex值 (默认 10090 )
-	 * @property {Boolean}			loading		是否加载中 （默认 false ）
-	 * @property {String | Number}	message		显示的文字内容
-	 * @property {String}			icon		图标，或者绝对路径的图片
-	 * @property {String}			type		主题类型 （默认 default）
-	 * @property {Boolean}			show		是否显示该组件 （默认 false）
-	 * @property {Boolean}			overlay		是否显示透明遮罩，防止点击穿透 （默认 false ）
-	 * @property {String}			position	位置 （默认 'center' ）
-	 * @property {Object}			params		跳转的参数 
-	 * @property {String | Number}  duration	展示时间，单位ms （默认 2000 ）
-	 * @property {Boolean}			isTab		是否返回的为tab页面 （默认 false ）
-	 * @property {String}			url			toast消失后是否跳转页面，有则跳转，优先级高于back参数 
-	 * @property {Function}			complete	执行完后的回调函数 
-	 * @property {Boolean}			back		结束toast是否自动返回上一页 （默认 false ）
-	 * @property {Object}			customStyle	组件的样式，对象形式
-	 * @event {Function} show 显示toast，如需一进入页面就显示toast，请在onReady生命周期调用
-	 * @example <u-toast ref="uToast" />
-	 */
-	export default {
-		name: 'u-toast',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin],
-		data() {
-			return {
-				isShow: false,
-				timer: null, // 定时器
-				config: {
-					message: '', // 显示文本
-					type: '', // 主题类型，primary，success，error，warning，black
-					duration: 2000, // 显示的时间，毫秒
-					icon: true, // 显示的图标
-					position: 'center', // toast出现的位置
-					complete: null, // 执行完后的回调函数
-					overlay: false, // 是否防止触摸穿透
-					loading: false, // 是否加载中状态
-				},
-				tmpConfig: {}, // 将用户配置和内置配置合并后的临时配置变量
-			}
-		},
-		computed: {
-			iconName() {
-				// 只有不为none，并且type为error|warning|succes|info时候，才显示图标
-				if(!this.tmpConfig.icon || this.tmpConfig.icon == 'none') {
-					return '';
-				}
-				if (['error', 'warning', 'success', 'primary'].includes(this.tmpConfig.type)) {
-					return uni.$u.type2icon(this.tmpConfig.type)
-				} else {
-					return ''
-				}
-			},
-			overlayStyle() {
-				const style = {
-					justifyContent: 'center',
-					alignItems: 'center',
-					display: 'flex'
-				}
-				// 将遮罩设置为100%透明度，避免出现灰色背景
-				style.backgroundColor = 'rgba(0, 0, 0, 0)'
-				return style
-			},
-			iconStyle() {
-				const style = {}
-				// 图标需要一个右边距，以跟右边的文字有隔开的距离
-				style.marginRight = '4px'
-				// #ifdef APP-NVUE
-				// iOSAPP下，图标有1px的向下偏移，这里进行修正
-				if (uni.$u.os() === 'ios') {
-					style.marginTop = '-1px'
-				}
-				// #endif
-				return style
-			},
-			loadingIconColor() {
-				let color = 'rgb(255, 255, 255)'
-				if (['error', 'warning', 'success', 'primary'].includes(this.tmpConfig.type)) {
-					// loading-icon组件内部会对color参数进行一个透明度处理，该方法要求传入的颜色值
-					// 必须为rgb格式的，所以这里做一个处理
-					color = uni.$u.hexToRgb(uni.$u.color[this.tmpConfig.type])
-				}
-				return color
-			},
-			// 内容盒子的样式
-			contentStyle() {
-				const windowHeight = uni.$u.sys().windowHeight, style = {}
-				let value = 0
-				// 根据top和bottom，对Y轴进行窗体高度的百分比偏移
-				if(this.tmpConfig.position === 'top') {
-					value = - windowHeight * 0.25
-				} else if(this.tmpConfig.position === 'bottom') {
-					value = windowHeight * 0.25
-				}
-				style.transform = `translateY(${value}px)`
-				return style
-			}
-		},
-		created() {
-			// 通过主题的形式调用toast，批量生成方法函数
-			['primary', 'success', 'error', 'warning', 'default', 'loading'].map(item => {
-				this[item] = message => this.show({
-					type: item,
-					message
-				})
-			})
-		},
-		methods: {
-			// 显示toast组件，由父组件通过this.$refs.xxx.show(options)形式调用
-			show(options) {
-				// 不将结果合并到this.config变量，避免多次调用u-toast，前后的配置造成混乱
-				this.tmpConfig = uni.$u.deepMerge(this.config, options)
-				// 清除定时器
-				this.clearTimer()
-				this.isShow = true
-				this.timer = setTimeout(() => {
-					// 倒计时结束，清除定时器，隐藏toast组件
-					this.clearTimer()
-					// 判断是否存在callback方法，如果存在就执行
-					typeof(this.tmpConfig.complete) === 'function' && this.tmpConfig.complete()
-				}, this.tmpConfig.duration)
-			},
-			// 隐藏toast组件，由父组件通过this.$refs.xxx.hide()形式调用
-			hide() {
-				this.clearTimer()
-			},
-			clearTimer() {
-				this.isShow = false
-				// 清除定时器
-				clearTimeout(this.timer)
-				this.timer = null
-			}
-		},
-		beforeDestroy() {
-			this.clearTimer()
-		}
-	}
+/**
+ * toast 消息提示
+ * @description 此组件表现形式类似uni的uni.showToastAPI，但也有不同的地方。
+ * @tutorial https://www.uviewui.com/components/toast.html
+ * @property {String | Number}	zIndex		toast展示时的zIndex值 (默认 10090 )
+ * @property {Boolean}			loading		是否加载中 （默认 false ）
+ * @property {String | Number}	message		显示的文字内容
+ * @property {String}			icon		图标，或者绝对路径的图片
+ * @property {String}			type		主题类型 （默认 default）
+ * @property {Boolean}			show		是否显示该组件 （默认 false）
+ * @property {Boolean}			overlay		是否显示透明遮罩，防止点击穿透 （默认 false ）
+ * @property {String}			position	位置 （默认 'center' ）
+ * @property {Object}			params		跳转的参数
+ * @property {String | Number}  duration	展示时间，单位ms （默认 2000 ）
+ * @property {Boolean}			isTab		是否返回的为tab页面 （默认 false ）
+ * @property {String}			url			toast消失后是否跳转页面，有则跳转，优先级高于back参数
+ * @property {Function}			complete	执行完后的回调函数
+ * @property {Boolean}			back		结束toast是否自动返回上一页 （默认 false ）
+ * @property {Object}			customStyle	组件的样式，对象形式
+ * @event {Function} show 显示toast，如需一进入页面就显示toast，请在onReady生命周期调用
+ * @example <u-toast ref="uToast" />
+ */
+export default {
+  name: "u-toast",
+  mixins: [uni.$u.mpMixin, uni.$u.mixin],
+  data() {
+    return {
+      isShow: false,
+      timer: null, // 定时器
+      config: {
+        message: "", // 显示文本
+        type: "", // 主题类型，primary，success，error，warning，black
+        duration: 2000, // 显示的时间，毫秒
+        icon: true, // 显示的图标
+        position: "center", // toast出现的位置
+        complete: null, // 执行完后的回调函数
+        overlay: false, // 是否防止触摸穿透
+        loading: false, // 是否加载中状态
+        zIndex: 12000,
+      },
+      tmpConfig: {}, // 将用户配置和内置配置合并后的临时配置变量
+    };
+  },
+  computed: {
+    iconName() {
+      // 只有不为none，并且type为error|warning|succes|info时候，才显示图标
+      if (!this.tmpConfig.icon || this.tmpConfig.icon == "none") {
+        return "";
+      }
+      if (
+        ["error", "warning", "success", "primary"].includes(this.tmpConfig.type)
+      ) {
+        return uni.$u.type2icon(this.tmpConfig.type);
+      } else {
+        return "";
+      }
+    },
+    overlayStyle() {
+      const style = {
+        justifyContent: "center",
+        alignItems: "center",
+        display: "flex",
+        zIndex: this.zIndex,
+      };
+      // 将遮罩设置为100%透明度，避免出现灰色背景
+      style.backgroundColor = "rgba(0, 0, 0, 0)";
+      return style;
+    },
+    iconStyle() {
+      const style = {};
+      // 图标需要一个右边距，以跟右边的文字有隔开的距离
+      style.marginRight = "4px";
+      // #ifdef APP-NVUE
+      // iOSAPP下，图标有1px的向下偏移，这里进行修正
+      if (uni.$u.os() === "ios") {
+        style.marginTop = "-1px";
+      }
+      // #endif
+      return style;
+    },
+    loadingIconColor() {
+      let color = "rgb(255, 255, 255)";
+      if (
+        ["error", "warning", "success", "primary"].includes(this.tmpConfig.type)
+      ) {
+        // loading-icon组件内部会对color参数进行一个透明度处理，该方法要求传入的颜色值
+        // 必须为rgb格式的，所以这里做一个处理
+        color = uni.$u.hexToRgb(uni.$u.color[this.tmpConfig.type]);
+      }
+      return color;
+    },
+    // 内容盒子的样式
+    contentStyle() {
+      const windowHeight = uni.$u.sys().windowHeight,
+        style = {};
+      let value = 0;
+      // 根据top和bottom，对Y轴进行窗体高度的百分比偏移
+      if (this.tmpConfig.position === "top") {
+        value = -windowHeight * 0.25;
+      } else if (this.tmpConfig.position === "bottom") {
+        value = windowHeight * 0.25;
+      }
+      style.transform = `translateY(${value}px)`;
+      return style;
+    },
+  },
+  created() {
+    // 通过主题的形式调用toast，批量生成方法函数
+    ["primary", "success", "error", "warning", "default", "loading"].map(
+      (item) => {
+        this[item] = (message) =>
+          this.show({
+            type: item,
+            message,
+          });
+      }
+    );
+  },
+  methods: {
+    // 显示toast组件，由父组件通过this.$refs.xxx.show(options)形式调用
+    show(options) {
+      // 不将结果合并到this.config变量，避免多次调用u-toast，前后的配置造成混乱
+      this.tmpConfig = uni.$u.deepMerge(this.config, options);
+      // 清除定时器
+      this.clearTimer();
+      this.isShow = true;
+      this.timer = setTimeout(() => {
+        // 倒计时结束，清除定时器，隐藏toast组件
+        this.clearTimer();
+        // 判断是否存在callback方法，如果存在就执行
+        typeof this.tmpConfig.complete === "function" &&
+          this.tmpConfig.complete();
+      }, this.tmpConfig.duration);
+    },
+    // 隐藏toast组件，由父组件通过this.$refs.xxx.hide()形式调用
+    hide() {
+      this.clearTimer();
+    },
+    clearTimer() {
+      this.isShow = false;
+      // 清除定时器
+      clearTimeout(this.timer);
+      this.timer = null;
+    },
+  },
+  beforeDestroy() {
+    this.clearTimer();
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
+@import "../../libs/css/components.scss";
 
-	$u-toast-color:#fff !default;
-	$u-toast-border-radius:4px !default;
-	$u-toast-border-background-color:#585858 !default;
-	$u-toast-border-font-size:14px !default;
-	$u-toast-border-padding:12px 20px !default;
-	$u-toast-loading-border-padding: 20px 20px !default;
-	$u-toast-content-text-color:#fff !default;
-	$u-toast-content-text-font-size:15px !default;
-	$u-toast-u-icon:10rpx !default;
-	$u-toast-u-type-primary-color:$u-primary !default;
-	$u-toast-u-type-primary-background-color:#ecf5ff !default;
-	$u-toast-u-type-primary-border-color:rgb(215, 234, 254) !default;
-	$u-toast-u-type-primary-border-width:1px !default;
-	$u-toast-u-type-success-color: $u-success !default;
-	$u-toast-u-type-success-background-color: #dbf1e1 !default;
-	$u-toast-u-type-success-border-color: #BEF5C8 !default;
-	$u-toast-u-type-success-border-width: 1px !default;
-	$u-toast-u-type-error-color:$u-error !default;
-	$u-toast-u-type-error-background-color:#fef0f0 !default;
-	$u-toast-u-type-error-border-color:#fde2e2 !default;
-	$u-toast-u-type-error-border-width: 1px !default;
-	$u-toast-u-type-warning-color:$u-warning !default;
-	$u-toast-u-type-warning-background-color:#fdf6ec !default;
-	$u-toast-u-type-warning-border-color:#faecd8 !default;
-	$u-toast-u-type-warning-border-width: 1px !default;
-	$u-toast-u-type-default-color:#fff !default;
-	$u-toast-u-type-default-background-color:#585858 !default;
+$u-toast-color: #fff !default;
+$u-toast-border-radius: 4px !default;
+$u-toast-border-background-color: #585858 !default;
+$u-toast-border-font-size: 14px !default;
+$u-toast-border-padding: 12px 20px !default;
+$u-toast-loading-border-padding: 20px 20px !default;
+$u-toast-content-text-color: #fff !default;
+$u-toast-content-text-font-size: 15px !default;
+$u-toast-u-icon: 10rpx !default;
+$u-toast-u-type-primary-color: $u-primary !default;
+$u-toast-u-type-primary-background-color: #ecf5ff !default;
+$u-toast-u-type-primary-border-color: rgb(215, 234, 254) !default;
+$u-toast-u-type-primary-border-width: 1px !default;
+$u-toast-u-type-success-color: $u-success !default;
+$u-toast-u-type-success-background-color: #dbf1e1 !default;
+$u-toast-u-type-success-border-color: #bef5c8 !default;
+$u-toast-u-type-success-border-width: 1px !default;
+$u-toast-u-type-error-color: $u-error !default;
+$u-toast-u-type-error-background-color: #fef0f0 !default;
+$u-toast-u-type-error-border-color: #fde2e2 !default;
+$u-toast-u-type-error-border-width: 1px !default;
+$u-toast-u-type-warning-color: $u-warning !default;
+$u-toast-u-type-warning-background-color: #fdf6ec !default;
+$u-toast-u-type-warning-border-color: #faecd8 !default;
+$u-toast-u-type-warning-border-width: 1px !default;
+$u-toast-u-type-default-color: #fff !default;
+$u-toast-u-type-default-background-color: #585858 !default;
 
-	.u-toast {
-		&__content {
-			@include flex;
-			padding: $u-toast-border-padding;
-			border-radius: $u-toast-border-radius;
-			background-color: $u-toast-border-background-color;
-			color: $u-toast-color;
-			align-items: center;
-			/* #ifndef APP-NVUE */
-			max-width: 600rpx;
-			/* #endif */
-			position: relative;
+.u-toast {
+  &__content {
+    @include flex;
+    padding: $u-toast-border-padding;
+    border-radius: $u-toast-border-radius;
+    background-color: $u-toast-border-background-color;
+    color: $u-toast-color;
+    align-items: center;
+    /* #ifndef APP-NVUE */
+    max-width: 600rpx;
+    /* #endif */
+    position: relative;
 
-			&--loading {
-				flex-direction: column;
-				padding: $u-toast-loading-border-padding;
-			}
+    &--loading {
+      flex-direction: column;
+      padding: $u-toast-loading-border-padding;
+    }
 
-			&__text {
-				color: $u-toast-content-text-color;
-				font-size: $u-toast-content-text-font-size;
-				line-height: $u-toast-content-text-font-size;
+    &__text {
+      color: $u-toast-content-text-color;
+      font-size: $u-toast-content-text-font-size;
+      line-height: $u-toast-content-text-font-size;
 
-				&--default {
-					color: $u-toast-content-text-color;
-				}
+      &--default {
+        color: $u-toast-content-text-color;
+      }
 
-				&--error {
-					color: $u-error;
-				}
+      &--error {
+        color: $u-error;
+      }
 
-				&--primary {
-					color: $u-primary;
-				}
+      &--primary {
+        color: $u-primary;
+      }
 
-				&--success {
-					color: $u-success;
-				}
+      &--success {
+        color: $u-success;
+      }
 
-				&--warning {
-					color: $u-warning;
-				}
-			}
-		}
-	}
+      &--warning {
+        color: $u-warning;
+      }
+    }
+  }
+}
 
-	.u-type-primary {
-		color: $u-toast-u-type-primary-color;
-		background-color: $u-toast-u-type-primary-background-color;
-		border-color: $u-toast-u-type-primary-border-color;
-		border-width: $u-toast-u-type-primary-border-width;
-	}
+.u-type-primary {
+  color: $u-toast-u-type-primary-color;
+  background-color: $u-toast-u-type-primary-background-color;
+  border-color: $u-toast-u-type-primary-border-color;
+  border-width: $u-toast-u-type-primary-border-width;
+}
 
-	.u-type-success {
-		color: $u-toast-u-type-success-color;
-		background-color: $u-toast-u-type-success-background-color;
-		border-color: $u-toast-u-type-success-border-color;
-		border-width: 1px;
-	}
+.u-type-success {
+  color: $u-toast-u-type-success-color;
+  background-color: $u-toast-u-type-success-background-color;
+  border-color: $u-toast-u-type-success-border-color;
+  border-width: 1px;
+}
 
-	.u-type-error {
-		color: $u-toast-u-type-error-color;
-		background-color: $u-toast-u-type-error-background-color;
-		border-color: $u-toast-u-type-error-border-color;
-		border-width: $u-toast-u-type-error-border-width;
-	}
+.u-type-error {
+  color: $u-toast-u-type-error-color;
+  background-color: $u-toast-u-type-error-background-color;
+  border-color: $u-toast-u-type-error-border-color;
+  border-width: $u-toast-u-type-error-border-width;
+}
 
-	.u-type-warning {
-		color: $u-toast-u-type-warning-color;
-		background-color: $u-toast-u-type-warning-background-color;
-		border-color: $u-toast-u-type-warning-border-color;
-		border-width: 1px;
-	}
+.u-type-warning {
+  color: $u-toast-u-type-warning-color;
+  background-color: $u-toast-u-type-warning-background-color;
+  border-color: $u-toast-u-type-warning-border-color;
+  border-width: 1px;
+}
 
-	.u-type-default {
-		color: $u-toast-u-type-default-color;
-		background-color: $u-toast-u-type-default-background-color;
-	}
+.u-type-default {
+  color: $u-toast-u-type-default-color;
+  background-color: $u-toast-u-type-default-background-color;
+}
 </style>
diff --git a/java-mall-app-shop-admin/utils/socket.js b/java-mall-app-shop-admin/utils/socket.js
index 5c931ff..0ab2c3b 100644
--- a/java-mall-app-shop-admin/utils/socket.js
+++ b/java-mall-app-shop-admin/utils/socket.js
@@ -1,261 +1,189 @@
-const noop = function() {};
-class Socket {
-	static stopTime = 0;
-	static concatCount = 0;
-	constructor({
-		url = '',
-		onOpen = noop,
-		onMsg = noop,
-		onClose = noop,
-		onError = noop,
-		onReload = noop,
-		onRdFinsh = noop,
-		maxInterValCount = 10,
-		interValTime = 2000,
-		SocketState = {},
-		...args
-	} = {}) {
-		this.isRconnectIng = false; //是否处于重连状态
-		this.waiting = Promise.resolve(false); //心跳检查必须等待重连完成后
-		this.waitDep = []; //等待时收集依赖的容器
-		this.SocketTask = {
-			nsend: noop,
-			nclose: noop,
-			nrconnect: noop,
-			isconnect: false,
-			uniColse: false,
-			maxInterValCount,
-			interValTime,
-			InterValCount: 0,
-			eventPatch: null,
-			url,
-			onOpen,
-			onMsg,
-			onClose,
-			onError,
-			onReload,
-			onRdFinsh,
-			extra: args
-		};
-		this._EventDispath(this.SocketTask);
-		//this.initChat(this.SocketTask, this.SocketTask.extra);
-		return this.SocketTask;
+class WebsocketUtil {
+  constructor(url, time) {
+    this.is_open_socket = false; // 避免重复连接
+    this.url = url; // 地址
+    this.data = null;
+    // 心跳检测
+    this.timeout = time; // 多少秒执行检测
+    this.heartbeatInterval = null; // 检测服务器端是否还活着
+    this.reconnectInterval = null; // 重连之后多久再次重连
+    this.messageCallbacks = []; // 存储消息回调函数
+    this.store = null; // 存储Vuex store引用
 
-	}
-	set CONCATCOUNT(value) {
-		Socket.concatCount = value;
-		if (value > 0) this._notify();
-	}
-	get CONCATCOUNT() {
-		return Socket.concatCount
-	}
-	/**
-	 * 仅供内部使用，通知所有收集到的依赖
-	 */
-	_notify() {
-		for (let i = 0; i < this.waitDep.length; i++) {
-			this.waitDep[i].call(this.SocketTask);
-		}
-		this.waitDep = [];
-	}
-	/**
-	 * 仅供内部使用，确认当前是否连接成功,收集依赖
-	 */
-	_chunkConnect(fn) {
-		if (Socket.concatCount > 0) {
-			fn();
-		} else {
-			this.waitDep.push(fn);
-		}
-	}
-	/**
-	 * 仅供内部使用，事件注册
-	 */
-	_EventDispath({
-		onReload
-	} = {}) {
-		let SocketTask = this.SocketTask;
-		let events = {
-			onOpen: [],
-			onMsg: [],
-			onClose: [],
-			onError: [],
-			onReload: [],
-			onRdFinsh: [],
-		}
-		SocketTask.connectserver = config => {
-			//重连，判断是否
-			if (!SocketTask.isconnect && !this.isRconnectIng)
-			{
-				this.SocketTask.url = config.node_site_url
-				this.initChat(this.SocketTask, this.SocketTask.extra);
-			}
-		}
-		SocketTask.nsend = msg => {
-			let text = JSON.stringify(msg)
-			this._chunkConnect(() => {
-				uni.sendSocketMessage({
-					data: text
-				})
-			})
-		}
-		SocketTask.nclose = t => {
-			this._chunkConnect(() => {
-				SocketTask.uniColse = true;
-				uni.closeSocket();
-			})
-		}
-		SocketTask.nrconnect = t => {
-			this._chunkConnect(() => {
-				this.waiting = new Promise(async (resolve) => {
-					uni.closeSocket();
-					let reloadStatus = false;
-					try {
-						const res = await this.initChat(SocketTask, SocketTask.extra);
-						reloadStatus = res;
-					} catch (e) {}
-					onReload.call(SocketTask, reloadStatus, SocketTask);
-					SocketTask.eventPatch.dispatchEvent('onReload', reloadStatus);
-					resolve(reloadStatus);
-				})
-			})
-		}
+    try {
+      return this.connectSocketInit();
+    } catch (e) {
+      this.is_open_socket = false;
+    }
+  }
 
-		function EventDispatcher() {
-			this.events = events;
-		}
-		for (let key in events) {
-			EventDispatcher.prototype[key] = function(handler) {
-				if (typeof handler != 'function') return;
-				this.events[key].push(handler)
-			}
-		}
-		EventDispatcher.prototype.dispatchEvent = function(type, msg) {
-			let evenArr = this.events[type];
-			if (evenArr.length > 0) {
-				for (let i = 0; i < evenArr.length; i++) {
-					evenArr[i].call(SocketTask, msg, SocketTask);
-				}
-			}
-		}
-		SocketTask.eventPatch = new EventDispatcher();
-	}
-	/**
-	 * 心跳检测
-	 */
-	async hbDetection() {
-		const SocketTask = this.SocketTask;
-		if (SocketTask.uniColse) {
-			return false;
-		}
-		clearTimeout(Socket.stopTime);
-		if (!SocketTask.isconnect) { //未连接则启动连接
-			if (SocketTask.maxInterValCount > SocketTask.InterValCount) {
-				Socket.stopTime = setTimeout(async () => {
-					try {
-						const R_result = await this.waiting;
-						if (R_result) return;
-						this.isRconnectIng = true;
-						const openResult = await this.initChat(SocketTask, SocketTask.extra);
-						if (openResult) return;
-						SocketTask.InterValCount++;
-						return this.hbDetection();
-					} catch (e) {
-						return this.hbDetection();
-					}
-				}, SocketTask.interValTime)
-			} else {
-				SocketTask.onRdFinsh.call(SocketTask, SocketTask.maxInterValCount, SocketTask);
-				SocketTask.eventPatch.dispatchEvent('onRdFinsh', SocketTask.maxInterValCount);
-			}
-		}
-	}
-	/**
-	 * websocket监听事件
-	 */
-	SocketEvents({
-		onOpen,
-		onMsg,
-		onClose,
-		onError,
-		onReload,
-	} = {}) {
-		return new Promise((resolve, reject) => {
-			const SocketTask = this.SocketTask;
-			uni.onSocketOpen(res => {
-				this.CONCATCOUNT += 1;
-				this.isRconnectIng = false;
-				SocketTask.isconnect = true;
-				SocketTask.InterValCount = 0;
-				SocketTask.uniColse = false;
-				resolve(true);
-				onOpen.call(SocketTask, res, SocketTask);
-				SocketTask.eventPatch.dispatchEvent('onOpen', res)
-			})
-			uni.onSocketMessage(msg => {
-				onMsg.call(SocketTask, msg, SocketTask);
-				SocketTask.eventPatch.dispatchEvent('onMsg', msg)
-			})
-			uni.onSocketClose(async err => {
-				SocketTask.isconnect = false;
-				resolve(false);
-				if (!this.isRconnectIng) {
-					this.hbDetection();
-					onClose.call(SocketTask, err, SocketTask);
-					SocketTask.eventPatch.dispatchEvent('onClose', err);
-				}
-			})
-			uni.onSocketError(err => {
-				uni.closeSocket();
-				onError.call(SocketTask, err, SocketTask);
-				SocketTask.eventPatch.dispatchEvent('onError', err)
-			})
-		})
-	}
-	/**
-	 * 开始初始化chat
-	 */
-	initChat({
-		url,
-		onOpen,
-		onMsg,
-		onClose,
-		onError,
-		onReload
-	} = {}, args) {
-		return new Promise(async (resolve, reject) => {
-			try {
-				await this.connectSocket(url, args);
-				let res = await this.SocketEvents({
-					onOpen,
-					onMsg,
-					onClose,
-					onError,
-					onReload,
-				})
-				resolve(res);
-			} catch (e) {
-				console.log(e)
-				reject();
-			}
-		})
-	}
-	/**
-	 * 连接webSocket
-	 */
-	connectSocket(url, args) {
-		return new Promise((resolve, reject) => {
-			uni.connectSocket({
-				url,
-				success: () => {
-					resolve();
-				},
-				fail: err => {
-					reject();
-				},
-				...args
-			})
-		})
-	}
+  // 设置store
+  setStore(store) {
+    this.store = store;
+  }
+
+  // 创建WebSocket连接
+  connectSocketInit() {
+    if (this.is_open_socket) return;
+
+    this.socketTask = uni.connectSocket({
+      url: this.url,
+      success: () => {
+        this.is_open_socket = true;
+        return this.socketTask;
+      },
+    });
+
+    this.socketTask.onOpen((res) => {
+      clearInterval(this.reconnectInterval);
+      clearInterval(this.heartbeatInterval);
+      this.is_open_socket = true;
+      this.start();
+
+      this.socketTask.onMessage((res) => {
+        try {
+          const data = JSON.parse(res.data);
+          // 如果有store，将数据存入store
+          if (this.store) {
+            this.store.commit("setWebSocketData", data);
+          }
+          // 执行所有注册的回调函数
+          this.messageCallbacks.forEach((callback) => callback(data));
+        } catch (e) {
+          console.error("WebSocket消息解析错误:", e);
+        }
+      });
+    });
+
+    this.socketTask.onError((res) => {
+      this.is_open_socket = false;
+      if (this.socketTask) {
+        this.socketTask.close();
+      }
+    });
+
+    this.socketTask.onClose(() => {
+      this.is_open_socket = false;
+    });
+  }
+
+  // 发送消息
+  send(value) {
+    if (!this.is_open_socket) return;
+
+    this.socketTask.send({
+      data: JSON.stringify(value),
+      success() {
+        console.log("消息发送成功", value);
+      },
+      fail(err) {
+        console.error("消息发送失败", err);
+      },
+    });
+  }
+
+  // 关闭连接
+  close() {
+    clearInterval(this.heartbeatInterval);
+    clearInterval(this.reconnectInterval);
+    this.is_open_socket = false;
+    if (this.socketTask) {
+      this.socketTask.close();
+    }
+  }
+
+  // 开启心跳检测
+  start() {
+    // this.heartbeatInterval = setInterval(() => {
+    //   const heartbeatMsg = {
+    //     type: 'heartbeat',
+    //     userId: uni.getStorageSync('userinfo')?.user_id
+    //   }
+    //   this.send(heartbeatMsg)
+    // }, this.timeout)
+  }
+
+  // 重新连接
+  reconnect() {
+    clearInterval(this.heartbeatInterval);
+    if (!this.is_open_socket) {
+      this.reconnectInterval = setInterval(() => {
+        this.connectSocketInit();
+      }, 3000);
+    }
+  }
+
+  // 注册消息回调
+  onMessage(callback) {
+    this.messageCallbacks.push(callback);
+  }
+
+  // 移除消息回调
+  offMessage(callback) {
+    this.messageCallbacks = this.messageCallbacks.filter(
+      (cb) => cb !== callback
+    );
+  }
 }
-export default Socket
+
+class WebSocketManager {
+  constructor() {
+    this.connections = {}; // 存储所有WebSocket连接
+    this.globalConnections = []; // 存储需要全局管理的连接名称
+  }
+
+  // 创建全局连接
+  createGlobalConnection(name, url, time, store) {
+    if (!this.connections[name]) {
+      this.connections[name] = new WebsocketUtil(url, time);
+      if (store) this.connections[name].setStore(store);
+      this.globalConnections.push(name);
+    }
+    return this.connections[name];
+  }
+
+  // 创建页面级连接
+  createPageConnection(name, url, time) {
+    if (!this.connections[name]) {
+      this.connections[name] = new WebsocketUtil(url, time);
+    }
+    return this.connections[name];
+  }
+
+  // 获取连接
+  getConnection(name) {
+    return this.connections[name];
+  }
+
+  // 关闭指定连接
+  closeConnection(name) {
+    console.log("关闭指定连接", name);
+    if (this.connections[name]) {
+      this.connections[name].close();
+      delete this.connections[name];
+
+      // 从全局连接列表中移除
+      this.globalConnections = this.globalConnections.filter((n) => n !== name);
+    }
+  }
+
+  // 关闭所有全局连接
+  closeAllGlobalConnections() {
+    this.globalConnections.forEach((name) => {
+      this.closeConnection(name);
+    });
+  }
+
+  // 关闭所有连接
+  closeAllConnections() {
+    Object.keys(this.connections).forEach((name) => {
+      this.connections[name].close();
+    });
+    this.connections = {};
+    this.globalConnections = [];
+  }
+}
+
+// 导出单例实例
+export const webSocketManager = new WebSocketManager();
+export default WebsocketUtil;