Skip to content

dev / marubi-wish-list-mp

Go to a project
Toggle navigation
Toggle navigation pinning
4f63187f by simon
Options

版本更新

1 parent 08ba8f32
Inline Side-by-side
Showing 31 changed files with 170 additions and 104 deletions
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 * ------------------------------------------------------------------ 4 * ------------------------------------------------------------------
5 */ 5 */
6 var isFirst = false; 6 var isFirst = false;
7 // isFirst = true;
7 8
8 var path = require('path'); 9 var path = require('path');
9 var gulp = require('gulp'); 10 var gulp = require('gulp');
......
...@@ -93,7 +93,8 @@ ...@@ -93,7 +93,8 @@
93 93
94 @font-face { 94 @font-face {
95 font-family: "iconfont"; 95 font-family: "iconfont";
96 src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAOsAAsAAAAAB6gAAANdAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgqDDIJmATYCJAMMCwgABCAFhG0HORuvBsgOJUHBwIABAAlgPHyN/f7c3UVEk0mi+3QSQxJNJCoexUrxUhhKIyT4UsKbL89+kizTNWb3wyt7UkR96ayA4xev1q04fZzIa32ey/Gt5wc26luWy5iT9qKFAcYBBbQ3RgEFWiAJesPYlRdxn0C9YccRqxl5ZcBCYSwLxJFS3gwsUk6lpj7UCtUle4t4Yqo2XaeXAHj0vx//QUhYkFRlxtq1w/Q2kPRz+iOmhipDoM51Gx7PD3aIjBlAITZLgxuoMDODUq8YTerLqxUhjRU3GgFfqeqrzT88kiCqGbWNYAJlEz+nbQmJP1h91rUZVMPcGeAZM51XhqohJw97O/vO23paqy3T6coNhsqQ1esr3nVWF19mTZ3YnOwtWwPk5bvMfvYCQV11V+xUzZx02tPO6H02TtP0y4dn5a7M9ravfPvs/poNl43TTmVrW87O66dcKzd3myo2Tjo5rW07l6+fcXXd3KmUDdBKXH240GtvAAw49qfa2BeatkTevUsumTJX5pzRRVy781FXe+YP15YALi0+kkDHQRm8OLz2sP/U1NGjIPxKdyVpafxHpKWvbajtddvnaxmZHLP0XGY1d2wvLarJWrd3LMD6Q1DiSPHusrPgvOxtlAKDyt7bk32nH3emP+npcwo2dKU/Vj040Jn2+HTvAU5VFtOf5vZDf683NVrpbEvIO7N3IX421A40MRbmdVIPQGXQhMi7/+o3vjanTBtt4/7Vygr4/p/GIHW7aqBWorXqz7QVQMVYCK4xXLnISlup57Ntpvcth3Ju8j8aod2b/tauu8+FWl0xkhpDyGqNEIWZQZUG86hWawH1pmUebtBBQolShynjAKHVFSTNPpG1ekUU5jWqdPuGaq1Bod56OJ7ZYCyUdKqEmjFqgy3dUNkqCozlwXRQX4Lk7VyzlNT4XAWSNMo4DA4IyuYzkYCkMTZoOuQhGDOQkUQeZoDHEMeJUC2JKtSKAxQYq2MCA5myFwW0ijygrZAgzTCkDdSiG6TUSiRg3MEYnft8CUSuHaeZVNNTka6ASDSUo0PBAgS1IDKNQquea3lGo4NcCAxjQAyJiAdlgFkIhyOC1OWzVJBWWABFj5RajECzH9PWGDC/mX++Q1DPGJsjRY6i5hgx1hSNwhTxatwNAAAAAA==') format('woff2'), 96 // src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAScAAsAAAAACWAAAARQAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDSAqFVIRuATYCJAMYCw4ABCAFhG0HVRshCMgOJSGRwABgYAPDUEoeHvd7PTfJSwFAEah6VmX1dTtS08QKyKgZO6MrzNCI9/9/p93MlJPWQetZqTCDwumbgGcyBbEQPyFlu+svwP9zP59X1mB57dlcIpO6qHBnQOMBDSiiLVJ4Axl/1g9uMj9DgoHJYeziMrYT6LVoIdZxQpoAzBRav0A8lEvLwSymU0oooVtZc6YW8R2MdacP2GUA39zvx3/wCTOSJtOGXj2Ir4SoXzYvA/HW/62KaoC2/ixgZpGxBRTiRa7tEdwPbsH1Sn/ByAnQr1tSftk84z7b8oJ5Gfi/BTGR5gr9eipF0vT4z4sKyfoh7izU8MvGRCj84iIkfm1BaPjDIGT+BgpOS1VRlz7cAsQOaPgtstj5d4Rm2sJiwdWa42RrY6ulpEvbeDlLtnAqJzlZk8u4aPEAP3fpSuXt24I7d4R374oNhiJLRB4nmnP7duGSfo5AlMO3tXKFgsnW7QN8sXDxwM42nki8tK3mqIFow/X54sSBO+ECS/w5TujcY2N92Rz53GqTg2ASsDfb2bYDO1l46xNX5PVv4qy63W9wW7KFIH7scBavZFt/chQu3zazYAlvehIBR+Uu3swXr1AmWrKJw5lczhUu3srnL10hZneQz3q7g0dMbgPo8EzXZ6VkJQlEttQOBNR5QVncISGLWroG2VIHRSxo/2/IU1P4BrHLsYrCmEN92IEDGOK+5UARjuM+XO64nNbYV6Wv1xw+6P43+saNYsePY6Nil50laln7B910+c7pbYU5oEojI9iIVbBZ1r9w7vTe3vnzwe/ml+vG+g0bjh3LOf5Fq1W+Hs8G/7d39kaNdr0PNHe39rU+aJrdzQN/k9GLbIudBavigso8bNUCD8vnXpHt2SvHuBru2I2kPb0Ez2yxxi1na+LP1TdyvBG18WcVp2bVxJ3d0jBLpchzG7aoZmJpcMV7ix+w9nlq8tTH3dTXBhoB2tNpCl8EQH6DA7B0MANWH8+SRKFwixEr3/mhfmPufaG81Drsa3dfAbcRm2ZBQT0Z/BVytfm/T0EB2v9GwQqxvhaxvNlBoLpmjPwJvbqLFrpGPe5LNfEewqHbRAhJlwXIui2hCm4LGn12oeq2B702Jc7uM4aGi9KDDV0AwrC9kAz6CdmwK6iCewSNSW+hGg4cenXCfsk+KyEnYmlUzqBKsqKOlEu0GspGhvAyc5C0SlVOR4UuVYRovdxDent4JSOJSIPoPkboq6U+DEORFK1VkwlgN6RSaUkdrVUgCeMhYxhdiKcnlXcjD4lWDYQjNKQcA6lEqlCHJCehpUHZtRlE6vM5EKkqKuXokrISqwhC05M3TvLmwasGKlGmqVV2Lq31qkn5YDAo3ItC01IjJUALotKDWiRdficFRILhQdbCrxPCE1Wi6so8xleor3Id9NLWqZEiR4kmanTpuVMuUe5/U28TiUqrR96mNKI8Ti8zkmnVyBipdUwdAA==') format('woff2'),
97 src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAT4AAsAAAAAClgAAASsAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDdAqHBIYEATYCJAMgCxIABCAFhG0HZhv8CMgOJU2RwMBgYANAPDzt1+/cmXn+TXFL0ESrpU2IJ0LDo1hJlIqXQChfS9j//73sBlWmUDqts1JhDgrtTl9G0clkKX7SnP//fqWTxwcsrz0blBF8f6KaKgJoeIAGKGqzqch2QcpxH+AZLkzg3QR6e/SEXc8v1YCzQtgXiOdmY29wdhmVGEZoNXXImUV8g0qb3uNnAXzVvz62ITqcSapMOPL2s7w2yFxzfJVAjLCPcEc1w7vy7LidR8YpoBDfQp0fZDNyCqH/pBb3gBnxLxKsOT73fE4/r3m+7qXyKsFu97WiMnI14TZQKZJaU8s/L2qCcgLpT6INa44yomLNE1FYoxGJtRqFdKp1iGjYUBCZzQTxzCpb9YwZYJroiJcgqM/rypiRY0KSVCuurrtDPFzpFRcCvTy9RNY4f6Rf9bx1vm1zfCvnLKDR3MnqmvmLrVevaq5d0964ob9+vVGS6wzCWXT1asO8Sb4anfL4DSNorWbOiI2T1Xrt3MmbR/rp9PNH9t9/ncojMEXvUydfS9O4ES8IyuiJCh+yfPSLq081155pb7zQX3/eREEfImmYUthx7mv8NXMgvd2o8pq8GSNqe+ai2klrfJdcnXQ9dN46ivq+KUi/WOXxMUC7cEPH+nl+3ZFrHkx67lq1/hqtunlrfH3nLKS1c9er1fMX6VUFlGLvNvlRczaAAl/pYqfiykKNzovdhIC9Ud+au0eLsfOXIS92tw6DsX1VvnmTWCVilVCa7KQ9E/Fdu3CUTWQCpZxC310YsFAWsDZljLEcPkr2ITG5M/CDB/EZIlaxcoUB2M4poVJdUNnIhmrg0vTpOMg4xHjVuIau7SdM6N4dYh/+Dlk9aNWqAweqD34Vxet8O1gFTK46SjpW5R951NHxL2nLa6o75uhwwGHbNkXqS5Ljzr27tj1zxtgPCS5hHjEeu2VbmEuCc8mM0yrXMz2W5Ca28lFLeoS7vYjMGFW1eCYt0DO1Y+WISM1zL3zIuuP9804MGuJrHDMg77jlSKf+ucfXDe7EWcJ819dxHdE+OIQoLXWyR/RDx4fR+m1jPGE4wPhoukn0AiC/JQDsI/w66w5mUZ5J/NvzJaIqNpzE8qMz9nusbZgvt3ikfmuHAv7nzTChOF0MtNJ+UDk/GwowtpNxlwimtry7k42iLOcDDvdQQi8SPw0I3jn3y9Qu7lZ53NWLNiSN3ZC1DpEL/RRUBmeh1roEvZMKzh/MkxGidDhhLECYsR2SKT8gm3GOXOj3oLLkHdRmgoDeKHyuODgSZipHRr0V1Mb0GciYDaLAShaFMvKrkbEv11t2SnSmDsk2s5+JCo/0xguQgOQyjrH1M0YrCsuwssgz+XA/xHEiI8miBRmUcJOiSMkREWzYB4UbRB4o18iQ3hRIG0YfAzHMDEQCVp2toHyfXw0x6ovTmxzT9sOrg8hszIszooSLTEEuUAqp2rZltU0/RtEUCpZ3sWQiHiMf7QgnRkQMKXyTBWKgCGfKEZIki6BxbFpleP1qfknPQU+4aRspcpSooo4m2uh0j3obrHOwNMrRwIk2FOUkI1Z6kc1EmkQeOQ0wC4OQYCQlrq/NAfGSMhAA') format('woff2'),
97 } 98 }
98 99
99 .iconfont { 100 .iconfont {
...@@ -112,6 +113,10 @@ ...@@ -112,6 +113,10 @@
112 content: "\e6a6"; 113 content: "\e6a6";
113 } 114 }
114 115
116 .iconclose1:before {
117 content: "\e615";
118 }
119
115 .drop-down-item :last-child { 120 .drop-down-item :last-child {
116 border-bottom: none; 121 border-bottom: none;
117 } 122 }
......
...@@ -30,13 +30,21 @@ Component({ ...@@ -30,13 +30,21 @@ Component({
30 }); 30 });
31 }, 31 },
32 bindGetUserInfo(e) { 32 bindGetUserInfo(e) {
33 wx.showLoading(); 33 console.log("e:", e);
34 this.getUserInfo(e.detail); 34 if (e.detail.iv && e.detail.encryptedData) {
35 wx.showLoading();
36 this.getUserInfo(e.detail);
37 } else {
38 wx.showToast({
39 title: "请允许授权",
40 icon:"none"
41 })
42 }
35 }, 43 },
36 getUserInfo(e) { 44 getUserInfo(e) {
37 let _this = this; 45 let _this = this;
38 app.globalData.userInfo = e.userInfo; 46 app.globalData.userInfo = e.userInfo;
39 console.log("before register : code = ", app.store.getItem("wxcode")) 47 // console.log("before register : code = ", app.store.getItem("wxcode"))
40 app.post({ 48 app.post({
41 url: app.api.register, 49 url: app.api.register,
42 sid: false, 50 sid: false,
...@@ -57,7 +65,9 @@ Component({ ...@@ -57,7 +65,9 @@ Component({
57 } 65 }
58 _this.hideMask(); 66 _this.hideMask();
59 _this.authComplete(); 67 _this.authComplete();
60 }).catch((err) => {}) 68 }).catch((err) => {
69
70 })
61 }, 71 },
62 } 72 }
63 }) 73 })
......
1 <view class="empty-tips" wx:if="{{emptyVisible}}"> 1 <!-- <view class="empty-tips" wx:if="{{emptyVisible}}"> -->
2 <view class="empty-tips">
2 <view class="tips"> 3 <view class="tips">
3 <span class="iconfont iconempty"></span> 4 <span class="iconfont iconempty"></span>
4 <view class="tips">这里空空如也~</view> 5 <view class="tips">这里空空如也~</view>
......
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
82 &-item { 82 &-item {
83 position: relative; 83 position: relative;
84 text-align: center; 84 text-align: center;
85 width: 240px;
85 86
86 .display { 87 .display {
87 position: relative; 88 position: relative;
...@@ -90,6 +91,7 @@ ...@@ -90,6 +91,7 @@
90 border-radius: 70px; 91 border-radius: 70px;
91 background-image: radial-gradient(circle at 0 0, #ffffff, #f2e6e6); 92 background-image: radial-gradient(circle at 0 0, #ffffff, #f2e6e6);
92 @extend .fcc; 93 @extend .fcc;
94 margin: 0 auto;
93 95
94 .prod { 96 .prod {
95 max-width: 200px; 97 max-width: 200px;
......
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
5 <view class="tit">· 太棒了 ·</view> 5 <view class="tit">· 太棒了 ·</view>
6 <view class="tips"> 6 <view class="tips">
7 领取 7 领取
8 <span class="val">{{wishInfo.totalElasticValue}}</span> 8 <span class="val">{{wishBillInfo.totalElasticValue}}</span>
9 弹力值 9 弹力值
10 </view> 10 </view>
11 <!-- 心愿容器 --> 11 <!-- 心愿容器 -->
12 <view class="wish"> 12 <view class="wish">
13 <view wx:for="{{wishList}}" wx:key="{{index}}" class="wish-item"> 13 <view wx:for="{{wishBillInfo.elasticValueList}}" wx:key="{{index}}" class="wish-item">
14 <view class="display"> 14 <view class="display">
15 <image class="prod" mode="aspectFit" src="../../image/prize/prize-{{item.tag}}.png" /> 15 <image class="prod" mode="aspectFit" src="../../image/prize/prize-{{item.tag}}.png" />
16 </view> 16 </view>
17 <view class="val"> 17 <view class="val">
18 <image class="icon" mode="widthFix" src="../../image/oss/create-wish/cw-light.png" /> 18 <image class="icon" mode="widthFix" src="../../image/oss/create-wish/cw-light.png" />
19 获得{{item.initialElasticValue}} 19 获得{{item.elasticValue}}
20 </view> 20 </view>
21 </view> 21 </view>
22 </view> 22 </view>
......
...@@ -55,12 +55,13 @@ ...@@ -55,12 +55,13 @@
55 position: relative; 55 position: relative;
56 margin: 20px auto 0; 56 margin: 20px auto 0;
57 z-index: 1; 57 z-index: 1;
58 font-size: 26px;
58 } 59 }
59 60
60 .btn1 { 61 .btn1 {
61 @include cb(320px, 60px); 62 @include cb(320px, 60px);
62 // @include cb(360px, 72px); 63 // @include cb(360px, 72px);
63 font-size: 26px; 64
64 } 65 }
65 66
66 .btn2 { 67 .btn2 {
......
...@@ -47,7 +47,8 @@ $contentWidth:690px; ...@@ -47,7 +47,8 @@ $contentWidth:690px;
47 width: 168px; 47 width: 168px;
48 height: 62px; 48 height: 62px;
49 border-radius: 10px; 49 border-radius: 10px;
50 border: solid 1px #b83138; 50 border: solid 1PX #b83138;
51 // border: solid 1px #b83138;
51 color: #b93138; 52 color: #b93138;
52 font-size: 24px; 53 font-size: 24px;
53 @extend .bb; 54 @extend .bb;
...@@ -93,7 +94,7 @@ $contentWidth:690px; ...@@ -93,7 +94,7 @@ $contentWidth:690px;
93 display: flex; 94 display: flex;
94 justify-content: space-between; 95 justify-content: space-between;
95 align-items: center; 96 align-items: center;
96 border-bottom: solid 1px #e0e0e0; 97 border-bottom: solid 1PX #e0e0e0;
97 98
98 .check { 99 .check {
99 width: 26px; 100 width: 26px;
...@@ -150,6 +151,12 @@ $contentWidth:690px; ...@@ -150,6 +151,12 @@ $contentWidth:690px;
150 151
151 152
152 } 153 }
154
155 .empty {
156 text-align: center;
157 margin-top: 100px;
158 color: #999999;
159 }
153 } 160 }
154 161
155 .btn-wrap { 162 .btn-wrap {
......
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
56 <view class="txt">导航</view> 56 <view class="txt">导航</view>
57 </view> 57 </view>
58 </view> 58 </view>
59 <view wx:if="{{addressList.length <= 0}}" class="empty">该区域无门店，换一个地方试试</view>
59 </scroll-view> 60 </scroll-view>
60 <!-- 按钮 --> 61 <!-- 按钮 -->
61 <view wx:if="{{selectedMode}}" class="btn-wrap"> 62 <view wx:if="{{selectedMode}}" class="btn-wrap">
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
4 .comp-item { 4 .comp-item {
5 position: relative; 5 position: relative;
6 width: 654px; 6 width: 654px;
7 height: 585px; 7 height: 645px;
8 8
9 // background-color: wheat; 9 // background-color: wheat;
10 .bg { 10 .bg {
11 position: absolute; 11 position: absolute;
12 width: 654px; 12 width: 654px;
13 height: 585px; 13 height: 645px;
14 } 14 }
15 15
16 .space1 { 16 .space1 {
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 position: absolute; 22 position: absolute;
23 left: 0; 23 left: 0;
24 right: 0; 24 right: 0;
25 bottom: 64px; 25 bottom: 80px;
26 margin: 0 auto; 26 margin: 0 auto;
27 } 27 }
28 } 28 }
......
1 Component({ 1 Component({
2 options: {
3 styleIsolation: 'apply-shared'
4 },
2 properties: { 5 properties: {
3 // 这里定义了innerText属性，属性值可以在组件使用时指定 6 // 这里定义了innerText属性，属性值可以在组件使用时指定
4 innerText: { 7 innerText: {
......
...@@ -27,4 +27,16 @@ ...@@ -27,4 +27,16 @@
27 // bottom: 100px; 27 // bottom: 100px;
28 margin: 0 auto; 28 margin: 0 auto;
29 } 29 }
30
31
32 }
33
34 .close-wrap {
35 text-align: center;
36 color: #ffffff;
37
38 .iconfont {
39 font-size: 100px;
40 }
41
30 } 42 }
......
...@@ -3,3 +3,6 @@ ...@@ -3,3 +3,6 @@
3 <view class="space1"></view> 3 <view class="space1"></view>
4 <view bindtap="hideMask" class="btn">我知道了</view> 4 <view bindtap="hideMask" class="btn">我知道了</view>
5 </scroll-view> 5 </scroll-view>
6 <view class="close-wrap">
7 <span bindtap="hideMask" class="iconfont iconclose1"></span>
8 </view>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 @extend .fcc; 6 @extend .fcc;
7 7
8 .notice { 8 .notice {
9 margin-top: 24px;
9 width: 439px; 10 width: 439px;
10 height: 235px; 11 height: 235px;
11 } 12 }
......
1 <view class="comp-item"> 1 <view class="comp-item">
2 <image class="notice" mode="widthFix" src="../../image/oss/coupon-detail/cd-c3.png" /> 2 <image class="notice" mode="widthFix" src="../../image/oss/coupon-detail/cd-c3.png?ver=1" />
3 </view> 3 </view>
......
...@@ -36,7 +36,7 @@ let productMap = { ...@@ -36,7 +36,7 @@ let productMap = {
36 sence: 1, 36 sence: 1,
37 point: { 37 point: {
38 left: 210, 38 left: 210,
39 top: 300, 39 top: 400,
40 }, 40 },
41 tips: { 41 tips: {
42 type: "top-left", 42 type: "top-left",
...@@ -50,11 +50,11 @@ let productMap = { ...@@ -50,11 +50,11 @@ let productMap = {
50 sence: 1, 50 sence: 1,
51 point: { 51 point: {
52 left: 460, 52 left: 460,
53 top: 180, 53 top: 120,
54 }, 54 },
55 tips: { 55 tips: {
56 type: "bottom-left", 56 type: "bottom-right",
57 point: mapFix["bottom-left"], 57 point: mapFix["bottom-right"],
58 } 58 }
59 }, 59 },
60 60
...@@ -98,14 +98,12 @@ let productMap = { ...@@ -98,14 +98,12 @@ let productMap = {
98 top: 300, 98 top: 300,
99 }, 99 },
100 tips: { 100 tips: {
101 type: "top-left", 101 type: "bottom-right",
102 point: mapFix["top-left"], 102 point: mapFix["bottom-right"],
103 } 103 }
104 }, 104 },
105 105
106 106
107
108
109 // 场景3 107 // 场景3
110 "P000000000000000000000000000001": { 108 "P000000000000000000000000000001": {
111 name: "丸美弹力蛋白眼精华素10g+10g", 109 name: "丸美弹力蛋白眼精华素10g+10g",
...@@ -127,11 +125,11 @@ let productMap = { ...@@ -127,11 +125,11 @@ let productMap = {
127 sence: 3, 125 sence: 3,
128 point: { 126 point: {
129 left: 380, 127 left: 380,
130 top: 180, 128 top: 280,
131 }, 129 },
132 tips: { 130 tips: {
133 type: "bottom-right", 131 type: "top-right",
134 point: mapFix["bottom-right"], 132 point: mapFix["top-right"],
135 } 133 }
136 }, 134 },
137 135
...@@ -142,11 +140,11 @@ let productMap = { ...@@ -142,11 +140,11 @@ let productMap = {
142 sence: 3, 140 sence: 3,
143 point: { 141 point: {
144 left: 540, 142 left: 540,
145 top: 440, 143 top: 380,
146 }, 144 },
147 tips: { 145 tips: {
148 type: "top-left", 146 type: "bottom-left",
149 point: mapFix["top-left"], 147 point: mapFix["bottom-left"],
150 } 148 }
151 }, 149 },
152 150
...@@ -177,8 +175,8 @@ let productMap = { ...@@ -177,8 +175,8 @@ let productMap = {
177 top: 300, 175 top: 300,
178 }, 176 },
179 tips: { 177 tips: {
180 type: "top-left", 178 type: "bottom-right",
181 point: mapFix["top-left"], 179 point: mapFix["bottom-right"],
182 } 180 }
183 }, 181 },
184 182
......

20.6 KB | W: | H:

20.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -25,6 +25,7 @@ Page({ ...@@ -25,6 +25,7 @@ Page({
25 status: 0, 25 status: 0,
26 animationShake: {}, // 摇一摇动画 26 animationShake: {}, // 摇一摇动画
27 aniTimeoutIndex: 0, 27 aniTimeoutIndex: 0,
28 initComplete: false,
28 }, 29 },
29 onShareAppMessage() {}, 30 onShareAppMessage() {},
30 showAuth() { 31 showAuth() {
...@@ -51,6 +52,7 @@ Page({ ...@@ -51,6 +52,7 @@ Page({
51 this.initData(); 52 this.initData();
52 }, 53 },
53 initData() { 54 initData() {
55 console.log("coop - initData");
54 app.queryIndex().then((result) => { 56 app.queryIndex().then((result) => {
55 this.setData({ 57 this.setData({
56 indexInfo: app.globalData.indexInfo, 58 indexInfo: app.globalData.indexInfo,
...@@ -124,6 +126,10 @@ Page({ ...@@ -124,6 +126,10 @@ Page({
124 if (this.data.tipsCommonVisible) { 126 if (this.data.tipsCommonVisible) {
125 return; 127 return;
126 } 128 }
129 // 引导注册
130 if (this.data.tipsGuideRegisterVisible) {
131 return;
132 }
127 // 自己表单 133 // 自己表单
128 if (wishInfo.isSelfWishBill == 1) { 134 if (wishInfo.isSelfWishBill == 1) {
129 return; 135 return;
...@@ -175,6 +181,7 @@ Page({ ...@@ -175,6 +181,7 @@ Page({
175 status: status, 181 status: status,
176 animationPassVisible: false 182 animationPassVisible: false
177 }) 183 })
184 this.queryWishbillDetail();
178 }, 2000); 185 }, 2000);
179 186
180 } else if (status == 2) { 187 } else if (status == 2) {
...@@ -228,7 +235,8 @@ Page({ ...@@ -228,7 +235,8 @@ Page({
228 }); 235 });
229 this.setData({ 236 this.setData({
230 wishInfo: result, 237 wishInfo: result,
231 wishList: wishList 238 wishList: wishList,
239 initComplete: true,
232 }) 240 })
233 console.log("wishInfo:", this.data.wishInfo); 241 console.log("wishInfo:", this.data.wishInfo);
234 console.log("wishList:", this.data.wishList); 242 console.log("wishList:", this.data.wishList);
...@@ -250,6 +258,7 @@ Page({ ...@@ -250,6 +258,7 @@ Page({
250 name, 258 name,
251 data 259 data
252 } = evt.detail; 260 } = evt.detail;
261 console.log("name:", name);
253 switch (name) { 262 switch (name) {
254 263
255 case "_evt_hide_mask": 264 case "_evt_hide_mask":
...@@ -272,7 +281,8 @@ Page({ ...@@ -272,7 +281,8 @@ Page({
272 }) 281 })
273 break; 282 break;
274 283
275 case "_evt_auth_complete:": 284 case "_evt_auth_complete":
285 this.hideMask();
276 this.initData(); 286 this.initData();
277 break; 287 break;
278 288
......
1 <view class="page"> 1 <view class="page">
2 <view wx:if="{{animationPassVisible}}" class="ani"> 2 <view wx:if="{{animationPassVisible}}" class="ani">
3 <view class="mask"></view> 3 <view class="mask"></view>
4 <image class="gif" mode="widthFix" src="../../image/oss/ani/pass.gif" /> 4 <image class="gif" mode="widthFix" src="../../image/oss/ani/pass.gif?ver=1" />
5 </view> 5 </view>
6 <view class="app__bgc bgc"></view> 6 <view class="app__bgc bgc"></view>
7 <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" />
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <!-- 点自己链接未助力 --> 16 <!-- 点自己链接未助力 -->
17 <view bindtap="queryWishbillAssist" wx:if="{{wishInfo.isSelfWishBill == 1 || (status != 1 && wishInfo.isAssist != 1)}}" class="shake"> 17 <view bindtap="queryWishbillAssist" wx:if="{{wishInfo.isSelfWishBill == 1 || (status != 1 && wishInfo.isAssist != 1)}}" class="shake">
18 <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" />
19 <image class="coop-shake animated infinite {{animationPassVisible?'':'tada'}}" mode="widthFix" src="../../image/oss/coop/coop-shake.png" /> 19 <image class="coop-shake animated infinite {{animationPassVisible || !initComplete ?'':'tada'}}" mode="widthFix" src="../../image/oss/coop/coop-shake.png" />
20 <view class="space1"></view> 20 <view class="space1"></view>
21 <view class="cont"> 21 <view class="cont">
22 <view class="tips"> 22 <view class="tips">
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 </view> 60 </view>
61 </view> 61 </view>
62 <view class="tips2"> 62 <view class="tips2">
63 <text class="t1">太厉害了\n您总共摇出了{{coopInfo.totalElasticValue}}弹力值</text> 63 <text class="t1">太厉害了\n您总共摇出了{{wishInfo.helpElasticValue}}弹力值</text>
64 </view> 64 </view>
65 <!-- 奖品 --> 65 <!-- 奖品 -->
66 <view class="wish"> 66 <view class="wish">
...@@ -87,9 +87,7 @@ ...@@ -87,9 +87,7 @@
87 </view> 87 </view>
88 </view> 88 </view>
89 </view> 89 </view>
90 <view wx:if="{{isSelfWishBill == 1 || (status != 1 && wishInfo.isAssist != 1)}}" bindtap="onPlayTooHandler" class="play-too-btn"> 90 <view bindtap="onPlayTooHandler" class="play-too-btn">我也要玩</view>
91 我也要玩
92 </view>
93 </view> 91 </view>
94 </view> 92 </view>
95 </view> 93 </view>
......
1
2 import { 1 import {
3 getBindtapData, 2 getBindtapData,
4 pxToRpx, 3 pxToRpx,
...@@ -42,16 +41,19 @@ Page({ ...@@ -42,16 +41,19 @@ Page({
42 41
43 let wishInfo = this.data.wishInfo; 42 let wishInfo = this.data.wishInfo;
44 let couponInfo = this.data.couponInfo; 43 let couponInfo = this.data.couponInfo;
44 if(!couponInfo){
45 return;
46 }
45 47
46 // 设置二维码 48 // 设置二维码
47 let qrSize = this.setCanvasSize(340); 49 let qrSize = this.setCanvasSize(340);
48 console.log("couponInfo:", couponInfo); 50 console.log("couponInfo:", couponInfo);
49 let codeContent = couponInfo.couponCode || ''; 51 let codeContent = couponInfo && couponInfo.couponCode || '';
50 this.createQrCode(codeContent, 'qrcanvas', qrSize.w, qrSize.h); 52 this.createQrCode(codeContent, 'qrcanvas', qrSize.w, qrSize.h);
51 53
52 // 判断是否使用 54 // 判断是否使用
53 // 自提券 使用状态（0=未使用 1=已过期，2=已使用） 55 // 自提券 使用状态（0=未使用 1=已过期，2=已使用）
54 let used = couponInfo.state != 0; 56 let used = couponInfo && couponInfo.state != 0;
55 57
56 // 设置起止时间 58 // 设置起止时间
57 couponInfo.startDateStr = new Date(couponInfo.startDate).toString("yyyy.MM.dd"); 59 couponInfo.startDateStr = new Date(couponInfo.startDate).toString("yyyy.MM.dd");
...@@ -63,24 +65,6 @@ Page({ ...@@ -63,24 +65,6 @@ Page({
63 used: used 65 used: used
64 }) 66 })
65 67
66
67 // 设置坐标
68 // wx.getLocation({
69 // type: 'gcj02',
70 // success(res) {
71 // let targetLocation = {
72 // latitude: wishInfo.latitude,
73 // longitude: wishInfo.longitude,
74 // }
75 // let distance = getLocalDistance(res, targetLocation).dis;
76 // wishInfo.distance = distance;
77 // console.log("distance:", distance);
78 // _this.setData({
79 // wishInfo: wishInfo
80 // })
81 // }
82 // })
83
84 }) 68 })
85 }, 69 },
86 /** 70 /**
......
...@@ -29,17 +29,11 @@ Page({ ...@@ -29,17 +29,11 @@ Page({
29 wishInfo: {}, // 创建后的心愿信息 29 wishInfo: {}, // 创建后的心愿信息
30 wishList: [], // 创建后的心愿单列表 30 wishList: [], // 创建后的心愿单列表
31 userInfo: {}, 31 userInfo: {},
32 isPageVisible: false,
33 // canShake:false, 32 // canShake:false,
34 guideIndex: 0, 33 guideIndex: 0,
35 }, 34 },
36 onShareAppMessage() {}, 35 onShareAppMessage() {},
37 onShow() { 36 onShow() {},
38 this.isPageVisible = true;
39 },
40 onHide() {
41 this.isPageVisible = false;
42 },
43 onLoad(options) { 37 onLoad(options) {
44 // console.log("cw -- onLoad"); 38 // console.log("cw -- onLoad");
45 this.initData(); 39 this.initData();
...@@ -80,7 +74,7 @@ Page({ ...@@ -80,7 +74,7 @@ Page({
80 initShake() { 74 initShake() {
81 let _this = this; 75 let _this = this;
82 wx.onAccelerometerChange(function (res) { 76 wx.onAccelerometerChange(function (res) {
83 if (!_this.data.isPageVisible || !_this.data.isPageVisible) { 77 if (!_this.data.tipsShakeVisible) {
84 return 78 return
85 } 79 }
86 if (res.x > 1) { //偏移量为2时触发，有的使用1 80 if (res.x > 1) { //偏移量为2时触发，有的使用1
...@@ -88,10 +82,26 @@ Page({ ...@@ -88,10 +82,26 @@ Page({
88 tipsShakeVisible: false, 82 tipsShakeVisible: false,
89 tipsCreateCompleteVisible: true 83 tipsCreateCompleteVisible: true
90 }) 84 })
85 _this.playShakeSound();
91 } 86 }
92 }); 87 });
93 }, 88 },
94 89
90 /**
91 * 播放摇动声音
92 */
93 playShakeSound() {
94 const innerAudioContext = wx.createInnerAudioContext()
95 innerAudioContext.autoplay = true;
96 innerAudioContext.src = "https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/mp3/shake.mp3";
97 innerAudioContext.onPlay(() => {
98 console.log('开始播放')
99 })
100 innerAudioContext.onError((res) => {
101 console.log(res.errMsg)
102 console.log(res.errCode)
103 })
104 },
95 105
96 /** 106 /**
97 * 是否第一次进入当前页面 107 * 是否第一次进入当前页面
...@@ -283,10 +293,23 @@ Page({ ...@@ -283,10 +293,23 @@ Page({
283 url: app.api.selfAssist, 293 url: app.api.selfAssist,
284 data: {} 294 data: {}
285 }).then((result2) => { 295 }).then((result2) => {
296 let wishBillInfo = result2;
297
298 wishBillInfo.elasticValueList.forEach(element => {
299 let product = productMap[element.prizeDefineCode + ""];
300 element = Object.assign(element, product);
301 });
302
286 this.setData({ 303 this.setData({
287 tipsShakeVisible: true, 304 tipsShakeVisible: true,
288 wishBillInfo: result2 305 wishBillInfo: wishBillInfo
289 }) 306 })
307 console.log("----->");
308 console.log("wishBillInfo:", this.data.wishBillInfo);
309 console.log("wishInfo:", this.data.wishInfo);
310 console.log("wishList:", this.data.wishList);
311 console.log("taskTotalElasticValue:", this.data.taskTotalElasticValue);
312
290 }) 313 })
291 } 314 }
292 }).catch((err) => { 315 }).catch((err) => {
...@@ -490,8 +513,6 @@ Page({ ...@@ -490,8 +513,6 @@ Page({
490 this.hideMask(); 513 this.hideMask();
491 break; 514 break;
492 515
493
494
495 // 创建心愿单 516 // 创建心愿单
496 case "_evt_create_wish": 517 case "_evt_create_wish":
497 this.hideMask(); 518 this.hideMask();
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 45
46 .rect { 46 .rect {
47 position: absolute; 47 position: absolute;
48 z-index: 41; 48 z-index: 11;
49 // background-color: wheat; 49 // background-color: wheat;
50 opacity: .5; 50 opacity: .5;
51 } 51 }
...@@ -56,12 +56,12 @@ ...@@ -56,12 +56,12 @@
56 56
57 .point1 { 57 .point1 {
58 left: 210px; 58 left: 210px;
59 top: 300px; 59 top: 400px;
60 } 60 }
61 61
62 .point2 { 62 .point2 {
63 left: 460px; 63 left: 460px;
64 top: 180px; 64 top: 120px;
65 } 65 }
66 66
67 .point3 { 67 .point3 {
...@@ -131,12 +131,12 @@ ...@@ -131,12 +131,12 @@
131 131
132 .point2 { 132 .point2 {
133 left: 380px; 133 left: 380px;
134 top: 180px; 134 top: 280px;
135 } 135 }
136 136
137 .point3 { 137 .point3 {
138 left: 540px; 138 left: 540px;
139 top: 440px; 139 top: 380px;
140 } 140 }
141 141
142 .rect1 { 142 .rect1 {
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
259 // 换一批按钮 259 // 换一批按钮
260 .change-btn { 260 .change-btn {
261 position: relative; 261 position: relative;
262 z-index: 9999; 262 z-index: 31;
263 margin-left: 48px; 263 margin-left: 48px;
264 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);
265 background-color: #ffffff; 265 background-color: #ffffff;
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
293 } 293 }
294 294
295 .space1 { 295 .space1 {
296 height: 116px; 296 height: 100px;
297 } 297 }
298 298
299 // 心愿 299 // 心愿
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
444 &-item-1 { 444 &-item-1 {
445 width: 402px; 445 width: 402px;
446 height: 451px; 446 height: 451px;
447 top: 76px; 447 top: 176px;
448 left: 36px; 448 left: 36px;
449 } 449 }
450 450
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 <tips-shake-comp bind:evtcomp="evtcomp"></tips-shake-comp> 117 <tips-shake-comp bind:evtcomp="evtcomp"></tips-shake-comp>
118 </van-popup> 118 </van-popup>
119 <van-popup show="{{ tipsCreateCompleteVisible }}"> 119 <van-popup show="{{ tipsCreateCompleteVisible }}">
120 <tips-create-complete-comp bind:evtcomp="evtcomp" wish-info="{{wishInfo}}" wish-list="{{wishList}}" wish-list="{{wishList}}" ele-val="{{taskTotalElasticValue}}" wish-bill-info="{{wishBillInfo}}"></tips-create-complete-comp> 120 <tips-create-complete-comp bind:evtcomp="evtcomp" wish-info="{{wishInfo}}" wish-list="{{wishList}}" ele-val="{{taskTotalElasticValue}}" wish-bill-info="{{wishBillInfo}}"></tips-create-complete-comp>
121 </van-popup> 121 </van-popup>
122 <van-popup show="{{ tipsCommonVisible }}"> 122 <van-popup show="{{ tipsCommonVisible }}">
123 <tips-common-comp bind:evtcomp="evtcomp" inner-text="{{tipsInnerText}}"></tips-common-comp> 123 <tips-common-comp bind:evtcomp="evtcomp" inner-text="{{tipsInnerText}}"></tips-common-comp>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <view class="ipt-icon"> 16 <view class="ipt-icon">
17 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-mobile.png" /> 17 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-mobile.png" />
18 </view> 18 </view>
19 <input value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" /> 19 <input type="number" value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" />
20 </view> 20 </view>
21 <!-- 滑动拼图 --> 21 <!-- 滑动拼图 -->
22 <view class="puzzle"> 22 <view class="puzzle">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 <view class="ipt-icon"> 42 <view class="ipt-icon">
43 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" /> 43 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
44 </view> 44 </view>
45 <input value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" /> 45 <input type="number" value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
46 <view bindtap="reqGetSmsRequest" class="ipt-verify"> 46 <view bindtap="reqGetSmsRequest" class="ipt-verify">
47 {{sendAuthCode ? "获取验证码": auth_time+"(s)"}} 47 {{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
48 </view> 48 </view>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
22 </view> 22 </view>
23 </view> 23 </view>
24 </view> 24 </view>
25 <empty-tips wx:if="{{prizeInfo.length <= 0}}"></empty-tips>
25 <!-- 查看门店需要 couponId --> 26 <!-- 查看门店需要 couponId -->
26 <!-- <view class="store-btn" bindtap="onNearbyStoreHandler"> 27 <!-- <view class="store-btn" bindtap="onNearbyStoreHandler">
27 <span class="c1">附近门店查询</span> 28 <span class="c1">附近门店查询</span>
......
...@@ -19,7 +19,8 @@ Page({ ...@@ -19,7 +19,8 @@ Page({
19 let path = `/pages/coop/coop?code=${billCode}&s=share` 19 let path = `/pages/coop/coop?code=${billCode}&s=share`
20 return { 20 return {
21 title, 21 title,
22 path 22 path,
23 imageUrl: 'https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/share.png'
23 } 24 }
24 }, 25 },
25 onLoad(options) { 26 onLoad(options) {
......
...@@ -16,7 +16,7 @@ Page({ ...@@ -16,7 +16,7 @@ Page({
16 verifyCode: "", 16 verifyCode: "",
17 birthday: "", 17 birthday: "",
18 password: "", 18 password: "",
19 sex: -1, 19 sex: "",
20 sexList: [{ 20 sexList: [{
21 label: "女", 21 label: "女",
22 value: 0 22 value: 0
...@@ -138,15 +138,15 @@ Page({ ...@@ -138,15 +138,15 @@ Page({
138 } else if (!this.data.birthday) { 138 } else if (!this.data.birthday) {
139 this.showLog("请输入生日"); 139 this.showLog("请输入生日");
140 reject(); 140 reject();
141 } else if (!this.data.password) { 141 // } else if (!this.data.password) {
142 this.showLog("请输入登陆密码"); 142 // this.showLog("请输入登陆密码");
143 reject(); 143 // reject();
144 } else if (!this.data.verifyCode) { 144 } else if (!this.data.verifyCode) {
145 this.showLog("请输入验证码"); 145 this.showLog("请输入验证码");
146 reject(); 146 reject();
147 } else if (this.data.sex != 0 && this.data.sex != 1) { 147 // } else if (this.data.sex != 0 && this.data.sex != 1) {
148 this.showLog("请选择性别"); 148 // this.showLog("请选择性别");
149 reject(); 149 // reject();
150 } else if (!this.data.isPlzAuth) { 150 } else if (!this.data.isPlzAuth) {
151 this.showLog("请完成拼图验证"); 151 this.showLog("请完成拼图验证");
152 reject(); 152 reject();
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <view class="ipt-icon"> 16 <view class="ipt-icon">
17 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-mobile.png" /> 17 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-mobile.png" />
18 </view> 18 </view>
19 <input value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" /> 19 <input type="number" value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" />
20 </view> 20 </view>
21 <!-- 名字 --> 21 <!-- 名字 -->
22 <view class="ipt"> 22 <view class="ipt">
...@@ -35,12 +35,12 @@ ...@@ -35,12 +35,12 @@
35 </view> 35 </view>
36 </picker> 36 </picker>
37 <!-- 登陆密码 --> 37 <!-- 登陆密码 -->
38 <view class="ipt"> 38 <!-- <view class="ipt">
39 <view class="ipt-icon"> 39 <view class="ipt-icon">
40 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" /> 40 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
41 </view> 41 </view>
42 <input password="{{true}}" value="{{password}}" bindinput="bindPasswordInput" class="ipt-input" placeholder="登陆密码" placeholder-class="placeholder" /> 42 <input password="{{true}}" value="{{password}}" bindinput="bindPasswordInput" class="ipt-input" placeholder="登陆密码" placeholder-class="placeholder" />
43 </view> 43 </view> -->
44 <!-- 滑动拼图 --> 44 <!-- 滑动拼图 -->
45 <view class="puzzle"> 45 <view class="puzzle">
46 <view class="plz"> 46 <view class="plz">
...@@ -65,18 +65,18 @@ ...@@ -65,18 +65,18 @@
65 <view class="ipt-icon"> 65 <view class="ipt-icon">
66 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" /> 66 <image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
67 </view> 67 </view>
68 <input value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" /> 68 <input type="number" value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
69 <view bindtap="reqGetSmsRequest" class="ipt-verify"> 69 <view bindtap="reqGetSmsRequest" class="ipt-verify">
70 {{sendAuthCode ? "获取验证码": auth_time+"(s)"}} 70 {{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
71 </view> 71 </view>
72 </view> 72 </view>
73 <!-- 性别 --> 73 <!-- 性别 -->
74 <radio-group class="radio-group" bindchange="onSexRadioChange"> 74 <!-- <radio-group class="radio-group" bindchange="onSexRadioChange">
75 <label class="radio" wx:for="{{sexList}}" wx:key="{{index}}"> 75 <label class="radio" wx:for="{{sexList}}" wx:key="{{index}}">
76 <radio color="#ba3138" value="{{item.value}}" checked="{{item.checked}}" /> 76 <radio color="#ba3138" value="{{item.value}}" checked="{{item.checked}}" />
77 {{item.label}} 77 {{item.label}}
78 </label> 78 </label>
79 </radio-group> 79 </radio-group> -->
80 </view> 80 </view>
81 <!-- 条款/政策 --> 81 <!-- 条款/政策 -->
82 <view class="policy"> 82 <view class="policy">
......
...@@ -33,13 +33,15 @@ Page({ ...@@ -33,13 +33,15 @@ Page({
33 let path = `/pages/coop/coop?code=${billCode}&s=share` 33 let path = `/pages/coop/coop?code=${billCode}&s=share`
34 return { 34 return {
35 title, 35 title,
36 path 36 path,
37 imageUrl: 'https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/share.png'
37 } 38 }
38 } else { 39 } else {
39 //分享配置 40 //分享配置
40 return { 41 return {
41 title: '弹弹弹 看你有多弹', 42 title: '弹弹弹 看你有多弹',
42 path: 'pages/index/index' 43 path: 'pages/index/index',
44 imageUrl: 'https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/marubi/wish-list/share.png'
43 }; 45 };
44 } 46 }
45 }, 47 },
......
...@@ -249,6 +249,7 @@ ...@@ -249,6 +249,7 @@
249 margin-top: 16px; 249 margin-top: 16px;
250 color: #333333; 250 color: #333333;
251 font-size: 24px; 251 font-size: 24px;
252 height: 48px;
252 253
253 .t1 { 254 .t1 {
254 color: #ba3039; 255 color: #ba3039;
...@@ -344,9 +345,9 @@ ...@@ -344,9 +345,9 @@
344 } 345 }
345 346
346 &-item-1 { 347 &-item-1 {
347 width: 438px; 348 width: 538px;
348 height: 426px; 349 height: 534px;
349 top: 25px; 350 top: 28px;
350 right: 2px; 351 right: 2px;
351 } 352 }
352 353
...@@ -367,7 +368,7 @@ ...@@ -367,7 +368,7 @@
367 &-item-4 { 368 &-item-4 {
368 width: 608px; 369 width: 608px;
369 height: 426px; 370 height: 426px;
370 top: 1574px; 371 top: 1588px;
371 left: 95px; 372 left: 95px;
372 } 373 }
373 } 374 }
......
...@@ -68,8 +68,11 @@ ...@@ -68,8 +68,11 @@
68 有 68 有
69 <span class="t1">{{helperInfo.total}}</span> 69 <span class="t1">{{helperInfo.total}}</span>
70 位好友帮忙，收集到 70 位好友帮忙，收集到
71 <span class="t1">{{helperInfo.totalElasticValue}}</span> 71 <span class="t1">{{helperInfo.helpElasticValue}}</span>
72 弹力值！ 72 弹力值！
73 总弹力值:
74 <span class="t1">{{helperInfo.totalElasticValue}}</span>
75 。
73 </view> 76 </view>
74 <scroll-view scroll-y="{{true}}" class="list"> 77 <scroll-view scroll-y="{{true}}" class="list">
75 <view wx:for="{{helperInfo.helpers}}" wx:key="{{index}}" class="list-item"> 78 <view wx:for="{{helperInfo.helpers}}" wx:key="{{index}}" class="list-item">
......