Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

pagesGood/shopDetails.vue

@@ -1,5 +1,5 @@
 <template>
-	<scroll-view id="shopBox" class="container" scroll-y="true" @scrolltolower="handleLoadMore">
+	<scroll-view id="shopBox" class="container" scroll-y="true" @scrolltolower="handleLoadMore()">
 		<view class="shop-bg"></view>
 		<view class="shop-info">
 			<view class="shop-icon">
@@ -9,7 +9,8 @@
 			<view class="shop-sell">已售商品{{shopData.soldCount}}</view>
 		</view>
 		<view class="shop-image" :style="{height: (swiperHeight / 2 + 30)+'px'}">
-			<swiper class="swiper" :style="{height: (swiperHeight / 2)+'px'}" :indicator-dots="false" :autoplay="true" :interval="3000" :duration="500">
+			<swiper class="swiper" :style="{height: (swiperHeight / 2)+'px'}" :indicator-dots="false" :autoplay="true" :interval="3000"
+			 :duration="500">
 				<swiper-item v-for="(item,index) in shopData.storeImgUrl" :key="index">
 					<image :src="item" mode="aspectFill" style="width: 100%;height: 100%;border-radius: 10px;" :style="{height: (swiperHeight / 2)+'px'}"></image>
 				</swiper-item>
@@ -248,7 +249,12 @@
 		},
 	}
 </script>
-
+<style>
+	page {
+		width: 100%;
+		height: 100%;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;

pagesMain/orderDetail.vue

@@ -370,7 +370,7 @@
 							} else {
 								//  追踪物流
 								uni.navigateTo({
-									url: '/pagesMain/logisticsDeatil?orderId=' + this.orderData.orderId
+									url: '/pagesMain/logisticsDeatil?logisticCode=' + this.orderData.logisticsNum
 								});
 							}
 						} else {