Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
bc5e9c60 by simon
Options

no message

1 parent 2d22b076
Inline Side-by-side
Showing 7 changed files with 27 additions and 8 deletions
...@@ -85,7 +85,7 @@ function login() { ...@@ -85,7 +85,7 @@ function login() {
85 } 85 }
86 86
87 const fetch = function ({ 87 const fetch = function ({
88 loading = true, 88 loading = false,
89 toast = true, 89 toast = true,
90 sid = true, 90 sid = true,
91 auth = true, 91 auth = true,
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </view> 16 </view>
17 </view> 17 </view>
18 <!-- 使用规则 --> 18 <!-- 使用规则 -->
19 <view class="cont-wrap use-rule"> 19 <view wx:if="{{item.commodityInfo}}" class="cont-wrap use-rule">
20 <!-- 京东E卡可在京东商城 20 <!-- 京东E卡可在京东商城
21 <span class="link">www.jd.com</span> 21 <span class="link">www.jd.com</span>
22 上购买自营商品（“自营商品”指在商品详情页明确标识为自营的商品），用户可在订单结算时输入E卡密码并使用。 --> 22 上购买自营商品（“自营商品”指在商品详情页明确标识为自营的商品），用户可在订单结算时输入E卡密码并使用。 -->
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 </view> 38 </view>
39 <view class="detail"> 39 <view class="detail">
40 <view class="t1">{{item.orderCommodityTitle}}</view> 40 <view class="t1">{{item.orderCommodityTitle}}</view>
41 <view class="t1 t2">{{item.orderCommodityPoints}}</view> 41 <view class="t1 t2">{{item.orderCommodityPoints}}积分</view>
42 <view class="t1 t3"> 42 <view class="t1 t3">
43 <span wx:if="{{item.orderStatus == 'unaudited'}}">待审核</span> 43 <span wx:if="{{item.orderStatus == 'unaudited'}}">待审核</span>
44 <span wx:if="{{item.orderStatus == 'pass'}}">已通过</span> 44 <span wx:if="{{item.orderStatus == 'pass'}}">已通过</span>
......
...@@ -43,9 +43,11 @@ Page({ ...@@ -43,9 +43,11 @@ Page({
43 } 43 }
44 }).then((result) => { 44 }).then((result) => {
45 let rankInfo = this.formatRankInfo(result, status); 45 let rankInfo = this.formatRankInfo(result, status);
46 if(rankInfo){
46 this.setData({ 47 this.setData({
47 rankInfo: rankInfo 48 rankInfo: rankInfo
48 }) 49 })
50 }
49 console.log("rankInfo 1:", rankInfo); 51 console.log("rankInfo 1:", rankInfo);
50 resolve(); 52 resolve();
51 }) 53 })
...@@ -85,6 +87,7 @@ Page({ ...@@ -85,6 +87,7 @@ Page({
85 */ 87 */
86 formatRankInfo(val, status) { 88 formatRankInfo(val, status) {
87 let rankInfo = val; 89 let rankInfo = val;
90 if(!rankInfo) return;
88 if (status == "promotion") { 91 if (status == "promotion") {
89 rankInfo.myMember.rank = rankInfo.myMember.promotionNo; 92 rankInfo.myMember.rank = rankInfo.myMember.promotionNo;
90 rankInfo.myMember.points = rankInfo.myMember.promotionPoints; 93 rankInfo.myMember.points = rankInfo.myMember.promotionPoints;
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 <!-- 省略号 --> 78 <!-- 省略号 -->
79 <view class="etc">...</view> 79 <view class="etc">...</view>
80 <!-- 我的排名 --> 80 <!-- 我的排名 -->
81 <view class="my-rank"> 81 <view class="my-rank" wx:if="{{rankInfo.myMember}}">
82 <view class="rank-item"> 82 <view class="rank-item">
83 <view class="no"> 83 <view class="no">
84 <image wx:if="{{rankInfo.myMember.rank == 1}}" class="medal" mode="aspectFit" src="../../image/icon/icon-medal.png" /> 84 <image wx:if="{{rankInfo.myMember.rank == 1}}" class="medal" mode="aspectFit" src="../../image/icon/icon-medal.png" />
......
...@@ -243,7 +243,7 @@ $contentWidth: 690px; ...@@ -243,7 +243,7 @@ $contentWidth: 690px;
243 // 签到按钮 243 // 签到按钮
244 &-btn { 244 &-btn {
245 @include btc(280px, 68px); 245 @include btc(280px, 68px);
246 margin: 42px auto 4px; 246 margin: 12px auto 4px;
247 border-radius: 34px; 247 border-radius: 34px;
248 background: #3680EB; 248 background: #3680EB;
249 font-size: 28px; 249 font-size: 28px;
...@@ -311,15 +311,30 @@ $contentWidth: 690px; ...@@ -311,15 +311,30 @@ $contentWidth: 690px;
311 311
312 &-item { 312 &-item {
313 width: 132px; 313 width: 132px;
314 position: relative;
315
316
314 317
315 .icon-wrap { 318 .icon-wrap {
319 position: relative;
316 @extend .fcc; 320 @extend .fcc;
317 height: 100px; 321 // width: 100px;
318 height: 100px; 322 height: 100px;
319 323
320 .icon { 324 .icon {
325 // width: 64px;
321 height: 64px; 326 height: 64px;
322 height: 64px; 327 }
328
329 .rpoint {
330 position: absolute;
331 width: 24px;
332 height: 24px;
333 border-radius: 24px;
334 right: 22px;
335 top: 10px;
336 background-color: #fe4b4b;
337 z-index: 1;
323 } 338 }
324 } 339 }
325 340
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 <!-- 签到区 --> 41 <!-- 签到区 -->
42 <view class="border sign "> 42 <view class="border sign ">
43 <view class="tit"> 43 <view class="tit">
44 <view class="t1">连续签到7天赢现金红包</view> 44 <view class="t1">签到7天赢红包</view>
45 <view bindtap="onsignInRecordHandler" class="t2"> 45 <view bindtap="onsignInRecordHandler" class="t2">
46 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" /> 46 <image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
47 签到记录 47 签到记录
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
94 </view> 94 </view>
95 <view bindtap="onMyMessageHandler" class="func-wrap-item"> 95 <view bindtap="onMyMessageHandler" class="func-wrap-item">
96 <view class="icon-wrap"> 96 <view class="icon-wrap">
97 <view wx:if="{{userInfo.news > 0}}" class="rpoint"></view>
97 <image class="icon" mode="aspectFit" src="../../image/icon/icon-my-message.png" /> 98 <image class="icon" mode="aspectFit" src="../../image/icon/icon-my-message.png" />
98 </view> 99 </view>
99 <view class="txt">我的消息</view> 100 <view class="txt">我的消息</view>
......