BUG修改

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -36,6 +36,7 @@
 				<u-checkbox v-model="item.checkType" v-if="checkTypeFun==true" shape="circle" class="list-uCheck" @click.stop.native="()=>{}" @change="stopPhoto(index)"></u-checkbox>
 				<view class="list-mask" @click.stop.native="()=>{}" @click="projectCheckPhoto(index)" >预览</view>
 			</view>
+			<view class="subject-noMore" v-if="previewDataType==true">暂无更多数据</view>
 		</view>
 		<!--脚部-->
 		<view class="album-bottom">
@@ -149,6 +150,7 @@ export default {
         //   src: '../static/album/customPic.png'
         // },
       ],
+      previewDataType:false,
       previewNum: 0, //当前是第几张图片
       checkTypeFun:true,//刷新选项
       //左右滑动监听开始
@@ -172,13 +174,14 @@ export default {
       priceNum:0,//选购了多少照片
       merchantMessage:[],//景区基础参数
       masterSlaveCouponList:[],//优惠券
+			
     }
   },
   onLoad(option) {
     this.companyId = this.$commonjs.getCompanyId(option)||''
     //this.companyId = '6da527f930be4aa1904fe17fcb41874f'
     this.openid = uni.getStorageSync('openid') //获取openid
-    //this.openid = 'oroHZ5B455jLw_BqDmVpr7W13NLY' //获取openid
+    //this.openid = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ' //获取openid  oroHZ5B455jLw_BqDmVpr7W13NLY
     this.faceIds = JSON.parse(option.faceIds)
     var locationData = {
       latitude:'',
@@ -245,6 +248,10 @@ export default {
 		  })
     },
     getPhotos(){//照片
+      //显示加载框
+      uni.showLoading({
+        title: '加载中'
+      })
 		  var data = {
 		    faceIds:this.faceIds,//照片ID
 		    openid:this.openid,
@@ -254,6 +261,11 @@ export default {
 		  this.$request('wechatUser/pdFace/list',data).then((res)=>{
 		    if(res.code=='00'){
 		      this.previewData = res.data
+          if(this.previewData){
+            this.previewDataType = true
+          }else{
+            this.previewDataType = false
+          }
           this.previewData.forEach((item,index)=>{
             item['checkType'] = false
             if(item.sellingPrice!=null){
@@ -264,7 +276,8 @@ export default {
             item['title']=''
           })
           this.mearchLoadList()
-          
+          //隐藏加载框
+          uni.hideLoading()
 		    }else{
 		      this.$refs.uToast.show({
 		        title: res.message,
@@ -664,6 +677,14 @@ export default {
 				border-color: #2979ff !important;
 			}
 		}
+		.subject-noMore{
+			width: 100%;
+			height: 40rpx;
+			color: #666666;
+			font-size: 30rpx;
+			line-height: 40rpx;
+			text-align: center;
+		}
 	}
 
 	.album-bottom {

pages/my/order/orderList/orderList.vue

@@ -446,6 +446,7 @@ export default {
     this.getData(1)
   },
   onShow(){
+    this.pageIndex = 1
     this.getData(1)
   },
   methods: {