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

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -172,12 +172,12 @@ export default {
     }
   },
   onLoad(option) {
-    this.companyId = this.$commonjs.getCompanyId(option)
+    this.companyId = this.$commonjs.getCompanyId(option)||''
     //this.companyId = '6da527f930be4aa1904fe17fcb41874f'
     this.openid = uni.getStorageSync('openid') //获取openid
     this.faceIds = JSON.parse(option.faceIds)
     this.location = JSON.parse(uni.getStorageSync('location'))
-    this.merchantId = option.merchantId||''// 'z0015605022691a5945bbe463141668c'
+    this.merchantId = option.merchantId||'z0015605022691a5945bbe463141668c'// 'z0015605022691a5945bbe463141668c'
     this.obtainProvince()//获取省市区
     this.inquireMerchant()//查询所有商户
     this.getPhotos()//照片列表
@@ -347,6 +347,9 @@ export default {
           if(this.sellingPrices<0){
             this.sellingPrices=0
           }
+          if(this.originalPrices<0){
+					  this.originalPrices=0
+          }
         }else{
           this.$refs.uToast.show({
             title: res.message,
@@ -593,6 +596,17 @@ export default {
 				width: 344rpx;
 				height: 460rpx;
 			}
+			.list-image::after {
+				content: "";
+				display: block;
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				background-image: url(../static/album/backgroundImg.png);
+				background-size: cover;
+			}
 
 			.list-mask {
 				width: 344rpx;
@@ -915,5 +929,16 @@ export default {
 				border: solid 2px #fff;
 			}
 		}
+		/deep/ .u-swiper-image::after {
+			content: "";
+			display: block;
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background-image: url(../static/album/backgroundImg.png);
+			background-size: cover;
+		}
 	}
 </style>
\ No newline at end of file