Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

App.vue

@@ -1,5 +1,8 @@
+
 <script>
+	
 	export default {
+		
 		onLaunch: function() {
 			uni.authorize({
 				scope: 'scope.userLocation',

manifest.json

@@ -108,9 +108,9 @@
             "scope.writePhotosAlbum" : {
                 "desc" : "你的图片将保存到手机相册"
             },
-			"scope.writePhoneNumber": {
+            "scope.writePhoneNumber" : {
-			  "desc": "你的手机号码将用于账号安全及订单通知"
+                "desc" : "你的手机号码将用于账号安全及订单通知"
-			}
+            }
         },
         "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     },

package2/group/groupBuySingle.vue

@@ -821,6 +821,12 @@
 			}
 		},
 		onPullDownRefresh() {
+			this.menuList = [{
+				categoryName: '推荐',
+				id: 'tuijian',
+				checked: true
+			}]
+			this.productItem = []
 		    this.getCategory(this.shopItem.id);
 		    this.getProduct('');
 		},

pages/index/index.vue

@@ -228,7 +228,6 @@
 						</view>
 					</view>
 					<view class="daimai-box" style="padding-bottom:180rpx;">
-						<view style="width:100%;height:100rpx;" v-if="lastScrollTop>583"></view>
 						<view class="daimai-tab" id="menuList" :class="{'daimai-tab--sticky': lastScrollTop>583}"
 							:style="{'top': (navBarHeight+46) + 'px'}">
 							<view class="daimai-tab-item" :class="{'active': checked == 'waimai'}"
@@ -331,7 +330,8 @@
 							</view>
 						</view>
 						
-						<scroll-view  @scrolltolower="onReachPage" :scroll-y="lastScrollTop>583" class="delivery-list-wrap">
+						<scroll-view  @scrolltolower="onReachPage" :upper-threshold="30" @scrolltoupper="gundongTop" :scroll-y="lastScrollTop>583" class="delivery-list-wrap">
+							
 							<view class="empty-delivery" v-if="deliveryItem.length <= 0">
 								<view class="empty-delivery-icon">校园</view>
 								<view class="empty-delivery-title">暂时没有可抢订单</view>
@@ -339,6 +339,7 @@
 							</view>
 							<view class="list-1" v-for="(item,index) in deliveryItem" :key="index"
 								@tap="productDetail(item)">
+								<view style="width:100%;height:70rpx;" v-if="lastScrollTop>560 && index == 0"></view>
 								<view class="daoda-time">
 									送达时间：{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }}
 								</view>
@@ -1220,6 +1221,9 @@
 				this.searchForm.pageNum++;
 				this.getDelivery();
 			},
+			gundongTop(){
+				console.log("00000000000000000000000")
+			},
 			searchOrder(type, value) {
 				if (type == 'getarea') {
 					if (this.searchForm.getAreaId == value.id) {