Commit 922fa2211bac9d26e2d377e0d513fafff3d217b4

Authored by 后端开发-许程
1 parent 7ce23aa4

分享 及购买卡的修改

pages/user/Detailed/Detailed.js
@@ -186,6 +186,13 @@ Page({ @@ -186,6 +186,13 @@ Page({
186 var user=app.globalData.userInfo; 186 var user=app.globalData.userInfo;
187 var unit = th.data.screenWidth / 750 * 1.35; 187 var unit = th.data.screenWidth / 750 * 1.35;
188 var scene = getApp().globalData.user_id; 188 var scene = getApp().globalData.user_id;
  189 + var nickname = user.nickname;
  190 +
  191 + if (nickname.length>3){
  192 + nickname=nickname.substr(0, 3);
  193 +
  194 + nickname = nickname+"..."
  195 + }
189 196
190 //---二微码--- 197 //---二微码---
191 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + 198 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
@@ -203,13 +210,13 @@ Page({ @@ -203,13 +210,13 @@ Page({
203 ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 930 * unit); 210 ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 930 * unit);
204 ctx.setFontSize(26 * unit); 211 ctx.setFontSize(26 * unit);
205 ctx.setFillStyle("rgb(0,0,0)"); 212 ctx.setFillStyle("rgb(0,0,0)");
206 - ctx.fillText(user.nickname, 155 * unit, 75 * unit, 200 * unit); 213 + ctx.fillText(nickname, 155 * unit, 75 * unit, 200 * unit);
207 214
208 var tj_path = "../../../images/share/q_tj.png"; 215 var tj_path = "../../../images/share/q_tj.png";
209 - ctx.drawImage(tj_path, 385 * unit, 45 * unit, 90 * unit, 30 * unit); 216 + ctx.drawImage(tj_path, 255 * unit, 50 * unit, 90 * unit, 30 * unit);
210 ctx.setFontSize(18 * unit); 217 ctx.setFontSize(18 * unit);
211 ctx.setFillStyle("rgb(255,255,255)"); 218 ctx.setFillStyle("rgb(255,255,255)");
212 - ctx.fillText("强烈推荐", 394 * unit, 65 * unit); 219 + ctx.fillText("强烈推荐", 265 * unit, 72 * unit);
213 220
214 ctx.setStrokeStyle("rgb(255,255,255)"); 221 ctx.setStrokeStyle("rgb(255,255,255)");
215 ctx.setLineDash([5 * unit, 5 * unit], 5 * unit); 222 ctx.setLineDash([5 * unit, 5 * unit], 5 * unit);
@@ -232,13 +239,13 @@ Page({ @@ -232,13 +239,13 @@ Page({
232 ctx.fillText(big_card.CardName, 80 * unit, 215 * unit); 239 ctx.fillText(big_card.CardName, 80 * unit, 215 * unit);
233 ctx.setFontSize(18 * unit); 240 ctx.setFontSize(18 * unit);
234 ctx.setFillStyle('rgb(218,194,169)'); 241 ctx.setFillStyle('rgb(218,194,169)');
235 - ctx.fillText("开通会员年卡仅" + big_card.CardFee+"元", 80 * unit, 240 * unit); 242 + ctx.fillText("开通plus会员仅" + big_card.CardFee+"元", 80 * unit, 240 * unit);
236 243
237 - ctx.drawImage(privilege_o, 80 * unit, 343 * unit, 20 * unit, 20 * unit); 244 + //zz ctx.drawImage(privilege_o, 80 * unit, 343 * unit, 20 * unit, 20 * unit);
238 245
239 ctx.setFontSize(14 * unit); 246 ctx.setFontSize(14 * unit);
240 ctx.setFillStyle('rgb(218,194,169)'); 247 ctx.setFillStyle('rgb(218,194,169)');
241 - ctx.fillText("根据大家购买数据,您成为超级会员预计可省¥3031元", 105 * unit, 360 * unit); 248 + ctx.fillText("按去年用户消费计算,开卡后一年预计省¥3031", 85 * unit, 360 * unit);
242 249
243 ctx.rect(70 * unit, 425 * unit, 182 * unit, 1 * unit); 250 ctx.rect(70 * unit, 425 * unit, 182 * unit, 1 * unit);
244 ctx.setFillStyle('rgb(218,194,169)'); 251 ctx.setFillStyle('rgb(218,194,169)');
pages/user/cardinfo/cardinfo.js
1 var t = getApp(), 1 var t = getApp(),
2 a = t.request, 2 a = t.request,
3 o = t.globalData.setting, 3 o = t.globalData.setting,
4 - os = o, 4 + os = o,
5 i = require("../../../utils/util.js"), 5 i = require("../../../utils/util.js"),
6 ut = i, 6 ut = i,
7 s = require("../../../utils/common.js"),t_pay = require("../../../utils/pay2.js"), 7 s = require("../../../utils/common.js"),t_pay = require("../../../utils/pay2.js"),
@@ -294,6 +294,13 @@ Page({ @@ -294,6 +294,13 @@ Page({
294 var img_Identification = th.data.img_Identification;//会员标识 294 var img_Identification = th.data.img_Identification;//会员标识
295 var privilege_o = th.data.privilege_o;//勋章图片 295 var privilege_o = th.data.privilege_o;//勋章图片
296 var img_square=th.data.img_square; 296 var img_square=th.data.img_square;
  297 + var nickname = user.nickname;
  298 +
  299 + if (nickname.length > 3) {
  300 + nickname = nickname.substr(0, 3);
  301 +
  302 + nickname = nickname + "..."
  303 + }
297 304
298 var app = getApp(); 305 var app = getApp();
299 var unit = th.data.screenWidth / 750 * 1.35; 306 var unit = th.data.screenWidth / 750 * 1.35;
@@ -319,13 +326,13 @@ Page({ @@ -319,13 +326,13 @@ Page({
319 ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 930 * unit); 326 ctx.drawImage("../../../images/share/mackground.png", 0, 0, 554 * unit, 930 * unit);
320 ctx.setFontSize(26 * unit); 327 ctx.setFontSize(26 * unit);
321 ctx.setFillStyle("rgb(0,0,0)"); 328 ctx.setFillStyle("rgb(0,0,0)");
322 - ctx.fillText(user.nickname, 155 * unit, 75 * unit, 200 * unit); 329 + ctx.fillText(nickname, 155 * unit, 75 * unit, 200 * unit);
323 330
324 var tj_path = "../../../images/share/q_tj.png"; 331 var tj_path = "../../../images/share/q_tj.png";
325 - ctx.drawImage(tj_path, 385 * unit, 45 * unit, 90 * unit, 30 * unit); 332 + ctx.drawImage(tj_path, 255 * unit, 50 * unit, 90 * unit, 30 * unit);
326 ctx.setFontSize(18 * unit); 333 ctx.setFontSize(18 * unit);
327 ctx.setFillStyle("rgb(255,255,255)"); 334 ctx.setFillStyle("rgb(255,255,255)");
328 - ctx.fillText("强烈推荐", 394 * unit, 65 * unit); 335 + ctx.fillText("强烈推荐", 265 * unit, 72 * unit);
329 336
330 ctx.setStrokeStyle("rgb(255,255,255)"); 337 ctx.setStrokeStyle("rgb(255,255,255)");
331 ctx.setLineDash([5 * unit, 5 * unit], 5 * unit); 338 ctx.setLineDash([5 * unit, 5 * unit], 5 * unit);
@@ -387,19 +394,19 @@ Page({ @@ -387,19 +394,19 @@ Page({
387 ctx.fillText(big_card.CardName, 80 * unit, 215 * unit); 394 ctx.fillText(big_card.CardName, 80 * unit, 215 * unit);
388 ctx.setFontSize(18 * unit); 395 ctx.setFontSize(18 * unit);
389 ctx.setFillStyle('rgb(218,194,169)'); 396 ctx.setFillStyle('rgb(218,194,169)');
390 - ctx.fillText("开通会员年卡仅" + big_card.CardFee+"元", 80 * unit, 240 * unit); 397 + ctx.fillText("开通plus会员仅" + big_card.CardFee+"元", 80 * unit, 240 * unit);
391 398
392 - ctx.drawImage(privilege_o, 80 * unit, 343 * unit, 20 * unit, 20 * unit); 399 + // zzctx.drawImage(privilege_o, 80 * unit, 343 * unit, 20 * unit, 20 * unit);
393 400
394 ctx.setFontSize(14 * unit); 401 ctx.setFontSize(14 * unit);
395 ctx.setFillStyle('rgb(218,194,169)'); 402 ctx.setFillStyle('rgb(218,194,169)');
396 - ctx.fillText("根据大家购买数据,您成为超级会员预计可省¥3031元", 105 * unit, 360 * unit); 403 + ctx.fillText("按去年用户消费计算,开卡后一年预计省¥3031",85 * unit, 360 * unit);
397 404
398 ctx.rect(70 * unit, 425 * unit, 182 * unit, 1 * unit); 405 ctx.rect(70 * unit, 425 * unit, 182 * unit, 1 * unit);
399 ctx.setFillStyle('rgb(218,194,169)'); 406 ctx.setFillStyle('rgb(218,194,169)');
400 ctx.fill(); 407 ctx.fill();
401 408
402 - ctx.drawImage(img_square, 267 * unit, 420 * unit, 13 * unit, 13 * unit); 409 + ctx.drawImage(img_square, 267 * unit, 420 * unit, 13 * unit, 13 * unit);
403 410
404 ctx.beginPath(); 411 ctx.beginPath();
405 ctx.rect(295 * unit, 425 * unit, 182 * unit, 1 * unit); 412 ctx.rect(295 * unit, 425 * unit, 182 * unit, 1 * unit);
pages/user/cardinfo/cardinfo.wxml
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <view wx:else style="color:{{user_card.CardColor}}">享受更低价格,请续费哦</view> 27 <view wx:else style="color:{{user_card.CardColor}}">享受更低价格,请续费哦</view>
28 </view> 28 </view>
29 <view wx:if="{{!is_guoqi}}" class="flex-vertical" bindtap="Share_pictures"> 29 <view wx:if="{{!is_guoqi}}" class="flex-vertical" bindtap="Share_pictures">
30 - <view style="color:{{user_card.CardColor}};border-bottom:{{user_card.CardColor}}">邀请新朋友</view> 30 + <view style="color:{{user_card.CardColor}};border-bottom:3rpx solid {{user_card.CardColor}}">邀请新朋友</view>
31 31
32 <view style="overflow: hidden; margin-left: 10rpx;"> 32 <view style="overflow: hidden; margin-left: 10rpx;">
33 33
pages/user/plus/plus.wxml
@@ -20,15 +20,15 @@ @@ -20,15 +20,15 @@
20 <view class="fs36">{{item.CardName}}</view> 20 <view class="fs36">{{item.CardName}}</view>
21 <view class="fs24 Membership_remarks">开通会员年卡仅{{item.CardFee}}元</view> 21 <view class="fs24 Membership_remarks">开通会员年卡仅{{item.CardFee}}元</view>
22 </view> 22 </view>
23 - <view class="Opening fs24 xc-black" data-ind="{{index}}" style="background:{{item.CardColor}}" bindtap="Opening">立即开通 23 + <view class="Opening fs28 xc-black" data-ind="{{index}}" style="background:{{item.CardColor}}" bindtap="Opening">立即购买
24 </view> 24 </view>
25 25
26 </view> 26 </view>
27 27
28 - <view class="flex-vertical-between consumption"> 28 + <view class="flex-vertical-between consumption" style="height: 40rpx;line-height:40rpx ">
29 29
30 <view class="flex-vertical fs24" style="overflow:hidden"> 30 <view class="flex-vertical fs24" style="overflow:hidden">
31 - <!-- <image class="Member" src="{{url}}/miniapp/images/plus/privilege_o.png" style="filter:drop-shadow( 20rpx 0 0px {{item.CardColor}});"></image> --> 31 +
32 <view class="Member"style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png');filter: drop-shadow( 40rpx 0rpx 0rpx {{item.CardColor}});"></view> 32 <view class="Member"style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png');filter: drop-shadow( 40rpx 0rpx 0rpx {{item.CardColor}});"></view>
33 <view style="margin-left:5rpx;white-space: nowrap;">按去年用户消费计算,开卡后一年预计省¥{{item.free}}元 33 <view style="margin-left:5rpx;white-space: nowrap;">按去年用户消费计算,开卡后一年预计省¥{{item.free}}元
34 </view> 34 </view>
@@ -48,17 +48,16 @@ @@ -48,17 +48,16 @@
48 <!-- 标题 --> 48 <!-- 标题 -->
49 <view class="flex-center" style="width:100%;height:200rpx;"> 49 <view class="flex-center" style="width:100%;height:200rpx;">
50 <view> 50 <view>
51 - <view wx:if="{{false}}" class="Courtesy_title flex-center fs36">开通PLUSI会员尊享礼遇 51 + <view class="Courtesy_title flex-center fs36">开通PLUSI会员尊享礼遇
52 </view> 52 </view>
53 - <view wx:else class="Courtesy_title flex-center fs36">PLUS会员尊享礼遇 </view> 53 +
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">PLUS会员可享以下特权  
60 - </view>  
61 - <view wx:else class="Courtesy_can fs24">解锁新权益 精彩享不停 59 +
  60 + <view class="Courtesy_can fs24">PLUS会员可享受以下特权
62 </view> 61 </view>
63 62
64 <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image> 63 <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
pages/user/plus/plus.wxss
@@ -163,19 +163,16 @@ swiper { @@ -163,19 +163,16 @@ swiper {
163 height: 30rpx; 163 height: 30rpx;
164 margin-right: 5rpx; 164 margin-right: 5rpx;
165 background-size: 100% 100%; 165 background-size: 100% 100%;
166 - background-blend-mode: lighten;  
167 transform: translateX(-130%); 166 transform: translateX(-130%);
168 - vertical-align: top;  
169 -  
170 167
171 } 168 }
172 169
173 .Membership .Opening { 170 .Membership .Opening {
174 width: 160rpx; 171 width: 160rpx;
175 - height: 45rpx;  
176 - border-radius: 20rpx; 172 + height: 50rpx;
  173 + line-height: 50rpx;
  174 + border-radius: 30rpx;
177 background-color: rgb(237, 189, 150); 175 background-color: rgb(237, 189, 150);
178 - line-height: 45rpx;  
179 text-align: center; 176 text-align: center;
180 margin-top: 2rpx; 177 margin-top: 2rpx;
181 color: #666 178 color: #666
@@ -212,7 +209,7 @@ swiper { @@ -212,7 +209,7 @@ swiper {
212 } 209 }
213 210
214 .consumption { 211 .consumption {
215 - margin-top: 95rpx; 212 + margin-top: 88rpx;
216 font-size: 18rpx; 213 font-size: 18rpx;
217 } 214 }
218 215