Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

.gitignore

@@ -1,3 +1,6 @@
-unpackage/
+unpackage/cache
+unpackage/dist
+unpackage/res
+unpackage/resources
 node_modules/
 /node_modules/

.hbuilderx/launch.json

@@ -16,7 +16,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]

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 

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;
 	}

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 ">

pageProduct/invoicing-list/invoicing-list.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="color-333 u-font-28">
-		<view class="fixed-top bg-fff u-flex u-p-l-30 u-row-between">
+		<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">筛选时间</text>
+						<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>
@@ -36,6 +37,8 @@
 					<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>