Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/album/albumOrderdetail/albumOrderdetail.vue

@@ -245,6 +245,7 @@ export default {
     },
     //---下载方法
     downloadFun(imgUrl) { 
+      console.log(imgUrl)
       uni.showLoading({
         title: '下载中',
         mask: true

pages/scenic/combinationProduct/combinationProduct.vue

@@ -85,7 +85,7 @@
 					</swiper-item>
 
 					<swiper-item class="swiper-item">
-						<u-waterfall v-model="albumList" style="padding-top: 8rpx;">
+						<u-waterfall v-model="albumList" class="waterfall" style="padding-top: 8rpx;">
 							<template v-slot:left="{leftList}">
 								<view v-for="(item, index) in leftList" :key="index" class="album-left" @click="goAlbum(index)">
 									<view class="album-list-top">
@@ -128,10 +128,10 @@
 					</swiper-item>
 
 					<swiper-item class="swiper-item">
-						<u-empty text="空空如也3..." mode="list"></u-empty>
+						<u-empty text="空空如也..." mode="list"></u-empty>
 					</swiper-item>
 					<swiper-item class="swiper-item">
-						<u-empty text="空空如也4..." mode="list"></u-empty>
+						<u-empty text="空空如也..." mode="list"></u-empty>
 					</swiper-item>
 				</swiper>
 			</view>
@@ -338,6 +338,12 @@ export default {
     //---导航栏切换
     tabbarChange(index) {
       this.active = index
+      if(index==0){
+        this.countSwiper()
+      }
+      if(index==1){
+        this.countSwiper('waterfall')
+      }
     },
     //---swiper滑动结束，分别设置tabs和swiper的状态
     animationfinish(e) {
@@ -383,28 +389,26 @@ export default {
       this.$refs.detail.showPop = true
     },
     //计算第一个swiper高度
-    countSwiper1(){
+    countSwiper(label){
+      let labels=label||'checkbox-box'
       this.$nextTick(() => {
 			  const query = uni.createSelectorQuery().in(this)
-			  query
-			    .select('.checkbox-box')
-			    .boundingClientRect(data => {
-			      this.swiperHeight = data.height
-			    })
-			    .exec()
+			  query.select(`.${labels}`).boundingClientRect(data => {
+			    this.swiperHeight=data.height
+			  }).exec()
       })
     },
     //---展示更多产品
     showMoreProduct(item) {
       item.productListCopy = item.productList
       this.$forceUpdate()
-      this.countSwiper1()
+      this.countSwiper()
     },
     //---收起产品
     retractProduct(item) {
       item.productListCopy = item.productList.slice(0, 2)
       this.$forceUpdate()
-      this.countSwiper1()
+      this.countSwiper()
     },
     //---多选框变化
     checkboxChange(e) {
@@ -521,7 +525,7 @@ export default {
               })
             })
             this.$nextTick(() => {
-              this.countSwiper1()
+              this.countSwiper()
             })
           } else {
             uni.showToast({
@@ -865,4 +869,7 @@ export default {
 .swiper-item /deep/ .u-waterfall{
 	padding-top:8rpx;
 }
+.swiper-item /deep/ .u-empty{
+	height: 300px;
+}
 </style>