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
29013641
authored
2019-08-07 03:52:48 +0800
by
simon
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
1
1 parent
2daada2a
Show whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
418 additions
and
92 deletions
config.js
src/app.json
src/component/authorize-comp/authorize-comp.js
src/component/authorize-comp/authorize-comp.scss
src/component/authorize-comp/authorize-comp.wxml
src/component/tips-common-comp/tips-common-comp.scss
src/component/tips-create-complete-comp/tips-create-complete-comp.wxml
src/component/tips-new-comp/tips-new-comp.scss
src/component/tips-new-comp/tips-new-comp.wxml
src/component/tips-prize-comp/tips-prize-comp.scss
src/component/tips-prize-comp/tips-prize-comp.wxml
src/component/tips-register-comp/tips-register-comp.scss
src/component/tips-register-ed-comp/tips-register-ed-comp.js
src/component/tips-register-ed-comp/tips-register-ed-comp.scss
src/component/tips-register-ed-comp/tips-register-ed-comp.wxml
src/component/tips-rule-comp/tips-rule-comp.scss
src/http/fetch-api.js
src/image/draw/draw-c1.png
src/image/logo.png
src/pages/coop/coop.js
src/pages/coop/coop.scss
src/pages/coop/coop.wxml
src/pages/create-wish/create-wish.js
src/pages/index/index.js
src/pages/index/index.json
src/pages/index/index.wxml
src/pages/poster/poster.js
src/pages/question/question.scss
src/pages/question/question.wxml
src/pages/register/register.js
src/pages/register/register.scss
src/pages/register/register.wxml
src/pages/wish/wish.js
src/pages/wish/wish.wxml
src/utils/util.js
config.js
View file @
2901364
...
...
@@ -24,4 +24,6 @@ module.exports = {
},
// 静态资源CDN 域名,配合CDN 功能实用,线上请确保在mp管理端已经注册域名
"assetsCDN"
:
"https://kdcdn.oss-cn-shenzhen.aliyuncs.com"
// "assetsCDN": "https://kd.cdn.xyiyang.com"
};
...
...
src/app.json
View file @
2901364
...
...
@@ -28,5 +28,9 @@
"scope.userLocation"
:
{
"desc"
:
"你的位置信息将用显示附近门店"
}
},
"usingComponents"
:
{
"authorize-comp"
:
"../../component/authorize-comp/authorize-comp"
,
"van-popup"
:
"../../ui/vant-weapp/popup/index"
}
}
...
...
src/component/authorize-comp/authorize-comp.js
View file @
2901364
let
app
=
getApp
();
Component
({
properties
:
{
// 这里定义了innerText属性,属性值可以在组件使用时指定
...
...
@@ -20,8 +21,30 @@ Component({
// 隐藏蒙层
hideMask
()
{
this
.
triggerEvent
(
'evtcomp'
,
{
name
:
"_evt_hide_
authorize
"
name
:
"_evt_hide_
mask
"
});
},
bindGetUserInfo
(
e
)
{
wx
.
showLoading
();
this
.
getUserInfo
(
e
.
detail
);
},
getUserInfo
(
e
)
{
let
_this
=
this
;
app
.
globalData
.
userInfo
=
e
.
userInfo
;
console
.
log
(
"before register : code = "
,
app
.
store
.
getItem
(
"wxcode"
)
)
app
.
post
({
url
:
app
.
api
.
register
,
sid
:
false
,
data
:
{
encryptedData
:
e
.
encryptedData
,
iv
:
e
.
iv
,
code
:
app
.
store
.
getItem
(
"wxcode"
),
tlMemberCode
:
app
.
globalData
.
tlMemberCode
}
}).
then
((
res2
)
=>
{
wx
.
hideLoading
();
_this
.
hideMask
();
}).
catch
((
err
)
=>
{})
},
}
})
...
...
src/component/authorize-comp/authorize-comp.scss
View file @
2901364
.comp-item
{
@import
'../../assets/scss/mixins'
;
@import
'../../assets/scss/utils'
;
.comp-item
{
font-weight
:
300
;
width
:
557px
;
height
:
505px
;
border-radius
:
10px
;
background-color
:
#ffffff
;
.cspace
{
height
:
24px
;
}
.cont
{
text-align
:
center
;
.logo
{
margin
:
0
auto
;
width
:
200px
;
height
:
153px
;
image
{
width
:
200px
;
height
:
153px
;
}
}
.tips
{
margin-top
:
50px
;
font-size
:
32px
;
color
:
#333333
;
}
}
.btn
{
@include
cb
(
300px
,
80px
);
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
80px
;
margin
:
0
auto
;
}
}
...
...
src/component/authorize-comp/authorize-comp.wxml
View file @
2901364
<view class="comp-item">
<view class="cspace"></view>
<view class="cont">
<view class="logo">
<image mode="widthFix" src="../../image/logo.png" />
</view>
<view class="tips">参与活动需要您的微信授权哦</view>
</view>
<button class="btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button>
</view>
...
...
src/component/tips-common-comp/tips-common-comp.scss
View file @
2901364
...
...
@@ -32,7 +32,6 @@
.tips
{
margin-top
:
32px
;
// height: 210px;
color
:
#999999
;
font-size
:
28px
;
@extend
.bb
;
...
...
@@ -44,12 +43,10 @@
.btn
{
@include
cb
(
234px
,
64px
);
// position: relative;
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
100px
;
margin
:
0
auto
;
// @include cb(300px, 80px);
}
}
...
...
src/component/tips-create-complete-comp/tips-create-complete-comp.wxml
View file @
2901364
...
...
@@ -4,7 +4,7 @@
<view class="space1"></view>
<view class="tit">· 太棒了 ·</view>
<view class="tips">
共获得
领取
<span class="val">{{wishInfo.totalElasticValue}}</span>
弹力值
</view>
...
...
@@ -22,6 +22,6 @@
</view>
</view>
<view class="btn-wrap">
<view bindtap="toMyWishHandler" class="btn">
立即查看
</view>
<view bindtap="toMyWishHandler" class="btn">
继续收集
</view>
</view>
</view>
...
...
src/component/tips-new-comp/tips-new-comp.scss
View file @
2901364
...
...
@@ -4,13 +4,13 @@
.comp-item
{
position
:
relative
;
width
:
654px
;
height
:
666
px
;
height
:
1093
px
;
// background-color: wheat;
.bg
{
position
:
absolute
;
width
:
654px
;
height
:
666
px
;
height
:
1093
px
;
}
.space1
{
...
...
@@ -18,19 +18,22 @@
}
.btn
{
position
:
relative
;
margin
:
0
auto
;
@include
cb
(
234px
,
64px
);
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
100px
;
margin
:
0
auto
;
}
.nickname
{
.nickname
{
position
:
absolute
;
width
:
100%
;
text-align
:
center
;
font-size
:
40px
;
font-weight
:
300
;
color
:
#ba3138
;
top
:
152
px
;
top
:
68
px
;
@include
ellipsis
(
1
);
}
}
...
...
src/component/tips-new-comp/tips-new-comp.wxml
View file @
2901364
...
...
@@ -2,5 +2,5 @@
<image class="bg" src="../../image/oss/tips/tips-new.png" mode="widthFix" />
<view class="nickname">{{userInfo.nickname}}</view>
<view class="space1"></view>
<view bindtap="toQeustionHandler" class="btn">马上
答题
</view>
<view bindtap="toQeustionHandler" class="btn">马上
参与
</view>
</view>
...
...
src/component/tips-prize-comp/tips-prize-comp.scss
View file @
2901364
...
...
@@ -44,7 +44,7 @@
.stock1
{
margin
:
22px
auto
0
;
font-size
:
24px
;
width
:
4
1
0px
;
width
:
4
3
0px
;
.tips
{
color
:
#333333
;
}
...
...
src/component/tips-prize-comp/tips-prize-comp.wxml
View file @
2901364
...
...
@@ -14,12 +14,13 @@
</view>
<!-- 有库存 -->
<view wx:if="{{status == 1}}" class="stock stock1">
<
view class="tips">您可选择直接邮寄到家,或到附近丸美柜台自提</view
>
<view class="tips2">
ps:选择之后不可修改哦!
</view>
<
!-- <view class="tips">您可选择直接邮寄到家,或到附近丸美柜台自提</view> --
>
<view class="tips2">
礼品可选邮寄到家或到丸美柜台自提噢~
</view>
</view>
<!-- 无库存 -->
<view wx:else class="stock stock2">
<text class="tips">目前线上库存已不足\n需要女神亲自到丸美柜台领取哦!</text>
<!-- <text class="tips">目前线上库存已不足\n需要女神亲自到丸美柜台领取哦!</text> -->
<text class="tips2">目前线上库存已不足\n需要女神亲自到丸美柜台领取哦!</text>
</view>
</view>
<view class="btn-wrap">
...
...
src/component/tips-register-comp/tips-register-comp.scss
View file @
2901364
...
...
@@ -4,13 +4,13 @@
.comp-item
{
position
:
relative
;
width
:
654px
;
height
:
64
5px
;
height
:
58
5px
;
// background-color: wheat;
.bg
{
position
:
absolute
;
width
:
654px
;
height
:
64
5px
;
height
:
58
5px
;
}
.space1
{
...
...
@@ -18,9 +18,11 @@
}
.btn
{
position
:
relative
;
margin
:
0
auto
;
// @include cb(300px, 80px);
@include
cb
(
234px
,
64px
);
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
100px
;
margin
:
0
auto
;
}
}
...
...
src/component/tips-register-ed-comp/tips-register-ed-comp.js
View file @
2901364
...
...
@@ -22,6 +22,12 @@ Component({
this
.
triggerEvent
(
'evtcomp'
,
{
name
:
"_evt_hide_mask"
});
},
// 打电话
onCallHandler
()
{
wx
.
makePhoneCall
({
phoneNumber
:
'400-830-4000'
//仅为示例,并非真实的电话号码
})
}
}
})
...
...
src/component/tips-register-ed-comp/tips-register-ed-comp.scss
View file @
2901364
...
...
@@ -18,9 +18,20 @@
}
.btn
{
position
:
relative
;
margin
:
0
auto
;
// @include cb(300px, 80px);
@include
cb
(
234px
,
64px
);
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
100px
;
margin
:
0
auto
;
}
.call
{
width
:
180px
;
height
:
40px
;
position
:
absolute
;
left
:
380px
;
top
:
248px
;
}
}
...
...
src/component/tips-register-ed-comp/tips-register-ed-comp.wxml
View file @
2901364
...
...
@@ -2,4 +2,5 @@
<image class="bg" src="../../image/oss/tips/tips-register-ed.png" mode="widthFix" />
<view class="space1"></view>
<view bindtap="hideMask" class="btn">我知道了</view>
<view bindtap="onCallHandler" class="call"></view>
</view>
...
...
src/component/tips-rule-comp/tips-rule-comp.scss
View file @
2901364
...
...
@@ -4,13 +4,13 @@
.comp-item
{
position
:
relative
;
width
:
654px
;
height
:
911
px
;
height
:
1598
px
;
// background-color: wheat;
.bg
{
position
:
absolute
;
width
:
654px
;
height
:
911
px
;
height
:
1598
px
;
}
.space1
{
...
...
@@ -18,9 +18,12 @@
}
.btn
{
position
:
relative
;
margin
:
0
auto
;
@include
cb
(
300px
,
80px
);
// @include cb(234px, 64px);
@include
cb
(
300px
,
80px
);
position
:
absolute
;
left
:
0
;
right
:
0
;
bottom
:
100px
;
margin
:
0
auto
;
}
}
...
...
src/http/fetch-api.js
View file @
2901364
...
...
@@ -3,9 +3,32 @@ let Store = require('./../utils/stroage');
let
Router
=
require
(
'./../router/index'
);
const
errMsg
=
'服务异常,请稍后重试'
;
let
isWxLogin
=
false
;
function
wxLogin
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
isWxLogin
)
{
resolve
();
}
else
{
wx
.
login
({
success
:
function
(
res
)
{
isWxLogin
=
true
;
Store
.
setItem
(
'wxcode'
,
res
.
code
);
resolve
();
}
});
}
});
}
// 检查并获取sessionid
function
checkSessionId
()
{
function
checkSessionId
(
sid
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
!
sid
)
{
resolve
();
return
;
}
let
sessionId
=
Store
.
getItem
(
'sessionId'
);
if
(
sessionId
)
{
resolve
();
...
...
@@ -20,17 +43,15 @@ function checkSessionId() {
});
}
//
重新登陆
//
session丢失
function
login
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
wx
.
login
({
success
:
function
(
res
)
{
Store
.
setItem
(
'wxcode'
,
res
.
code
);
wxLogin
().
then
((
result
)
=>
{
let
baseUrl
=
config
.
NET_CONFIG
.
baseApi
;
wx
.
request
({
url
:
baseUrl
+
'/warubiEyeCreamApi/app/login'
,
data
:
{
code
:
res
.
code
code
:
Store
.
getItem
(
'wxcode'
)
},
method
:
'POST'
,
success
:
function
(
res2
)
{
...
...
@@ -42,16 +63,25 @@ function login() {
Store
.
setItem
(
'sessionId'
,
content
.
sessionId
);
resolve
();
}
else
{
wx
.
showToast
({
title
:
errMsg
,
icon
:
'none'
wx
.
hideLoading
();
let
pages
=
getCurrentPages
();
let
view
=
pages
[
pages
.
length
-
1
];
if
(
view
)
{
try
{
wx
.
login
({
success
:
function
(
res
)
{
Store
.
setItem
(
'wxcode'
,
res
.
code
);
view
.
showAuth
();
}
});
}
catch
(
error
)
{}
}
reject
();
}
}
})
}
});
})
});
}
...
...
@@ -77,7 +107,7 @@ const fetch = function ({
if
(
isMock
&&
mode
!=
'log'
)
{
baseUrl
=
config
.
MOCKAPI
;
//环境配置
}
checkSessionId
().
then
((
result
)
=>
{
checkSessionId
(
sid
).
then
((
result
)
=>
{
wx
.
request
({
url
:
baseUrl
+
url
,
//请求地址
data
:
data
,
//自定义参数
...
...
src/image/draw/draw-c1.png
100755 → 100644
View file @
2901364
87 KB
|
W:
|
H:
89.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/image/logo.png
0 → 100644
View file @
2901364
10.7 KB
src/pages/coop/coop.js
View file @
2901364
...
...
@@ -12,14 +12,22 @@ Page({
data
:
{
groupMemberCoopVisible
:
false
,
tipsCommonVisible
:
false
,
authorizeVisible
:
false
,
tipsInnerText
:
""
,
options
:
null
,
wishInfo
:
{},
wishList
:
[],
coopInfo
:
{},
userInfo
:
{},
canShake
:
true
,
status
:
0
,
},
onShareAppMessage
()
{},
showAuth
()
{
this
.
setData
({
authorizeVisible
:
true
})
},
onLoad
(
options
)
{
this
.
setData
({
options
...
...
@@ -30,6 +38,9 @@ Page({
},
initData
()
{
app
.
queryIndex
().
then
((
result
)
=>
{
this
.
setData
({
userInfo
:
app
.
globalData
.
userInfo
})
// 判断是否需要授权
if
(
result
.
isNeedAuth
==
1
)
{
app
.
router
.
push
({
...
...
@@ -70,9 +81,6 @@ Page({
},
// 助力
queryWishbillAssist
()
{
// this.setData({
// canShake: false
// })
app
.
post
({
url
:
app
.
api
.
wishbillAssist
,
data
:
{
...
...
@@ -128,9 +136,9 @@ Page({
billCode
:
this
.
data
.
options
.
code
}
}).
then
((
result
)
=>
{
let
isAssist
=
result
.
isAssist
;
let
status
=
result
.
isAssist
;
this
.
setData
({
isAssist
status
})
let
wishList
=
result
.
wishGifts
;
wishList
.
forEach
(
element
=>
{
...
...
@@ -157,6 +165,7 @@ Page({
this
.
setData
({
groupMemberCoopVisible
:
false
,
tipsCommonVisible
:
false
,
authorizeVisible
:
false
,
})
},
// 子组件事件
...
...
src/pages/coop/coop.scss
View file @
2901364
...
...
@@ -154,10 +154,43 @@
position
:
relative
;
.portrait-wrap
{
position
:
relative
;
width
:
400px
;
height
:
100px
;
margin
:
20px
auto
0
;
display
:
flex
;
justify-content
:
space-between
;
.connect
{
position
:
absolute
;
left
:
0
;
right
:
0
;
top
:
0
;
bottom
:
0
;
margin
:
auto
;
width
:
290px
;
height
:
54px
;
}
.portrait
{
position
:
relative
;
width
:
100px
;
height
:
100px
;
image
{
width
:
100px
;
height
:
100px
;
border-radius
:
50px
;
}
}
}
.user
{
height
:
150px
;
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
padding
:
0
98px
;
@extend
.bb
;
...
...
src/pages/coop/coop.wxml
View file @
2901364
...
...
@@ -9,7 +9,7 @@
<view class="content">
<!-- 摇一摇 -->
<!-- bindtap="queryWishbillAssist" -->
<view wx:if="{{
coopInfo.isAssist
!= 1}}" class="shake">
<view wx:if="{{
status
!= 1}}" class="shake">
<image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" />
<view class="space1"></view>
<view class="cont">
...
...
@@ -31,14 +31,23 @@
<image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c3.png" />
<view class="space1"></view>
<view class="cont">
<view class="user">
<
!-- <
view class="user">
<image class="portrait" mode="widthFix" src="{{wishInfo.member.avatar}}" />
<view class="nickname">
你的好友{{wishInfo.member.nickname}}的心愿单需要你的帮助哦!拿起手机摇一摇,即可为ta贡献弹力值!
</view>
</view> -->
<view class="portrait-wrap">
<image class="connect" mode="widthFix" src="../../image/oss/coop/coop-c4.png" />
<view class="portrait">
<image mode="widthFix" src="{{userInfo.avatar}}" />
</view>
<view class="portrait">
<image mode="widthFix" src="{{wishInfo.member.avatar}}" />
</view>
</view>
<view class="tips2">
<text class="t1">太厉害了\n您总共摇出了{{
coop
Info.totalElasticValue}}弹力值</text>
<text class="t1">太厉害了\n您总共摇出了{{
wish
Info.totalElasticValue}}弹力值</text>
</view>
<!-- 奖品 -->
<view class="wish">
...
...
@@ -73,7 +82,9 @@
<van-popup show="{{ groupMemberCoopVisible }}">
<tips-group-member-coop-comp bind:evtcomp="evtcomp"></tips-group-member-coop-comp>
</van-popup>
<van-popup show="{{ tipsCommonVisible }}">
<tips-common-comp bind:evtcomp="evtcomp" inner-text="{{tipsInnerText}}"></tips-common-comp>
</van-popup>
<van-popup show="{{ authorizeVisible }}">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
...
...
src/pages/create-wish/create-wish.js
View file @
2901364
...
...
@@ -53,7 +53,6 @@ Page({
userInfo
:
app
.
globalData
.
userInfo
})
this
.
queryWishbillPrizeCandidate
();
this
.
queryWishbillDetail
();
});
this
.
initShake
();
},
...
...
src/pages/index/index.js
View file @
2901364
...
...
@@ -3,23 +3,35 @@ Page({
data
:
{
canIUse
:
wx
.
canIUse
(
'button.open-type.getUserInfo'
),
tipsRuleVisible
:
false
,
authorizeVisible
:
false
,
indexInfo
:
{}
},
onShareAppMessage
()
{},
showAuth
()
{
this
.
setData
({
authorizeVisible
:
true
})
},
onLoad
(
options
)
{
this
.
initData
();
//
this.initData();
},
initData
()
{
// app.queryIndex({
// auth: false
// }).then((result) => {
// this.setData({
// indexInfo: app.globalData.indexInfo
// })
// })
},
// 开始互动游戏 判断是否会员
onStartHandler
()
{
app
.
queryIndex
({
auth
:
false
}).
then
((
result
)
=>
{
this
.
setData
({
indexInfo
:
app
.
globalData
.
indexInfo
})
})
},
// 开始互动游戏 判断是否会员
onStartHandler
()
{
let
{
wishBillCode
}
=
app
.
globalData
.
indexInfo
;
...
...
@@ -30,6 +42,9 @@ Page({
app
.
router
.
push
({
path
:
path
})
})
},
// 显示规则页面
onShowRuleHandler
()
{
...
...
@@ -37,6 +52,13 @@ Page({
tipsRuleVisible
:
true
})
},
hideMask
()
{
this
.
setData
({
tipsRuleVisible
:
false
,
authorizeVisible
:
false
,
})
},
// 子组件事件
evtcomp
(
evt
)
{
let
{
...
...
@@ -46,9 +68,7 @@ Page({
switch
(
name
)
{
case
"_evt_hide_mask"
:
this
.
setData
({
tipsRuleVisible
:
false
})
this
.
hideMask
();
break
;
default
:
...
...
src/pages/index/index.json
View file @
2901364
{
"navigationBarTitleText"
:
"我的心愿单"
,
"usingComponents"
:
{
"authorize-comp"
:
"../../component/authorize-comp/authorize-comp"
,
"tips-rule-comp"
:
"../../component/tips-rule-comp/tips-rule-comp"
,
"van-popup"
:
"../../ui/vant-weapp/popup/index"
}
...
...
src/pages/index/index.wxml
View file @
2901364
...
...
@@ -9,7 +9,7 @@
<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">
<!-- 已授权 直接到下一步操作 -->
...
...
@@ -27,9 +27,9 @@
</view>
</view>
</view>
<
!-- <
van-popup show="{{ authorizeVisible }}" >
<van-popup show="{{ authorizeVisible }}" >
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
-->
<van-popup show="{{ tipsRuleVisible }}">
</van-popup>
<van-popup show="{{ tipsRuleVisible }}"
bind:click-overlay="hideMask"
>
<tips-rule-comp bind:evtcomp="evtcomp"></tips-rule-comp>
</van-popup>
...
...
src/pages/poster/poster.js
View file @
2901364
...
...
@@ -198,7 +198,8 @@ Page({
fontSize
:
26
,
lineNum
:
3
,
baseLine
:
'middle'
,
text
:
`
${
userInfo
.
nickname
}
正在参加丸美眼霜节心愿单活动,需要你的倾情相助!`
,
// text: `${userInfo.nickname}正在参加丸美眼霜节心愿单活动,需要你的倾情相助!`,
text
:
`我正在参加丸美集弹力值领心愿礼,需要你的倾情相助!`
,
color
:
'#666666'
,
zIndex
:
111
}];
...
...
src/pages/question/question.scss
View file @
2901364
...
...
@@ -83,7 +83,7 @@
.right
{
color
:
#ffffff
;
background-color
:
#
32ba32
;
background-color
:
#
b83138
;
border
:
none
;
}
...
...
src/pages/question/question.wxml
View file @
2901364
...
...
@@ -41,7 +41,7 @@
<view class="score">{{questionResult.elasticValue}}</view>
<view class="t1">弹力值</view>
</view>
<view class="tips">
还凭您的盛世美颜获得更多惊喜
</view>
<view class="tips">
到店购物即可使用,绝不要错过噢~
</view>
<view class="coupon">
<view wx:for="{{questionResult.coupons}}" wx:key="{{index}}" class="coupon-item {{item.type==4?'coupon-item2':''}}">
<image wx:if="{{item.type==4}}" class="ebg" mode="widthFix" src="../../image/oss/coupon/coupon-2.png" />
...
...
@@ -55,7 +55,7 @@
</view>
</view>
</view>
<view bindtap="onCreateWishHandler" class="create-wish-btn">
去
创建心愿单</view>
<view bindtap="onCreateWishHandler" class="create-wish-btn">
马上
创建心愿单</view>
</view>
</view>
</view>
...
...
src/pages/register/register.js
View file @
2901364
let
Date
=
require
(
'../../utils/date.js'
);
let
Utils
=
require
(
'../../utils/util.js'
);
let
app
=
getApp
();
Page
({
data
:
{
windowWidth
:
0
,
tipsInnerText
:
""
,
redirect
:
"createWish"
,
// 注册完的重定向页面
tipsRegisteredVisible
:
false
,
...
...
@@ -26,12 +28,21 @@ Page({
],
isTerms
:
false
,
// form end
thumbX
:
44
,
thumbXTarget
:
350
,
// 正确的指数
thumbXFixed
:
20
,
// 运行的误差
movableViewX
:
0
,
// 滑块的值
isPlzAuth
:
false
,
//滑块验证
auth_time
:
0
,
sendAuthCode
:
true
,
/*布尔值,通过v-show控制显示‘获取按钮’还是‘倒计时’ */
},
onShareAppMessage
()
{},
onLoad
(
options
)
{
let
windowWidth
=
wx
.
getSystemInfoSync
().
windowWidth
;
this
.
setData
({
windowWidth
})
let
{
redirect
}
=
options
;
...
...
@@ -40,6 +51,7 @@ Page({
redirect
})
}
this
.
initData
();
},
initData
()
{},
...
...
@@ -67,17 +79,18 @@ Page({
}).
then
((
result
)
=>
{
if
(
result
.
status
==
1
)
{
wx
.
showModal
({
title
:
"
登陆
成功"
,
content
:
"
继续生成我的心愿单
"
,
title
:
"
注册
成功"
,
content
:
"
请登录您的账号
"
,
confirmText
:
"马上前往"
,
showCancel
:
false
,
success
(
res
)
{
app
.
router
.
push
({
openType
:
"redirectTo"
,
path
:
_this
.
data
.
redirect
})
_this
.
toLoginHandler
();
}
})
}
else
if
(
result
.
status
==
2
)
{
this
.
setData
({
tipsRegisteredVisible
:
true
,
})
}
else
{
this
.
setData
({
tipsInnerText
:
result
.
errMsg
,
...
...
@@ -111,6 +124,9 @@ Page({
}
else
if
(
this
.
data
.
sex
!=
0
&&
this
.
data
.
sex
!=
1
)
{
this
.
showLog
(
"请选择性别"
);
reject
();
}
else
if
(
!
this
.
data
.
isPlzAuth
)
{
this
.
showLog
(
"请完成拼图验证"
);
reject
();
}
else
if
(
!
this
.
data
.
isTerms
)
{
this
.
showLog
(
"请同意服务条款"
);
reject
();
...
...
@@ -178,6 +194,36 @@ Page({
},
1000
)
},
// 监听滑动变量
onThumbChangeHandler
(
e
)
{
let
thumbX
=
e
.
detail
.
x
*
750
/
this
.
data
.
windowWidth
+
44
;
this
.
setData
({
thumbX
:
thumbX
,
})
},
// 滑动停止
onTouchEndHandler
(
e
)
{
let
{
thumbX
,
thumbXTarget
,
thumbXFixed
}
=
this
.
data
;
let
result
=
Math
.
abs
(
thumbXTarget
-
thumbX
);
if
(
result
<
thumbXFixed
)
{
this
.
showLog
(
"验证成功"
)
this
.
setData
({
isPlzAuth
:
true
})
}
else
{
this
.
showLog
(
"验证失败"
)
}
this
.
setData
({
thumbX
:
44
,
movableViewX
:
0
,
})
},
bindMobileInput
(
e
)
{
this
.
setData
({
"mobile"
:
e
.
detail
.
value
...
...
@@ -212,7 +258,6 @@ Page({
this
.
setData
({
sex
:
e
.
detail
.
value
})
console
.
log
(
"sex:"
,
this
.
data
.
sex
);
},
// 子组件事件
...
...
src/pages/register/register.scss
View file @
2901364
...
...
@@ -5,6 +5,8 @@
$formWidth
:
560px
;
.page
{
padding-bottom
:
$pageBottom
;
.bgc
{
background-color
:
#fff2ef
;
}
...
...
@@ -97,23 +99,79 @@ $formWidth:560px;
border
:
solid
1px
#db9a9d
;
.plz
{
position
:
relative
;
@include
border-top-radius
(
$borderRadius
);
width
:
$formWidth
;
height
:
183px
;
image
{
.ebg
{
@include
border-top-radius
(
$borderRadius
);
width
:
$formWidth
;
height
:
183px
;
}
.block
{
position
:
absolute
;
width
:
83px
;
height
:
83px
;
top
:
41px
;
z-index
:
11
;
}
.shadow
{
left
:
348px
;
}
.thumb
{
left
:
44px
;
}
}
.slider
{
position
:
relative
;
width
:
560px
;
height
:
70px
;
border-top
:
solid
1px
#db9a9d
;
background-color
:
#ffffff
;
@include
border-bottom-radius
(
$borderRadius
);
&
-bar
{
position
:
relative
;
width
:
410px
;
padding
:
0
45px
;
height
:
48px
;
border-radius
:
24px
;
background-color
:
#fff0ed
;
margin
:
12px
auto
0
;
.tips
{
width
:
410px
;
height
:
48px
;
line-height
:
48px
;
font-size
:
24px
;
color
:
#b83138
;
}
.tips-wait
{
text-align
:
right
;
padding-left
:
16px
;
// @extend .bb;
}
.tips-authorized
{
text-align
:
center
;
}
&
-thumb
{
width
:
109px
;
height
:
80px
;
position
:
absolute
;
top
:
-12px
;
}
}
}
}
...
...
src/pages/register/register.wxml
View file @
2901364
...
...
@@ -60,12 +60,25 @@
</radio-group>
</view>
<!-- 滑动拼图 -->
<!-- <view class="puzzle">
<view class="puzzle">
<!-- <view class="plz" bindtouchstart="onTouchStartHandler" bindtouchmove='onTouchMoveHandler' bindtouchend='onTouchEndHandler'> -->
<view class="plz">
<image src="../../image/oss/register/plz-cont.png" mode="widthFix" />
<image class="ebg" src="../../image/oss/register/plz-cont.png" mode="widthFix" />
<block wx:if="{{!isPlzAuth}}">
<image class="block shadow" mode="widthFix" src="../../image/oss/register/plz-block.png?ver=1" />
<image style="left:{{thumbX}}rpx;" class="block thumb" mode="widthFix" src="../../image/oss/register/plz-block-inline.png?ver=1" />
</block>
</view>
<view class="slider">
<movable-area class="slider-bar">
<view wx:if="{{!isPlzAuth}}" class="tips tips-wait">拖动左侧滑块,完成上方拼图验证</view>
<view wx:else class="tips tips-authorized">验证成功</view>
<movable-view wx:if="{{!isPlzAuth}}" x="{{movableViewX}}" bindchange="onThumbChangeHandler" direction="horizontal">
<image bindtouchend="onTouchEndHandler" class="slider-bar-thumb" mode="widthFix" src="../../image/oss/register/slider-block.png" />
</movable-view>
</movable-area>
</view>
</view>
<view class="slider"></view>
</view> -->
<!-- 条款/政策 -->
<view class="policy">
<span bindtap="onTermsHandler" class="check">
...
...
src/pages/wish/wish.js
View file @
2901364
...
...
@@ -12,7 +12,7 @@ Page({
data
:
{
isOverShare
:
true
,
//自定义分享
tipsRuleVisible
:
false
,
tipsPirzeVisible
:
fals
e
,
tipsPirzeVisible
:
tru
e
,
userInfo
:
{},
wishInfo
:
{},
wishList
:
[],
...
...
src/pages/wish/wish.wxml
View file @
2901364
...
...
@@ -56,9 +56,9 @@
<view class="coop">
<view class="tit">· 我的弹力帮帮团 ·</view>
<view class="tips">
积累
有
<span class="t1">{{helperInfo.total}}</span>
人助力,获得
位好友帮忙,收集到
<span class="t1">{{helperInfo.totalElasticValue}}</span>
弹力值!
</view>
...
...
src/utils/util.js
View file @
2901364
...
...
@@ -82,11 +82,16 @@ function getLastScreenHeight(useHeight = 0, unit = 'rpx') {
* px转rpx
* @param {*} value
*/
function
pxToRpx
(
value
)
{
let
sysInfo
=
wx
.
getSystemInfoSync
();
let
clientWidth
=
sysInfo
.
windowWidth
;
let
result
=
value
/
750
*
clientWidth
return
result
;
function
px2rpx
(
value
)
{
return
value
*
750
/
wx
.
getSystemInfoSync
().
windowWidth
;
}
/**
* rpx转px
* @param {*} value
*/
function
rpx2px
(
value
)
{
return
value
/
750
*
wx
.
getSystemInfoSync
().
windowWidth
;
}
...
...
@@ -265,7 +270,8 @@ module.exports = {
debounce
:
debounce
,
throttle
:
throttle
,
param2Obj
:
param2Obj
,
pxToRpx
:
pxToRpx
,
px2rpx
:
px2rpx
,
rpx2px
:
rpx2px
,
formatWeek
:
formatWeek
,
getBindtapData
:
getBindtapData
,
wxacodeGet
:
wxacodeGet
,
...
...
Please
register
or
sign in
to post a comment