diff --git a/.gitignore b/.gitignore
index 961b6db..063d141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
-unpackage/
+unpackage/cache
+unpackage/dist
+unpackage/res
+unpackage/resources
 node_modules/
 /node_modules/
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 07d9281..179fe2d 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -16,7 +16,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/pageCategory/index/index.vue b/pageCategory/index/index.vue
index c86676a..c282ffa 100644
--- a/pageCategory/index/index.vue
+++ b/pageCategory/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="safe-page">
+	<view class="safe-page min-page">
 		<view class="goods-list u-p-30">
 			<view class="u-m-b-32" v-for="(item,index) in pageData.list" :key="index">
 				<my-category 
diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index 8f06a11..e4b6272 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -1767,7 +1767,9 @@
 		padding: 0 !important;
 		min-height: initial !important;
 	}
-
+	::v-deep .uni-easyinput__content-input{
+		height: inherit;
+	}
 	::v-deep .none-label .uni-forms-item .uni-forms-item__label {
 		padding: 0 !important;
 	}
diff --git a/pageProduct/index/index.vue b/pageProduct/index/index.vue
index 414dd84..4ab5da9 100644
--- a/pageProduct/index/index.vue
+++ b/pageProduct/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="safe-page">
+	<view class="safe-page min-page">
 		<up-sticky>
 			<view class="bg-fff u-p-l-30   u-p-b-30">
 				<!-- <view class="myTabs ">
diff --git a/pageProduct/invoicing-list/invoicing-list.vue b/pageProduct/invoicing-list/invoicing-list.vue
index 8054bbe..8253bc9 100644
--- a/pageProduct/invoicing-list/invoicing-list.vue
+++ b/pageProduct/invoicing-list/invoicing-list.vue
@@ -1,41 +1,44 @@
 <template>
 	<view class="color-333 u-font-28">
-		<view class="fixed-top bg-fff u-flex u-p-l-30 u-row-between">
-			<view class="u-flex  ">
-				<view class="u-flex u-p-t-30 u-p-b-30 u-flex-1 u-row-center" @tap="timeToggle">
-					<text class="u-m-r-12 no-wrap">筛选时间</text>
-					<image src="/pageInvoicing/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
-						mode="">
-					</image>
+		<up-sticky offset-top="0">
+			<view class=" bg-fff u-flex u-p-l-30 u-row-between">
+				<view class="u-flex  ">
+					<view class="u-flex u-p-t-30 u-p-b-30 u-flex-1 u-row-center" @tap="timeToggle">
+						<text class="u-m-r-12 no-wrap" :class="{'color-main':filters.time.start&&filters.time.end}">筛选时间</text>
+						<image src="/pageInvoicing/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
+							mode="">
+						</image>
+					</view>
+					<view class="u-flex u-m-l-60 u-p-t-30 u-p-b-30  u-flex-1 u-row-center" @tap="showTypesToggle">
+						<text class="u-m-r-12" v-if="types.active===''"> 选择类型</text>
+						<text class="u-m-r-12 no-wrap color-main" v-else>{{types.list[types.active].text}}</text>
+						<image src="/pageInvoicing/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
+							mode="">
+						</image>
+					</view>
 				</view>
-				<view class="u-flex u-m-l-60 u-p-t-30 u-p-b-30  u-flex-1 u-row-center" @tap="showTypesToggle">
-					<text class="u-m-r-12" v-if="types.active===''"> 选择类型</text>
-					<text class="u-m-r-12 no-wrap color-main" v-else>{{types.list[types.active].text}}</text>
-					<image src="/pageInvoicing/static/images/icon-arrow-down-fill.svg" class="icon-arrow-down-fill"
-						mode="">
-					</image>
+			
+				<!-- <view style="width: 164rpx;"></view> -->
+				<!-- <view class="search-box">
+					<view class="search-btn u-flex" @tap="showSearch" :style="{width:search.show?'694rpx':'164rpx'}">
+						<image src="@/static/iconImg/icon-search.svg" class="input-icon" />
+						<view class="u-flex-1 u-p-l-10"><input v-model="search.keyword" @confirm="searchConfirm" type="text"
+								placeholder-style="font-size:28rpx;" placeholder="搜索" /></view>
+						<view @tap.stop="hideSearch" v-if="search.show">取消</view>
+					</view>
+				</view> -->
+			
+				<view :style="{height:types.show?typesHeight:0}" class="tranistion types overflow-hide">
+					<view @tap="changeTypesActive(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
+						v-for="(item,index) in types.list" :key="index">
+						<view>{{item.text}}</view>
+						<uni-icons v-if="types.active===index" type="checkmarkempty" :color="color.ColorMain"></uni-icons>
+					</view>
+					<view :style="{height: types.bottomHeight+'px'}"></view>
 				</view>
 			</view>
-
-			<!-- <view style="width: 164rpx;"></view> -->
-			<!-- <view class="search-box">
-				<view class="search-btn u-flex" @tap="showSearch" :style="{width:search.show?'694rpx':'164rpx'}">
-					<image src="@/static/iconImg/icon-search.svg" class="input-icon" />
-					<view class="u-flex-1 u-p-l-10"><input v-model="search.keyword" @confirm="searchConfirm" type="text"
-							placeholder-style="font-size:28rpx;" placeholder="搜索" /></view>
-					<view @tap.stop="hideSearch" v-if="search.show">取消</view>
-				</view>
-			</view> -->
-
-			<view :style="{height:types.show?typesHeight:0}" class="tranistion types overflow-hide">
-				<view @tap="changeTypesActive(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
-					v-for="(item,index) in types.list" :key="index">
-					<view>{{item.text}}</view>
-					<uni-icons v-if="types.active===index" type="checkmarkempty" :color="color.ColorMain"></uni-icons>
-				</view>
-				<view :style="{height: types.bottomHeight+'px'}"></view>
-			</view>
-		</view>
+		</up-sticky>
+		
 
 		<view class=" min-page bg-gray list u-p-30">
 			<view class="u-flex u-m-b-30" v-if="filters.time.start&&filters.time.end">
@@ -49,7 +52,7 @@
 				</view>
 			</view>
 
-			<view class="recoreds color-fff ">
+			<!-- <view class="recoreds color-fff ">
 				<view class="u-font-32">详情记录</view>
 				<view class="u-flex u-row-between u-m-t-48">
 					<view class="u-flex u-flex-col u-row-center u-col-center">
@@ -57,9 +60,9 @@
 						<view class="u-font-32 u-m-t-10 font-bold">{{pageData.changeSum}}</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<template v-if="pageData.list.length">
-				<view class="u-m-b-28 u-m-t-28" v-for="(item,index) in pageData.list" :key="index">
+				<view class="u-m-b-28 " v-for="(item,index) in pageData.list" :key="index">
 					<list-item :data="item"></list-item>
 				</view>
 				<my-pagination :size="pageData.size" :totalElements="pageData.totalElements"
@@ -209,7 +212,11 @@
 	const pageData = reactive({
 		query: {
 			page: 0,
-			size: 10
+			size: 10,
+			productId:'',
+			column:'/api/tbProductStockDetail/stock/count',
+			shopId:uni.getStorageSync('shopId'),
+			createdAt:[]
 		},
 		productId:'',
 		totalElements: 0,
@@ -242,9 +249,9 @@
 	})
 	
 	onLoad(opt => {
-		pageData.productId = opt ? opt.productId : ''
+		pageData.query.productId = opt ? opt.productId : ''
 		init()
-		getSum()
+		// getSum()
 	})
 </script>
 
@@ -317,6 +324,5 @@
 	}
 
 	.list {
-		margin-top: 52px;
 	}
 </style>
\ No newline at end of file
diff --git a/pageWorkControl/index/index.vue b/pageWorkControl/index/index.vue
index b1a5a66..8b8aae6 100644
--- a/pageWorkControl/index/index.vue
+++ b/pageWorkControl/index/index.vue
@@ -140,10 +140,10 @@
 			<my-button bgColor="#333" color="#fff" borderRadius="100rpx 0 0 100rpx" shape="circle" plain type="primary"
 				@tap="toSetting">设置</my-button>
 		</view> -->
-		<view class="u-flex-1">
-			<!-- <my-button borderRadius="0 100rpx 100rpx 0" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button> -->
+		<!-- <view class="u-flex-1">
+			<my-button borderRadius="0 100rpx 100rpx 0" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button>
 			<my-button borderRadius="100rpx" shape="circle" type="primary" @tap="jiaoban">开始交班</my-button>
-		</view>
+		</view> -->
 	</view>
 
 	<!-- 交班开班时间选择 -->
diff --git a/unpackage/debug/android_debug.apk b/unpackage/debug/android_debug.apk
new file mode 100644
index 0000000..255d8a2
Binary files /dev/null and b/unpackage/debug/android_debug.apk differ