Skip to content

dev / marubi-wish-list-mp

Go to a project
Toggle navigation
Toggle navigation pinning
d6ce1c64 by simon
Options

no message

1 parent eea35a7a
Inline Side-by-side
Showing 23 changed files with 163 additions and 110 deletions
......@@ -73,7 +73,8 @@
position: relative;
margin: 0 auto 0;
display: flex;
justify-content: space-between;
// justify-content: space-between;
justify-content: center;
@extend .bb;
// padding-top: 116px;
padding: 56px 80px 0;
......
......@@ -4,7 +4,7 @@
.comp-item {
position: relative;
width: 654px;
height: 1598px;
height: 1000px;
// background-color: wheat;
.bg {
......@@ -23,7 +23,8 @@
position: absolute;
left: 0;
right: 0;
bottom: 100px;
top: 1420px;
// bottom: 100px;
margin: 0 auto;
}
}
......
<view class="comp-item">
<scroll-view scroll-y="{{true}}" class="comp-item">
<image class="bg" src="../../image/oss/rule/rule-c1.png" mode="widthFix" />
<view class="space1"></view>
<view bindtap="hideMask" class="btn">我知道了</view>
</view>
</scroll-view>
......
......@@ -62,6 +62,9 @@
line-height: 1.6;
height: 140px;
@include ellipsis(3);
.t1{
color: #bb3039;
}
}
// 心愿
......@@ -69,7 +72,7 @@
position: relative;
margin: 450px auto 0;
display: flex;
// justify-content: center;
justify-content: center;
@extend .bb;
min-height: 238px;
width: 630px;
......@@ -329,7 +332,7 @@
.play-too-btn {
@include cb(234px, 64px);
margin: 24px auto 0;
margin: 48px auto 0;
}
}
}
......
......@@ -13,7 +13,12 @@
<image class="ebg" mode="widthFix" src="../../image/oss/coop/coop-c2.png" />
<view class="space1"></view>
<view class="cont">
<view class="tips">你的好友{{wishInfo.member.nickname}}的心愿单需要你的帮助哦！拿起手机摇一摇，即可为ta贡献弹力值！</view>
<view class="tips">
<!-- 你的好友
<span class="t1">{{wishInfo.member.nickname}}</span>
的心愿单需要你的帮助哦！拿起手机摇一摇，即可为ta贡献弹力值！ -->
亲爱的好友，我的丸美心愿单需要你的帮助，拿起手机摇一摇，为我的心愿注入弹力值~
</view>
<view class="wish">
<view wx:for="{{wishList}}" wx:key="{{index}}" class="wish-item">
<view class="display">
......
......@@ -38,6 +38,6 @@
</view>
</view>
</view>
<van-popup show="{{ nearbyStoreVisible }}" position="bottom" bind:click-overlay="hideMask">
<van-popup show="{{ nearbyStoreVisible }}" position="bottom" bind:click-overlay="hideMask" safe-area-inset-bottom="{{false}}">
<tips-nearby-store-comp id="nearbyStoreComp" bind:evtcomp="evtcomp" wish-info="{{wishInfo}}" location="{{location}}" selectedMode="{{false}}"></tips-nearby-store-comp>
</van-popup>
......
......@@ -335,7 +335,7 @@ Page({
})
if (uni) {
this.setData({
tipsInnerText: "心愿重复啦~\n换个其他心愿试试！",
tipsInnerText: "这个心愿已记录过噢~\n每款产品只可以加入1次心愿单，换其它试试！",
tipsCommonVisible: true
})
return;
......
......@@ -4,12 +4,14 @@
<!-- 场景 -->
<view class="sence">
<!-- 第一幕 -->
<view class="view view1">
<view wx:if="{{curStatus==1}}" class="view view1">
<image class="ebg" src="{{'../../image/oss/create-wish/create-wish-1.png'}}" mode="scaleToFill" />
<image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000002" class="point point1" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
<image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000003" class="point point2" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
<image bindtap="onShowTipsBorderHandler" data-index="P000000000000000000000000000001" class="point point3" mode="widthFix" src="../../image/oss/create-wish/cw-point.png" />
</view>
<view wx:if="{{curStatus==2}}" class="view view2">场景待确认2</view>
<view wx:if="{{curStatus==3}}" class="view view3">场景待确认3</view>
<!-- 详情 -->
<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;">
<view class="rel">
......@@ -27,10 +29,10 @@
<view class="content">
<!-- <view class="btn" bindtap="onWishHandler">提交心愿单</view> -->
<!-- 换一批按钮 -->
<!-- <view class="change-btn" bindtap="onChangeStatusHandler">
<view class="change-btn" bindtap="onChangeStatusHandler">
<image class="icon" src="../../image/oss/create-wish/cw-exchange-btn.png" mode="widthFix" />
换一批
</view> -->
</view>
<!-- 心愿单 -->
<view class="wish-container">
<image class="ebg" mode="widthFix" src="../../image/oss/create-wish/cw-border.png" />
......
......@@ -13,16 +13,23 @@ Page({
})
},
onLoad(options) {
// app.post({
// url: app.api.member,
// data: {}
// }).then((result) => {
// console.log("result:",result);
// resolve();
// })
},
initData() {
app.queryIndex({
auth: false
}).then((result) => {
this.setData({
indexInfo: app.globalData.indexInfo
})
let {
wishBillCode
} = app.globalData.indexInfo;
if (wishBillCode) {
app.router.push({
path: "wish"
})
}
})
},
initData() {},
// 开始互动游戏 判断是否会员
onStartHandler() {
app.queryIndex({
......@@ -39,7 +46,7 @@ Page({
if (wishBillCode) {
path = "wish"
}
console.log("path:",path);
console.log("path:", path);
app.router.push({
path: path
})
......
......@@ -30,6 +30,6 @@
<van-popup show="{{ authorizeVisible }}" >
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
<van-popup show="{{ tipsRuleVisible }}" bind:click-overlay="hideMask">
<van-popup show="{{ tipsRuleVisible }}" >
<tips-rule-comp bind:evtcomp="evtcomp"></tips-rule-comp>
</van-popup>
......
......@@ -186,6 +186,10 @@ Page({
this.showLog("请输入正确的手机号码");
return
}
if (!this.data.isPlzAuth) {
this.showLog("请完成拼图验证");
return
}
this.getAuthCode();
app.post({
url: app.api.mobileVerifyCode,
......
......@@ -90,7 +90,7 @@ $formWidth:560px;
// 拼图
.puzzle {
margin-top: 32px;
margin: 20px auto 20px;
$borderRadius: 32px;
width: $formWidth;
border-radius: $borderRadius;
......
......@@ -18,17 +18,6 @@
</view>
<input value="{{mobile}}" bindinput="bindMobileInput" class="ipt-input" placeholder="手机号" placeholder-class="placeholder" />
</view>
<!-- 验证码 -->
<view class="ipt">
<view class="ipt-icon">
<image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
</view>
<input value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
<view bindtap="reqGetSmsRequest" class="ipt-verify">
{{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
</view>
</view>
</view>
<!-- 滑动拼图 -->
<view class="puzzle">
<view class="plz">
......@@ -48,6 +37,17 @@
</movable-area>
</view>
</view>
<!-- 验证码 -->
<view class="ipt">
<view class="ipt-icon">
<image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
</view>
<input value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
<view bindtap="reqGetSmsRequest" class="ipt-verify">
{{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
</view>
</view>
</view>
<!-- 条款/政策 -->
<!-- <view class="policy">
<span bindtap="onTermsHandler" class="check">
......
......@@ -2,32 +2,27 @@ import Poster from '../../miniprogram_dist/poster/poster';
let app = getApp();
Page({
data: {
// isOverShare: false,
isOverShare: true,
imageUrl: "", // 海报图片
wxShareTitle: "", // 分享标题
wxCodePath: "", // 微信二维码参数地址，分享链接公用
wxCodeUrl: "", // 微信二维码图片地址
wishList: [],
},
onShareAppMessage() {
// if (res.from === 'button') {
// // 来自页面内转发按钮
// console.log(res.target)
// }
// let title = this.data.wxShareTitle;
// let path = this.data.wxCodePath;
// let imageUrl = this.data.imageUrl;
// console.log("title:", title);
// console.log("path:", path);
// console.log("imageUrl:", imageUrl);
// return {
// title,
// path,
// imageUrl
// }
onShareAppMessage(res) {
if (res.from === 'button') {
// 来自页面内转发按钮
}
let userInfo = app.globalData.userInfo;
let billCode = app.globalData.indexInfo.wishBillCode;
let title = `${userInfo.nickname}正在参加丸美眼霜节心愿单活动，需要你的倾情相助！`;
let path = `/pages/coop/coop?code=${billCode}&s=share`
return {
title,
path
}
},
onLoad(options) {
// this.setData({
// wishList: wishList
// })
......@@ -209,12 +204,22 @@ Page({
y: 160,
}
// 产品居中修正
let productLength = posterWishList.length;
let productSpace = 215;
if (productLength == 1) {
originPoint.x = (700 - 165) / 2
} else if (productLength == 2) {
productSpace = 250;
originPoint.x = (700 - (200 * 2)) / 2
}
posterWishList.forEach((element, index) => {
// 产品背景
let egb = {
width: 165,
height: 165,
x: originPoint.x + (215 * index),
x: originPoint.x + (productSpace * index),
y: originPoint.y,
url: '../../image/draw/draw-c2.png',
}
......@@ -223,13 +228,13 @@ Page({
let product = {
width: 165,
height: 165,
x: originPoint.x + (215 * index),
x: originPoint.x + (productSpace * index),
y: originPoint.y,
url: '../../image/prize/prize-' + element.tag + '.png',
}
let productDesc = {
x: originPoint.x + (215 * index),
x: originPoint.x + (productSpace * index),
y: originPoint.y + 165 + 12,
width: 165,
fontSize: 24,
......
......@@ -64,6 +64,6 @@
</view>
</view>
</view>
<van-popup show="{{ nearbyStoreVisible }}" position="bottom" bind:click-overlay="hideMask">
<van-popup show="{{ nearbyStoreVisible }}" position="bottom" bind:click-overlay="hideMask" safe-area-inset-bottom="{{false}}">
<tips-nearby-store-comp id="nearbyStoreComp" bind:evtcomp="evtcomp" wish-info="{{wishInfo}}" location="{{location}}" selectedMode="{{true}}"></tips-nearby-store-comp>
</van-popup>
......
......@@ -5,7 +5,7 @@ import Date from '../../utils/date';
let app = getApp();
Page({
data: {
hadAnswer:false,
hadAnswer: false,
questionList: [], // 题目列表
questionResult: {},
// 答题结果
......@@ -13,8 +13,7 @@ Page({
myAnswer: [], //我的答案
},
onShareAppMessage() {},
onShow(){
},
onShow() {},
onLoad(options) {
this.initData();
},
......@@ -68,10 +67,6 @@ Page({
let myAnswer = this.data.myAnswer;
if (isComplete) {
wx.showModal({
content: "确认提交？",
confirmText: "确认",
success(res) {
app.post({
url: app.api.answerSubmit,
data: myAnswer
......@@ -81,20 +76,21 @@ Page({
element.endDateStr = new Date(element.endDate).toString("yy-MM-dd");
});
_this.setData({
hadAnswer:true,
questionResult:questionResult
hadAnswer: true,
questionResult: questionResult
})
console.log("answerSubmit:", _this.data.questionResult);
})
}
})
} else {
wx.showModal({
content: "答题未完成",
confirmText: "继续答题",
showCancel: false,
success(res) {
}
// wx.showModal({
// content: "答题未完成",
// confirmText: "继续答题",
// showCancel: false,
// success(res) {}
// })
wx.showToast({
title: "答题未完成",
icon: "none"
})
}
},
......
......@@ -66,8 +66,9 @@
&-item {
display: flex;
width: 312px;
padding: 20px 10px;
// width: 312px;
width: 100%;
padding: 20px 32px;
border-radius: 36px;
border: solid 1px #999999;
@extend .bb;
......@@ -76,6 +77,12 @@
margin-bottom: 28px;
}
.no{
// @extend .bb;
// padding-right: 4
margin-right: 4px;
}
.selected {
border: solid 2px #ac0521;
color: #ac0521;
......
......@@ -18,7 +18,7 @@
</view>
<view class="answer">
<view bindtap="onSelectAnswerHandler" data-pdata="{{item}}" data-pindex="{{index}}" data-data="{{item2}}" data-index="{{index2}}" wx:for="{{item.answers}}" wx:key="index2" wx:for-index="index2" wx:for-item="item2" class="answer-item {{item2.selected ? 'selected':''}} {{item2.rightAnswer == 1 && hadAnswer ? 'right' :''}} ">
<view>{{questionNumList[index2]}}.</view>
<view class="no">{{questionNumList[index2]}}.</view>
<view>{{item2.answer}}</view>
</view>
</view>
......
......@@ -36,6 +36,8 @@ Page({
auth_time: 0,
sendAuthCode: true,
/*布尔值，通过v-show控制显示‘获取按钮’还是‘倒计时’ */
startTime: "",
endTime: "",
},
onShareAppMessage() {},
onLoad(options) {
......@@ -51,10 +53,23 @@ Page({
redirect
})
}
this.initData();
},
initData() {},
initData() {
let curDate = new Date();
let startYear = curDate.getFullYear() - 80;
let endYear = curDate.getFullYear() - 15;
let mouth = curDate.getMonth() + 1;
let day = curDate.getDate();
if (mouth < 10) mouth = "0" + mouth;
if (day < 10) day = "0" + day;
let startTime = startYear + "-" + mouth + "-" + day;
let endTime = endYear + "-" + mouth + "-" + day;
this.setData({
startTime,
endTime
})
},
showLog(msg) {
wx.showToast({
title: msg,
......@@ -159,6 +174,11 @@ Page({
this.showLog("请输入正确的手机号码");
return
}
if (!this.data.isPlzAuth) {
this.showLog("请完成拼图验证");
return
}
this.getAuthCode();
app.post({
url: app.api.mobileVerifyCode,
......
......@@ -92,7 +92,7 @@ $formWidth:560px;
// 拼图
.puzzle {
margin-top: 32px;
margin: 20px auto 20px;
$borderRadius: 32px;
width: $formWidth;
border-radius: $borderRadius;
......
......@@ -26,7 +26,7 @@
<input value="{{name}}" bindinput="bindNameInput" class="ipt-input" placeholder="姓名" placeholder-class="placeholder" />
</view>
<!-- 生日 -->
<picker mode="date" value="{{birthday}}" bindchange="bindBirthdayChange">
<picker mode="date" start="{{startTime}}" end="{{endTime}}" value="{{birthday}}" bindchange="bindBirthdayChange">
<view class="ipt">
<view class="ipt-icon">
<image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-birthday.png" />
......@@ -41,24 +41,6 @@
</view>
<input password="{{true}}" value="{{password}}" bindinput="bindPasswordInput" class="ipt-input" placeholder="登陆密码" placeholder-class="placeholder" />
</view>
<!-- 验证码 -->
<view class="ipt">
<view class="ipt-icon">
<image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
</view>
<input value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
<view bindtap="reqGetSmsRequest" class="ipt-verify">
{{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
</view>
</view>
<!-- 性别 -->
<radio-group class="radio-group" bindchange="onSexRadioChange">
<label class="radio" wx:for="{{sexList}}" wx:key="{{index}}">
<radio color="#ba3138" value="{{item.value}}" checked="{{item.checked}}" />
{{item.label}}
</label>
</radio-group>
</view>
<!-- 滑动拼图 -->
<view class="puzzle">
<view class="plz">
......@@ -78,6 +60,24 @@
</movable-area>
</view>
</view>
<!-- 验证码 -->
<view class="ipt">
<view class="ipt-icon">
<image class="icon" mode="widthFix" src="../../image/oss/register/reg-icon-verify.png" />
</view>
<input value="{{verifyCode}}" bindinput="bindVerifyCodeInput" class="ipt-input" placeholder="验证码" placeholder-class="placeholder" />
<view bindtap="reqGetSmsRequest" class="ipt-verify">
{{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
</view>
</view>
<!-- 性别 -->
<radio-group class="radio-group" bindchange="onSexRadioChange">
<label class="radio" wx:for="{{sexList}}" wx:key="{{index}}">
<radio color="#ba3138" value="{{item.value}}" checked="{{item.checked}}" />
{{item.label}}
</label>
</radio-group>
</view>
<!-- 条款/政策 -->
<view class="policy">
<span bindtap="onTermsHandler" class="check">
......
......@@ -40,7 +40,6 @@ Page({
path: 'pages/index/index'
};
}
},
onLoad(options) {},
onShow() {
......
......@@ -86,12 +86,13 @@
}
.mycard {
@include cb(160px, 48px);
margin: 16px auto;
border-radius: 24px;
box-shadow: 0px 2px 9px 0 rgba(0, 0, 0, 0.1);
background-color: #ffffff;
color: #bb3039;
@include btc(160px, 48px);
// border-radius: 24px;
// box-shadow: 0px 2px 9px 0 rgba(0, 0, 0, 0.1);
// background-color: #ffffff;
// color: #bb3039;
// @include btc(160px, 48px);
font-size: 24px;
}
......@@ -153,7 +154,7 @@
.flag {
position: absolute;
left: 0px;
bottom: 6px;
bottom: 10px;
color: #a97a4b;
font-size: 16px;
width: 51px;
......@@ -174,14 +175,16 @@
}
.line {
$progressHeight: 8px;
width: $proWidth;
height: 4px;
height: $progressHeight;
background-color: #dcdcdc;
&-thumb {
// width: $proWidth;
height: 4px;
width: 0%;
height: $progressHeight;
background-color: #ba3038;
transition: width 4s;
}
}
}
......