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

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -332,7 +332,7 @@ export default {
         tickets:1,
         productId:this.merchantMessage[0].merchantExtendProjectId,
         orderSource:11,//指定为相册优惠券
-				merchantType:11,//指定为相册
+        merchantType:11,//指定为相册
       }
       this.$request('wechatUser/myPage/usableCouponList',data).then((res)=>{
         if(res.code=='00'){
@@ -737,6 +737,7 @@ export default {
 			width: 240rpx;
 			height: 98rpx;
 			background-color: #3688FF;
+			background: linear-gradient(90deg, #ED400C 0%, #FB862C 100%);
 			font-size: 32rpx;
 			color: #fff;
 			font-weight: bold;

pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum.vue

@@ -464,6 +464,7 @@ export default {
 			width: 240rpx;
 			height: 98rpx;
 			background-color: #3688FF;
+			background: linear-gradient(90deg, #ED400C 0%, #FB862C 100%);
 			font-size: 32rpx;
 			color: #fff;
 			font-weight: bold;