Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
dev
/
marubi-wish-list-mp
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
200dd8be
authored
2019-08-13 00:35:01 +0800
by
simon
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
no message
1 parent
726dff38
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
52 additions
and
36 deletions
src/component/tips-new-comp/tips-new-comp.scss
src/component/tips-register-comp/tips-register-comp.scss
src/pages/coop/coop.js
src/pages/coop/coop.wxml
src/pages/create-wish/create-wish.js
src/pages/index/index.js
src/pages/index/index.wxml
src/pages/login/login.js
src/pages/register/register.js
src/component/tips-new-comp/tips-new-comp.scss
View file @
200dd8b
...
...
@@ -4,13 +4,13 @@
.comp-item
{
position
:
relative
;
width
:
654px
;
height
:
1093
px
;
height
:
666
px
;
// background-color: wheat;
.bg
{
position
:
absolute
;
width
:
654px
;
height
:
1093
px
;
height
:
666
px
;
}
.space1
{
...
...
@@ -33,7 +33,7 @@
font-size
:
40px
;
font-weight
:
300
;
color
:
#ba3138
;
top
:
68
px
;
top
:
160
px
;
@include
ellipsis
(
1
);
}
}
...
...
src/component/tips-register-comp/tips-register-comp.scss
View file @
200dd8b
...
...
@@ -22,7 +22,7 @@
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
100
px
;
bottom
:
64
px
;
margin
:
0
auto
;
}
}
...
...
src/pages/coop/coop.js
View file @
200dd8b
...
...
@@ -45,7 +45,8 @@ Page({
initData
()
{
app
.
queryIndex
().
then
((
result
)
=>
{
this
.
setData
({
userInfo
:
app
.
globalData
.
userInfo
indexInfo
:
app
.
globalData
.
indexInfo
,
userInfo
:
app
.
globalData
.
userInfo
,
})
this
.
queryWishbillDetail
();
this
.
initShake
();
...
...
src/pages/coop/coop.wxml
View file @
200dd8b
...
...
@@ -9,7 +9,9 @@
<view class="content">
<!-- 摇一摇 -->
<!-- bindtap="queryWishbillAssist" -->
<view bindtap="queryWishbillAssist" wx:if="{{status != 1 && wishInfo.isAssist != 1}}" class="shake">
<!-- 点自己链接
未助力 -->
<view bindtap="queryWishbillAssist" wx:if="{{options.code == indexInfo.wishBillCode || (status != 1 && wishInfo.isAssist != 1)}}" class="shake">
<image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" />
<image class="coop-shake animated tada infinite" mode="widthFix " src="../../image/oss/coop/coop-shake.png" />
<view class="space1"></view>
...
...
src/pages/create-wish/create-wish.js
View file @
200dd8b
...
...
@@ -59,7 +59,7 @@ Page({
this
.
queryWishbillPrizeCandidate
().
then
((
result
)
=>
{
this
.
initBorder
();
})
this
.
checkNeedQuestion
();
//
this.checkNeedQuestion();
this
.
checkFirst
();
});
this
.
initShake
();
...
...
@@ -125,6 +125,9 @@ Page({
tipsNewMemberVisible
:
true
,
})
}
else
{}
// this.setData({
// tipsNewMemberVisible: true,
// })
resolve
();
});
},
...
...
src/pages/index/index.js
View file @
200dd8b
...
...
@@ -37,6 +37,7 @@ Page({
initData
()
{},
// 开始互动游戏 判断是否会员
onStartHandler
()
{
console
.
log
(
"onStartHandler"
);
app
.
queryIndex
({
auth
:
false
}).
then
((
result
)
=>
{
...
...
@@ -90,6 +91,7 @@ Page({
},
bindGetUserInfo
(
e
)
{
console
.
log
(
"222"
);
wx
.
showLoading
();
this
.
getUserInfo
(
e
.
detail
);
},
...
...
src/pages/index/index.wxml
View file @
200dd8b
...
...
@@ -9,16 +9,16 @@
<image class="d1" src="../../image/oss/index/index-c4.png" mode="widthFix" />
<image class="d2" src="../../image/oss/index/index-c3.png" mode="widthFix" />
</view>
<view class="app__content main"
>
<view class="app__content main">
<view class="top-space"></view>
<view class="content">
<!-- 已授权 直接到下一步操作 -->
<!-- 需要授权 -->
<
button wx:if="{{indexInfo.isNeedAuth == 1}}
" bindgetuserinfo="bindGetUserInfo" class="btn">
<
!-- <button wx:if="{{indexInfo.isNeedAuth == 1}}" open-type="getUserInfo
" bindgetuserinfo="bindGetUserInfo" class="btn">
马上测弹力值
</button>
</button>
-->
<!-- 已授权 -->
<button
wx:else
bindtap="onStartHandler" class="btn">马上测弹力值</button>
<button bindtap="onStartHandler" class="btn">马上测弹力值</button>
<!-- 未授权 拉起授权弹窗 -->
<!-- <button class="btn" wx:else open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">马上测弹力值2</button> -->
</view>
...
...
@@ -27,9 +27,9 @@
</view>
</view>
</view>
<van-popup show="{{ authorizeVisible }}"
bind:click-overlay="hideMask">
<van-popup show="{{ authorizeVisible }}" bind:click-overlay="hideMask">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
<van-popup show="{{ tipsRuleVisible }}"
>
<van-popup show="{{ tipsRuleVisible }}">
<tips-rule-comp bind:evtcomp="evtcomp"></tips-rule-comp>
</van-popup>
...
...
src/pages/login/login.js
View file @
200dd8b
...
...
@@ -72,17 +72,21 @@ Page({
data
:
data
}).
then
((
result
)
=>
{
if
(
result
.
status
==
1
)
{
wx
.
showModal
({
title
:
"登陆成功"
,
content
:
"继续生成我的心愿单"
,
confirmText
:
"马上前往"
,
showCancel
:
false
,
success
(
res
)
{
app
.
router
.
push
({
openType
:
"redirectTo"
,
path
:
_this
.
data
.
redirect
})
}
// wx.showModal({
// title: "登陆成功",
// content: "继续生成我的心愿单",
// confirmText: "马上前往",
// showCancel: false,
// success(res) {
// app.router.push({
// openType: "redirectTo",
// path: _this.data.redirect
// })
// }
// })
app
.
router
.
push
({
openType
:
"redirectTo"
,
path
:
_this
.
data
.
redirect
})
}
else
if
(
result
.
status
==
0
)
{
this
.
setData
({
...
...
src/pages/register/register.js
View file @
200dd8b
...
...
@@ -93,18 +93,22 @@ Page({
data
:
data
}).
then
((
result
)
=>
{
if
(
result
.
status
==
1
)
{
wx
.
showModal
({
title
:
"注册成功"
,
content
:
"继续创建心愿单"
,
confirmText
:
"马上前往"
,
showCancel
:
false
,
success
(
res
)
{
// 注册成功直接跳回创建心愿单页
app
.
router
.
push
({
openType
:
"redirectTo"
,
path
:
"createWish"
})
}
// wx.showModal({
// title: "注册成功",
// content: "继续创建心愿单",
// confirmText: "马上前往",
// showCancel: false,
// success(res) {
// // 注册成功直接跳回创建心愿单页
// app.router.push({
// openType: "redirectTo",
// path: "createWish"
// })
// }
// })
app
.
router
.
push
({
openType
:
"redirectTo"
,
path
:
"createWish"
})
}
else
if
(
result
.
status
==
2
)
{
this
.
setData
({
...
...
Please
register
or
sign in
to post a comment