Commit a2b9e938785132edf84b5b99a599a68947b97fbe
1 parent
09d77798
plus会员页面的修改, 立即购买的修改
Showing
6 changed files
with
40 additions
and
46 deletions
pages/user/cardinfo/cardinfo.js
@@ -693,6 +693,11 @@ Page({ | @@ -693,6 +693,11 @@ Page({ | ||
693 | getApp().my_warnning("支付失败", 0, th); | 693 | getApp().my_warnning("支付失败", 0, th); |
694 | }); | 694 | }); |
695 | 695 | ||
696 | - } | 696 | + }, |
697 | + | ||
698 | + //--支付成功,跳转到等级卡续费页面-- | ||
699 | + success:function () { | ||
700 | + getApp().my_warnning("支付成功",0,this); | ||
701 | + }, | ||
697 | 702 | ||
698 | }) | 703 | }) |
699 | \ No newline at end of file | 704 | \ No newline at end of file |
pages/user/cardinfo/cardinfo.json
@@ -4,5 +4,5 @@ | @@ -4,5 +4,5 @@ | ||
4 | "goods_recommend": "/components/goods_list/goods_list", | 4 | "goods_recommend": "/components/goods_list/goods_list", |
5 | "warn": "/components/long_warn/long_warn" | 5 | "warn": "/components/long_warn/long_warn" |
6 | }, | 6 | }, |
7 | - "navigationBarTitleText": "会员续费" | 7 | + "navigationBarTitleText": "plus会员" |
8 | } | 8 | } |
9 | \ No newline at end of file | 9 | \ No newline at end of file |
pages/user/cardinfo/cardinfo.wxml
@@ -7,26 +7,24 @@ | @@ -7,26 +7,24 @@ | ||
7 | </view> | 7 | </view> |
8 | 8 | ||
9 | 9 | ||
10 | - <view class="MemberPlus"style="background-image:url('{{user_card.CardImg}}');background-size: 100% 100%;background-repead:no-repead;"> | 10 | + <view class="MemberPlus rel"style="background-image:url('{{user_card.CardImg}}');background-size: 100% 100%;background-repead:no-repead;"> |
11 | 11 | ||
12 | <view class="flex-space-between"> | 12 | <view class="flex-space-between"> |
13 | <view style="color:{{user_card.CardColor}}"> | 13 | <view style="color:{{user_card.CardColor}}"> |
14 | - <view class="fs36" style="font-weight:bold">{{user_card.CardName}}</view> | ||
15 | - <view class="fs22">会员将在{{filters.replace_time2(expiryDate)}}到期</view> | 14 | + <view class="fs36 h36" style="font-weight:bold">{{user_card.CardName}}</view> |
15 | + <view class="fs22 h22" style="margin-top:15rpx">会员将在{{filters.replace_time2(expiryDate)}}到期</view> | ||
16 | </view> | 16 | </view> |
17 | <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}}">立即续费 | 17 | <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}}">立即续费 |
18 | </view> | 18 | </view> |
19 | - | ||
20 | </view> | 19 | </view> |
21 | 20 | ||
22 | - <view class="flex-vertical-between xs fs24"> | ||
23 | - | ||
24 | - <view class="flex" style=" overflow:hidden"> | ||
25 | - <view class="Member" | ||
26 | - style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png'); filter: drop-shadow(40px 0 0 {{user_card.CardColor}});"> | ||
27 | - </view> | ||
28 | - <view style="color:{{user_card.CardColor}}">正在享受{{user_card.CardName}}会员特权 | ||
29 | - </view> | 21 | + <view class="flex-vertical-between xs fs28"> |
22 | + <view class="flex ai-center" style=" overflow:hidden"> | ||
23 | + <view class="Member" | ||
24 | + style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png'); filter: drop-shadow(40px 0 0 {{user_card.CardColor}});"> | ||
25 | + </view> | ||
26 | + <view style="color:{{user_card.CardColor}}">正在享受{{user_card.CardName}}会员特权 | ||
27 | + </view> | ||
30 | </view> | 28 | </view> |
31 | <view class="flex-vertical" bindtap="Share_pictures"> | 29 | <view class="flex-vertical" bindtap="Share_pictures"> |
32 | <view style="color:{{user_card.CardColor}}">邀请新朋友</view> | 30 | <view style="color:{{user_card.CardColor}}">邀请新朋友</view> |
@@ -49,14 +47,7 @@ | @@ -49,14 +47,7 @@ | ||
49 | <navigator url="/pages/user/Detailed/Detailed">明细</navigator> | 47 | <navigator url="/pages/user/Detailed/Detailed">明细</navigator> |
50 | </view> | 48 | </view> |
51 | <view class="Invitation_Cash" bindtap="to_user_money">转到余额</view> | 49 | <view class="Invitation_Cash" bindtap="to_user_money">转到余额</view> |
52 | - | ||
53 | </view> | 50 | </view> |
54 | - | ||
55 | - | ||
56 | - | ||
57 | - | ||
58 | - | ||
59 | - | ||
60 | </view> | 51 | </view> |
61 | 52 | ||
62 | <!-- 会员礼遇 --> | 53 | <!-- 会员礼遇 --> |
@@ -65,15 +56,15 @@ | @@ -65,15 +56,15 @@ | ||
65 | <!-- 标题 --> | 56 | <!-- 标题 --> |
66 | <view class="flex-center" style="width:100%;height:200rpx;"> | 57 | <view class="flex-center" style="width:100%;height:200rpx;"> |
67 | <view> | 58 | <view> |
68 | - <view wx:if="{{false}}" class="Courtesy_title flex-center fs36">开通PLUSI会员尊享礼遇 | 59 | + <view wx:if="{{false}}" class="Courtesy_title flex-center fs36">开通PLUS会员尊享礼遇 |
69 | </view> | 60 | </view> |
70 | - <view wx:else class="Courtesy_title flex-center fs36">PLUSI会员尊享礼遇 </view> | 61 | + <view wx:else class="Courtesy_title flex-center fs36">PLUS会员尊享礼遇 </view> |
71 | 62 | ||
72 | 63 | ||
73 | <view class="flex-center"> | 64 | <view class="flex-center"> |
74 | <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image> | 65 | <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image> |
75 | 66 | ||
76 | - <view wx:if="{{false}}" class="Courtesy_can fs24">PLUSI会员可享以下特权 | 67 | + <view wx:if="{{false}}" class="Courtesy_can fs24">PLUS会员可享以下特权 |
77 | </view> | 68 | </view> |
78 | <view wx:else class="Courtesy_can fs24">解锁新权益 精彩享不停 | 69 | <view wx:else class="Courtesy_can fs24">解锁新权益 精彩享不停 |
79 | </view> | 70 | </view> |
@@ -84,7 +75,7 @@ | @@ -84,7 +75,7 @@ | ||
84 | </view> | 75 | </view> |
85 | 76 | ||
86 | <!-- 会员权益内容 --> | 77 | <!-- 会员权益内容 --> |
87 | - <view class="Courtesy_comment"> | 78 | + <view class="Courtesy_comment" style="padding:0 20rpx"> |
88 | <view class="wxParse"> | 79 | <view class="wxParse"> |
89 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 80 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
90 | </view> | 81 | </view> |
pages/user/cardinfo/cardinfo.wxss
@@ -7,14 +7,17 @@ | @@ -7,14 +7,17 @@ | ||
7 | } | 7 | } |
8 | .MemberPlus { | 8 | .MemberPlus { |
9 | width: 618rpx; | 9 | width: 618rpx; |
10 | - height: 290rpx; | ||
11 | - border-radius: 18rpx; | 10 | + height: 285rpx; |
11 | + /* border-radius: 18rpx; */ | ||
12 | box-shadow: 0rpx 0rpx 10rpx #888; | 12 | box-shadow: 0rpx 0rpx 10rpx #888; |
13 | margin: 0rpx 35rpx; | 13 | margin: 0rpx 35rpx; |
14 | color: #ffa786; | 14 | color: #ffa786; |
15 | padding: 0rpx 31rpx; | 15 | padding: 0rpx 31rpx; |
16 | - padding-top: 60rpx; | 16 | + padding-top: 40rpx; |
17 | background-size: 100%; | 17 | background-size: 100%; |
18 | + border-top-left-radius: 18rpx; | ||
19 | + border-top-right-radius: 18rpx; | ||
20 | + | ||
18 | } | 21 | } |
19 | .renew { | 22 | .renew { |
20 | width: 190rpx; | 23 | width: 190rpx; |
@@ -28,7 +31,7 @@ | @@ -28,7 +31,7 @@ | ||
28 | 31 | ||
29 | } | 32 | } |
30 | .xs { | 33 | .xs { |
31 | - margin-top: 130rpx; | 34 | + position: absolute; bottom: 30rpx; width: 91%; |
32 | } | 35 | } |
33 | .MemberPlus .privilege { | 36 | .MemberPlus .privilege { |
34 | width: 30rpx; | 37 | width: 30rpx; |
@@ -46,8 +49,6 @@ | @@ -46,8 +49,6 @@ | ||
46 | height: 95rpx; | 49 | height: 95rpx; |
47 | background-color: rgb(255, 255, 255); | 50 | background-color: rgb(255, 255, 255); |
48 | z-index: 6; | 51 | z-index: 6; |
49 | - position: relative; | ||
50 | - margin-top: -15rpx; | ||
51 | } | 52 | } |
52 | .Invitation .Invitation_count, .Invitation_my { | 53 | .Invitation .Invitation_count, .Invitation_my { |
53 | color: rgb(237, 189, 153); | 54 | color: rgb(237, 189, 153); |
@@ -146,4 +147,8 @@ | @@ -146,4 +147,8 @@ | ||
146 | background-size: 100% 100%; | 147 | background-size: 100% 100%; |
147 | background-blend-mode: lighten; | 148 | background-blend-mode: lighten; |
148 | transform: translateX(-280%); | 149 | transform: translateX(-280%); |
149 | -} | ||
150 | \ No newline at end of file | 150 | \ No newline at end of file |
151 | + vertical-align: top; | ||
152 | +} | ||
153 | + | ||
154 | +.h36{ height:36rpx; line-height: 36rpx;} | ||
155 | +.h22{ height:22rpx; line-height: 22rpx;} | ||
151 | \ No newline at end of file | 156 | \ No newline at end of file |
pages/user/plus/plus.js
@@ -129,12 +129,9 @@ Page({ | @@ -129,12 +129,9 @@ Page({ | ||
129 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, { | 129 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, { |
130 | success: function (e) { | 130 | success: function (e) { |
131 | var userInfo = e.data.data; | 131 | var userInfo = e.data.data; |
132 | - if(userInfo['card_field']){ | ||
133 | - getApp().confirmBox("您已经是plus会员"); | ||
134 | - setTimeout(function () { | 132 | + if(userInfo['card_field']){ |
135 | var u_url = "/pages/user/cardinfo/cardinfo"; | 133 | var u_url = "/pages/user/cardinfo/cardinfo"; |
136 | - wx.reLaunch({url: u_url}) | ||
137 | - },1500) | 134 | + wx.reLaunch({url: u_url}) |
138 | } | 135 | } |
139 | }, | 136 | }, |
140 | }); | 137 | }); |
@@ -283,14 +280,10 @@ Page({ | @@ -283,14 +280,10 @@ Page({ | ||
283 | wx.reLaunch({url:"/pages/user/index/index"}); | 280 | wx.reLaunch({url:"/pages/user/index/index"}); |
284 | },1000) | 281 | },1000) |
285 | }, | 282 | }, |
283 | + | ||
286 | //--支付成功,跳转到等级卡续费页面-- | 284 | //--支付成功,跳转到等级卡续费页面-- |
287 | success:function () { | 285 | success:function () { |
288 | - var th=this; | ||
289 | - getApp().my_warnning("支付成功", 0, th); | ||
290 | - setTimeout(function () { | ||
291 | - var u_url = "/pages/user/cardinfo/cardinfo"; | ||
292 | - wx.reLaunch({url: u_url}) | ||
293 | - },1500) | 286 | + |
294 | }, | 287 | }, |
295 | 288 | ||
296 | //--绑定邀请码的输入-- | 289 | //--绑定邀请码的输入-- |
pages/user/plus/plus.wxml
@@ -50,13 +50,13 @@ | @@ -50,13 +50,13 @@ | ||
50 | <view> | 50 | <view> |
51 | <view wx:if="{{false}}" class="Courtesy_title flex-center fs36">开通PLUSI会员尊享礼遇 | 51 | <view wx:if="{{false}}" class="Courtesy_title flex-center fs36">开通PLUSI会员尊享礼遇 |
52 | </view> | 52 | </view> |
53 | - <view wx:else class="Courtesy_title flex-center fs36">PLUSI会员尊享礼遇 </view> | 53 | + <view wx:else class="Courtesy_title flex-center fs36">PLUS会员尊享礼遇 </view> |
54 | 54 | ||
55 | 55 | ||
56 | <view class="flex-center"> | 56 | <view class="flex-center"> |
57 | <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image> | 57 | <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image> |
58 | 58 | ||
59 | - <view wx:if="{{false}}" class="Courtesy_can fs24">PLUSI会员可享以下特权 | 59 | + <view wx:if="{{false}}" class="Courtesy_can fs24">PLUS会员可享以下特权 |
60 | </view> | 60 | </view> |
61 | <view wx:else class="Courtesy_can fs24">解锁新权益 精彩享不停 | 61 | <view wx:else class="Courtesy_can fs24">解锁新权益 精彩享不停 |
62 | </view> | 62 | </view> |
@@ -67,7 +67,7 @@ | @@ -67,7 +67,7 @@ | ||
67 | </view> | 67 | </view> |
68 | 68 | ||
69 | <!-- 会员权益内容 --> | 69 | <!-- 会员权益内容 --> |
70 | - <view class="Courtesy_comment " wx:if="{{is_card_rule!=null&&is_card_rule!=''}}"> | 70 | + <view class="Courtesy_comment " style="padding:0 20rpx" wx:if="{{is_card_rule!=null&&is_card_rule!=''}}"> |
71 | <view class="wxParse"> | 71 | <view class="wxParse"> |
72 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 72 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
73 | </view> | 73 | </view> |