diff --git a/pages.json b/pages.json index 788cc06..1bdfd09 100644 --- a/pages.json +++ b/pages.json @@ -378,6 +378,18 @@ "group": "用户中心" } }, + { + "path": "user_vip/list", + "style": { + "navigationBarTitleText": "会员页面" + }, + "meta": { + "auth": true, + "sync": true, + "title": "会员页面", + "group": "用户中心" + } + }, { "path": "goods-collect", "style": { @@ -767,6 +779,28 @@ "title": "兑换记录", "group": "营销活动" } + }, + { + "path": "point/exchange_success", + "style": { + "navigationBarTitleText": "兑换成功" + }, + "meta": { + "sync": true, + "title": "兑换成功", + "group": "营销活动" + } + }, + { + "path": "point/exchange_detail", + "style": { + "navigationBarTitleText": "兑换详情" + }, + "meta": { + "sync": true, + "title": "兑换详情", + "group": "营销活动" + } } ] } diff --git a/pages/activity/point/exchange_detail.vue b/pages/activity/point/exchange_detail.vue new file mode 100644 index 0000000..eb659fd --- /dev/null +++ b/pages/activity/point/exchange_detail.vue @@ -0,0 +1,250 @@ + + + + + \ No newline at end of file diff --git a/pages/activity/point/exchange_list.vue b/pages/activity/point/exchange_list.vue new file mode 100644 index 0000000..637af1f --- /dev/null +++ b/pages/activity/point/exchange_list.vue @@ -0,0 +1,218 @@ + + + + + + \ No newline at end of file diff --git a/pages/activity/point/exchange_success.vue b/pages/activity/point/exchange_success.vue new file mode 100644 index 0000000..48a19c9 --- /dev/null +++ b/pages/activity/point/exchange_success.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/pages/app/sign.vue b/pages/app/sign.vue index 6200c44..043d45b 100644 --- a/pages/app/sign.vue +++ b/pages/app/sign.vue @@ -456,7 +456,8 @@ .confirm-btn { width: 220rpx; height: 70rpx; - background: linear-gradient(90deg, #ff6000, #fe832a); + // background: linear-gradient(90deg, #ff6000, #fe832a); + background: linear-gradient(90deg, #ff6000, #ff6000); box-shadow: 0 0.2em 0.5em rgba(#ff6000, 0.4); border-radius: 35rpx; font-size: 28rpx; diff --git a/pages/app/signList.vue b/pages/app/signList.vue new file mode 100644 index 0000000..66a9c6c --- /dev/null +++ b/pages/app/signList.vue @@ -0,0 +1,185 @@ + + + + + + diff --git a/pages/commission/components/account-info.vue b/pages/commission/components/account-info.vue index 302206a..5700fcd 100644 --- a/pages/commission/components/account-info.vue +++ b/pages/commission/components/account-info.vue @@ -117,7 +117,7 @@ border-radius: 12rpx 12rpx 0 0; z-index: 3; position: relative; - background: url('https://zysc.fjptzykj.com:3000/shangcheng/02ee19a89858e3b1cf0de82867fb06f3ae7f57511130d0167205a97b99b796c7.png') no-repeat; + background: url('https://zysc.fjptzykj.com:3000/shangcheng/423af1ff70d4e80ca7bd4ede17b9fe63800aaffd2e4e8b5b7584ab5bf5884996.png') no-repeat; background-size: cover; @@ -129,7 +129,7 @@ padding: 0 45rpx; .new-btn { - background: rgba(254, 104, 73); + background: rgba(178, 102, 67); border-radius: 22px; padding: 8px 0; font-size: 16px; diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue index 60d33e9..e78e57e 100644 --- a/pages/commission/components/commission-info.vue +++ b/pages/commission/components/commission-info.vue @@ -18,7 +18,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -95,7 +95,7 @@ display: flex; justify-content: center; .l { - background: rgba(254,244,237,1); + background: rgba(254,244,237); // background:url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/8e878e15d22f68e0187a953aeba31b80423b7e3fafa8e4aa9f237477ac0fd519.png') rgba(254,244,237,1); width:43%; height:85px; @@ -145,8 +145,9 @@ width: 100%; height: 580rpx; // margin: -88rpx 20rpx 0 20rpx; - // background: url('https://zysc.fjptzykj.com:3000/shangcheng/10c7d7a9afb36266f658e5f398922b835530cb350ef98cf90d4ef6f60ccc1bc1.png') no-repeat; - background: url('https://zysc.fjptzykj.com:3000/shangcheng/4bcaa2803c9cc953353d22db804b952b333e97d2a0d57266a00baf0c07379efa.png') no-repeat; + background: url('https://zysc.fjptzykj.com:3000/shangcheng/c4f941683d41701ac7f182824791ff43b5f7e70fb527b4d4d153416d6065c44f.png') no-repeat; + // background: url('https://zysc.fjptzykj.com:3000/shangcheng/4bcaa2803c9cc953353d22db804b952b333e97d2a0d57266a00baf0c07379efa.png') no-repeat; + // background:#ff3000; background-size: 100% 100%; display: flex; flex-wrap: wrap; diff --git a/pages/commission/promoter.vue b/pages/commission/promoter.vue index c731f17..bcd7c03 100644 --- a/pages/commission/promoter.vue +++ b/pages/commission/promoter.vue @@ -168,7 +168,6 @@ + .promoter-list .list .item .right .num { + margin-right: 7rpx; + } + \ No newline at end of file diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue index 9a04233..eb1ed09 100644 --- a/pages/coupon/list.vue +++ b/pages/coupon/list.vue @@ -17,9 +17,10 @@