From 3022db13493986d3d6624ec88c625f1a3abfad8d Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 28 Nov 2023 08:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                      |  19 +--
 components/a-map-walking.vue |  56 ++++++--
 components/index/detaila.vue |  54 +++----
 components/index/detailb.vue | 129 +++++++++++++----
 components/index/detailc.vue | 125 ++++++++++++----
 components/index/index.vue   | 165 +++++++++++----------
 components/index/index1.vue  | 162 ++++++++++++---------
 components/index/indexg.vue  | 166 +++++++++++----------
 components/you-scroll.vue    | 271 +++++++++++++++++++++++++++++++++++
 pages.json                   |   2 +-
 pages/index/detail.vue       |   1 -
 pages/index/index.vue        | 125 +++++++++++-----
 pages/oaLogin/oaLogin.vue    |   7 +-
 static/pullDown.jpg          | Bin 0 -> 11645 bytes
 14 files changed, 911 insertions(+), 371 deletions(-)
 create mode 100644 components/you-scroll.vue
 create mode 100644 static/pullDown.jpg

diff --git a/App.vue b/App.vue
index b51eed2..f17a89b 100644
--- a/App.vue
+++ b/App.vue
@@ -2,18 +2,15 @@
 	//#ifdef APP-PLUS
 	const jpushModule = uni.requireNativePlugin("JG-JPush");
 	// #endif
-	
+
 	export default {
 		onLaunch: function() {
 			console.log('App Launch')
 			// #ifdef APP-PLUS
-				// 锁定屏幕方向 横屏正方向
-				plus.screen.lockOrientation('landscape-primary');
-				// #endif 
-				var main = plus.android.runtimeMainActivity();
-				var pkName = main.getPackageName();
-				
-				console.log(pkName)
+			// 锁定屏幕方向 横屏正方向
+			plus.screen.lockOrientation('landscape-primary');
+			// #endif 
+
 		},
 		onShow: function() {
 			console.log('App Show')
@@ -23,8 +20,7 @@
 			// 播放音频
 			//#ifdef APP-PLUS
 			jpushModule.addNotificationListener(res => {
-				console.log(res,'111111')
-				
+				// console.log(res, '111111')
 				if (res.notificationEventType == 'notificationOpened') return
 				audioContext.play()
 				uni.vibrateLong();
@@ -48,9 +44,8 @@
 	page {
 		background: #F3F4F8;
 	}
-	
-	@import "static/css/base.css";
 
+	@import "static/css/base.css";
 
 	@import url('static/iconfont/iconfont.css')
 </style>
\ No newline at end of file
diff --git a/components/a-map-walking.vue b/components/a-map-walking.vue
index 25c3052..80e4e9c 100644
--- a/components/a-map-walking.vue
+++ b/components/a-map-walking.vue
@@ -12,43 +12,65 @@
 			},
 			endPoint: {
 				type: Array,
-				default: () => [],
+				default: () => [116.40717,39.90469],
 			},
 		},
 		computed: {
 			points() {
-				console.log(this.startPoint, this.endPoint)
+				// console.log(this.startPoint, this.endPoint)
 				return {
 					startPoint: this.startPoint,
 					endPoint: this.endPoint
 				};
 			}
-		}
+		},
+
 	};
 </script>
 
+
 <script module="aMapRenderJs" lang="renderjs">
+	import {
+		Toast
+	} from '.././libs/uniApi'
+
 	const A_MAP_KEY = "4e96ffd5a5612a52c9caa25312ed9ace";
 	const A_MAP_SECRET_KEY = "4817909f57e07c7694c056a62bb39124";
 
 	export default {
 		mounted() {
-			if (typeof window.AMap === 'function') {
-				this.initAmap();
-			} else {
-				window._AMapSecurityConfig = {
-					securityJsCode: A_MAP_SECRET_KEY,
-				};
-				const script = document.createElement('script');
-				script.src = `https://webapi.amap.com/maps?v=1.4.15&key=${A_MAP_KEY}&plugin=AMap.Driving`;
-				
-				script.onload = this.initAmap.bind(this);
-				document.head.appendChild(script);
-			}
+			this.loadMapApi().then(() => {
+				this.initAmap()
+			})
+
 		},
 		methods: {
+			loadMapApi() {
+
+				const A_MAP_KEY = "4e96ffd5a5612a52c9caa25312ed9ace";
+				const A_MAP_SECRET_KEY = "4817909f57e07c7694c056a62bb39124";
+				return new Promise((resolve, reject) => {
+					if (typeof window.AMap === 'function') {
+						resolve()
+					} else {
+						const script = document.createElement('script')
+						script.src =
+							`https://webapi.amap.com/maps?v=1.4.15&key=${A_MAP_KEY}&plugin=AMap.Driving&async=true&defer=true`
+
+						script.onload = () => {
+							window._AMapSecurityConfig = {
+								securityJsCode: A_MAP_SECRET_KEY
+							}
+							resolve()
+						}
+						script.onerror = reject
+						document.head.appendChild(script)
+					}
+				})
+			},
 			initAmap() {
 				const map = new AMap.Map('amap', {
+					center: this.startPoint,
 					resizeEnable: true,
 				});
 				// 开始绘画路径
@@ -73,6 +95,8 @@
 							console.log('绘制路线完成');
 						} else {
 							console.error('路线数据查询失败' + result);
+							this.$emit('sbai','1')
+
 						}
 					}
 				);
@@ -82,5 +106,7 @@
 				this.makeWalking();
 			},
 		},
+
+
 	};
 </script>
\ No newline at end of file
diff --git a/components/index/detaila.vue b/components/index/detaila.vue
index 22a5c6c..ba05276 100644
--- a/components/index/detaila.vue
+++ b/components/index/detaila.vue
@@ -18,7 +18,7 @@
 						:polyline="polyline" :markers='markers'><cover-image class="map_btn" @tap="getoption()"
 							src="@/static/images/DH.png">
 						</cover-image></map> -->
-					<a-map-walking :startPoint="startPoint" :endPoint="endPoint"
+					<a-map-walking :startPoint="startPoint" :endPoint="endPoint" @sbai='onshibai'
 						style="width: 100%;height: 265rpx;"></a-map-walking>
 					<view class="walking-img">
 						<image src="@/static/images/DH.png" mode="aspectFit" @click="getoption()"></image>
@@ -36,7 +36,7 @@
 
 				</view>
 
-				<view class="btn" @click="openCamera(lisobj.logistics)">
+				<view class="btn" @click="openCamera(lisobj.logistics)" v-if="lisobj.logistics">
 					<view class="btn1">
 
 
@@ -136,7 +136,7 @@
 <script>
 	import {
 		detail,
-
+		takeGoods
 	} from '@/api/oa.js'
 	const ttAMapNavi = uni.requireNativePlugin('TT-AMapNavi');
 	import AMapWalking from "@/components/a-map-walking.vue";
@@ -188,20 +188,19 @@
 			}
 		},
 
-		onLoad() {
 
-		},
 		mounted() {
+			
 			this.getlist(this.type)
 			this.getLocation()
+
+
 			// this.$refs.globalPopup.open()
-
-
-
 		},
 
 		methods: {
 
+			//返回
 			returnlog() {
 
 				this.$emit('outfun', '1')
@@ -210,6 +209,17 @@
 				console.log('Map updated:', e);
 				// 在地图更新后，可以根据用户选择的起点和终点，调用地图服务的规划路线接口，获取路线数据并更新polyline和markers
 			},
+			//监听失败
+			onshibai(e) {
+				if (e == 1) {
+					uni.showToast({
+						title: '路线规划失败',
+						icon: none
+					})
+				}
+			},
+
+
 
 			//导航
 			getoption() {
@@ -230,7 +240,7 @@
 					// 终点（只支持传入一个）
 					endPoints: [{
 						name: '终点名称',
-						latitude:  this.endPoint[1],
+						latitude: this.endPoint[1],
 						longitude: this.endPoint[0]
 					}],
 					// 途径点（最多支持三个），选填
@@ -242,7 +252,7 @@
 					// 导航组件的主题皮肤类型
 					themeType: 1
 				});
-				
+
 				// uni.navigateTo({
 				// 	url: '/pages/submap/index?task_id=' + this.type
 				// })
@@ -329,7 +339,7 @@
 			},
 
 			//获取定位
-			getLocation() {
+			async getLocation() {
 
 				uni.getLocation({
 					type: 'gcj02',
@@ -353,7 +363,6 @@
 						// })
 
 
-
 					},
 					fail: (res) => {
 						console.log(res)
@@ -362,15 +371,6 @@
 				});
 			},
 
-			serch() {
-				this.getlist()
-			},
-			inpuval(e) {
-
-				if (e.length == 0) {
-					this.getlist()
-				}
-			},
 			//提取商品
 			getDocumentListApi(item, oredr) {
 
@@ -380,14 +380,18 @@
 					order_sn: oredr
 				}
 
+				
+
 				takeGoods(data).then(res => {
 
 					// Toast(res.msg)
 					if (res.code == 1) {
-						this.getlist()
+						
 						const subNVue = uni.getSubNVueById('concat'); // 通过 id 获取 nvue 子窗体
-						subNVue.show('none', 250); // 打开 nvue 子窗体
-						this.$emit('outfun', '1')
+						subNVue.show('none', 1000); // 打开 nvue 子窗体
+						setTimeout(() => {
+							this.$emit('outfun', '1')
+						}, 1500)
 
 					}
 				})
@@ -811,7 +815,7 @@
 	.btn1 {
 		width: 23rpx;
 		height: 23rpx;
-		margin-left: 80rpx;
+		margin-left: 100rpx;
 		margin-top: 0rpx;
 		margin-right: 10rpx;
 	}
diff --git a/components/index/detailb.vue b/components/index/detailb.vue
index 316861a..94ca98e 100644
--- a/components/index/detailb.vue
+++ b/components/index/detailb.vue
@@ -115,7 +115,22 @@
 								<div class="shop-content-a1">商品信息：</div>
 								<div class="shop-content-a2">{{ lisobj.product.length }}件</div>
 							</view>
-							<view class="shop" v-for="(items,j) in lisobj.product" :key="j">
+							<view class="shop-list">
+							
+								<view class="shop" v-for="(items,j) in lisobj.product" :key="j">
+									<view style="display: flex;">
+										<view class="shop-img">
+											<image :src="items.goods_pic" mode="aspectFit"></image>
+										</view>
+										<view class="container-txt">
+											<text class=" centered-multi-line shop-txt">
+												{{ items.goods_name }}</text>
+										</view>
+									</view>
+									<view style="line-height: 34rpx;">X{{ items.product_num}}</view>
+								</view>
+							</view>
+							<!-- <view class="shop" v-for="(items,j) in lisobj.product" :key="j">
 								<view style="display: flex;">
 									<view class="shop-img">
 										<image :src="items.goods_pic" alt="">
@@ -123,7 +138,7 @@
 									<view class="shop-txt">{{ items.goods_name }}</view>
 								</view>
 								<view style="line-height: 26rpx;">X{{ items.product_num}}</view>
-							</view>
+							</view> -->
 
 						</view>
 
@@ -184,7 +199,6 @@
 		},
 		data() {
 			return {
-
 				lisobj: [],
 				page_no: 1,
 				page_size: 1,
@@ -194,11 +208,13 @@
 			}
 		},
 		mounted() {
+		
+
 			this.getlist(this.type)
 
 			// console.log(this.type)
 
-			this.$refs.globalPopup.show();
+
 		},
 		methods: {
 			returnlog() {
@@ -224,12 +240,15 @@
 						take_code: this.code
 					}).then((res) => {
 
-						console.log(res)
+
 						this.code = ''
 						if (res.code == 1) {
 							// Toast(res.msg)
 							this.$refs.globalPopup.open()
+							setTimeout(() => {
 								this.$emit('outfun', '2')
+							}, 1500)
+
 
 						}
 
@@ -256,16 +275,8 @@
 			close() {
 				this.$refs.globalPopup.close()
 			},
-			serch() {
-				this.getlist()
-			},
+		
 
-			inpuval(e) {
-
-				if (e.length == 0) {
-					this.getlist()
-				}
-			},
 			getlist(id) {
 				detail({
 					id: id
@@ -278,7 +289,7 @@
 
 			},
 			openCamera() {
-				console.log('1111111')
+		
 				// this.show1()
 				this.isShow1 = !this.isShow1
 			}
@@ -651,32 +662,90 @@
 					color: #0022c7;
 				}
 
-				.shop {
-					height: 130px;
-					overflow: hidden;
-					overflow-y: auto;
+				.shop-content {
+					padding-left: 20px;
+					padding-right: 20px;
 
-					display: flex;
-					justify-content: space-between;
 				}
 
-				.shop-image {
-					width: 26px;
-					height: 26px;
+				.shop-content-a {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 14px;
+					margin-bottom: 10px;
+				}
+
+				.shop-content-a1 {
+					font-size: 13rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #000000;
+				}
+
+				.shop-content-a2 {
+					font-size: 12rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #0022C7;
+				}
+
+				.shop-list {
+					height: 220rpx;
+					overflow: hidden;
+					overflow-y: auto;
+					margin-bottom: 10rpx;
+				}
+
+				.shop {
+					display: flex;
+					justify-content: space-between;
+					font-size: 10rpx;
+					font-family: PingFang SC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					margin-bottom: 10rpx;
+				}
+
+				.shop-img {
+					width: 34rpx;
+					height: 34rpx;
+
 					border-radius: 6px 6px 6px 6px;
 				}
 
 				.shop-img image {
-					width: 26px;
-					height: 26px;
-
+					width: 34rpx;
+					height: 34rpx;
 					border-radius: 6px 6px 6px 6px;
 				}
 
+
+
+				.container-txt {
+					margin-left: 10rpx;
+					width: 130rpx;
+					/* 设置容器高度 */
+					display: flex;
+					justify-content: center;
+					/* 水平居中 */
+					align-items: center;
+					/* 垂直居中 */
+				}
+
+				.centered-multi-line {
+					text-align: left;
+					/* 文本水平居中 */
+					width: 100%;
+					/* 宽度占满父容器 */
+				}
+
 				.shop-txt {
-					margin-left: 20px;
-
-
+					display: inline-block;
+					/* 转换为行内块元素 */
+					white-space: normal;
+					/* 允许自动换行 */
+					word-break: break-all;
+					/* 单词内断行 */
 				}
 			}
 
diff --git a/components/index/detailc.vue b/components/index/detailc.vue
index 054b37a..1dff8b2 100644
--- a/components/index/detailc.vue
+++ b/components/index/detailc.vue
@@ -109,13 +109,31 @@
 								<div class="shop-content-a1">商品信息：</div>
 								<div class="shop-content-a2">{{ lisobj.product.length }}件</div>
 							</view>
-							<view class="shop" v-for="(items,j) in lisobj.product" :key="j">
+							
+							<view class="shop-list">
+							
+								<view class="shop" v-for="(items,j) in lisobj.product" :key="j">
+									<view style="display: flex;">
+										<view class="shop-img">
+											<image :src="items.goods_pic" mode="aspectFit"></image>
+										</view>
+										<view class="container-txt">
+											<text class=" centered-multi-line shop-txt">
+												{{ items.goods_name }}</text>
+										</view>
+									</view>
+									<view style="line-height: 34rpx;">X{{ items.product_num}}</view>
+								</view>
+							
+							</view>
+							
+							<!-- <view class="shop" v-for="(items,j) in lisobj.product" :key="j">
 								<view style="display: flex;">
 									<view class="shop-img"> <img :src="items.goods_pic" alt=""></view>
 									<view class="shop-txt">{{ items.goods_name }}</view>
 								</view>
 								<view style="line-height: 26rpx;">X{{ items.product_num}}</view>
-							</view>
+							</view> -->
 
 						</view>
 					</view>
@@ -156,15 +174,7 @@
 				// })
 				this.$emit('outfun', '3')
 			},
-			serch() {
-				this.getlist()
-			},
-			inpuval(e) {
-
-				if (e.length == 0) {
-					this.getlist()
-				}
-			},
+		
 			getlist(id) {
 				detail({
 					id: id
@@ -172,7 +182,7 @@
 
 					if (res.code == 1) {
 						this.lisobj = res.data
-						console.log(this.lisobj, '11111')
+					
 					}
 				})
 			}
@@ -438,31 +448,90 @@
 						color: #0022c7;
 					}
 
-					.shop {
-						height: 130px;
-						overflow: hidden;
-						overflow-y: auto;
-
+					.shop-content {
+						padding-left: 20px;
+						padding-right: 20px;
+					
+					}
+					
+					.shop-content-a {
 						display: flex;
 						justify-content: space-between;
+						margin-top: 14px;
+						margin-bottom: 10px;
 					}
-
+					
+					.shop-content-a1 {
+						font-size: 13rpx;
+						font-family: PingFang SC-Regular, PingFang SC;
+						font-weight: 400;
+						color: #000000;
+					}
+					
+					.shop-content-a2 {
+						font-size: 12rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #0022C7;
+					}
+					
+					.shop-list {
+						height: 220rpx;
+						overflow: hidden;
+						overflow-y: auto;
+						margin-bottom: 10rpx;
+					}
+					
+					.shop {
+						display: flex;
+						justify-content: space-between;
+						font-size: 10rpx;
+						font-family: PingFang SC-Regular, PingFang SC;
+						font-weight: 400;
+						color: #333333;
+						margin-bottom: 10rpx;
+					}
+					
 					.shop-img {
-						width: 26px;
-						height: 26px;
+						width: 34rpx;
+						height: 34rpx;
+					
 						border-radius: 6px 6px 6px 6px;
 					}
-
-					.shop-img img {
-						width: 26px;
-						height: 26px;
+					
+					.shop-img image {
+						width: 34rpx;
+						height: 34rpx;
 						border-radius: 6px 6px 6px 6px;
 					}
-
+					
+					
+					
+					.container-txt {
+						margin-left: 10rpx;
+						width: 130rpx;
+						/* 设置容器高度 */
+						display: flex;
+						justify-content: center;
+						/* 水平居中 */
+						align-items: center;
+						/* 垂直居中 */
+					}
+					
+					.centered-multi-line {
+						text-align: left;
+						/* 文本水平居中 */
+						width: 100%;
+						/* 宽度占满父容器 */
+					}
+					
 					.shop-txt {
-						margin-left: 20px;
-
-
+						display: inline-block;
+						/* 转换为行内块元素 */
+						white-space: normal;
+						/* 允许自动换行 */
+						word-break: break-all;
+						/* 单词内断行 */
 					}
 				}
 			}
diff --git a/components/index/index.vue b/components/index/index.vue
index f254efa..c2696b6 100644
--- a/components/index/index.vue
+++ b/components/index/index.vue
@@ -1,84 +1,91 @@
 <template>
 
+	<view class="">
+		<you-scroll ref="scroll" @onPullDown="onPullDown">
 
-	<view class="dashboard-container">
-		<view class="container-top">
-			<!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> -->
-			<u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false' height="3"
-				bgColor='#fff'></u-search>
-			<view class="serch" @click="serch">搜索</view>
+			<view class="dashboard-container">
+				<view class="container-top">
+					<!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> -->
+					<u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false'
+						height="3" bgColor='#fff'></u-search>
+					<view class="serch" @click="serch">搜索</view>
 
-		</view>
-		<view class="container-content" v-if="list.length>0">
-			<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
-				@scrolltolower="loadMoreData">
+				</view>
+				<view class="container-content" v-if="list.length>0">
+					<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
+						@scrolltolower="loadMoreData">
 
 
-				<view v-for="(item,i) in list" :key="i" class="content-one">
-					<view class="" @click="kk(item)">
-						<view class="content-one-title">商户名称：{{item.shop_name}}</view>
-						<view class="content-one-con">
-							<view>店主姓名：{{item.shop_user}}</view>
-							<view>联系电话：{{item.shop_phone}}</view>
-							<view>商家地址：{{item.shop_address}}</view>
-							<view>订单编号：{{item.order_sn}}</view>
-							<!-- <view>订单状态：{{item.status==0?'待取货':item.status==1?'配送中':item.status==2?'已配送':'待取消'}}</view> -->
-						</view>
-
-
-
-					</view>
-					<view class="shop-content">
-						<view class="shop-content-a">
-							<view class="shop-content-a1">商品信息：</view>
-							<view class="shop-content-a2">{{ item.products.length }}件</view>
-
-						</view>
-
-						<view class="shop-list">
-
-							<view class="shop" v-for="(items,j) in item.products" :key="j">
-								<view style="display: flex;">
-									<view class="shop-img">
-										<image :src="items.goods_pic" mode=""></image>
-									</view>
-									<view class="container-txt">
-										<text class=" centered-multi-line shop-txt">
-											{{ items.goods_name }}</text>
-									</view>
+						<view v-for="(item,i) in list" :key="i" class="content-one">
+							<view class="" @click="kk(item)">
+								<view class="content-one-title">商户名称：{{item.shop_name}}</view>
+								<view class="content-one-con">
+									<view>店主姓名：{{item.shop_user}}</view>
+									<view>联系电话：{{item.shop_phone}}</view>
+									<view>商家地址：{{item.shop_address}}</view>
+									<view>订单编号：{{item.order_sn}}</view>
+									<!-- <view>订单状态：{{item.status==0?'待取货':item.status==1?'配送中':item.status==2?'已配送':'待取消'}}</view> -->
 								</view>
-								<view style="line-height: 34rpx;">X{{ items.product_num}}</view>
+
+
+
+							</view>
+							<view class="shop-content">
+								<view class="shop-content-a">
+									<view class="shop-content-a1">商品信息：</view>
+									<view class="shop-content-a2">{{ item.products.length }}件</view>
+
+								</view>
+
+								<view class="shop-list">
+
+									<view class="shop" v-for="(items,j) in item.products" :key="j">
+										<view style="display: flex;">
+											<view class="shop-img">
+												<image :src="items.goods_pic" mode=""></image>
+											</view>
+											<view class="container-txt">
+												<text class=" centered-multi-line shop-txt">
+													{{ items.goods_name }}</text>
+											</view>
+										</view>
+										<view style="line-height: 34rpx;">X{{ items.product_num}}</view>
+									</view>
+
+								</view>
+
+
 							</view>
 
+							<view class="btn" @click="openCamera(item)">
+								<view class="btn1">
+
+
+									<image src="@/static/images/er.png" mode=""></image>
+								</view>
+								<view class="btn2">扫码取货</view>
+							</view>
 						</view>
 
+					</scroll-view>
+				</view>
+				<view class="bj" v-else>
 
-					</view>
-
-					<view class="btn" @click="openCamera(item)">
-						<view class="btn1">
-
-
-							<image src="@/static/images/er.png" mode=""></image>
+					<view class="bj-conter">
+						<view class="bja">
+							<image src="@/static/images/zanwu.png" mode=""></image>
+						</view>
+						<view class="bjb">
+							暂无订单信息
 						</view>
-						<view class="btn2">扫码取货</view>
 					</view>
 				</view>
 
-			</scroll-view>
-		</view>
-		<view class="bj" v-else>
 
-			<view class="bj-conter">
-				<view class="bja">
-					<image src="@/static/images/zanwu.png" mode=""></image>
-				</view>
-				<view class="bjb">
-					暂无订单信息
-				</view>
 			</view>
-		</view>
 
+
+		</you-scroll>
 		<uni-popup ref="globalPopup" :custom="true">
 			<view class="popup-content" @click="close">
 				<view class="popup-content-a">
@@ -106,7 +113,11 @@
 		Toast
 	} from '../../libs/uniApi'
 
+	import youScroll from '@/components/you-scroll'
 	export default {
+		components: {
+			youScroll
+		},
 
 		data() {
 			return {
@@ -125,15 +136,23 @@
 				camera: 'auto'
 			}
 		},
-		mounted() {
-			this.getlist()
 
+		mounted() {
+
+
+			this.initlist()
 		},
 
-		methods: {
-			refresh() {
-			this.initlist()
 
+		methods: {
+			onPullDown(done) { // 下拉刷新
+				setTimeout(() => {
+					this.initlist()
+					done(); // 完成刷新
+				}, 1000 * 1)
+			},
+			refresh() {
+				this.initlist()
 			},
 			close() {
 				this.$refs.globalPopup.close()
@@ -166,6 +185,7 @@
 					data
 				).then(res => {
 					if (res.code == 1) {
+						uni.hideLoading();
 						this.list = [...this.list, ...res.data]
 						this.page_no = this.page_no + 1
 
@@ -179,7 +199,9 @@
 				// 		url: '/pages/index/detail?id=' + item.id
 				// 	})
 				// })
-				this.$emit('onfunction', item.id)
+
+				this.$emit('onfunction', item.id, 1)
+
 			},
 			loadMoreData() {
 
@@ -187,13 +209,12 @@
 			},
 			//提取商品
 			getDocumentListApi(item, oredr) {
-
 				let data = {
 					id: item.id,
 					order_id: item.order_id,
 					order_sn: oredr
 				}
-				console.log(data)
+
 				takeGoods(data).then(res => {
 
 					// Toast(res.msg)
@@ -206,11 +227,11 @@
 			},
 			// 打开相机
 			openCamera(item) {
-
+				console.log(item);
 				uni.scanCode({
 					success: (res) => {
 						this.getDocumentListApi(item, res.result)
-						// console.log(res.result); // 打印扫码结果
+						console.log(item, res.result); // 打印扫码结果
 					}
 				});
 
diff --git a/components/index/index1.vue b/components/index/index1.vue
index 06b0430..09d1fc5 100644
--- a/components/index/index1.vue
+++ b/components/index/index1.vue
@@ -1,93 +1,102 @@
 <template>
-	<view class="dashboard-container">
+	<view class="">
+		<you-scroll ref="scroll" @onPullDown="onPullDown">
+			<view class="dashboard-container">
 
-		<view class="container-top">
-			<!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> -->
-			<u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false' height="30"
-				bgColor='#fff'></u-search>
-			<view class="serch" @click="serch">搜索</view>
-		</view>
-		<view class="container-content" v-if="list.length>0">
-			<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
-				@scrolltolower="loadMoreData">
-				<view v-for="(item,i) in list" :key="i" class="content-one">
-					<view class="" @click="kk(item)">
-						<view class="content-one-title">收货人名称：{{item.receiver_name}}</view>
-						<view class="content-one-con">
-							<view>联系电话：{{item.receiver_phone}}</view>
-							<view>商家地址：{{item.receiver_address}}</view>
-							<view>订单编号：{{item.order_sn}}</view>
-							<!-- <view>订单状态：{{item.status==0?'待取货':item.status==1?'配送中':item.status==2?'已配送':'待取消'}}</view> -->
-						</view>
-
-
-					</view>
-					<view class="shop-content">
-						<view class="shop-content-a">
-							<view class="shop-content-a1">商品信息：</view>
-							<view class="shop-content-a2">{{ item.products.length }}件</view>
-
-						</view>
-						<view class="shop-list">
-
-							<view class="shop" v-for="(items,j) in item.products" :key="j">
-								<view style="display: flex;">
-									<view class="shop-img">
-										<image :src="items.goods_pic" mode=""></image>
-									</view>
-									<view class="container-txt">
-										<text class=" centered-multi-line shop-txt">
-											{{ items.goods_name }}</text>
-									</view>
+				<view class="container-top">
+					<!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> -->
+					<u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false'
+						height="30" bgColor='#fff'></u-search>
+					<view class="serch" @click="serch">搜索</view>
+				</view>
+				<view class="container-content" v-if="list.length>0">
+					<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
+						@scrolltolower="loadMoreData">
+						<view v-for="(item,i) in list" :key="i" class="content-one">
+							<view class="" @click="kk(item)">
+								<view class="content-one-title">收货人名称：{{item.receiver_name}}</view>
+								<view class="content-one-con">
+									<view>联系电话：{{item.receiver_phone}}</view>
+									<view>商家地址：{{item.receiver_address}}</view>
+									<view>订单编号：{{item.order_sn}}</view>
+									<!-- <view>订单状态：{{item.status==0?'待取货':item.status==1?'配送中':item.status==2?'已配送':'待取消'}}</view> -->
 								</view>
-								<view style="line-height: 34rpx;">X{{ items.product_num}}</view>
-							</view>
 
+
+							</view>
+							<view class="shop-content">
+								<view class="shop-content-a">
+									<view class="shop-content-a1">商品信息：</view>
+									<view class="shop-content-a2">{{ item.products.length }}件</view>
+
+								</view>
+								<view class="shop-list">
+
+									<view class="shop" v-for="(items,j) in item.products" :key="j">
+										<view style="display: flex;">
+											<view class="shop-img">
+												<image :src="items.goods_pic" mode=""></image>
+											</view>
+											<view class="container-txt">
+												<text class=" centered-multi-line shop-txt">
+													{{ items.goods_name }}</text>
+											</view>
+										</view>
+										<view style="line-height: 34rpx;">X{{ items.product_num}}</view>
+									</view>
+
+								</view>
+
+								<view class="btn" @click="show1(item)">
+									<view class="btn1">
+										<image src="@/static/images/che.png" mode=""></image>
+
+									</view>
+									<view class="btn2">货物送达</view>
+								</view>
+							</view>
 						</view>
+					</scroll-view>
 
-						<view class="btn" @click="show1(item)">
-							<view class="btn1">
-								<image src="@/static/images/che.png" mode=""></image>
+				</view>
+				<view class="bj" v-else>
 
-							</view>
-							<view class="btn2">货物送达</view>
+					<view class="bj-conter">
+						<view class="bja">
+							<image src="@/static/images/zanwu.png" mode=""></image>
+						</view>
+						<view class="bjb">
+							暂无订单信息
 						</view>
 					</view>
 				</view>
-			</scroll-view>
-
-		</view>
-		<view class="bj" v-else>
-
-			<view class="bj-conter">
-				<view class="bja">
-					<image src="@/static/images/zanwu.png" mode=""></image>
-				</view>
-				<view class="bjb">
-					暂无订单信息
-				</view>
+				
 			</view>
-		</view>
+
+
+
+		</you-scroll>
 		<gb-popup :isShow="isShow1" rName="确定" :isBut="false" lName="取消" @lEvent="copyshow" @rEvent="copyData"
 			title="请输入取件码">
-
+		
 			<view style="padding: 30rpx;">
 				<input type="value" v-model="code" placeholder="请输入"
 					placeholder-style="font-size: 12rpx;height: 50rpx;line-height: 50rpx;"
 					style="height: 50rpx;font-size: 18rpx;" />
 			</view>
 		</gb-popup>
-
-		<uni-popup ref="globalPopup"  :custom="true">
+		
+		<uni-popup ref="globalPopup" :custom="true">
 			<view class="popup-content" @click="close">
-				
+		
 				<view class="popup-content-a">
 					<view class="popup-item">
 						用户完成收货
 					</view>
-
+		
 					<view class="popup-item">
-						<image src="@/static/images/zzw.png" mode="aspectFit" style="width: 150rpx; height: 150rpx;">
+						<image src="@/static/images/zzw.png" mode="aspectFit"
+							style="width: 150rpx; height: 150rpx;">
 						</image>
 					</view>
 				</view>
@@ -102,8 +111,12 @@
 		delivery
 	} from '@/api/oa.js'
 
-	export default {
+	import youScroll from '@/components/you-scroll'
 
+	export default {
+		components: {
+			youScroll
+		},
 		data() {
 			return {
 				isShow1: false,
@@ -124,11 +137,18 @@
 			}
 		},
 		mounted() {
-			this.getlist()
 
+			this.initlist()
 		},
 
+
 		methods: {
+			onPullDown(done) { // 下拉刷新
+				setTimeout(() => {
+					this.initlist()
+					done(); // 完成刷新
+				}, 1000 * 1)
+			},
 			refresh() {
 				this.initlist()
 
@@ -136,7 +156,7 @@
 			close() {
 				this.$refs.globalPopup.close()
 			},
-			
+
 			//查询
 			serch() {
 				this.initlist()
@@ -144,7 +164,7 @@
 			//监听
 			inpuval(e) {
 				if (e.length == 0) {
-				
+
 					this.initlist()
 				}
 			},
@@ -179,7 +199,7 @@
 
 				this.isShow1 = true
 				this.typeid = row.id
-			
+
 			},
 			copyshow() {
 				this.isShow1 = false
@@ -231,7 +251,7 @@
 				// uni.navigateTo({
 				// 	url: '/pages/psong/detail?id=' + item.id
 				// })
-				this.$emit('onfunction1', item.id)
+				this.$emit('onfunction', item.id,2)
 
 			},
 			// 打开相机
diff --git a/components/index/indexg.vue b/components/index/indexg.vue
index fe3b326..3ea765b 100644
--- a/components/index/indexg.vue
+++ b/components/index/indexg.vue
@@ -1,88 +1,93 @@
 <template>
-	<view class="dashboard-container">
+	<view class="">
+		<you-scroll ref="scroll" @onPullDown="onPullDown">
+			<view class="dashboard-container">
 
-		<view class="container-top">
-			<!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> -->
-			<u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false'
-				bgColor='#fff' height="30" class="usearch"></u-search>
-			<view class="serch" @click="serch">搜索</view>
+				<view class="container-top">
+					<!-- <input v-model="keyword" prefix-icon="el-icon-search" placeholder="请输入内容" @input="inpuval" /> -->
+					<u-search placeholder="请输入订单编号,联系方式,名称" v-model="keyword" @input="inpuval" :showAction='false'
+						bgColor='#fff' height="30" class="usearch"></u-search>
+					<view class="serch" @click="serch">搜索</view>
 
-		</view>
-		<view class="container-content" v-if="list.length>0">
-			<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
-				@scrolltolower="loadMoreData">
-				<view v-for="(item,i) in list" :key="i" class="content-one" @click="kk(item)">
-					<view class="" @click="kk(item)">
-						<view :class="item.status==3?'content-one-title1':'content-one-title'">
-							<view class="">收货人名称：{{item.receiver_name}}</view>
-							<view class="" v-if="item.status==3">已取消</view>
-						</view>
-						<view class="content-one-con">
-
-							<view>联系电话：{{item.receiver_phone}}</view>
-							<view>商家地址：{{item.shop_address}}</view>
-							<view>订单编号：{{item.order_sn}}</view>
-
-							<view v-if="item.status!=3">取货时间：{{item.qh_time}}</view>
-
-							<view v-if="item.status!=3">送达时间：{{item.ps_time}}</view>
-							<!-- <view>订单状态：{{item.status==0?'待取货':item.status==1?'配送中':item.status==2?'已配送':'待取消'}}</view> -->
-
-						</view>
-
-
-
-					</view>
-
-					<view class="shop-content">
-						<view class="shop-content-a">
-							<view class="shop-content-a1">商品信息：</view>
-							<view class="shop-content-a2">{{ item.products.length }}件</view>
-
-						</view>
-
-
-						<view class="shop-list">
-
-							<view :class="item.status==3?'shop1':'shop'" v-for="(items,j) in item.products" :key="j">
-								<view style="display: flex;">
-									<view class="shop-img">
-										<image :src="items.goods_pic" mode=""></image>
-									</view>
-									<view class="container-txt">
-										<text class=" centered-multi-line shop-txt">
-											{{ items.goods_name }}</text>
-									</view>
+				</view>
+				<view class="container-content" v-if="list.length>0">
+					<scroll-view scroll-x="true" style="width: 565rpx;white-space: nowrap;overflow: hidden;"
+						@scrolltolower="loadMoreData">
+						<view v-for="(item,i) in list" :key="i" class="content-one" @click="kk(item)">
+							<view class="" @click="kk(item)">
+								<view :class="item.status==3?'content-one-title1':'content-one-title'">
+									<view class="">收货人名称：{{item.receiver_name}}</view>
+									<view class="" v-if="item.status==3">已取消</view>
 								</view>
-								<view style="line-height: 34rpx;">X{{ items.product_num}}</view>
+								<view class="content-one-con">
+
+									<view>联系电话：{{item.receiver_phone}}</view>
+									<view>商家地址：{{item.shop_address}}</view>
+									<view>订单编号：{{item.order_sn}}</view>
+
+									<view v-if="item.status!=3">取货时间：{{item.qh_time}}</view>
+
+									<view v-if="item.status!=3">送达时间：{{item.ps_time}}</view>
+									<!-- <view>订单状态：{{item.status==0?'待取货':item.status==1?'配送中':item.status==2?'已配送':'待取消'}}</view> -->
+
+								</view>
+
+
+
 							</view>
 
+							<view class="shop-content">
+								<view class="shop-content-a">
+									<view class="shop-content-a1">商品信息：</view>
+									<view class="shop-content-a2">{{ item.products.length }}件</view>
+
+								</view>
+
+
+								<view class="shop-list">
+
+									<view :class="item.status==3?'shop1':'shop'" v-for="(items,j) in item.products"
+										:key="j">
+										<view style="display: flex;">
+											<view class="shop-img">
+												<image :src="items.goods_pic" mode=""></image>
+											</view>
+											<view class="container-txt">
+												<text class=" centered-multi-line shop-txt">
+													{{ items.goods_name }}</text>
+											</view>
+										</view>
+										<view style="line-height: 34rpx;">X{{ items.product_num}}</view>
+									</view>
+
+								</view>
+
+								<view class="btn" :class="item.status==3?'btns':'btn'">
+									<view class="btn1">
+
+										<image src="@/static/images/yan.png" mode=""></image>
+									</view>
+									<view class="btn2" @click="openCamera"> 查看详情</view>
+								</view>
+							</view>
 						</view>
+					</scroll-view>
+				</view>
 
-						<view class="btn" :class="item.status==3?'btns':'btn'">
-							<view class="btn1">
+				<view class="bj" v-else>
 
-								<image src="@/static/images/yan.png" mode=""></image>
-							</view>
-							<view class="btn2" @click="openCamera"> 查看详情</view>
+					<view class="bj-conter">
+						<view class="bja">
+							<image src="@/static/images/zanwu.png" mode=""></image>
+						</view>
+						<view class="bjb">
+							暂无订单信息
 						</view>
 					</view>
 				</view>
-			</scroll-view>
-		</view>
-
-		<view class="bj" v-else>
-
-			<view class="bj-conter">
-				<view class="bja">
-					<image src="@/static/images/zanwu.png" mode=""></image>
-				</view>
-				<view class="bjb">
-					暂无订单信息
-				</view>
 			</view>
-		</view>
-
+		</you-scroll>
+		
 	</view>
 </template>
 
@@ -90,8 +95,11 @@
 	import {
 		lists
 	} from '@/api/oa.js'
-
+	import youScroll from '@/components/you-scroll'
 	export default {
+		components: {
+			youScroll
+		},
 
 		data() {
 			return {
@@ -111,10 +119,18 @@
 			}
 		},
 		mounted() {
+
 			this.initlist()
 		},
 
+
 		methods: {
+			onPullDown(done) { // 下拉刷新
+				setTimeout(() => {
+						this.initlist()
+					done(); // 完成刷新
+				},1000*1)
+			},
 			refresh() {
 				this.initlist()
 
@@ -127,7 +143,7 @@
 					this.initlist()
 				}
 			},
-	initlist() {
+			initlist() {
 				this.list = []
 				this.page_no = 1
 				this.getlist()
@@ -155,7 +171,7 @@
 				// uni.navigateTo({
 				// 	url: '/pages/sda/detail?id=' + item.id
 				// })
-				this.$emit('onfunction2', item.id)
+				this.$emit('onfunction', item.id,3)
 
 			},
 			loadMoreData() {
diff --git a/components/you-scroll.vue b/components/you-scroll.vue
new file mode 100644
index 0000000..4239b0b
--- /dev/null
+++ b/components/you-scroll.vue
@@ -0,0 +1,271 @@
+<template>
+	<view class="you-scroll" ref="youScroll">
+		<view class="pullDown" :style="{ transform: 'translateY('+translateY+'px)', transition: isDown ? '0s' : '0.3s' }">
+			<slot name="pullDown">
+				<!-- <img src="@/static/pullDown.jpg" :class="{'down-icon': true,'animate': pullDownStatus == 3}"></img> -->
+				<span>
+					<block v-if="pullDownStatus == 1">{{downPullToRefresh}}</block>
+					<block v-if="pullDownStatus == 2">{{downReleaseToRefresh}}</block>
+					<block v-if="pullDownStatus == 3">{{downRefreshing}}</block>
+				</span>
+			</slot>
+		</view>
+		<scroll-view class="you-scroll-inner" ref="youScrollInner" :scroll-top="scrollToTop" scroll-with-animation scroll-y :style="{ transform: 'translateY('+translateY+'px)', transition: isDown ? '0s' : 'transform 0.3s' }"
+		 @touchstart="startFn" @touchmove="moveFn" @touchend="endFn" @touchcancel="endFn" @scroll="scroll">
+			<view class="you-scroll-content">
+				<slot></slot>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				scrollToTop: 0,
+				scrollTop: 0,
+				oldTop: 0,
+				sPageY: 0,
+				mPageY: 0,
+				ePageY: 0,
+				translateY: 0,
+				pullDownStatus: 1, // 1：下拉刷新 2：松开刷新 3：刷新中
+				isDown: false
+			};
+		},
+		props: {
+			pullDownDistance: {
+				type: Number,
+				default: 50 // 下拉刷新距离
+			},
+			reachBottomDistance: {
+				type: Number,
+				default: 30 // 上拉加载距离
+			},
+			downPullToRefresh: {
+				type: String,
+				default: '下拉刷新'
+			},
+			downReleaseToRefresh: {
+				type: String,
+				default: '松开刷新'
+			},
+			downRefreshing: {
+				type: String,
+				default: '刷新中…'
+			},
+		},
+		methods: {
+			startFn(e) {
+				this.isDown = true;
+				this.sPageY = e.changedTouches[0].pageY;
+				this.pointY = this.translateY;
+			},
+			moveFn(e) {
+				let view = uni.createSelectorQuery().in(this).select(".you-scroll-inner");
+				view.fields({ 
+					size: true, 
+					scrollOffset: true
+				}, data => { 
+					this.scrollTop = data.scrollTop;
+					this.mPageY = e.changedTouches[0].pageY;
+					if (this.scrollTop <= 0) {
+						let translateY = ((this.mPageY - this.sPageY)  / 2) + this.pointY;
+						this.translateY = (translateY < 0 ? 0 : translateY);
+						
+						if(this.pullDownStatus != 3) {
+							if(this.translateY < this.pullDownDistance) {
+								this.pullDownStatus = 1;
+							} else if(this.translateY >= this.pullDownDistance) {
+								this.pullDownStatus = 2;
+							}
+						}
+					}
+				}).exec();
+				
+			},
+			endFn(e) {
+				this.isDown = false;
+				this.ePageY = e.changedTouches[0].pageY;
+				setTimeout(() => {
+					this.translateY = this.translateY >= this.pullDownDistance ? this.pullDownDistance : 0;
+					if(this.pullDownStatus == 2) { // 开始刷新
+						this.pullDownStatus = 3;
+						this.$emit('onPullDown',this.endPullDown);
+					}
+				},100)
+				
+				
+			},
+			endPullDown(mm) {
+				if(this.timeout) clearTimeout(this.timeout);
+				this.timeout = setTimeout(() => {
+					this.translateY = 0;
+					this.pullDownStatus = 1;
+				}, mm || 0);
+			},
+			prevent(e) {  
+				if(this.translateY > 0) {
+					e.preventDefault();
+				}
+			},
+			scroll(e) {
+				this.$emit('onScroll',e);
+				this.oldTop = e.detail.scrollTop;
+				
+				if(this.timeout) clearTimeout(this.timeout);
+				this.timeout = setTimeout(() => {
+					this.scrolltolower(e);
+				},20);
+			},
+			scrolltolower(e) {
+				let view = uni.createSelectorQuery().in(this).select(".you-scroll-inner");
+				view.fields({ 
+					size: true, 					
+					scrollOffset: true
+				}, data => { 
+					if(data.scrollTop >= (e.detail.scrollHeight - data.height - this.reachBottomDistance)) {
+						this.$emit('onLoadMore',e);
+					}
+				}).exec();
+				
+			},
+			isWeixinCient(){
+				var ua = navigator.userAgent.toLowerCase();
+				if(ua.match(/MicroMessenger/i)=="micromessenger") {
+					return true;
+				} else {
+					return false;
+				}
+			},
+			goTop(top) {
+				this.scrollToTop = this.oldTop;
+				this.$nextTick(function() {
+					this.scrollToTop = top || 0;
+				});
+			}
+		},
+		mounted() {
+			// #ifdef H5
+			if(this.isWeixinCient()) {
+				document.body.addEventListener('touchmove', this.prevent);
+			}
+			// #endif
+		},
+		destroyed() {
+			// #ifdef H5
+			if(this.isWeixinCient()) {
+				document.body.removeEventListener('touchmove', this.prevent);
+			}
+			// #endif
+		}
+	}
+</script>
+
+<style scoped>
+	.you-scroll {
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		position: relative;
+		// background-color: #eee;
+	}
+	.you-scroll .pullDown {
+		width: 100%;
+		height: 40px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+		overflow: hidden;
+		transform: translateY(-100%);
+		position: absolute;
+		top: -40px;
+		left: 0;
+	}
+	.you-scroll .pullDown .down-icon {
+		width: 40px;
+		height: 32px;
+		display: inline-block;
+		vertical-align: middle;
+	}
+	.you-scroll .pullDown .animate {
+		-webkit-animation: scaleIcon 1s infinite linear;
+		-moz-animation: scaleIcon 1s infinite linear;
+		-ms-animation: scaleIcon 1s infinite linear;
+		animation: scaleIcon 1s infinite linear;
+	}
+	.you-scroll .pullDown span {
+		white-space: nowrap;
+		overflow: hidden;
+		display: inline-block;
+		vertical-align: middle;
+	}
+	
+	.you-scroll .you-scroll-inner {
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		position: relative;
+	}
+	.you-scroll-content {
+		overflow: hidden;
+	}
+
+	@-webkit-keyframes scaleIcon {
+		0% {
+			transform: scaleY(1);
+		}
+		40% {
+			transform: scaleY(0.8);
+		}
+		80% {
+			transform: scaleY(0.9);
+		}
+		100% {
+			transform: scaleY(1);
+		}
+	}
+	@-moz-keyframes scaleIcon {
+		0% {
+			transform: scaleY(1);
+		}
+		40% {
+			transform: scaleY(0.8);
+		}
+		80% {
+			transform: scaleY(0.9);
+		}
+		100% {
+			transform: scaleY(1);
+		}
+	}
+	@-ms-keyframes scaleIcon {
+		0% {
+			transform: scaleY(1);
+		}
+		40% {
+			transform: scaleY(0.8);
+		}
+		80% {
+			transform: scaleY(0.9);
+		}
+		100% {
+			transform: scaleY(1);
+		}
+	}
+	@keyframes scaleIcon {
+		0% {
+			transform: scaleY(1);
+		}
+		40% {
+			transform: scaleY(0.8);
+		}
+		80% {
+			transform: scaleY(0.9);
+		}
+		100% {
+			transform: scaleY(1);
+		}
+	}
+</style>
diff --git a/pages.json b/pages.json
index 81158fa..6b10a97 100644
--- a/pages.json
+++ b/pages.json
@@ -6,7 +6,7 @@
 			"style": {
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom",
-				"enablePullDownRefresh": true,
+				
 				"app-plus": {
 					"subNVues": [{
 						"id": "concat", // 唯一标识  
diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index 8d83e70..9766c2b 100644
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@@ -108,7 +108,6 @@
 
 		},
 		onPullDownRefresh() {
-
 			uni.stopPullDownRefresh()
 		},
 		methods: {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b226762..5d5d750 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,12 +22,9 @@
 					<view class="left-bottom-right">
 						<view class="bottom-right1">
 							<view class="bottom-right_a">
-
 							</view>
 							<view class="bottom-right_b">
-
 								{{oaUserInfo.nickname ?'在线':'离线'}}
-
 							</view>
 						</view>
 						<view class="bottom-right2" @click="logout">
@@ -37,13 +34,12 @@
 				</view>
 			</view>
 			<view class="content-right">
-				<index ref="list" @onfunction='onfunction' v-if="num==0&&isshow" />
-				<indexa :type='type' @outfun='outfun' v-if="num==0&&!isshow" />
-				<index1 ref="list1" @onfunction1='onfunction1' v-if="num==1&&isshow1" />
-				<indexb :type='type' @outfun='outfun' v-if="num==1&&!isshow1" />
-				<pindex ref="list2" @onfunction2='onfunction2' v-if="num==2&&isshow2" />
-				<indexc :type='type' @outfun='outfun' v-if="num==2 &&!isshow2" />
-
+				<index ref="list" @onfunction='onfunction' v-show="showIndexComponent" />
+				<indexa :type='type' @outfun='outfun' v-if="showIndexAComponent" />
+				<index1 ref="list1" @onfunction='onfunction' v-show="showIndex1Component" />
+				<indexb :type='type' @outfun='outfun' v-if="showIndexBComponent" />
+				<pindex ref="list2" @onfunction='onfunction' v-show="showPIndexComponent" />
+				<indexc :type='type' @outfun='outfun' v-if="showIndexCComponent" />
 			</view>
 
 		</view>
@@ -78,7 +74,7 @@
 			indexc
 		},
 		data() {
-			
+
 			return {
 				title: 'Hello',
 				BarHeight: '',
@@ -106,7 +102,24 @@
 			oaUserInfo() {
 				return this.$store.state.app.userInfo
 			},
-
+			showIndexComponent: function() {
+				return this.num === 0 && this.isshow;
+			},
+			showIndexAComponent: function() {
+				return this.num === 0 && !this.isshow;
+			},
+			showIndex1Component: function() {
+				return this.num === 1 && this.isshow1;
+			},
+			showIndexBComponent: function() {
+				return this.num === 1 && !this.isshow1;
+			},
+			showPIndexComponent: function() {
+				return this.num === 2 && this.isshow2;
+			},
+			showIndexCComponent: function() {
+				return this.num === 2 && !this.isshow2;
+			}
 		},
 
 		onLoad() {
@@ -114,21 +127,43 @@
 
 
 		},
-		onPullDownRefresh() {
-			if (this.num == 0) {
+
+		// onPullDownRefresh() {
+		// 	if (this.num == 0 && this.isshow) {
+		// 		this.$refs.list.refresh()
+		// 		uni.stopPullDownRefresh()
+		// 	} else if (this.num == 1 && this.isshow1) {
+		// 		this.$refs.list1.refresh()
+		// 		uni.stopPullDownRefresh()
+		// 	} else if (this.num == 2 && this.isshow2) {
+		// 		this.$refs.list2.refresh()
+		// 		uni.stopPullDownRefresh()
+		// 	}
+		// },
+		onShow() {
+			if (this.num == 0 && this.isshow) {
 				this.$refs.list.refresh()
 				uni.stopPullDownRefresh()
-			} else if (this.num == 1) {
+			} else if (this.num == 1 && this.isshow1) {
 				this.$refs.list1.refresh()
 				uni.stopPullDownRefresh()
-			} else {
+			} else if (this.num == 2 && this.isshow2) {
 				this.$refs.list2.refresh()
 				uni.stopPullDownRefresh()
 			}
-
 		},
-		mounted() {
 
+		mounted() {
+			if (this.num == 0 && this.isshow) {
+				this.$refs.list.refresh()
+				uni.stopPullDownRefresh()
+			} else if (this.num == 1 && this.isshow1) {
+				this.$refs.list1.refresh()
+				uni.stopPullDownRefresh()
+			} else if (this.num == 2 && this.isshow2) {
+				this.$refs.list2.refresh()
+				uni.stopPullDownRefresh()
+			}
 		},
 		methods: {
 			login() {
@@ -137,59 +172,75 @@
 				})
 			},
 			logout() {
-				uni.reLaunch({
-					url: '/pages/oaLogin/oaLogin'
+
+				uni.showModal({
+					title: '提示',
+					content: '确定退出？',
+					cancelText: "取消", // 取消按钮的文字  
+					confirmText: "确认", // 确认按钮的文字  
+					showCancel: true, // 是否显示取消按钮，默认为 true
+					confirmColor: '#f55850',
+					cancelColor: '#39B54A',
+					success: (res) => {
+						if (res.confirm) {
+							uni.reLaunch({
+								url: '/pages/oaLogin/oaLogin'
+							})
+							console.log('comfirm') //点击确定之后执行的代码
+						} else {
+							console.log('cancel') //点击取消之后执行的代码
+						}
+					}
 				})
+
 			},
 			getlist(index) {
 				this.num = index
 				if (index == 1) {
-
+					this.$refs.list1.refresh()
 					this.isshow2 = true
 					this.isshow = true
 				}
 				if (index == 2) {
 					this.isshow1 = true
 					this.isshow = true
+					this.$refs.list2.refresh()
 				}
 
 				if (index == 0) {
+					this.$refs.list.refresh()
+
 					this.isshow1 = true
 					this.isshow2 = true
 				}
 
 			},
-			onfunction(e) {
-				if (e) {
-				
+			onfunction(e,id) {
+				console.log(e,id)
+				if (id == 1) {
 					this.isshow = false
 					this.type = e
-				}
-			},
-			onfunction1(e) {
-				if (e) {
-		
+				} else if (id == 2) {
 					this.isshow1 = false
 					this.type = e
-				}
-			},
-			onfunction2(e) {
-				
-				if (e) {
+				} else {
 					this.isshow2 = false
 					this.type = e
 				}
+
 			},
 
+
+
 			outfun(e) {
 				if (e == 1) {
-				
+					this.$refs.list.refresh()
 					this.isshow = true
 				} else if (e == 2) {
-
+					this.$refs.list1.refresh()
 					this.isshow1 = true
 				} else {
-					
+					this.$refs.list2.refresh()
 					this.isshow2 = true
 				}
 			},
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index 848f669..00ffe00 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -104,7 +104,7 @@
 				jpushModule.getRegistrationID(result => {
 					console.log("设备----", result)
 					// 绑定极光设备id
-					this.formData.register_id = result.registerID || 1
+					this.formData.register_id = result.registerID 
 					console.log("设备----", this.formData)
 				})
 				// #endif
@@ -117,6 +117,7 @@
 			async login() {
 
 				if (!this.formData.account) return Toast('账号不能为空');
+				
 				if (this.formData.scene == 1 && !this.formData.password) return Toast('密码不能为空');
 				if (this.formData.scene == 2 && !this.formData.code) return Toast('验证码不能为空');
 
@@ -126,7 +127,7 @@
 				// })
 				console.log(that.formData)
 				let res = await loginAccount(that.formData);
-				console.log(res)
+				// console.log(res)
 				encrypt.encode('ACT', that.formData);
 
 				this.$store.commit('SET_USERINFO', {
@@ -139,8 +140,6 @@
 
 				// console.log(data, '11111111')
 				// this.$store.commit('setUserInfo', data);
-
-
 				uni.hideLoading()
 				if (res.data.token) {
 					// console.log('111111111')
diff --git a/static/pullDown.jpg b/static/pullDown.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cd99f3381a639e4063a1ccbf727f6f2120b70f86
GIT binary patch
literal 11645
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
N^?x>3P!iqE{xA6PlP>@O

literal 0
HcmV?d00001