Skip to content

dev / marubi-wish-list-mp

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

no message

1 parent 4f63187f
Inline Side-by-side
Showing 18 changed files with 195 additions and 43 deletions
...@@ -6,7 +6,7 @@ Component({ ...@@ -6,7 +6,7 @@ Component({
6 // 这里定义了innerText属性，属性值可以在组件使用时指定 6 // 这里定义了innerText属性，属性值可以在组件使用时指定
7 innerText: { 7 innerText: {
8 type: String, 8 type: String,
9 value: 'default value', 9 value: '这里空空如也~',
10 }, 10 },
11 emptyVisible: { 11 emptyVisible: {
12 type: Boolean, 12 type: Boolean,
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <view class="empty-tips"> 2 <view class="empty-tips">
3 <view class="tips"> 3 <view class="tips">
4 <span class="iconfont iconempty"></span> 4 <span class="iconfont iconempty"></span>
5 <view class="tips">这里空空如也~</view> 5 <view ></view>
6 <text class="tips">{{innerText}}</text>
6 </view> 7 </view>
7 </view> 8 </view>
......
...@@ -35,7 +35,6 @@ Component({ ...@@ -35,7 +35,6 @@ Component({
35 }, 35 },
36 /** 36 /**
37 * 提交礼品领取方式 37 * 提交礼品领取方式
38
39 */ 38 */
40 queryWishbillAcceptTypeSubmit(acceptType) { 39 queryWishbillAcceptTypeSubmit(acceptType) {
41 return new Promise((resolve, reject) => { 40 return new Promise((resolve, reject) => {
...@@ -47,7 +46,22 @@ Component({ ...@@ -47,7 +46,22 @@ Component({
47 acceptType: acceptType 46 acceptType: acceptType
48 } 47 }
49 }).then((result) => { 48 }).then((result) => {
50 resolve(result) 49
50 // 再查看奖品
51 app.post({
52 url: app.api.wishbillGiftQuery,
53 data: {
54 instanceCode: wishInfo.instanceCode
55 }
56 }).then((result) => {
57 let curData = app.globalData.giftData
58 curData = Object.assign(curData, result);
59 app.globalData.giftData = curData;
60 console.log("app.globalData.giftData 333:", app.globalData.giftData);
61 console.log(JSON.stringify(app.globalData.giftData));
62 resolve(result)
63 })
64
51 }) 65 })
52 }); 66 });
53 }, 67 },
...@@ -55,28 +69,20 @@ Component({ ...@@ -55,28 +69,20 @@ Component({
55 // 自提 69 // 自提
56 toSelfLiftHandler() { 70 toSelfLiftHandler() {
57 this.queryWishbillAcceptTypeSubmit(2).then((result) => { 71 this.queryWishbillAcceptTypeSubmit(2).then((result) => {
58 console.log("prize-self-result:", result);
59 let wishInfo = this.properties.wishInfo; 72 let wishInfo = this.properties.wishInfo;
60 let query = Object.assign(wishInfo, result);
61 console.log("prize-self-query:", query);
62 this.hideMask(); 73 this.hideMask();
63 app.router.push({ 74 app.router.push({
64 path: "prizeDetail", 75 path: "prizeDetail",
65 query: query
66 }) 76 })
67 }) 77 })
68 }, 78 },
69 // 邮寄 79 // 邮寄
70 toUserTableHandler() { 80 toUserTableHandler() {
71 this.queryWishbillAcceptTypeSubmit(1).then((result) => { 81 this.queryWishbillAcceptTypeSubmit(1).then((result) => {
72 console.log("prize-table-result:", result);
73 let wishInfo = this.properties.wishInfo; 82 let wishInfo = this.properties.wishInfo;
74 let query = Object.assign(wishInfo, result);
75 console.log("prize-table-query:", query);
76 this.hideMask(); 83 this.hideMask();
77 app.router.push({ 84 app.router.push({
78 path: "userTable", 85 path: "userTable",
79 query: query
80 }) 86 })
81 }) 87 })
82 }, 88 },
......
1 <view class="comp-item"> 1 <view class="comp-item">
2 <image class="notice" mode="widthFix" src="../../image/oss/coupon-detail/cd-c3.png?ver=1" /> 2 <image class="notice" mode="widthFix" src="../../image/oss/coupon-detail/cd-c3.png?ver=2" />
3 </view> 3 </view>
......
...@@ -183,6 +183,117 @@ let productMap = { ...@@ -183,6 +183,117 @@ let productMap = {
183 } 183 }
184 184
185 185
186 var ttttt = {
187 "prizeDefineCode": "P000000000000000000000000000008",
188 "price": "398",
189 "commodityNo": "11047004",
190 "instanceCode": "e5e59a7aa9da46a2b2359ec2f85636b9",
191 "accessStatus": 2,
192 "prizeName": "丸美纯色之恋光透精华液30ml",
193 "prizePic": "",
194 "initialElasticValue": 98,
195 "conditionElasticValue": 3980,
196 "elasticValue": 8898,
197 "storeRemain": 149,
198 "name": "丸美纯色之恋光透精华液30ml",
199 "tag": 2,
200 "sence": 1,
201 "point": {
202 "left": 210,
203 "top": 400
204 },
205 "tips": {
206 "type": "top-left",
207 "point": {
208 "fixLeft": -188,
209 "fixTop": -314
210 }
211 },
212 "progress": 100,
213 "progressLeft": 169.00000000000003,
214 "status": 1,
215 "order": {
216 "coupon": {
217 "couponId": "20839",
218 "couponCode": "RLLA1BDJ",
219 "rule": "RLLA1BDJ",
220 "startDate": 1565953849000,
221 "endDate": 1568563199000,
222 "type": 4,
223 "name": "眼部护理体验券-7月24日",
224 "state": 0
225 },
226 "status": 1,
227 "orderSn": "MW201908161910471000012",
228 "storeName": "",
229 "storeAddress": "",
230 "latitude": 0,
231 "longitude": 0,
232 "instanceCode": "e5e59a7aa9da46a2b2359ec2f85636b9",
233 "storeCode": "",
234 "acceptType": 2,
235 "prizeName": "丸美纯色之恋光透精华液30ml",
236 "commodityNo": "11047004"
237 },
238 "coupon": null
239 }
240
241 var qqq = {
242 "prizeDefineCode": "P000000000000000000000000000008",
243 "price": "398",
244 "commodityNo": "11047004",
245 "instanceCode": "d2ce21c064574899932b7747737c1493",
246 "accessStatus": 1,
247 "prizeName": "丸美纯色之恋光透精华液30ml",
248 "prizePic": "",
249 "initialElasticValue": 88,
250 "conditionElasticValue": 3980,
251 "elasticValue": 9988,
252 "storeRemain": 149,
253 "name": "丸美纯色之恋光透精华液30ml",
254 "tag": 2,
255 "sence": 1,
256 "point": {
257 "left": 210,
258 "top": 400
259 },
260 "tips": {
261 "type": "top-left",
262 "point": {
263 "fixLeft": -188,
264 "fixTop": -314
265 }
266 },
267 "progress": 100,
268 "progressLeft": 169.00000000000003,
269 "status": 1,
270 "order": {
271 "coupon": {
272 "couponId": "20839",
273 "couponCode": "RLL81B9M",
274 "rule": "RLL81B9M",
275 "startDate": 1565955185000,
276 "endDate": 1568563199000,
277 "type": 4,
278 "name": "眼部护理体验券-7月24日",
279 "state": 0
280 },
281 "status": 1,
282 "orderSn": "MW201908161933021000015",
283 "storeName": "",
284 "storeAddress": "",
285 "latitude": 0,
286 "longitude": 0,
287 "instanceCode": "d2ce21c064574899932b7747737c1493",
288 "storeCode": "",
289 "acceptType": 2,
290 "prizeName": "丸美纯色之恋光透精华液30ml",
291 "commodityNo": "11047004"
292 },
293 "coupon": null
294 }
295
296
186 module.exports = { 297 module.exports = {
187 productMap: productMap 298 productMap: productMap
188 } 299 }
......
...@@ -13,7 +13,6 @@ Page({ ...@@ -13,7 +13,6 @@ Page({
13 }) 13 })
14 }, 14 },
15 onLoad(options) { 15 onLoad(options) {
16
17 let sessionId = app.store.getItem('sessionId'); 16 let sessionId = app.store.getItem('sessionId');
18 if (sessionId) { 17 if (sessionId) {
19 app.queryIndex({ 18 app.queryIndex({
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 position: absolute; 14 position: absolute;
15 width: 750px; 15 width: 750px;
16 height: 1303px; 16 height: 1303px;
17 top: -130px; 17 // top: -130px;
18 } 18 }
19 } 19 }
20 20
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 position: absolute; 25 position: absolute;
26 width: 160px; 26 width: 160px;
27 height: 192px; 27 height: 192px;
28 top: 0; 28 top: -100px;
29 left: 0; 29 left: 0;
30 } 30 }
31 31
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 40
41 .main { 41 .main {
42 .top-space { 42 .top-space {
43 height: 1042px; 43 height: 1122px;
44 } 44 }
45 45
46 .content { 46 .content {
......
1 <view class="page"> 1 <view class="page">
2 <view class="app__bgc bgc"> 2 <view class="app__bgc bgc">
3 <image src="../../image/oss/index/index-c1.png" mode="scaleToFill" /> 3 <image src="../../image/oss/index/index-c1.png?ver=1" mode="scaleToFill" />
4 </view> 4 </view>
5 <view class="app__bg bg"> 5 <view class="app__bg bg">
6 <image src="../../image/oss/index/index-c2.png" mode="scaleToFill" /> 6 <image src="../../image/oss/index/index-c2.png?ver=1" mode="scaleToFill" />
7 </view> 7 </view>
8 <view class="decoration"> 8 <view class="decoration">
9 <image class="d1" src="../../image/oss/index/index-c4.png" mode="widthFix" /> 9 <image class="d1" src="../../image/oss/index/index-c4.png" mode="widthFix" />
......
...@@ -33,7 +33,7 @@ Page({ ...@@ -33,7 +33,7 @@ Page({
33 }).then((result) => { 33 }).then((result) => {
34 console.log("result:", result); 34 console.log("result:", result);
35 wx.showLoading({ 35 wx.showLoading({
36 title: '海报生成中', 36 title: '海报在修图中···”',
37 }); 37 });
38 this.initData(); 38 this.initData();
39 }) 39 })
......
1
2 import { 1 import {
3 getBindtapData, 2 getBindtapData,
4 pxToRpx, 3 pxToRpx,
...@@ -44,7 +43,7 @@ Page({ ...@@ -44,7 +43,7 @@ Page({
44 let couponInfo = wishInfo.coupon; 43 let couponInfo = wishInfo.coupon;
45 44
46 // 设置二维码 45 // 设置二维码
47 let qrSize = this.setCanvasSize(300); 46 let qrSize = this.setCanvasSize(400);
48 console.log("couponInfo:", couponInfo); 47 console.log("couponInfo:", couponInfo);
49 let codeContent = couponInfo.couponCode || ''; 48 let codeContent = couponInfo.couponCode || '';
50 this.createQrCode(codeContent, 'qrcanvas', qrSize.w, qrSize.h); 49 this.createQrCode(codeContent, 'qrcanvas', qrSize.w, qrSize.h);
...@@ -229,10 +228,11 @@ Page({ ...@@ -229,10 +228,11 @@ Page({
229 case "_evt_submit_store_complete": 228 case "_evt_submit_store_complete":
230 // 刷新状态 229 // 刷新状态
231 this.hideMask(); 230 this.hideMask();
231
232 app.post({ 232 app.post({
233 url: app.api.wishbillGiftQuery, 233 url: app.api.wishbillGiftQuery,
234 data: { 234 data: {
235 instanceCode: curData.instanceCode 235 instanceCode: this.data.wishInfo.instanceCode
236 } 236 }
237 }).then((result) => { 237 }).then((result) => {
238 238
......
...@@ -81,18 +81,18 @@ ...@@ -81,18 +81,18 @@
81 81
82 // 二维码 82 // 二维码
83 .qrcode { 83 .qrcode {
84 width: 300px; 84 width: 400px;
85 height: 300px; 85 height: 400px;
86 margin: 0 auto; 86 margin: -28px auto -30px;
87 87
88 image { 88 image {
89 width: 300px; 89 width: 400px;
90 height: 300px; 90 height: 400px;
91 } 91 }
92 92
93 canvas { 93 canvas {
94 width: 300px; 94 width: 400px;
95 height: 300px; 95 height: 400px;
96 } 96 }
97 } 97 }
98 98
...@@ -182,8 +182,10 @@ ...@@ -182,8 +182,10 @@
182 182
183 .top { 183 .top {
184 display: flex; 184 display: flex;
185 margin: 0 auto 36px; 185 margin: 0 auto 0;
186 justify-content: center; 186 justify-content: center;
187 position: relative;
188 z-index: 11;
187 } 189 }
188 190
189 .display { 191 .display {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <image class="prod" mode="aspectFit" src="../../image/prize/prize-1.png" /> 19 <image class="prod" mode="aspectFit" src="../../image/prize/prize-1.png" />
20 </view> 20 </view>
21 <view class="info"> 21 <view class="info">
22 <view class="name">{{couponInfo.name}}</view> 22 <view class="name">{{wishInfo.prizeName}}</view>
23 <view class="c1">手机号：{{userInfo.mobile}}</view> 23 <view class="c1">手机号：{{userInfo.mobile}}</view>
24 <view class="c1">派券日期：{{couponInfo.startDateStr}}</view> 24 <view class="c1">派券日期：{{couponInfo.startDateStr}}</view>
25 <view class="c1">有效日期：{{couponInfo.endDateStr}}</view> 25 <view class="c1">有效日期：{{couponInfo.endDateStr}}</view>
......
...@@ -218,14 +218,22 @@ ...@@ -218,14 +218,22 @@
218 218
219 .empty { 219 .empty {
220 text-align: center; 220 text-align: center;
221 // padding-top: 80px; 221 padding-top: 260px;
222 font-size: 28px;
223 color: #999999;
224
225 .iconfont {
226 font-size: 100px;
227 }
222 228
223 .logo { 229 .logo {
224 width: 140px; 230 width: 140px;
225 height: 140px; 231 height: 140px;
226 } 232 }
227 .tips{ 233
228 color: #333333; 234 .tips {
235
236 margin-top: 24px;
229 } 237 }
230 } 238 }
231 239
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 </view> 55 </view>
56 </view> 56 </view>
57 <!-- 下方排行榜 --> 57 <!-- 下方排行榜 -->
58 <view wx:if="{{downRank.length > 2}}" class="rank"> 58 <view wx:if="{{downRank.length > 0}}" class="rank">
59 <view wx:for="{{downRank}}" wx:key="{{index}}" class="rank-item {{downRank.length-1 == index?'last':''}}"> 59 <view wx:for="{{downRank}}" wx:key="{{index}}" class="rank-item {{downRank.length-1 == index?'last':''}}">
60 <view class="no">NO.{{item.no}}</view> 60 <view class="no">NO.{{item.no}}</view>
61 <view class="portrait"> 61 <view class="portrait">
...@@ -68,8 +68,9 @@ ...@@ -68,8 +68,9 @@
68 <view wx:else class="rank"> 68 <view wx:else class="rank">
69 <view class="empty"> 69 <view class="empty">
70 <!-- <image class="logo" src="../../image/logo.png" mode="aspectFit" /> --> 70 <!-- <image class="logo" src="../../image/logo.png" mode="aspectFit" /> -->
71 <span class="iconfont iconempty"></span>
71 <view class="tips"> 72 <view class="tips">
72 <text >活动火热进行中\n排名信息正在努力整理·····</text> 73 <text>活动火热进行中\n排名信息正在努力整理·····</text>
73 </view> 74 </view>
74 </view> 75 </view>
75 </view> 76 </view>
......
...@@ -133,7 +133,7 @@ $iptHeight:80px; ...@@ -133,7 +133,7 @@ $iptHeight:80px;
133 width: $contentWidth; 133 width: $contentWidth;
134 height: $iptHeight; 134 height: $iptHeight;
135 border-radius: 40px; 135 border-radius: 40px;
136 border: solid 1px #b83138; 136 border: solid 1PX #b83138;
137 background-color: #ffffff; 137 background-color: #ffffff;
138 display: flex; 138 display: flex;
139 margin-bottom: 30px; 139 margin-bottom: 30px;
...@@ -195,9 +195,13 @@ $iptHeight:80px; ...@@ -195,9 +195,13 @@ $iptHeight:80px;
195 } 195 }
196 196
197 .textarea { 197 .textarea {
198 height: $iptHeight;
199 flex: 1;
198 min-height: 160px; 200 min-height: 160px;
199 @extend .bb; 201 @extend .bb;
200 padding: 24px 0; 202 padding-right: 24px;
203 padding-top: 4px;
204 margin-left: -10px;
201 } 205 }
202 } 206 }
203 207
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 </view> 60 </view>
61 <view class="ipt ipt2"> 61 <view class="ipt ipt2">
62 <view class="label">地址</view> 62 <view class="label">地址</view>
63 <textarea value="{{receiverAddress}}" bindinput="bindAddressInput" class="input textarea" placeholder="请输入"></textarea> 63 <textarea value="{{receiverAddress}}" bindinput="bindAddressInput" class=" textarea" placeholder="请输入"></textarea>
64 </view> 64 </view>
65 </view> 65 </view>
66 <view bindtap="onSubmitHandler" class="submit-btn">确认提交</view> 66 <view bindtap="onSubmitHandler" class="submit-btn">确认提交</view>
......
...@@ -138,8 +138,28 @@ Page({ ...@@ -138,8 +138,28 @@ Page({
138 tipsPirzeVisible: true, 138 tipsPirzeVisible: true,
139 status: curData.status 139 status: curData.status
140 }) 140 })
141 app.globalData.giftData = curData;
142 // 再查看奖品
143 // app.post({
144 // url: app.api.wishbillGiftQuery,
145 // data: {
146 // instanceCode: curData.instanceCode
147 // }
148 // }).then((result) => {
149 // curData = Object.assign(curData, result);
150 // this.setData({
151 // curWish: curData,
152 // tipsPirzeVisible: true,
153 // status: curData.status
154 // })
155 // app.globalData.giftData = curData;
156 // console.log("app.globalData.giftData 222:", app.globalData.giftData);
157 // console.log(JSON.stringify(app.globalData.giftData));
158 // })
159
141 }); 160 });
142 }, 161 },
162
143 /** 163 /**
144 * 查看我的奖品 164 * 查看我的奖品
145 * 点击领取 165 * 点击领取
...@@ -159,11 +179,12 @@ Page({ ...@@ -159,11 +179,12 @@ Page({
159 status: curData.status 179 status: curData.status
160 }) 180 })
161 app.globalData.giftData = curData; 181 app.globalData.giftData = curData;
182 console.log("app.globalData.giftData 111:", app.globalData.giftData);
183 console.log(JSON.stringify(app.globalData.giftData));
162 184
163 // 领取状态 185 // 领取状态
164 // 领取类型：0=未提交；1=邮寄（填写邮寄信息）；2=自提（填门店预约信息） 186 // 领取类型：0=未提交；1=邮寄（填写邮寄信息）；2=自提（填门店预约信息）
165 let acceptType = curData.order.acceptType; 187 let acceptType = curData.order.acceptType;
166 console.log("acceptType:", acceptType);
167 if (acceptType == 0) { 188 if (acceptType == 0) {
168 // 未提交，显示领取选择 189 // 未提交，显示领取选择
169 this.setData({ 190 this.setData({
...@@ -178,7 +199,7 @@ Page({ ...@@ -178,7 +199,7 @@ Page({
178 } else if (acceptType == 2) { 199 } else if (acceptType == 2) {
179 // 已经选择自提 200 // 已经选择自提
180 app.router.push({ 201 app.router.push({
181 path: "prizeDetail" 202 path: "prizeDetail",
182 }) 203 })
183 } 204 }
184 205
......
...@@ -55,7 +55,6 @@ function push(path, option = {}) { ...@@ -55,7 +55,6 @@ function push(path, option = {}) {
55 query = {}, openType = 'navigate', duration = 0 55 query = {}, openType = 'navigate', duration = 0
56 } = option; 56 } = option;
57 // json 转换为 字符串拼接参数 57 // json 转换为 字符串拼接参数
58 console.log("query:", query);
59 let params = parse(query) 58 let params = parse(query)
60 // console.log("params:", params); 59 // console.log("params:", params);
61 if (params) { 60 if (params) {
......