Skip to content

U
uni-pdtravel
Commit 20336615 authored by 潘永坪's avatar 潘永坪
Browse files
Options

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

parents 0933305d 87b1d123
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
pages/album/myPhotoAlbum/myPhotoAlbum.vue
View file @ 20336615
...@@ -332,7 +332,7 @@ export default { ...@@ -332,7 +332,7 @@ export default {
tickets:1, tickets:1,
productId:this.merchantMessage[0].merchantExtendProjectId, productId:this.merchantMessage[0].merchantExtendProjectId,
orderSource:11,//指定为相册优惠券 orderSource:11,//指定为相册优惠券
merchantType:11,//指定为相册 merchantType:11,//指定为相册
} }
this.$request('wechatUser/myPage/usableCouponList',data).then((res)=>{ this.$request('wechatUser/myPage/usableCouponList',data).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
...@@ -737,6 +737,7 @@ export default { ...@@ -737,6 +737,7 @@ export default {
width: 240rpx; width: 240rpx;
height: 98rpx; height: 98rpx;
background-color: #3688FF; background-color: #3688FF;
background: linear-gradient(90deg, #ED400C 0%, #FB862C 100%);
font-size: 32rpx; font-size: 32rpx;
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
......
pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum.vue
View file @ 20336615
...@@ -464,6 +464,7 @@ export default { ...@@ -464,6 +464,7 @@ export default {
width: 240rpx; width: 240rpx;
height: 98rpx; height: 98rpx;
background-color: #3688FF; background-color: #3688FF;
background: linear-gradient(90deg, #ED400C 0%, #FB862C 100%);
font-size: 32rpx; font-size: 32rpx;
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment