Skip to content

dev / marubi-wish-list-mp

Go to a project
Toggle navigation
Toggle navigation pinning
08ba8f32 by simon
Options

版本提交

1 parent 200dd8be
Inline Side-by-side
Showing 30 changed files with 632 additions and 367 deletions
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
3 * gulpfile 文件 3 * gulpfile 文件
4 * ------------------------------------------------------------------ 4 * ------------------------------------------------------------------
5 */ 5 */
6 var isFirst = false;
6 7
7 var path = require('path'); 8 var path = require('path');
8 var gulp = require('gulp'); 9 var gulp = require('gulp');
...@@ -231,7 +232,9 @@ var watchHandler = function (type, file) { ...@@ -231,7 +232,9 @@ var watchHandler = function (type, file) {
231 var tmp = file.replace('src/', 'dist/') 232 var tmp = file.replace('src/', 'dist/')
232 del([tmp]); 233 del([tmp]);
233 } else { 234 } else {
234 // copyWXML(); 235 if (isFirst) {
236 copyWXML(); // first
237 }
235 wxmlImgRewrite(); 238 wxmlImgRewrite();
236 } 239 }
237 } 240 }
...@@ -242,8 +245,13 @@ var watchHandler = function (type, file) { ...@@ -242,8 +245,13 @@ var watchHandler = function (type, file) {
242 var tmp = file.replace('src/', 'dist/'); 245 var tmp = file.replace('src/', 'dist/');
243 del([tmp]); 246 del([tmp]);
244 } else { 247 } else {
245 copyTargetFiles(); // modify 248 if (isFirst) {
246 // copyBasicFiles(); 249 copyBasicFiles(); //first
250 } else {
251 copyTargetFiles(); // modify
252 }
253
254
247 // copyWXML(); 255 // copyWXML();
248 // wxmlImgRewrite(); 256 // wxmlImgRewrite();
249 } 257 }
......
...@@ -26,6 +26,7 @@ App({ ...@@ -26,6 +26,7 @@ App({
26 questionResult: null, //答题的结果 弹力值 elasticValue 26 questionResult: null, //答题的结果 弹力值 elasticValue
27 posterWishList: [], //海报用 27 posterWishList: [], //海报用
28 giftData: null, // 实物奖 userTabel prizeDetail用 28 giftData: null, // 实物奖 userTabel prizeDetail用
29 coopOptions: null, // 协作页 onload入参
29 }, 30 },
30 onLaunch: function () { 31 onLaunch: function () {
31 this.share(); 32 this.share();
...@@ -48,7 +49,10 @@ App({ ...@@ -48,7 +49,10 @@ App({
48 //分享配置 49 //分享配置
49 return { 50 return {
50 title: '弹弹弹 看你有多弹', 51 title: '弹弹弹 看你有多弹',
51 path: 'pages/index/index' 52 path: 'pages/index/index',
53 // imageUrl: './image/share.png',
54 // imageUrl: 'https://kd.cdn.xyiyang.com/weapp/marubi/wish-list/share.png'
55 imageUrl: 'https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/share.png'
52 }; 56 };
53 }; 57 };
54 } 58 }
...@@ -57,13 +61,14 @@ App({ ...@@ -57,13 +61,14 @@ App({
57 }, 61 },
58 // 获取用户基本信息 62 // 获取用户基本信息
59 queryIndex(query = { 63 queryIndex(query = {
60 auth: true 64 auth: true,
65 // loading: true
61 }) { 66 }) {
62 return new Promise((resolve, reject) => { 67 return new Promise((resolve, reject) => {
63 this.post({ 68 this.post({
64 url: this.api.index, 69 url: this.api.index,
65 data: {}, 70 data: {},
66 loading: true, 71 // loading: loading,
67 }).then((result) => { 72 }).then((result) => {
68 this.globalData.indexInfo = result; 73 this.globalData.indexInfo = result;
69 this.globalData.userInfo = result.userInfo; 74 this.globalData.userInfo = result.userInfo;
......
1 { 1 {
2 "pages": [ 2 "pages": [
3 "pages/index/index", 3 "pages/index/index",
4 "pages/create-wish/create-wish",
4 "pages/prize-detail/prize-detail", 5 "pages/prize-detail/prize-detail",
5 "pages/user-table/user-table", 6 "pages/user-table/user-table",
6 "pages/authorize/authorize", 7 "pages/authorize/authorize",
...@@ -8,7 +9,6 @@ ...@@ -8,7 +9,6 @@
8 "pages/register/register", 9 "pages/register/register",
9 "pages/login/login", 10 "pages/login/login",
10 "pages/wish/wish", 11 "pages/wish/wish",
11 "pages/create-wish/create-wish",
12 "pages/question/question", 12 "pages/question/question",
13 "pages/new-welfare/new-welfare", 13 "pages/new-welfare/new-welfare",
14 "pages/coupon-detail/coupon-detail", 14 "pages/coupon-detail/coupon-detail",
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
32 "usingComponents": { 32 "usingComponents": {
33 "authorize-comp": "../../component/authorize-comp/authorize-comp", 33 "authorize-comp": "../../component/authorize-comp/authorize-comp",
34 "empty-tips": "../../component/empty-tips/empty-tips", 34 "empty-tips": "../../component/empty-tips/empty-tips",
35 "tips-guide-register-comp": "../../component/tips-guide-register-comp/tips-guide-register-comp",
35 "van-popup": "../../ui/vant-weapp/popup/index" 36 "van-popup": "../../ui/vant-weapp/popup/index"
36 } 37 }
37 } 38 }
......
1 let app = getApp();
1 Component({ 2 Component({
2 properties: { 3 properties: {
3 // 这里定义了innerText属性，属性值可以在组件使用时指定 4 // 这里定义了innerText属性，属性值可以在组件使用时指定
5 cid: {
6 type: String,
7 value: '',
8 },
4 innerText: { 9 innerText: {
5 type: String, 10 type: String,
6 value: 'default value', 11 value: '',
12 },
13 innerButton: {
14 type: String,
15 value: '我知道了',
7 } 16 }
8 }, 17 },
9 data: { 18 data: {
...@@ -20,7 +29,10 @@ Component({ ...@@ -20,7 +29,10 @@ Component({
20 // 隐藏蒙层 29 // 隐藏蒙层
21 hideMask() { 30 hideMask() {
22 this.triggerEvent('evtcomp', { 31 this.triggerEvent('evtcomp', {
23 name: "_evt_hide_mask" 32 name: "_evt_hide_mask",
33 data: {
34 cid: this.properties.cid,
35 }
24 }); 36 });
25 } 37 }
26 } 38 }
......
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
7 <text decode="{{true}}">{{innerText}}</text> 7 <text decode="{{true}}">{{innerText}}</text>
8 </view> 8 </view>
9 </view> 9 </view>
10 <view bindtap="hideMask" class="btn">我知道了</view> 10 <view bindtap="hideMask" class="btn">{{innerButton}}</view>
11 </view> 11 </view>
......
1 let app = getApp();
2 Component({
3 properties: {
4 // 这里定义了innerText属性，属性值可以在组件使用时指定
5 innerText: {
6 type: String,
7 value: 'default value',
8 }
9 },
10 data: {
11 // 这里是一些组件内部数据
12 someData: {}
13 },
14 methods: {
15 // 这里是一个自定义方法
16 customMethod() {
17 this.triggerEvent('evtcomp', {
18 name: "_evt_custom"
19 })
20 },
21 // 隐藏蒙层
22 hideMask() {
23 this.triggerEvent('evtcomp', {
24 name: "_evt_hide_mask"
25 });
26 },
27 // 前往注册
28 onRegisterHandler() {
29 // this.hideMask();
30 this.triggerEvent('evtcomp', {
31 name: "_evt_to_register"
32 });
33
34 }
35 }
36 })
1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
3
4 .comp-item {
5 position: relative;
6 width: 654px;
7 height: 588px;
8
9 // width: 654px;
10 // height: 732px;
11
12 // background-color: wheat;
13 .bg {
14 position: absolute;
15 width: 654px;
16 height: 588px;
17 }
18
19 .space1 {
20 height: 108px;
21 }
22
23 .cont {
24 position: relative;
25 text-align: center;
26 }
27
28 .tit {
29 color: #333333;
30 font-size: 40px;
31 font-weight: 300;
32 text-align: center;
33 margin: 0 auto;
34 }
35
36 .tips {
37 margin-top: 32px;
38 color: #999999;
39 font-size: 28px;
40 @extend .bb;
41 padding: 0 100px;
42
43 text {
44 line-height: 32px
45 }
46 }
47
48 .btn-wrap {
49 position: absolute;
50 left: 0;
51 right: 0;
52 bottom: 80px;
53
54 .btn {
55 position: relative;
56 margin: 20px auto 0;
57 z-index: 1;
58 }
59
60 .btn1 {
61 @include cb(320px, 60px);
62 // @include cb(360px, 72px);
63 font-size: 26px;
64 }
65
66 .btn2 {
67 @include cb(320px, 60px);
68 // @include cb(240px, 48px);
69 background: transparent;
70 background-color: #d2d2d2;
71 }
72 }
73 }
1 <view class="comp-item">
2 <image class="bg" src="../../image/oss/tips/tips-border-small.png" mode="widthFix" />
3 <!-- <image class="bg" src="../../image/oss/tips/tips-border-big.png" mode="widthFix" /> -->
4 <view class="space1"></view>
5 <view class="cont">
6 <view class="tit">· 温馨提示 ·</view>
7 <view class="tips">
8 <text decode="{{true}}">{{innerText}}</text>
9 </view>
10 </view>
11 <view class="btn-wrap">
12 <view bindtap="onRegisterHandler" class="btn btn1">丸美姐妹，马上注册</view>
13 <view bindtap="hideMask" class="btn btn2">塑胶姐妹，残忍拒绝</view>
14 </view>
15 </view>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 position: absolute; 58 position: absolute;
59 max-width: 120px; 59 max-width: 120px;
60 max-height: 120px; 60 max-height: 120px;
61 bottom: 12px; 61 bottom: -4px;
62 left: 0; 62 left: 0;
63 right: 0; 63 right: 0;
64 margin: 0 auto; 64 margin: 0 auto;
......
...@@ -29,41 +29,42 @@ let mapFix = { ...@@ -29,41 +29,42 @@ let mapFix = {
29 29
30 let productMap = { 30 let productMap = {
31 // 场景1 31 // 场景1
32 "P000000000000000000000000000002": { 32
33 name: "丸美白色之恋纯白淡黑眼霜20g", 33 "P000000000000000000000000000008": {
34 tag: 1, 34 name: "丸美纯色之恋光透精华液30ml",
35 tag: 2,
35 sence: 1, 36 sence: 1,
36 point: { 37 point: {
37 left: 111, 38 left: 210,
38 top: 258, 39 top: 300,
39 }, 40 },
40 tips: { 41 tips: {
41 type: "top-right", 42 type: "top-left",
42 point: mapFix["top-right"], 43 point: mapFix["top-left"],
43 } 44 }
44 }, 45 },
45 46
46 "P000000000000000000000000000003": { 47 "P000000000000000000000000000010": {
47 name: "丸美巧克力青春丝滑眼乳霜25g", 48 name: "丸美巧克力青春丝滑毛孔隐形精华露35ml",
48 tag: 7, 49 tag: 5,
49 sence: 1, 50 sence: 1,
50 point: { 51 point: {
51 left: 337, 52 left: 460,
52 top: 350, 53 top: 180,
53 }, 54 },
54 tips: { 55 tips: {
55 type: "top-right", 56 type: "bottom-left",
56 point: mapFix["top-right"], 57 point: mapFix["bottom-left"],
57 } 58 }
58 }, 59 },
59 60
60 "P000000000000000000000000000001": { 61 "P000000000000000000000000000009": {
61 name: "丸美弹力蛋白眼精华素10g+10g", 62 name: "丸美雪绒花纯净保湿深润霜50g",
62 tag: 3, 63 tag: 10,
63 sence: 1, 64 sence: 1,
64 point: { 65 point: {
65 left: 558, 66 left: 450,
66 top: 437, 67 top: 520,
67 }, 68 },
68 tips: { 69 tips: {
69 type: "top-left", 70 type: "top-left",
...@@ -71,55 +72,30 @@ let productMap = { ...@@ -71,55 +72,30 @@ let productMap = {
71 } 72 }
72 }, 73 },
73 74
74 // 场景2
75
76 "P000000000000000000000000000008": {
77 name: "丸美纯色之恋光透精华液30ml",
78 tag: 2,
79 sence: 2,
80 point: {
81 left: 0,
82 top: 0,
83 },
84 tips: {
85 type: "top-left",
86 point: mapFix["top-left"],
87 }
88 },
89 75
76 // 场景2
90 "P000000000000000000000000000007": { 77 "P000000000000000000000000000007": {
91 name: "丸美巧克力青春丝滑洁面啫喱120g", 78 name: "丸美巧克力青春丝滑洁面啫喱120g",
92 tag: 4, 79 tag: 4,
93 sence: 2, 80 sence: 2,
94 point: { 81 point: {
95 left: 0, 82 left: 300,
96 top: 0, 83 top: 300,
97 },
98 tips: {
99 type: "top-left",
100 point: mapFix["top-left"],
101 }
102 },
103 "P000000000000000000000000000010": {
104 name: "丸美巧克力青春丝滑毛孔隐形精华露35ml",
105 tag: 5,
106 sence: 2,
107 point: {
108 left: 0,
109 top: 0,
110 }, 84 },
111 tips: { 85 tips: {
112 type: "top-left", 86 type: "top-left",
113 point: mapFix["top-left"], 87 point: mapFix["top-left"],
114 } 88 }
115 }, 89 },
90
91
116 "P000000000000000000000000000004": { 92 "P000000000000000000000000000004": {
117 name: "丸美巧克力青春丝滑水190ml", 93 name: "丸美巧克力青春丝滑水190ml",
118 tag: 6, 94 tag: 6,
119 sence: 2, 95 sence: 2,
120 point: { 96 point: {
121 left: 0, 97 left: 500,
122 top: 0, 98 top: 300,
123 }, 99 },
124 tips: { 100 tips: {
125 type: "top-left", 101 type: "top-left",
...@@ -127,39 +103,46 @@ let productMap = { ...@@ -127,39 +103,46 @@ let productMap = {
127 } 103 }
128 }, 104 },
129 105
130 "P000000000000000000000000000006": { 106
131 name: "丸美雪绒花纯净保湿咕嘟咕嘟菁华露80ml", 107
132 tag: 8, 108
109 // 场景3
110 "P000000000000000000000000000001": {
111 name: "丸美弹力蛋白眼精华素10g+10g",
112 tag: 3,
133 sence: 3, 113 sence: 3,
134 point: { 114 point: {
135 left: 0, 115 left: 210,
136 top: 0, 116 top: 300,
137 }, 117 },
138 tips: { 118 tips: {
139 type: "top-left", 119 type: "top-left",
140 point: mapFix["top-left"], 120 point: mapFix["top-left"],
141 } 121 }
142 }, 122 },
143 "P000000000000000000000000000005": { 123
144 name: "丸美雪绒花纯净保湿洁面乳120g", 124 "P000000000000000000000000000002": {
145 tag: 9, 125 name: "丸美白色之恋纯白淡黑眼霜20g",
126 tag: 1,
146 sence: 3, 127 sence: 3,
147 point: { 128 point: {
148 left: 0, 129 left: 380,
149 top: 0, 130 top: 180,
150 }, 131 },
151 tips: { 132 tips: {
152 type: "top-left", 133 type: "bottom-right",
153 point: mapFix["top-left"], 134 point: mapFix["bottom-right"],
154 } 135 }
155 }, 136 },
156 "P000000000000000000000000000009": { 137
157 name: "丸美雪绒花纯净保湿深润霜50g", 138
158 tag: 10, 139 "P000000000000000000000000000003": {
140 name: "丸美巧克力青春丝滑眼乳霜25g",
141 tag: 7,
159 sence: 3, 142 sence: 3,
160 point: { 143 point: {
161 left: 0, 144 left: 540,
162 top: 0, 145 top: 440,
163 }, 146 },
164 tips: { 147 tips: {
165 type: "top-left", 148 type: "top-left",
...@@ -167,199 +150,41 @@ let productMap = { ...@@ -167,199 +150,41 @@ let productMap = {
167 } 150 }
168 }, 151 },
169 152
170 }
171
172 153
154 // 场景4
173 155
174 /** 156 "P000000000000000000000000000006": {
175 * @my-wish 157 name: "丸美雪绒花纯净保湿咕嘟咕嘟菁华露80ml",
176 * 点击领取心愿单奖品 158 tag: 8,
177 */ 159 sence: 4,
178 let wishbillGiftAccept = {
179 "status": 1,
180 "order": {
181 "acceptType": 0,
182 "instanceCode": "162951b667a746188c83491bd5601164",
183 "prizeName": "丸美弹力蛋白眼精华素10g+10g",
184 "prizePic": "",
185 "commodityNo": "11059001"
186 },
187 "coupon": null
188 }
189
190 /**
191 * @my-wish
192 * 点击单个心愿单奖品
193 */
194 let curWish = {
195 accessStatus: 1,
196 commodityNo: "11059001",
197 conditionElasticValue: 5480,
198 coupon: null,
199 elasticValue: 10000,
200 initialElasticValue: 33,
201 instanceCode: "162951b667a746188c83491bd5601164",
202 name: "丸美弹力蛋白眼精华素10g+10g",
203 order: {
204 acceptType: 0,
205 instanceCode: "162951b667a746188c83491bd5601164",
206 prizeName: "丸美弹力蛋白眼精华素10g+10g",
207 prizePic: "",
208 commodityNo: "11059001"
209 },
210 point: {
211 left: 558,
212 top: 437
213 },
214 price: "548",
215 prizeDefineCode: "P000000000000000000000000000001",
216 prizeName: "丸美弹力蛋白眼精华素10g+10g",
217 prizePic: "",
218 progress: 100,
219 progressLeft: 169.00000000000003,
220 sence: 1,
221 status: 1,
222 storeRemain: 99,
223 tag: 3,
224 tips: {
225 type: "top-left",
226 point: { 160 point: {
227 fixLeft: -188, 161 left: 300,
228 fixTop: -314 162 top: 300,
229 }
230 }
231 }
232
233 // 读取心愿单奖品
234 let wishbillGiftQuery = {
235 "status": 1,
236 "order": {
237 "coupon": {
238 "couponId": "20839",
239 "couponCode": "RLLW18Q1",
240 "rule": "RLLW18Q1",
241 "startDate": 1564912960000,
242 "endDate": 1567526399000,
243 "type": 4,
244 "name": "眼部护理体验券-7月24日",
245 "state": 0
246 }, 163 },
247 "acceptType": 2, 164 tips: {
248 "instanceCode": "0924988c7fb0437b99c31b97bd1f1d6c", 165 type: "top-left",
249 "storeCode": "", 166 point: mapFix["top-left"],
250 "storeName": "", 167 }
251 "storeAddress": "",
252 "latitude": 0.0,
253 "longitude": 0.0,
254 "prizeName": "丸美巧克力青春丝滑眼乳霜25g",
255 "orderSn": "MW20190804180237100003",
256 "commodityNo": "11039003"
257 }, 168 },
258 "coupon": null
259 }
260 169
261 /**
262 * @tips-prize-comp
263 * 自提数据
264 */
265 let prizeLiftQuery = {
266 "coupon": {
267 "couponId": "20839",
268 "couponCode": "RLLW18Q1",
269 "rule": "RLLW18Q1",
270 "startDate": 1564912960000,
271 "endDate": 1567526399000,
272 "type": 4,
273 "name": "眼部护理体验券-7月24日",
274 "state": 0
275 },
276 "acceptType": 2,
277 "instanceCode": "0924988c7fb0437b99c31b97bd1f1d6c",
278 "storeCode": "",
279 "storeName": "",
280 "storeAddress": "",
281 "latitude": 0.0,
282 "longitude": 0.0,
283 "prizeName": "丸美巧克力青春丝滑眼乳霜25g",
284 "orderSn": "MW20190804180237100003",
285 "commodityNo": "11039003"
286 }
287 170
288 /** 171 "P000000000000000000000000000005": {
289 * @tips-prize-comp 172 name: "丸美雪绒花纯净保湿洁面乳120g",
290 * 邮寄提交返回数据 173 tag: 9,
291 */ 174 sence: 4,
292 let prizeTableQuery = {
293 address: "",
294 associateMobile: "",
295 associateName: "",
296 city: "",
297 commodityNo: "11059001",
298 district: "",
299 instanceCode: "162951b667a746188c83491bd5601164",
300 logisticsCompany: "",
301 logisticsSn: "",
302 memberCode: "654b8d70164e4c1e83e1503d44f325db",
303 orderSn: "MW20190804152353100001",
304 prizeName: "丸美弹力蛋白眼精华素10g+10g",
305 prizePic: "",
306 province: "",
307 }
308
309 /**
310 * @tips-prize-comp
311 * 邮寄提交返回数据 合并
312 */
313 let prizeTableQueryAssign = {
314 accessStatus: 2,
315 address: "",
316 associateMobile: "",
317 associateName: "",
318 city: "",
319 commodityNo: "11059001",
320 conditionElasticValue: 5480,
321 coupon: null,
322 district: "",
323 elasticValue: 10000,
324 initialElasticValue: 33,
325 instanceCode: "162951b667a746188c83491bd5601164",
326 logisticsCompany: "",
327 logisticsSn: "",
328 memberCode: "654b8d70164e4c1e83e1503d44f325db",
329 name: "丸美弹力蛋白眼精华素10g+10g",
330 order: {
331 acceptType: 0,
332 instanceCode: "162951b667a746188c83491bd5601164",
333 prizeName: "丸美弹力蛋白眼精华素10g+10g",
334 prizePic: "",
335 commodityNo: "11059001"
336 },
337 orderSn: "MW20190804152353100001",
338 point: {
339 left: 558,
340 top: 437
341 },
342 price: "548",
343 prizeDefineCode: "P000000000000000000000000000001",
344 prizeName: "丸美弹力蛋白眼精华素10g+10g",
345 prizePic: "",
346 progress: 100,
347 progressLeft: 169.00000000000003,
348 province: "",
349 sence: 1,
350 status: 1,
351 storeRemain: 98,
352 tag: 3,
353 tips: {
354 type: "top-left",
355 point: { 175 point: {
356 fixLeft: -188, 176 left: 500,
357 fixTop: -314 177 top: 300,
358 }, 178 },
179 tips: {
180 type: "top-left",
181 point: mapFix["top-left"],
182 }
359 }, 183 },
184
360 } 185 }
361 186
187
362 module.exports = { 188 module.exports = {
363 productMap: productMap, 189 productMap: productMap
364 wishbillGiftQuery: wishbillGiftQuery
365 } 190 }
......

344 KB | W: | H:

88.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

28.3 KB | W: | H:

15.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

27.6 KB | W: | H:

14.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

24.8 KB | W: | H:

20.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

34.8 KB | W: | H:

26.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

42.3 KB | W: | H:

22.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

42.5 KB | W: | H:

26.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -13,6 +13,8 @@ Page({ ...@@ -13,6 +13,8 @@ Page({
13 groupMemberCoopVisible: false, 13 groupMemberCoopVisible: false,
14 tipsCommonVisible: false, 14 tipsCommonVisible: false,
15 authorizeVisible: false, 15 authorizeVisible: false,
16 tipsGuideRegisterVisible: false,
17 animationPassVisible: false,
16 tipsInnerText: "", 18 tipsInnerText: "",
17 options: null, 19 options: null,
18 wishInfo: {}, 20 wishInfo: {},
...@@ -21,7 +23,8 @@ Page({ ...@@ -21,7 +23,8 @@ Page({
21 userInfo: {}, 23 userInfo: {},
22 canShake: true, 24 canShake: true,
23 status: 0, 25 status: 0,
24 animationShake:{}, // 摇一摇动画 26 animationShake: {}, // 摇一摇动画
27 aniTimeoutIndex: 0,
25 }, 28 },
26 onShareAppMessage() {}, 29 onShareAppMessage() {},
27 showAuth() { 30 showAuth() {
...@@ -33,11 +36,16 @@ Page({ ...@@ -33,11 +36,16 @@ Page({
33 this.setData({ 36 this.setData({
34 options 37 options
35 }) 38 })
36 console.log("onLoad"); 39 // 注册回调的入参
37 }, 40 if (app.globalData.coopOptions) {
38 onHide() { 41 this.setData({
42 options: app.globalData.coopOptions
43 })
44 }
39 45
46 console.log("onLoad");
40 }, 47 },
48 onHide() {},
41 onShow() { 49 onShow() {
42 console.log("onShow"); 50 console.log("onShow");
43 this.initData(); 51 this.initData();
...@@ -48,15 +56,32 @@ Page({ ...@@ -48,15 +56,32 @@ Page({
48 indexInfo: app.globalData.indexInfo, 56 indexInfo: app.globalData.indexInfo,
49 userInfo: app.globalData.userInfo, 57 userInfo: app.globalData.userInfo,
50 }) 58 })
51 this.queryWishbillDetail(); 59 this.queryWishbillDetail().then((result) => {
60 let {
61 wishInfo
62 } = this.data;
63 // 如果是本人的话，就跳转到我首页
64 if (wishInfo.isSelfWishBill == 1) {
65 this.onPlayTooHandler();
66 return;
67 }
68 // 判断是否需要显示注册蒙层
69 // 条件 1.不是本人 2.未为她助力
70 if (wishInfo.isSelfWishBill == 0 && wishInfo.isAssist != 1) {
71 this.setData({
72 tipsGuideRegisterVisible: true
73 })
74 }
75 })
52 this.initShake(); 76 this.initShake();
77
53 }) 78 })
54 }, 79 },
55 // 添加摇一摇 80 // 添加摇一摇
56 initShake() { 81 initShake() {
57 let _this = this; 82 let _this = this;
58 wx.onAccelerometerChange(function (res) { 83 wx.onAccelerometerChange(function (res) {
59 if (!_this.data.canShake) { 84 if (!_this.data.canShake || _this.data.tipsCommonVisible) {
60 return 85 return
61 } 86 }
62 if (res.x > 1) { //偏移量为2时触发，有的使用1 87 if (res.x > 1) { //偏移量为2时触发，有的使用1
...@@ -73,14 +98,45 @@ Page({ ...@@ -73,14 +98,45 @@ Page({
73 path: "index" 98 path: "index"
74 }) 99 })
75 }, 100 },
101
102 playShakeSound() {
103 const innerAudioContext = wx.createInnerAudioContext()
104 innerAudioContext.autoplay = true;
105 innerAudioContext.src = "https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/mp3/shake.mp3";
106 innerAudioContext.onPlay(() => {
107 console.log('开始播放')
108 })
109 innerAudioContext.onError((res) => {
110 console.log(res.errMsg)
111 console.log(res.errCode)
112 })
113 },
114
76 // 助力 115 // 助力
77 queryWishbillAssist() { 116 queryWishbillAssist() {
78 if (!this.data.canShake || this.data.tipsCommonVisible) { 117 let {
118 wishInfo
119 } = this.data;
120 if (!this.data.canShake) {
121 return;
122 }
123 // 在弹窗状态
124 if (this.data.tipsCommonVisible) {
79 return; 125 return;
80 } 126 }
127 // 自己表单
128 if (wishInfo.isSelfWishBill == 1) {
129 return;
130 }
131 // 已经助力
132 if (wishInfo.isAssist == 1) {
133 return;
134 }
135
81 this.setData({ 136 this.setData({
82 canShake: false 137 canShake: false
83 }) 138 })
139 this.playShakeSound();
84 app.post({ 140 app.post({
85 url: app.api.wishbillAssist, 141 url: app.api.wishbillAssist,
86 data: { 142 data: {
...@@ -88,29 +144,39 @@ Page({ ...@@ -88,29 +144,39 @@ Page({
88 } 144 }
89 }).then((result) => { 145 }).then((result) => {
90 let status = result.status; 146 let status = result.status;
91 this.setData({ 147 if (status != 1) {
92 status: status 148 this.setData({
93 }) 149 status: status
150 })
151 }
152
94 if (status == 1) { 153 if (status == 1) {
95 // 助力成功
96 // 合并数据
97 let wishList = result.elasticValueList;
98 wishList.forEach(element => {
99 let product = productMap[element.prizeDefineCode + ""];
100 console.log("product:", product);
101 element = Object.assign(element, product);
102 let progress = element.elasticValue / element.conditionElasticValue * 100;
103 if (progress > 100) progress = 100;
104 // 直接计算坐标
105 let progressLeft = progress * 3.22 - 51;
106 element.progress = progress;
107 element.progressLeft = progressLeft;
108 });
109 console.log("wishList:", wishList);
110 this.setData({ 154 this.setData({
111 coopInfo: result, 155 animationPassVisible: true
112 wishList: wishList
113 }) 156 })
157
158 setTimeout(() => {
159 // 助力成功
160 // 合并数据
161 let wishList = result.elasticValueList;
162 wishList.forEach(element => {
163 let product = productMap[element.prizeDefineCode + ""];
164 element = Object.assign(element, product);
165 let progress = element.elasticValue / element.conditionElasticValue * 100;
166 if (progress > 100) progress = 100;
167 // 直接计算坐标
168 let progressLeft = progress * 3.22 - 51;
169 element.progress = progress;
170 element.progressLeft = progressLeft;
171 });
172 this.setData({
173 coopInfo: result,
174 wishList: wishList,
175 status: status,
176 animationPassVisible: false
177 })
178 }, 2000);
179
114 } else if (status == 2) { 180 } else if (status == 2) {
115 // 助力失败 181 // 助力失败
116 this.setData({ 182 this.setData({
...@@ -175,6 +241,7 @@ Page({ ...@@ -175,6 +241,7 @@ Page({
175 groupMemberCoopVisible: false, 241 groupMemberCoopVisible: false,
176 tipsCommonVisible: false, 242 tipsCommonVisible: false,
177 authorizeVisible: false, 243 authorizeVisible: false,
244 tipsGuideRegisterVisible: false,
178 }) 245 })
179 }, 246 },
180 // 子组件事件 247 // 子组件事件
...@@ -187,6 +254,22 @@ Page({ ...@@ -187,6 +254,22 @@ Page({
187 254
188 case "_evt_hide_mask": 255 case "_evt_hide_mask":
189 this.hideMask(); 256 this.hideMask();
257 let cid = data && data.cid || "";
258 if (cid == "play-too") {
259 this.onPlayTooHandler();
260 }
261 break;
262
263 // 前往注册页面
264 case "_evt_to_register":
265 this.hideMask();
266 app.globalData.coopOptions = this.data.options;
267 app.router.push({
268 path: "register",
269 query: {
270 redirect: "coop"
271 }
272 })
190 break; 273 break;
191 274
192 case "_evt_auth_complete:": 275 case "_evt_auth_complete:":
......
...@@ -48,12 +48,14 @@ ...@@ -48,12 +48,14 @@
48 } 48 }
49 49
50 .coop-shake { 50 .coop-shake {
51 width: 306px; 51 // width: 306px;
52 height: 335px; 52 // height: 335px;
53 width: 290px;
54 height: 318px;
53 position: absolute; 55 position: absolute;
54 left: 0; 56 left: 0;
55 right: 0; 57 right: 0;
56 top: 170px; 58 top: 190px;
57 margin: 0 auto; 59 margin: 0 auto;
58 } 60 }
59 61
...@@ -68,8 +70,8 @@ ...@@ -68,8 +70,8 @@
68 margin: 0 auto; 70 margin: 0 auto;
69 width: 480px; 71 width: 480px;
70 color: #333333; 72 color: #333333;
71 // font-size: 28px; 73 font-size: 28px;
72 font-size: 24px; 74 // font-size: 24px;
73 line-height: 1.6; 75 line-height: 1.6;
74 height: 140px; 76 height: 140px;
75 @include ellipsis(3); 77 @include ellipsis(3);
...@@ -349,3 +351,28 @@ ...@@ -349,3 +351,28 @@
349 } 351 }
350 } 352 }
351 } 353 }
354
355
356 .ani {
357 position: relative;
358
359 .mask {
360 background-color: rgba($color: #000000, $alpha: .8);
361 width: 100%;
362 height: 100%;
363 z-index: 101;
364 position: fixed;
365 bottom: 0;
366 }
367
368 .gif {
369 position: absolute;
370 left: 80px;
371 // right: 0;
372 // margin: 0 auto;
373 top: 300px;
374 width: 600px;
375 height: 332px;
376 z-index: 9999;
377 }
378 }
......
1 <view class="page"> 1 <view class="page">
2 <view wx:if="{{animationPassVisible}}" class="ani">
3 <view class="mask"></view>
4 <image class="gif" mode="widthFix" src="../../image/oss/ani/pass.gif" />
5 </view>
2 <view class="app__bgc bgc"></view> 6 <view class="app__bgc bgc"></view>
3 <image class="bg" src="../../image/oss/coop/coop-bg-1.png" mode="scaleToFill" /> 7 <image class="bg" src="../../image/oss/coop/coop-bg-1.png" mode="scaleToFill" />
4 <view class="decoration"> 8 <view class="decoration">
...@@ -9,18 +13,19 @@ ...@@ -9,18 +13,19 @@
9 <view class="content"> 13 <view class="content">
10 <!-- 摇一摇 --> 14 <!-- 摇一摇 -->
11 <!-- bindtap="queryWishbillAssist" --> 15 <!-- bindtap="queryWishbillAssist" -->
12 <!-- 点自己链接 16 <!-- 点自己链接未助力 -->
13 未助力 --> 17 <view bindtap="queryWishbillAssist" wx:if="{{wishInfo.isSelfWishBill == 1 || (status != 1 && wishInfo.isAssist != 1)}}" class="shake">
14 <view bindtap="queryWishbillAssist" wx:if="{{options.code == indexInfo.wishBillCode || (status != 1 && wishInfo.isAssist != 1)}}" class="shake">
15 <image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" /> 18 <image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" />
16 <image class="coop-shake animated tada infinite" mode="widthFix " src="../../image/oss/coop/coop-shake.png" /> 19 <image class="coop-shake animated infinite {{animationPassVisible?'':'tada'}}" mode="widthFix" src="../../image/oss/coop/coop-shake.png" />
17 <view class="space1"></view> 20 <view class="space1"></view>
18 <view class="cont"> 21 <view class="cont">
19 <view class="tips"> 22 <view class="tips">
20 <!-- 你的好友 23 <!-- 你的好友
21 <span class="t1">{{wishInfo.member.nickname}}</span> 24 <span class="t1">{{wishInfo.member.nickname}}</span>
22 的心愿单需要你的帮助哦！拿起手机摇一摇，即可为ta贡献弹力值！ --> 25 的心愿单需要你的帮助哦！拿起手机摇一摇，即可为ta贡献弹力值！ -->
23 亲爱的好友，我的丸美心愿单需要你的帮助，拿起手机摇一摇，为我的心愿注入弹力值~ 26 亲爱的好友，
27 <span class="t1">{{wishInfo.member.nickname}}</span>
28 的丸美心愿单需要你的帮助，拿手机摇一摇，为TA的心愿注入弹力值~
24 </view> 29 </view>
25 <view class="wish"> 30 <view class="wish">
26 <view wx:for="{{wishList}}" wx:key="{{index}}" class="wish-item"> 31 <view wx:for="{{wishList}}" wx:key="{{index}}" class="wish-item">
...@@ -31,7 +36,7 @@ ...@@ -31,7 +36,7 @@
31 </view> 36 </view>
32 </view> 37 </view>
33 </view> 38 </view>
34 <view bindtap="onPlayTooHandler" class="play-too-btn">我也要玩</view> 39 <!-- <view bindtap="onPlayTooHandler" class="play-too-btn">我也要玩</view> -->
35 </view> 40 </view>
36 <!-- 摇后结果 --> 41 <!-- 摇后结果 -->
37 <view wx:else class="result-wrap"> 42 <view wx:else class="result-wrap">
...@@ -82,7 +87,9 @@ ...@@ -82,7 +87,9 @@
82 </view> 87 </view>
83 </view> 88 </view>
84 </view> 89 </view>
85 <view bindtap="onPlayTooHandler" class="play-too-btn">我也要玩</view> 90 <view wx:if="{{isSelfWishBill == 1 || (status != 1 && wishInfo.isAssist != 1)}}" bindtap="onPlayTooHandler" class="play-too-btn">
91 我也要玩
92 </view>
86 </view> 93 </view>
87 </view> 94 </view>
88 </view> 95 </view>
...@@ -91,7 +98,10 @@ ...@@ -91,7 +98,10 @@
91 <tips-group-member-coop-comp bind:evtcomp="evtcomp"></tips-group-member-coop-comp> 98 <tips-group-member-coop-comp bind:evtcomp="evtcomp"></tips-group-member-coop-comp>
92 </van-popup> 99 </van-popup>
93 <van-popup show="{{ tipsCommonVisible }}"> 100 <van-popup show="{{ tipsCommonVisible }}">
94 <tips-common-comp bind:evtcomp="evtcomp" inner-text="{{tipsInnerText}}"></tips-common-comp> 101 <tips-common-comp bind:evtcomp="evtcomp" inner-text="{{tipsInnerText}}" inner-button="我也要玩" cid="play-too"></tips-common-comp>
102 </van-popup>
103 <van-popup show="{{ tipsGuideRegisterVisible }}">
104 <tips-guide-register-comp bind:evtcomp="evtcomp" inner-text="注册成为丸美新会员，\n可为好友心愿注入更多弹力值噢~"></tips-guide-register-comp>
95 </van-popup> 105 </van-popup>
96 <van-popup show="{{ authorizeVisible }}"> 106 <van-popup show="{{ authorizeVisible }}">
97 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 107 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
......
...@@ -72,7 +72,8 @@ Page({ ...@@ -72,7 +72,8 @@ Page({
72 // let targetProductList = productList1; 72 // let targetProductList = productList1;
73 // let randomIndex = targetProductList[Math.floor(Math.random() * targetProductList.length)]; 73 // let randomIndex = targetProductList[Math.floor(Math.random() * targetProductList.length)];
74 // this.doShowTipsBorder(randomIndex); 74 // this.doShowTipsBorder(randomIndex);
75 this.doShowTipsBorder("P000000000000000000000000000002"); 75 // this.doShowTipsBorder("P000000000000000000000000000008");
76 this.doShowTipsBorder("P000000000000000000000000000008");
76 77
77 }, 78 },
78 // 添加摇一摇 79 // 添加摇一摇
...@@ -305,8 +306,13 @@ Page({ ...@@ -305,8 +306,13 @@ Page({
305 let curData = productMap[curIndex + ""]; 306 let curData = productMap[curIndex + ""];
306 let product = getObjByListKeyValue(curIndex, 'prizeDefineCode', this.data.candidate); 307 let product = getObjByListKeyValue(curIndex, 'prizeDefineCode', this.data.candidate);
307 curData = Object.assign(curData, product) 308 curData = Object.assign(curData, product)
309 let curWish = curData;
310
311 console.log("curWish:", curData);
312 console.log("top:", curWish.point.top + curWish.tips.point.fixTop);
313 console.log("left:", curWish.point.left + curWish.tips.point.fixLeft);
308 this.setData({ 314 this.setData({
309 curWish: curData, 315 curWish: curWish,
310 tipsBorderVisible: true, 316 tipsBorderVisible: true,
311 }); 317 });
312 }, 318 },
...@@ -382,14 +388,9 @@ Page({ ...@@ -382,14 +388,9 @@ Page({
382 * @param {*} evt 388 * @param {*} evt
383 */ 389 */
384 onChangeStatusHandler(evt) { 390 onChangeStatusHandler(evt) {
385 wx.showToast({
386 title: "场景修缉中，敬请期待",
387 icon: "none"
388 });
389 return;
390 let curStatus = this.data.curStatus; 391 let curStatus = this.data.curStatus;
391 curStatus++; 392 curStatus++;
392 if (curStatus > 3) { 393 if (curStatus > 4) {
393 curStatus = 1; 394 curStatus = 1;
394 } 395 }
395 this.setData({ 396 this.setData({
......
...@@ -6,9 +6,22 @@ ...@@ -6,9 +6,22 @@
6 6
7 // 场景1背景 7 // 场景1背景
8 .bgc1 { 8 .bgc1 {
9 background-color: #ffd5da; 9 background-color: #e5f5f7;
10 } 10 }
11 11
12 .bgc2 {
13 background-color: #e68892;
14 }
15
16 .bgc3 {
17 background-color: #f9eae0;
18 }
19
20 .bgc4 {
21 background-color: #a7e6f1;
22 }
23
24
12 .bg {} 25 .bg {}
13 26
14 .sence { 27 .sence {
...@@ -38,48 +51,149 @@ ...@@ -38,48 +51,149 @@
38 } 51 }
39 } 52 }
40 53
54 // 场景1
41 .view1 { 55 .view1 {
42 .ebg {
43 height: 1303px;
44 }
45 56
46 .point1 { 57 .point1 {
47 left: 111px; 58 left: 210px;
48 top: 258px; 59 top: 300px;
49 } 60 }
50 61
51 .point2 { 62 .point2 {
52 left: 337px; 63 left: 460px;
53 top: 350px; 64 top: 180px;
54 } 65 }
55 66
56 .point3 { 67 .point3 {
57 left: 558px; 68 left: 450px;
58 top: 437px; 69 top: 520px;
59 } 70 }
60 71
61 .rect1 { 72 .rect1 {
62 width: 150px; 73 width: 180px;
63 height: 360px; 74 height: 440px;
64 left: 40px; 75 left: 110px;
65 top: 160px; 76 top: 160px;
66 } 77 }
67 78
68 .rect2 { 79 .rect2 {
69 width: 150px; 80 width: 180px;
70 height: 150px; 81 height: 380px;
71 left: 234px; 82 left: 424px;
72 top: 350px; 83 top: 70px;
73 } 84 }
74 85
75 .rect3 { 86 .rect3 {
76 width: 150px; 87 width: 200px;
88 height: 186px;
89 left: 414px;
90 top: 500px;
91 }
92 }
93
94 // 场景2
95 .view2 {
96
97 .point1 {
98 left: 300px;
99 top: 300px;
100 }
101
102 .point2 {
103 left: 500px;
104 top: 300px;
105 }
106
107 .rect1 {
108 width: 120px;
109 height: 320px;
110 left: 270px;
111 top: 170px;
112 transform: rotate(25deg);
113 }
114
115 .rect2 {
116 width: 120px;
117 height: 320px;
118 left: 445px;
119 top: 210px;
120 transform: rotate(30deg);
121 }
122 }
123
124 // 场景3
125 .view3 {
126
127 .point1 {
128 left: 210px;
129 top: 300px;
130 }
131
132 .point2 {
133 left: 380px;
134 top: 180px;
135 }
136
137 .point3 {
138 left: 540px;
139 top: 440px;
140 }
141
142 .rect1 {
143 width: 180px;
144 height: 440px;
145 left: 130px;
146 top: 200px;
147 }
148
149 .rect2 {
150 width: 130px;
77 height: 380px; 151 height: 380px;
78 left: 534px; 152 left: 320px;
79 top: 220px; 153 top: 110px;
154 }
155
156 .rect3 {
157 width: 200px;
158 height: 186px;
159 left: 470px;
160 top: 370px;
161
80 } 162 }
81 } 163 }
82 164
165 // 场景4
166 .view4 {
167
168 .point1 {
169 left: 300px;
170 top: 300px;
171 }
172
173 .point2 {
174 left: 500px;
175 top: 300px;
176 }
177
178 .rect1 {
179 width: 100px;
180 height: 340px;
181 left: 290px;
182 top: 200px;
183 transform: rotate(18deg);
184 }
185
186 .rect2 {
187 width: 120px;
188 height: 320px;
189 left: 410px;
190 top: 240px;
191 transform: rotate(14deg);
192
193 }
194 }
195
196
83 .tips-border { 197 .tips-border {
84 position: absolute; 198 position: absolute;
85 width: 208px; 199 width: 208px;
...@@ -144,6 +258,8 @@ ...@@ -144,6 +258,8 @@
144 258
145 // 换一批按钮 259 // 换一批按钮
146 .change-btn { 260 .change-btn {
261 position: relative;
262 z-index: 9999;
147 margin-left: 48px; 263 margin-left: 48px;
148 box-shadow: 0px 6px 30px 0 rgba(126, 40, 40, 0.5); 264 box-shadow: 0px 6px 30px 0 rgba(126, 40, 40, 0.5);
149 background-color: #ffffff; 265 background-color: #ffffff;
...@@ -326,16 +442,16 @@ ...@@ -326,16 +442,16 @@
326 } 442 }
327 443
328 &-item-1 { 444 &-item-1 {
329 width: 644px; 445 width: 402px;
330 height: 246px; 446 height: 451px;
331 top: 158px; 447 top: 76px;
332 left: 20px; 448 left: 36px;
333 } 449 }
334 450
335 &-item-2 { 451 &-item-2 {
336 width: 639px; 452 width: 420px;
337 height: 169px; 453 height: 475px;
338 top: 496px; 454 top: 502px;
339 left: 40px; 455 left: 24px;
340 } 456 }
341 } 457 }
......
...@@ -4,22 +4,47 @@ ...@@ -4,22 +4,47 @@
4 <image wx:if="{{guideIndex == 1}}" class="guide-item guide-item-1" mode="widthFix" src="../../image/guide/guide-c-wish-1.png" /> 4 <image wx:if="{{guideIndex == 1}}" class="guide-item guide-item-1" mode="widthFix" src="../../image/guide/guide-c-wish-1.png" />
5 <image wx:if="{{guideIndex == 2}}" class="guide-item guide-item-2" mode="widthFix" src="../../image/guide/guide-c-wish-2.png" /> 5 <image wx:if="{{guideIndex == 2}}" class="guide-item guide-item-2" mode="widthFix" src="../../image/guide/guide-c-wish-2.png" />
6 </view> 6 </view>
7 <view class="app__bgc bgc {{curStatus==1?'bgc1':''}}"></view> 7 <!-- <view class="app__bgc bgc {{curStatus==1?'bgc1':''}} {{curStatus==2?'bgc2':''}} {{curStatus==3?'bgc3':''}} {{curStatus==4?'bgc4':''}}"></view> -->
8 <view class="app__bgc bgc {{'bgc'+curStatus}}"></view>
8 <view class="app__bg bg"></view> 9 <view class="app__bg bg"></view>
9 <!-- 场景 --> 10 <!-- 场景 -->
10 <view class="sence"> 11 <view class="sence">
11 <!-- 第一幕 --> 12 <!-- 场景1 -->
12 <view wx:if="{{curStatus==1}}" class="view view1"> 13 <view wx:if="{{curStatus==1}}" class="view view1">
13 <image class="ebg" src="{{'../../image/oss/create-wish/create-wish-1.png'}}" mode="scaleToFill" /> 14 <image class="ebg" src="{{'../../image/oss/create-wish/create-wish-1.png?ver=1'}}" mode="widthFix" />
14 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000002" class="point point1" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" /> 15 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000008" class="point point1" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
15 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000003" class="point point2" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" /> 16 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000010" class="point point2" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
16 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000001" class="point point3" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" /> 17 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000009" class="point point3" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
17 <view class="rect rect1" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000002"></view> 18 <view class="rect rect1" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000008"></view>
18 <view class="rect rect2" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000003"></view> 19 <view class="rect rect2" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000010"></view>
19 <view class="rect rect3" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000001"></view> 20 <view class="rect rect3" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000009"></view>
21 </view>
22 <!-- 场景2 -->
23 <view wx:if="{{curStatus==2}}" class="view view2">
24 <image class="ebg" src="{{'../../image/oss/create-wish/create-wish-2.png?ver=1'}}" mode="widthFix" />
25 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000007" class="point point1" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
26 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000004" class="point point2" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
27 <view class="rect rect1" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000007"></view>
28 <view class="rect rect2" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000004"></view>
29 </view>
30 <!-- 场景3 -->
31 <view wx:if="{{curStatus==3}}" class="view view3">
32 <image class="ebg" src="{{'../../image/oss/create-wish/create-wish-3.png?ver=1'}}" mode="widthFix" />
33 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000001" class="point point1" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
34 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000002" class="point point2" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
35 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000003" class="point point3" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
36 <view class="rect rect1" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000001"></view>
37 <view class="rect rect2" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000002"></view>
38 <view class="rect rect3" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000003"></view>
39 </view>
40 <!-- 场景4 -->
41 <view wx:if="{{curStatus==4}}" class="view view4">
42 <image class="ebg" src="{{'../../image/oss/create-wish/create-wish-4.png?ver=1'}}" mode="widthFix" />
43 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000006" class="point point1" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
44 <image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000005" class="point point2" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
45 <view class="rect rect1" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000006"></view>
46 <view class="rect rect2" bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000005"></view>
20 </view> 47 </view>
21 <view wx:if="{{curStatus==2}}" class="view view2">场景待确认2</view>
22 <view wx:if="{{curStatus==3}}" class="view view3">场景待确认3</view>
23 <!-- 详情 --> 48 <!-- 详情 -->
24 <view wx:if="{{tipsBorderVisible}}" class="tips-border" style="top:{{curWish.point.top+curWish.tips.point.fixTop}}rpx;left:{{curWish.point.left+curWish.tips.point.fixLeft}}rpx;"> 49 <view wx:if="{{tipsBorderVisible}}" class="tips-border" style="top:{{curWish.point.top+curWish.tips.point.fixTop}}rpx;left:{{curWish.point.left+curWish.tips.point.fixLeft}}rpx;">
25 <view class="rel"> 50 <view class="rel">
......
...@@ -26,10 +26,13 @@ Page({ ...@@ -26,10 +26,13 @@ Page({
26 // this.setData({ 26 // this.setData({
27 // wishList: wishList 27 // wishList: wishList
28 // }) 28 // })
29 app.queryIndex().then((result) => { 29 app.queryIndex({
30 auth: true,
31 loading: false,
32 }).then((result) => {
30 console.log("result:", result); 33 console.log("result:", result);
31 wx.showLoading({ 34 wx.showLoading({
32 title: '生成中', 35 title: '海报生成中',
33 }); 36 });
34 this.initData(); 37 this.initData();
35 }) 38 })
...@@ -47,6 +50,7 @@ Page({ ...@@ -47,6 +50,7 @@ Page({
47 50
48 // 获取小程序码 51 // 获取小程序码
49 app.post({ 52 app.post({
53 loading: false,
50 url: app.api.wxacodeGet, 54 url: app.api.wxacodeGet,
51 data: { 55 data: {
52 path: encodeURIComponent(wxCodePath) 56 path: encodeURIComponent(wxCodePath)
......
...@@ -215,6 +215,20 @@ ...@@ -215,6 +215,20 @@
215 .last { 215 .last {
216 border-bottom: none; 216 border-bottom: none;
217 } 217 }
218
219 .empty {
220 text-align: center;
221 // padding-top: 80px;
222
223 .logo {
224 width: 140px;
225 height: 140px;
226 }
227 .tips{
228 color: #333333;
229 }
230 }
231
218 } 232 }
219 } 233 }
220 } 234 }
......
1 <view class="page"> 1 <view class="page">
2 <view class="app__bgc bgc"></view> 2 <view class="app__bgc bgc"></view>
3 <view class="app__bg bg"></view> 3 <view class="app__bg bg"></view>
4
5 <view class="decoration"> 4 <view class="decoration">
6 <image class="d1" src="../../image/oss/rank/rank-d1.png" mode="widthFix" /> 5 <image class="d1" src="../../image/oss/rank/rank-d1.png" mode="widthFix" />
7 <image class="d2" src="../../image/oss/rank/rank-d2.png" mode="widthFix" /> 6 <image class="d2" src="../../image/oss/rank/rank-d2.png" mode="widthFix" />
...@@ -56,7 +55,7 @@ ...@@ -56,7 +55,7 @@
56 </view> 55 </view>
57 </view> 56 </view>
58 <!-- 下方排行榜 --> 57 <!-- 下方排行榜 -->
59 <view class="rank"> 58 <view wx:if="{{downRank.length > 2}}" class="rank">
60 <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':''}}">
61 <view class="no">NO.{{item.no}}</view> 60 <view class="no">NO.{{item.no}}</view>
62 <view class="portrait"> 61 <view class="portrait">
...@@ -66,6 +65,14 @@ ...@@ -66,6 +65,14 @@
66 <view class="val">{{item.elasticValue}}</view> 65 <view class="val">{{item.elasticValue}}</view>
67 </view> 66 </view>
68 </view> 67 </view>
68 <view wx:else class="rank">
69 <view class="empty">
70 <!-- <image class="logo" src="../../image/logo.png" mode="aspectFit" /> -->
71 <view class="tips">
72 <text >活动火热进行中\n排名信息正在努力整理·····</text>
73 </view>
74 </view>
75 </view>
69 </view> 76 </view>
70 </view> 77 </view>
71 </view> 78 </view>
......
...@@ -344,30 +344,30 @@ ...@@ -344,30 +344,30 @@
344 } 344 }
345 345
346 &-item-1 { 346 &-item-1 {
347 width: 459px; 347 width: 438px;
348 height: 281px; 348 height: 426px;
349 top: 30px; 349 top: 25px;
350 right: 2px; 350 right: 2px;
351 } 351 }
352 352
353 &-item-2 { 353 &-item-2 {
354 width: 565px; 354 width: 514px;
355 height: 281px; 355 height: 419px;
356 top: 296px; 356 top: 350px;
357 left: 127px; 357 left: 217px;
358 } 358 }
359 359
360 &-item-3 { 360 &-item-3 {
361 width: 565px; 361 width: 514px;
362 height: 281px; 362 height: 445px;
363 top: 899.8px; 363 top: 860px;
364 left: 159px; 364 left: -34px;
365 } 365 }
366 366
367 &-item-4 { 367 &-item-4 {
368 width: 410px; 368 width: 608px;
369 height: 199px; 369 height: 426px;
370 top: 1588px; 370 top: 1574px;
371 left: 292px; 371 left: 95px;
372 } 372 }
373 } 373 }
......