完成扫码入出库全部功能（无语音版）

common/p-scan/scan.vue

@@ -28,7 +28,7 @@
 				top: '0',
 				left: '0',
 				width: '100%',
-				height: '50%', //180px
+				height: '420', //180px
 				position: 'static',
 				background: '#ffffff',
 				frameColor: '#00A0EA',
@@ -46,6 +46,9 @@
 
 			});
 			// #endif
+			uni.$on("aaa",(data)=>{
+				this.aaa=data
+			})
 		},
 		onUnload() {
 			clearTimeout(this.t);
@@ -56,7 +59,8 @@
 				this.$emit('getCode', result);
 				this.t = setTimeout(() => {
 					this.barcode.start();
-				}, 1000)
+				}, 2000)
+				
 			}
 		}
 	}

pages.json

@@ -71,6 +71,25 @@
 				}
 
 			},
+			//扫码出库
+			{
+				"path": "scancode/scancodeout",
+				"style": {
+					"navigationBarTitleText": "扫码出库",
+					// "navigationBarBackgroundColor": "#0095FF",
+					"app-plus": {
+						"titleNView": {
+							"type": "float",
+							"backgroundColor": "rgba(192,192,192,0)",
+							"buttons": [{
+								"type": "transparent"
+							}]
+						}
+					}
+
+				}
+
+			},
 			// 扫码入库确认
 			{
 				"path": "Scan-code-in/index",
@@ -135,13 +154,13 @@
 					"navigationStyle": "custom", // 隐藏系统导航栏
 					"navigationBarTextStyle": "white"
 				}
-			}
-		    ,{
-                "path" : "monthly-policy/monthly-policy",
-                "style" : {
+			}, {
+				"path": "monthly-policy/monthly-policy",
+				"style": {
 					"navigationBarTitleText": "月度政策"
 				}
-            }]
+			}
+		]
 	}, {
 		"root": "pages/msg",
 		"pages": [{
@@ -170,14 +189,6 @@
 					"navigationBarBackgroundColor": "#1692F7"
 				}
 			},
-			// 搜索页面
-			{
-				"path": "search/index",
-				"style": {
-					"navigationBarTitleText": "搜索"
-				}
-
-			},
 			//优惠卷
 			{
 				"path": "coupon",
@@ -306,13 +317,13 @@
 				"navigationBarTitleText": "零售店注册"
 			}
 
-		},{
-            "path" : "register_map",
-              "style": {
-              	"navigationBarTitleText": "地图"
-            }
-                
-        }]
+		}, {
+			"path": "register_map",
+			"style": {
+				"navigationBarTitleText": "地图"
+			}
+
+		}]
 	}],
 	"preloadRule": {},
 	"globalStyle": {

pages/home/Scan-code-in/index.vue

@@ -5,7 +5,7 @@
 			<view style="width: 100%;height: 42rpx;margin-top: 30rpx;margin-bottom: 10rpx;text-align: center;">成功信息</view>
 			<u-table border-color="#f2f2f2">
 				<u-tr class="u-tr">
-					<u-td class="u-td">{{successCount}}</u-td>
+					<u-td class="u-td" style="font-size: 24rpx;">{{successCount}}</u-td>
 					<u-td class="u-td">成功入库轮胎</u-td>
 				</u-tr>
 			</u-table>
@@ -16,15 +16,15 @@
 					<u-th class="u-th">失败原因</u-th>
 				</u-tr>
 				<u-tr class="u-tr" v-for="item in notBelongStoreBrandTyreNumbers">
-					<u-td class="u-td">{{item}}</u-td>
+					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">非门店经营品牌</u-td>
 				</u-tr>
 				<u-tr class="u-tr" v-for="item in nonRegularTyreNumbers">
-					<u-td class="u-td">{{item}}</u-td>
+					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">非正规胎号</u-td>
 				</u-tr>
 				<u-tr class="u-tr" v-for="item in alreadyExistsTyreNumbers">
-					<u-td class="u-td">{{item}}</u-td>
+					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">库存中已存在</u-td>
 				</u-tr>
 
@@ -86,7 +86,9 @@
 				nonRegularTyreNumbers: [], //非正规胎号
 				alreadyExistsTyreNumbers: [], //库存中已存在轮胎号
 				rewardMoney: '', //奖励金额
-				rewardIntegral: '' //奖励积分
+				rewardIntegral: '' ,//奖励积分
+				longitude:'',  //经度
+				latitude:''    //纬度
 			}
 		},
 		created() {
@@ -127,6 +129,17 @@
 				})
 			},
 			Submit() {
+				uni.getLocation({
+					type: 'wgs84',
+					geocode:true,
+					success: function(res) {
+						console.log(res, "当前位置");
+						console.log(res.longitude);
+						console.log(res.latitude);
+						this.longitude = res.longitude
+						this.latitude = res.latitude
+					},
+				});
 				this.show = true;
 				request({
 					url: '/storeScan/storeScanTyres',
@@ -135,8 +148,8 @@
 						storeId: '1000',
 						userId: '123',
 						scanAddress: '中国',
-						longitude: '1213.61256',
-						latitude: '541651.56',
+						longitude: this.longitude,
+						latitude: this.latitude,
 						materialList: this.datalist
 					}
 				}).then(res => {

pages/home/Scan-code-out/index.vue

@@ -1,103 +1,176 @@
 <template>
 	<!-- 扫码出库确认页面 -->
-	<view class="">
+	<view>
+		<u-modal v-model="show" :show-title="false" @confirm="confirm">
+			<view style="width: 100%;height: 42rpx;margin-top: 30rpx;margin-bottom: 10rpx;text-align: center;">成功信息</view>
+			<u-table border-color="#f2f2f2">
+				<u-tr class="u-tr">
+					<u-td class="u-td" style="font-size: 24rpx;">{{successCount}}</u-td>
+					<u-td class="u-td">成功出库轮胎</u-td>
+				</u-tr>
+			</u-table>
+			<view style="width: 100%;height: 42rpx;margin-top: 30rpx;margin-bottom: 10rpx;text-align: center;">失败信息</view>
+			<u-table border-color="#f2f2f2" font-size="20rpx">
+				<u-tr class="u-tr">
+					<u-th class="u-th">轮胎胎号</u-th>
+					<u-th class="u-th">失败原因</u-th>
+				</u-tr>
+				<u-tr class="u-tr" v-for="item in notBelongStoreBrandTyreNumbers">
+					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
+					<u-td class="u-td">非门店经营品牌</u-td>
+				</u-tr>
+				<u-tr class="u-tr" v-for="item in nonRegularTyreNumbers">
+					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
+					<u-td class="u-td">非正规胎号</u-td>
+				</u-tr>
+				<u-tr class="u-tr" v-for="item in notScanInTyres">
+					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
+					<u-td class="u-td">未入库轮胎</u-td>
+				</u-tr>
+			</u-table>
+		</u-modal>
+		
 		<view class="header">
-		</view>
-		<view class="content" style="margin-bottom: 50rpx;">
-			<view class="content-one">
-				<view>胎号</view>
-				<view>物料</view>
-			</view>
-			<view v-for="(item,index) in datalist" :key="index">
-			<view class="content-two">
-				<view>{{item.order}}</view>
-				<view>{{item.size}}</view>
+			<view class="behind"></view>
+			<view class="content">
+				<view class="content-one">
+					<view>胎号</view>
+					<view>物料</view>
+				</view>
+				<view v-for="(item,index) in datalist" :key="index">
+					<view class="content-two">
+						<view>{{item.tireNumber}}</view>
+						<view>{{item.maktx}}</view>
+					</view>
+				</view>
 			</view>
+			<view class="content-four">
+				注：请完善请完善请完善请完善请完善请完善请完善
 			</view>
 		</view>
-		<view class="tail">
+		<u-toast ref="repeat" position="bottom" />
+		<view class="tail" @click="Submit">
 			扫码确认
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		request
+	} from '../../../common/request/request'
+	require("promise.prototype.finally").shim()
 	export default {
 		data() {
 			return {
-				datalist: [
-					{
-						order: '202134103765',
-						size: 'SAILUN 185/6R14 SA10',
-						sum: '100'
-					},
-					{
-						order: '202134103765',
-						size: 'SAILUN 185/6R14 SA10',
-						sum: '100'
-					},
-					{
-						order: '202134103765',
-						size: 'SAILUN 185/6R14 SA10',
-						sum: '100'
-					},
-					{
-						order: '202134103765',
-						size: 'SAILUN 185/6R14 SA10',
-						sum: '100'
-					},
-					{
-						order: '202134103765',
-						size: 'SAILUN 185/6R14 SA10',
-						sum: '100'
-					},
-					{
-						order: '202134103765',
-						size: 'SAILUN 185/6R14 SA10',
-						sum: '100'
-					},
-				]
+				datalist: [],
+				total: 0,
+				show: false,
+				successCount: '', //成功条数
+				notBelongStoreBrandTyreNumbers: [], //非门店经营品牌胎号
+				nonRegularTyreNumbers: [], //非正规胎号
+				notScanInTyres: [], //未入库胎号
+				longitude:'',  //经度
+				latitude:''    //纬度
 			}
 		},
-	
-		onLoad() {
-	
+		created() {
+			uni.$on('update', data => {
+				this.datalist = data.materialList
+				return this.datalist
+			})
 		},
-	
 		methods: {
-	
+			confirm() {
+				this.$u.route({
+					type:'redirectTo',
+					url: 'pages/me/Delivery-details/index'
+				})
+
+			},
+			Submit() {
+				uni.getLocation({
+					type: 'wgs84',
+					geocode:true,
+					success: function(res) {
+						console.log(res, "当前位置");
+						console.log(res.longitude);
+						console.log(res.latitude);
+						this.longitude = res.longitude
+						this.latitude = res.latitude
+					},
+				});
+				this.show = true;
+				request({
+					url: '/storeScan/storeScanOutTyres',
+					method: 'Post',
+					data: {
+						storeId: '1000',
+						userId: '123',
+						scanAddress: '中国',
+						longitude: this.longitude,
+						latitude: this.latitude,
+						materialList: this.datalist
+					}
+				}).then(res => {
+					console.log(res.data.msg)
+					if (res.data.code == 500) {
+						this.$refs.repeat.show({
+							title: res.data.msg,
+							type: 'default',
+							position: 'bottom'
+						})
+					}
+					this.notBelongStoreBrandTyreNumbers = res.data.data.notBelongStoreBrandTyreNumbers //非门店经营品牌胎号
+					this.successCount = res.data.data.successCount //成功条数
+					this.nonRegularTyreNumbers = res.data.data.nonRegularTyreNumbers //非正规胎号
+					this.notScanInTyres = res.data.data.notScanInTyres //未入库轮胎号
+					console.log(res)
+				}).catch(err => {
+					console.log(err.data.msg)
+				}).finally(() => {
+					// Loading.close()
+				})
+			}
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	.header {
+	.behind {
 		width: 100%;
-		height: 280rpx;
+		height: 230rpx;
+		margin-bottom: -200rpx;
 		background-color: #0094FE;
 	}
 
+	.header {
+		width: 100%;
+	}
+
 	.content {
 		width: 711rpx;
-		// height: 792rpx;
-		position: absolute;
-		top: 40rpx;
-		left: 20rpx;
+		// height: 852rpx;
 		background: #FFFFFF;
-		box-shadow: 0px 0px 24px 0px rgba(101, 176, 249, 0.41);
-		border-radius: 20px;
+		box-shadow: 0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41);
+		border-radius: 20rpx;
+		padding-top: 10rpx;
+		padding-bottom: 10rpx;
+		margin: 0 auto;
 	}
 
 	.content-one {
 		display: flex;
 		justify-content: space-between;
 	}
+
 	.content-one:nth-child(1) {
 		margin-left: 90rpx;
-		margin-right: 180rpx;
+		margin-right: 150rpx;
 		font-weight: bold;
 		margin-top: 30rpx;
 	}
+
 	.content-two {
 		display: flex;
 		justify-content: space-between;
@@ -109,16 +182,34 @@
 		font-size: 28rpx;
 		border-bottom: 1rpx solid #E8E8E8;
 	}
+
+	.content-two>view:nth-child(2) {
+		padding-top: 28rpx;
+		width: 350rpx;
+		line-height: 53rpx;
+		text-align: center;
+	}
+
+	.content-two>view:nth-child(3) {
+		color: #149EE2;
+		margin-right: 50rpx;
+	}
+
 	.tail {
 		width: 678rpx;
 		line-height: 83rpx;
 		background: #0095FF;
-		border-radius: 10rpx;
-		position: fixed;
-		top: 1100rpx;
-		left: 36rpx;
 		color: #fff;
 		text-align: center;
+		margin: 0 auto;
+		margin-top: 60rpx;
+		border-radius: 15rpx;
+	}
+	.content-four {
+		color: #acacac;
+		font-size: 24rpx;
+		margin-top: 30rpx;
+		margin-left: 20rpx;
+		margin-bottom: 50rpx;
 	}
-	
-</style>
+</style>

pages/home/index.vue

@@ -117,7 +117,7 @@
 			},
 			scancodeOut() {
 				this.$u.route({
-					url: 'pages/home/scancode/new_file',
+					url: 'pages/home/scancode/scancodeout',
 				})
 			},
 			inStock() {

pages/home/scancode/index.vue

@@ -1,3 +1,4 @@
+<!-- 入库扫码 -->
 <template>
 	<view class="content">
 		<view class="text-area">
@@ -20,8 +21,8 @@
 			<view>
 				<view></view>
 				<view></view>
-				<view style="width: 94%;height: 20px;background-color: rgb(0,0,0,0);margin: 0 auto;margin-top: -1rpx;border-radius: 0;">
-					<image src="../../../static/sailun/line.png" style="width: 100%;height: 1rpx;" mode=""></image>
+				<view style="width: 94%;height: 20px;background-color: #FFFFFF;margin: 0 auto;margin-top: -3rpx;border-radius: 0;">
+					<image src="../../../static/sailun/line.png" style="width: 96%;height: 1rpx;;" mode=""></image>
 				</view>
 			</view>
 			<view class="generate">
@@ -46,8 +47,6 @@
 		<view>
 		</view>
 		<u-toast ref="repeat" position="bottom" />
-
-
 	</view>
 </template>
 
@@ -73,14 +72,7 @@
 			}
 		},
 		created() {
-			uni.getLocation({
-				type: 'wgs84',
-				success: function(res) {
-					console.log('当前位置的经度：' + res.longitude);
-					console.log('当前位置的纬度：' + res.latitude);
-				    console.log(res.address);
-				},
-			});
+
 		},
 		methods: {
 			//手动录入调用
@@ -111,6 +103,7 @@
 								return
 							}
 						}
+
 						this.$refs.repeat.show({
 							title: '录入成功',
 							type: 'success',
@@ -118,6 +111,7 @@
 						})
 						this.number_a = ""
 						console.log("我成功啦")
+						console.log(res)
 						this.lisi.push({
 							specs: res.data.data[0].specs,
 							flagRegular: res.data.data[0].isRegular,
@@ -129,7 +123,7 @@
 							tireNumber: res.data.data[0].tirenumber,
 							brand: res.data.data[0].brand,
 							shippedDate: res.data.data[0].shippedDate,
-							scanWay: '1'
+							scanWay: '0'
 						})
 						console.log(this.lisi)
 					}).catch(err => {
@@ -183,6 +177,7 @@
 							tireNumber: res.data.data[0].tirenumber,
 							brand: res.data.data[0].brand,
 							shippedDate: res.data.data[0].shippedDate,
+							plyRating: res.data.data[0].plyRating,
 							scanWay: '1'
 						})
 						this.$refs.repeat.show({
@@ -224,6 +219,7 @@
 					})
 				} else {
 					this.$u.route({
+						type:'redirectTo',
 						url: 'pages/home/Scan-code-in/index'
 					})
 					uni.$emit('update', {
@@ -264,7 +260,8 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		padding-top: 100%;
+		// background-color: #F29100;
+		padding-top: 400px;
 	}
 
 	.logo {
@@ -287,8 +284,8 @@
 
 	.text-area {
 		width: 100%;
-		background-color: #000;
 		display: flex;
+		background-color: #000000;
 		position: static;
 		justify-content: center;
 		padding-top: 180rpx;
@@ -300,7 +297,7 @@
 	}
 
 	page {
-		/* background-color: #000; */
+		// background-color: #000;
 	}
 
 	.roll {
@@ -335,17 +332,17 @@
 	}
 
 	.roll>view:nth-child(2)>view {
-		width: 50rpx;
-		height: 50rpx;
+		width: 40rpx;
+		height: 40rpx;
 		background-color: #F4F4F4;
 		border-radius: 100%;
 		float: right;
-		margin-right: -30rpx;
+		margin-right: -20rpx;
 	}
 
 	.roll>view:nth-child(2)>view:nth-child(1) {
 		float: left;
-		margin-left: -30rpx;
+		margin-left: -20rpx;
 	}
 
 	.status_bar {

pages/home/scancode/scancodeout.vue

@@ -0,0 +1,345 @@
+<!-- 出库扫码 -->
+<template>
+	<view class="content">
+		<view class="text-area">
+			<scan @getCode="getScanCode"/>
+		</view>
+		<view class="stripe"></view>
+		<view class="roll">
+			<view>
+				<view @click="show =! show">
+					<u-icon name="edit-pen"></u-icon>手动录入
+				</view>
+				<view class="lnput" v-if="show==false">
+					<input type="text" v-model="number_a" :placeholder="content" clearable="true" />
+					<u-button type="primary" size="medium" @click="manualentry">确认录入</u-button>
+				</view>
+				<view class="" v-else>
+					<view>{{tips}}：{{number}}</view>
+				</view>
+			</view>
+			<view>
+				<view></view>
+				<view></view>
+				<view style="width: 94%;height: 20px;background-color: #FFFFFF;margin: 0 auto;margin-top: -3rpx;border-radius: 0;">
+					<image src="../../../static/sailun/line.png" style="width: 96%;height: 1rpx;;" mode=""></image>
+				</view>
+			</view>
+			<view class="generate">
+				<u-table font-size="24" border-color="#ffffff" bg-color="#fff">
+					<u-tr class="u-tr">
+						<u-th class="u-th" width="30%">胎号</u-th>
+						<u-th class="u-th">规格</u-th>
+						<u-th class="u-th" width="15%">操作</u-th>
+					</u-tr>
+					<u-tr class="u-tr" :key="index" v-for="(item, index) in lisi">
+						<u-td class="u-td" width="30%">{{item.tireNumber}}</u-td>
+						<u-td class="u-td">{{item.maktx}}</u-td>
+						<u-td class="u-td" width="15%"><text @click="confirm(index)" style="color: #FA3534;">删除</text></u-td>
+					</u-tr>
+				</u-table>
+				<u-divider color="rgb(144, 147, 153)" half-width="200" border-color="rgb(144, 147, 153)" margin-top="40">没有更多了</u-divider>
+			</view>
+		</view>
+		<view class="determine">
+			<u-button type="primary" shape="circle" @click="scancodein">扫码确认</u-button>
+		</view>
+		<view>
+		</view>
+		<u-toast ref="repeat" position="bottom" />
+	</view>
+</template>
+
+<script>
+	import {
+		request
+	} from '../../../common/request/request'
+	require("promise.prototype.finally").shim()
+	export default {
+		data() {
+			return {
+				tips: '提示',
+				number: '请扫码出库',
+				nbTitle: '扫码标题',
+				content: '请输入轮胎胎号',
+				number_s: '',
+				number_a: '',
+				lisi: [],
+				background: {
+					backgroundColor: '#0094fe',
+				},
+				show: true,
+			}
+		},
+		created() {
+			
+		},
+		methods: {
+			//手动录入调用
+			manualentry() {
+				request({
+						url: '/storeScan/storeScanGetTyre',
+						method: 'Post',
+						data: {
+							storeId: '1000',
+							userId: '123',
+							tyreNum: this.number_a
+						}
+					}).then(res => {
+						for (let i = 0; i < this.lisi.length; i++) {
+							if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
+								this.$refs.repeat.show({
+									title: '请勿重复录入',
+									type: 'default',
+									position: 'bottom'
+								})
+								return
+							}
+						}
+
+						this.$refs.repeat.show({
+							title: '录入成功',
+							type: 'success',
+							position: 'bottom'
+						})
+						this.number_a = ""
+						console.log("我成功啦")
+						this.lisi.push({
+							specs: res.data.data[0].specs,
+							flagRegular: res.data.data[0].isRegular,
+							diameter: res.data.data[0].diameter,
+							maktx: res.data.data[0].maktx,
+							pattern: res.data.data[0].pattern,
+							soldToPartyKunnr: res.data.data[0].soldToPartyKunnr,
+							matnr: res.data.data[0].matnr,
+							tireNumber: res.data.data[0].tirenumber,
+							brand: res.data.data[0].brand,
+							shippedDate: res.data.data[0].shippedDate,
+							scanWay: '0'
+						})
+						console.log(this.lisi)
+					}).catch(err => {
+						this.$refs.repeat.show({
+							title: "请重新录入",
+							type: 'default',
+							position: 'bottom'
+						})
+						console.log(err)
+					})
+					.finally(() => {
+						// Loading.close()
+					})
+			},
+			//获取扫码控件
+			getScanCode(val) {
+				console.log(val)
+				this.number = val
+				this.number_s = val
+				request({
+						url: '/storeScan/storeScanGetTyre',
+						method: 'Post',
+						data: {
+							storeId: '1000',
+							userId: '123',
+							tyreNum: this.number_s
+						}
+					}).then(res => {
+						this.tips = "胎号"
+						for (let i = 0; i < this.lisi.length; i++) {
+							if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
+								this.$refs.repeat.show({
+									title: '请勿重复扫码',
+									type: 'default',
+									position: 'bottom'
+								})
+								return
+							}
+						}
+						this.number_s = ""
+						console.log("我成功啦")
+						console.log(res)
+						this.lisi.push({
+							specs: res.data.data[0].specs,
+							flagRegular: res.data.data[0].isRegular,
+							diameter: res.data.data[0].diameter,
+							maktx: res.data.data[0].maktx,
+							pattern: res.data.data[0].pattern,
+							soldToPartyKunnr: res.data.data[0].soldToPartyKunnr,
+							matnr: res.data.data[0].matnr,
+							tireNumber: res.data.data[0].tirenumber,
+							brand: res.data.data[0].brand,
+							shippedDate: res.data.data[0].shippedDate,
+							plyRating: res.data.data[0].plyRating,
+							scanWay: '1'
+						})
+						this.$refs.repeat.show({
+							title: '扫码成功',
+							type: 'success',
+							position: 'bottom'
+						})
+						console.log(this.lisi)
+					}).catch(err => {
+						if (code == 400) {
+							this.$refs.repeat.show({
+								title: "无网络",
+								type: 'default',
+								position: 'bottom'
+							})
+						} else {
+							this.$refs.repeat.show({
+								title: "请重新扫码",
+								type: 'default',
+								position: 'bottom'
+							})
+						}
+						console.log(err)
+					})
+					.finally(() => {
+						// Loading.close()
+					})
+			},
+			confirm(index) {
+				console.log(index + "什么情况")
+				this.lisi.splice(index, 1)
+			},
+			scancodein() {
+				if (this.lisi == '') {
+					this.$refs.repeat.show({
+						title: '请扫码后再点击！',
+						type: 'default',
+						position: 'bottom'
+					})
+				} else {
+					this.$u.route({
+						type:'redirectTo',
+						url: 'pages/home/Scan-code-out/index',
+					})
+					uni.$emit('update', {
+						materialList: this.lisi
+					})
+					this.lisi = []
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.lnput>input {
+		background-color: none;
+		width: 60%;
+		font-size: 42rpx;
+		float: left;
+		margin-top: 10rpx;
+		margin-left: 20rpx;
+	}
+
+	.generate {
+		width: 98%;
+		height: 300rpx;
+		overflow: auto;
+		margin: 0 auto;
+		margin-top: 120rpx;
+	}
+
+	.determine {
+		width: 690rpx;
+		margin-top: 30rpx;
+	}
+
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		// background-color: #F29100;
+		padding-top: 400px;
+	}
+
+	.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin-top: 200rpx;
+		margin-left: auto;
+		margin-right: auto;
+		margin-bottom: 50rpx;
+	}
+
+	.stripe {
+		width: 740rpx;
+		height: 30rpx;
+		background-color: #00A0EA;
+		border-radius: 12rpx;
+		margin: 0 auto;
+		margin-top: -100rpx;
+	}
+
+	.text-area {
+		width: 100%;
+		display: flex;
+		background-color: #000000;
+		position: static;
+		justify-content: center;
+		padding-top: 180rpx;
+	}
+
+	.title {
+		font-size: 36rpx;
+		color: #8f8f94;
+	}
+
+	page {
+		// background-color: #000;
+	}
+
+	.roll {
+		width: 710rpx;
+		height: auto;
+		background: #FFFFFF;
+		margin: 0 auto;
+		margin-top: -15rpx;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(101, 176, 249, 0.3);
+		border-bottom-left-radius: 10rpx;
+		border-bottom-right-radius: 10rpx;
+		padding-top: 50rpx;
+		padding-bottom: 50rpx;
+	}
+
+	.roll>view:nth-child(1)>view:nth-child(2) {
+		font-size: 42rpx;
+		font-weight: bold;
+		color: #0192FD;
+		text-align: center;
+		margin-bottom: 50rpx;
+	}
+
+	.roll>view:nth-child(1)>view:nth-child(1) {
+		width: 200rpx;
+		color: #0094FE;
+		position: relative;
+		top: -40rpx;
+		left: 500rpx;
+		font-size: 32rpx;
+		text-align: center;
+	}
+
+	.roll>view:nth-child(2)>view {
+		width: 40rpx;
+		height: 40rpx;
+		background-color: #F4F4F4;
+		border-radius: 100%;
+		float: right;
+		margin-right: -20rpx;
+	}
+
+	.roll>view:nth-child(2)>view:nth-child(1) {
+		float: left;
+		margin-left: -20rpx;
+	}
+
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+		background-color: #0095FF;
+	}
+</style>

pages/login/register_map.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="page-body">
 			<view class="page-section page-section-gap">
-				<map style="width: 100%;height: 100vh;" :markers="markers"  :longitude="longitude" :latitude="latitude" :circles="circles">
+				<map style="width: 100%;height: 100vh;" :markers="markers" :longitude="longitude" :latitude="latitude" :circles="circles">
 				</map>
 			</view>
 		</view>
@@ -33,10 +33,13 @@
 			var that = this
 			uni.getLocation({
 				type: 'wgs84',
+				geocode: true,
 				success(res) {
 					console.log(res, "当前位置");
 					that.latitude = res.latitude
 					that.longitude = res.longitude
+					console.log('当前位置的经度：' + res.longitude);
+					console.log('当前位置的纬度：' + res.latitude);
 					//标记点
 					that.markers = [{
 						id: 1,

pages/me/Delivery-details/index.vue

@@ -2,164 +2,340 @@
 	<!-- 出库明细页面 -->
 	<view class="header">
 		<view class="header-one">
-			库存总量：<text>999</text>
+			库存总量：<text>{{total}}</text>
 		</view>
-		<view class="content">
-			<u-tabs style="width: 500rpx;" bg-color="#0095ff" inactive-color="#FFFFFF" active-color="#fff" :list="list"
-			 :is-scroll="false" :current="current" @change="change"></u-tabs>
-			<u-select style=" color: #fff;" v-model="showBrand" :list="brandList"></u-select>
-			<u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar>
-			<u-search :show-action="true" :animation="true"></u-search>
+		<view style="width: 100%;margin-top: 60rpx;">
+			<u-tabs style="width: 350rpx;float: left;margin-top: 0;" :list="list" :is-scroll="false" :current="current" @change="change"
+			 active-color="#fff" inactive-color="#ffffff" bg-color="#ffffff00"></u-tabs>
+			<u-search class="inputbox" placeholder="请输入胎号或规格" @change="inputbox" v-model="keyword"
+			 :show-action="false"></u-search>
 		</view>
-		<view class="content-one" v-for="(item,index) in datalist" :key="index">
-			<view class="content-one-view">
+		<view class="nothing" v-if="judge==true">
+			<u-empty text="暂无数据"></u-empty>
+		</view>
+		<view style="width: 100%;margin-top: 160rpx;">
+			<view class="block" v-for="(item, index) in itemList" :key="index">
+				<view class="title">
+					<view>|</view>
+					<view>单号：{{item.scanNum}} </view>
+					<view>{{item.scanTime.slice(0,10)}}</view>
+				</view>
+				<u-line color="#f4f4f4"></u-line>
+				<view v-for="item2 in item.tyreMsgVOList">
+					<u-collapse>
+						<u-collapse-item style="margin-left: 10rpx;">
+							<view class="u-flex u-row-between" style="width: 100%;" slot="title">
+								<view>
+									{{item2.tireModel}}
+								</view>
+								<view class="">
+									{{item2.tyreCount}}条
+								</view>
+							</view>
+							<view class="details" v-for="item3 in item2.matnrMsgVOS">
+								<view>
+									<view>物料描述</view>
+									<view>{{item3.maktx}}</view>
+								</view>
+								<view>
+									<view>轮胎胎号</view>
+									<view>{{item3.tyreNum}}</view>
+								</view>
+								<view>
+									<view>参加活动</view>
+									<view>{{item3.satisfyActivity}}</view>
+								</view>
+								<view>
+									<view>创建时间</view>
+									<view>{{item3.createDate}}</view>
+								</view>
+								<u-line color="#f4f4f4"></u-line>
+							</view>
+						</u-collapse-item>
+					</u-collapse>
+				</view>
+			</view>
+			<view style="margin-top: 30rpx;margin-bottom: 30rpx;">
+				<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
 			</view>
-			<view class="content-one-text">单号：20200609135904795 - 20753</view>
-			<view class="content-one-time">2020-10-28</view>
-			<u-collapse class="content-two">
-				<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">
-					<view class="content-two1">
-						物料描述：{{item.body}}
-					</view>
-					<view class="content-two1">
-						轮胎胎号：{{item.body}}
-					</view>
-					<view class="content-two1">
-						参加活动： {{item.body}}
-					</view>
-				</u-collapse-item>
-			</u-collapse>
+			<u-action-sheet :list="list_a" @click="click" v-model="show" :mask-close-able="false" @close="close"></u-action-sheet>
+			<u-calendar v-model="show_d" :mode="mode" @change="time" :mask-close-able="false"></u-calendar>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		request
+	} from '../../../common/request/request'
+	require("promise.prototype.finally").shim()
 	export default {
 		data() {
 			return {
-				datalist: [{},
-					{}
-				],
+				status: 'loadmore',
+				iconType: 'flower',
+				show: false,
+				judge: true,
+				show_d: false,
+				mode: 'range',
+				loadText: {
+					loadmore: '无数据',
+					loading: '努力加载中',
+					nomore: '我是有底线的'
+				},
 				list: [{
 					name: '全部'
 				}, {
 					name: '品牌'
 				}, {
-					name: '时间',
+					name: '时间'
 				}],
-				itemList: [{
-					head: "赛轮 12R22.5 18PR S838",
-					body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-					open: true,
-					disabled: true
-				}, {
-					head: "赛轮 12R22.5 18PR S838",
-					body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-					open: false,
-				}, {
-					head: "赛轮 12R22.5 18PR S838",
-					body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-					open: false,
-				}],
-				brandList: [{
-						value: '1',
-						label: '赛轮'
-					},
-					{
-						value: '2',
-						label: '黑鹰'
-					}
-				],
+				brandCode: null,
+				list_a: [],
 				current: 0,
-				showBrand: false,
-				showDate: false,
-				mode: 'date'
-			};
+				keyword: '',
+				itemList: [],
+				total: '',
+				size: 10,
+				page: 0,
+				beginDate: null,
+				endDate: null,
+				content: null,
+				length:''
+			}
+		},
+		onReachBottom() {
+			this.status = 'loading';
+			this.page++
+			if(this.itemList.length >= this.length){
+				this.status = 'nomore';
+			}else{
+				this.getPage()
+			}
+		},
+		created() {
+			this.page = 1
+			this.getPage()
 		},
 		methods: {
+			content_s(){
+				console.log(this.keyword)
+			},
+			inputbox(e){
+				this.page = 1
+				console.log(e)
+				this.itemList = []
+				this.brandCode = null
+				this.beginDate = null
+				this.endDate = null
+				this.content = e
+				if(this.itemList.length >= this.length){
+					this.status = 'nomore';
+				}else{
+					this.getPage()
+				}
+			},
+			close() {
+				this.current = 0
+				this.page = 1
+				this.getPage()
+			},
+			time(e) {
+				this.page = 1
+				this.itemList = []
+				this.beginDate = e.startDate + " 00:00:00",
+				this.endDate = e.endDate + " 00:00:00",
+				console.log(e);
+				this.getPage()
+			},
+			click(index) {
+				this.page = 1
+				console.log(`点击了第${index + 1}项，内容为：${this.list_a[index].brandCode}`)
+				this.brandCode = this.list_a[index].brandCode
+				this.itemList = []
+				this.judge = true
+				console.log(this.judge)
+				this.getPage()
+			},
 			change(index) {
 				this.current = index;
-				if (this.current == 1) {
-					this.showBrand = true
-				} else if (this.current == 2) {
-					this.showDate = true
+				this.brandCode = null
+				this.beginDate = null
+				this.endDate = null
+				this.content = null
+				if (index == 1) {
+					this.show = true
+					if (this.list_a.length == 0) {
+						request({
+							url: '/baseReq/getBrandList',
+							method: 'Post',
+							data: {
+								storeId: '1000',
+								userId: '123'
+							}
+						}).then(res => {
+							console.log(res)
+							console.log(res.data.data)
+							for (let i = 0; i < res.data.data.length; i++) {
+								console.log(res.data.data[i].brandCode)
+								this.list_a.push({
+									brandCode: res.data.data[i].brandCode,
+									text: res.data.data[i].brandName,
+									color: '#000',
+									fontSize: 28
+								})
+							}
+						}).catch(err => {
+							console.log(err)
+						}).finally(() => {
+							// Loading.close()
+						})
+					}
+				} else if (index == 0) {
+					this.page = 0
+					console.log(this.brandCode)
+					this.getPage()
+				} else if (index == 2) {
+					this.show_d = true
 				}
+				console.log(this.current)
+			},
+			getPage() {
+				console.log(this.page)
+				console.log(this.brandCode)
+				console.log(this.beginDate)
+				console.log(this.endDate)
+				console.log(this.content)
+				uni.showLoading({
+					title: '加载中...'
+				});
+				setTimeout(function() {
+					uni.hideLoading();
+				}, 1000);
+				request({
+					url: '/myPage/getPageScanRecordList',
+					method: 'Post',
+					data: {
+						storeId: '1000',
+						userId: '123',
+						size: this.size,
+						current: this.page, //获取第几页
+						scanType: '2',
+						brandCode: this.brandCode,
+						beginDate: this.beginDate, //开始时间
+						endDate: this.endDate, //结束时间
+						content: this.content //搜索内容
+					}
+				}).then(res => {
+					console.log(res)
+					this.total = res.data.stock
+					this.length = res.data.count
+					this.itemList = this.itemList.concat(res.data.record)
+					if (this.itemList.length >= res.data.count) this.status = 'nomore';
+					else this.status = 'loading';
+					if (this.itemList.length == 0) {
+						this.judge = true
+					} else {
+						this.judge = false
+					}
+					console.log(this.itemList)
+					return this.itemList
+				}).catch(err => {
+					console.log(err)
+				}).finally(() => {
+					// Loading.close()
+				})
 			}
-		}
+		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	.header {
-		height: 400rpx;
-		width: 100%;
-		background: #0094FE;
-		color: #fff;
-		font-size: 28rpx;
+	.details>view {
+		width: 96%;
+		height: 54rpx;
+		color: #303134;
 	}
 
-	.header-one {
-		text-align: center;
-		padding-top: 40rpx;
+	.details>view>view:nth-child(1) {
+		float: left;
 	}
 
-	.header-one>text {
-		font-size: 52rpx;
+	.details>view>view:nth-child(2) {
+		float: right;
 	}
-
-	.content {
-		display: flex;
-		justify-content: space-between;
-		width: 700rpx;
-		margin-top: 80rpx;
+	.inputbox{
+		width: 350rpx;
+		float: right;
+		padding-right: 30rpx;
+		padding-top: 10rpx;
 	}
-
-	.content-one {
-		width: 690rpx;
-		// height: 338rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 0px 24px 0px rgba(101, 176, 249, 0.41);
-		border-radius: 20rpx;
+	.title {
+		width: 98%;
+		height: 60rpx;
 		margin: 0 auto;
-		margin-top: 30rpx;
+		padding-top: 10rpx;
+		// background-color: #55aa7f;
 	}
 
-	.content-one-view {
-		width: 6rpx;
-		height: 30rpx;
-		background: #0292FD;
-		position: relative;
-		top: 20rpx;
-		left: 30rpx;
+	.title>view:nth-child(1) {
+		font-size: 34rpx;
+		font-weight: bold;
+		color: #0094FE;
+		float: left;
 	}
 
-	.content-one-text {
-		position: relative;
-		top: -8rpx;
-		left: 60rpx;
-		font-size: 28rpx;
+	.title>view:nth-child(2) {
+		font-size: 30rpx;
 		font-weight: bold;
-		color: #000;
+		color: #000000;
+		float: left;
+		position: relative;
+		top: 10%;
 	}
 
-	.content-one-time {
+	.title>view:nth-child(3) {
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #000000;
+		float: right;
 		position: relative;
-		top: -45rpx;
-		left: 530rpx;
-		font-size: 26rpx;
-		color: #626262;
+		top: 10%;
 	}
 
-	.content-two {
-		width: 600rpx;
+	.block {
+		width: 96%;
+		background-color: #FFFFFF;
 		margin: 0 auto;
-		margin-top: -30rpx;
-		margin-bottom: 20rpx;
+		margin-top: 20rpx;
+		border-radius: 15rpx;
+		box-shadow: 0 0 24rpx 0 rgba(101, 176, 249, 0.41);
+	}
+
+	.nothing {
+		width: 96%;
+		height: 800rpx;
+		background-color: #FFFFFF;
+		margin: 0 auto;
+		margin-top: 200rpx;
+		border-radius: 20rpx;
+		box-shadow: 0 0 24rpx 0 rgba(101, 176, 249, 0.41);
+	}
+
+	.header {
+		height: 400rpx;
+		width: 100%;
+		background: #0094FE;
+		color: #fff;
+		font-size: 28rpx;
 	}
 
-	.content-two1 {
-		font-size: 24rpx;
-		margin-top: 10rpx;
-		margin-bottom: 20rpx;
+	.header-one {
+		text-align: center;
+		padding-top: 40rpx;
+	}
+
+	.header-one>text {
+		font-size: 52rpx;
 	}
 </style>

pages/me/Warehousing-details/index.vue

@@ -2,166 +2,344 @@
 	<!-- 入库明细页面 -->
 	<view class="header">
 		<view class="header-one">
-			库存总量：<text>9999</text>
+			库存总量：<text>{{total}}</text>
 		</view>
-			<view class="content">
-				<u-tabs style="width: 750rpx;" bg-color="#0095ff" inactive-color="#FFFFFF" active-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
-				<u-select style=" color: #fff;" v-model="showBrand" :list="brandList"></u-select>
-				<u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar>
-				<view @click="search"><u-search :show-action="true" :animation="true"></u-search></view>
-				
-			</view>
-			<view class="content-one" v-for="(item,index) in datalist" :key="index">
-				<view class="content-one-view">
+		<view style="width: 100%;margin-top: 60rpx;">
+			<u-tabs style="width: 350rpx;float: left;margin-top: 0;" :list="list" :is-scroll="false" :current="current" @change="change"
+			 active-color="#fff" inactive-color="#ffffff" bg-color="#ffffff00"></u-tabs>
+			<u-search class="inputbox" placeholder="请输入胎号或规格" @change="inputbox" v-model="keyword"
+			 :show-action="false"></u-search>
+		</view>
+		<view class="nothing" v-if="judge==true">
+			<u-empty text="暂无数据"></u-empty>
+		</view>
+		<view style="width: 100%;margin-top: 160rpx;">
+			<view class="block" v-for="(item, index) in itemList" :key="index">
+				<view class="title">
+					<view>|</view>
+					<view>单号：{{item.scanNum}} </view>
+					<view>{{item.scanTime.slice(0,10)}}</view>
 				</view>
-				<view class="content-one-text">单号：20200609135904795 - 20753</view>
-				<view class="content-one-time">2020-10-28</view>
-				<u-collapse class="content-two">
-						<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">
-							<view class="content-two1">
-								物料描述：{{item.body}}
-							</view>
-							<view class="content-two1">
-								轮胎胎号：{{item.body}}
+				<u-line color="#f4f4f4"></u-line>
+				<view v-for="item2 in item.tyreMsgVOList">
+					<u-collapse>
+						<u-collapse-item style="margin-left: 10rpx;">
+							<view class="u-flex u-row-between" style="width: 100%;" slot="title">
+								<view>
+									{{item2.tireModel}}
+								</view>
+								<view class="">
+									{{item2.tyreCount}}条
+								</view>
 							</view>
-							<view class="content-two1">
-								参加活动： {{item.body}}
+							<view class="details" v-for="item3 in item2.matnrMsgVOS">
+								<view>
+									<view>物料描述</view>
+									<view>{{item3.maktx}}</view>
+								</view>
+								<view>
+									<view>轮胎胎号</view>
+									<view>{{item3.tyreNum}}</view>
+								</view>
+								<view>
+									<view>参加活动</view>
+									<view>{{item3.satisfyActivity}}</view>
+								</view>
+								<view>
+									<view>创建时间</view>
+									<view>{{item3.createDate}}</view>
+								</view>
+								<u-line color="#f4f4f4"></u-line>
 							</view>
 						</u-collapse-item>
 					</u-collapse>
+				</view>
 			</view>
-			
-			
+			<view style="margin-top: 30rpx;margin-bottom: 30rpx;">
+				<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
+			</view>
+			<u-action-sheet :list="list_a" @click="click" v-model="show" :mask-close-able="false" @close="close"></u-action-sheet>
+			<u-calendar v-model="show_d" toolTip="请选择日期范围" :closeable="false" :mode="mode" @change="time" :mask-close-able="false"></u-calendar>
+		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		request
+	} from '../../../common/request/request'
+	require("promise.prototype.finally").shim()
 	export default {
-			data() {
-				return {
-					datalist: [
-						{},
-						{}
-					],
-					list: [{
-						name: '全部'
-					}, {
-						name: '品牌'
-					}, {
-						name: '时间',
-					}],
-					itemList: [{
-										head: "赛轮 12R22.5 18PR S838",
-										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-										open: true,
-										disabled: true
-									},{
-										head: "赛轮 12R22.5 18PR S838",
-										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-										open: false,
-									},{
-										head: "赛轮 12R22.5 18PR S838",
-										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-										open: false,
-									}],
-					brandList: [{
-							value: '1',
-							label: '赛轮'
-						},
-						{
-							value: '2',
-							label: '黑鹰'
-						}
-					],
-					current: 0,
-					showBrand: false,
-					showDate: false,
-					mode: 'date'
-				};
-			},
-			methods: {
-				search(){
-					this.$u.route({
-						url: 'pages/me/search/index',
-					})
+		data() {
+			return {
+				status: 'loadmore',
+				iconType: 'flower',
+				show: false,
+				judge: true,
+				show_d: false,
+				mode: 'range',
+				loadText: {
+					loadmore: '无数据',
+					loading: '努力加载中',
+					nomore: '我是有底线的'
 				},
-				change(index) {	
-					this.current = index;
-					if(this.current==1){
-						this.showBrand=true
-					}else if(this.current==2){
-						this.showDate=true
+				list: [{
+					name: '全部'
+				}, {
+					name: '品牌'
+				}, {
+					name: '时间'
+				}],
+				brandCode: null,
+				list_a: [],
+				current: 0,
+				keyword: '',
+				itemList: [],
+				total: '',
+				size: 10,
+				page: 0,
+				beginDate: null,
+				endDate: null,
+				content: null,
+				length:''
+			}
+		},
+		onReachBottom() {
+			this.status = 'loading';
+			this.page++
+			if(this.itemList.length >= this.length){
+				this.status = 'nomore';
+			}else{
+				this.getPage()
+			}
+		},
+		created() {
+			this.page = 1
+			this.getPage()
+		},
+		methods: {
+			content_s(){
+				console.log(this.keyword)
+			},
+			inputbox(e){
+				this.page = 1
+				console.log(e)
+				this.itemList = []
+				this.brandCode = null
+				this.beginDate = null
+				this.endDate = null
+				this.content = e
+				if(this.itemList.length >= this.length){
+					this.status = 'nomore';
+				}else{
+					this.getPage()
+				}
+			},
+			close() {
+				this.current = 0
+				this.page = 1
+				this.getPage()
+			},
+			
+			time(e) {
+				this.page = 1
+				this.itemList = []
+				this.beginDate = e.startDate + " 00:00:00"
+				this.endDate = e.endDate + " 00:00:00"
+				console.log(e)
+				console.log("触发了")
+				console.log(this.show_d)
+				this.current = 0
+				this.getPage()
+			},
+			click(index) {
+				this.page = 1
+				console.log(`点击了第${index + 1}项，内容为：${this.list_a[index].brandCode}`)
+				this.brandCode = this.list_a[index].brandCode
+				this.itemList = []
+				this.judge = true
+				console.log(this.judge)
+				this.getPage()
+			},
+			change(index) {
+				this.current = index;
+				this.brandCode = null
+				this.beginDate = null
+				this.endDate = null
+				this.content = null
+				if (index == 1) {
+					this.show = true
+					if (this.list_a.length == 0) {
+						request({
+							url: '/baseReq/getBrandList',
+							method: 'Post',
+							data: {
+								storeId: '1000',
+								userId: '123'
+							}
+						}).then(res => {
+							console.log(res)
+							console.log(res.data.data)
+							for (let i = 0; i < res.data.data.length; i++) {
+								console.log(res.data.data[i].brandCode)
+								this.list_a.push({
+									brandCode: res.data.data[i].brandCode,
+									text: res.data.data[i].brandName,
+									color: '#000',
+									fontSize: 28
+								})
+							}
+						}).catch(err => {
+							console.log(err)
+						}).finally(() => {
+							// Loading.close()
+						})
 					}
+				} else if (index == 0) {
+					this.page = 0
+					console.log(this.brandCode)
+					this.getPage()
+				} else if (index == 2) {
+					this.show_d = true
 				}
+				console.log(this.current)
+			},
+			getPage() {
+				console.log(this.page)
+				console.log(this.brandCode)
+				console.log(this.beginDate)
+				console.log(this.endDate)
+				console.log(this.content)
+				uni.showLoading({
+					title: '加载中...'
+				});
+				setTimeout(function() {
+					uni.hideLoading();
+				}, 1000);
+				request({
+					url: '/myPage/getPageScanRecordList',
+					method: 'Post',
+					data: {
+						storeId: '1000',
+						userId: '123',
+						size: this.size,
+						current: this.page, //获取第几页
+						scanType: '1',
+						brandCode: this.brandCode,
+						beginDate: this.beginDate, //开始时间
+						endDate: this.endDate, //结束时间
+						content: this.content //搜索内容
+					}
+				}).then(res => {
+					console.log(res)
+					this.total = res.data.stock
+					this.length = res.data.count
+					this.itemList = this.itemList.concat(res.data.record)
+					if (this.itemList.length >= res.data.count) this.status = 'nomore';
+					else this.status = 'loading';
+					if (this.itemList.length == 0) {
+						this.judge = true
+					} else {
+						this.judge = false
+					}
+					console.log(this.itemList)
+					return this.itemList
+				}).catch(err => {
+					console.log(err)
+				}).finally(() => {
+					// Loading.close()
+				})
 			}
+		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	.header {
-		height: 400rpx;
-		width: 100%;
-		background: #0094FE;
-		color: #fff;
-		font-size: 28rpx;
+	.details>view {
+		width: 96%;
+		height: 54rpx;
+		color: #303134;
 	}
 
-	.header-one {
-		text-align: center;
-		padding-top: 40rpx;
+	.details>view>view:nth-child(1) {
+		float: left;
 	}
 
-	.header-one>text {
-		font-size: 52rpx;
+	.details>view>view:nth-child(2) {
+		float: right;
 	}
-	.content {
-		display: flex;
-		justify-content: space-between;
-		width: 700rpx;
-		margin-top: 80rpx;
+	.inputbox{
+		width: 350rpx;
+		float: right;
+		padding-right: 30rpx;
+		padding-top: 10rpx;
 	}
-	.content-one {
-		width: 690rpx;
-		// height: 338rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 0px 24px 0px rgba(101, 176, 249, 0.41);
-		border-radius: 20px;
+	.title {
+		width: 98%;
+		height: 60rpx;
 		margin: 0 auto;
-		margin-top: 50rpx;
+		padding-top: 10rpx;
+		// background-color: #55aa7f;
 	}
-	.content-one-view {
-		width: 6rpx;
-		height: 30rpx;
-		background: #0292FD;
-		position: relative;
-		top: 20rpx;
-		left: 30rpx;
 
-		
+	.title>view:nth-child(1) {
+		font-size: 34rpx;
+		font-weight: bold;
+		color: #0094FE;
+		float: left;
 	}
-	.content-one-text {
-		position: relative;
-		top: -8rpx;
-		left: 60rpx;
-		font-size: 28rpx;
+
+	.title>view:nth-child(2) {
+		font-size: 30rpx;
 		font-weight: bold;
-		color: #000;
+		color: #000000;
+		float: left;
+		position: relative;
+		top: 10%;
 	}
-	.content-one-time {
+
+	.title>view:nth-child(3) {
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #000000;
+		float: right;
 		position: relative;
-		top: -40rpx;
-		left: 530rpx;
-		font-size: 16rpx;
-		color: #626262;
+		top: 10%;
 	}
-	.content-two {
-		width: 600rpx;
+
+	.block {
+		width: 96%;
+		background-color: #FFFFFF;
 		margin: 0 auto;
-		margin-bottom: 50rpx;
+		margin-top: 20rpx;
+		border-radius: 15rpx;
+		box-shadow: 0 0 24rpx 0 rgba(101, 176, 249, 0.41);
+	}
+
+	.nothing {
+		width: 96%;
+		height: 800rpx;
+		background-color: #FFFFFF;
+		margin: 0 auto;
+		margin-top: 200rpx;
+		border-radius: 20rpx;
+		box-shadow: 0 0 24rpx 0 rgba(101, 176, 249, 0.41);
+	}
+
+	.header {
+		height: 400rpx;
+		width: 100%;
+		background: #0094FE;
+		color: #fff;
+		font-size: 28rpx;
 	}
-	.content-two1 {
-		font-size: 24rpx;
-		margin-top: 30rpx;
+
+	.header-one {
+		text-align: center;
+		padding-top: 40rpx;
+	}
+
+	.header-one>text {
+		font-size: 52rpx;
 	}
-	
 </style>