diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index c279ffe..7eccfd0 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -693,6 +693,11 @@ Page({ getApp().my_warnning("支付失败", 0, th); }); - } + }, + + //--支付成功,跳转到等级卡续费页面-- + success:function () { + getApp().my_warnning("支付成功",0,this); + }, }) \ No newline at end of file diff --git a/pages/user/cardinfo/cardinfo.json b/pages/user/cardinfo/cardinfo.json index a9abbf8..3058b7f 100644 --- a/pages/user/cardinfo/cardinfo.json +++ b/pages/user/cardinfo/cardinfo.json @@ -4,5 +4,5 @@ "goods_recommend": "/components/goods_list/goods_list", "warn": "/components/long_warn/long_warn" }, - "navigationBarTitleText": "会员续费" + "navigationBarTitleText": "plus会员" } \ No newline at end of file diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml index efdc8ca..559fe51 100644 --- a/pages/user/cardinfo/cardinfo.wxml +++ b/pages/user/cardinfo/cardinfo.wxml @@ -7,26 +7,24 @@ - + - {{user_card.CardName}} - 会员将在{{filters.replace_time2(expiryDate)}}到期 + {{user_card.CardName}} + 会员将在{{filters.replace_time2(expiryDate)}}到期 立即续费 - - - - - - - 正在享受{{user_card.CardName}}会员特权 - + + + + + 正在享受{{user_card.CardName}}会员特权 + 邀请新朋友 @@ -49,14 +47,7 @@ 明细 转到余额 - - - - - - - @@ -65,15 +56,15 @@ - 开通PLUSI会员尊享礼遇 + 开通PLUS会员尊享礼遇 - PLUSI会员尊享礼遇 + PLUS会员尊享礼遇 - PLUSI会员可享以下特权 + PLUS会员可享以下特权 解锁新权益 精彩享不停 @@ -84,7 +75,7 @@ - + diff --git a/pages/user/cardinfo/cardinfo.wxss b/pages/user/cardinfo/cardinfo.wxss index c34f284..88a432c 100644 --- a/pages/user/cardinfo/cardinfo.wxss +++ b/pages/user/cardinfo/cardinfo.wxss @@ -7,14 +7,17 @@ } .MemberPlus { width: 618rpx; - height: 290rpx; - border-radius: 18rpx; + height: 285rpx; + /* border-radius: 18rpx; */ box-shadow: 0rpx 0rpx 10rpx #888; margin: 0rpx 35rpx; color: #ffa786; padding: 0rpx 31rpx; - padding-top: 60rpx; + padding-top: 40rpx; background-size: 100%; + border-top-left-radius: 18rpx; + border-top-right-radius: 18rpx; + } .renew { width: 190rpx; @@ -28,7 +31,7 @@ } .xs { - margin-top: 130rpx; + position: absolute; bottom: 30rpx; width: 91%; } .MemberPlus .privilege { width: 30rpx; @@ -46,8 +49,6 @@ height: 95rpx; background-color: rgb(255, 255, 255); z-index: 6; - position: relative; - margin-top: -15rpx; } .Invitation .Invitation_count, .Invitation_my { color: rgb(237, 189, 153); @@ -146,4 +147,8 @@ background-size: 100% 100%; background-blend-mode: lighten; transform: translateX(-280%); -} \ No newline at end of file + vertical-align: top; +} + +.h36{ height:36rpx; line-height: 36rpx;} +.h22{ height:22rpx; line-height: 22rpx;} \ No newline at end of file diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js index 969081f..123b095 100644 --- a/pages/user/plus/plus.js +++ b/pages/user/plus/plus.js @@ -129,12 +129,9 @@ Page({ getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, { success: function (e) { var userInfo = e.data.data; - if(userInfo['card_field']){ - getApp().confirmBox("您已经是plus会员"); - setTimeout(function () { + if(userInfo['card_field']){ var u_url = "/pages/user/cardinfo/cardinfo"; - wx.reLaunch({url: u_url}) - },1500) + wx.reLaunch({url: u_url}) } }, }); @@ -283,14 +280,10 @@ Page({ wx.reLaunch({url:"/pages/user/index/index"}); },1000) }, + //--支付成功,跳转到等级卡续费页面-- success:function () { - var th=this; - getApp().my_warnning("支付成功", 0, th); - setTimeout(function () { - var u_url = "/pages/user/cardinfo/cardinfo"; - wx.reLaunch({url: u_url}) - },1500) + }, //--绑定邀请码的输入-- diff --git a/pages/user/plus/plus.wxml b/pages/user/plus/plus.wxml index 4a24bee..d7c6d5b 100644 --- a/pages/user/plus/plus.wxml +++ b/pages/user/plus/plus.wxml @@ -50,13 +50,13 @@ 开通PLUSI会员尊享礼遇 - PLUSI会员尊享礼遇 + PLUS会员尊享礼遇 - PLUSI会员可享以下特权 + PLUS会员可享以下特权 解锁新权益 精彩享不停 @@ -67,7 +67,7 @@ - +