diff --git a/java-mall-app-shop-admin/.hbuilderx/launch.json b/java-mall-app-shop-admin/.hbuilderx/launch.json
index 007bebb..131b491 100644
--- a/java-mall-app-shop-admin/.hbuilderx/launch.json
+++ b/java-mall-app-shop-admin/.hbuilderx/launch.json
@@ -4,24 +4,20 @@
     "version" : "0.0",
     "configurations" : [
         {
-        	"app-plus" : 
-        	{
-        		"launchtype" : "remote"
-        	},
-        	"default" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"h5" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"mp-weixin" : 
-        	{
-        		"launchtype" : "local"
-        	},
-        	"provider" : "aliyun",
-        	"type" : "uniCloud"
+            "app-plus" : {
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "provider" : "aliyun",
+            "type" : "uniCloud"
         },
         {
             "playground" : "custom",
diff --git a/java-mall-app-shop-admin/api/order.js b/java-mall-app-shop-admin/api/order.js
index 0a87857..872b96e 100644
--- a/java-mall-app-shop-admin/api/order.js
+++ b/java-mall-app-shop-admin/api/order.js
@@ -25,6 +25,95 @@ export function GetOrderList(params) {
   });
 }
 
+/**
+ * 获取退货订单列表
+ * @author Seven
+ * @data 2025-3-28
+ * @param {
+ *  storeId: 1, //店铺Id
+ *  keyword: 'DD-',  //搜索订单关键字
+ *  pageNum: 1, //页码
+ *  pageSize: 10, //页大小
+ *  delivery: 1, // 1-同城配送；2-物流配送
+ *  status: 1, 1-进行中；2-超时的订单；3-退款的订单
+ *  }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-order-return/list?pageNum=1&pageSize=20&order_id=&return_id=&startDate=&endDate=&source_lang=zh_CN
+ */
+
+export function GetSalesReturnOrderList(params) {
+  return http({
+    url: "/shop/shop-order-return/list",
+    method: "get",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/**
+ * 获取退货订单详情
+ * @author Seven
+ * @data 2025-3-28
+ * @param {
+ *  return_id: FX-20241223-4  退货订单编号
+ *  }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-order-return/get?return_id=FX-20241223-4&source_lang=zh_CN
+ */
+
+export function GetSalesReturnOrderDetails(params) {
+  return http({
+    url: "/shop/shop-order-return/get",
+    method: "get",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/**
+ * 退货订单不通过
+ * @author Seven
+ * @data 2025-3-28
+ * @param {
+ *  return_store_message: "" , 备注
+ *  return_id: FX-20241223-4  退货订单编号
+ *  }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-order-return/refused?source_lang=zh_CN
+ */
+
+export function GetSalesReturnOrderNoPass(params) {
+  return http({
+    url: "/shop/shop-order-return/refused",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/**
+ * 退货订单不通过
+ * @author Seven
+ * @data 2025-3-28
+ * @param {
+ *  return_flag： 0 不用退货 1需要退货
+ *  return_store_message: "" , 备注
+ *  receiving_address：2
+ *  return_id: FX-20241223-4  退货订单编号
+ *  }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-order-return/review?source_lang=zh_CN
+ */
+
+export function GetSalesReturnOrderPass(params) {
+  return http({
+    url: "/shop/shop-order-return/review",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
 /**
  * 获取订单列表 模拟数据
  **/
diff --git a/java-mall-app-shop-admin/api/warehouse/productList.js b/java-mall-app-shop-admin/api/warehouse/productList.js
new file mode 100644
index 0000000..6aafee6
--- /dev/null
+++ b/java-mall-app-shop-admin/api/warehouse/productList.js
@@ -0,0 +1,72 @@
+import http from "../../utils/http";
+import config from "../../config/config";
+
+/** 获取店铺商品分类
+ *
+ * @author Seven
+ * @data 2025-7-4
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-base-product-category/tree?source_lang=zh_CN
+ */
+
+export function GetProductCategoryTree() {
+  return http({
+    url: "/shop/shop-base-product-category/tree",
+    method: "get",
+    baseURL: config.adminApi,
+  });
+}
+
+/** 获取店铺商品列表
+ *
+ * @author Seven
+ * @data 2025-7-4
+ * @param { pageNum  pageSize kind_id product_src category_id }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-base/list?pageNum=1&pageSize=20&kind_id=1201,1202,1203&product_src=false&category_id=&source_lang=zh_CN
+ */
+
+export function GetProductList(params) {
+  return http({
+    url: "/shop/shop-product-base/list",
+    method: "get",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/** 更新商品上下架
+ *
+ * @author Seven
+ * @data 2025-7-6
+ * @param { pageNum  pageSize kind_id product_src category_id }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-base/editState?source_lang=zh_CN
+ */
+
+export function UpdateProductPutaway(params) {
+  return http({
+    url: "/shop/shop-product-base/editState",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
+
+/** 删除商品
+ *
+ * @author Seven
+ * @data 2025-7-6
+ * @param { product_id }
+ * @returns {  }
+ * @see https://mall.gpxscs.cn/api/admin/shop/shop-product-base/deleteBatch
+ */
+
+export function DelectCommodity(params) {
+  return http({
+    url: "/shop/shop-product-base/deleteBatch",
+    method: "post",
+    params,
+    baseURL: config.adminApi,
+  });
+}
diff --git a/java-mall-app-shop-admin/components/tabbar/tabbar.vue b/java-mall-app-shop-admin/components/tabbar/tabbar.vue
index 34a5283..567f497 100644
--- a/java-mall-app-shop-admin/components/tabbar/tabbar.vue
+++ b/java-mall-app-shop-admin/components/tabbar/tabbar.vue
@@ -25,6 +25,22 @@
           color="#000"
         ></u-icon>
       </u-tabbar-item>
+      <u-tabbar-item text="经营" name="warehouse">
+        <u-icon
+          class="u-icon"
+          custom-prefix="custom-icon-jingyingguanli custom-icon"
+          size="22"
+          slot="active-icon"
+          color="#fe4119"
+        ></u-icon>
+        <u-icon
+          class="u-icon"
+          custom-prefix="custom-icon-jingyingguanli custom-icon"
+          size="22"
+          slot="inactive-icon"
+          color="#000"
+        ></u-icon>
+      </u-tabbar-item>
       <u-tabbar-item text="消息" name="IM" :badge="weiduNum">
         <u-icon
           class="u-icon"
@@ -142,8 +158,14 @@ export default {
             url: "/pages/order/order",
           });
           break;
+        case "warehouse":
+          uni.switchTab({
+            url: "/pages/warehouse/warehouse",
+          });
+          break;
         case "IM":
           // #ifdef APP-PLUS
+          // 获取权限
           let result = await permission.premissionCheck(
             "CAMERA_EXTERNAL_STORAGE_RECORD_AUDIO"
           ); //使用
diff --git a/java-mall-app-shop-admin/components/tui-gallery/tui-gallery.vue b/java-mall-app-shop-admin/components/tui-gallery/tui-gallery.vue
new file mode 100644
index 0000000..f73c19a
--- /dev/null
+++ b/java-mall-app-shop-admin/components/tui-gallery/tui-gallery.vue
@@ -0,0 +1,212 @@
+<template>
+	<view class="tui-gallery" :class="{'tui-gallery_show':show}" @tap="hideGallery">
+		<view class="tui-gallery__info">{{currentIndex+1}}/{{getLen}}</view>
+		<swiper class="tui-gallery__img__wrap" :indicator-dots="false" @change="change" :current="defCurIndex"
+			:autoplay="false" :duration="500">
+			<swiper-item v-for="(item,index) in imgUrls" :key="index">
+				<image mode="aspectFit" class="tui-gallery__img" :src="item[srcField]"></image>
+			</swiper-item>
+		</swiper>
+		<view class="tui-gallery__desc" v-if="!showDelete">
+			{{getDesc(currentIndex,imgUrls)}}
+		</view>
+		<view class="tui-gallery__operate" hover-class="tui-opacity__del" :hover-start-time="150" @tap.stop="deleteImg"
+			v-if="showDelete">
+			删除
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiGallery',
+		emits: ['change', 'delete', 'hide'],
+		props: {
+			urls: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			srcField: {
+				type: String,
+				default: 'src'
+			},
+			descField: {
+				type: String,
+				default: 'desc'
+			},
+			showDelete: {
+				type: Boolean,
+				default: false
+			},
+			show: {
+				type: Boolean,
+				default: false
+			},
+			current: {
+				type: Number,
+				default: 0
+			},
+			hideOnClick: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			getLen() {
+				return this.imgUrls.length
+			}
+		},
+		watch: {
+			urls(newVal, oldVal) {
+				this.imgUrls = newVal
+			},
+			current(newVal) {
+				this.defCurIndex = this.currentIndex;
+				let val = Number(newVal)
+				setTimeout(() => {
+					this.defCurIndex = val;
+					this.currentIndex = val;
+				}, 20)
+			}
+		},
+		mounted() {
+			this.defCurIndex = Number(this.current);
+			this.currentIndex = this.defCurIndex;
+			this.imgUrls = this.urls;
+		},
+		data() {
+			return {
+				imgUrls: [],
+				currentIndex: 0,
+				defCurIndex: 0
+			};
+		},
+		methods: {
+			getDesc(index, imgUrls) {
+				let desc = ''
+				let item = imgUrls[index]
+				if (item) {
+					desc = item[this.descField]
+				}
+				return desc
+			},
+			change(e) {
+				this.currentIndex = e.detail.current
+				this.$emit('change', {
+					current: e.detail.current
+				});
+			},
+			deleteImg() {
+				const imgs = this.imgUrls;
+				const url = imgs.splice(this.current, 1);
+				this.$emit('delete', {
+					url: url[0],
+					index: this.current
+				});
+
+				if (imgs.length === 0) {
+					this.hideGallery();
+					return;
+				}
+
+				this.currentIndex = 0;
+				this.imgUrls = imgs
+			},
+			hideGallery() {
+				if (this.hideOnClick) {
+					this.$emit('hide', {});
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-gallery {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		background-color: #000;
+		z-index: 1000;
+		display: none;
+	}
+
+	.tui-gallery__img,
+	.tui-gallery__operate,
+	.tui-gallery__desc {
+		position: absolute;
+		left: 0;
+		left: constant(safe-area-inset-left);
+		left: env(safe-area-inset-left);
+		right: 0;
+		right: constant(safe-area-inset-right);
+		right: env(safe-area-inset-right)
+	}
+
+	.tui-gallery__img {
+		width: 100%;
+		height: 100%;
+		top: 0;
+		top: constant(safe-area-inset-top);
+		top: env(safe-area-inset-top);
+		bottom: 60px;
+		bottom: calc(60px + constant(safe-area-inset-bottom));
+		bottom: calc(60px + env(safe-area-inset-bottom));
+		background: 50% no-repeat;
+		background-size: contain
+	}
+
+	.tui-gallery__operate,
+	.tui-gallery__desc {
+		position: absolute;
+		bottom: 0;
+		padding-bottom: 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		background-color: #0d0d0d;
+		color: #fff;
+		line-height: 60px;
+		text-align: center;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		z-index: 10;
+	}
+
+
+	.tui-gallery__info {
+		color: #fff;
+		font-size: 17px;
+		line-height: 60px;
+		min-height: 60px;
+		text-align: center
+	}
+
+	.tui-gallery__img__wrap {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		position: relative;
+		font-size: 0
+	}
+
+	.tui-gallery__operate {
+		position: static
+	}
+
+	.tui-gallery_show {
+		display: flex !important;
+		flex-direction: column !important;
+		flex-wrap: nowrap !important;
+	}
+
+	.tui-opacity__del {
+		opacity: 0.5;
+	}
+</style>
diff --git a/java-mall-app-shop-admin/components/tui-navigation-bar/tui-navigation-bar.vue b/java-mall-app-shop-admin/components/tui-navigation-bar/tui-navigation-bar.vue
new file mode 100644
index 0000000..7db07ea
--- /dev/null
+++ b/java-mall-app-shop-admin/components/tui-navigation-bar/tui-navigation-bar.vue
@@ -0,0 +1,258 @@
+<template>
+	<view class="tui-navigation-bar"
+		:class="{ 'tui-bar-line': opacity > 0.85 && splitLine, 'tui-navbar-fixed': isFixed, 'tui-backdrop__filter': backdropFilter && dropDownOpacity > 0  }"
+		:style="{ height: height + 'px', background: isOpacity? `rgba(${background},${opacity})`:background, opacity: dropDownOpacity, zIndex: isFixed ? zIndex : 'auto' }">
+		<view class="tui-status-bar" :style="{ height: statusBarHeight + 'px' }" v-if="isImmersive"></view>
+		<view class="tui-navigation_bar-title"
+			:style="{ opacity: transparent || opacity >= maxOpacity ? 1 : opacity, color: color, paddingTop: top - statusBarHeight + 'px' }"
+			v-if="title && !isCustom">
+			{{ title }}
+		</view>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiNavigationBar',
+		emits: ['init', 'change'],
+		props: {
+			//NavigationBar标题
+			title: {
+				type: String,
+				default: ''
+			},
+			//NavigationBar标题颜色
+			color: {
+				type: String,
+				default: '#333'
+			},
+			//NavigationBar背景颜色,不支持rgb
+			backgroundColor: {
+				type: String,
+				default: '#fff'
+			},
+			//是否需要分割线
+			splitLine: {
+				type: Boolean,
+				default: false
+			},
+			//是否设置不透明度
+			isOpacity: {
+				type: Boolean,
+				default: true
+			},
+			//不透明度最大值 0-1
+			maxOpacity: {
+				type: [Number, String],
+				default: 1
+			},
+			//背景透明 【设置该属性，则背景透明，只出现内容，isOpacity和maxOpacity失效】
+			transparent: {
+				type: Boolean,
+				default: false
+			},
+			//滚动条滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+			/*
+				 isOpacity 为true时生效
+				 opacity=scrollTop /windowWidth * scrollRatio
+				*/
+			scrollRatio: {
+				type: [Number, String],
+				default: 0.3
+			},
+			//是否自定义header内容
+			isCustom: {
+				type: Boolean,
+				default: false
+			},
+			//是否沉浸式
+			isImmersive: {
+				type: Boolean,
+				default: true
+			},
+			isFixed: {
+				type: Boolean,
+				default: true
+			},
+			//是否开启高斯模糊效果[仅在支持的浏览器有效果]
+			backdropFilter: {
+				type: Boolean,
+				default: false
+			},
+			//下拉隐藏NavigationBar，主要针对有回弹效果ios端
+			dropDownHide: {
+				type: Boolean,
+				default: false
+			},
+			//z-index设置
+			zIndex: {
+				type: [Number, String],
+				default: 996
+			}
+		},
+		watch: {
+			scrollTop(newValue, oldValue) {
+				if (this.isOpacity && !this.transparent) {
+					this.opacityChange();
+				}
+			},
+			backgroundColor(val) {
+				if (val) {
+					if (this.isOpacity) {
+						this.background = this.hexToRgb(val);
+					} else {
+						this.background = this.transparent ? 'rgba(0, 0, 0, 0)' : val
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				width: 375, //header宽度
+				left: 375, //小程序端 左侧距胶囊按钮距离
+				height: 44, //header高度
+				top: 0,
+				scrollH: 1, //滚动总高度,计算opacity
+				opacity: 1, //0-1
+				statusBarHeight: 0, //状态栏高度
+				background: '255,255,255', //header背景色
+				dropDownOpacity: 1
+			};
+		},
+		created() {
+			this.dropDownOpacity = this.backdropFilter && 0;
+			this.opacity = this.isOpacity || this.transparent ? 0 : this.maxOpacity;
+			if (this.isOpacity) {
+				this.background = this.hexToRgb(this.backgroundColor);
+			} else {
+				this.background = this.transparent ? 'rgba(0, 0, 0, 0)' : this.backgroundColor
+			}
+			let obj = {};
+			// #ifdef MP-WEIXIN
+			obj = wx.getMenuButtonBoundingClientRect();
+			// #endif
+			// #ifdef MP-BAIDU
+			obj = swan.getMenuButtonBoundingClientRect();
+			// #endif
+			// #ifdef MP-ALIPAY
+			my.hideAddToDesktopMenu();
+			// #endif
+			uni.getSystemInfo({
+				success: res => {
+					this.statusBarHeight = res.statusBarHeight;
+					this.width = res.windowWidth;
+					this.left = obj.left || res.windowWidth;
+					if (this.isImmersive) {
+						this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44;
+					}
+					this.scrollH = res.windowWidth * this.scrollRatio;
+					this.top = obj.top ? obj.top + (obj.height - 32) / 2 : res.statusBarHeight + 6;
+					this.$emit('init', {
+						width: this.width,
+						height: this.height,
+						left: this.left,
+						top: this.top,
+						statusBarHeight: this.statusBarHeight,
+						opacity: this.opacity,
+						windowHeight: res.windowHeight
+					});
+				}
+			});
+		},
+		methods: {
+			hexToRgb(hex) {
+				let rgb = '255,255,255';
+				if (hex && ~hex.indexOf('#')) {
+					if (hex.length === 4) {
+						let text = hex.substring(1, 4);
+						hex = '#' + text + text;
+					}
+					let result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+					if (result) {
+						rgb = `${parseInt(result[1], 16)},${parseInt(result[2], 16)},${parseInt(result[3], 16)}`;
+					}
+				}
+				return rgb;
+			},
+			opacityChange() {
+				if (this.dropDownHide) {
+					if (this.scrollTop < 0) {
+						if (this.dropDownOpacity > 0) {
+							this.dropDownOpacity = 1 - Math.abs(this.scrollTop) / 30;
+						}
+					} else {
+						this.dropDownOpacity = 1;
+					}
+				}
+
+				let scroll = this.scrollTop <= 1 ? 0 : this.scrollTop;
+				let opacity = scroll / this.scrollH;
+				if ((this.opacity >= this.maxOpacity && opacity >= this.maxOpacity) || (this.opacity == 0 && opacity ==
+						0)) {
+					return;
+				}
+				this.opacity = opacity > this.maxOpacity ? this.maxOpacity : opacity;
+				if (this.backdropFilter) {
+					this.dropDownOpacity = this.opacity >= this.maxOpacity ? 1 : this.opacity;
+				}
+				this.$emit('change', {
+					opacity: this.opacity
+				});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-navigation-bar {
+		width: 100%;
+		transition: opacity 0.4s;
+	}
+
+	.tui-backdrop__filter {
+		/* Safari for macOS & iOS */
+		-webkit-backdrop-filter: blur(15px);
+		/* Google Chrome */
+		backdrop-filter: blur(15px);
+	}
+
+	.tui-navbar-fixed {
+		position: fixed;
+		left: 0;
+		top: 0;
+		transform: translateZ(0);
+	}
+
+	.tui-status-bar {
+		width: 100%;
+	}
+
+	.tui-navigation_bar-title {
+		width: 100%;
+		font-size: 17px;
+		line-height: 17px;
+		/* #ifndef APP-PLUS */
+		font-weight: 500;
+		/* #endif */
+		height: 32px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tui-bar-line::after {
+		content: '';
+		position: absolute;
+		border-bottom: 1rpx solid #eaeef1;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/java-mall-app-shop-admin/components/tui-upload/tui-upload.vue b/java-mall-app-shop-admin/components/tui-upload/tui-upload.vue
new file mode 100644
index 0000000..1b7fadf
--- /dev/null
+++ b/java-mall-app-shop-admin/components/tui-upload/tui-upload.vue
@@ -0,0 +1,613 @@
+<template>
+	<view class="tui-upload__container">
+		<view class="tui-upload-box">
+			<view class="tui-image-item" :style="{width:width+'rpx',height:height+'rpx',borderRadius:radius+'rpx'}"
+				v-for="(item,index) in imageList" :key="index">
+				<image :src="item" class="tui-item-img"
+					:style="{width:width+'rpx',height:height+'rpx',borderRadius:radius+'rpx'}"
+					@tap.stop="previewImage(index)" mode="aspectFill"></image>
+				<view v-if="!forbidDel" class="tui-img-del" :style="{background:getDelColor}"
+					@tap.stop="delImage(index)">
+				</view>
+				<view v-if="statusArr[index]!=1" class="tui-upload-mask">
+					<view class="tui-upload-loading" v-if="statusArr[index]==2"></view>
+					<text class="tui-tips">{{statusArr[index]==2?'上传中...':'上传失败'}}</text>
+					<view class="tui-mask-btn" v-if="statusArr[index]==3" @tap.stop="reUpLoad(index)"
+						hover-class="tui-btn-hover" :hover-stay-time="150">重新上传</view>
+				</view>
+			</view>
+			<view v-if="isShowAdd" class="tui-upload-add"
+				:class="[borderColor!=='transparent'?'tui-upload__border':'tui-upload__unborder']"
+				:style="{width:width+'rpx',height:height+'rpx',background:background,borderRadius:radius+'rpx',borderColor:borderColor,borderStyle:borderSytle}"
+				@tap="chooseImage">
+				<slot>
+					<view class="tui-upload-icon tui-icon-plus" :style="{color:addColor,fontSize:addSize+'rpx'}"></view>
+				</slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiUpload',
+		emits: ['remove', 'complete', 'reupload'],
+		props: {
+			//展示图片宽度
+			width: {
+				type: [Number, String],
+				default: 218
+			},
+			//展示图片高度
+			height: {
+				type: [Number, String],
+				default: 218
+			},
+			//初始化图片路径
+			value: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			//2.3.0+
+			radius: {
+				type: [Number, String],
+				default: 0
+			},
+			//2.3.0+
+			background: {
+				type: String,
+				default: '#F7F7F7'
+			},
+			//2.3.0+
+			borderColor: {
+				type: String,
+				default: 'transparent'
+			},
+			//2.3.0+
+			//solid、dashed、dotted
+			borderSytle: {
+				type: String,
+				default: 'dashed'
+			},
+			//2.3.0+
+			delColor: {
+				type: String,
+				default: ''
+			},
+			//删除图片前是否弹框确认
+			delConfirm: {
+				type: Boolean,
+				default: false
+			},
+			//禁用删除
+			forbidDel: {
+				type: Boolean,
+				default: false
+			},
+			//V2.9.6+ 删除图片是否触发 @complete 事件
+			delTrigger:{
+				type: Boolean,
+				default: true
+			},
+			//2.3.0+
+			addColor: {
+				type: String,
+				default: '#888'
+			},
+			//2.3.0+
+			addSize: {
+				type: [Number, String],
+				default: 68
+			},
+			//禁用添加
+			forbidAdd: {
+				type: Boolean,
+				default: false
+			},
+			//服务器接口地址。当接口地址为空时，直接返回本地图片地址
+			serverUrl: {
+				type: String,
+				default: ""
+			},
+			//限制数
+			limit: {
+				type: Number,
+				default: 9
+			},
+			//original 原图，compressed 压缩图，默认二者都有
+			sizeType: {
+				type: Array,
+				default () {
+					return ['original', 'compressed']
+				}
+			},
+			//album 从相册选图，camera 使用相机，默认二者都有。如需直接开相机或直接选相册，请只使用一个选项
+			sourceType: {
+				type: Array,
+				default () {
+					return ['album', 'camera']
+				}
+			},
+			//可上传图片类型，默认为空，不限制  Array<String> ['jpg','png','gif']
+			imageFormat: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			//单张图片大小限制 MB 
+			size: {
+				type: Number,
+				default: 4
+			},
+			//文件对应的key，默认为 file
+			fileKeyName: {
+				type: String,
+				default: "file"
+			},
+			//HTTP 请求 Header, header 中不能设置 Referer。
+			header: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			//HTTP 请求中其他额外的 form data
+			formData: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			//自定义参数
+			params: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		data() {
+			return {
+				//图片地址
+				imageList: [],
+				tempFiles: [],
+				//上传状态：1-上传成功 2-上传中 3-上传失败
+				statusArr: [],
+				//传入回调函数上传
+				callUpload: false
+			}
+		},
+		created() {
+			this.initImages()
+		},
+		watch: {
+			value(val) {
+				if (val) {
+					this.initImages()
+				}
+			}
+		},
+		computed: {
+			isShowAdd() {
+				let isShow = true;
+				if (this.forbidAdd || (this.limit && this.imageList.length >= this.limit)) {
+					isShow = false;
+				}
+				return isShow
+			},
+			getDelColor() {
+				return this.delColor || (uni && uni.$tui && uni.$tui.color.danger) || '#EB0909';
+			}
+		},
+		methods: {
+			initImages() {
+				this.statusArr = [];
+				this.imageList = [...this.value];
+				let tempFiles = []
+				for (let item of this.imageList) {
+					this.statusArr.push("1")
+					tempFiles.push({
+						path: item
+					})
+				}
+				this.tempFiles = tempFiles;
+			},
+			// 重新上传
+			reUpLoad(index) {
+				this.$set(this.statusArr, index, "2")
+				this.$emit('reupload', {
+					index
+				})
+				if (!this.callUpload) {
+					this.uploadImage(index, this.imageList[index]).then(() => {
+						this.change()
+					}).catch(() => {
+						this.change()
+					})
+				}
+			},
+			/**
+			 * @param manual 是否手动上传
+			 **/
+			change(manual = false) {
+				let status = ~this.statusArr.indexOf("2") ? 2 : 1
+				if (status != 2 && ~this.statusArr.indexOf("3")) {
+					// 上传失败
+					status = 3
+				}
+				this.$emit('complete', {
+					status: status,
+					imgArr: this.imageList,
+					params: this.params,
+					manual: manual
+				})
+			},
+			toast(text) {
+				text && uni.showToast({
+					title: text,
+					icon: "none"
+				});
+			},
+			chooseImage: function() {
+				let _this = this;
+				uni.chooseImage({
+					count: _this.limit - _this.imageList.length,
+					sizeType: _this.sizeType,
+					sourceType: _this.sourceType,
+					success: function(e) {
+						let imageArr = [];
+						for (let i = 0; i < e.tempFiles.length; i++) {
+							let len = _this.imageList.length;
+							if (len >= _this.limit) {
+								_this.toast(`最多可上传${_this.limit}张图片`);
+								break;
+							}
+							//过滤图片类型
+							let path = e.tempFiles[i].path;
+
+							if (_this.imageFormat.length > 0) {
+								let format = ""
+								// #ifdef H5
+								let type = e.tempFiles[i].type;
+								format = type.split('/')[1]
+								// #endif
+
+								// #ifndef H5
+								format = path.split(".")[(path.split(".")).length - 1];
+								// #endif
+
+								if (_this.imageFormat.indexOf(format) == -1) {
+									let text = `只能上传 ${_this.imageFormat.join(',')} 格式图片！`
+									_this.toast(text);
+									continue;
+								}
+							}
+
+							//过滤超出大小限制图片
+							let size = e.tempFiles[i].size;
+
+							if (_this.size * 1024 * 1024 < size) {
+								let err = `单张图片大小不能超过：${_this.size}MB`
+								_this.toast(err);
+								continue;
+							}
+							imageArr.push(path)
+							_this.imageList.push(path)
+							_this.tempFiles.push(e.tempFiles[i])
+							_this.statusArr.push("2")
+						}
+						_this.change()
+
+						let start = _this.imageList.length - imageArr.length
+						for (let j = 0; j < imageArr.length; j++) {
+							let index = start + j
+							//服务器地址
+							if (_this.serverUrl) {
+								_this.uploadImage(index, imageArr[j]).then(() => {
+									_this.change()
+								}).catch(() => {
+									_this.change()
+								})
+							} else {
+								//无服务器地址则直接返回成功
+								_this.$set(_this.statusArr, index, "1")
+								_this.change()
+							}
+						}
+					}
+				})
+			},
+			uploadImage: function(index, url, serverUrl) {
+				let _this = this;
+				return new Promise((resolve, reject) => {
+					uni.uploadFile({
+						url: this.serverUrl || serverUrl,
+						name: this.fileKeyName,
+						header: this.header,
+						formData: this.formData,
+						filePath: url,
+						success: function(res) {
+							if (res.statusCode == 200) {
+								//返回结果 此处需要按接口实际返回进行修改
+								let d = JSON.parse(res.data.replace(/\ufeff/g, "") || "{}")
+								//判断code，以实际接口规范判断
+								if (d.code % 100 === 0) {
+									// 上传成功 d.url 为上传后图片地址，以实际接口返回为准
+									d.url && (_this.imageList[index] = d.url)
+									_this.$set(_this.statusArr, index, d.url ? "1" : "3")
+								} else {
+									// 上传失败
+									_this.$set(_this.statusArr, index, "3")
+								}
+								resolve(index)
+							} else {
+								_this.$set(_this.statusArr, index, "3")
+								reject(index)
+							}
+						},
+						fail: function(res) {
+							_this.$set(_this.statusArr, index, "3")
+							reject(index)
+						}
+					})
+				})
+
+			},
+			delImage: function(index) {
+				let that = this
+				if (this.delConfirm) {
+					uni.showModal({
+						title: '提示',
+						content: '确认删除该图片吗？',
+						showCancel: true,
+						cancelColor: "#555",
+						confirmColor: "#eb0909",
+						confirmText: "确定",
+						success(res) {
+							if (res.confirm) {
+								that.imageList.splice(index, 1)
+								that.tempFiles.splice(index, 1)
+								that.statusArr.splice(index, 1)
+								that.$emit("remove", {
+									index: index,
+									params: that.params
+								})
+								that.delTrigger && that.change()
+							}
+						}
+					})
+				} else {
+					that.imageList.splice(index, 1)
+					that.tempFiles.splice(index, 1)
+					that.statusArr.splice(index, 1)
+					that.$emit("remove", {
+						index: index,
+						params: that.params
+					})
+					that.delTrigger && that.change()
+				}
+			},
+			previewImage: function(index) {
+				if (!this.imageList.length) return;
+				uni.previewImage({
+					current: this.imageList[index],
+					loop: true,
+					urls: this.imageList
+				})
+			},
+			/**
+			 * 当属性serverUrl传空时，父级调用该方法一次性上传所有图片
+			 * @param serverUrl 服务器接口地址
+			 **/
+			uploadAllImage(serverUrl) {
+				if (!serverUrl) {
+					this.toast('服务器接口地址不能为空！');
+					return;
+				}
+				let imageArr = [...this.imageList]
+				const len = imageArr.length
+				for (let i = 0; i < len; i++) {
+					//如果是服务器地址图片则无需再次上传
+					if (imageArr[i].startsWith('https')) {
+						continue;
+					} else {
+						this.$set(this.statusArr, i, "2")
+						this.uploadImage(i, imageArr[i], serverUrl).then(() => {
+							if (i === len - 1) {
+								this.change(true)
+							}
+						}).catch(() => {
+							if (i === len - 1) {
+								this.change(true)
+							}
+						})
+					}
+				}
+			},
+			upload(callback, index) {
+				// 传入一个返回Promise的文件上传的函数
+				//上传状态：1-上传成功 2-上传中 3-上传失败
+				this.callUpload = true;
+				if (index === undefined || index === null) {
+					let urls = [...this.imageList]
+					const len = urls.length
+					for (let i = 0; i < len; i++) {
+						if (urls[i].startsWith('https')) {
+							continue;
+						} else {
+							this.$set(this.statusArr, i, "2")
+							if (typeof callback === 'function') {
+								callback(this.tempFiles[i]).then(res => {
+									this.$set(this.statusArr, i, '1')
+									this.imageList[i] = res
+									this.change(true)
+								}).catch(err => {
+									this.$set(this.statusArr, i, '3')
+								})
+							}
+						}
+					}
+				} else {
+					//如果传入index，则是重新上传时调用
+					this.$set(this.statusArr, index, "2")
+					if (typeof callback === 'function') {
+						callback(this.tempFiles[index]).then(res => {
+							this.$set(this.statusArr, index, '1')
+							this.imageList[index] = res
+							this.change(true)
+						}).catch(err => {
+							this.$set(this.statusArr, index, '3')
+						})
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@font-face {
+		font-family: 'tuiUpload';
+		src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAATcAA0AAAAAByQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAEwAAAABoAAAAciR52BUdERUYAAASgAAAAHgAAAB4AKQALT1MvMgAAAaAAAABCAAAAVjxvR/tjbWFwAAAB+AAAAEUAAAFK5ibpuGdhc3AAAASYAAAACAAAAAj//wADZ2x5ZgAAAkwAAADXAAABAAmNjcZoZWFkAAABMAAAAC8AAAA2FpiS+WhoZWEAAAFgAAAAHQAAACQH3QOFaG10eAAAAeQAAAARAAAAEgwAACBsb2NhAAACQAAAAAwAAAAMAEoAgG1heHAAAAGAAAAAHwAAACABEgA2bmFtZQAAAyQAAAFJAAACiCnmEVVwb3N0AAAEcAAAACgAAAA6OMUs4HjaY2BkYGAAYo3boY/i+W2+MnCzMIDAzb3qdQj6fwPzf+YGIJeDgQkkCgA/KAtvAHjaY2BkYGBu+N/AEMPCAALM/xkYGVABCwBZ4wNrAAAAeNpjYGRgYGBl0GJgZgABJiDmAkIGhv9gPgMADTABSQB42mNgZGFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDA7PGJ9xMjf8b2CIYW5gaAAKM4LkANt9C+UAAHjaY2GAABYIVmBgAAAA+gAtAAAAeNpjYGBgZoBgGQZGBhBwAfIYwXwWBg0gzQakGRmYnjE+4/z/n4EBQksxSf6GqgcCRjYGOIeRCUgwMaACRoZhDwCiLwmoAAAAAAAAAAAAAAAASgCAeNpdjkFKw0AARf/vkIR0BkPayWRKQZtYY90ohJju2kOIbtz0KD1HVm50UfEmWXoAr9ADOHFARHHzeY//Fx8Ci+FJfIgdJFa4AhgiMshbrCuIsLxhFJZVs+Vl1bT1GddtbXTC3OhohN4dg4BJ3zMJAnccyfm468ZzHXddrH9ZKbHzdf9n/vkY/xv9sPQXgGEvBrHHwst5kTbXLE+YpYVPkxepPmW94W16UbdNJd6f3SAzo5W7m1jaKd+8ZZIvk5nlKw9SK6Wle7BLS3f/bTzQLmfAF2T1NsQAeNp9kD1OAzEQhZ/zByQSQiCoXVEA2vyUKRMp9Ailo0g23pBo1155nUg5AS0VB6DlGByAGyDRcgpelkmTImvt6PObmeexAZzjGwr/3yXuhBWO8ShcwREy4Sr1F+Ea+V24jhY+hRvUf4SbuFUD4RYu1BsdVO2Eu5vSbcsKZxgIV3CKJ+Eq9ZVwjfwqXMcVPoQb1L+EmxjjV7iFa2WpDOFhMEFgnEFjig3jAjEcLJIyBtahOfRmEsxMTzd6ETubOBso71dilwMeaDnngCntPbdmvkon/mDLgdSYbh4FS7YpjS4idCgbXyyc1d2oc7D9nu22tNi/a4E1x+xRDWzU/D3bM9JIbAyvkJI18jK3pBJTj2hrrPG7ZynW814IiU68y/SIx5o0dTr3bmniwOLn8owcfbS5kj33qBw+Y1kIeb/dTsQgil2GP5PYcRkAAAB42mNgYoAALjDJyIAOWMGiTIxMjMxsKak5qSWpbFmZiRmJ+QAmgAUIAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMABAABAAQAAAACAAAAAHjaY2BgYGQAgqtL1DlA9M296nUwGgA+8QYgAAA=) format('woff');
+		font-weight: normal;
+		font-style: normal;
+	}
+
+	.tui-upload-icon {
+		font-family: "tuiUpload" !important;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+		padding: 10rpx;
+	}
+
+	.tui-icon-delete:before {
+		content: "\e601";
+	}
+
+	.tui-icon-plus:before {
+		content: "\e609";
+	}
+
+	.tui-upload-box {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.tui-upload-add {
+		font-weight: 100;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0;
+		overflow: hidden;
+		box-sizing: border-box;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.tui-upload__unborder {
+		border-width: 0;
+	}
+
+	.tui-upload__border {
+		border-width: 1px;
+	}
+
+	.tui-image-item {
+		position: relative;
+		margin-right: 20rpx;
+		margin-bottom: 20rpx;
+		flex-shrink: 0;
+	}
+
+	.tui-item-img {
+		display: block;
+	}
+
+	.tui-img-del {
+		width: 36rpx;
+		height: 36rpx;
+		position: absolute;
+		right: -12rpx;
+		top: -12rpx;
+		border-radius: 50%;
+		color: white;
+		font-size: 34rpx;
+		z-index: 5;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.tui-img-del::before {
+		content: '';
+		width: 16rpx;
+		height: 1px;
+		position: absolute;
+		left: 10rpx;
+		top: 18rpx;
+		background-color: #fff;
+	}
+
+	.tui-upload-mask {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 40rpx 0;
+		box-sizing: border-box;
+		background-color: rgba(0, 0, 0, 0.6);
+		z-index: 3;
+	}
+
+	.tui-upload-loading {
+		width: 28rpx;
+		height: 28rpx;
+		border-radius: 50%;
+		border: 2px solid;
+		border-color: #B2B2B2 #B2B2B2 #B2B2B2 #fff;
+		animation: tui-rotate 0.7s linear infinite;
+	}
+
+	@keyframes tui-rotate {
+		0% {
+			transform: rotate(0);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.tui-tips {
+		font-size: 26rpx;
+		color: #fff;
+	}
+
+	.tui-mask-btn {
+		padding: 4rpx 16rpx;
+		border-radius: 40rpx;
+		text-align: center;
+		font-size: 24rpx;
+		color: #fff;
+		border: 1px solid #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+		margin-top: 26rpx;
+	}
+
+	.tui-btn-hover {
+		opacity: 0.8;
+	}
+</style>
\ No newline at end of file
diff --git a/java-mall-app-shop-admin/pages.json b/java-mall-app-shop-admin/pages.json
index 4410740..e43654a 100644
--- a/java-mall-app-shop-admin/pages.json
+++ b/java-mall-app-shop-admin/pages.json
@@ -1,6 +1,5 @@
 {
   "pages": [
-    //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
     {
       "path": "pages/login/launch",
       "style": {
@@ -91,8 +90,6 @@
       "path": "pages/order/order",
       "style": {
         "navigationStyle": "custom"
-        // "onReachBottomDistance": 105,
-        // "enablePullDownRefresh": true
       }
     },
     {
@@ -197,6 +194,42 @@
         "navigationBarTitleText": "网址"
       }
     },
+    {
+      "path": "pages/warehouse/warehouse",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/warehouse/manage/productList",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/warehouse/manage/brandList",
+      "style": {
+        "navigationBarTitleText": "品牌管理"
+      }
+    },
+    {
+      "path": "pages/warehouse/manage/photoGallery",
+      "style": {
+        "navigationBarTitleText": "商品图库"
+      }
+    },
+    {
+      "path": "pages/warehouse/manage/classifyList",
+      "style": {
+        "navigationBarTitleText": "分类管理"
+      }
+    },
+    {
+      "path": "pages/warehouse/manage/batch",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/my/versions",
       "style": {
@@ -232,6 +265,17 @@
         },
         "text": "工作台"
       },
+      {
+        "pagePath": "pages/warehouse/warehouse",
+        "iconfont": {
+          "text": "\ue606",
+          "selectedText": "\ue606",
+          "selectedColor": "#fe4119",
+          "color": "#000",
+          "fontSize": "20px"
+        },
+        "text": "经营"
+      },
       {
         "pagePath": "pages/IM/IM",
         "iconfont": {
diff --git a/java-mall-app-shop-admin/pages/audit/checkAudit.vue b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
index 8956c3a..c8839dc 100644
--- a/java-mall-app-shop-admin/pages/audit/checkAudit.vue
+++ b/java-mall-app-shop-admin/pages/audit/checkAudit.vue
@@ -315,10 +315,9 @@
             class="id-radio-group"
             @change="handelRaddio"
           >
-            <view v-for="(item, index) in radioItems">
+            <view v-for="(item, index) in radioItems" :key="index">
               <tui-radio
                 class="id-radio"
-                :key="index"
                 :checked="item.checked"
                 :value="item.value"
                 color="#07c160"
@@ -368,12 +367,12 @@
           placeholder="搜索开户银行关键词"
           @change="onBranchBankChange"
         />
-        <div class="branch_list">
+        <view class="branch_list">
           <template v-if="bankList.length">
             <view
               class="branch_list_item"
               v-for="(item, index) in bankList"
-              :key="item.id"
+              :key="item.id + index"
               @click="onBankSelect(item, $event)"
             >
               {{ item.branch_bank_name }}
@@ -387,7 +386,7 @@
               <view class="tit">数据加载中...</view>
             </template>
           </view>
-        </div>
+        </view>
       </u-popup>
       <u-datetime-picker
         :show="showStartTime"
@@ -580,17 +579,11 @@ export default {
     async getAuditInfo() {
       if (this.isContractSigningaPageTo) return;
 
-
-
       var params = {};
 
-      let isContain = this.userInfo.user_mobile.indexOf("86");
-
-      if (isContain != -1 && this.userInfo.user_mobile.length > 11) {
-        params.mobile = this.userInfo.user_mobile.slice(2);
-      } else {
-        params.mobile = this.userInfo.user_mobile;
-      }
+      params.mobile = this.userInfo.user_mobile.startsWith("+86")
+        ? this.userInfo.user_mobile.replace("+86", "")
+        : this.userInfo.user_mobile;
 
       let res = await GetAuditInfo(params);
       if (res && res.status == 200) {
@@ -602,11 +595,11 @@ export default {
           approval_invalid_col: [],
         };
 
-        if(this.isPassAudit){
-            uni.switchTab({
-              url: "/pages/order/order",
-            });
-          return 
+        if (this.isPassAudit) {
+          uni.switchTab({
+            url: "/pages/order/order",
+          });
+          return;
         }
 
         if (!res.data || res.data.approval_status == 4) {
@@ -818,7 +811,7 @@ export default {
           var ocr = await this.getOcrText(
             imgUrl,
             fileImg,
-            orcImgTypeConf.ID_CARD_FRONT
+            orcImgTypeConf.FR_ID_CARD_FRONT
           );
           this.auditInfo.approval_invalid_col.forEach((item) => {
             if (
@@ -1058,23 +1051,24 @@ export default {
 
         const batchNoRes = await batchNoApi(filePath, file, type);
         const batchNo = batchNoRes.batchNo;
+        // 兼容多端的表单数据处理方式
+        let formDataStr;
+        //#ifdef H5
         const formData = new FormData();
-        let formDataStr = "";
-
         formData.append("batchNo", batchNo);
         formData.append("imgType", type);
+        formDataStr = new URLSearchParams(formData).toString();
+        //#endif
+
+        //#ifdef APP-PLUS
+        formDataStr = `batchNo=${encodeURIComponent(
+          batchNo
+        )}&imgType=${encodeURIComponent(type)}`;
+        //#endif
 
         clearTimeout(this.orcTimeout);
 
         this.orcTimeout = setTimeout(async () => {
-          formData.forEach((value, key) => {
-            if (formDataStr !== "") {
-              formDataStr += "&";
-            }
-            formDataStr +=
-              encodeURIComponent(key) + "=" + encodeURIComponent(value);
-          });
-
           const imgOcrRes = await imgOcrResultApi(formDataStr);
           clearTimeout(this.orcTimeout);
           resolve(imgOcrRes?.data);
diff --git a/java-mall-app-shop-admin/pages/audit/mapAddress.vue b/java-mall-app-shop-admin/pages/audit/mapAddress.vue
index 9bbb22b..cb94598 100644
--- a/java-mall-app-shop-admin/pages/audit/mapAddress.vue
+++ b/java-mall-app-shop-admin/pages/audit/mapAddress.vue
@@ -166,7 +166,6 @@ export default {
 
           this.searchAddressList.forEach((item) => {
             if (item.name.indexOf(value) >= 0) {
-              console.log("aa");
               item.searchName = item.name.replace(
                 new RegExp(value, "g"),
                 "<font style='color:#ee852f;padding:0 4px'>" + value + "</font>"
diff --git a/java-mall-app-shop-admin/pages/audit/shop1.vue b/java-mall-app-shop-admin/pages/audit/shop1.vue
index 74a60e0..806bbb8 100644
--- a/java-mall-app-shop-admin/pages/audit/shop1.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop1.vue
@@ -326,15 +326,9 @@ export default {
           let userInfo = uni.getStorageSync("userInfo");
           let locationItem = uni.getStorageSync("locationItem");
 
-          // userInfo.user_mobile = userInfo.user_mobile.slice(2);
-
-          let isContain = userInfo.user_mobile.indexOf("86");
-
-          if (isContain != -1 && userInfo.user_mobile.length > 11) {
-            params.mobile = userInfo.user_mobile.slice(2);
-          } else {
-            params.mobile = userInfo.user_mobile;
-          }
+          params.mobile = userInfo.user_mobile.startsWith("+86")
+            ? userInfo.user_mobile.replace("+86", "")
+            : userInfo.user_mobile;
 
           const storeArea =
             locationItem.administrativeRegion.label[0] +
diff --git a/java-mall-app-shop-admin/pages/audit/shop2.vue b/java-mall-app-shop-admin/pages/audit/shop2.vue
index 0c0608e..109472c 100644
--- a/java-mall-app-shop-admin/pages/audit/shop2.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop2.vue
@@ -483,7 +483,7 @@ const orcImgTypeConf = {
   ID_CARD_FRONT: "ID_CARD_FRONT", // 个人身份证正面
   ID_CARD_BEHIND: "ID_CARD_BEHIND", // 个人身份证反面
   BUSINESS_LICENCE: "BUSINESS_LICENCE", // 营业执照
-  BANK_CARD: "BANK_CARD",
+  BANK_CARD: "BANK_CARD", // 银行卡
 };
 
 export default {
@@ -558,7 +558,7 @@ export default {
       action: "",
       limitType: ["png", "jpg", "jpeg"], //允许的图片后缀
       fileMaxSize: 1 * 1024 * 1024, // 超出1M开启压缩
-      maxSize: 20 * 1024 * 1024, //图片最大不能超过20M
+      maxSize: 10 * 1024 * 1024, //图片最大不能超过10M
       fileMinSize: 5 * 1024, // 最小为5KB
       fileList: [],
       fileList2: [],
@@ -723,7 +723,7 @@ export default {
       uni.navigateBack();
     },
     overSize(e) {
-      uni.$u.toast("上传图片大小不能超过20MB!");
+      uni.$u.toast("上传图片大小不能超过10MB!");
     },
     compressImage(url) {
       return new Promise((reslove, reject) => {
@@ -733,6 +733,7 @@ export default {
           src: tempFilePath,
           quality: 75, //压缩的程度
           success: (res) => {
+            console.log("压缩成功", res);
             reslove(res.tempFilePath); //压缩成功返回的路径
           },
           fail: (error) => {
@@ -742,13 +743,13 @@ export default {
         });
       });
     },
+
     async getOcrText(filePath, file, type) {
       return new Promise(async (resolve, reject) => {
         this.loading = true;
         //#ifdef APP-PLUS
         try {
           filePath = await this.compressImage(filePath);
-          console.log("路径", filePath);
         } catch (error) {
           console.log(error);
         }
@@ -764,87 +765,94 @@ export default {
         console.log("OCR上图图片压缩后为：", size);
 
         //#endif
-
-        const batchNoRes = await batchNoApi(filePath, file, type);
-
-        if (!batchNoRes) {
-          this.loading = false;
-          reject(batchNoRes);
-        }
-
-        const batchNo = batchNoRes.batchNo;
-
-        const formData = new FormData();
-        let formDataStr = "";
-
-        formData.append("batchNo", batchNo);
-        formData.append("imgType", type);
-
-        clearTimeout(this.orcTimeout);
-
-        this.orcTimeout = setTimeout(async () => {
-          formData.forEach((value, key) => {
-            if (formDataStr !== "") {
-              formDataStr += "&";
-            }
-            formDataStr +=
-              encodeURIComponent(key) + "=" + encodeURIComponent(value);
-          });
-
-          const imgOcrRes = await imgOcrResultApi(formDataStr);
-          if (imgOcrRes.status == 250) {
-            switch (type) {
-              case "FR_ID_CARD_FRONT":
-                uni.showToast({
-                  title: "上传身份证正面图片错误,请重新上传",
-                  icon: "error",
-                  duration: 2000,
-                });
-                this.form.legal_person_id_images == "";
-                this.fileList3 = [];
-                break;
-              case "FR_ID_CARD_BEHIND":
-                uni.showToast({
-                  title: "上传身份证反面图片错误,请重新上传",
-                  icon: "error",
-                  duration: 2000,
-                });
-                this.form.legal_person_id_images2 == "";
-                this.fileList4 = [];
-                break;
-              case "ID_CARD_FRONT":
-                uni.showToast({
-                  title: "上传身份证正面图片错误,请重新上传",
-                  icon: "error",
-                  duration: 2000,
-                });
-                this.form2.individual_id_images == "";
-                this.fileList5 = [];
-                break;
-              case "ID_CARD_BEHIND":
-                uni.showToast({
-                  title: "上传身份证反面图片错误,请重新上传",
-                  icon: "error",
-                  duration: 2000,
-                });
-                this.form2.individual_id_images2 == "";
-                this.fileList6 = [];
-                break;
-              case "BUSINESS_LICENCE":
-                uni.showToast({
-                  title: "营业图片上传有误,请重新上传",
-                  icon: "error",
-                  duration: 2000,
-                });
-                this.form.biz_license_image == "";
-                this.fileList = [];
-                break;
-            }
+        try {
+          const batchNoRes = await batchNoApi(filePath, file, type);
+          console.log("batchNoRes", batchNoRes);
+          if (!batchNoRes) {
+            this.loading = false;
+            reject(batchNoRes);
           }
+
+          const batchNo = batchNoRes.batchNo;
+
+          // 兼容多端的表单数据处理方式
+          let formDataStr;
+          //#ifdef H5
+          const formData = new FormData();
+          formData.append("batchNo", batchNo);
+          formData.append("imgType", type);
+          formDataStr = new URLSearchParams(formData).toString();
+          //#endif
+
+          //#ifdef APP-PLUS
+          formDataStr = `batchNo=${encodeURIComponent(
+            batchNo
+          )}&imgType=${encodeURIComponent(type)}`;
+          //#endif
+
           clearTimeout(this.orcTimeout);
-          this.loading = false;
-          resolve(imgOcrRes?.data);
-        }, 1000);
+
+          this.orcTimeout = setTimeout(async () => {
+            const imgOcrRes = await imgOcrResultApi(formDataStr);
+            console.log("imgOcrRes", imgOcrRes);
+            if (imgOcrRes.status == 250) {
+              switch (type) {
+                case "FR_ID_CARD_FRONT":
+                  uni.showToast({
+                    title: "上传身份证正面图片错误,请重新上传",
+                    icon: "none",
+                    duration: 2000,
+                  });
+
+                  this.form.legal_person_id_images = "";
+                  this.fileList3.splice(0, 1);
+                  console.log(this.fileList3);
+                  break;
+                case "FR_ID_CARD_BEHIND":
+                  uni.showToast({
+                    title: "上传身份证反面图片错误,请重新上传",
+                    icon: "none",
+                    duration: 2000,
+                  });
+                  this.form.legal_person_id_images2 = "";
+                  this.fileList4.splice(0, 1);
+                  break;
+                case "ID_CARD_FRONT":
+                  uni.showToast({
+                    title: "上传身份证正面图片错误,请重新上传",
+                    icon: "none",
+                    duration: 2000,
+                  });
+                  this.form2.individual_id_images = "";
+                  this.fileList5.splice(0, 1);
+                  break;
+                case "ID_CARD_BEHIND":
+                  uni.showToast({
+                    title: "上传身份证反面图片错误,请重新上传",
+                    icon: "none",
+                    duration: 2000,
+                  });
+                  this.form2.individual_id_images2 = "";
+                  this.fileList6.splice(0, 1);
+                  break;
+                case "BUSINESS_LICENCE":
+                  uni.showToast({
+                    title: "营业图片上传有误,请重新上传",
+                    icon: "none",
+                    duration: 2000,
+                  });
+                  this.form.biz_license_image = "";
+                  this.fileList.splice(0, 1);
+                  break;
+              }
+            }
+            clearTimeout(this.orcTimeout);
+            this.loading = false;
+            resolve(imgOcrRes?.data);
+          }, 1000);
+        } catch (error) {
+          console.log(error);
+        }
       });
     },
     /**判断文件类型是否正确 */
@@ -942,8 +950,9 @@ export default {
           var ocr = await this.getOcrText(
             imgUrl,
             item,
-            orcImgTypeConf.ID_CARD_FRONT
+            orcImgTypeConf.FR_ID_CARD_FRONT
           );
+
           this.form.legal_person_name = ocr.name;
           this.form.legal_person_id_number = ocr.idNumber;
           this.form.legal_person_id_addr = ocr.address;
@@ -1367,5 +1376,15 @@ page {
     margin-right: 20rpx;
     width: 240rpx;
   }
+
+  ::v-deep.u-upload__deletable {
+    width: 40rpx;
+    height: 40rpx;
+
+    .uicon-close {
+      font-size: 28rpx !important;
+      top: 8rpx !important;
+    }
+  }
 }
 </style>
diff --git a/java-mall-app-shop-admin/pages/audit/shop3.vue b/java-mall-app-shop-admin/pages/audit/shop3.vue
index caeb1fd..c6211d5 100644
--- a/java-mall-app-shop-admin/pages/audit/shop3.vue
+++ b/java-mall-app-shop-admin/pages/audit/shop3.vue
@@ -120,12 +120,12 @@
         placeholder="搜索开户银行关键词"
         @change="onBranchBankChange"
       />
-      <div class="branch_list">
+      <view class="branch_list">
         <template v-if="bankList.length">
           <view
             class="branch_list_item"
             v-for="(item, index) in bankList"
-            :key="item.id"
+            :key="item.id + index"
             @click="onBankSelect(item, $event)"
           >
             {{ item.branch_bank_name }}
@@ -139,7 +139,7 @@
             <view class="tit">数据加载中...</view>
           </template>
         </view>
-      </div>
+      </view>
     </u-popup>
 
     <view class="btn-content">
@@ -261,7 +261,7 @@ export default {
       },
       limitType: ["png", "jpg", "jpeg"], //允许的图片后缀
       fileMaxSize: 1 * 1024 * 1024, // 超出1M开启压缩
-      maxSize: 5 * 1024 * 1024, //图片最大不能超过20M
+      maxSize: 10 * 1024 * 1024, //图片最大不能超过20M
       fileMinSize: 5 * 1024, // 最小为5KB
       showTips: false,
     };
@@ -288,7 +288,7 @@ export default {
       uni.navigateBack();
     },
     overSize(e) {
-      uni.$u.toast("上传图片大小不能超过20MB!");
+      uni.$u.toast("上传图片大小不能超过10MB!");
     },
     compressImage(url) {
       return new Promise((reslove, reject) => {
@@ -331,24 +331,24 @@ export default {
           this.bankCardOcrLoaded = true;
           reject(batchNoRes);
         }
-
+        // 兼容多端的表单数据处理方式
+        let formDataStr;
+        //#ifdef H5
         const formData = new FormData();
-        let formDataStr = "";
-
         formData.append("batchNo", batchNo);
         formData.append("imgType", type);
+        formDataStr = new URLSearchParams(formData).toString();
+        //#endif
+
+        //#ifdef APP-PLUS
+        formDataStr = `batchNo=${encodeURIComponent(
+          batchNo
+        )}&imgType=${encodeURIComponent(type)}`;
+        //#endif
 
         clearTimeout(this.orcTimeout);
 
         this.orcTimeout = setTimeout(async () => {
-          formData.forEach((value, key) => {
-            if (formDataStr !== "") {
-              formDataStr += "&";
-            }
-            formDataStr +=
-              encodeURIComponent(key) + "=" + encodeURIComponent(value);
-          });
-
           const imgOcrRes = await imgOcrResultApi(formDataStr);
 
           if (imgOcrRes?.status == 200) {
diff --git a/java-mall-app-shop-admin/pages/index/index.vue b/java-mall-app-shop-admin/pages/index/index.vue
index c6fcfd2..7582cf3 100644
--- a/java-mall-app-shop-admin/pages/index/index.vue
+++ b/java-mall-app-shop-admin/pages/index/index.vue
@@ -32,13 +32,10 @@ export default {
   onShow() {
     if (this.userInfo && Object.keys(this.userInfo).length > 0) {
       var _userinfo = JSON.parse(JSON.stringify(this.userInfo));
-      var mobile = "";
-      let isContain = _userinfo.user_mobile.indexOf("86");
-      if (isContain != -1 && _userinfo.user_mobile.length > 11) {
-        mobile = _userinfo.user_mobile.slice(2);
-      } else {
-        mobile = _userinfo.user_mobile;
-      }
+      let mobile = "";
+      mobile = _userinfo.user_mobile.startsWith("+86")
+        ? _userinfo.user_mobile.replace("+86", "")
+        : _userinfo.user_mobile;
       this.checkAccountIsPass({ userInfo: _userinfo, mobile: mobile });
     }
   },
@@ -131,7 +128,7 @@ export default {
           border: none;
         }
       }
-      
+
       .btn-register {
         &::after {
           border: none;
diff --git a/java-mall-app-shop-admin/pages/login/login.vue b/java-mall-app-shop-admin/pages/login/login.vue
index 814062d..9f595d8 100644
--- a/java-mall-app-shop-admin/pages/login/login.vue
+++ b/java-mall-app-shop-admin/pages/login/login.vue
@@ -110,10 +110,7 @@
               :maxlength="4"
             >
               <template slot="prefix">
-                <u-icon
-                  class="input_icon"
-                  name="file-text"
-                ></u-icon>
+                <u-icon class="input_icon" name="file-text"></u-icon>
               </template>
               <template slot="suffix">
                 <u--image
@@ -134,12 +131,13 @@
 
         <view class="btn-content">
           <view class="tool">
-            <view v-if="loginType == 0" class="left" @click="skipuForgetPwd"
-              >忘记密码</view
-            >
-            <view class="right" @click="skipuRegister"
-              >没有店铺? <text>立即开店</text></view
-            >
+            <view v-if="loginType == 0" class="left" @click="skipuForgetPwd">
+              忘记密码
+            </view>
+            <view class="right" @click="skipuRegister">
+              没有店铺?
+              <text>立即开店</text>
+            </view>
           </view>
           <u-button
             class="btn-login"
@@ -203,15 +201,10 @@ export default {
     if (this.userInfo && Object.keys(this.userInfo).length > 0) {
       console.log(this.userInfo);
       var _userinfo = JSON.parse(JSON.stringify(this.userInfo));
-      var mobile = "";
-
-      let isContain = _userinfo.user_mobile.indexOf("86");
-
-      if (isContain != -1 && _userinfo.user_mobile.length > 11) {
-        mobile = _userinfo.user_mobile.slice(2);
-      } else {
-        mobile = _userinfo.user_mobile;
-      }
+      let mobile = "";
+      mobile = _userinfo.user_mobile.startsWith("+86")
+        ? _userinfo.user_mobile.replace("+86", "")
+        : _userinfo.user_mobile;
 
       this.checkAccountIsPass({ userInfo: _userinfo, mobile: mobile });
 
diff --git a/java-mall-app-shop-admin/pages/my/shopQRcode/shopQRcode.vue b/java-mall-app-shop-admin/pages/my/shopQRcode/shopQRcode.vue
index 4fc56db..7628cb2 100644
--- a/java-mall-app-shop-admin/pages/my/shopQRcode/shopQRcode.vue
+++ b/java-mall-app-shop-admin/pages/my/shopQRcode/shopQRcode.vue
@@ -4,7 +4,7 @@
       <u--image
         class="qr-code-img"
         :showLoading="true"
-        :src="accountInfo.store_info.wx_qrcode"
+        :src="dashboardInfo.store_info.wx_qrcode"
         width="250px"
         height="250px"
       ></u--image>
@@ -22,7 +22,7 @@ export default {
   },
   onShow() {},
   computed: {
-    ...mapState("account", ["accountInfo"]),
+    ...mapState("user", ["dashboardInfo"]),
   },
   methods: {
     save() {
@@ -31,7 +31,7 @@ export default {
       });
       //下载图片
       uni.downloadFile({
-        url: this.accountInfo.store_info.wx_qrcode,
+        url: this.dashboardInfo.store_info.wx_qrcode,
         success: (res) => {
           if (res.statusCode === 200) {
             //鉴权
diff --git a/java-mall-app-shop-admin/pages/my/storeBusinessStatus/oz-timePicker/oz-timePicker.vue b/java-mall-app-shop-admin/pages/my/storeBusinessStatus/oz-timePicker/oz-timePicker.vue
index 4d75607..ffcd45d 100644
--- a/java-mall-app-shop-admin/pages/my/storeBusinessStatus/oz-timePicker/oz-timePicker.vue
+++ b/java-mall-app-shop-admin/pages/my/storeBusinessStatus/oz-timePicker/oz-timePicker.vue
@@ -3,7 +3,7 @@
   <uni-popup ref="popup" type="bottom" :safe-area="false">
     <view class="custom-picker">
       <view class="custom-picker__header">
-        <view class="cancel" :style="{ color: canceColor }" >
+        <view class="cancel" :style="{ color: canceColor }">
           <!-- {{ cancelText }} -->
         </view>
         <view class="title">{{ title }}</view>
@@ -48,7 +48,7 @@
         <picker-view-column>
           <view
             class="picker-view__item"
-            v-for="(item, index) in rangeList[2]"
+            v-for="(item, index) in rangeList[3]"
             :key="index"
           >
             {{ item }}
@@ -57,7 +57,7 @@
         <picker-view-column>
           <view
             class="picker-view__item"
-            v-for="(item, index) in rangeList[3]"
+            v-for="(item, index) in rangeList[4]"
             :key="index"
           >
             {{ item }}
@@ -69,7 +69,7 @@
       <view class="bottom-time">
         <view class="">
           <text>{{ startTime }}</text>
-          <text style="padding: 0 6rpx;">至</text>
+          <text style="padding: 0 6rpx">至</text>
           <text>{{ endTime }}</text>
         </view>
         <view class="">{{ totalTime }}</view>
@@ -85,7 +85,6 @@
           确认
         </u-button>
       </view>
-      
     </view>
   </uni-popup>
 </template>
@@ -169,88 +168,99 @@ export default {
   },
   data() {
     return {
-      rangeList: [],
-      pickerValue: [0, 0, 0, 0],
+      rangeList: [[], [], [], [], []], // 明确5个子数组
+      pickerValue: [0, 0, 0, 0, 0], // 改为5个元素的数组
       isScoll: false, // 是否正在滚动
-      startTime:"",
-      endTime:"",
-      totalTime:""
+      startTime: "00:00",
+      endTime: "00:00",
+      totalTime: "共0小时0分",
+      isValidTime: false,
     };
   },
   created() {
-    this.generateRangeLists();
-  },
-  watch: {
-    // 监听最大时间限制变化
-    maxStartHour() {
-      this.generateRangeLists();
-    },
-    maxStartMinute() {
-      this.generateRangeLists();
-    },
-    maxEndHour() {
-      this.generateRangeLists();
-    },
-    maxEndMinute() {
-      this.generateRangeLists();
-    },
+    this.initTimeRanges();
+    this.setInitialValue();
   },
+
   methods: {
-    generateRangeLists() {
-      const ranges = [[], [], [], []];
+    initTimeRanges() {
+      // 开始小时 (0-23)
+      this.rangeList[0] = Array.from({ length: 24 }, (_, i) =>
+        i.toString().padStart(2, "0")
+      );
 
-      // 生成开始小时范围 (0 - maxStartHour)
-      for (let i = 0; i <= this.maxStartHour; i++) {
-        ranges[0].push(i >= 10 ? String(i) : `0${i}`);
+      // 开始分钟 (0-59)
+      this.rangeList[1] = Array.from({ length: 60 }, (_, i) =>
+        i.toString().padStart(2, "0")
+      );
+
+      // 分隔符
+      this.rangeList[2] = [this.segmentation];
+
+      // 结束小时 (0-24)
+      this.rangeList[3] = Array.from({ length: 25 }, (_, i) =>
+        i.toString().padStart(2, "0")
+      );
+
+      // 结束分钟 (初始为00-59)
+      this.rangeList[4] = Array.from({ length: 60 }, (_, i) =>
+        i.toString().padStart(2, "0")
+      );
+    },
+    setInitialValue() {
+      // 确保value是有效的5元素数组，否则使用默认值
+      if (!Array.isArray(this.value) || this.value.length !== 5) {
+        this.pickerValue = [0, 0, 0, 0, 0];
+        return;
       }
 
-      // 生成开始分钟范围 (0 - maxStartMinute)
-      for (let i = 0; i <= this.maxStartMinute; i++) {
-        ranges[1].push(i >= 10 ? String(i) : `0${i}`);
+      // 转换value为pickerValue索引
+      this.pickerValue = [
+        Math.max(this.rangeList[0].indexOf(this.value[0]), 0), // 开始小时
+        Math.max(this.rangeList[1].indexOf(this.value[1]), 0), // 开始分钟
+        0, // 分隔符位置固定为0
+        Math.max(this.rangeList[3].indexOf(this.value[3]), 0), // 结束小时
+        Math.max(this.rangeList[4].indexOf(this.value[4]), 0), // 结束分钟
+      ];
+
+      // 处理24:00特殊情况
+      if (this.value[3] === "24") {
+        this.pickerValue[4] = 0;
+        this.rangeList[4] = ["00"];
       }
 
-      // 生成结束小时范围 (0 - maxEndHour)
-      for (let i = 0; i <= this.maxEndHour; i++) {
-        ranges[2].push(i >= 10 ? String(i) : `0${i}`);
-      }
+      // 强制更新视图
+      this.$nextTick(() => {
+        this.calculateTimeDifference();
+      });
+    },
+    handle24HourSelection() {
+      this.pickerValue[4] = 0; // 分钟强制为00
+      this.rangeList[4] = ["00"]; // 分钟选项只保留00
+    },
 
-      // 生成结束分钟范围 (0 - maxEndMinute)
-      // 如果结束小时是24，分钟只能是00
-      if (
-        this.pickerValue &&
-        this.pickerValue[2] === this.rangeList[2]?.length - 1
-      ) {
-        ranges[3] = ["00"];
-      } else {
-        for (let i = 0; i <= this.maxEndMinute; i++) {
-          ranges[3].push(i >= 10 ? String(i) : `0${i}`);
-        }
+    restoreMinuteOptions() {
+      this.rangeList[4] = Array.from({ length: 60 }, (_, i) =>
+        i.toString().padStart(2, "0")
+      );
+    },
+    generateMinutesRange() {
+      const minutes = [];
+      for (let i = 0; i <= 59; i++) {
+        minutes.push(i.toString().padStart(2, "0"));
       }
-      this.rangeList = ranges;
+      return minutes;
     },
     /**
      * 开启弹窗
      */
     open() {
-      this.generateRangeLists();
-
-      if (Array.isArray(this.value) && this.value.length) {
-        this.pickerValue = this.value.map((item, index) => {
-          const i = this.rangeList[index].findIndex(
-            (child) => Number(child) == Number(this.value[index])
-          );
-          return i > -1 ? i : 0;
-        });
-
-        // If initial end hour is 24, ensure minute is 00
-        if (this.pickerValue[2] === this.rangeList[2]?.length - 1) {
-          this.pickerValue[3] = 0;
-          this.generateRangeLists();
-        }
-      } else {
-        this.pickerValue = [0, 0, 0, 0];
-      }
+      this.setInitialValue();
       this.$refs.popup.open();
+      // 添加延迟确保picker-view正确渲染
+      setTimeout(() => {
+        this.calculateTimeDifference();
+      }, 100);
     },
     /**
      * 关闭弹窗
@@ -264,16 +274,23 @@ export default {
      * 点击确定
      */
     onConfirm() {
-      if (!this.isScoll) {
-        let data = this.value || ["00", "00", "00", "00"];
-        if (this.pickerValue && this.pickerValue.length) {
-          data = this.pickerValue.map((item, index) =>
-            String(this.rangeList[index][item])
-          );
-        }
-        this.$emit("confirm", data);
-        this.close();
+      if (!this.isValidTime) {
+        uni.showToast({
+          title: "开始时间和结束时间至少相差半小时",
+          icon: "none",
+        });
+        return;
       }
+
+      const result = [
+        this.rangeList[0][this.pickerValue[0]],
+        this.rangeList[1][this.pickerValue[1]],
+        this.rangeList[3][this.pickerValue[3]],
+        this.rangeList[4][this.pickerValue[4]],
+      ];
+
+      this.$emit("confirm", result);
+      this.close();
     },
     /**
      * 点击取消
@@ -298,48 +315,84 @@ export default {
      * @param {Object} e
      */
     bindChange(e) {
-
       const newValue = [...e.detail.value];
-  
-      // 更新 pickerValue
+
+      // 处理24小时选择
+      if (newValue[3] === this.rangeList[3].length - 1) {
+        // 选择24小时
+        newValue[4] = 0; // 强制分钟为00
+        this.rangeList[4] = ["00"];
+      } else if (this.pickerValue[3] === this.rangeList[3].length - 1) {
+        // 从24小时切换
+        this.rangeList[4] = Array.from({ length: 60 }, (_, i) =>
+          i.toString().padStart(2, "0")
+        );
+      }
+
       this.pickerValue = newValue;
+      this.calculateTimeDifference();
+    },
+    calculateTimeDifference() {
+      // 确保获取有效的数值
+      const getValidNumber = (val) => (isNaN(val) ? 0 : val);
 
-      // 计算 startTime (前两列: 小时和分钟)
-      const startHour = this.rangeList[0][newValue[0]];
-      const startMinute = this.rangeList[1][newValue[1]];
-      const startTime = `${startHour}:${startMinute}`;
+      const startHour = getValidNumber(
+        parseInt(this.rangeList[0][this.pickerValue[0]])
+      );
+      const startMinute = getValidNumber(
+        parseInt(this.rangeList[1][this.pickerValue[1]])
+      );
+      const endHour = getValidNumber(
+        parseInt(this.rangeList[3][this.pickerValue[3]])
+      );
+      let endMinute = getValidNumber(
+        parseInt(this.rangeList[4][this.pickerValue[4]])
+      );
 
-      // 计算 endTime (后两列: 小时和分钟)
-      const endHour = this.rangeList[3][newValue[3]];
-      const endMinute = this.rangeList[4][newValue[4]];
-      const endTime = `${endHour}:${endMinute}`;
-
-      // 计算总时长 totalTime
-      const startDate = new Date(2000, 0, 1, parseInt(startHour), parseInt(startMinute));
-      const endDate = new Date(2000, 0, 1, parseInt(endHour), parseInt(endMinute));
-      
-      // 处理跨天情况（如23:00到01:00）
-      if (endDate < startDate) {
-        endDate.setDate(endDate.getDate() + 1);
+      // 处理24:00特殊情况
+      if (endHour === 24) {
+        endMinute = 0;
+        this.endTime = "24:00";
+      } else {
+        this.endTime = `${endHour.toString().padStart(2, "0")}:${endMinute
+          .toString()
+          .padStart(2, "0")}`;
       }
-      
-      const diffMs = endDate - startDate;
-      const diffHours = Math.floor(diffMs / (1000 * 60 * 60));
-      const diffMinutes = Math.floor((diffMs % (1000 * 60 * 60)) / (1000 * 60));
-      
-      const totalTime = `共${diffHours}小时${diffMinutes}分`;
 
-      // 更新到data中以便在模板显示
-      this.startTime = startTime;
-      this.endTime = endTime;
-      this.totalTime = totalTime;
+      this.startTime = `${startHour.toString().padStart(2, "0")}:${startMinute
+        .toString()
+        .padStart(2, "0")}`;
 
-      // 检查是否需要限制分钟选择（如选择24:00时分钟只能是00）
-      if (newValue[3] === this.rangeList[3]?.length - 1) { // 假设24是最后一小时
-        newValue[4] = 0; // 设置为00分钟
-        this.pickerValue = newValue;
-        this.generateRangeLists();
+      // 计算时间差（分钟）
+      const startTotal = startHour * 60 + startMinute;
+      const endTotal = endHour * 60 + endMinute;
+      let diffMinutes = endTotal - startTotal;
+
+      // 处理跨天情况
+      if (diffMinutes < 0) {
+        diffMinutes += 1440; // 24小时*60分钟
       }
+
+      // 验证时间差
+      if (diffMinutes === 0) {
+        this.totalTime = "开始时间需早于结束时间";
+        this.isValidTime = false;
+      } else if (diffMinutes < 30) {
+        this.totalTime = "时间差需至少30分钟";
+        this.isValidTime = false;
+      } else {
+        const hours = Math.floor(diffMinutes / 60);
+        const minutes = diffMinutes % 60;
+        this.totalTime = `共${hours}小时${minutes}分`;
+        this.isValidTime = true;
+      }
+    },
+    pickstart() {
+      this.isScoll = true;
+    },
+
+    pickend() {
+      this.isScoll = false;
     },
   },
 };
@@ -433,15 +486,15 @@ export default {
   line-height: 80rpx;
 }
 
-::v-deep .picker-view{
+::v-deep .picker-view {
   height: 60%;
 }
 
-.bottom-content{
+.bottom-content {
   background: #fff;
-  box-shadow: 0 0 4rpx 4rpx rgba(0, 0, 0, 0.1);
+  box-shadow: 0 0 28rpx 4rpx rgba(0, 0, 0, 0.1);
 
-  .bottom-time{
+  .bottom-time {
     display: flex;
     justify-content: space-between;
     padding: 20rpx 28rpx;
@@ -449,10 +502,10 @@ export default {
     font-weight: bold;
   }
 
-  .bottom-btn{
+  .bottom-btn {
     padding: 28rpx 40rpx 80rpx;
 
-    .btn-time{
+    .btn-time {
       background: $base-color;
       color: #fff;
 
@@ -461,8 +514,5 @@ export default {
       }
     }
   }
-  
-
 }
-
 </style>
diff --git a/java-mall-app-shop-admin/pages/my/storeBusinessStatus/updateBusinessTime.vue b/java-mall-app-shop-admin/pages/my/storeBusinessStatus/updateBusinessTime.vue
index 75b5de3..abbaec5 100644
--- a/java-mall-app-shop-admin/pages/my/storeBusinessStatus/updateBusinessTime.vue
+++ b/java-mall-app-shop-admin/pages/my/storeBusinessStatus/updateBusinessTime.vue
@@ -11,16 +11,28 @@
     </view>
     <view class="business-time-content" @click="showTimePopup">
       <view class="time-box">
-        <view calss="time">23:30</view>
+        <view calss="time">{{ storeBaseInfo.info.store_opening_hours }}</view>
         <view>至</view>
-        <view calss="time">23:30</view>
+        <view calss="time">{{ storeBaseInfo.info.store_close_hours }}</view>
       </view>
     </view>
+    <view class="business-time-bottm">
+      <u-button
+        class="btn-time"
+        :hairline="true"
+        :plain="true"
+        shape="circle"
+        @click="updateStoreBizState"
+      >
+        确认修改
+      </u-button>
+    </view>
     <ozTimePicker
       ref="timePickerPopupRef"
       title="设置营业时间段"
       segmentation="至"
-      :value="['00', '00', '00', '00']"
+      :value="timeValue"
+      @confirm="handerConfirmTiem"
       indicator-class="picker-view__indicator acitve"
     ></ozTimePicker>
   </view>
@@ -31,6 +43,7 @@ import { GetAccountDashboard } from "../../../api/user";
 import { UpdateStoreBizState } from "../../../api/store";
 import tuiDatetime from "./tui-datetime/tui-datetime.vue";
 import ozTimePicker from "./oz-timePicker/oz-timePicker.vue";
+import { GetShopBaseInfo, UpdataShopInfo } from "@/api/shop";
 export default {
   components: {
     tuiDatetime,
@@ -71,6 +84,13 @@ export default {
       },
       showPopup: false,
       dateTime: "",
+      storeBaseInfo: {
+        info: {
+          store_opening_hours: "",
+          store_close_hours: "",
+        },
+      },
+      timeValue: ["00", "00", "至", "00", "00"],
     };
   },
   computed: {
@@ -79,9 +99,20 @@ export default {
     },
   },
   onShow() {
+    this.getShopBaseInfo();
     this.getAccountDashboard();
   },
   methods: {
+    async getShopBaseInfo() {
+      let res = await GetShopBaseInfo();
+      if (res && res.status == 200) {
+        this.storeBaseInfo = res.data;
+        const startTime =
+          this.storeBaseInfo.info.store_opening_hours.split(":");
+        const endTime = this.storeBaseInfo.info.store_close_hours.split(":");
+        this.timeValue = [...startTime, "至", ...endTime];
+      }
+    },
     async getAccountDashboard() {
       let res = await GetAccountDashboard();
       if (res && res.status == 200) {
@@ -95,6 +126,26 @@ export default {
     closeTimePopup() {
       this.showPopup = false;
     },
+    handerConfirmTiem(e) {
+      this.storeBaseInfo.info.store_opening_hours = e[0] + ":" + e[1];
+      this.storeBaseInfo.info.store_close_hours = e[2] + ":" + e[3];
+    },
+    async updateStoreBizState() {
+      var params = {
+        store_id: this.storeBaseInfo.store_id,
+        store_opening_hours: this.storeBaseInfo.info.store_opening_hours,
+        store_close_hours: this.storeBaseInfo.info.store_close_hours,
+        store_biz_state: this.storeBaseInfo.store_biz_state,
+      };
+
+      let res = await UpdateStoreBizState(params);
+      if (res && res.status == 200) {
+        uni.showToast({
+          title: "修改成功",
+          icon: "success",
+        });
+      }
+    },
   },
 };
 </script>
@@ -150,6 +201,7 @@ export default {
       padding: 36rpx 40rpx;
       border-radius: 24rpx;
       background: #f5f6fa;
+      font-weight: 500;
     }
   }
 
@@ -166,5 +218,25 @@ export default {
       }
     }
   }
+
+  .business-time-bottm {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 90%;
+    background: #fff;
+    box-shadow: 0 0 28rpx 4rpx rgba(0, 0, 0, 0.1);
+
+    padding: 28rpx 40rpx 80rpx;
+
+    .btn-time {
+      background: $base-color;
+      color: #fff;
+      border: none;
+      &::after {
+        border: none;
+      }
+    }
+  }
 }
 </style>
diff --git a/java-mall-app-shop-admin/pages/order/order.vue b/java-mall-app-shop-admin/pages/order/order.vue
index 53bf170..a9083a6 100644
--- a/java-mall-app-shop-admin/pages/order/order.vue
+++ b/java-mall-app-shop-admin/pages/order/order.vue
@@ -30,7 +30,7 @@
         :width="300"
         :currentTab="currentTab2"
         @change="handleTab2"
-        backgroundColor="#f5f5f5"
+        backgroundColor="#fff"
         :height="88"
         unlined
         :sliderWidth="150"
@@ -42,10 +42,7 @@
         sliderBgColor="#fe4119"
       ></tui-tabs>
     </view>
-    <view
-      class="search-contetn"
-      v-if="orderInfo.order_page_list.records.length > 0"
-    >
+    <view class="search-contetn" v-if="currentTab2 != 2">
       <u-search
         placeholder="请输入订单号搜索"
         :showAction="false"
@@ -79,6 +76,20 @@
         </tui-dropdown-list>
       </view> -->
     </view>
+    <view class="sales-retrun-btn-list" v-if="currentTab2 == 2">
+      <u-button
+        :class="[
+          'sales-retrun-btn-item',
+          { active: salesReturnBtnSearchAcitve == item.value },
+        ]"
+        @click="handelSalesReturnSearch(item)"
+        :style="{ width: item.width }"
+        v-for="(item, index) of salesReturnBtnSearchList"
+        :key="index"
+      >
+        {{ item.label }}
+      </u-button>
+    </view>
 
     <view class="order-info-content" v-if="currentTab2 == 0">
       <favorite-loading
@@ -308,9 +319,11 @@
         </view>
         <view
           class="m-loading-box"
-          v-if="orderInfo.order_page_list.records.length > 0 && !isNoOrderData"
+          v-if="
+            orderInfo.order_page_list.records.length > 0 && !isNoOnlineOrder
+          "
         >
-          <block v-if="isLoadingReachData">
+          <block v-if="loadingDownOnlinData">
             <view class="u-loadmore">
               <view class="u-loading"></view>
               <text class="u-loadmore-tips">正在加载...</text>
@@ -325,7 +338,7 @@
       </scroll-view>
       <view
         class="no-data"
-        v-if="orderInfo.order_page_list.records.length <= 0 && isNoOrderData"
+        v-if="orderInfo.order_page_list.records.length <= 0 && isNoOnlineOrder"
       >
         <view class="no-data-bg"></view>
         <view class="no-data-tips">暂无交易记录!</view>
@@ -416,7 +429,7 @@
               <view class="delivery-num">{{ item.order_pickup_num_str }}</view>
             </view>
             <view class="order-remark">
-              <text style="color: red; font-weight: bold">备注：</text>
+              <text style="font-weight: bold">备注：</text>
               <text>{{ item.buyer_info.order_message }}</text>
             </view>
             <view class="commodity-info-block">
@@ -543,11 +556,11 @@
             </view>
           </view>
           <view class="order-btn-block">
-            <view class="btn-list">
+            <!-- <view class="btn-list">
               <u-button class="btn-item">取消订单</u-button>
               <u-button class="btn-item">退差价</u-button>
               <u-button class="btn-item">部分退款</u-button>
-            </view>
+            </view> -->
             <view class="arrow-item" @click="showRefundOrderInfo(item, index)">
               {{ item.showRefundOrderInfo ? "收起订单" : "展开订单" }}
               <u-icon
@@ -560,7 +573,7 @@
           </view>
         </view>
         <view class="m-loading-box">
-          <block v-if="isLoadingReachData">
+          <block v-if="loadingDownOnlinData">
             <view class="u-loadmore">
               <view class="u-loading"></view>
               <text class="u-loadmore-tips">正在加载...</text>
@@ -575,7 +588,7 @@
       </scroll-view>
       <view
         class="no-data"
-        v-if="orderInfo.order_page_list.records.length <= 0 && isNoOrderData"
+        v-if="orderInfo.order_page_list.records.length <= 0 && isNoOnlineOrder"
       >
         <view class="no-data-bg"></view>
         <view class="no-data-tips">暂无交易记录!</view>
@@ -590,12 +603,13 @@
         animation="spinner15"
       ></favorite-loading>
       <scroll-view
-        class="uni-swiper-list"
+        class="uni-swiper-return-list"
         scroll-y
         :scroll-top="0"
         enhanced
         :show-scrollbar="false"
-        v-if="orderInfo.order_page_list.records.length > 0"
+        @scrolltolower="scrollSalesReturnTolower"
+        v-if="salesReturnOrderList.length > 0"
       >
         <view
           :class="[
@@ -606,7 +620,7 @@
               'order-refund-open': currentTab2 == 2 && item.showRefundOrderInfo,
             },
           ]"
-          v-for="(item, index) of orderInfo.order_page_list.records"
+          v-for="(item, index) of salesReturnOrderList"
           :key="index"
         >
           <view class="order-info-hander">
@@ -620,10 +634,10 @@
                     font-weight: bold;
                   "
                 >
-                  3
+                  {{ item.orderNum }}
                 </text>
               </view>
-              <view class="order-num">订单号：{{ item.order_id }}</view>
+              <view class="order-num">退货单号：{{ item.return_id }}</view>
             </view>
             <view class="rider-info">
               <view class="delivery-time"></view>
@@ -631,11 +645,11 @@
                 {{ sfFormatStatus(item.order_state_id) }}
               </view>
             </view>
-            <view class="order-msg-tips">
+            <!-- <view class="order-msg-tips">
               取消原因：订单符合未发货秒退规则，平台已优先退款
-            </view>
+            </view> -->
           </view>
-          <view class="steps-content" v-show="item.showRefundOrderInfo">
+          <!-- <view class="steps-content" v-show="item.showRefundOrderInfo">
             <view class="steps-title">
               退款
               <u-icon
@@ -657,55 +671,105 @@
                 desc="理由：商家联系我说没货了"
               ></u-steps-item>
             </u-steps>
-          </view>
-          <view class="" v-show="item.showRefundOrderInfo">
+          </view> -->
+          <view
+            class=""
+            v-if="
+              item.showRefundOrderInfo &&
+              item.detailsInfo &&
+              Object.keys(item.detailsInfo).length > 0
+            "
+          >
             <view class="user-info-block">
-              <view class="user-info">张先生 手机尾号3158</view>
+              <view class="user-info">
+                {{ item.detailsInfo.da_name }}先生 手机尾号{{
+                  item.detailsInfo.da_mobile.slice(-4)
+                }}
+                <u-icon
+                  @click="makePhone(item.detailsInfo.da_mobile)"
+                  name="phone-fill"
+                  class="icon-phone-fill"
+                  size="40"
+                  color="#fe4119"
+                ></u-icon>
+              </view>
               <view class="user-address">
-                收货地址：金凤凰商业街18号4楼（桂平发发网络有限公司）
+                收货地址：{{ item.detailsInfo.da_address }}
               </view>
             </view>
             <view class="order-remark">
-              <text style="color: red; font-weight: bold">备注：</text>
-              <text>【如遇缺货】：缺货时请与我电话联系</text>
+              <text style="font-weight: bold">退货理由：</text>
+              <text>{{ item.return_buyer_message }}</text>
+            </view>
+            <view
+              class="sales-return-img-title"
+              v-if="item.detailsInfo.items[0].return_item_image.length > 0"
+            >
+              退货凭据
+            </view>
+            <view
+              class="sales-return-img-list"
+              v-if="item.detailsInfo.items[0].return_item_image.length > 0"
+            >
+              <u--image
+                v-for="(imgItem, imgIndex) of item.detailsInfo.items[0]
+                  .return_item_image"
+                :key="imgIndex"
+                :showLoading="true"
+                :src="imgItem"
+                width="80px"
+                height="80px"
+                @click="
+                  handlerShowImg(item.detailsInfo.items[0].return_item_image)
+                "
+              ></u--image>
             </view>
             <view class="commodity-info-block">
               <view class="commodity-num">
-                <text style="font-size: 36rpx">{{ commodityArr.length }}</text>
+                <text style="font-size: 36rpx">
+                  {{ item.detailsInfo.items[0].return_item_num }}
+                </text>
                 <text>件商品</text>
               </view>
               <view
                 class="commodity-info"
-                v-for="(item, index) of commodityArr"
-                :key="index"
+                v-for="(group, index2) of item.detailsInfo.items"
+                :key="index2"
               >
-                <image class="commodity-info-img" :src="item.imrUrl"></image>
+                <image
+                  class="commodity-info-img"
+                  :src="group.order_item_image"
+                ></image>
                 <view class="commodity-content">
-                  <view class="commodity-name">{{ item.name }}</view>
-                  <view class="commodity-barcode">
+                  <view class="commodity-name">{{ group.product_name }}</view>
+                  <!-- <view class="commodity-barcode">
                     条码
                     <text style="padding-left: 8rpx">{{ item.barcode }}</text>
-                  </view>
-                  <view class="commodity-specification">
+                  </view> -->
+                  <!-- <view class="commodity-specification">
                     规格
                     <text style="padding-left: 8rpx">
                       {{ item.specification }}
                     </text>
-                  </view>
+                  </view> -->
                 </view>
                 <view class="commodity-num">
                   X
-                  <text style="padding-left: 8rpx">{{ item.num }}</text>
+                  <text style="padding-left: 8rpx">
+                    {{ group.return_item_num }}
+                  </text>
+                </view>
+                <view class="commodity-price">
+                  ￥{{ group.return_item_subtotal }}
                 </view>
-                <view class="commodity-price">￥{{ item.price }}</view>
               </view>
             </view>
-            <view class="baling-charges-block">
+            <!-- <view class="baling-charges-block">
               <view class="baling-charges-name">打包费</view>
               <view class="baling charges-num">￥0.5</view>
-            </view>
+            </view> -->
             <view class="cost-info-block">
-              <view class="cost-info-item cost-info-subtotal">
+              <!-- <view class="cost-info-item cost-info-subtotal">
                 <view class="cost-info-title">小计</view>
                 <view class="cost-info-num">￥30.50</view>
               </view>
@@ -725,8 +789,8 @@
                   </text>
                 </view>
                 <view class="cost-info-num">￥30.50</view>
-              </view>
-              <view class="cost-info-item cost-info-subtotal">
+              </view> -->
+              <!-- <view class="cost-info-item cost-info-subtotal">
                 <view
                   class="cost-info-title"
                   style="color: #333333; font-weight: 700"
@@ -742,40 +806,68 @@
                   </text>
                 </view>
                 <view class="cost-info-num">￥30.50</view>
-              </view>
+              </view> -->
               <view class="cost-info-income">
                 <view class="predict-income">
-                  预计收入
+                  实际退款总额
                   <text
-                    style="font-size: 40rpx; color: #333333; font-weight: 700"
+                    style="
+                      margin: 0 10rpx;
+                      font-size: 40rpx;
+                      color: #333333;
+                      font-weight: 700;
+                    "
                   >
-                    ￥24.95
+                    {{ item.return_refund_amount }}
                   </text>
+                  元
                 </view>
-                <view class="customer-actual-payment">
+                <!-- <view class="customer-actual-payment">
                   顾客实际支付 ￥30.50
-                </view>
+                </view> -->
               </view>
             </view>
           </view>
           <view class="order-btn-block">
-            <view class="btn-list">
-              <u-button class="btn-item">拒绝退款</u-button>
-              <u-button class="btn-item">同意退款</u-button>
+            <view class="btn-list" v-if="item.return_state_id == 3105">
+              <u-button
+                class="btn-item"
+                @click="handelOpenReturnOrderPopup(item, 'noPass')"
+              >
+                拒绝退款
+              </u-button>
+              <u-button
+                class="btn-item"
+                @click="handelOpenReturnOrderPopup(item, 'pass')"
+              >
+                同意退款
+              </u-button>
             </view>
-            <view class="arrow-item" @click="showRefundOrderInfo(item, index)">
-              {{ item.showRefundOrderInfo ? "收起订单" : "展开订单" }}
-              <u-icon
-                style="display: inline-block; margin-left: 6rpx"
-                :name="item.showRefundOrderInfo ? 'arrow-up' : 'arrow-down'"
-                size="12"
-                color="#cccccc"
-              ></u-icon>
+            <view class="btn-list retrun-state-name" v-else>
+              {{ item.return_state_name }}
+            </view>
+            <view
+              class="arrow-item arrow-item-2"
+              @click="showRefundOrderInfo(item, index)"
+            >
+              <view class="time">{{ item.return_add_time }}</view>
+              <view>
+                {{ item.showRefundOrderInfo ? "收起订单" : "展开订单" }}
+                <u-icon
+                  style="display: inline-block; margin-left: 6rpx"
+                  :name="item.showRefundOrderInfo ? 'arrow-up' : 'arrow-down'"
+                  size="12"
+                  color="#cccccc"
+                ></u-icon>
+              </view>
             </view>
           </view>
         </view>
-        <view class="m-loading-box">
-          <block v-if="isLoadingReachData">
+        <view
+          class="m-loading-box"
+          v-if="salesReturnOrderList.length > 0 && !isNoSalesReturnOrderData"
+        >
+          <block v-if="loadingDownSalesReturnData">
             <view class="u-loadmore">
               <view class="u-loading"></view>
               <text class="u-loadmore-tips">正在加载...</text>
@@ -790,26 +882,101 @@
       </scroll-view>
       <view
         class="no-data"
-        v-if="orderInfo.order_page_list.records.length <= 0 && isNoOrderData"
+        v-if="salesReturnOrderList.length <= 0 && isNoSalesReturnOrderData"
       >
         <view class="no-data-bg"></view>
         <view class="no-data-tips">暂无交易记录!</view>
       </view>
     </view>
     <tabbar tabbarName="order"></tabbar>
+    <tui-gallery
+      :urls="showImgList"
+      :show="showImg"
+      @hide="hideImg"
+    ></tui-gallery>
+    <u-popup
+      class="return-order-popup"
+      :show="showReturnOrderPopup"
+      mode="center"
+      round="12"
+      @close="handerCloseReturnOrderPopup"
+    >
+      <view class="return-order-popup-content">
+        <view class="title">
+          {{ returnOrderType == "pass" ? "退货确认" : "拒绝退款" }}
+        </view>
+        <view class="radio-content" v-if="returnOrderType == 'pass'">
+          <view class="radio-type-name">退货类型：</view>
+          <view class="radio-list">
+            <tui-radio-group class="radio-group" @change="handelRaddio">
+              <view v-for="(item, index) in radioItems" :key="index">
+                <tui-radio
+                  :checked="item.checked"
+                  :value="item.value"
+                  color="#07c160"
+                  borderColor="#999"
+                ></tui-radio>
+                <text class="radio-name">{{ item.name }}</text>
+              </view>
+            </tui-radio-group>
+          </view>
+        </view>
+        <view class="popup-textarea">
+          <u--textarea
+            class="textarea"
+            v-model="retrunOrderMsg"
+            placeholder="请输入商家备注"
+            :border="'surround'"
+            count
+            :maxlength="40"
+            :height="100"
+          ></u--textarea>
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showReturnOrderPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            v-if="dashboardInfo.store_info.store_biz_state == 1"
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerRetrunOrder()"
+          >
+            确认
+          </u-button>
+        </view>
+      </view>
+    </u-popup>
   </view>
 </template>
 
 <script>
 import statusBar from "../../components/status-bar.vue";
 import tuiTabs from "../../components/tui-tabs.vue";
-import { GetOrderList } from "../../api/order";
+import {
+  GetOrderList,
+  GetSalesReturnOrderList,
+  GetSalesReturnOrderDetails,
+  GetSalesReturnOrderNoPass,
+  GetSalesReturnOrderPass,
+} from "../../api/order";
 import { mapState } from "vuex";
 import { GetAuditInfo } from "../../api/audit";
 import { GetAccountDashboard } from "../../api/user";
 import favoriteLoading from "@/components/favorite-loading/favorite-loading.vue";
 import tuiDropdownList from "@/components/tui-dropdown-list/tui-dropdown-list.vue";
 import tabbar from "@/components/tabbar/tabbar.vue";
+import tuiGallery from "@/components/tui-gallery/tui-gallery.vue";
+import tuiRadio from "@/components/tui-radio/tui-radio.vue";
+import tuiRadioGroup from "@/components/tui-radio-group/tui-radio-group.vue";
 export default {
   components: {
     tuiTabs,
@@ -817,6 +984,9 @@ export default {
     favoriteLoading,
     tuiDropdownList,
     tabbar,
+    tuiGallery,
+    tuiRadio,
+    tuiRadioGroup,
   },
   data() {
     return {
@@ -947,19 +1117,86 @@ export default {
         },
       ],
       time: 0,
-      isLoadingReachData: false,
       params: {
         storeId: "",
         keyword: "",
         pageNum: "",
         pageSize: "",
+        return_state_id: null,
       },
-      isNoOrderData: false,
-      showOrderLoading: false,
+      dashboardInfo: {
+        store_info: {
+          store_id: "",
+        },
+      },
+      salesReturnBtnSearchList: [
+        {
+          value: null,
+          label: "全部",
+          width: "120rpx",
+        },
+        {
+          value: 3125,
+          label: "完成",
+          width: "120rpx",
+        },
+        {
+          value: 3130,
+          label: "拒绝",
+          width: "120rpx",
+        },
+        {
+          value: 3110,
+          label: "收货确认",
+          width: "170rpx",
+        },
+        {
+          value: 3105,
+          label: "待审核",
+          width: "140rpx",
+        },
+        {
+          value: 3115,
+          label: "退款确认",
+          width: "170rpx",
+        },
+        {
+          value: 3120,
+          label: "收款确认",
+          width: "170rpx",
+        },
+      ],
+      salesReturnBtnSearchAcitve: 3105,
+      salesReturnOrderList: [],
+      showImgList: [],
+      showImg: false,
+      showOrderLoading: false, //
+      isNoOnlineOrder: false, // 没有订单的显示
+      loadingDownOnlinData: false, // 在线订单下拉加载
+      isDownNoOrderData: false, // 下拉加载时没有数据的表现
+      isNoSalesReturnOrderData: false, // 没有退货订单
+      loadingDownSalesReturnData: false, // 下拉加载退货订单
+      isDownNoSalesReturnData: false, // 下拉加载时没有退货数据
+      showReturnOrderPopup: false,
+      returnOrderType: "",
+      radioOrderType: "",
+      radioItems: [
+        {
+          name: "需要退货",
+          value: "1",
+          checked: true,
+        },
+        {
+          name: "不用退货",
+          value: "0",
+          checked: false,
+        },
+      ],
+      retrunOrderMsg: "",
+      currReturnId: "",
     };
   },
   computed: {
-    ...mapState("account", ["accountInfo"]),
     ...mapState("user", ["userInfo"]),
     ...mapState("order", ["pushOrderInfo"]),
   },
@@ -984,19 +1221,6 @@ export default {
   },
   onLoad() {},
   onShow() {
-    let accountDashboard = uni.getStorageSync("accountDashboard");
-    let auditInfo = uni.getStorageSync("auditInfo");
-
-    if (accountDashboard) {
-      this.shopNmae = accountDashboard.store_info.store_name;
-      this.logoUrl = accountDashboard.store_info.store_logo;
-    } else {
-      this.getAccountDashboard();
-    }
-    if (!auditInfo) {
-      this.getAuditInfo();
-    }
-
     this.getOrderList();
   },
   onPullDownRefresh() {
@@ -1007,7 +1231,7 @@ export default {
   },
   // onReachBottom() {
   //   clearTimeout(this.time);
-  //   this.isLoadingReachData = true;
+  //   this.loadingDownOnlinData = true;
   //   this.time = setTimeout(() => {
   //     this.pageNum = this.pageNum + 1;
   //     this.getOrderList();
@@ -1016,10 +1240,30 @@ export default {
 
   methods: {
     async getOrderList() {
-      // this.showOrderLoading = true;
+      let accountDashboard = uni.getStorageSync("accountDashboard");
+      let auditInfo = uni.getStorageSync("auditInfo");
+
+      if (accountDashboard) {
+        this.shopNmae = accountDashboard.store_info.store_name;
+        this.logoUrl = accountDashboard.store_info.store_logo;
+        this.dashboardInfo = accountDashboard;
+      } else {
+        await this.getAccountDashboard();
+      }
+      if (!auditInfo) {
+        await this.getAuditInfo();
+      }
+
+      if (this.loadingDownOnlinData) {
+        this.showOrderLoading = false;
+      } else {
+        this.showOrderLoading = true;
+      }
+
+      console.log(this.dashboardInfo.store_info.store_id);
 
       this.params = {
-        storeId: this.accountInfo.store_info.store_id,
+        storeId: this.dashboardInfo.store_info.store_id,
         keyword: this.keyword,
         pageNum: this.pageNum,
         pageSize: this.pageSize,
@@ -1030,10 +1274,11 @@ export default {
       let res = await GetOrderList(this.params);
 
       if (res && res.status == 200) {
-        if (this.isLoadingReachData) {
+        // 下拉加载时
+        if (this.loadingDownOnlinData) {
           if (res.data.order_page_list.records.length <= 0) {
-            this.showOrderLoading = false;
-            this.isLoadingReachData = false;
+            this.loadingDownOnlinData = false;
+            this.isDownNoOrderData = true;
             return;
           } else {
             // this.orderInfo = { ...this.orderInfo, ...res.data };
@@ -1058,9 +1303,10 @@ export default {
           this.tabs2[2].num =
             this.orderInfo.order_count.same_city_order.refund_count; // 同城退款订单数量
         }
+
         if (res.data.order_page_list.records.length <= 0) {
           this.showOrderLoading = false;
-          this.isNoOrderData = true;
+          this.isNoOnlineOrder = true;
           return;
         }
 
@@ -1075,28 +1321,115 @@ export default {
       }
 
       this.showOrderLoading = false;
-      this.isLoadingReachData = false;
+      this.loadingDownOnlinData = false;
       // uni.stopPullDownRefresh();
     },
+    handelSalesReturnSearch(item) {
+      if (item.value == this.salesReturnBtnSearchAcitve) return;
+      this.pageNum = 1;
+      this.pageSize = 10;
+      this.salesReturnBtnSearchAcitve = item.value;
+      this.loadingDownSalesReturnData = false;
+      this.isNoSalesReturnOrderData = false;
+      this.isDownNoSalesReturnData = false;
+
+      this.getSalesReturnOrderList(item.value);
+    },
+    async getSalesReturnOrderList(returnStateId = 3105) {
+      if (this.loadingDownSalesReturnData) {
+        this.showOrderLoading = false;
+      } else {
+        this.showOrderLoading = true;
+      }
+
+      let params = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        return_state_id: returnStateId,
+      };
+
+      let res = await GetSalesReturnOrderList(params);
+      if (res && res.status == 200) {
+        // 下拉加载
+        if (this.loadingDownSalesReturnData) {
+          if (res.data.items.length <= 0) {
+            this.loadingDownSalesReturnData = false;
+            this.isDownNoSalesReturnData = true;
+            return;
+          } else {
+            // this.orderInfo = { ...this.orderInfo, ...res.data };
+            this.salesReturnOrderList = [
+              ...this.salesReturnOrderList,
+              ...res.data.items,
+            ];
+          }
+        } else {
+          this.salesReturnOrderList = res.data.items;
+        }
+
+        if (res.data.items <= 0) {
+          this.showOrderLoading = false;
+          this.isNoSalesReturnOrderData = true;
+          return;
+        }
+
+        this.salesReturnOrderList = this.salesReturnOrderList.map(
+          (item, index) => {
+            if (item) {
+              item.orderNum = index + 1;
+              item.showRefundOrderInfo = false;
+            }
+            return item;
+          }
+        );
+        console.log(this.salesReturnOrderList);
+      }
+      this.showOrderLoading = false;
+      this.loadingDownSalesReturnData = false;
+    },
+    async getSalesReturnOrderDetails(item, index) {
+      let params = {
+        return_id: item.return_id,
+      };
+
+      let res = await GetSalesReturnOrderDetails(params);
+      if (res && res.status == 200) {
+        let detailsInfo = res.data;
+
+        this.$set(this.salesReturnOrderList, index, {
+          ...this.salesReturnOrderList[index],
+          detailsInfo: detailsInfo,
+        });
+
+        console.log(this.salesReturnOrderList);
+      }
+    },
+
     showRefundOrderInfo(item, index) {
-      this.$set(this.orderInfo.order_page_list.records, index, {
-        ...item,
-        showRefundOrderInfo: !item.showRefundOrderInfo,
-      });
-      console.log(
-        this.orderInfo.order_page_list.records[index].showRefundOrderInfo
-      );
+      if (this.currentTab2 == 2) {
+        if (!item.showRefundOrderInfo) {
+          this.getSalesReturnOrderDetails(item, index);
+        }
+
+        this.$set(this.salesReturnOrderList, index, {
+          ...item,
+          showRefundOrderInfo: !item.showRefundOrderInfo,
+        });
+      }
+
+      if (this.currentTab2 != 2) {
+        this.$set(this.orderInfo.order_page_list.records, index, {
+          ...item,
+          showRefundOrderInfo: !item.showRefundOrderInfo,
+        });
+      }
     },
     async getAuditInfo() {
       var params = {};
 
-      let isContain = this.userInfo.user_mobile.indexOf("86");
-
-      if (isContain != -1 && this.userInfo.user_mobile.length > 11) {
-        params.mobile = this.userInfo.user_mobile.slice(2);
-      } else {
-        params.mobile = this.userInfo.user_mobile;
-      }
+      params.mobile = this.userInfo.user_mobile.startsWith("+86")
+        ? this.userInfo.user_mobile.replace("+86", "")
+        : this.userInfo.user_mobile;
 
       let res = await GetAuditInfo(params);
       if (res && res.status == 200) {
@@ -1115,10 +1448,31 @@ export default {
 
       if (res && res.status == 200) {
         uni.setStorageSync("accountDashboard", res.data);
+        this.dashboardInfo = res.data;
         this.shopNmae = res.data.store_info.store_name;
         this.logoUrl = res.data.store_info.store_logo;
       }
     },
+    makePhone(phone) {
+      // #ifdef H5
+      uni.showToast({
+        title: "H5环境不支持",
+        icon: "none",
+      });
+      // #endif
+
+      // #ifdef APP-PLUS
+      uni.makePhoneCall({
+        phoneNumber: phone,
+        success: function () {
+          console.log("拨打电话成功");
+        },
+        fail: function () {
+          console.log("拨打电话失败");
+        },
+      });
+      // #endif
+    },
     sfFormatStatus(id) {
       let label = "";
       this.sfStatus.forEach((item) => {
@@ -1129,6 +1483,21 @@ export default {
 
       return label;
     },
+    handlerShowImg(imgList) {
+      this.showImg = true;
+      const _imgList = imgList.map((item) => {
+        return {
+          src: item,
+          desc: "",
+        };
+      });
+
+      this.showImgList = _imgList;
+      console.log(this.showImgList);
+    },
+    hideImg() {
+      this.showImg = false;
+    },
     formatTime(time) {
       let date = new Date(time);
       let hours = String(date.getHours()).padStart(2, "0");
@@ -1140,16 +1509,28 @@ export default {
       this.pageNum = 1;
       this.pageSize = 10;
       this.keyword = "";
-      this.isNoOrderData = false;
+      this.isNoOnlineOrder = false;
       this.getOrderList();
     },
     handleTab2(e) {
       this.currentTab2 = e.index;
+
       this.pageNum = 1;
       this.pageSize = 10;
       this.keyword = "";
-      this.isNoOrderData = false;
-      this.getOrderList();
+      this.isNoOnlineOrder = false;
+      this.loadingDownOnlinData = false;
+      this.isDownNoOrderData = false;
+
+      this.isNoSalesReturnOrderData = false;
+      this.loadingDownSalesReturnData = false;
+      this.isDownNoSalesReturnData = false;
+
+      if (this.currentTab2 == 2) {
+        this.getSalesReturnOrderList();
+      } else {
+        this.getOrderList();
+      }
     },
     searchOrder() {
       this.pageNum = 1;
@@ -1161,15 +1542,66 @@ export default {
     },
     scrolltolower() {
       clearTimeout(this.time);
-      this.isLoadingReachData = true;
+      if (this.isDownNoOrderData) return;
+      this.loadingDownOnlinData = true;
       this.time = setTimeout(() => {
         this.pageNum = this.pageNum + 1;
         this.getOrderList();
       }, 500);
     },
+    scrollSalesReturnTolower() {
+      clearTimeout(this.time);
+      if (this.isDownNoSalesReturnData) return;
+      this.loadingDownSalesReturnData = true;
+      this.time = setTimeout(() => {
+        this.pageNum = this.pageNum + 1;
+        this.getSalesReturnOrderList();
+      });
+    },
     handleShowDropDown() {
       this.showDropdown = !this.showDropdown;
     },
+    handelOpenReturnOrderPopup(item, type) {
+      this.showReturnOrderPopup = true;
+      this.returnOrderType = type;
+      this.currReturnId = item.return_id;
+    },
+    handelRaddio(e) {
+      this.radioOrderType = e.detail.value;
+    },
+    async handerRetrunOrder() {
+      if (this.returnOrderType == "noPass") {
+        let params = {
+          return_id: this.currReturnId,
+          return_store_message: this.retrunOrderMsg,
+        };
+
+        let res = await GetSalesReturnOrderNoPass(params);
+        if (res && res.status == 200) {
+          this.currReturnId = "";
+          this.retrunOrderMsg = "";
+          this.getSalesReturnOrderList();
+        }
+      } else {
+        let params = {
+          return_flag: this.radioOrderType,
+          return_id: this.currReturnId,
+          return_store_message: this.retrunOrderMsg,
+        };
+
+        if (this.radioOrderType == 1) {
+          params.receiving_address = 2;
+        }
+
+        let res = await GetSalesReturnOrderPass(params);
+        if (res && res.status == 200) {
+          this.currReturnId = "";
+          this.retrunOrderMsg = "";
+          this.getSalesReturnOrderList();
+        }
+      }
+      this.showReturnOrderPopup = false;
+    },
   },
 };
 </script>
@@ -1178,7 +1610,7 @@ export default {
 @import "@/styles/variables.scss";
 .index-container {
   // overflow: hidden;
-  background: #f5f5f5;
+  background: #eeeff3;
   min-height: 100vh;
   .shop-info {
     display: flex;
@@ -1207,12 +1639,23 @@ export default {
   }
 
   .tab-content {
-    margin-bottom: 20rpx;
+    padding-bottom: 20rpx;
     background: #fff;
   }
 
   .tab2-content {
-    background: #f5f5f5;
+    background: #fff;
+  }
+
+  .sales-return-img-title {
+    margin: 20rpx;
+    font-weight: bold;
+  }
+
+  .sales-return-img-list {
+    display: flex;
+    flex-wrap: wrap;
+    margin: 40rpx 20rpx;
   }
 
   .search-contetn {
@@ -1232,11 +1675,37 @@ export default {
     }
   }
 
+  .sales-retrun-btn-list {
+    margin: 38rpx 24rpx 0;
+    height: 160rpx;
+
+    .sales-retrun-btn-item {
+      float: left !important;
+      height: 60rpx;
+      margin-left: 20rpx;
+      margin-bottom: 20rpx;
+      border: none;
+
+      ::after {
+        border: none;
+      }
+    }
+
+    .active {
+      background: $base-color;
+      color: #fff;
+    }
+  }
+
   .order-info-content {
     border-radius: 8rpx;
 
     .uni-swiper-list {
-      height: calc(100vh - 310px);
+      height: calc(100vh - 320px);
+    }
+
+    .uni-swiper-return-list {
+      height: calc(100vh - 350px);
     }
 
     .order-msg-tips {
@@ -1324,6 +1793,8 @@ export default {
         border-bottom: 1px solid #f7f7f7;
 
         .user-info {
+          display: flex;
+          align-items: center;
           font-size: 26rpx;
           margin-bottom: 20rpx;
         }
@@ -1494,6 +1965,14 @@ export default {
           margin-top: 40rpx;
           font-size: 26rpx;
           color: #cccccc;
+
+          .time {
+            color: #333333;
+          }
+        }
+
+        .arrow-item-2 {
+          justify-content: space-between;
         }
       }
     }
@@ -1562,9 +2041,6 @@ export default {
     }
   }
 
-  .btn-down-list {
-  }
-
   .tui-animation {
     display: inline-block;
     transform: rotate(0deg);
@@ -1574,5 +2050,80 @@ export default {
   .tui-animation-show {
     transform: rotate(180deg);
   }
+
+  .icon-phone-fill {
+    margin-left: 10%;
+  }
+
+  .retrun-state-name {
+    color: $base-color;
+  }
+
+  .return-order-popup {
+    .return-order-popup-content {
+      width: 600rpx;
+      min-height: 600rpx;
+
+      .title {
+        margin: 36rpx;
+        text-align: center;
+        font-weight: bold;
+        font-size: 36rpx;
+      }
+
+      .radio-content {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin: 60rpx 40rpx 40rpx;
+
+        .radio-type-name {
+          font-weight: 500;
+        }
+
+        .radio-list {
+          flex: 1;
+          .radio-group {
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
+            line-height: 40rpx;
+
+            .radio-name {
+              margin-left: 8rpx;
+            }
+          }
+        }
+      }
+
+      .popup-textarea {
+        margin: 28rpx;
+        .textarea {
+          border: 1px solid #eeeff3;
+        }
+      }
+
+      .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;
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue b/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
new file mode 100644
index 0000000..d55bdaf
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/batch.vue
@@ -0,0 +1,1988 @@
+<template>
+  <view class="batch-container">
+    <navBar
+      class="nav-bar"
+      :statusBar="true"
+      :border="false"
+      :fixed="true"
+      :height="'44px'"
+      :rightWidth="30"
+      :leftWidth="30"
+      title="商品批量"
+      backgroundColor="#fff"
+    >
+      <block slot="left">
+        <u-icon
+          name="arrow-left"
+          color="#000"
+          size="20"
+          @click="pageBack()"
+        ></u-icon>
+      </block>
+      <block slot="right">
+        <u-icon
+          name="search"
+          color="#000"
+          size="30"
+          @click="showRightPopup = true"
+        ></u-icon>
+      </block>
+    </navBar>
+    <view class="productList-content">
+      <scroll-view
+        scroll-y
+        scroll-with-animation
+        class="tab-view"
+        :scroll-into-view="scrollViewId"
+        :style="{ height: height - 100 + 'px' }"
+      >
+        <block v-for="(item, index) of tabbar" :key="index">
+          <tui-collapse
+            :index="index"
+            :current="current"
+            hdBgColor="f5f6fa"
+            :arrow="item.children.length > 0 ? true : false"
+            @click="handerCollApse"
+          >
+            <template v-slot:title>
+              <view
+                class="tab-bar-item"
+                :class="[
+                  { active: currentTab === index },
+                  { active2: current === index },
+                ]"
+              >
+                {{ item.label }}
+              </view>
+            </template>
+            <template v-slot:content v-if="item.children.length > 0">
+              <view
+                class="tab-bar-item tab-bar-item-2"
+                :class="[currentTab == group.id ? 'active' : '']"
+                v-for="(group, index2) of item.children"
+                @click="handerCollApseChildren(index, index2)"
+              >
+                {{ group.label }}
+              </view>
+            </template>
+          </tui-collapse>
+        </block>
+      </scroll-view>
+      <view class="right-box" :style="{ height: height + 'px' }">
+        <view class="commodity-status">
+          <u-tabs
+            class="u-tabs"
+            ref="tabsRef"
+            :list="commodityStatusList"
+            @click="handerCommodityStatus"
+            itemStyle="padding-left: 15px; padding-right: 15px; height: 57px;"
+            activeStyle="font-weight: bold;color: #000;"
+            inactiveStyle="color:#999999;"
+            lineColor="#e41f19"
+          ></u-tabs>
+        </view>
+        <!-- 有子集 - 全选按钮 -->
+        <view
+          v-if="
+            commodityList.length > 0 &&
+            !loadingCommodityData &&
+            tabbar.length > 0 &&
+            tabbar[current].children.length > 0
+          "
+          class="checkbox-all"
+          @click="handleSelectAll(null, true)"
+        >
+          <u-checkbox-group
+            class="commodity-list"
+            v-model="
+              tabbar[current].children[currTabChildrenIndex].checkboxAllList
+            "
+            placement="column"
+            @change="handleSelectAll($event, true)"
+          >
+            <u-checkbox
+              class="commodity-checkbox"
+              :name="'select-all'"
+            ></u-checkbox>
+          </u-checkbox-group>
+          <view class="checkbox-all-name">
+            已勾选{{
+              tabbar[current].children[currTabChildrenIndex].checkboxList
+                .length
+            }}个
+          </view>
+        </view>
+        <!--判断无子集-->
+        <view
+          v-if="
+            commodityList.length > 0 &&
+            !loadingCommodityData &&
+            tabbar.length > 0 &&
+            tabbar[current].children.length <= 0
+          "
+          class="checkbox-all"
+          @click="handleSelectAll(null, false)"
+        >
+          <u-checkbox-group
+            class="commodity-list"
+            v-model="tabbar[current].checkboxAllList"
+            placement="column"
+            @change="handleSelectAll($event, false)"
+          >
+            <u-checkbox
+              class="commodity-checkbox"
+              :name="'select-all'"
+            ></u-checkbox>
+          </u-checkbox-group>
+          <view class="checkbox-all-name">
+            已勾选{{ tabbar[current].checkboxList.length }}个
+          </view>
+        </view>
+        <favorite-loading
+          class="commodity-loading"
+          v-show="loadingCommodityData"
+          :color="'#fe4119'"
+          text=""
+          animation="spinner15"
+        ></favorite-loading>
+        <view
+          class="no-data"
+          v-if="commodityList.length <= 0 && isNoCommodityData"
+        >
+          <view class="no-data-bg"></view>
+          <view class="no-data-tips">暂无商品</view>
+        </view>
+        <scroll-view
+          v-if="commodityList.length > 0 && !loadingCommodityData"
+          scroll-y
+          :style="{ height: height - 230 + 'px' }"
+          :show-scrollbar="false"
+          @scrolltolower="handerScrolltolower"
+          refresher-enabled
+          :refresher-triggered="isRefreshing"
+          @refresherrefresh="handleRefresh"
+        >
+          <!-- 有子集 - 单个选择 -->
+          <u-checkbox-group
+            v-if="tabbar[current].children.length > 0"
+            class="commodity-list"
+            v-model="
+              tabbar[current].children[currTabChildrenIndex].checkboxList
+            "
+            placement="column"
+            @change="handleSingleCheckboxChange($event, true)"
+          >
+            <view
+              class="commodity-item"
+              v-for="(item, index) of commodityList"
+              :key="index"
+            >
+              <u-checkbox
+                class="commodity-checkbox"
+                :key="index"
+                :name="item.product_id"
+              ></u-checkbox>
+              <view class="commodity-info">
+                <view
+                  :class="[
+                    'commodity-img',
+                    { 'commodity-img-sold-out': item.product_state_id == 1002 },
+                  ]"
+                >
+                  <u--image
+                    :src="item.product_image"
+                    radius="8"
+                    width="68px"
+                    height="68px"
+                    @click="handlerShowImg(item.product_image)"
+                  ></u--image>
+                </view>
+                <view class="commodity-info-box">
+                  <view class="commodity-name">
+                    {{ item.product_name }}
+                  </view>
+                  <view class="commodity-inventory">
+                    库存{{ item.itemQuantity }}
+                  </view>
+                  <view class="commodity-price">
+                    <block class="currency">¥</block>
+                    {{ item.product_unit_price }}
+                  </view>
+                </view>
+              </view>
+            </view>
+          </u-checkbox-group>
+          <!-- 无子集 - 单个选择 -->
+          <u-checkbox-group
+            v-if="tabbar[current].children.length <= 0"
+            class="commodity-list"
+            v-model="tabbar[current].checkboxList"
+            placement="column"
+            @change="handleSingleCheckboxChange($event, false)"
+          >
+            <view
+              class="commodity-item"
+              v-for="(item, index) of commodityList"
+              :key="index"
+            >
+              <u-checkbox
+                class="commodity-checkbox"
+                :key="index"
+                :name="item.product_id"
+              ></u-checkbox>
+              <view class="commodity-info">
+                <view
+                  :class="[
+                    'commodity-img',
+                    { 'commodity-img-sold-out': item.product_state_id == 1002 },
+                  ]"
+                >
+                  <u--image
+                    :src="item.product_image"
+                    radius="8"
+                    width="68px"
+                    height="68px"
+                    @click="handlerShowImg(item.product_image)"
+                  ></u--image>
+                </view>
+                <view class="commodity-info-box">
+                  <view class="commodity-name">
+                    {{ item.product_name }}
+                  </view>
+                  <view class="commodity-inventory">
+                    库存{{ item.itemQuantity }}
+                  </view>
+                  <view class="commodity-price">
+                    <block class="currency">¥</block>
+                    {{ item.product_unit_price }}
+                  </view>
+                </view>
+              </view>
+            </view>
+          </u-checkbox-group>
+          <view
+            class="m-loading-box"
+            v-if="commodityList.length > 0 && !isNoCommodityData"
+          >
+            <block v-if="loadingDownCommodityData">
+              <view class="u-loadmore">
+                <view class="u-loading"></view>
+                <text class="u-loadmore-tips">正在加载...</text>
+              </view>
+            </block>
+            <block v-else>
+              <view class="u-loadmore u-loadmore-line">
+                <text class="u-loadmore-tips">没有更多商品了 ~</text>
+              </view>
+            </block>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+    <view
+      class="productList-bottom"
+      :class="{ 'productList-bottom-2': selectCommodityList.length > 0 }"
+    >
+      <view class="product-tips" v-if="selectCommodityList.length > 0">
+        共选择{{ selectCommodityList.length }}/100
+        <text class="product-tips-check" @click="showPopup = true">
+          查看
+          <u-icon class="icon-up" size="8" name="arrow-up"></u-icon>
+        </text>
+      </view>
+      <view class="commodity-btn-content">
+        <u-button
+          class="commodity-btn-item"
+          :hairline="true"
+          :plain="true"
+          shape="circle"
+          @click="updateProductPutaway(1001)"
+        >
+          上架
+        </u-button>
+        <u-button
+          class="commodity-btn-item"
+          :hairline="true"
+          :plain="true"
+          shape="circle"
+          @click="updateProductPutaway(1002)"
+        >
+          下架
+        </u-button>
+        <u-button
+          class="commodity-btn-item commodity-btn-item-2"
+          :hairline="true"
+          :plain="true"
+          shape="circle"
+          @click="delectCommodity"
+        >
+          删除
+        </u-button>
+      </view>
+    </view>
+    <u-loading-page
+      style="z-index: 999"
+      :loading="isEditLoading"
+      bgColor="rgba(0,0,0,0.5)"
+      fontSize="32rpx"
+      color="#fff"
+      :loadingText="''"
+    ></u-loading-page>
+    <u-popup
+      class="batch-popup"
+      :show="showPopup"
+      mode="bottom"
+      :closeable="true"
+      zIndex="10075"
+      @close="handerCloseSelct"
+    >
+      <view class="batch-popup-content">
+        <view class="batch-popup-title">已选商品</view>
+        <view class="tips">
+          <view class="tips-name">
+            共选择
+            <text class="tips-num">{{ selectCommodityList.length }}/100</text>
+            个商品
+          </view>
+          <u-button
+            @click="emptySelectAll"
+            class="empty-select-btn"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+          >
+            清空已选
+          </u-button>
+        </view>
+        <view class="select-commodity-list">
+          <scroll-view
+            scroll-y
+            class="select-commodity-list-scroll-view"
+            :show-scrollbar="false"
+            :style="{
+              maxHeight: selectCommodityList.length >= 7 ? '500px' : 'none',
+              overflowY: selectCommodityList.length >= 7 ? 'auto' : 'visible',
+            }"
+          >
+            <view
+              class="commodity-item"
+              v-for="(item, index) of selectCommodityList"
+              :key="index"
+            >
+              <view class="commodity-info">
+                <view
+                  :class="[
+                    'commodity-img',
+                    {
+                      'commodity-img-sold-out': item.product_state_id == 1002,
+                    },
+                  ]"
+                >
+                  <u--image
+                    :src="item.product_image"
+                    radius="8"
+                    width="60px"
+                    height="60px"
+                    @click="handlerShowImg(item.product_image)"
+                  ></u--image>
+                </view>
+                <view class="commodity-info-box">
+                  <view class="commodity-name">
+                    {{ item.product_name }}
+                  </view>
+                  <view class="commodity-inventory">
+                    库存{{ item.itemQuantity }}
+                  </view>
+                  <view class="commodity-price">
+                    <block class="currency">¥</block>
+                    {{ item.product_unit_price }}
+                  </view>
+                </view>
+              </view>
+              <view
+                class="icon-content"
+                @click="delectSelectCommodity(item, index)"
+              >
+                <u-icon
+                  class="u-icon-jianhao"
+                  custom-prefix="custom-icon-jianhao custom-icon"
+                  size="20"
+                ></u-icon>
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+      </view>
+    </u-popup>
+    <u-popup
+      class="affirm-popup"
+      zIndex="10077"
+      :show="showAffirmEmptyPopup"
+      mode="center"
+    >
+      <view class="affirm-popup-content">
+        <view class="affirm-popup-title">确认清空</view>
+        <view class="affirm-popup-tips">
+          已选择
+          <text style="margin: 0 6rx">
+            {{ this.selectCommodityList.length }}
+          </text>
+          个商品,清空后需要重新勾选
+        </view>
+        <view class="popup-btn-list">
+          <u-button
+            class="btn-item"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="showAffirmEmptyPopup = false"
+          >
+            取消
+          </u-button>
+          <u-button
+            class="btn-item btn-item-2"
+            :hairline="true"
+            :plain="true"
+            shape="circle"
+            @click="handerAffirmEmptyAll"
+          >
+            清空
+          </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">确认删除</view>
+        <view class="affirm-popup-tips">
+          当前已选择
+          <text style="margin: 0 6rx">
+            {{ this.selectCommodityList.length }}
+          </text>
+          个商品,删除后不可恢复!
+        </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="handerDelectCommodity"
+          >
+            删除
+          </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">
+          已选择
+          <text style="margin: 0 6rx">
+            {{ this.selectCommodityList.length }}
+          </text>
+          个商品,现在退出将不保留操作几率
+        </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-popup
+      class="right-popup"
+      zIndex="1000"
+      :overlay="false"
+      :show="showRightPopup"
+      mode="right"
+    >
+      <batchSearch
+        @pageBack="showRightPopup = false"
+        :selectCommodityList="selectCommodityList"
+        @searchCommodity="searchCommodity"
+      />
+    </u-popup>
+    <tui-gallery
+      :urls="showImgList"
+      :show="showImg"
+      @hide="hideImg"
+    ></tui-gallery>
+  </view>
+</template>
+
+<script>
+import {
+  GetProductCategoryTree,
+  GetProductList,
+  UpdateProductPutaway,
+  DelectCommodity,
+} from "@/api/warehouse/productList";
+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 tuiGallery from "@/components/tui-gallery/tui-gallery.vue";
+import batchSearch from "./batchSearch.vue";
+export default {
+  name: "productList",
+  components: {
+    navBar,
+    tuiCollapse,
+    favoriteLoading,
+    tuiGallery,
+    batchSearch,
+  },
+  data() {
+    return {
+      tabbar: [],
+      height: 0, //scroll-view高度
+      top: 0,
+      currentTab: 0, //预设当前项的值
+      current: -1, // 手风琴状态
+      scrollViewId: "id_0",
+      commodityStatusList: [
+        {
+          value: null,
+          name: "全部",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          // 1001-正常;1002-下架仓库中;1000-违规禁售
+          value: 1001,
+          name: "销售中",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1002,
+          name: "仓库中",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1000,
+          name: "违规禁售",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1003,
+          name: "待审核",
+          badge: {
+            value: 0,
+          },
+        },
+      ],
+      commodityList: [],
+      pageNum: 1,
+      pageSize: 20,
+      currCategoryId: null,
+      currProductStateId: null,
+      currTabChildrenIndex: 0,
+      collApseIndex: 0,
+      loadingCommodityData: false,
+      loadingDownCommodityData: false,
+      isNoCommodityData: false,
+      isNoDownCommodityData: false,
+      isRefreshing: false,
+      time: null,
+      time2: null,
+      showImgList: [],
+      showImg: false,
+      selectCommodityList: [],
+      showPopup: false,
+      showAffirmEmptyPopup: false,
+      isEditLoading: false,
+      showDelectPopup: false,
+      showBackPopup: false,
+      showRightPopup: false,
+    };
+  },
+  computed: {
+    hasCheckboxValue() {
+      // 递归检查 checkboxList 是否有值
+      const check = (items) => {
+        for (const item of items) {
+          if (item.checkboxList?.length > 0) return true;
+          if (item.children?.length > 0 && check(item.children)) return true;
+        }
+        return false;
+      };
+      return check(this.tabbar);
+    },
+  },
+  onLoad: function (options) {
+    setTimeout(() => {
+      uni.getSystemInfo({
+        success: (res) => {
+          let header = 60;
+          let top = 0;
+          //#ifdef H5
+          top = 44;
+          //#endif
+          this.height = res.windowHeight - uni.upx2px(header);
+          this.top = top + uni.upx2px(header);
+        },
+      });
+    }, 50);
+  },
+  onReady() {},
+  onShow() {
+    this.getProductCategoryTree();
+  },
+
+  mounted() {},
+  methods: {
+    pageBack() {
+      if (this.selectCommodityList.length > 0) {
+        this.showBackPopup = true;
+      } else {
+        uni.navigateBack();
+      }
+    },
+    handerPageBack() {
+      uni.navigateBack();
+    },
+    // 点击标题切换当前页时改变样式
+    swichNav: function (e) {
+      let cur = e.currentTarget.dataset.current;
+      if (this.currentTab == cur) {
+        return false;
+      } else {
+        this.currentTab = cur;
+        this.checkCor();
+      }
+    },
+    //判断当前滚动超过一屏时，设置tab标题滚动条。
+    checkCor: function () {
+      if (this.currentTab > 6) {
+        this.scrollViewId = `id_${this.currentTab - 2}`;
+      } else {
+        this.scrollViewId = `id_0`;
+      }
+    },
+    async getProductCategoryTree() {
+      let res = await GetProductCategoryTree();
+      if (res && res.status == 200) {
+        this.tabbar = res.data;
+
+        // 定义递归函数，处理每个 item 及其 children
+        const resetCheckboxLists = (items) => {
+          return items.map((item) => {
+            const newItem = {
+              ...item,
+              checkboxList: [],
+              checkboxAllList: [],
+            };
+
+            // 如果有 children，递归处理
+            if (item.children && Array.isArray(item.children)) {
+              newItem.children = resetCheckboxLists(item.children);
+            }
+
+            return newItem;
+          });
+        };
+
+        // 应用递归函数处理整个 tabbar
+        this.tabbar = resetCheckboxLists(res.data);
+
+        console.log(this.tabbar);
+        if (this.tabbar.length > 0) {
+          if (this.tabbar[0].children.length) {
+            this.current = 0; // 打开手风琴
+            this.currentTab = this.tabbar[0].children[0].id;
+            this.currCategoryId = this.tabbar[0].children[0].id;
+            this.currTabChildrenIndex = 0;
+          } else {
+            this.currCategoryId = this.tabbar[0].id;
+          }
+
+          this.getProductList();
+        }
+      }
+    },
+    async getProductList() {
+      this.isNoCommodityData = false;
+
+      if (this.loadingDownCommodityData) {
+        this.loadingCommodityData = false;
+      } else {
+        this.loadingCommodityData = true;
+      }
+
+      if (this.isRefreshing) {
+        this.pageNum = 1;
+        this.isNoCommodityData = false;
+        this.isNoDownCommodityData = false;
+      }
+
+      let params = {
+        kind_id: "1201,1202,1203",
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        product_state_id: this.currProductStateId,
+        category_id: this.currCategoryId,
+        openCount: true,
+      };
+
+      let res = await GetProductList(params);
+      if (res && res.status == 200) {
+        if (this.loadingDownCommodityData) {
+          if (res.data.items.length <= 0) {
+            this.loadingDownCommodityData = false;
+            this.isNoDownCommodityData = true;
+            return;
+          } else {
+            this.commodityList = [...this.commodityList, ...res.data.items];
+          }
+        } else {
+          this.commodityList = res.data.items;
+        }
+
+        if (this.commodityList.length <= 0) {
+          this.isNoCommodityData = true;
+        }
+
+        this.autoCheckSelectedProducts();
+
+        var {
+          allRecords,
+          normalRecords,
+          offRecords,
+          illegalRecords,
+          unCheckedRecords,
+        } = res.data;
+
+        this.commodityStatusList[0].badge.value = allRecords;
+        this.commodityStatusList[1].badge.value = normalRecords;
+        this.commodityStatusList[2].badge.value = offRecords;
+        this.commodityStatusList[3].badge.value = illegalRecords;
+        this.commodityStatusList[4].badge.value = unCheckedRecords;
+
+        this.$nextTick(() => {
+          this.$refs.tabsRef.init();
+        });
+      }
+
+      this.loadingDownCommodityData = false;
+      this.loadingCommodityData = false;
+      this.isRefreshing = false;
+    },
+    // 自动勾选已在selectCommodityList中的商品
+    autoCheckSelectedProducts() {
+      if (!this.commodityList.length || !this.selectCommodityList.length)
+        return;
+
+      // 获取当前页所有商品ID
+      const currentPageIds = this.commodityList.map((p) => p.product_id);
+
+      // 获取当前页中已选中的商品ID
+      const selectedIdsInCurrentPage = this.selectCommodityList
+        .filter((item) => currentPageIds.includes(item.product_id))
+        .map((item) => item.product_id);
+
+      if (!selectedIdsInCurrentPage.length) return;
+
+      // 根据是否有子分类决定操作哪个数据
+      const hasChildren = this.tabbar[this.current]?.children?.length > 0;
+      const targetData = hasChildren
+        ? this.tabbar[this.current].children[this.currTabChildrenIndex]
+        : this.tabbar[this.current];
+
+      if (!targetData) return;
+
+      // 合并去重，避免重复添加
+      const newCheckboxList = [
+        ...new Set([
+          ...(targetData.checkboxList || []),
+          ...selectedIdsInCurrentPage,
+        ]),
+      ];
+
+      // 更新复选框状态
+      targetData.checkboxList = newCheckboxList;
+
+      // 检查是否需要更新全选状态
+      const allCurrentPageIds = this.commodityList
+        .filter((item) => item.product_id)
+        .map((item) => item.product_id);
+
+      const isAllSelected = allCurrentPageIds.every((id) =>
+        newCheckboxList.includes(id)
+      );
+
+      if (isAllSelected) {
+        targetData.checkboxAllList = ["select-all"];
+      }
+    },
+    handleRefresh() {
+      this.isRefreshing = true;
+      this.getProductList();
+    },
+    async updateProductPutaway(type) {
+      if (this.selectCommodityList.length <= 0) {
+        uni.$u.toast("请先选择商品");
+        return;
+      }
+
+      this.isEditLoading = true;
+
+      let productIdList = this.selectCommodityList.map(
+        (item) => item.product_id
+      );
+
+      let params = {
+        product_id: productIdList.toString(),
+        product_state_id: type,
+      };
+
+      let res = await UpdateProductPutaway(params);
+      if (res && res.status) {
+        uni.$u.toast(
+          `${this.selectCommodityList.length}个商品${
+            type == 1001 ? "上架" : "下架"
+          }成功`
+        );
+
+        this.commodityList = this.commodityList.map((item) => {
+          if (productIdList.includes(item.product_id)) {
+            return {
+              ...item,
+              product_state_id: type,
+            };
+          }
+          return item;
+        });
+
+        await this.updateCommodityStatistics();
+
+        this.clearCheckboxLists(this.tabbar);
+        this.selectCommodityList = [];
+      }
+      this.isEditLoading = false;
+    },
+    async updateCommodityStatistics() {
+      let params = {
+        kind_id: "1201,1202,1203",
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        product_state_id: this.currProductStateId,
+        category_id: this.currCategoryId,
+        openCount: true,
+      };
+
+      let result = await GetProductList(params);
+
+      if (result && result.status == 200) {
+        var {
+          allRecords,
+          normalRecords,
+          offRecords,
+          illegalRecords,
+          unCheckedRecords,
+        } = result.data;
+
+        this.commodityStatusList[0].badge.value = allRecords;
+        this.commodityStatusList[1].badge.value = normalRecords;
+        this.commodityStatusList[2].badge.value = offRecords;
+        this.commodityStatusList[3].badge.value = illegalRecords;
+        this.commodityStatusList[4].badge.value = unCheckedRecords;
+      }
+    },
+    handerScrolltolower() {
+      if (this.tabbar[this.current].children.length > 0) {
+        this.tabbar[this.current].children[
+          this.currTabChildrenIndex
+        ].checkboxAllList = [];
+      } else {
+        this.tabbar[this.current].checkboxAllList = [];
+      }
+
+      if (this.isNoDownCommodityData) return;
+      this.loadingDownCommodityData = true;
+      this.time = setTimeout(() => {
+        this.pageNum = this.pageNum + 1;
+        this.getProductList();
+      }, 500);
+    },
+    handerCommodityStatus(e) {
+      this.pageNum = 1;
+      this.pageSize = 20;
+      this.isNoDownCommodityData = false;
+      this.isNoCommodityData = false;
+      this.currProductStateId = e.value;
+      this.commodityList = [];
+      this.getProductList();
+    },
+
+    handerSearchCommodityStatus() {},
+    emptySelectAll() {
+      this.showAffirmEmptyPopup = true;
+    },
+    handerAffirmEmptyAll() {
+      this.clearCheckboxLists(this.tabbar);
+
+      this.selectCommodityList = [];
+      this.showAffirmEmptyPopup = false;
+      this.showPopup = false;
+    },
+    clearCheckboxLists(data) {
+      data.forEach((item) => {
+        item.checkboxList = [];
+        item.checkboxAllList = [];
+        if (item.children && item.children.length) {
+          this.clearCheckboxLists(item.children);
+        }
+      });
+    },
+    handerCollApse(e) {
+      let index = e.index;
+      //手风琴展开状态  -1 == 不展开
+      const oldCategoryId = this.currCategoryId;
+
+      this.current = this.current == index ? -1 : e.index;
+
+      // 如果current没有实际变化（点击的是已经展开的项），直接返回
+
+      if (this.current != -1 && this.tabbar[index].children.length > 0) {
+        this.currentTab =
+          this.tabbar[index].children[this.currTabChildrenIndex].id;
+        this.currCategoryId =
+          this.tabbar[index].children[this.currTabChildrenIndex].id;
+      } else {
+        this.currentTab = index;
+        this.currCategoryId = this.tabbar[index].id;
+
+        if (this.current != -1) {
+          this.currTabChildrenIndex = 0;
+        }
+      }
+
+      this.pageNum = 1;
+      this.pageSize = 20;
+
+      if (this.collApseIndex == index) {
+        return;
+      }
+      if (this.currCategoryId != oldCategoryId && this.current != -1) {
+        this.getProductList();
+        this.collApseIndex = index;
+      }
+    },
+    // 点击子集时触发
+    handerCollApseChildren(index1, index2) {
+      const oldCategoryId = this.currCategoryId;
+
+      //获取当前子集下的坐标
+      this.currTabChildrenIndex = index2;
+      //active状态
+      this.currentTab = this.tabbar[index1].children[index2].id;
+      //当前子集id
+      this.currCategoryId = this.tabbar[index1].children[index2].id;
+      if (this.currCategoryId != oldCategoryId) {
+        this.getProductList();
+      }
+    },
+    handleSelectAll(e, isHaveChildren) {
+      const MAX_LIMIT = 100;
+      const currentTabData = isHaveChildren
+        ? this.tabbar[this.current].children[this.currTabChildrenIndex]
+        : this.tabbar[this.current];
+
+      // 获取当前页所有有效商品ID
+      const allProductIds = this.commodityList
+        .filter((item) => item.product_id)
+        .map((item) => item.product_id);
+
+      // 判断当前是否全选状态
+      const isCurrentlyAllSelected =
+        currentTabData.checkboxList?.length === allProductIds.length &&
+        allProductIds.length > 0;
+
+      // 计算新的选中列表
+      let newIdList = isCurrentlyAllSelected ? [] : [...allProductIds];
+
+      // 计算当前总选中数（包括其他标签页）
+      const currentTotalSelected = this.calculateTotalSelected(
+        [],
+        isHaveChildren
+      );
+
+      // 计算可添加的数量
+      const availableSlots = MAX_LIMIT - currentTotalSelected;
+
+      // 如果可添加的数量小于当前页商品数，只添加部分商品
+      if (availableSlots < newIdList.length && !isCurrentlyAllSelected) {
+        // 只添加可添加数量的商品
+        newIdList = newIdList.slice(0, availableSlots);
+
+        // 如果可添加数量为0，则提示用户
+        if (availableSlots > 0) {
+          uni.$u.toast(`最多可选${MAX_LIMIT}个商品，超出的商品无法选中`);
+        } else {
+          uni.$u.toast(`最多可选${MAX_LIMIT}个商品，超出的商品无法选中`);
+          return; // 添加return防止继续执行
+        }
+      }
+
+      // 检查是否超过限制
+      const totalSelected = this.calculateTotalSelected(
+        newIdList,
+        isHaveChildren
+      );
+      if (totalSelected > MAX_LIMIT) {
+        this.clearCheckboxState(currentTabData);
+        uni.$u.toast(`最多可选${MAX_LIMIT}个商品，超出的商品无法选中`);
+        return;
+      }
+
+      // 更新当前标签页的复选框状态
+      this.updateCheckboxState(currentTabData, newIdList, allProductIds);
+
+      // 更新选中的商品对象列表
+      this.updateSelectedCommodities(newIdList);
+    },
+
+    /**
+     * 处理单个商品选择变化
+     * @param {Array} list 变化的复选框值列表
+     * @param {Boolean} isHaveChildren 当前是否有子分类
+     */
+    handleSingleCheckboxChange(list, isHaveChildren) {
+      const MAX_LIMIT = 100;
+      const currentTabData = isHaveChildren
+        ? this.tabbar[this.current].children[this.currTabChildrenIndex]
+        : this.tabbar[this.current];
+
+      // 过滤掉全选标识和无效ID
+      let newIdList = list
+        .filter((id) => id !== "select-all" && id !== "")
+        .filter((id, index, self) => self.indexOf(id) === index); // 去重
+
+      // 计算当前总选中数（包括其他标签页）
+      const currentTotalSelected = this.calculateTotalSelected(
+        [],
+        isHaveChildren
+      );
+
+      // 计算可添加的数量
+      const availableSlots = MAX_LIMIT - currentTotalSelected;
+
+      // 如果尝试添加的数量超过可用槽位
+      if (newIdList.length > currentTabData.checkboxList.length) {
+        const addedCount =
+          newIdList.length - currentTabData.checkboxList.length;
+
+        // 如果添加的数量超过可用槽位
+        if (addedCount > availableSlots) {
+          // 只添加可添加数量的商品
+          const addedIds = newIdList.filter(
+            (id) => !currentTabData.checkboxList.includes(id)
+          );
+
+          const partialAddedIds = addedIds.slice(0, availableSlots);
+          newIdList = [...currentTabData.checkboxList, ...partialAddedIds];
+
+          if (availableSlots > 0) {
+            uni.$u.toast(`最多可选${MAX_LIMIT}个商品，超出的商品无法选中`);
+          } else {
+            uni.$u.toast(`最多可选${MAX_LIMIT}个商品，超出的商品无法选中`);
+          }
+        }
+      }
+
+      // 获取当前页所有有效商品ID
+      const allProductIds = this.commodityList
+        .filter((item) => item.product_id)
+        .map((item) => item.product_id);
+
+      // 更新当前标签页的复选框状态
+      this.updateCheckboxState(currentTabData, newIdList, allProductIds);
+
+      // 更新选中的商品对象列表
+      this.updateSelectedCommodities(newIdList);
+    },
+
+    /**
+     * 计算总选中数量（考虑其他标签页的选中）
+     */
+    calculateTotalSelected(newList, isHaveChildren) {
+      // 计算当前页新选中的商品数量
+      const currentSelectedCount = newList.length;
+
+      // 计算其他标签页已选中的商品数量
+      let otherSelectedCount = 0;
+      this.tabbar.forEach((tab, tabIndex) => {
+        if (tabIndex === this.current && isHaveChildren) {
+          // 如果是当前父分类，检查其他子分类
+          tab.children.forEach((child, childIndex) => {
+            if (
+              !(
+                tabIndex === this.current &&
+                childIndex === this.currTabChildrenIndex
+              )
+            ) {
+              otherSelectedCount += child.checkboxList?.length || 0;
+            }
+          });
+        } else if (tabIndex !== this.current) {
+          // 其他分类
+          if (tab.children?.length > 0) {
+            otherSelectedCount += tab.children.reduce(
+              (sum, child) => sum + (child.checkboxList?.length || 0),
+              0
+            );
+          } else {
+            otherSelectedCount += tab.checkboxList?.length || 0;
+          }
+        }
+      });
+
+      return currentSelectedCount + otherSelectedCount;
+    },
+
+    /**
+     * 更新当前标签页的复选框状态
+     * @param {Object} tabData 当前标签页数据
+     * @param {Array} idList 选中的商品ID列表
+     * @param {Array} allIds 当前页所有商品ID
+     */
+    updateCheckboxState(tabData, idList, allIds) {
+      // 更新复选框的ID列表
+      tabData.checkboxList = idList;
+
+      // 计算是否全选状态
+      const isAllSelected =
+        idList.length === allIds.length &&
+        allIds.length > 0 &&
+        idList.every((id) => allIds.includes(id));
+
+      // 更新全选复选框状态
+      tabData.checkboxAllList = isAllSelected ? ["select-all"] : [];
+    },
+
+    /**
+     * 更新选中的商品对象列表
+     * @param {Array} idList 选中的商品ID列表
+     */
+    updateSelectedCommodities(idList) {
+      // 创建当前页商品ID到商品对象的映射
+      const currentProductMap = this.commodityList.reduce((map, product) => {
+        map[product.product_id] = product;
+        return map;
+      }, {});
+
+      // 更新选中商品列表：
+      // 1. 保留不在当前页的商品
+      // 2. 添加当前页新选中的商品
+      // 3. 移除当前页取消选中的商品
+
+      // 获取当前页所有商品ID
+      const currentPageIds = this.commodityList.map((p) => p.product_id);
+
+      // 保留不在当前页的选中商品
+      const otherSelectedProducts = this.selectCommodityList.filter(
+        (item) => !currentPageIds.includes(item.product_id)
+      );
+
+      // 添加当前页选中的商品
+      const currentSelectedProducts = idList
+        .filter((id) => currentProductMap[id])
+        .map((id) => currentProductMap[id]);
+
+      // 合并并去重
+      const newSelectedList = [
+        ...otherSelectedProducts,
+        ...currentSelectedProducts,
+      ];
+
+      // 确保不超过100个
+      this.selectCommodityList = newSelectedList.slice(0, 100);
+    },
+
+    /**
+     * 清空复选框状态
+     */
+    clearCheckboxState(tabData) {
+      tabData.checkboxAllList = [];
+      tabData.checkboxList = [];
+    },
+    delectSelectCommodity(item, index) {
+      this.selectCommodityList.splice(index, 1);
+
+      // 从 checkboxList 中删除对应的 product_id
+      const productIdIndex = this.tabbar[this.currentTab].checkboxList.indexOf(
+        item.product_id
+      );
+      if (productIdIndex !== -1) {
+        this.tabbar[this.currentTab].checkboxList.splice(productIdIndex, 1);
+      }
+
+      // 如果 selectAll 被选中且 checkboxList 为空，则取消 selectAll
+      if (
+        this.tabbar[this.currentTab].checkboxAllList.includes("select-all") &&
+        this.tabbar[this.currentTab].checkboxList.length === 0
+      ) {
+        this.tabbar[this.currentTab].checkboxAllList = [];
+      }
+
+      if (this.selectCommodityList.length <= 0) {
+        this.showPopup = false;
+      }
+    },
+    searchCommodity(list) {
+      this.selectCommodityList = [
+        ...new Set([...this.selectCommodityList, ...list]),
+      ];
+
+      this.autoCheckSelectedProducts();
+
+      const clearCheckboxAllList = (data) => {
+        data.forEach((item) => {
+          item.checkboxAllList = [];
+          if (item.children && item.children.length) {
+            clearCheckboxAllList(item.children);
+          }
+        });
+      };
+
+      if (this.selectCommodityList.length == 100) {
+        clearCheckboxAllList(this.tabbar);
+      }
+    },
+
+    handlerShowImg(url) {
+      if (!url) return;
+      this.showImg = true;
+      this.showImgList = [
+        {
+          src: url,
+          desc: "", // You can add description if needed
+        },
+      ];
+    },
+    delectCommodity() {
+      this.showDelectPopup = true;
+    },
+    async handerDelectCommodity() {
+      const productIds = this.selectCommodityList.map(
+        (item) => item.product_id
+      );
+
+      let params = {
+        product_ids: productIds.toString(),
+      };
+
+      let res = await DelectCommodity(params);
+      if (res && res.status == 200) {
+        uni.$u.toast("操作成功");
+
+        await this.updateCommodityStatistics();
+
+        this.clearCheckboxLists(this.tabbar);
+        this.selectCommodityList = [];
+      }
+
+      this.showDelectPopup = false;
+    },
+    hideImg() {
+      this.showImg = false;
+    },
+    handerCloseSelct() {
+      this.showPopup = false;
+    },
+    detail(e) {
+      uni.navigateTo({
+        url: "../productDetail/productDetail",
+      });
+    },
+    productList(e) {
+      let key = e.currentTarget.dataset.key;
+      uni.navigateTo({
+        url: "../productList/productList?searchKey=" + key,
+      });
+    },
+    search: function () {
+      uni.navigateTo({
+        url: "../../news/search/search",
+      });
+    },
+    skipuBatch() {
+      uni.navigateTo({
+        url: "/pages/warehouse/manage/batch",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/variables.scss";
+.batch-container {
+  height: calc(100vh);
+  background: #fff;
+
+  ::v-deep.uni-nav-bar-text {
+    font-weight: bold;
+    font-size: 32rpx;
+  }
+
+  ::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    color: transparent;
+  }
+
+  .tui-searchbox {
+    width: 100%;
+    height: 92rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    left: 0;
+    top: 0;
+    /* #ifdef H5 */
+    top: 0;
+    /* #endif */
+    z-index: 100;
+  }
+
+  .tui-searchbox::after {
+    content: "";
+    position: absolute;
+    border-bottom: 1rpx solid #d2d2d2;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    bottom: 0;
+    right: 0;
+    left: 0;
+  }
+
+  .tui-search-input {
+    width: 100%;
+    height: 60rpx;
+    background: #f1f1f1;
+    border-radius: 30rpx;
+    font-size: 26rpx;
+    color: #999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .tui-search-text {
+    padding-left: 16rpx;
+  }
+
+  .tab-view {
+    /* height: 100%; */
+    width: 200rpx;
+    position: fixed;
+    left: 0;
+    z-index: 10;
+  }
+
+  .tab-bar-item {
+    width: 200rpx;
+    min-height: 57px;
+    background: #f5f6fa;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 30rpx;
+    color: #666666;
+    font-weight: 400;
+    padding: 12rpx;
+    padding-left: 28px;
+    padding-right: 32rpx;
+    word-wrap: break-word;
+    word-break: break-all;
+  }
+
+  .active {
+    position: relative;
+    color: #000;
+
+    font-weight: 600;
+    background: #fff;
+  }
+
+  .tab-bar-item-2 {
+    font-size: 28rpx;
+    background: #fff !important;
+  }
+
+  .active2 {
+    background: #fff;
+  }
+
+  .active::before {
+    content: "";
+    position: absolute;
+    border-left: 8rpx solid #e41f19;
+    height: 30rpx;
+    left: 0;
+  }
+
+  /* 左侧导航布局 end*/
+
+  .right-box {
+    width: 100%;
+    position: fixed;
+    padding-left: 210rpx;
+    box-sizing: border-box;
+    left: 0;
+    background: #fff;
+  }
+
+  .page-view {
+    width: 100%;
+    overflow: hidden;
+    padding-top: 20rpx;
+    padding-right: 20rpx;
+    box-sizing: border-box;
+    padding-bottom: env(safe-area-inset-bottom);
+  }
+
+  .swiper {
+    width: 100%;
+    height: 220rpx;
+    border-radius: 12rpx;
+    overflow: hidden;
+    transform: translateZ(0);
+  }
+
+  /* #ifdef MP-WEIXIN */
+  .swiper .wx-swiper-dot {
+    width: 8rpx;
+    height: 8rpx;
+    display: inline-flex;
+    background: none;
+    justify-content: space-between;
+  }
+
+  .swiper .wx-swiper-dot::before {
+    content: "";
+    flex-grow: 1;
+    background: rgba(255, 255, 255, 0.8);
+    border-radius: 16rpx;
+    overflow: hidden;
+  }
+
+  .swiper .wx-swiper-dot-active::before {
+    background: #fff;
+  }
+
+  .swiper .wx-swiper-dot.wx-swiper-dot-active {
+    width: 16rpx;
+  }
+
+  /* #endif */
+
+  /* #ifndef MP-WEIXIN */
+  ::v-deep .swiper .uni-swiper-dot {
+    width: 8rpx;
+    height: 8rpx;
+    display: inline-flex;
+    background: none;
+    justify-content: space-between;
+  }
+
+  ::v-deep .swiper .uni-swiper-dot::before {
+    content: "";
+    flex-grow: 1;
+    background: rgba(255, 255, 255, 0.8);
+    border-radius: 16rpx;
+    overflow: hidden;
+  }
+
+  ::v-deep .swiper .uni-swiper-dot-active::before {
+    background: #fff;
+  }
+
+  ::v-deep .swiper .uni-swiper-dot.uni-swiper-dot-active {
+    width: 16rpx;
+  }
+
+  /* #endif */
+
+  .slide-image {
+    width: 100%;
+    height: 220rpx;
+  }
+
+  .class-box {
+    padding-top: 30rpx;
+  }
+
+  .class-item {
+    background: #fff;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    border-radius: 12rpx;
+  }
+
+  .class-name {
+    font-size: 22rpx;
+  }
+
+  .g-container {
+    /* padding-top: 20rpx; */
+    display: flex;
+    display: -webkit-flex;
+    justify-content: flex-start;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+
+  .g-box {
+    width: 33.3333%;
+    text-align: center;
+    padding-top: 40rpx;
+  }
+
+  .g-image {
+    width: 120rpx;
+    height: 120rpx;
+  }
+
+  .g-title {
+    font-size: 22rpx;
+  }
+
+  .tui-content {
+    padding: 20rpx 30rpx;
+    background-color: #fff;
+    color: #555;
+    font-size: 26rpx;
+  }
+
+  .u-tabs {
+    border-bottom: 1px solid #f3f3f3;
+  }
+
+  .commodity-status {
+    position: sticky;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 3;
+    background: #fff;
+  }
+
+  .m-loading-box {
+    text-align: center;
+    padding: 40rpx;
+    color: #aaaa;
+    font-size: 28rpx;
+  }
+
+  .checkbox-all {
+    position: sticky;
+    top: 0;
+    left: 0;
+    display: flex;
+    align-items: center;
+    height: 60px;
+    width: 100%;
+    z-index: 100;
+    background: #fff;
+  }
+
+  .commodity-list {
+    padding: 20rpx;
+
+    .commodity-item {
+      display: flex;
+      align-items: center;
+      margin-bottom: 40rpx;
+
+      .commodity-checkbox {
+        margin-bottom: 20px;
+        margin-right: 20rpx;
+      }
+
+      .commodity-info {
+        display: flex;
+        margin-bottom: 40rpx;
+
+        .commodity-img {
+          position: relative;
+          margin-right: 20rpx;
+          width: 68px;
+          height: 68px;
+          border: 1px solid #ebebeb;
+          border-radius: 16rpx;
+        }
+
+        .commodity-img-sold-out {
+          &::before {
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+            height: 20px;
+            line-height: 20px;
+            content: "已下架";
+            text-align: center;
+            background: rgba(0, 0, 0, 0.6);
+            color: #fff;
+            z-index: 99;
+            font-size: 14px;
+            border-bottom-left-radius: 16rpx;
+            border-bottom-right-radius: 16rpx;
+          }
+        }
+
+        .commodity-info-box {
+          display: flex;
+          flex-flow: column;
+          justify-content: space-between;
+
+          .commodity-name {
+            font-weight: bold;
+            font-size: 36rpx;
+            word-break: break-all; /* 允许在任意字符间断行 */
+            overflow-wrap: break-word; /* 优先在单词间断行 */
+            display: -webkit-box;
+            -webkit-line-clamp: 2; /* 限制最多2行 */
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            text-overflow: ellipsis; /* 超出部分显示省略号 */
+          }
+
+          .commodity-inventory {
+            font-size: 28rpx;
+            color: #626262;
+            margin: 6rpx 0;
+          }
+
+          .commodity-price {
+            font-size: 32rpx;
+            font-weight: bold;
+            color: #ea3938;
+
+            .currency {
+              margin-right: 4px;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .no-data {
+    .no-data-bg {
+      margin: 60% auto;
+      margin-bottom: 0;
+      width: 300rpx;
+      height: 200rpx;
+      background-image: url("../../../static/no-commodity.png");
+      background-size: 100%;
+    }
+    .no-data-tips {
+      margin: 80rpx auto;
+      color: #aaaaaa;
+      text-align: center;
+    }
+  }
+
+  .productList-bottom {
+    position: fixed;
+    bottom: 0;
+    z-index: 99;
+    display: flex;
+    flex-flow: column;
+    padding: 40rpx;
+    width: 100%;
+    background: #fff;
+    border-top: 2px solid #f3f3f3;
+    // box-shadow: 0 0px 6px 0 rgba(0, 0, 0, 0.1);
+
+    .product-tips {
+      margin-bottom: 20rpx;
+      font-size: 24rpx;
+      text-align: center;
+
+      .product-tips-check {
+        margin-left: 10rpx;
+
+        color: $base-color;
+
+        .icon-up {
+          color: $base-color;
+          display: inline-block;
+
+          ::v-deep.uicon-arrow-up {
+            margin-left: 8rpx;
+            top: -1px !important;
+            color: $base-color !important;
+          }
+        }
+      }
+    }
+
+    &.productList-bottom-2 {
+      padding-top: 20rpx;
+    }
+
+    .commodity-btn-content {
+      display: flex;
+      .commodity-btn-item {
+        margin: 0;
+        margin-right: 20rpx;
+        width: 140rpx;
+        font-size: 24rpx;
+        border-color: #d2d2d2;
+        color: #000;
+
+        &::after {
+          border: none;
+        }
+      }
+
+      .commodity-btn-item-2 {
+        color: $base-color;
+        border-color: $base-color;
+      }
+    }
+  }
+
+  .batch-popup {
+    ::v-deep.u-popup__content {
+      border-top-left-radius: 16rpx;
+      border-top-right-radius: 16rpx;
+    }
+
+    .batch-popup-content {
+      // width: 100%;
+
+      .batch-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .tips {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 40rpx;
+        padding-left: 20rpx;
+        font-size: 15px;
+        color: #626262;
+
+        .tips-num {
+          padding: 0 8rpx;
+          font-size: 14px;
+          color: #000;
+        }
+
+        .empty-select-btn {
+          margin: 0;
+          margin-right: 20rpx;
+          width: 156rpx;
+          height: 60rpx;
+          font-size: 26rpx;
+          font-weight: bold;
+          border-color: $base-color;
+          color: $base-color;
+
+          &::after {
+            border: none;
+          }
+        }
+      }
+
+      .select-commodity-list {
+        padding: 20rpx;
+
+        .commodity-item {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-bottom: 40rpx;
+          padding: 0 40rpx;
+
+          .u-icon-jianhao {
+            ::v-deep.u-icon__icon {
+              color: $base-color !important;
+            }
+          }
+
+          .commodity-info {
+            display: flex;
+
+            .commodity-img {
+              position: relative;
+              margin-right: 20rpx;
+              width: 60px;
+              height: 60px;
+              border: 1px solid #ebebeb;
+              border-radius: 16rpx;
+            }
+
+            .commodity-img-sold-out {
+              &::before {
+                position: absolute;
+                bottom: 0;
+                width: 100%;
+                height: 20px;
+                line-height: 20px;
+                content: "已下架";
+                text-align: center;
+                background: rgba(0, 0, 0, 0.6);
+                color: #fff;
+                z-index: 99;
+                font-size: 14px;
+                border-bottom-left-radius: 16rpx;
+                border-bottom-right-radius: 16rpx;
+              }
+            }
+
+            .commodity-info-box {
+              display: flex;
+              flex-flow: column;
+              justify-content: space-between;
+
+              .commodity-name {
+                font-weight: bold;
+                font-size: 34rpx;
+                word-break: break-all; /* 允许在任意字符间断行 */
+                overflow-wrap: break-word; /* 优先在单词间断行 */
+                display: -webkit-box;
+                -webkit-line-clamp: 2; /* 限制最多2行 */
+                -webkit-box-orient: vertical;
+                overflow: hidden;
+                text-overflow: ellipsis; /* 超出部分显示省略号 */
+              }
+
+              .commodity-inventory {
+                margin: 6rpx 0;
+                font-size: 25rpx;
+                color: #626262;
+              }
+
+              .commodity-price {
+                font-size: 32rpx;
+                font-weight: bold;
+                color: #ea3938;
+
+                .currency {
+                  margin-right: 4px;
+                  font-size: 24rpx;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .affirm-popup {
+    ::v-deep.u-popup__content {
+      border-radius: 16rpx;
+    }
+
+    ::v-deep.u-fade-enter-to {
+      z-index: 10076 !important;
+    }
+
+    .affirm-popup-content {
+      width: 600rpx;
+
+      .affirm-popup-title {
+        padding: 40rpx;
+        text-align: center;
+        font-weight: 500;
+      }
+
+      .affirm-popup-tips {
+        padding: 0 60rpx;
+        font-size: 28rpx;
+      }
+
+      .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;
+        }
+      }
+    }
+  }
+
+  .right-popup {
+    .right-popup-content {
+      width: 100vw;
+    }
+  }
+
+  .commodity-loading {
+    margin: 70% auto;
+    display: flex;
+  }
+}
+</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
new file mode 100644
index 0000000..c8c50de
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/batchSearch.vue
@@ -0,0 +1,810 @@
+<template>
+  <view class="batch-search-container">
+    <navBar
+      class="nav-bar"
+      :statusBar="true"
+      :border="false"
+      :fixed="true"
+      :height="'44px'"
+      rightWidth="0"
+      :leftWidth="30"
+      backgroundColor="#fff"
+    >
+      <block slot="left">
+        <u-icon
+          name="arrow-left"
+          color="#000"
+          size="20"
+          @click="pageBack()"
+        ></u-icon>
+      </block>
+      <block slot="default">
+        <u-search
+          v-model="inputSearch"
+          class="search"
+          placeholder="请输入商品名称查找"
+          :showAction="false"
+          @change="handerSearch"
+          bgColor="#eeeeee"
+        ></u-search>
+      </block>
+    </navBar>
+    <view class="commodity-status" v-if="searchCommodityList.length > 0">
+      <u-tabs
+        class="u-tabs"
+        ref="tabsRef"
+        :list="searchCommodityStatusList"
+        @click="handerCommodityStatus"
+        itemStyle="padding-left: 15px; padding-right: 15px; height: 57px;"
+        activeStyle="font-weight: bold;color: #000;"
+        inactiveStyle="color:#999999;"
+        lineColor="#e41f19"
+      ></u-tabs>
+    </view>
+    <view
+      class="no-data"
+      v-if="searchCommodityList.length <= 0 && isNoCommodityData"
+    >
+      <view class="no-data-bg"></view>
+      <view class="no-data-tips">暂无商品</view>
+    </view>
+    <favorite-loading
+      class="commodity-loading"
+      v-show="loadingCommodityData"
+      :color="'#fe4119'"
+      text=""
+      animation="spinner15"
+    ></favorite-loading>
+    <scroll-view
+      v-if="searchCommodityList.length > 0 && !loadingCommodityData"
+      scroll-y
+      class="batch-search-scroll"
+      :show-scrollbar="false"
+      @scrolltolower="handerScrolltolower"
+      refresher-enabled
+      :refresher-triggered="isRefreshing"
+      @refresherrefresh="handleRefresh"
+    >
+      <u-checkbox-group
+        class="commodity-list"
+        v-model="checkboxList"
+        placement="column"
+        @change="handleSingleCheckboxChange($event, true)"
+      >
+        <view
+          class="commodity-item"
+          v-for="(item, index) of searchCommodityList"
+          :key="index"
+        >
+          <u-checkbox
+            class="commodity-checkbox"
+            :key="index"
+            :name="item.product_id"
+          ></u-checkbox>
+          <view
+            class="commodity-info"
+            @click="handleSingleCheckboxChange([item.product_id])"
+          >
+            <view
+              :class="[
+                'commodity-img',
+                { 'commodity-img-sold-out': item.product_state_id == 1002 },
+              ]"
+            >
+              <u--image
+                :src="item.product_image"
+                radius="8"
+                width="60px"
+                height="60px"
+                @click="handlerShowImg(item.product_image)"
+              ></u--image>
+            </view>
+            <view class="commodity-info-box">
+              <view class="commodity-name" v-html="item.searchName"></view>
+              <view class="commodity-inventory">
+                库存{{ item.itemQuantity }}
+              </view>
+              <view class="commodity-price">
+                <block class="currency">¥</block>
+                {{ item.product_unit_price }}
+              </view>
+            </view>
+          </view>
+        </view>
+      </u-checkbox-group>
+      <view
+        class="m-loading-box"
+        v-if="searchCommodityList.length > 0 && !isNoCommodityData"
+      >
+        <block v-if="loadingDownCommodityData">
+          <view class="u-loadmore">
+            <view class="u-loading"></view>
+            <text class="u-loadmore-tips">正在加载...</text>
+          </view>
+        </block>
+        <block v-else>
+          <view class="u-loadmore u-loadmore-line">
+            <text class="u-loadmore-tips">没有更多商品了 ~</text>
+          </view>
+        </block>
+      </view>
+    </scroll-view>
+    <view class="bottom" v-if="searchCommodityList.length > 0">
+      <u-checkbox-group
+        v-model="checkboxAllList"
+        placement="column"
+        @change="handleSelectAll($event, true)"
+      >
+        <u-checkbox
+          class="commodity-checkbox"
+          :name="'select-all'"
+          label="全选"
+        ></u-checkbox>
+      </u-checkbox-group>
+      <u-button
+        class="commodity-btn-item"
+        :hairline="true"
+        :plain="true"
+        shape="circle"
+        @click="affirmSelect"
+      >
+        确定选择
+      </u-button>
+    </view>
+    <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>
+    <tui-gallery
+      :urls="showImgList"
+      :show="showImg"
+      @hide="hideImg"
+    ></tui-gallery>
+    <u-toast ref="uToast"></u-toast>
+  </view>
+</template>
+
+<script>
+import { GetProductList } from "@/api/warehouse/productList";
+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 tuiGallery from "@/components/tui-gallery/tui-gallery.vue";
+export default {
+  name: "batchSearch",
+  props: {
+    selectCommodityList: {
+      type: Array,
+      default: [],
+    },
+  },
+  components: {
+    navBar,
+    tuiCollapse,
+    favoriteLoading,
+    tuiGallery,
+  },
+  data() {
+    return {
+      height: 0, //scroll-view高度
+      top: 0,
+      searchCommodityStatusList: [
+        {
+          value: null,
+          name: "全部",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          // 1001-正常;1002-下架仓库中;1000-违规禁售
+          value: 1001,
+          name: "销售中",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1002,
+          name: "仓库中",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1000,
+          name: "违规禁售",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1003,
+          name: "待审核",
+          badge: {
+            value: 0,
+          },
+        },
+      ],
+      searchCommodityList: [],
+      pageNum: 1,
+      pageSize: 20,
+      loadingCommodityData: false,
+      loadingDownCommodityData: false,
+      isNoCommodityData: false,
+      isNoDownCommodityData: false,
+      isRefreshing: false,
+      time: null,
+      searchTime: null,
+      showImgList: [],
+      showImg: false,
+      inputSearch: "",
+      checkboxList: [],
+      checkboxAllList: [],
+      showBackPopup: false,
+    };
+  },
+  computed: {
+    allSelectedExistInCurrentPage() {
+      if (this.selectCommodityList.length === 0) return false;
+
+      // 获取当前页面的所有商品ID
+      const currentPageIds = this.searchCommodityList.map(
+        (item) => item.product_id
+      );
+
+      // 检查selectCommodityList中的所有商品是否都在当前页面
+      return this.selectCommodityList.every((selectedItem) =>
+        currentPageIds.includes(selectedItem.product_id)
+      );
+    },
+  },
+  onLoad: function (options) {
+    setTimeout(() => {
+      uni.getSystemInfo({
+        success: (res) => {
+          let header = 60;
+          let top = 0;
+          //#ifdef H5
+          top = 44;
+          //#endif
+          this.height = res.windowHeight - uni.upx2px(header);
+          this.top = top + uni.upx2px(header);
+        },
+      });
+    }, 50);
+  },
+  onReady() {},
+  onShow() {
+    this.getProductCategoryTree();
+  },
+
+  mounted() {},
+  methods: {
+    pageBack() {
+      if (this.checkboxList.length > 0) {
+        this.showBackPopup = true;
+      } else {
+        this.$emit("pageBack");
+      }
+    },
+    handerPageBack() {
+      this.$emit("pageBack");
+    },
+    // 点击标题切换当前页时改变样式
+    swichNav: function (e) {
+      let cur = e.currentTarget.dataset.current;
+      if (this.currentTab == cur) {
+        return false;
+      } else {
+        this.currentTab = cur;
+        this.checkCor();
+      }
+    },
+    //判断当前滚动超过一屏时，设置tab标题滚动条。
+    checkCor: function () {
+      if (this.currentTab > 6) {
+        this.scrollViewId = `id_${this.currentTab - 2}`;
+      } else {
+        this.scrollViewId = `id_0`;
+      }
+    },
+    handerSearch() {
+      clearTimeout(this.searchTime);
+      this.searchTime = setTimeout(() => {
+        if (this.inputSearch.length == 0) {
+          this.pageNum = 1;
+          this.searchCommodityList = [];
+          this.checkboxList = [];
+          this.checkboxAllList = [];
+          return;
+        }
+        this.getProductList();
+      }, 500);
+    },
+    async getProductList() {
+      this.isNoCommodityData = false;
+
+      if (this.loadingDownCommodityData) {
+        this.loadingCommodityData = false;
+      } else {
+        this.loadingCommodityData = true;
+      }
+
+      if (this.isRefreshing) {
+        this.pageNum = 1;
+        this.isNoCommodityData = false;
+        this.isNoDownCommodityData = false;
+      }
+
+      let params = {
+        kind_id: "1201,1202,1203",
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        product_state_id: this.currProductStateId,
+        product_name: this.inputSearch,
+        openCount: true,
+      };
+
+      let res = await GetProductList(params);
+      if (res && res.status == 200) {
+        if (this.loadingDownCommodityData) {
+          if (res.data.items.length <= 0) {
+            this.loadingDownCommodityData = false;
+            this.isNoDownCommodityData = true;
+            return;
+          } else {
+            this.searchCommodityList = [
+              ...this.searchCommodityList,
+              ...res.data.items,
+            ];
+          }
+        } else {
+          this.searchCommodityList = res.data.items;
+        }
+
+        if (this.searchCommodityList.length <= 0) {
+          this.isNoCommodityData = true;
+        }
+
+        // 初始化选中状态：如果商品已在selectCommodityList中，自动勾选
+        this.checkboxList = [
+          ...this.checkboxList,
+          ...this.searchCommodityList
+            .filter((item) =>
+              this.selectCommodityList.some(
+                (selected) => selected.product_id === item.product_id
+              )
+            )
+            .map((item) => item.product_id),
+        ];
+
+        if (this.allSelectedExistInCurrentPage) {
+          this.checkboxAllList = ["select-all"];
+        } else {
+          this.checkboxAllList = [];
+        }
+
+        this.searchCommodityList.forEach((item) => {
+          if (item.product_name.indexOf(this.inputSearch) >= 0) {
+            item.searchName = item.product_name.replace(
+              new RegExp(this.inputSearch, "g"),
+              "<font style='color:#fe4119;padding:0 4px'>" +
+                this.inputSearch +
+                "</font>"
+            );
+          } else {
+            item.searchName = item.name;
+          }
+        });
+
+        var {
+          allRecords,
+          normalRecords,
+          offRecords,
+          illegalRecords,
+          unCheckedRecords,
+        } = res.data;
+
+        this.searchCommodityStatusList[0].badge.value = allRecords;
+        this.searchCommodityStatusList[1].badge.value = normalRecords;
+        this.searchCommodityStatusList[2].badge.value = offRecords;
+        this.searchCommodityStatusList[3].badge.value = illegalRecords;
+        this.searchCommodityStatusList[4].badge.value = unCheckedRecords;
+
+        this.$nextTick(() => {
+          this.$refs.tabsRef.init();
+        });
+      }
+
+      this.loadingDownCommodityData = false;
+      this.loadingCommodityData = false;
+      this.isRefreshing = false;
+    },
+    handleRefresh() {
+      this.isRefreshing = true;
+      this.getProductList();
+    },
+
+    handerScrolltolower() {
+      clearTimeout(this.time);
+      this.checkboxAllList = [];
+      if (this.isNoDownCommodityData) return;
+      this.loadingDownCommodityData = true;
+      this.time = setTimeout(() => {
+        this.pageNum = this.pageNum + 1;
+        this.getProductList();
+      }, 500);
+    },
+    handerCommodityStatus(e) {
+      this.pageNum = 1;
+      this.pageSize = 20;
+      this.isNoDownCommodityData = false;
+      this.isNoCommodityData = false;
+      this.currProductStateId = e.value;
+      this.searchCommodityList = [];
+      this.getProductList();
+    },
+    handerSearchCommodityStatus() {},
+    emptySelectAll() {
+      this.showAffirmEmptyPopup = true;
+    },
+    affirmSelect() {
+      // 计算最终选中数量
+      const totalSelected = [
+        ...new Set([
+          ...this.selectCommodityList.map((item) => item.product_id),
+          ...this.checkboxList,
+        ]),
+      ].length;
+
+      if (totalSelected > 100) {
+        uni.showToast({
+          title: `总数不能超过100个（当前${totalSelected}）`,
+          icon: "none",
+        });
+        return;
+      }
+
+      // 从searchCommodityList中找出所有被选中的商品对象
+      const selectedCommodities = this.searchCommodityList.filter((item) =>
+        this.checkboxList.includes(item.product_id)
+      );
+
+      // 过滤掉已经在父组件selectCommodityList中的商品
+      const newSelectedCommodities = selectedCommodities.filter(
+        (item) =>
+          !this.selectCommodityList.some(
+            (selected) => selected.product_id === item.product_id
+          )
+      );
+
+      // 传递给父组件的是新增的商品对象数组
+      this.$emit("searchCommodity", newSelectedCommodities);
+      this.$emit("pageBack");
+    },
+    hideImg() {
+      this.showImg = false;
+    },
+    handlerShowImg(url) {
+      if (!url) return;
+      this.showImg = true;
+      this.showImgList = [
+        {
+          src: url,
+          desc: "", // You can add description if needed
+        },
+      ];
+    },
+    handleSelectAll(list) {
+      // 获取当前页所有商品ID（包括滚动加载的）
+      const currentPageIds = this.searchCommodityList.map(
+        (item) => item.product_id
+      );
+
+      if (list.length > 0) {
+        // 全选操作
+        if (currentPageIds.length + this.checkboxList.length > 100) {
+          // 如果超过限制，计算还能选多少
+          const remaining = 100 - this.checkboxList.length;
+          const toSelect = currentPageIds.slice(
+            0,
+            remaining > 0 ? remaining : 0
+          );
+
+          this.checkboxList = [...this.checkboxList, ...toSelect];
+
+          if (remaining <= 0) {
+            this.$refs.uToast.show({
+              message: "已达到100个商品上限",
+              type: "error",
+              duration: 1000,
+            });
+          }
+
+          // 取消全选复选框的选中状态
+          setTimeout(() => {
+            this.checkboxAllList = [];
+          }, 0);
+        } else {
+          // 可以全部选中当前页
+          this.checkboxList = [
+            ...new Set([...this.checkboxList, ...currentPageIds]),
+          ];
+        }
+      } else {
+        // 取消全选：只取消当前页商品的选择
+        this.checkboxList = this.checkboxList.filter(
+          (id) => !currentPageIds.includes(id)
+        );
+      }
+    },
+    handleSingleCheckboxChange(list, isFromCheckbox = false) {
+      const remaining = 100 - this.selectCommodityList.length;
+      const currentSelected = this.checkboxList.length;
+
+      // 处理单个商品点击
+      if (!isFromCheckbox) {
+        const productId = list[0];
+        const isAlreadySelected = this.checkboxList.includes(productId);
+
+        // 如果是取消选中操作，直接处理
+        if (isAlreadySelected) {
+          this.checkboxList = this.checkboxList.filter(
+            (id) => id !== productId
+          );
+          return;
+        }
+
+        // 如果是选中操作，检查限额
+        if (currentSelected >= remaining) {
+          this.$refs.uToast.show({
+            message: "最多可选100个商品，超出的商品无法选中",
+            type: "error",
+            duration: 1000,
+          });
+          return;
+        }
+
+        this.checkboxList = [...this.checkboxList, productId];
+        return;
+      }
+
+      // 处理复选框组变化
+      if (list.length - currentSelected > remaining) {
+        return;
+      }
+
+      this.checkboxList = list;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/variables.scss";
+.batch-search-container {
+  width: 100vw;
+  height: 100vh;
+  background: #fff;
+
+  .nav-bar {
+    padding-top: 10px;
+  }
+
+  .batch-search-scroll {
+    height: calc(100vh - 230px);
+  }
+
+  .commodity-list {
+    padding: 48rpx 52rpx 0;
+
+    .commodity-item {
+      display: flex;
+      align-items: center;
+      margin-bottom: 40rpx;
+
+      .commodity-checkbox {
+        margin-bottom: 20px;
+        margin-right: 20rpx;
+      }
+
+      .commodity-info {
+        display: flex;
+
+        .commodity-img {
+          position: relative;
+          margin-right: 20rpx;
+          width: 60px;
+          height: 60px;
+          border: 1px solid #ebebeb;
+          border-radius: 16rpx;
+        }
+
+        .commodity-img-sold-out {
+          &::before {
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+            height: 20px;
+            line-height: 20px;
+            content: "已下架";
+            text-align: center;
+            background: rgba(0, 0, 0, 0.6);
+            color: #fff;
+            z-index: 99;
+            font-size: 14px;
+            border-bottom-left-radius: 16rpx;
+            border-bottom-right-radius: 16rpx;
+          }
+        }
+
+        .commodity-info-box {
+          display: flex;
+          flex-flow: column;
+          justify-content: space-between;
+
+          .commodity-name {
+            font-weight: bold;
+            font-size: 18px;
+            word-break: break-all; /* 允许在任意字符间断行 */
+            overflow-wrap: break-word; /* 优先在单词间断行 */
+            display: -webkit-box;
+            -webkit-line-clamp: 2; /* 限制最多2行 */
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            text-overflow: ellipsis; /* 超出部分显示省略号 */
+          }
+
+          .commodity-inventory {
+            font-size: 28rpx;
+            color: #626262;
+            margin: 6rpx 0;
+          }
+
+          .commodity-price {
+            font-size: 32rpx;
+            font-weight: bold;
+            color: #ea3938;
+
+            .currency {
+              margin-right: 4px;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .commodity-loading {
+    margin: 70% auto;
+    display: flex;
+  }
+
+  .m-loading-box {
+    text-align: center;
+    padding: 40rpx;
+    color: #aaaa;
+    font-size: 28rpx;
+  }
+
+  .bottom {
+    position: fixed;
+    width: 92%;
+    bottom: 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    margin: 40px 0;
+
+    .commodity-btn-item {
+      margin: 0;
+      margin-right: 20rpx;
+      width: 360rpx;
+      height: 38px;
+      font-size: 28rpx;
+      border: none;
+      color: #fff;
+      background: $base-color;
+
+      &::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: 500;
+      }
+
+      .affirm-popup-tips {
+        padding: 0 60rpx;
+        font-size: 28rpx;
+        text-align: center;
+      }
+
+      .popup-btn-list {
+        display: flex;
+        margin: 50rpx;
+
+        .btn-item {
+          width: 46%;
+          height: 80rpx;
+          border-color: #909193;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .btn-item-2 {
+          background: $base-color;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+  }
+
+  .no-data {
+    .no-data-bg {
+      margin: 60% auto;
+      margin-bottom: 0;
+      width: 300rpx;
+      height: 200rpx;
+      background-image: url("../../../static/no-commodity.png");
+      background-size: 100%;
+    }
+    .no-data-tips {
+      margin: 80rpx auto;
+      color: #aaaaaa;
+      text-align: center;
+    }
+  }
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/brandList.vue b/java-mall-app-shop-admin/pages/warehouse/manage/brandList.vue
new file mode 100644
index 0000000..e69de29
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue b/java-mall-app-shop-admin/pages/warehouse/manage/classifyList.vue
new file mode 100644
index 0000000..e69de29
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/components/tui-collapse/tui-collapse.vue b/java-mall-app-shop-admin/pages/warehouse/manage/components/tui-collapse/tui-collapse.vue
new file mode 100644
index 0000000..0ac934d
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/components/tui-collapse/tui-collapse.vue
@@ -0,0 +1,187 @@
+<template>
+  <view class="tui-collapse" :style="{ backgroundColor: bgColor }">
+    <view
+      class="tui-collapse-head"
+      :style="{ backgroundColor: hdBgColor }"
+      @tap.stop="handleClick"
+    >
+      <view class="tui-header" :class="{ 'tui-opacity': disabled }">
+        <view
+          class="tui-collapse-icon tui-icon-arrow"
+          :class="{ 'tui-icon-active': isOpen }"
+          :style="{ color: arrowColor }"
+          v-if="arrow"
+        ></view>
+        <slot name="title"></slot>
+      </view>
+    </view>
+    <view
+      class="tui-collapse-body_box"
+      :style="{ backgroundColor: bdBgColor, height: isOpen ? height : '0rpx' }"
+    >
+      <view
+        class="tui-collapse-body"
+        :class="{
+          'tui-collapse-transform': height == 'auto',
+          'tui-collapse-body_show': isOpen && height == 'auto',
+        }"
+      >
+        <slot name="content"></slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "tuiCollapse",
+  emits: ["click"],
+  props: {
+    //collapse背景颜色
+    bgColor: {
+      type: String,
+      default: "transparent",
+    },
+    //collapse-head 背景颜色
+    hdBgColor: {
+      type: String,
+      default: "#fff",
+    },
+    //collapse-body 背景颜色
+    bdBgColor: {
+      type: String,
+      default: "transparent",
+    },
+    //collapse-body实际高度 open时使用
+    height: {
+      type: String,
+      default: "auto",
+    },
+    //索引
+    index: {
+      type: Number,
+      default: 0,
+    },
+    //当前索引，index==current时展开
+    current: {
+      type: Number,
+      default: -1,
+    },
+    // 是否禁用
+    disabled: {
+      type: [Boolean, String],
+      default: false,
+    },
+    //是否带箭头
+    arrow: {
+      type: [Boolean, String],
+      default: true,
+    },
+    //箭头颜色
+    arrowColor: {
+      type: String,
+      default: "#333",
+    },
+  },
+  watch: {
+    current() {
+      this.updateCurrentChange();
+    },
+  },
+  created() {
+    this.updateCurrentChange();
+  },
+  data() {
+    return {
+      isOpen: false,
+    };
+  },
+  methods: {
+    updateCurrentChange() {
+      this.isOpen = this.index == this.current;
+    },
+    handleClick() {
+      if (this.disabled) return;
+      this.$emit("click", {
+        index: Number(this.index),
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+@font-face {
+  font-family: "tuiCollapse";
+  src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAAQ4AA0AAAAABlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAEHAAAABoAAAAciRx3B0dERUYAAAP8AAAAHgAAAB4AKQAKT1MvMgAAAaAAAABCAAAAVjxuR/JjbWFwAAAB9AAAAD4AAAFCAA/pq2dhc3AAAAP0AAAACAAAAAj//wADZ2x5ZgAAAkAAAABEAAAARCs1U/toZWFkAAABMAAAADAAAAA2FpaT+mhoZWEAAAFgAAAAHQAAACQHngOFaG10eAAAAeQAAAAPAAAAEAwAAEBsb2NhAAACNAAAAAoAAAAKACIAAG1heHAAAAGAAAAAHwAAACABDwAdbmFtZQAAAoQAAAFJAAACiCnmEVVwb3N0AAAD0AAAACMAAAA1DunpUnjaY2BkYGAAYja/oO54fpuvDNwsDCBwc4/6fzjtwNDNfICpBMjlYGACiQIAGVAKZnjaY2BkYGBu+N/AEMPCAALMBxgYGVABCwBVNgMsAAAAeNpjYGRgYGBhEGQA0QwMTEDMBYQMDP/BfAYACnYBLQB42mNgZGFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDA7PGJ4xMDf8b2CIYW5gaAAKM4LkANq9C9sAAHjaY2GAABYIdgAAAMAATQB42mNgYGBmgGAZBkYGELAB8hjBfBYGBSDNAoRA/jOG//8hpBQzVCUDIxsDjMnAyAQkmBhQASPDsAcAMCAGoQAAAAAAAAAAAAAAIgAAAAEAQACLA8ACdAAQAAAlASYiBhQXARYyNwE2NCYiBwIA/oYNIBkMAZcNIA0BlwwZIA3uAXoMGSAN/mkMDAGXDSAZDAB42n2QPU4DMRCFn/MHJBJCIKhdUQDa/JQpEyn0CKWjSDbekGjXXnmdSDkBLRUHoOUYHIAbINFyCl6WSZMia+3o85uZ57EBnOMbCv/fJe6EFY7xKFzBETLhKvUX4Rr5XbiOFj6FG9R/hJu4VQPhFi7UGx1U7YS7m9JtywpnGAhXcIon4Sr1lXCN/CpcxxU+hBvUv4SbGONXuIVrZakM4WEwQWCcQWOKDeMCMRwskjIG1qE59GYSzExPN3oRO5s4GyjvV2KXAx5oOeeAKe09t2a+Sif+YMuB1JhuHgVLtimNLiJ0KBtfLJzV3ahzsP2e7ba02L9rgTXH7FENbNT8Pdsz0khsDK+QkjXyMrekElOPaGus8btnKdbzXgiJTrzL9IjHmjR1OvduaeLA4ufyjBx9tLmSPfeoHD5jWQh5v91OxCCKXYY/k9hxGQAAAHjaY2BigAAuMMnIgA5YwKJMjExciUVF+eW6KfnleQAZ0wQyAAAAAAH//wACAAEAAAAMAAAAFgAAAAIAAQADAAMAAQAEAAAAAgAAAAB42mNgYGBkAIKrS9Q5QPTNPer/YTQAQ+0HIAAA)
+    format("woff");
+  font-weight: normal;
+  font-style: normal;
+}
+
+.tui-collapse-icon {
+  font-family: "tuiCollapse" !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.tui-icon-arrow:before {
+  content: "\e600";
+}
+
+.tui-icon-arrow {
+  font-size: 20rpx;
+  transform: rotate(0);
+  transform-origin: center center;
+  transition: all 0.3s;
+  position: absolute;
+  top: 50%;
+  margin-top: -10rpx;
+  left: 20rpx;
+  z-index: 9;
+}
+
+.tui-arrow-padding {
+  padding-right: 62rpx;
+  box-sizing: border-box;
+}
+
+.tui-icon-active {
+  transform: rotate(180deg);
+  transform-origin: center center;
+}
+
+.tui-header {
+  position: relative;
+  z-index: 2;
+}
+.tui-collapse-body_box {
+  transition: all 0.25s;
+  overflow: hidden;
+}
+.tui-collapse-body {
+  transition: all 0.25s;
+  overflow: hidden;
+  position: relative;
+  z-index: 1;
+}
+
+.tui-collapse-transform {
+  opacity: 0;
+  visibility: hidden;
+  -webkit-transform: translateY(-40%);
+  transform: translateY(-40%);
+}
+
+.tui-collapse-body_show {
+  opacity: 1;
+  visibility: visible;
+  -webkit-transform: translateY(0);
+  transform: translateY(0);
+}
+
+.tui-opacity {
+  opacity: 0.6;
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/photoGallery.vue b/java-mall-app-shop-admin/pages/warehouse/manage/photoGallery.vue
new file mode 100644
index 0000000..e69de29
diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
new file mode 100644
index 0000000..a537b7f
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
@@ -0,0 +1,974 @@
+<template>
+  <view class="productList-container">
+    <navBar
+      class="nav-bar"
+      :statusBar="true"
+      :border="false"
+      :fixed="true"
+      :height="'44px'"
+      rightWidth="0"
+      :leftWidth="30"
+      backgroundColor="#f5f6fa"
+    >
+      <block slot="left">
+        <u-icon
+          name="arrow-left"
+          color="#000"
+          size="20"
+          @click="pageBack()"
+        ></u-icon>
+      </block>
+      <block slot="default">
+        <u-search
+          class="search"
+          placeholder="请输入商品名称查找"
+          :showAction="false"
+          bgColor="#fff"
+        ></u-search>
+      </block>
+    </navBar>
+    <view class="productList-content">
+      <scroll-view
+        scroll-y
+        scroll-with-animation
+        class="tab-view"
+        :scroll-into-view="scrollViewId"
+        :style="{ height: height - 130 + 'px', top: top + 'px' }"
+      >
+        <block v-for="(item, index) of tabbar" :key="index">
+          <tui-collapse
+            :index="index"
+            :current="current"
+            hdBgColor="f5f6fa"
+            :arrow="item.children.length > 0 ? true : false"
+            @click="handerCollApse"
+          >
+            <template v-slot:title>
+              <view
+                class="tab-bar-item"
+                :class="[
+                  { active: currentTab === index },
+                  { active2: current === index },
+                ]"
+              >
+                {{ item.label }}
+              </view>
+            </template>
+            <template v-slot:content v-if="item.children.length > 0">
+              <view
+                class="tab-bar-item tab-bar-item-2"
+                :class="[currentTab == group.id ? 'active' : '']"
+                v-for="(group, index2) of item.children"
+                @click="handerCollApseChildren(index, index2)"
+              >
+                {{ group.label }}
+              </view>
+            </template>
+          </tui-collapse>
+        </block>
+      </scroll-view>
+      <view
+        class="right-box"
+        :style="{ height: height + 'px', top: top + 'px' }"
+      >
+        <view class="commodity-status">
+          <u-tabs
+            class="u-tabs"
+            ref="tabsRef"
+            :list="commodityStatusList"
+            @click="handerCommodityStatus"
+            itemStyle="padding-left: 15px; padding-right: 15px; height: 57px;"
+            activeStyle="font-weight: bold;color: #000;"
+            inactiveStyle="color:#999999;"
+            lineColor="#e41f19"
+          ></u-tabs>
+        </view>
+        <favorite-loading
+          class="commodity-loading"
+          v-show="loadingCommodityData"
+          :color="'#fe4119'"
+          text=""
+          animation="spinner15"
+        ></favorite-loading>
+        <view
+          class="no-data"
+          v-if="commodityList.length <= 0 && isNoCommodityData"
+        >
+          <view class="no-data-bg"></view>
+          <view class="no-data-tips">暂无商品</view>
+        </view>
+        <scroll-view
+          v-if="commodityList.length > 0 && !loadingCommodityData"
+          scroll-y
+          :style="{ height: height - 200 + 'px', top: top + 'px' }"
+          :show-scrollbar="false"
+          @scrolltolower="handerScrolltolower"
+          refresher-enabled
+          :refresher-triggered="isRefreshing"
+          @refresherrefresh="handleRefresh"
+        >
+          <view class="commodity-list">
+            <view
+              class="commodity-item"
+              v-for="(item, index) of commodityList"
+              :key="index"
+            >
+              <view class="commodity-info">
+                <view
+                  :class="[
+                    'commodity-img',
+                    { 'commodity-img-sold-out': item.product_state_id == 1002 },
+                  ]"
+                >
+                  <u--image
+                    :src="item.product_image"
+                    radius="8"
+                    width="68px"
+                    height="68px"
+                  ></u--image>
+                </view>
+                <view class="commodity-info-box">
+                  <view class="commodity-name">
+                    {{ item.product_name }}
+                  </view>
+                  <view class="commodity-inventory">
+                    库存{{ item.itemQuantity }}
+                  </view>
+                  <view class="commodity-price">
+                    <text class="currency">¥</text>
+                    {{ item.product_unit_price }}
+                  </view>
+                </view>
+              </view>
+              <view class="commodity-btn-content">
+                <u-button
+                  class="commodity-btn-item"
+                  :hairline="true"
+                  :plain="true"
+                  shape="circle"
+                >
+                  价格/库存
+                </u-button>
+                <u-button
+                  v-if="item.product_state_id == 1002"
+                  class="commodity-btn-item commodity-btn-item-2"
+                  :hairline="true"
+                  :plain="true"
+                  shape="circle"
+                  @click="updateProductPutaway(item, index, 1001)"
+                >
+                  上架
+                </u-button>
+                <u-button
+                  v-if="item.product_state_id == 1001"
+                  class="commodity-btn-item commodity-btn-item-2"
+                  :hairline="true"
+                  :plain="true"
+                  shape="circle"
+                  @click="updateProductPutaway(item, index, 1002)"
+                >
+                  下架
+                </u-button>
+                <u-button
+                  class="commodity-btn-item commodity-btn-item-2"
+                  :hairline="true"
+                  :plain="true"
+                  shape="circle"
+                >
+                  编辑
+                </u-button>
+              </view>
+            </view>
+          </view>
+          <view
+            class="m-loading-box"
+            v-if="commodityList.length > 0 && !isNoCommodityData"
+          >
+            <block v-if="loadingDownCommodityData">
+              <view class="u-loadmore">
+                <view class="u-loading"></view>
+                <text class="u-loadmore-tips">正在加载...</text>
+              </view>
+            </block>
+            <block v-else>
+              <view class="u-loadmore u-loadmore-line">
+                <text class="u-loadmore-tips">没有更多商品了 ~</text>
+              </view>
+            </block>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+    <view class="productList-bottom">
+      <view class="bottom-item">分类管理</view>
+      <view class="bottom-item">
+        <u-icon
+          class="u-icon"
+          custom-prefix="custom-icon-piliangcaozuo custom-icon"
+          size="14"
+          color="#000"
+        ></u-icon>
+        <view class="bottom-item-name" @click="skipuBatch">批量操作</view>
+      </view>
+      <view class="bottom-item">
+        <u-icon
+          class="u-icon"
+          custom-prefix="custom-icon-xinjiantuopu custom-icon"
+          size="16"
+          color="#000"
+        ></u-icon>
+        <view class="bottom-item-name">商品新建</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import {
+  GetProductCategoryTree,
+  GetProductList,
+  UpdateProductPutaway,
+} from "@/api/warehouse/productList";
+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";
+
+export default {
+  name: "productList",
+  components: {
+    navBar,
+    tuiCollapse,
+    favoriteLoading,
+  },
+  data() {
+    return {
+      tabbar: [
+        {
+          id: null,
+          label: "全部",
+          children: [],
+        },
+      ],
+      height: 0, //scroll-view高度
+      top: 0,
+      currentTab: 0, //预设当前项的值
+      current: -1,
+      scrollViewId: "id_0",
+      commodityStatusList: [
+        {
+          value: null,
+          name: "全部",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          // 1001-正常;1002-下架仓库中;1000-违规禁售
+          value: 1001,
+          name: "销售中",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1002,
+          name: "仓库中",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1000,
+          name: "违规禁售",
+          badge: {
+            value: 0,
+          },
+        },
+        {
+          value: 1003,
+          name: "待审核",
+          badge: {
+            value: 0,
+          },
+        },
+      ],
+      commodityList: [],
+      pageNum: 1,
+      pageSize: 20,
+      currCategoryId: null,
+      collApseIndex: 0,
+      currTabChildrenIndex: 0,
+      currProductStateId: null,
+      loadingCommodityData: false,
+      loadingDownCommodityData: false,
+      isNoCommodityData: false,
+      isNoDownCommodityData: false,
+      isRefreshing: false,
+      time: null,
+      time2: null,
+    };
+  },
+  computed: {},
+  onLoad: function (options) {
+    setTimeout(() => {
+      uni.getSystemInfo({
+        success: (res) => {
+          let header = 60;
+          let top = 0;
+          //#ifdef H5
+          top = 44;
+          //#endif
+          this.height = res.windowHeight - uni.upx2px(header);
+          this.top = top + uni.upx2px(header);
+        },
+      });
+    }, 50);
+  },
+  onReady() {},
+  onShow() {
+    this.getProductCategoryTree();
+    this.getProductList();
+  },
+
+  mounted() {},
+  methods: {
+    pageBack() {
+      uni.navigateBack();
+    },
+    // 点击标题切换当前页时改变样式
+    swichNav: function (e) {
+      let cur = e.currentTarget.dataset.current;
+      if (this.currentTab == cur) {
+        return false;
+      } else {
+        this.currentTab = cur;
+        this.checkCor();
+      }
+    },
+    //判断当前滚动超过一屏时，设置tab标题滚动条。
+    checkCor: function () {
+      if (this.currentTab > 6) {
+        this.scrollViewId = `id_${this.currentTab - 2}`;
+      } else {
+        this.scrollViewId = `id_0`;
+      }
+    },
+    async getProductCategoryTree() {
+      let res = await GetProductCategoryTree();
+      if (res && res.status == 200) {
+        // var list = res.data.map((item) => ({
+        //   ...item,
+        //   current: -1,
+        // }));
+        this.tabbar = [...this.tabbar, ...res.data];
+      }
+    },
+    async getProductList() {
+      if (this.loadingDownCommodityData) {
+        this.loadingCommodityData = false;
+      } else {
+        this.loadingCommodityData = true;
+      }
+
+      if (this.isRefreshing) {
+        this.pageNum = 1;
+        this.isNoCommodityData = false;
+        this.isNoDownCommodityData = false;
+      }
+
+      let params = {
+        kind_id: "1201,1202,1203",
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        product_state_id: this.currProductStateId,
+        category_id: this.currCategoryId,
+        openCount: true,
+      };
+
+      let res = await GetProductList(params);
+      if (res && res.status == 200) {
+        if (this.loadingDownCommodityData) {
+          if (res.data.items.length <= 0) {
+            this.loadingDownCommodityData = false;
+            this.isNoDownCommodityData = true;
+            return;
+          } else {
+            this.commodityList = [...this.commodityList, ...res.data.items];
+          }
+        } else {
+          this.commodityList = res.data.items;
+        }
+
+        if (this.commodityList.length <= 0) {
+          this.isNoCommodityData = true;
+        }
+
+        var {
+          allRecords,
+          normalRecords,
+          offRecords,
+          illegalRecords,
+          unCheckedRecords,
+        } = res.data;
+
+        this.commodityStatusList[0].badge.value = allRecords;
+        this.commodityStatusList[1].badge.value = normalRecords;
+        this.commodityStatusList[2].badge.value = offRecords;
+        this.commodityStatusList[3].badge.value = illegalRecords;
+        this.commodityStatusList[4].badge.value = unCheckedRecords;
+
+        this.$nextTick(() => {
+          this.$refs.tabsRef.init();
+        });
+      }
+
+      this.loadingDownCommodityData = false;
+      this.loadingCommodityData = false;
+      this.isRefreshing = false;
+    },
+    handleRefresh() {
+      this.isRefreshing = true;
+      this.getProductList();
+    },
+    updateProductPutaway(item, index, type) {
+      clearTimeout(this.time2);
+
+      let params = {
+        product_id: item.product_id,
+        product_state_id: type,
+      };
+
+      this.time2 = setTimeout(async () => {
+        let res = await UpdateProductPutaway(params);
+        if (res && res.status) {
+          uni.$u.toast("操作成功");
+
+          this.commodityList[index].product_state_id = type;
+
+          let params = {
+            kind_id: "1201,1202,1203",
+            pageNum: this.pageNum,
+            pageSize: this.pageSize,
+            product_state_id: this.currProductStateId,
+            category_id: this.currCategoryId,
+            openCount: true,
+          };
+
+          let result = await GetProductList(params);
+
+          if (result && result.status == 200) {
+            var {
+              allRecords,
+              normalRecords,
+              offRecords,
+              illegalRecords,
+              unCheckedRecords,
+            } = result.data;
+
+            this.commodityStatusList[0].badge.value = allRecords;
+            this.commodityStatusList[1].badge.value = normalRecords;
+            this.commodityStatusList[2].badge.value = offRecords;
+            this.commodityStatusList[3].badge.value = illegalRecords;
+            this.commodityStatusList[4].badge.value = unCheckedRecords;
+          }
+        }
+      }, 500);
+    },
+    handerScrolltolower() {
+      clearTimeout(this.time);
+      if (this.isNoDownCommodityData) return;
+      this.loadingDownCommodityData = true;
+      this.time = setTimeout(() => {
+        this.pageNum = this.pageNum + 1;
+        this.getProductList();
+      }, 500);
+    },
+    handerCommodityStatus(e) {
+      this.pageNum = 1;
+      this.pageSize = 10;
+      this.isNoDownCommodityData = false;
+      this.isNoCommodityData = false;
+      this.currProductStateId = e.value;
+      this.commodityList = [];
+      this.getProductList();
+    },
+    handerCollApse(e) {
+      let index = e.index;
+      //手风琴展开状态  -1 == 不展开
+      const oldCategoryId = this.currCategoryId;
+
+      this.current = this.current == index ? -1 : e.index;
+
+      // 如果current没有实际变化（点击的是已经展开的项），直接返回
+
+      if (this.current != -1 && this.tabbar[index].children.length > 0) {
+        this.currentTab =
+          this.tabbar[index].children[this.currTabChildrenIndex].id;
+        this.currCategoryId =
+          this.tabbar[index].children[this.currTabChildrenIndex].id;
+      } else {
+        this.currentTab = index;
+        this.currCategoryId = this.tabbar[index].id;
+
+        if (this.current != -1) {
+          this.currTabChildrenIndex = 0;
+        }
+      }
+
+      this.pageNum = 1;
+      this.pageSize = 20;
+
+      if (this.collApseIndex == index) {
+        return;
+      }
+      if (this.currCategoryId != oldCategoryId && this.current != -1) {
+        this.getProductList();
+        this.collApseIndex = index;
+      }
+    },
+    // 点击子集时触发
+    handerCollApseChildren(index1, index2) {
+      const oldCategoryId = this.currCategoryId;
+
+      //获取当前子集下的坐标
+      this.currTabChildrenIndex = index2;
+      //active状态
+      this.currentTab = this.tabbar[index1].children[index2].id;
+      //当前子集id
+      this.currCategoryId = this.tabbar[index1].children[index2].id;
+      if (this.currCategoryId != oldCategoryId) {
+        this.getProductList();
+      }
+    },
+    detail(e) {
+      uni.navigateTo({
+        url: "../productDetail/productDetail",
+      });
+    },
+    productList(e) {
+      let key = e.currentTarget.dataset.key;
+      uni.navigateTo({
+        url: "../productList/productList?searchKey=" + key,
+      });
+    },
+    search: function () {
+      uni.navigateTo({
+        url: "../../news/search/search",
+      });
+    },
+    skipuBatch() {
+      uni.navigateTo({
+        url: "/pages/warehouse/manage/batch",
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/variables.scss";
+.productList-container {
+  height: calc(100vh);
+  background: #f5f6fa;
+  .nav-bar {
+    padding-top: 20rpx;
+  }
+
+  ::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    color: transparent;
+  }
+
+  .tui-searchbox {
+    width: 100%;
+    height: 92rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    left: 0;
+    top: 0;
+    /* #ifdef H5 */
+    top: 44px;
+    /* #endif */
+    z-index: 100;
+  }
+
+  .tui-searchbox::after {
+    content: "";
+    position: absolute;
+    border-bottom: 1rpx solid #d2d2d2;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    bottom: 0;
+    right: 0;
+    left: 0;
+  }
+
+  .tui-search-input {
+    width: 100%;
+    height: 60rpx;
+    background: #f1f1f1;
+    border-radius: 30rpx;
+    font-size: 26rpx;
+    color: #999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .tui-search-text {
+    padding-left: 16rpx;
+  }
+
+  .tab-view {
+    /* height: 100%; */
+    width: 200rpx;
+    position: fixed;
+    left: 0;
+    z-index: 10;
+  }
+
+  .tab-bar-item {
+    width: 200rpx;
+    min-height: 57px;
+    background: #f5f6fa;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 30rpx;
+    color: #666666;
+    font-weight: 400;
+    padding: 12rpx;
+    padding-left: 28px;
+    padding-right: 32rpx;
+    word-wrap: break-word;
+    word-break: break-all;
+  }
+
+  .active {
+    position: relative;
+    color: #000;
+
+    font-weight: 600;
+    background: #fff;
+  }
+
+  .tab-bar-item-2 {
+    font-size: 28rpx;
+    background: #fff !important;
+  }
+
+  .active2 {
+    background: #fff;
+  }
+
+  .active::before {
+    content: "";
+    position: absolute;
+    border-left: 8rpx solid #e41f19;
+    height: 30rpx;
+    left: 0;
+  }
+
+  /* 左侧导航布局 end*/
+
+  .right-box {
+    width: 100%;
+    position: fixed;
+    padding-left: 210rpx;
+    box-sizing: border-box;
+    left: 0;
+    background: #fff;
+  }
+
+  .page-view {
+    width: 100%;
+    overflow: hidden;
+    padding-top: 20rpx;
+    padding-right: 20rpx;
+    box-sizing: border-box;
+    padding-bottom: env(safe-area-inset-bottom);
+  }
+
+  .swiper {
+    width: 100%;
+    height: 220rpx;
+    border-radius: 12rpx;
+    overflow: hidden;
+    transform: translateZ(0);
+  }
+
+  /* #ifdef MP-WEIXIN */
+  .swiper .wx-swiper-dot {
+    width: 8rpx;
+    height: 8rpx;
+    display: inline-flex;
+    background: none;
+    justify-content: space-between;
+  }
+
+  .swiper .wx-swiper-dot::before {
+    content: "";
+    flex-grow: 1;
+    background: rgba(255, 255, 255, 0.8);
+    border-radius: 16rpx;
+    overflow: hidden;
+  }
+
+  .swiper .wx-swiper-dot-active::before {
+    background: #fff;
+  }
+
+  .swiper .wx-swiper-dot.wx-swiper-dot-active {
+    width: 16rpx;
+  }
+
+  /* #endif */
+
+  /* #ifndef MP-WEIXIN */
+  ::v-deep .swiper .uni-swiper-dot {
+    width: 8rpx;
+    height: 8rpx;
+    display: inline-flex;
+    background: none;
+    justify-content: space-between;
+  }
+
+  ::v-deep .swiper .uni-swiper-dot::before {
+    content: "";
+    flex-grow: 1;
+    background: rgba(255, 255, 255, 0.8);
+    border-radius: 16rpx;
+    overflow: hidden;
+  }
+
+  ::v-deep .swiper .uni-swiper-dot-active::before {
+    background: #fff;
+  }
+
+  ::v-deep .swiper .uni-swiper-dot.uni-swiper-dot-active {
+    width: 16rpx;
+  }
+
+  /* #endif */
+
+  .slide-image {
+    width: 100%;
+    height: 220rpx;
+  }
+
+  .class-box {
+    padding-top: 30rpx;
+  }
+
+  .class-item {
+    background: #fff;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    border-radius: 12rpx;
+  }
+
+  .class-name {
+    font-size: 22rpx;
+  }
+
+  .g-container {
+    /* padding-top: 20rpx; */
+    display: flex;
+    display: -webkit-flex;
+    justify-content: flex-start;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+
+  .g-box {
+    width: 33.3333%;
+    text-align: center;
+    padding-top: 40rpx;
+  }
+
+  .g-image {
+    width: 120rpx;
+    height: 120rpx;
+  }
+
+  .g-title {
+    font-size: 22rpx;
+  }
+
+  .tui-content {
+    padding: 20rpx 30rpx;
+    background-color: #fff;
+    color: #555;
+    font-size: 26rpx;
+  }
+
+  .u-tabs {
+    border-bottom: 1px solid #f3f3f3;
+  }
+
+  .commodity-status {
+    position: sticky;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 99;
+    background: #fff;
+  }
+
+  .m-loading-box {
+    text-align: center;
+    margin: 40rpx;
+    color: #aaaa;
+    font-size: 28rpx;
+  }
+
+  .commodity-list {
+    padding: 20rpx;
+
+    .commodity-item {
+      margin-bottom: 60rpx;
+
+      .commodity-info {
+        display: flex;
+        margin-bottom: 40rpx;
+
+        .commodity-img {
+          position: relative;
+          margin-right: 20rpx;
+          width: 68px;
+          height: 68px;
+          border: 1px solid #ebebeb;
+          border-radius: 16rpx;
+        }
+
+        .commodity-img-sold-out {
+          &::before {
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+            height: 20px;
+            line-height: 20px;
+            content: "已下架";
+            text-align: center;
+            background: rgba(0, 0, 0, 0.6);
+            color: #fff;
+            z-index: 99;
+            font-size: 14px;
+            border-bottom-left-radius: 16rpx;
+            border-bottom-right-radius: 16rpx;
+          }
+        }
+
+        .commodity-info-box {
+          display: flex;
+          flex-flow: column;
+          justify-content: space-between;
+
+          .commodity-name {
+            font-weight: bold;
+            font-size: 36rpx;
+            word-break: break-all; /* 允许在任意字符间断行 */
+            overflow-wrap: break-word; /* 优先在单词间断行 */
+            display: -webkit-box;
+            -webkit-line-clamp: 2; /* 限制最多2行 */
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            text-overflow: ellipsis; /* 超出部分显示省略号 */
+          }
+
+          .commodity-inventory {
+            font-size: 28rpx;
+            color: #626262;
+          }
+
+          .commodity-price {
+            font-size: 32rpx;
+            font-weight: bold;
+            color: #ea3938;
+
+            .currency {
+              margin-right: 4px;
+              font-size: 24rpx;
+            }
+          }
+        }
+      }
+
+      .commodity-btn-content {
+        display: flex;
+        justify-content: flex-end;
+        .commodity-btn-item {
+          margin: 0;
+          margin-right: 20rpx;
+          width: 160rpx;
+          height: 60rpx;
+          font-size: 24rpx;
+          border-color: #d2d2d2;
+          color: #000;
+
+          &::after {
+            border: none;
+          }
+        }
+
+        .commodity-btn-item-2 {
+          width: 104rpx;
+        }
+      }
+    }
+  }
+
+  .no-data {
+    .no-data-bg {
+      margin: 60% auto;
+      margin-bottom: 0;
+      width: 300rpx;
+      height: 200rpx;
+      background-image: url("../../../static/no-commodity.png");
+      background-size: 100%;
+    }
+    .no-data-tips {
+      margin: 80rpx auto;
+      color: #aaaaaa;
+      text-align: center;
+    }
+  }
+
+  .productList-bottom {
+    position: fixed;
+    bottom: 0;
+    z-index: 99;
+    display: flex;
+    padding: 40rpx;
+    width: 100%;
+    background: #fff;
+    border-top: 2px solid #f3f3f3;
+    // box-shadow: 0 0px 6px 0 rgba(0, 0, 0, 0.1);
+
+    .bottom-item {
+      display: flex;
+      align-items: center;
+      margin-bottom: 40rpx;
+      margin-right: 80rpx;
+
+      .u-icon {
+        margin-right: 8rpx;
+      }
+    }
+  }
+
+  .commodity-loading {
+    margin: 70% auto;
+    display: flex;
+  }
+}
+</style>
diff --git a/java-mall-app-shop-admin/pages/warehouse/warehouse.vue b/java-mall-app-shop-admin/pages/warehouse/warehouse.vue
new file mode 100644
index 0000000..ed81db4
--- /dev/null
+++ b/java-mall-app-shop-admin/pages/warehouse/warehouse.vue
@@ -0,0 +1,129 @@
+<template>
+  <view class="warehouse-container">
+    <status-bar :backgroundColor="'#fff'" v-if="true"></status-bar>
+    <view class="shop-name">{{ dashboardInfo.store_info.store_name }}</view>
+    <view class="warehouse-list">
+      <view class="warehouse-item" @click="skipu('productList')">
+        <view class="warehouse-item-img">
+          <u--image
+            src="../../static/warehouse/brand-2.png"
+            :width="44"
+            :height="44"
+          ></u--image>
+        </view>
+        <view class="warehouse-item-name">商品管理</view>
+      </view>
+      <view class="warehouse-item" @click="skipu('brandList')">
+        <view class="warehouse-item-img">
+          <u--image
+            src="../../static/warehouse/brand-3.png"
+            :width="44"
+            :height="44"
+          ></u--image>
+        </view>
+        <view class="warehouse-item-name">品牌管理</view>
+      </view>
+      <view class="warehouse-item" @click="skipu('photoGallery')">
+        <view class="warehouse-item-img">
+          <u--image
+            src="../../static/warehouse/classify.png"
+            :width="44"
+            :height="44"
+          ></u--image>
+        </view>
+        <view class="warehouse-item-name">分类管理</view>
+      </view>
+      <view class="warehouse-item" @click="skipu('classifyList')">
+        <view class="warehouse-item-img">
+          <u--image
+            src="../../static/warehouse/photo-gallery-1.png"
+            :width="44"
+            :height="44"
+          ></u--image>
+        </view>
+        <view class="warehouse-item-name">商品图库</view>
+      </view>
+    </view>
+    <tabbar tabbarName="warehouse"></tabbar>
+  </view>
+</template>
+
+<script>
+import tabbar from "@/components/tabbar/tabbar.vue";
+import statusBar from "@/components/status-bar.vue";
+import { GetAccountDashboard } from "../../api/user";
+import { mapState } from "vuex";
+export default {
+  name: "warehouse",
+  components: {
+    statusBar,
+    tabbar,
+  },
+  data() {
+    return {
+      dashboardInfo: {
+        store_info: {
+          store_name: "",
+        },
+      },
+    };
+  },
+  computed: {},
+  onReady() {},
+  onShow() {
+    this.getAccountDashboard();
+  },
+
+  mounted() {},
+  methods: {
+    async getAccountDashboard() {
+      let res = await GetAccountDashboard();
+
+      if (res && res.status == 200) {
+        this.dashboardInfo = res.data;
+      }
+    },
+    skipu(url) {
+      uni.navigateTo({
+        url: `/pages/warehouse/manage/${url}`,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/variables.scss";
+.warehouse-container {
+  height: calc(100vh - 120rpx);
+  background: #f5f6fa;
+
+  .shop-name {
+    padding: 40rpx 24px;
+    font-size: 40rpx;
+    font-weight: bold;
+    background: #fff;
+  }
+
+  .warehouse-list {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 10px;
+    padding: 20px;
+    background: #fff;
+    box-shadow: 0 12rpx 16rpx 0 rgba(0, 0, 0, 0.1);
+    border-radius: 24rpx;
+
+    .warehouse-item {
+      display: flex;
+      flex-flow: column;
+      align-items: center;
+
+      .warehouse-item-img {
+        margin-bottom: 20rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/java-mall-app-shop-admin/static/font/iconfont.css b/java-mall-app-shop-admin/static/font/iconfont.css
index 89f7b91..a91cfd8 100644
--- a/java-mall-app-shop-admin/static/font/iconfont.css
+++ b/java-mall-app-shop-admin/static/font/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "custom-icon"; /* Project id 4805967 */
-  src: url('@/static/font/iconfont.woff2?t=1736404172628') format('woff2'),
-       url('@/static/font/iconfont.woff?t=1736404172628') format('woff'),
-       url('@/static/font/iconfont.ttf?t=1736404172628') format('truetype');
+  src: url("@/static/font/iconfont.woff2?t=1736404172628") format("woff2"),
+    url("@/static/font/iconfont.woff?t=1736404172628") format("woff"),
+    url("@/static/font/iconfont.ttf?t=1736404172628") format("truetype");
 }
 
 .custom-icon {
@@ -21,6 +21,50 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.custom-icon-jianhao:before {
+  content: "\e664";
+}
+
+.custom-icon-xinjiantuopu:before {
+  content: "\e83a";
+}
+
+.custom-icon-piliangcaozuo:before {
+  content: "\e66a";
+}
+
+.custom-icon-gongzuotai1:before {
+  content: "\e660";
+}
+
+.custom-icon-shangpinguanli:before {
+  content: "\e666";
+}
+
+.custom-icon-shangpinpinpai:before {
+  content: "\e6e6";
+}
+
+.custom-icon-xiangcetuku:before {
+  content: "\e63c";
+}
+
+.custom-icon-fenlei:before {
+  content: "\fc7d";
+}
+
+.custom-icon-mianxingtuku:before {
+  content: "\e60a";
+}
+
+.custom-icon-icon_shangpindangan_shangpinpinpai:before {
+  content: "\e60f";
+}
+
+.custom-icon-yingyezhuangtai:before {
+  content: "\e605";
+}
+
 .custom-icon-shipin:before {
   content: "\e629";
 }
@@ -120,4 +164,3 @@
 .custom-icon-password:before {
   content: "\e61d";
 }
-
diff --git a/java-mall-app-shop-admin/static/font/iconfont.ttf b/java-mall-app-shop-admin/static/font/iconfont.ttf
index 8c1d747..a0c4c98 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.ttf and b/java-mall-app-shop-admin/static/font/iconfont.ttf differ
diff --git a/java-mall-app-shop-admin/static/font/iconfont.woff b/java-mall-app-shop-admin/static/font/iconfont.woff
index dc5eed4..84885ba 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.woff and b/java-mall-app-shop-admin/static/font/iconfont.woff differ
diff --git a/java-mall-app-shop-admin/static/font/iconfont.woff2 b/java-mall-app-shop-admin/static/font/iconfont.woff2
index d9ed4c1..b70e688 100644
Binary files a/java-mall-app-shop-admin/static/font/iconfont.woff2 and b/java-mall-app-shop-admin/static/font/iconfont.woff2 differ
diff --git a/java-mall-app-shop-admin/static/no-commodity.png b/java-mall-app-shop-admin/static/no-commodity.png
new file mode 100644
index 0000000..64c9d62
Binary files /dev/null and b/java-mall-app-shop-admin/static/no-commodity.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/asdsad.png b/java-mall-app-shop-admin/static/warehouse/asdsad.png
new file mode 100644
index 0000000..640ef72
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/asdsad.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/brand-1.png b/java-mall-app-shop-admin/static/warehouse/brand-1.png
new file mode 100644
index 0000000..f36a826
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/brand-1.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/brand-2.png b/java-mall-app-shop-admin/static/warehouse/brand-2.png
new file mode 100644
index 0000000..355adb5
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/brand-2.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/brand-3.png b/java-mall-app-shop-admin/static/warehouse/brand-3.png
new file mode 100644
index 0000000..b8dcc2b
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/brand-3.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/classify.png b/java-mall-app-shop-admin/static/warehouse/classify.png
new file mode 100644
index 0000000..485885a
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/classify.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/photo-gallery-1.png b/java-mall-app-shop-admin/static/warehouse/photo-gallery-1.png
new file mode 100644
index 0000000..9885685
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/photo-gallery-1.png differ
diff --git a/java-mall-app-shop-admin/static/warehouse/photo-gallery.png b/java-mall-app-shop-admin/static/warehouse/photo-gallery.png
new file mode 100644
index 0000000..31bf889
Binary files /dev/null and b/java-mall-app-shop-admin/static/warehouse/photo-gallery.png differ
diff --git a/java-mall-app-shop-admin/store/index.js b/java-mall-app-shop-admin/store/index.js
index 87ac695..87b8e60 100644
--- a/java-mall-app-shop-admin/store/index.js
+++ b/java-mall-app-shop-admin/store/index.js
@@ -1,7 +1,6 @@
 import Vue from "vue";
 import Vuex from "vuex";
 import user from "./modules/user";
-import account from "./modules/account";
 import order from "./modules/order";
 import audit from "./modules/audit";
 
@@ -10,7 +9,6 @@ Vue.use(Vuex);
 const store = new Vuex.Store({
   modules: {
     user,
-    account,
     order,
     audit,
   },
diff --git a/java-mall-app-shop-admin/store/modules/account.js b/java-mall-app-shop-admin/store/modules/account.js
deleted file mode 100644
index c29f42d..0000000
--- a/java-mall-app-shop-admin/store/modules/account.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const defaultState = () => {
-  return {
-    accountInfo: uni.getStorageSync('accountDashboard') || {
-      data: {},
-      notice: {},
-      order: {},
-      product: {
-        illegal_num: 0,
-        normal_num: 0,
-        off_num: 0,
-        total_num: 0,
-        verify_passed_off_num: 0,
-        verify_refused_num: 0,
-        verify_waiting_num: 0,
-      },
-      return: {
-        fin_num: 0,
-        review_num: 0,
-        total_num: 0,
-        un_fin_num: 0,
-      },
-      store_info: {
-        store_id: 1,
-        wx_qrcode: '',
-      },
-    },
-  };
-};
-
-const state = defaultState();
-
-const getters = {};
-
-const mutations = {};
-
-const actions = {};
-
-export default {
-  namespaced: true,
-  state,
-  getters,
-  mutations,
-  actions,
-};
diff --git a/java-mall-app-shop-admin/store/modules/user.js b/java-mall-app-shop-admin/store/modules/user.js
index b901538..4ce2c6b 100644
--- a/java-mall-app-shop-admin/store/modules/user.js
+++ b/java-mall-app-shop-admin/store/modules/user.js
@@ -20,6 +20,30 @@ const defaultState = () => {
     socket: {},
     getMsg: {},
     imWeidu: {},
+    dashboardInfo: uni.getStorageSync("accountDashboard") || {
+      data: {},
+      notice: {},
+      order: {},
+      product: {
+        illegal_num: 0,
+        normal_num: 0,
+        off_num: 0,
+        total_num: 0,
+        verify_passed_off_num: 0,
+        verify_refused_num: 0,
+        verify_waiting_num: 0,
+      },
+      return: {
+        fin_num: 0,
+        review_num: 0,
+        total_num: 0,
+        un_fin_num: 0,
+      },
+      store_info: {
+        store_id: "",
+        wx_qrcode: "",
+      },
+    },
   };
 };
 
@@ -46,6 +70,7 @@ const mutations = {
     state.socket = {};
     state.getMsg = {};
     state.imWeidu = {};
+    state.dashboardInfo = {};
   },
   CONNECT_SOCKET(state, { socket }) {
     state.socket = socket;
@@ -101,13 +126,9 @@ const actions = {
     if (res && res.status == 200) {
       let mobile = "";
 
-      let isContain = res.data.user_mobile.indexOf("86");
-
-      if (isContain != -1 && res.data.user_mobile.length > 11) {
-        mobile = res.data.user_mobile.slice(2);
-      } else {
-        mobile = res.data.user_mobile;
-      }
+      mobile = res.data.user_mobile.startsWith("+86")
+        ? res.data.user_mobile.replace("+86", "")
+        : res.data.user_mobile;
 
       const userInfo = res.data;
 
@@ -148,13 +169,9 @@ const actions = {
     if (res && res.status == 200) {
       let mobile = "";
 
-      let isContain = res.data.user_mobile.indexOf("86");
-
-      if (isContain != -1 && res.data.user_mobile.length > 11) {
-        mobile = res.data.user_mobile.slice(2);
-      } else {
-        mobile = res.data.user_mobile;
-      }
+      mobile = res.data.user_mobile.startsWith("+86")
+        ? res.data.user_mobile.replace("+86", "")
+        : res.data.user_mobile;
 
       const userInfo = res.data;
 
diff --git a/java-mall-app-shop-admin/uni_modules/uview-ui/components/u-tabs/u-tabs.vue b/java-mall-app-shop-admin/uni_modules/uview-ui/components/u-tabs/u-tabs.vue
index d2b3b03..0402280 100644
--- a/java-mall-app-shop-admin/uni_modules/uview-ui/components/u-tabs/u-tabs.vue
+++ b/java-mall-app-shop-admin/uni_modules/uview-ui/components/u-tabs/u-tabs.vue
@@ -167,7 +167,8 @@
 					.slice(0, this.innerCurrent)
 					.reduce((total, curr) => total + curr.rect.width, 0);
                 // 获取下划线的数值px表示法
-				const lineWidth = uni.$u.getPx(this.lineWidth);
+				 const lineWidth = uni.$u.getPx(uni.$u.addUnit(this.lineWidth));
+
 				this.lineOffsetLeft = lineOffsetLeft + (tabItem.rect.width - lineWidth) / 2
 				// #ifdef APP-NVUE
 				// 第一次移动滑块，无需过渡时间
diff --git a/java-mall-app-shop-admin/utils/exif.js b/java-mall-app-shop-admin/utils/exif.js
new file mode 100644
index 0000000..a5e4cbe
--- /dev/null
+++ b/java-mall-app-shop-admin/utils/exif.js
@@ -0,0 +1,1144 @@
+(function () {
+  var debug = false;
+
+  var root = this;
+
+  var EXIF = function (obj) {
+    if (obj instanceof EXIF) return obj;
+    if (!(this instanceof EXIF)) return new EXIF(obj);
+    this.EXIFwrapped = obj;
+  };
+
+  if (typeof exports !== "undefined") {
+    if (typeof module !== "undefined" && module.exports) {
+      exports = module.exports = EXIF;
+    }
+    exports.EXIF = EXIF;
+  } else {
+    root.EXIF = EXIF;
+  }
+
+  var ExifTags = (EXIF.Tags = {
+    // version tags
+    0x9000: "ExifVersion", // EXIF version
+    0xa000: "FlashpixVersion", // Flashpix format version
+
+    // colorspace tags
+    0xa001: "ColorSpace", // Color space information tag
+
+    // image configuration
+    0xa002: "PixelXDimension", // Valid width of meaningful image
+    0xa003: "PixelYDimension", // Valid height of meaningful image
+    0x9101: "ComponentsConfiguration", // Information about channels
+    0x9102: "CompressedBitsPerPixel", // Compressed bits per pixel
+
+    // user information
+    0x927c: "MakerNote", // Any desired information written by the manufacturer
+    0x9286: "UserComment", // Comments by user
+
+    // related file
+    0xa004: "RelatedSoundFile", // Name of related sound file
+
+    // date and time
+    0x9003: "DateTimeOriginal", // Date and time when the original image was generated
+    0x9004: "DateTimeDigitized", // Date and time when the image was stored digitally
+    0x9290: "SubsecTime", // Fractions of seconds for DateTime
+    0x9291: "SubsecTimeOriginal", // Fractions of seconds for DateTimeOriginal
+    0x9292: "SubsecTimeDigitized", // Fractions of seconds for DateTimeDigitized
+
+    // picture-taking conditions
+    0x829a: "ExposureTime", // Exposure time (in seconds)
+    0x829d: "FNumber", // F number
+    0x8822: "ExposureProgram", // Exposure program
+    0x8824: "SpectralSensitivity", // Spectral sensitivity
+    0x8827: "ISOSpeedRatings", // ISO speed rating
+    0x8828: "OECF", // Optoelectric conversion factor
+    0x9201: "ShutterSpeedValue", // Shutter speed
+    0x9202: "ApertureValue", // Lens aperture
+    0x9203: "BrightnessValue", // Value of brightness
+    0x9204: "ExposureBias", // Exposure bias
+    0x9205: "MaxApertureValue", // Smallest F number of lens
+    0x9206: "SubjectDistance", // Distance to subject in meters
+    0x9207: "MeteringMode", // Metering mode
+    0x9208: "LightSource", // Kind of light source
+    0x9209: "Flash", // Flash status
+    0x9214: "SubjectArea", // Location and area of main subject
+    0x920a: "FocalLength", // Focal length of the lens in mm
+    0xa20b: "FlashEnergy", // Strobe energy in BCPS
+    0xa20c: "SpatialFrequencyResponse", //
+    0xa20e: "FocalPlaneXResolution", // Number of pixels in width direction per FocalPlaneResolutionUnit
+    0xa20f: "FocalPlaneYResolution", // Number of pixels in height direction per FocalPlaneResolutionUnit
+    0xa210: "FocalPlaneResolutionUnit", // Unit for measuring FocalPlaneXResolution and FocalPlaneYResolution
+    0xa214: "SubjectLocation", // Location of subject in image
+    0xa215: "ExposureIndex", // Exposure index selected on camera
+    0xa217: "SensingMethod", // Image sensor type
+    0xa300: "FileSource", // Image source (3 == DSC)
+    0xa301: "SceneType", // Scene type (1 == directly photographed)
+    0xa302: "CFAPattern", // Color filter array geometric pattern
+    0xa401: "CustomRendered", // Special processing
+    0xa402: "ExposureMode", // Exposure mode
+    0xa403: "WhiteBalance", // 1 = auto white balance, 2 = manual
+    0xa404: "DigitalZoomRation", // Digital zoom ratio
+    0xa405: "FocalLengthIn35mmFilm", // Equivalent foacl length assuming 35mm film camera (in mm)
+    0xa406: "SceneCaptureType", // Type of scene
+    0xa407: "GainControl", // Degree of overall image gain adjustment
+    0xa408: "Contrast", // Direction of contrast processing applied by camera
+    0xa409: "Saturation", // Direction of saturation processing applied by camera
+    0xa40a: "Sharpness", // Direction of sharpness processing applied by camera
+    0xa40b: "DeviceSettingDescription", //
+    0xa40c: "SubjectDistanceRange", // Distance to subject
+
+    // other tags
+    0xa005: "InteroperabilityIFDPointer",
+    0xa420: "ImageUniqueID", // Identifier assigned uniquely to each image
+  });
+
+  var TiffTags = (EXIF.TiffTags = {
+    0x0100: "ImageWidth",
+    0x0101: "ImageHeight",
+    0x8769: "ExifIFDPointer",
+    0x8825: "GPSInfoIFDPointer",
+    0xa005: "InteroperabilityIFDPointer",
+    0x0102: "BitsPerSample",
+    0x0103: "Compression",
+    0x0106: "PhotometricInterpretation",
+    0x0112: "Orientation",
+    0x0115: "SamplesPerPixel",
+    0x011c: "PlanarConfiguration",
+    0x0212: "YCbCrSubSampling",
+    0x0213: "YCbCrPositioning",
+    0x011a: "XResolution",
+    0x011b: "YResolution",
+    0x0128: "ResolutionUnit",
+    0x0111: "StripOffsets",
+    0x0116: "RowsPerStrip",
+    0x0117: "StripByteCounts",
+    0x0201: "JPEGInterchangeFormat",
+    0x0202: "JPEGInterchangeFormatLength",
+    0x012d: "TransferFunction",
+    0x013e: "WhitePoint",
+    0x013f: "PrimaryChromaticities",
+    0x0211: "YCbCrCoefficients",
+    0x0214: "ReferenceBlackWhite",
+    0x0132: "DateTime",
+    0x010e: "ImageDescription",
+    0x010f: "Make",
+    0x0110: "Model",
+    0x0131: "Software",
+    0x013b: "Artist",
+    0x8298: "Copyright",
+  });
+
+  var GPSTags = (EXIF.GPSTags = {
+    0x0000: "GPSVersionID",
+    0x0001: "GPSLatitudeRef",
+    0x0002: "GPSLatitude",
+    0x0003: "GPSLongitudeRef",
+    0x0004: "GPSLongitude",
+    0x0005: "GPSAltitudeRef",
+    0x0006: "GPSAltitude",
+    0x0007: "GPSTimeStamp",
+    0x0008: "GPSSatellites",
+    0x0009: "GPSStatus",
+    0x000a: "GPSMeasureMode",
+    0x000b: "GPSDOP",
+    0x000c: "GPSSpeedRef",
+    0x000d: "GPSSpeed",
+    0x000e: "GPSTrackRef",
+    0x000f: "GPSTrack",
+    0x0010: "GPSImgDirectionRef",
+    0x0011: "GPSImgDirection",
+    0x0012: "GPSMapDatum",
+    0x0013: "GPSDestLatitudeRef",
+    0x0014: "GPSDestLatitude",
+    0x0015: "GPSDestLongitudeRef",
+    0x0016: "GPSDestLongitude",
+    0x0017: "GPSDestBearingRef",
+    0x0018: "GPSDestBearing",
+    0x0019: "GPSDestDistanceRef",
+    0x001a: "GPSDestDistance",
+    0x001b: "GPSProcessingMethod",
+    0x001c: "GPSAreaInformation",
+    0x001d: "GPSDateStamp",
+    0x001e: "GPSDifferential",
+  });
+
+  // EXIF 2.3 Spec
+  var IFD1Tags = (EXIF.IFD1Tags = {
+    0x0100: "ImageWidth",
+    0x0101: "ImageHeight",
+    0x0102: "BitsPerSample",
+    0x0103: "Compression",
+    0x0106: "PhotometricInterpretation",
+    0x0111: "StripOffsets",
+    0x0112: "Orientation",
+    0x0115: "SamplesPerPixel",
+    0x0116: "RowsPerStrip",
+    0x0117: "StripByteCounts",
+    0x011a: "XResolution",
+    0x011b: "YResolution",
+    0x011c: "PlanarConfiguration",
+    0x0128: "ResolutionUnit",
+    0x0201: "JpegIFOffset", // When image format is JPEG, this value show offset to JPEG data stored.(aka "ThumbnailOffset" or "JPEGInterchangeFormat")
+    0x0202: "JpegIFByteCount", // When image format is JPEG, this value shows data size of JPEG image (aka "ThumbnailLength" or "JPEGInterchangeFormatLength")
+    0x0211: "YCbCrCoefficients",
+    0x0212: "YCbCrSubSampling",
+    0x0213: "YCbCrPositioning",
+    0x0214: "ReferenceBlackWhite",
+  });
+
+  var StringValues = (EXIF.StringValues = {
+    ExposureProgram: {
+      0: "Not defined",
+      1: "Manual",
+      2: "Normal program",
+      3: "Aperture priority",
+      4: "Shutter priority",
+      5: "Creative program",
+      6: "Action program",
+      7: "Portrait mode",
+      8: "Landscape mode",
+    },
+    MeteringMode: {
+      0: "Unknown",
+      1: "Average",
+      2: "CenterWeightedAverage",
+      3: "Spot",
+      4: "MultiSpot",
+      5: "Pattern",
+      6: "Partial",
+      255: "Other",
+    },
+    LightSource: {
+      0: "Unknown",
+      1: "Daylight",
+      2: "Fluorescent",
+      3: "Tungsten (incandescent light)",
+      4: "Flash",
+      9: "Fine weather",
+      10: "Cloudy weather",
+      11: "Shade",
+      12: "Daylight fluorescent (D 5700 - 7100K)",
+      13: "Day white fluorescent (N 4600 - 5400K)",
+      14: "Cool white fluorescent (W 3900 - 4500K)",
+      15: "White fluorescent (WW 3200 - 3700K)",
+      17: "Standard light A",
+      18: "Standard light B",
+      19: "Standard light C",
+      20: "D55",
+      21: "D65",
+      22: "D75",
+      23: "D50",
+      24: "ISO studio tungsten",
+      255: "Other",
+    },
+    Flash: {
+      0x0000: "Flash did not fire",
+      0x0001: "Flash fired",
+      0x0005: "Strobe return light not detected",
+      0x0007: "Strobe return light detected",
+      0x0009: "Flash fired, compulsory flash mode",
+      0x000d: "Flash fired, compulsory flash mode, return light not detected",
+      0x000f: "Flash fired, compulsory flash mode, return light detected",
+      0x0010: "Flash did not fire, compulsory flash mode",
+      0x0018: "Flash did not fire, auto mode",
+      0x0019: "Flash fired, auto mode",
+      0x001d: "Flash fired, auto mode, return light not detected",
+      0x001f: "Flash fired, auto mode, return light detected",
+      0x0020: "No flash function",
+      0x0041: "Flash fired, red-eye reduction mode",
+      0x0045: "Flash fired, red-eye reduction mode, return light not detected",
+      0x0047: "Flash fired, red-eye reduction mode, return light detected",
+      0x0049: "Flash fired, compulsory flash mode, red-eye reduction mode",
+      0x004d:
+        "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected",
+      0x004f:
+        "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected",
+      0x0059: "Flash fired, auto mode, red-eye reduction mode",
+      0x005d:
+        "Flash fired, auto mode, return light not detected, red-eye reduction mode",
+      0x005f:
+        "Flash fired, auto mode, return light detected, red-eye reduction mode",
+    },
+    SensingMethod: {
+      1: "Not defined",
+      2: "One-chip color area sensor",
+      3: "Two-chip color area sensor",
+      4: "Three-chip color area sensor",
+      5: "Color sequential area sensor",
+      7: "Trilinear sensor",
+      8: "Color sequential linear sensor",
+    },
+    SceneCaptureType: {
+      0: "Standard",
+      1: "Landscape",
+      2: "Portrait",
+      3: "Night scene",
+    },
+    SceneType: {
+      1: "Directly photographed",
+    },
+    CustomRendered: {
+      0: "Normal process",
+      1: "Custom process",
+    },
+    WhiteBalance: {
+      0: "Auto white balance",
+      1: "Manual white balance",
+    },
+    GainControl: {
+      0: "None",
+      1: "Low gain up",
+      2: "High gain up",
+      3: "Low gain down",
+      4: "High gain down",
+    },
+    Contrast: {
+      0: "Normal",
+      1: "Soft",
+      2: "Hard",
+    },
+    Saturation: {
+      0: "Normal",
+      1: "Low saturation",
+      2: "High saturation",
+    },
+    Sharpness: {
+      0: "Normal",
+      1: "Soft",
+      2: "Hard",
+    },
+    SubjectDistanceRange: {
+      0: "Unknown",
+      1: "Macro",
+      2: "Close view",
+      3: "Distant view",
+    },
+    FileSource: {
+      3: "DSC",
+    },
+
+    Components: {
+      0: "",
+      1: "Y",
+      2: "Cb",
+      3: "Cr",
+      4: "R",
+      5: "G",
+      6: "B",
+    },
+  });
+
+  function addEvent(element, event, handler) {
+    if (element.addEventListener) {
+      element.addEventListener(event, handler, false);
+    } else if (element.attachEvent) {
+      element.attachEvent("on" + event, handler);
+    }
+  }
+
+  function imageHasData(img) {
+    return !!img.exifdata;
+  }
+
+  function base64ToArrayBuffer(base64, contentType) {
+    contentType =
+      contentType || base64.match(/^data\:([^\;]+)\;base64,/im)[1] || ""; // e.g. 'data:image/jpeg;base64,...' => 'image/jpeg'
+    base64 = base64.replace(/^data\:([^\;]+)\;base64,/gim, "");
+    var binary = atob(base64);
+    var len = binary.length;
+    var buffer = new ArrayBuffer(len);
+    var view = new Uint8Array(buffer);
+    for (var i = 0; i < len; i++) {
+      view[i] = binary.charCodeAt(i);
+    }
+    return buffer;
+  }
+
+  function objectURLToBlob(url, callback) {
+    var http = new XMLHttpRequest();
+    http.open("GET", url, true);
+    http.responseType = "blob";
+    http.onload = function (e) {
+      if (this.status == 200 || this.status === 0) {
+        callback(this.response);
+      }
+    };
+    http.send();
+  }
+
+  function getImageData(img, callback) {
+    function handleBinaryFile(binFile) {
+      var data = findEXIFinJPEG(binFile);
+      img.exifdata = data || {};
+      var iptcdata = findIPTCinJPEG(binFile);
+      img.iptcdata = iptcdata || {};
+      if (EXIF.isXmpEnabled) {
+        var xmpdata = findXMPinJPEG(binFile);
+        img.xmpdata = xmpdata || {};
+      }
+      if (callback) {
+        callback.call(img);
+      }
+    }
+
+    if (img.src) {
+      if (/^data\:/i.test(img.src)) {
+        // Data URI
+        var arrayBuffer = base64ToArrayBuffer(img.src);
+        handleBinaryFile(arrayBuffer);
+      } else if (/^blob\:/i.test(img.src)) {
+        // Object URL
+        var fileReader = new FileReader();
+        fileReader.onload = function (e) {
+          handleBinaryFile(e.target.result);
+        };
+        objectURLToBlob(img.src, function (blob) {
+          fileReader.readAsArrayBuffer(blob);
+        });
+      } else {
+        var http = new XMLHttpRequest();
+        http.onload = function () {
+          if (this.status == 200 || this.status === 0) {
+            handleBinaryFile(http.response);
+          } else {
+            throw "Could not load image";
+          }
+          http = null;
+        };
+        http.open("GET", img.src, true);
+        http.responseType = "arraybuffer";
+        http.send(null);
+      }
+    } else if (
+      self.FileReader &&
+      (img instanceof self.Blob || img instanceof self.File)
+    ) {
+      var fileReader = new FileReader();
+      fileReader.onload = function (e) {
+        if (debug)
+          console.log("Got file of length " + e.target.result.byteLength);
+        handleBinaryFile(e.target.result);
+      };
+
+      fileReader.readAsArrayBuffer(img);
+    }
+  }
+
+  function findEXIFinJPEG(file) {
+    var dataView = new DataView(file);
+
+    if (debug) console.log("Got file of length " + file.byteLength);
+    if (dataView.getUint8(0) != 0xff || dataView.getUint8(1) != 0xd8) {
+      if (debug) console.log("Not a valid JPEG");
+      return false; // not a valid jpeg
+    }
+
+    var offset = 2,
+      length = file.byteLength,
+      marker;
+
+    while (offset < length) {
+      if (dataView.getUint8(offset) != 0xff) {
+        if (debug)
+          console.log(
+            "Not a valid marker at offset " +
+              offset +
+              ", found: " +
+              dataView.getUint8(offset)
+          );
+        return false; // not a valid marker, something is wrong
+      }
+
+      marker = dataView.getUint8(offset + 1);
+      if (debug) console.log(marker);
+
+      // we could implement handling for other markers here,
+      // but we're only looking for 0xFFE1 for EXIF data
+
+      if (marker == 225) {
+        if (debug) console.log("Found 0xFFE1 marker");
+
+        return readEXIFData(
+          dataView,
+          offset + 4,
+          dataView.getUint16(offset + 2) - 2
+        );
+
+        // offset += 2 + file.getShortAt(offset+2, true);
+      } else {
+        offset += 2 + dataView.getUint16(offset + 2);
+      }
+    }
+  }
+
+  function findIPTCinJPEG(file) {
+    var dataView = new DataView(file);
+
+    if (debug) console.log("Got file of length " + file.byteLength);
+    if (dataView.getUint8(0) != 0xff || dataView.getUint8(1) != 0xd8) {
+      if (debug) console.log("Not a valid JPEG");
+      return false; // not a valid jpeg
+    }
+
+    var offset = 2,
+      length = file.byteLength;
+
+    var isFieldSegmentStart = function (dataView, offset) {
+      return (
+        dataView.getUint8(offset) === 0x38 &&
+        dataView.getUint8(offset + 1) === 0x42 &&
+        dataView.getUint8(offset + 2) === 0x49 &&
+        dataView.getUint8(offset + 3) === 0x4d &&
+        dataView.getUint8(offset + 4) === 0x04 &&
+        dataView.getUint8(offset + 5) === 0x04
+      );
+    };
+
+    while (offset < length) {
+      if (isFieldSegmentStart(dataView, offset)) {
+        // Get the length of the name header (which is padded to an even number of bytes)
+        var nameHeaderLength = dataView.getUint8(offset + 7);
+        if (nameHeaderLength % 2 !== 0) nameHeaderLength += 1;
+        // Check for pre photoshop 6 format
+        if (nameHeaderLength === 0) {
+          // Always 4
+          nameHeaderLength = 4;
+        }
+
+        var startOffset = offset + 8 + nameHeaderLength;
+        var sectionLength = dataView.getUint16(offset + 6 + nameHeaderLength);
+
+        return readIPTCData(file, startOffset, sectionLength);
+
+        break;
+      }
+
+      // Not the marker, continue searching
+      offset++;
+    }
+  }
+  var IptcFieldMap = {
+    0x78: "caption",
+    0x6e: "credit",
+    0x19: "keywords",
+    0x37: "dateCreated",
+    0x50: "byline",
+    0x55: "bylineTitle",
+    0x7a: "captionWriter",
+    0x69: "headline",
+    0x74: "copyright",
+    0x0f: "category",
+  };
+  function readIPTCData(file, startOffset, sectionLength) {
+    var dataView = new DataView(file);
+    var data = {};
+    var fieldValue, fieldName, dataSize, segmentType, segmentSize;
+    var segmentStartPos = startOffset;
+    while (segmentStartPos < startOffset + sectionLength) {
+      if (
+        dataView.getUint8(segmentStartPos) === 0x1c &&
+        dataView.getUint8(segmentStartPos + 1) === 0x02
+      ) {
+        segmentType = dataView.getUint8(segmentStartPos + 2);
+        if (segmentType in IptcFieldMap) {
+          dataSize = dataView.getInt16(segmentStartPos + 3);
+          segmentSize = dataSize + 5;
+          fieldName = IptcFieldMap[segmentType];
+          fieldValue = getStringFromDB(dataView, segmentStartPos + 5, dataSize);
+          // Check if we already stored a value with this name
+          if (data.hasOwnProperty(fieldName)) {
+            // Value already stored with this name, create multivalue field
+            if (data[fieldName] instanceof Array) {
+              data[fieldName].push(fieldValue);
+            } else {
+              data[fieldName] = [data[fieldName], fieldValue];
+            }
+          } else {
+            data[fieldName] = fieldValue;
+          }
+        }
+      }
+      segmentStartPos++;
+    }
+    return data;
+  }
+
+  function readTags(file, tiffStart, dirStart, strings, bigEnd) {
+    var entries = file.getUint16(dirStart, !bigEnd),
+      tags = {},
+      entryOffset,
+      tag,
+      i;
+
+    for (i = 0; i < entries; i++) {
+      entryOffset = dirStart + i * 12 + 2;
+      tag = strings[file.getUint16(entryOffset, !bigEnd)];
+      if (!tag && debug)
+        console.log("Unknown tag: " + file.getUint16(entryOffset, !bigEnd));
+      tags[tag] = readTagValue(file, entryOffset, tiffStart, dirStart, bigEnd);
+    }
+    return tags;
+  }
+
+  function readTagValue(file, entryOffset, tiffStart, dirStart, bigEnd) {
+    var type = file.getUint16(entryOffset + 2, !bigEnd),
+      numValues = file.getUint32(entryOffset + 4, !bigEnd),
+      valueOffset = file.getUint32(entryOffset + 8, !bigEnd) + tiffStart,
+      offset,
+      vals,
+      val,
+      n,
+      numerator,
+      denominator;
+
+    switch (type) {
+      case 1: // byte, 8-bit unsigned int
+      case 7: // undefined, 8-bit byte, value depending on field
+        if (numValues == 1) {
+          return file.getUint8(entryOffset + 8, !bigEnd);
+        } else {
+          offset = numValues > 4 ? valueOffset : entryOffset + 8;
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getUint8(offset + n);
+          }
+          return vals;
+        }
+
+      case 2: // ascii, 8-bit byte
+        offset = numValues > 4 ? valueOffset : entryOffset + 8;
+        return getStringFromDB(file, offset, numValues - 1);
+
+      case 3: // short, 16 bit int
+        if (numValues == 1) {
+          return file.getUint16(entryOffset + 8, !bigEnd);
+        } else {
+          offset = numValues > 2 ? valueOffset : entryOffset + 8;
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getUint16(offset + 2 * n, !bigEnd);
+          }
+          return vals;
+        }
+
+      case 4: // long, 32 bit int
+        if (numValues == 1) {
+          return file.getUint32(entryOffset + 8, !bigEnd);
+        } else {
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getUint32(valueOffset + 4 * n, !bigEnd);
+          }
+          return vals;
+        }
+
+      case 5: // rational = two long values, first is numerator, second is denominator
+        if (numValues == 1) {
+          numerator = file.getUint32(valueOffset, !bigEnd);
+          denominator = file.getUint32(valueOffset + 4, !bigEnd);
+          val = new Number(numerator / denominator);
+          val.numerator = numerator;
+          val.denominator = denominator;
+          return val;
+        } else {
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            numerator = file.getUint32(valueOffset + 8 * n, !bigEnd);
+            denominator = file.getUint32(valueOffset + 4 + 8 * n, !bigEnd);
+            vals[n] = new Number(numerator / denominator);
+            vals[n].numerator = numerator;
+            vals[n].denominator = denominator;
+          }
+          return vals;
+        }
+
+      case 9: // slong, 32 bit signed int
+        if (numValues == 1) {
+          return file.getInt32(entryOffset + 8, !bigEnd);
+        } else {
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getInt32(valueOffset + 4 * n, !bigEnd);
+          }
+          return vals;
+        }
+
+      case 10: // signed rational, two slongs, first is numerator, second is denominator
+        if (numValues == 1) {
+          return (
+            file.getInt32(valueOffset, !bigEnd) /
+            file.getInt32(valueOffset + 4, !bigEnd)
+          );
+        } else {
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] =
+              file.getInt32(valueOffset + 8 * n, !bigEnd) /
+              file.getInt32(valueOffset + 4 + 8 * n, !bigEnd);
+          }
+          return vals;
+        }
+    }
+  }
+
+  /**
+   * Given an IFD (Image File Directory) start offset
+   * returns an offset to next IFD or 0 if it's the last IFD.
+   */
+  function getNextIFDOffset(dataView, dirStart, bigEnd) {
+    //the first 2bytes means the number of directory entries contains in this IFD
+    var entries = dataView.getUint16(dirStart, !bigEnd);
+
+    // After last directory entry, there is a 4bytes of data,
+    // it means an offset to next IFD.
+    // If its value is '0x00000000', it means this is the last IFD and there is no linked IFD.
+
+    return dataView.getUint32(dirStart + 2 + entries * 12, !bigEnd); // each entry is 12 bytes long
+  }
+
+  function readThumbnailImage(dataView, tiffStart, firstIFDOffset, bigEnd) {
+    // get the IFD1 offset
+    var IFD1OffsetPointer = getNextIFDOffset(
+      dataView,
+      tiffStart + firstIFDOffset,
+      bigEnd
+    );
+
+    if (!IFD1OffsetPointer) {
+      // console.log('******** IFD1Offset is empty, image thumb not found ********');
+      return {};
+    } else if (IFD1OffsetPointer > dataView.byteLength) {
+      // this should not happen
+      // console.log('******** IFD1Offset is outside the bounds of the DataView ********');
+      return {};
+    }
+    // console.log('*******  thumbnail IFD offset (IFD1) is: %s', IFD1OffsetPointer);
+
+    var thumbTags = readTags(
+      dataView,
+      tiffStart,
+      tiffStart + IFD1OffsetPointer,
+      IFD1Tags,
+      bigEnd
+    );
+
+    // EXIF 2.3 specification for JPEG format thumbnail
+
+    // If the value of Compression(0x0103) Tag in IFD1 is '6', thumbnail image format is JPEG.
+    // Most of Exif image uses JPEG format for thumbnail. In that case, you can get offset of thumbnail
+    // by JpegIFOffset(0x0201) Tag in IFD1, size of thumbnail by JpegIFByteCount(0x0202) Tag.
+    // Data format is ordinary JPEG format, starts from 0xFFD8 and ends by 0xFFD9. It seems that
+    // JPEG format and 160x120pixels of size are recommended thumbnail format for Exif2.1 or later.
+
+    if (thumbTags["Compression"]) {
+      // console.log('Thumbnail image found!');
+
+      switch (thumbTags["Compression"]) {
+        case 6:
+          // console.log('Thumbnail image format is JPEG');
+          if (thumbTags.JpegIFOffset && thumbTags.JpegIFByteCount) {
+            // extract the thumbnail
+            var tOffset = tiffStart + thumbTags.JpegIFOffset;
+            var tLength = thumbTags.JpegIFByteCount;
+            thumbTags["blob"] = new Blob(
+              [new Uint8Array(dataView.buffer, tOffset, tLength)],
+              {
+                type: "image/jpeg",
+              }
+            );
+          }
+          break;
+
+        case 1:
+          console.log(
+            "Thumbnail image format is TIFF, which is not implemented."
+          );
+          break;
+        default:
+          console.log(
+            "Unknown thumbnail image format '%s'",
+            thumbTags["Compression"]
+          );
+      }
+    } else if (thumbTags["PhotometricInterpretation"] == 2) {
+      console.log("Thumbnail image format is RGB, which is not implemented.");
+    }
+    return thumbTags;
+  }
+
+  function getStringFromDB(buffer, start, length) {
+    var outstr = "";
+    for (var n = start; n < start + length; n++) {
+      outstr += String.fromCharCode(buffer.getUint8(n));
+    }
+    return outstr;
+  }
+
+  function readEXIFData(file, start) {
+    if (getStringFromDB(file, start, 4) != "Exif") {
+      if (debug)
+        console.log("Not valid EXIF data! " + getStringFromDB(file, start, 4));
+      return false;
+    }
+
+    var bigEnd,
+      tags,
+      tag,
+      exifData,
+      gpsData,
+      tiffOffset = start + 6;
+
+    // test for TIFF validity and endianness
+    if (file.getUint16(tiffOffset) == 0x4949) {
+      bigEnd = false;
+    } else if (file.getUint16(tiffOffset) == 0x4d4d) {
+      bigEnd = true;
+    } else {
+      if (debug) console.log("Not valid TIFF data! (no 0x4949 or 0x4D4D)");
+      return false;
+    }
+
+    if (file.getUint16(tiffOffset + 2, !bigEnd) != 0x002a) {
+      if (debug) console.log("Not valid TIFF data! (no 0x002A)");
+      return false;
+    }
+
+    var firstIFDOffset = file.getUint32(tiffOffset + 4, !bigEnd);
+
+    if (firstIFDOffset < 0x00000008) {
+      if (debug)
+        console.log(
+          "Not valid TIFF data! (First offset less than 8)",
+          file.getUint32(tiffOffset + 4, !bigEnd)
+        );
+      return false;
+    }
+
+    tags = readTags(
+      file,
+      tiffOffset,
+      tiffOffset + firstIFDOffset,
+      TiffTags,
+      bigEnd
+    );
+
+    if (tags.ExifIFDPointer) {
+      exifData = readTags(
+        file,
+        tiffOffset,
+        tiffOffset + tags.ExifIFDPointer,
+        ExifTags,
+        bigEnd
+      );
+      for (tag in exifData) {
+        switch (tag) {
+          case "LightSource":
+          case "Flash":
+          case "MeteringMode":
+          case "ExposureProgram":
+          case "SensingMethod":
+          case "SceneCaptureType":
+          case "SceneType":
+          case "CustomRendered":
+          case "WhiteBalance":
+          case "GainControl":
+          case "Contrast":
+          case "Saturation":
+          case "Sharpness":
+          case "SubjectDistanceRange":
+          case "FileSource":
+            exifData[tag] = StringValues[tag][exifData[tag]];
+            break;
+
+          case "ExifVersion":
+          case "FlashpixVersion":
+            exifData[tag] = String.fromCharCode(
+              exifData[tag][0],
+              exifData[tag][1],
+              exifData[tag][2],
+              exifData[tag][3]
+            );
+            break;
+
+          case "ComponentsConfiguration":
+            exifData[tag] =
+              StringValues.Components[exifData[tag][0]] +
+              StringValues.Components[exifData[tag][1]] +
+              StringValues.Components[exifData[tag][2]] +
+              StringValues.Components[exifData[tag][3]];
+            break;
+        }
+        tags[tag] = exifData[tag];
+      }
+    }
+
+    if (tags.GPSInfoIFDPointer) {
+      gpsData = readTags(
+        file,
+        tiffOffset,
+        tiffOffset + tags.GPSInfoIFDPointer,
+        GPSTags,
+        bigEnd
+      );
+      for (tag in gpsData) {
+        switch (tag) {
+          case "GPSVersionID":
+            gpsData[tag] =
+              gpsData[tag][0] +
+              "." +
+              gpsData[tag][1] +
+              "." +
+              gpsData[tag][2] +
+              "." +
+              gpsData[tag][3];
+            break;
+        }
+        tags[tag] = gpsData[tag];
+      }
+    }
+
+    // extract thumbnail
+    tags["thumbnail"] = readThumbnailImage(
+      file,
+      tiffOffset,
+      firstIFDOffset,
+      bigEnd
+    );
+
+    return tags;
+  }
+
+  function findXMPinJPEG(file) {
+    if (!("DOMParser" in self)) {
+      // console.warn('XML parsing not supported without DOMParser');
+      return;
+    }
+    var dataView = new DataView(file);
+
+    if (debug) console.log("Got file of length " + file.byteLength);
+    if (dataView.getUint8(0) != 0xff || dataView.getUint8(1) != 0xd8) {
+      if (debug) console.log("Not a valid JPEG");
+      return false; // not a valid jpeg
+    }
+
+    var offset = 2,
+      length = file.byteLength,
+      dom = new DOMParser();
+
+    while (offset < length - 4) {
+      if (getStringFromDB(dataView, offset, 4) == "http") {
+        var startOffset = offset - 1;
+        var sectionLength = dataView.getUint16(offset - 2) - 1;
+        var xmpString = getStringFromDB(dataView, startOffset, sectionLength);
+        var xmpEndIndex = xmpString.indexOf("xmpmeta>") + 8;
+        xmpString = xmpString.substring(
+          xmpString.indexOf("<x:xmpmeta"),
+          xmpEndIndex
+        );
+
+        var indexOfXmp = xmpString.indexOf("x:xmpmeta") + 10;
+        //Many custom written programs embed xmp/xml without any namespace. Following are some of them.
+        //Without these namespaces, XML is thought to be invalid by parsers
+        xmpString =
+          xmpString.slice(0, indexOfXmp) +
+          'xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/" ' +
+          'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' +
+          'xmlns:tiff="http://ns.adobe.com/tiff/1.0/" ' +
+          'xmlns:plus="http://schemas.android.com/apk/lib/com.google.android.gms.plus" ' +
+          'xmlns:ext="http://www.gettyimages.com/xsltExtension/1.0" ' +
+          'xmlns:exif="http://ns.adobe.com/exif/1.0/" ' +
+          'xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" ' +
+          'xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" ' +
+          'xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/" ' +
+          'xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/" ' +
+          'xmlns:Iptc4xmpExt="http://iptc.org/std/Iptc4xmpExt/2008-02-29/" ' +
+          xmpString.slice(indexOfXmp);
+
+        var domDocument = dom.parseFromString(xmpString, "text/xml");
+        return xml2Object(domDocument);
+      } else {
+        offset++;
+      }
+    }
+  }
+
+  function xml2json(xml) {
+    var json = {};
+
+    if (xml.nodeType == 1) {
+      // element node
+      if (xml.attributes.length > 0) {
+        json["@attributes"] = {};
+        for (var j = 0; j < xml.attributes.length; j++) {
+          var attribute = xml.attributes.item(j);
+          json["@attributes"][attribute.nodeName] = attribute.nodeValue;
+        }
+      }
+    } else if (xml.nodeType == 3) {
+      // text node
+      return xml.nodeValue;
+    }
+
+    // deal with children
+    if (xml.hasChildNodes()) {
+      for (var i = 0; i < xml.childNodes.length; i++) {
+        var child = xml.childNodes.item(i);
+        var nodeName = child.nodeName;
+        if (json[nodeName] == null) {
+          json[nodeName] = xml2json(child);
+        } else {
+          if (json[nodeName].push == null) {
+            var old = json[nodeName];
+            json[nodeName] = [];
+            json[nodeName].push(old);
+          }
+          json[nodeName].push(xml2json(child));
+        }
+      }
+    }
+
+    return json;
+  }
+
+  function xml2Object(xml) {
+    try {
+      var obj = {};
+      if (xml.children.length > 0) {
+        for (var i = 0; i < xml.children.length; i++) {
+          var item = xml.children.item(i);
+          var attributes = item.attributes;
+          for (var idx in attributes) {
+            var itemAtt = attributes[idx];
+            var dataKey = itemAtt.nodeName;
+            var dataValue = itemAtt.nodeValue;
+
+            if (dataKey !== undefined) {
+              obj[dataKey] = dataValue;
+            }
+          }
+          var nodeName = item.nodeName;
+
+          if (typeof obj[nodeName] == "undefined") {
+            obj[nodeName] = xml2json(item);
+          } else {
+            if (typeof obj[nodeName].push == "undefined") {
+              var old = obj[nodeName];
+
+              obj[nodeName] = [];
+              obj[nodeName].push(old);
+            }
+            obj[nodeName].push(xml2json(item));
+          }
+        }
+      } else {
+        obj = xml.textContent;
+      }
+      return obj;
+    } catch (e) {
+      console.log(e.message);
+    }
+  }
+
+  EXIF.enableXmp = function () {
+    EXIF.isXmpEnabled = true;
+  };
+
+  EXIF.disableXmp = function () {
+    EXIF.isXmpEnabled = false;
+  };
+
+  EXIF.getData = function (img, callback) {
+    console.log("EXIF", img);
+    // if (
+    //   ((self.Image && img instanceof self.Image) ||
+    //     (self.HTMLImageElement && img instanceof self.HTMLImageElement)) &&
+    //   !img.complete
+    // )
+    // return false;
+
+    if (!imageHasData(img)) {
+      getImageData(img, callback);
+    } else {
+      if (callback) {
+        callback.call(img);
+      }
+    }
+    return true;
+  };
+
+  EXIF.getTag = function (img, tag) {
+    if (!imageHasData(img)) return;
+    return img.exifdata[tag];
+  };
+
+  EXIF.getIptcTag = function (img, tag) {
+    if (!imageHasData(img)) return;
+    return img.iptcdata[tag];
+  };
+
+  EXIF.getAllTags = function (img) {
+    if (!imageHasData(img)) return {};
+    var a,
+      data = img.exifdata,
+      tags = {};
+    for (a in data) {
+      if (data.hasOwnProperty(a)) {
+        tags[a] = data[a];
+      }
+    }
+    return tags;
+  };
+
+  EXIF.getAllIptcTags = function (img) {
+    if (!imageHasData(img)) return {};
+    var a,
+      data = img.iptcdata,
+      tags = {};
+    for (a in data) {
+      if (data.hasOwnProperty(a)) {
+        tags[a] = data[a];
+      }
+    }
+    return tags;
+  };
+
+  EXIF.pretty = function (img) {
+    if (!imageHasData(img)) return "";
+    var a,
+      data = img.exifdata,
+      strPretty = "";
+    for (a in data) {
+      if (data.hasOwnProperty(a)) {
+        if (typeof data[a] == "object") {
+          if (data[a] instanceof Number) {
+            strPretty +=
+              a +
+              " : " +
+              data[a] +
+              " [" +
+              data[a].numerator +
+              "/" +
+              data[a].denominator +
+              "]\r\n";
+          } else {
+            strPretty += a + " : [" + data[a].length + " values]\r\n";
+          }
+        } else {
+          strPretty += a + " : " + data[a] + "\r\n";
+        }
+      }
+    }
+    return strPretty;
+  };
+
+  EXIF.readFromBinaryFile = function (file) {
+    return findEXIFinJPEG(file);
+  };
+
+  if (typeof define === "function" && define.amd) {
+    define("exif-js", [], function () {
+      return EXIF;
+    });
+  }
+}).call(this);
diff --git a/java-mall-app-shop-admin/utils/tupian.js b/java-mall-app-shop-admin/utils/tupian.js
new file mode 100644
index 0000000..4b06b03
--- /dev/null
+++ b/java-mall-app-shop-admin/utils/tupian.js
@@ -0,0 +1,262 @@
+/**
+ *  imageUtil.js
+ *解决图片旋转的问题
+ * **/
+
+import EXIF from "./exif.js";
+
+async function compressImage(path) {
+  let imageInfo = await getImageInfo(path);
+  let systemInfo = await getSystemInfo();
+  return new Promise(function (resolve, reject) {
+    // #ifdef APP-PLUS || APP-NVUE
+    appCompressImage(path, imageInfo)
+      .then((res) => {
+        resolve(res);
+      })
+      .catch((e) => {
+        reject(e);
+      });
+    // #endif
+
+    // #ifdef H5
+    let orientation = 1;
+    let img = document.createElement("img");
+    img.src = path;
+    img.onload = function () {
+      EXIF.getData(img, function () {
+        orientation = EXIF.getTag(this, "Orientation");
+        canvasImg(path, orientation, imageInfo, systemInfo)
+          .then((res) => {
+            debugger;
+            resolve(res);
+          })
+          .catch((e) => {
+            reject(e);
+          });
+      });
+    };
+    img.onerror = function () {
+      reject(path);
+    };
+    // #endif
+  });
+}
+
+// app处理旋转图片
+function appCompressImage(src, imageInfo) {
+  return new Promise(function (resolve, reject) {
+    let orientation = imageInfo.orientation;
+    let rotate = 0;
+    let quality = 80;
+    if (plus.os.name == "iOS") {
+      rotate = 0;
+      quality = 25;
+    } else {
+      switch (orientation) {
+        case "up": //exif:1 不旋转
+          rotate = 0;
+          break;
+        case "down": //exif:3 旋转180度
+          rotate = 180;
+          break;
+        case "right": //exif:6 旋转90度
+          rotate = 90;
+          break;
+        case "left": //exif:8 旋转270度
+          rotate = 270;
+          break;
+        default:
+          rotate = 0;
+          break;
+      }
+    }
+
+    plus.zip.compressImage(
+      {
+        src: src,
+        dst:
+          "_doc/uniapp_temp" + "/compressed/" + Math.round(new Date()) + ".png",
+        format: "png",
+        quality: quality,
+        width: "auto",
+        height: "auto",
+        rotate: rotate,
+      },
+      function (event) {
+        resolve(event.target);
+      },
+      function (error) {
+        reject(src);
+      }
+    );
+  });
+}
+
+// 画图片
+function canvasImg(path, or, imageInfo, systemInfo) {
+  return new Promise(function (resolve, reject) {
+    let canvasId = "uploadCanvas";
+    const ctx = uni.createCanvasContext(canvasId);
+    let scale = imageInfo.width / imageInfo.height;
+
+    // 图片参数 start
+    let maxdestWidth = 1100; // 2000;
+    let destWidth = imageInfo.width;
+    let destHeight = imageInfo.height;
+
+    let destCompressWidth = imageInfo.width;
+    let destCompressHeight = imageInfo.height;
+
+    // 压缩图片 最大不超过5M  1200
+    // 当宽大于高的时候
+    if (imageInfo.width > imageInfo.height) {
+      if (imageInfo.width > maxdestWidth) {
+        destCompressWidth = maxdestWidth;
+        destCompressHeight = Math.floor(destCompressWidth / scale);
+      } else {
+        destCompressWidth = (imageInfo.width * 8) / 10;
+        destCompressHeight = Math.floor(destCompressWidth / scale);
+      }
+    }
+    // 当高大于宽
+    else {
+      if (imageInfo.height > maxdestWidth) {
+        destCompressHeight = maxdestWidth;
+        destCompressWidth = Math.floor(destCompressHeight * scale);
+      } else {
+        destCompressHeight = imageInfo.height * 0.8;
+        destCompressWidth = Math.floor(destCompressHeight * scale);
+      }
+    }
+
+    destWidth = destCompressHeight;
+    destHeight = destCompressWidth;
+    // 图片参数 end
+
+    // 画布参数 start
+    let maxWidth = 300;
+    let canvasW = imageInfo.width;
+    let canvasH = imageInfo.height;
+
+    let width = imageInfo.width;
+    let height = imageInfo.height;
+
+    // canvas画布不能超过最大宽
+    if (canvasW > maxWidth) {
+      canvasW = maxWidth;
+      canvasH = Math.floor(canvasW / scale);
+    }
+
+    width = canvasW;
+    height = canvasH;
+    // 画布参数 end
+
+    // console.log('--or---', or)
+    //单独处理苹果最新版本
+    if (
+      systemInfo.model == "iPhone" &&
+      systemInfo.system.indexOf("13.4.1") > -1
+    ) {
+      ctx.drawImage(path, 0, 0, canvasW, canvasH);
+      destWidth = destCompressWidth;
+      destHeight = destCompressHeight;
+    } else {
+      if (or == 6) {
+        //逆时针旋转了90
+        ctx.translate(width, 0);
+        ctx.rotate(Math.PI / 2);
+        ctx.drawImage(path, 0, 0, canvasH, canvasW);
+      } else if (or == 3) {
+        //逆时针旋转了180
+        ctx.translate(width, height);
+        ctx.rotate(Math.PI);
+        ctx.drawImage(path, 0, 0, canvasH, canvasW);
+      } else if (or == 8) {
+        //顺时针旋转90
+        ctx.translate(0, height);
+        ctx.rotate(-Math.PI / 2);
+        ctx.drawImage(path, 0, 0, canvasH, canvasW);
+      } else {
+        ctx.drawImage(path, 0, 0, canvasW, canvasH);
+        // return resolve(path);
+
+        destWidth = destCompressWidth;
+        destHeight = destCompressHeight;
+      }
+    }
+    // console.log('图片原始长宽', imageInfo, maxWidth, canvasW, canvasH, width, height, destWidth, destHeight);
+
+    ctx.draw(
+      true,
+      setTimeout(() => {
+        uni.canvasToTempFilePath({
+          x: 0,
+          y: 0,
+          width: width, //画布宽度
+          height: height,
+          destWidth: destWidth,
+          destHeight: destHeight,
+          fileType: "png",
+          canvasId: canvasId,
+          success: (res) => {
+            resolve(res.tempFilePath);
+          },
+          fail: (err) => {
+            resolve(path);
+          },
+        });
+      }, 200)
+    );
+  });
+}
+
+// 获取图片信息
+function getImageInfo(path) {
+  return new Promise(function (resolve, reject) {
+    // #ifdef APP-PLUS
+    plus.io.getImageInfo({
+      src: path,
+      success: function (image) {
+        // console.log('orientation=' + image.orientation);
+        resolve(image);
+      },
+      fail: function (err) {
+        console.log("getImageInfoErr: " + JSON.stringify(err));
+        reject(err);
+      },
+    });
+    // #endif
+
+    // #ifdef H5 || MP-WEIXIN
+    uni.getImageInfo({
+      src: path,
+      success: function (image) {
+        // console.log('orientation=' + image.orientation);
+        resolve(image);
+      },
+      fail: function (err) {
+        console.log("getImageInfoErr: " + JSON.stringify(err));
+        reject(err);
+      },
+    });
+    // #endif
+  });
+}
+
+// 获取系统信息
+function getSystemInfo(path) {
+  return new Promise(function (resolve, reject) {
+    uni.getSystemInfo({
+      success(res) {
+        resolve(res);
+      },
+      fail(err) {
+        console.log("getSystemInfoErr: " + JSON.stringify(err));
+        reject(err);
+      },
+    });
+  });
+}
+
+export default compressImage;