Skip to content

dev / marubi-wish-list-mp

Go to a project
Toggle navigation
Toggle navigation pinning
200dd8be by simon
Options

no message

1 parent 726dff38
Inline Side-by-side
Showing 9 changed files with 52 additions and 36 deletions
...@@ -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: 1093px; 7 height: 666px;
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: 1093px; 13 height: 666px;
14 } 14 }
15 15
16 .space1 { 16 .space1 {
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 font-size: 40px; 33 font-size: 40px;
34 font-weight: 300; 34 font-weight: 300;
35 color: #ba3138; 35 color: #ba3138;
36 top: 68px; 36 top: 160px;
37 @include ellipsis(1); 37 @include ellipsis(1);
38 } 38 }
39 } 39 }
......
...@@ -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: 100px; 25 bottom: 64px;
26 margin: 0 auto; 26 margin: 0 auto;
27 } 27 }
28 } 28 }
......
...@@ -45,7 +45,8 @@ Page({ ...@@ -45,7 +45,8 @@ Page({
45 initData() { 45 initData() {
46 app.queryIndex().then((result) => { 46 app.queryIndex().then((result) => {
47 this.setData({ 47 this.setData({
48 userInfo: app.globalData.userInfo 48 indexInfo: app.globalData.indexInfo,
49 userInfo: app.globalData.userInfo,
49 }) 50 })
50 this.queryWishbillDetail(); 51 this.queryWishbillDetail();
51 this.initShake(); 52 this.initShake();
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
9 <view class="content"> 9 <view class="content">
10 <!-- 摇一摇 --> 10 <!-- 摇一摇 -->
11 <!-- bindtap="queryWishbillAssist" --> 11 <!-- bindtap="queryWishbillAssist" -->
12 <view bindtap="queryWishbillAssist" wx:if="{{status != 1 && wishInfo.isAssist != 1}}" class="shake"> 12 <!-- 点自己链接
13 未助力 -->
14 <view bindtap="queryWishbillAssist" wx:if="{{options.code == indexInfo.wishBillCode || (status != 1 && wishInfo.isAssist != 1)}}" class="shake">
13 <image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" /> 15 <image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" />
14 <image class="coop-shake animated tada infinite" mode="widthFix " src="../../image/oss/coop/coop-shake.png" /> 16 <image class="coop-shake animated tada infinite" mode="widthFix " src="../../image/oss/coop/coop-shake.png" />
15 <view class="space1"></view> 17 <view class="space1"></view>
......
...@@ -59,7 +59,7 @@ Page({ ...@@ -59,7 +59,7 @@ Page({
59 this.queryWishbillPrizeCandidate().then((result) => { 59 this.queryWishbillPrizeCandidate().then((result) => {
60 this.initBorder(); 60 this.initBorder();
61 }) 61 })
62 this.checkNeedQuestion(); 62 // this.checkNeedQuestion();
63 this.checkFirst(); 63 this.checkFirst();
64 }); 64 });
65 this.initShake(); 65 this.initShake();
...@@ -125,6 +125,9 @@ Page({ ...@@ -125,6 +125,9 @@ Page({
125 tipsNewMemberVisible: true, 125 tipsNewMemberVisible: true,
126 }) 126 })
127 } else {} 127 } else {}
128 // this.setData({
129 // tipsNewMemberVisible: true,
130 // })
128 resolve(); 131 resolve();
129 }); 132 });
130 }, 133 },
......
...@@ -37,6 +37,7 @@ Page({ ...@@ -37,6 +37,7 @@ Page({
37 initData() {}, 37 initData() {},
38 // 开始互动游戏 判断是否会员 38 // 开始互动游戏 判断是否会员
39 onStartHandler() { 39 onStartHandler() {
40 console.log("onStartHandler");
40 app.queryIndex({ 41 app.queryIndex({
41 auth: false 42 auth: false
42 }).then((result) => { 43 }).then((result) => {
...@@ -90,6 +91,7 @@ Page({ ...@@ -90,6 +91,7 @@ Page({
90 }, 91 },
91 92
92 bindGetUserInfo(e) { 93 bindGetUserInfo(e) {
94 console.log("222");
93 wx.showLoading(); 95 wx.showLoading();
94 this.getUserInfo(e.detail); 96 this.getUserInfo(e.detail);
95 }, 97 },
......
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
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" />
10 <image class="d2" src="../../image/oss/index/index-c3.png" mode="widthFix" /> 10 <image class="d2" src="../../image/oss/index/index-c3.png" mode="widthFix" />
11 </view> 11 </view>
12 <view class="app__content main" > 12 <view class="app__content main">
13 <view class="top-space"></view> 13 <view class="top-space"></view>
14 <view class="content"> 14 <view class="content">
15 <!-- 已授权 直接到下一步操作 --> 15 <!-- 已授权 直接到下一步操作 -->
16 <!-- 需要授权 --> 16 <!-- 需要授权 -->
17 <button wx:if="{{indexInfo.isNeedAuth == 1}}" bindgetuserinfo="bindGetUserInfo" class="btn"> 17 <!-- <button wx:if="{{indexInfo.isNeedAuth == 1}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn">
18 马上测弹力值 18 马上测弹力值
19 </button> 19 </button> -->
20 <!-- 已授权 --> 20 <!-- 已授权 -->
21 <button wx:else bindtap="onStartHandler" class="btn">马上测弹力值</button> 21 <button bindtap="onStartHandler" class="btn">马上测弹力值</button>
22 <!-- 未授权 拉起授权弹窗 --> 22 <!-- 未授权 拉起授权弹窗 -->
23 <!-- <button class="btn" wx:else open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">马上测弹力值2</button> --> 23 <!-- <button class="btn" wx:else open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">马上测弹力值2</button> -->
24 </view> 24 </view>
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
27 </view> 27 </view>
28 </view> 28 </view>
29 </view> 29 </view>
30 <van-popup show="{{ authorizeVisible }}" bind:click-overlay="hideMask"> 30 <van-popup show="{{ authorizeVisible }}" bind:click-overlay="hideMask">
31 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> 31 <authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
32 </van-popup> 32 </van-popup>
33 <van-popup show="{{ tipsRuleVisible }}" > 33 <van-popup show="{{ tipsRuleVisible }}">
34 <tips-rule-comp bind:evtcomp="evtcomp"></tips-rule-comp> 34 <tips-rule-comp bind:evtcomp="evtcomp"></tips-rule-comp>
35 </van-popup> 35 </van-popup>
......
...@@ -72,17 +72,21 @@ Page({ ...@@ -72,17 +72,21 @@ Page({
72 data: data 72 data: data
73 }).then((result) => { 73 }).then((result) => {
74 if (result.status == 1) { 74 if (result.status == 1) {
75 wx.showModal({ 75 // wx.showModal({
76 title: "登陆成功", 76 // title: "登陆成功",
77 content: "继续生成我的心愿单", 77 // content: "继续生成我的心愿单",
78 confirmText: "马上前往", 78 // confirmText: "马上前往",
79 showCancel: false, 79 // showCancel: false,
80 success(res) { 80 // success(res) {
81 app.router.push({ 81 // app.router.push({
82 openType: "redirectTo", 82 // openType: "redirectTo",
83 path: _this.data.redirect 83 // path: _this.data.redirect
84 }) 84 // })
85 } 85 // }
86 // })
87 app.router.push({
88 openType: "redirectTo",
89 path: _this.data.redirect
86 }) 90 })
87 } else if (result.status == 0) { 91 } else if (result.status == 0) {
88 this.setData({ 92 this.setData({
......
...@@ -93,18 +93,22 @@ Page({ ...@@ -93,18 +93,22 @@ Page({
93 data: data 93 data: data
94 }).then((result) => { 94 }).then((result) => {
95 if (result.status == 1) { 95 if (result.status == 1) {
96 wx.showModal({ 96 // wx.showModal({
97 title: "注册成功", 97 // title: "注册成功",
98 content: "继续创建心愿单", 98 // content: "继续创建心愿单",
99 confirmText: "马上前往", 99 // confirmText: "马上前往",
100 showCancel: false, 100 // showCancel: false,
101 success(res) { 101 // success(res) {
102 // 注册成功直接跳回创建心愿单页 102 // // 注册成功直接跳回创建心愿单页
103 app.router.push({ 103 // app.router.push({
104 openType: "redirectTo", 104 // openType: "redirectTo",
105 path: "createWish" 105 // path: "createWish"
106 }) 106 // })
107 } 107 // }
108 // })
109 app.router.push({
110 openType: "redirectTo",
111 path: "createWish"
108 }) 112 })
109 } else if (result.status == 2) { 113 } else if (result.status == 2) {
110 this.setData({ 114 this.setData({
......