0fc1db5f by simon

默认提交

1 parent 66d45eac
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 "pagePath": "pages/gift-shop/gift-shop", 56 "pagePath": "pages/gift-shop/gift-shop",
57 "iconPath": "image/tabbar/gift-bar.png", 57 "iconPath": "image/tabbar/gift-bar.png",
58 "selectedIconPath": "image/tabbar/gift-bar-selected.png", 58 "selectedIconPath": "image/tabbar/gift-bar-selected.png",
59 "text": "奖金兑换" 59 "text": "更多礼品"
60 }, 60 },
61 { 61 {
62 "pagePath": "pages/user-center/user-center", 62 "pagePath": "pages/user-center/user-center",
......
...@@ -42,8 +42,8 @@ Page({ ...@@ -42,8 +42,8 @@ Page({
42 this.hideMask(); 42 this.hideMask();
43 let options = this.data.options; 43 let options = this.data.options;
44 44
45 console.log("options:",options); 45 console.log("options:", options);
46 console.log("q:",q); 46 console.log("q:", q);
47 let q = decodeURIComponent(options.q); 47 let q = decodeURIComponent(options.q);
48 48
49 // 获取会员码 49 // 获取会员码
...@@ -88,7 +88,7 @@ Page({ ...@@ -88,7 +88,7 @@ Page({
88 if (memberCode) { 88 if (memberCode) {
89 app.globalData.tlMemberCode = memberCode; 89 app.globalData.tlMemberCode = memberCode;
90 } 90 }
91 console.log("code:",code); 91 console.log("code:", code);
92 // 如果存在扫码参数,则需要拉用户身份(未授权的情况下 要拉授权) 92 // 如果存在扫码参数,则需要拉用户身份(未授权的情况下 要拉授权)
93 this.queryMember().then((result) => { 93 this.queryMember().then((result) => {
94 let { 94 let {
...@@ -267,7 +267,7 @@ Page({ ...@@ -267,7 +267,7 @@ Page({
267 console.log("result:", result); 267 console.log("result:", result);
268 _this.queryMember().then((result) => { 268 _this.queryMember().then((result) => {
269 wx.showModal({ 269 wx.showModal({
270 content: '兑换成功', 270 content: '兑现申请已提交\r\n将在1个工作日内处理完成',
271 showCancel: false, 271 showCancel: false,
272 success(res) {} 272 success(res) {}
273 }) 273 })
......
...@@ -64,6 +64,11 @@ $contentWidth:670px; ...@@ -64,6 +64,11 @@ $contentWidth:670px;
64 font-size: 24px; 64 font-size: 24px;
65 color: rgba(255, 255, 255, 0.7); 65 color: rgba(255, 255, 255, 0.7);
66 } 66 }
67
68 &-t3 {
69 color: rgba(255, 255, 255, 1);
70 font-size: 26px;
71 }
67 } 72 }
68 } 73 }
69 74
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <view class="data-item-t1"> 16 <view class="data-item-t1">
17 {{userInfo ? filter.Fen2Yuan(userInfo.memberPoints) + '元' : '-' }} 17 {{userInfo ? filter.Fen2Yuan(userInfo.memberPoints) + '元' : '-' }}
18 </view> 18 </view>
19 <view class="data-item-t2">奖金兑换</view> 19 <view class="data-item-t2 data-item-t3">点击兑奖</view>
20 </view> 20 </view>
21 <view class="data-item" bindtap="onIntegralDetailHandler"> 21 <view class="data-item" bindtap="onIntegralDetailHandler">
22 <view class="data-item-t1">{{userInfo ? userInfo.promotionNum + '人' : '-' }}</view> 22 <view class="data-item-t1">{{userInfo ? userInfo.promotionNum + '人' : '-' }}</view>
......