Skip to content

dev / zhiliang-light-mp

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

no message

1 parent 38fe5e71
Inline Side-by-side
Showing 53 changed files with 1456 additions and 82 deletions
{
"pages": [
"pages/user-center/user-center",
"pages/gift-shop/gift-shop",
"pages/gift-detail/gift-detail",
"pages/scan-result/scan-result",
"pages/contact/contact",
"pages/contact-table/contact-table",
"pages/index/index",
"pages/authorize/authorize",
"pages/gift-shop/gift-shop",
"pages/register/register",
"pages/scan-result/scan-result",
"pages/integral-detail/integral-detail",
"pages/gift-detail/gift-detail",
"pages/address-management/address-management",
"pages/address-edit/address-edit",
"pages/my-qrcode/my-qrcode",
......@@ -58,6 +58,9 @@
"authorize-comp": "../../component/authorize-comp/authorize-comp",
"common-tips-comp": "../../component/common-tips-comp/common-tips-comp",
"sign-tips-comp": "../../component/sign-tips-comp/sign-tips-comp",
"gift-rank-tips-comp": "../../component/gift-rank-tips-comp/gift-rank-tips-comp",
"gift-sign-tips-comp": "../../component/gift-sign-tips-comp/gift-sign-tips-comp",
"order-submit-success-tips-comp": "../../component/order-submit-success-tips-comp/order-submit-success-tips-comp",
"van-popup": "../../ui/vant-weapp/popup/index"
}
}
......
......@@ -30,6 +30,7 @@ $contentWidth:690px;
// text-align: center;
box-sizing: border-box;
font-family: PingFangSC-Regular, -apple-system-font, Helvetica Neue, Helvetica, sans-serif, FZY3JW-GB1-0;
}
.app__width {
......
let app = getApp();
Component({
properties: {
// 这里定义了innerText属性，属性值可以在组件使用时指定
// cid 用户区分组件
cid: {
type: String,
value: '1',
},
innerTitle: {
type: String,
value: '',
},
innerText: {
type: String,
value: '',
},
innerButton: {
type: String,
value: '确定',
}
},
data: {
// 这里是一些组件内部数据
someData: {}
},
methods: {
// 这里是一个自定义方法
customMethod() {
this.triggerEvent('evtcomp', {
name: "_evt_custom"
})
},
// 隐藏蒙层
hideMask() {
this.triggerEvent('evtcomp', {
name: "_evt_hide_mask"
});
},
// 点击自定义按钮
onInnerButtonHandler() {
this.triggerEvent('evtcomp', {
name: "_evt_common_comp_button",
data: {
cid: this.properties.cid,
innerTitle: this.properties.innerTitle,
innerText: this.properties.innerText,
innerButton: this.properties.innerButton,
}
});
}
}
})
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
.comp-item {
width: 650px;
// min-height: 496px;
border-radius: 10px;
background-color: #ffffff;
color: #333333;
font-size: 28px;
padding-bottom: 240px;
.cspace {
height: 76px;
}
.cont {
text-align: center;
width: 500px;
margin: 0 auto;
.tit {}
.tit1 {}
.tit2 {
margin-top: 12px;
color: #3680EB;
}
.tit3 {
margin-top: 12px;
font-size: 40px;
}
.prize {
width: 460px;
height: 276px;
}
.tips {
color: #999999;
font-size: 24px;
}
}
.btn {
@include cb(320px, 84px);
position: absolute;
left: 0;
right: 0;
bottom: 74px;
margin: 0 auto;
}
}
<view class="comp-item">
<view class="cspace"></view>
<view class="cont">
<view class="tit tit1">在190701-190714周期中</view>
<view class="tit tit2">推广积分排行第一名</view>
<view class="tit tit3">恭喜获得88元现金红包</view>
<!-- 红包 -->
<!-- <block>
<image class="prize" mode="aspectFit" src="../../image/prize/prize-red-package.png" />
<view></view>
<text class="tips">经后台审核通过后，红包将通过公众号消息或微信服务消息发放，届时请及时领取！</text>
</block> -->
<!-- 积分 -->
<block>
<image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" />
<view></view>
<text class="tips">后台审核通过后，积分将会直接派送到您的账户上，可在积分明细中查看！</text>
</block>
</view>
<button class="btn" bindtap="hideMask">我知道了</button>
</view>
let app = getApp();
Component({
properties: {
// 这里定义了innerText属性，属性值可以在组件使用时指定
// cid 用户区分组件
cid: {
type: String,
value: '1',
},
innerTitle: {
type: String,
value: '',
},
innerText: {
type: String,
value: '',
},
innerButton: {
type: String,
value: '确定',
}
},
data: {
// 这里是一些组件内部数据
someData: {}
},
methods: {
// 这里是一个自定义方法
customMethod() {
this.triggerEvent('evtcomp', {
name: "_evt_custom"
})
},
// 隐藏蒙层
hideMask() {
this.triggerEvent('evtcomp', {
name: "_evt_hide_mask"
});
},
// 点击自定义按钮
onInnerButtonHandler() {
this.triggerEvent('evtcomp', {
name: "_evt_common_comp_button",
data: {
cid: this.properties.cid,
innerTitle: this.properties.innerTitle,
innerText: this.properties.innerText,
innerButton: this.properties.innerButton,
}
});
}
}
})
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
.comp-item {
width: 650px;
// min-height: 496px;
border-radius: 10px;
background-color: #ffffff;
color: #333333;
font-size: 28px;
padding-bottom: 240px;
.cspace {
height: 76px;
}
.cont {
text-align: center;
width: 500px;
margin: 0 auto;
.tit {}
.tit1 {}
.tit2 {
margin-top: 20px;
color: #3680EB;
}
.tit3 {
// margin-top: 20px;
font-size: 40px;
}
.prize {
width: 460px;
height: 276px;
}
.tips {
color: #999999;
font-size: 24px;
}
}
.btn {
@include cb(320px, 84px);
position: absolute;
left: 0;
right: 0;
bottom: 74px;
margin: 0 auto;
}
}
<view class="comp-item">
<view class="cspace"></view>
<view class="cont">
<view class="tit tit3">恭喜获得88元现金红包</view>
<!-- 红包 -->
<block>
<image class="prize" mode="aspectFit" src="../../image/prize/prize-red-package.png" />
<view></view>
<text class="tips">现金红包已经快马加鞭给您派送\n请注意通知消息，并在24小时内领取哦~</text>
</block>
<!-- 积分 -->
<!-- <block>
<image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" />
<view ></view>
<text class="tips">积分已派送到您的账户\n可在“积分明细”里查看</text>
</block> -->
</view>
<button class="btn" bindtap="hideMask">我知道了</button>
</view>
let app = getApp();
Component({
properties: {
// 这里定义了innerText属性，属性值可以在组件使用时指定
// cid 用户区分组件
cid: {
type: String,
value: '1',
},
innerTitle: {
type: String,
value: '',
},
innerText: {
type: String,
value: '',
},
innerButton: {
type: String,
value: '确定',
}
},
data: {
// 这里是一些组件内部数据
someData: {}
},
methods: {
// 这里是一个自定义方法
customMethod() {
this.triggerEvent('evtcomp', {
name: "_evt_custom"
})
},
// 隐藏蒙层
hideMask() {
this.triggerEvent('evtcomp', {
name: "_evt_hide_mask"
});
},
// 点击自定义按钮
onInnerButtonHandler() {
this.triggerEvent('evtcomp', {
name: "_evt_common_comp_button",
data: {
cid: this.properties.cid,
innerTitle: this.properties.innerTitle,
innerText: this.properties.innerText,
innerButton: this.properties.innerButton,
}
});
}
}
})
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
.comp-item {
width: 650px;
min-height: 496px;
border-radius: 10px;
background-color: #ffffff;
font-size: 28px;
color: #333333;
padding-bottom: 60px;
.cspace {
height: 76px;
}
.cont {
text-align: center;
width: 520px;
margin: 0 auto;
.tit {
font-size: 40px;
color: #333333;
}
.prize {
margin: 58px auto 0;
width: 200px;
height: 200px;
border: solid 1px #f0f0f0;
border-radius: 8px;
@extend .fcc;
.image {
width: 172px;
height: 172px;
background-color: wheat;
}
}
.name {
margin-top: 20px;
}
.tips {
margin-top: 20px;
color: #999999;
font-size: 24px;
}
}
.btn {
@include cb(300px, 80px);
// position: absolute;
// left: 0;
// right: 0;
// bottom: 48px;
margin: 60px auto 0;
}
}
<view class="comp-item">
<view class="cspace"></view>
<view class="cont">
<view class="tit">订单提交成功！</view>
<view class="prize">
<image class="image" mode="aspectFit" />
</view>
<view class="name">某东购物卡200元</view>
<button class="btn" bindtap="onInnerButtonHandler">{{innerButton}}</button>
<view class="tips">您可以在“个人中心→我的订单”中查看物流进度</view>
</view>
</view>
......@@ -34,8 +34,7 @@ module.exports = {
sign: '/sign', // post 签到动作 用户注册接口
sginRecord: '/sgin/record', // post 签到记录 用户注册接口
provinceQuery: 'https://ow.go.qudone.com/warubiEyeCreamApi/app/store/province', // post 省
cityQuery: 'https://ow.go.qudone.com/warubiEyeCreamApi/app/store/city', // post 省
areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询
uploadFile: '/kdapi/file/upload' //上传图片通用接口
}
......
......@@ -28,9 +28,9 @@ Page({
this.initData();
},
initData() {
this.setData({
commonTipsCompVisible: true
})
// this.setData({
// commonTipsCompVisible: false
// })
},
/**
* 提交表单
......
......@@ -2,6 +2,7 @@ let app = getApp();
Page({
data: {
authorizeVisible: false,
commonTipsCompVisible: true,
},
onShareAppMessage() {},
showAuth() {
......@@ -21,7 +22,31 @@ Page({
*/
onAddressManagementHandler() {
app.router.push({
path:"addressManagement"
path: "addressManagement"
})
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
commonTipsCompVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_common_comp_button":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -61,3 +61,6 @@
<van-popup show="{{ authorizeVisible }}" >
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
<van-popup show="{{ commonTipsCompVisible }}">
<common-tips-comp bind:evtcomp="evtcomp" inner-title="积分不足" inner-text="使用推广、签到功能\n可获取更多积分！" inner-button="我知道了"></common-tips-comp>
</van-popup>
......
......@@ -2,6 +2,7 @@ let app = getApp();
Page({
data: {
authorizeVisible: false,
orderSubmitSuccessTipsCompVisible: true,
productList: ["", "", ""]
},
onShareAppMessage() {},
......@@ -18,5 +19,29 @@ Page({
app.router.push({
path: "giftDetail"
});
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
orderSubmitSuccessTipsCompVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_common_comp_button":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -39,6 +39,9 @@
</view>
</view>
</view>
<van-popup show="{{ authorizeVisible }}" >
<van-popup show="{{ authorizeVisible }}">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
<van-popup show="{{ orderSubmitSuccessTipsCompVisible }}">
<order-submit-success-tips-comp bind:evtcomp="evtcomp" inner-title="积分不足" inner-text="使用推广、签到功能\n可获取更多积分！" inner-button="我知道了"></order-submit-success-tips-comp>
</van-popup>
......
......@@ -2,6 +2,38 @@ let app = getApp();
Page({
data: {
authorizeVisible: false,
navIndex: 0,
navList: [{
t1: "全部",
t2: "",
index: 0,
},
{
t1: "300",
t2: "购买积分",
index: 1,
},
{
t1: "200",
t2: "推广积分",
index: 2,
},
{
t1: "50",
t2: "签到积分",
index: 3,
},
{
t1: "300",
t2: "奖励积分",
index: 4,
},
{
t1: "300",
t2: "兑换积分",
index: 5,
},
],
},
onShareAppMessage() {},
showAuth() {
......
{
"navigationBarTitleText": "more"
"navigationBarTitleText": "积分明细"
}
......
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
$contentWidth:690px;
.page {
padding-bottom: $pageBottom;
.bgc {}
.bg {}
.main {
font-size: 28px;
color: #333333;
.top-space {
height: 0px;
height: 20px;
}
.content {
position: relative;
width: $contentWidth;
margin: 0 auto;
.func {
display: flex;
justify-content: space-between;
align-items: flex-end;
.info {
font-size: 32px;
color: #333333;
.t1 {
font-size: 72px;
color: #3680EB;
}
}
.sel {
font-size: 28px;
color: #3680EB;
padding: 4px 16px;
@extend .fcc;
background-color: rgba($color: #3680EB, $alpha: 0.05);
border-radius: 4px;
margin-bottom: 12px;
.icon {
width: 32px;
height: 32px;
margin: 8px;
}
}
}
// 标签
.tag {
position: relative;
display: flex;
justify-content: space-between;
margin: 18px auto 0;
&-item {
position: relative;
width: 94px;
height: 100px;
.ebg {
position: absolute;
left: 0;
right: 0;
top: 0;
margin: 0 auto;
width: 94px;
height: 114px;
}
.desc {
position: relative;
color: #999999;
width: 94px;
height: 100px;
@extend .fcc;
flex-wrap: wrap;
.t1 {
font-size: 28px;
}
.t2 {
font-size: 20px;
margin-top: -32px;
}
}
.act {
color: #FFFFFF;
}
}
}
// 标题
.tit {
width: $contentWidth;
height: 40px;
font-size: 20px;
color: #3680EB;
background: rgba($color: #3680EB, $alpha: 0.05);
// border-radius: 20px;
margin: 26px auto 0;
display: flex;
.tt {
height: 40px;
line-height: 40px;
}
.t1 {
margin-left: 30px;
}
.t2 {
margin-left: 152px;
}
.t3 {
margin-left: 112px;
}
.t4 {
margin-left: 148px;
}
}
// 积分
.integral {
// display: flex;
&-item {
display: flex;
justify-content: space-between;
border-bottom: solid 1px #dddddd;
$itemHeight: 104px;
height: $itemHeight;
.tt {
@extend .fcc;
}
.t1 {
width: 200px;
}
.t2 {
width: 152px;
}
.t3 {
flex: 1;
}
.t4 {
width: 100px;
color: #7ED321;
}
.minus {
color: #E62435;
}
}
}
}
}
}
......
......@@ -3,9 +3,47 @@
<view class="app__bg bg"></view>
<view class="app__content main">
<view class="top-space"></view>
<view class="content"></view>
<view class="content">
<view class="func">
<view class="info">
现有积分
<span class="t1">360</span>
分
</view>
<view class="sel">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-calendar.png" />
时间筛选
</view>
</view>
<!-- 标签 -->
<view class="tag">
<view data-index="{{index}}" wx:for="{{navList}}" wx:key="{{index}}" class="tag-item">
<image wx:if="{{navIndex==index}}" class="ebg" mode="aspectFit" src="../../image/icon/icon-integral-tag.png" />
<view class="desc {{navIndex == index ? 'act' : ''}}">
<view class="t1">{{item.t1}}</view>
<view class="t2">{{item.t2}}</view>
</view>
</view>
</view>
<!-- 标题 -->
<view class="tit">
<view class="tt t1">时间</view>
<view class="tt t2">获取方式</view>
<view class="tt t3">积分</view>
<view class="tt t4 minus">积分</view>
</view>
<!-- 积分 -->
<view class="integral">
<view class="integral-item">
<view class="tt t1">2019.03.13</view>
<view class="tt t2">扫码获取</view>
<view class="tt t3">产品名称</view>
<view class="tt t4 minus">+1000</view>
</view>
</view>
</view>
</view>
</view>
<van-popup show="{{ authorizeVisible }}" >
<van-popup show="{{ authorizeVisible }}">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
......
{
"navigationBarTitleText": "demo"
"navigationBarTitleText": "我的消息"
}
......
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
$contentWidth:690px;
.page {
.bgc {}
.bg {}
.main {
font-size: 28px;
color: #333333;
.top-space {
height: 0px;
height: 30px;
}
.content {
width: $contentWidth;
margin: 0 auto;
position: relative;
.func {
display: flex;
justify-content: space-between;
&-item {
color: #3680EB;
}
&-item2 {
color: #E62435;
}
}
.news {
margin: 30px auto 0;
&-item {
.tit {
display: flex;
justify-content: space-between;
align-items: center;
&-item {
.t1 {
padding: 4px 12px;
display: inline-block;
background: #F8F8F8;
border-radius: 8px;
color: #3680EB;
}
// 删除
.t2 {
color: #E62435;
}
}
}
.desc {
margin: 16px auto 0;
color: #666666;
}
}
}
}
}
}
......
<view class="page">
<view class="app__bgc bgc"></view>
<view class="app__bg bg"></view>
<!-- <view class="app__top-shadow"></view> -->
<view class="app__content main">
<view class="top-space"></view>
<view class="content"></view>
<view class="content">
<view class="func">
<view class="func-item ">全部标为已读</view>
<view class="func-item func-item2">删除已读消息</view>
</view>
<view class="news">
<view class="border news-item">
<view class="tit">
<view class="tit-item">订单消息</view>
<view class="tit-item">
<span class="t1">标记已读</span>
</view>
</view>
<view class="desc">您的订单 2357123413491 已通过审核！</view>
</view>
</view>
</view>
</view>
</view>
<van-popup show="{{ authorizeVisible }}" >
<van-popup show="{{ authorizeVisible }}">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
......
import {
getBindtapData
} from '../../utils/util';
let app = getApp();
Page({
data: {
authorizeVisible: false,
navIndex: 0
},
onShareAppMessage() {},
showAuth() {
......@@ -9,5 +14,30 @@ Page({
authorizeVisible: true
})
},
onLoad(options) {}
onLoad(options) {
let {
navIndex
} = options;
console.log("navIndex:", navIndex);
if (navIndex) {
this.setData({
navIndex: navIndex
})
}
},
/**
* 选择导航
* @param {*} evt
*/
onNavSelectHandler(evt) {
let navIndex = this.data.navIndex;
let curIndex = getBindtapData(evt, "index");
console.log("curIndex:", curIndex);
if (navIndex != curIndex) {
this.setData({
navIndex: curIndex
})
}
},
})
......
{
"navigationBarTitleText": "more"
"navigationBarTitleText": "我的订单"
}
......
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
$contentWidth:690px;
.page {
padding-bottom: $pageBottom;
.bgc {}
.bg {}
......@@ -13,6 +17,144 @@
.content {
position: relative;
// 导航
.nav {
display: flex;
justify-content: space-between;
align-items: center;
position: relative;
margin: 0 auto;
width: 750px;
@extend .bb;
padding: 0 30px;
background: #3680EB;
height: 100px;
&-item {
position: relative;
width: 20%;
@extend .fcc;
height: 100px;
// line-height: 100px;
.tit {
text-align: center;
font-size: 32px;
color: rgba($color: #FFFFFF, $alpha: 0.5);
}
.line {
position: absolute;
// margin: 12px auto 0;
left: 0;
right: 0;
bottom: 0;
margin: 0 auto;
width: 0px;
height: 6px;
border-radius: 4px;
background: #FFFFFF;
transition: width 0.2s ease;
align-self: flex-end;
}
}
&-item-act {
.tit {
color: rgba($color: #FFFFFF, $alpha: 1);
}
.line {
width: 60px;
}
}
}
// 卡片
.card {
width: $contentWidth;
margin: 20px auto 0;
&-item {
padding: 24px 30px 16px;
margin: 0 auto 20px;
.no {
font-size: 24px;
color: #999999;
}
.line {
width: 100%;
height: 2px;
background: #F0F0F0;
margin: 18px 0;
}
.cont {
display: flex;
height: 140px;
.prize {
@extend .fcc;
width: 140px;
height: 140px;
border: solid 1px #F0F0F0;
border-radius: 8px;
.image {
width: 120px;
height: 120px;
}
}
.detail {
// margin-left: 24px;
padding-left: 24px;
@extend .bb;
height: 140px;
display: flex;
flex-wrap: wrap;
align-content: space-between;
.t1 {
width: 100%;
font-size: 32px;
color: #333333;
}
.t2 {
font-size: 24px;
color: #999999;
}
.t3 {
font-size: 24px;
color: #3680EB;
}
}
}
.logistics {
font-size: 24px;
color: #333333;
&-item {
display: flex;
margin-bottom: 12px;
.label {
width: 120px;
}
.val {}
}
}
}
}
}
}
}
......
......@@ -3,9 +3,95 @@
<view class="app__bg bg"></view>
<view class="app__content main">
<view class="top-space"></view>
<view class="content"></view>
<view class="content">
<!-- 导航 -->
<view class="nav">
<view bindtap="onNavSelectHandler" data-index="0" class="nav-item {{navIndex == 0 ? 'nav-item-act':''}}">
<view class="tit">全部订单</view>
<view class="line"></view>
</view>
<view bindtap="onNavSelectHandler" data-index="1" class="nav-item {{navIndex == 1 ? 'nav-item-act':''}}">
<view class="tit">待审核</view>
<view class="line"></view>
</view>
<view bindtap="onNavSelectHandler" data-index="2" class="nav-item {{navIndex == 2 ? 'nav-item-act':''}}">
<view class="tit">已通过</view>
<view class="line"></view>
</view>
<view bindtap="onNavSelectHandler" data-index="3" class="nav-item {{navIndex == 3 ? 'nav-item-act':''}}">
<view class="tit">已发货</view>
<view class="line"></view>
</view>
<view bindtap="onNavSelectHandler" data-index="4" class="nav-item {{navIndex == 4 ? 'nav-item-act':''}}">
<view class="tit">未通过</view>
<view class="line"></view>
</view>
</view>
<!-- 卡片 -->
<view class="card">
<view class="border card-item">
<view class="no">订单编号：2357123413491</view>
<view class="line"></view>
<view class="cont">
<view class="prize">
<image class="image" mode="aspectFit" />
</view>
<view class="detail">
<view class="t1">某东购物卡200元</view>
<view class="t1 t2">消耗积分：1000分</view>
<view class="t1 t3">处理中</view>
</view>
</view>
<view class="line"></view>
<view class="logistics">
<view class="logistics-item">
<view class="label">收货地址</view>
<view class="val">深圳市龙岗区XXX路</view>
</view>
<view class="logistics-item">
<view class="label">物流公司</view>
<view class="val">待定</view>
</view>
<view class="logistics-item">
<view class="label">物流单号</view>
<view class="val">暂定</view>
</view>
</view>
</view>
<view class="border card-item">
<view class="no">订单编号：2357123413491</view>
<view class="line"></view>
<view class="cont">
<view class="prize">
<image class="image" mode="aspectFit" />
</view>
<view class="detail">
<view class="t1">某东购物卡200元</view>
<view class="t1 t2">消耗积分：1000分</view>
<view class="t1 t3">处理中</view>
</view>
</view>
<view class="line"></view>
<view class="logistics">
<view class="logistics-item">
<view class="label">收货地址</view>
<view class="val">深圳市龙岗区XXX路</view>
</view>
<view class="logistics-item">
<view class="label">物流公司</view>
<view class="val">待定</view>
</view>
<view class="logistics-item">
<view class="label">物流单号</view>
<view class="val">暂定</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<van-popup show="{{ authorizeVisible }}" >
<van-popup show="{{ authorizeVisible }}">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
......
......@@ -2,6 +2,7 @@ let app = getApp();
Page({
data: {
authorizeVisible: false,
giftRankTipsCompVisible: true,
},
onShareAppMessage() {},
showAuth() {
......@@ -9,5 +10,29 @@ Page({
authorizeVisible: true
})
},
onLoad(options) {}
onLoad(options) {},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
giftRankTipsCompVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
default:
break;
}
},
})
......
{
"navigationBarTitleText": "more"
"navigationBarTitleText": "我的排行奖励"
}
......
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
$contentWidth:690px;
.page {
.bgc {}
.bg {}
.main {
font-size: 28px;
color: #333333;
.top-space {
height: 0px;
height: 20px;
}
.content {
position: relative;
.gift {
width: $contentWidth;
margin: 0 auto 0;
&-item {
@extend .bb;
padding: 30px 0;
display: flex;
justify-content: space-between;
align-items: center;
.prize {
margin: 0 30px;
.image {
width: 120px;
height: 120px;
}
}
.cont {
position: relative;
height: 100%;
flex: 1;
display: flex;
flex-wrap: wrap;
align-content: space-between;
.t1 {
align-self: center;
padding: 4px 0;
}
.t2 {
font-size: 24px;
color: #999999;
}
.t3 {
font-size: 24px;
color: #3680EB;
}
}
.btn {
@include cb(120px, 60px);
margin-right: 20px;
}
}
}
}
}
}
......
......@@ -3,9 +3,37 @@
<view class="app__bg bg"></view>
<view class="app__content main">
<view class="top-space"></view>
<view class="content"></view>
<view class="content">
<view class="gift">
<view class="border gift-item">
<view class="prize">
<image class="image" mode="aspectFit" src="../../image/icon/icon-gift-red-package.png" />
</view>
<view class="cont">
<view class="t1">88元微信红包 1 个</view>
<view class="t1 t2">190701-190714</view>
<view class="t1 t3">推广积分排行第一名</view>
</view>
<view class="btn">领取</view>
</view>
<view class="border gift-item">
<view class="prize">
<image class="image" mode="aspectFit" src="../../image/icon/icon-gift-integral.png" />
</view>
<view class="cont">
<view class="t1">88元微信红包 1 个</view>
<view class="t1 t2">190701-190714</view>
<view class="t1 t3">推广积分排行第一名</view>
</view>
<view class="btn">领取</view>
</view>
</view>
</view>
</view>
</view>
<van-popup show="{{ authorizeVisible }}" >
<van-popup show="{{ authorizeVisible }}">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
<van-popup show="{{ giftRankTipsCompVisible }}">
<gift-rank-tips-comp bind:evtcomp="evtcomp"></gift-rank-tips-comp>
</van-popup>
......
......@@ -33,6 +33,16 @@ Page({
}
},
/**
* 排行榜奖励
* @param {*} evt
*/
onRankGiftHandler(evt) {
app.router.push({
path: "rankGift"
})
},
// 滚动到底部 分页加载
onRankScrolltolower(e) {
......
......@@ -127,7 +127,7 @@
</view>
<!-- 我的奖励按钮 -->
<view class="btn-wrap">
<view class="btn">
<view bindtap="onRankGiftHandler" class="btn">
<image class="integral" mode="aspectFit" src="../../image/icon/icon-rank-rewrad.png" />
我的奖励
</view>
......
{
"navigationBarTitleText": "more"
"navigationBarTitleText": "获得积分"
}
......
......@@ -7,12 +7,71 @@
.bg {}
.main {
color: #333333;
font-size: 28px;
.top-space {
height: 0px;
height: 110px;
}
.content {
position: relative;
.scan {
height: 900px;
.result {
.tips {
display: inline-block;
width: 100%;
text-align: center;
.t1{
color: #057FF3;
}
}
.btn-wrap {
margin: 114px auto 0;
.btn {
@include cb(320px, 84px);
margin: 0 auto 40px;
}
.btn2 {
background: transparent;
border: solid 1px #3680EB;
color: #3680EB;
}
}
}
.success {
.tips1 {
font-size: 44px;
margin: 212px auto 0;
}
.tips2 {
margin-top: 10px;
font-size: 28px;
color: #999999;
}
}
.fail {
.tips1 {
font-size: 32px;
margin: 232px auto 0;
font-weight: bold;
}
}
}
}
}
}
......
......@@ -3,9 +3,31 @@
<view class="app__bg bg"></view>
<view class="app__content main">
<view class="top-space"></view>
<view class="content">scan-result</view>
<view class="content">
<view class="border scan">
<view wx:if="{{1>0}}" class="result success">
<text class="tips tips1">恭喜获得10积分!</text>
<view class="tips tips2">
账户共有
<span class="t1">350</span>
积分
</view>
<view class="btn-wrap">
<view class="btn">再扫一次</view>
<view class="btn btn2">查看我的积分</view>
</view>
</view>
<view wx:else class="result fail">
<text class="tips tips1">此产品码已被扫过！\n若有异常，请联系客服</text>
<view class="btn-wrap">
<view class="btn">再扫一次</view>
<view class="btn btn2">联系客服</view>
</view>
</view>
</view>
</view>
</view>
</view>
<van-popup show="{{ authorizeVisible }}" >
<van-popup show="{{ authorizeVisible }}">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
......
{
"navigationBarTitleText": "demo"
"navigationBarTitleText": "签到记录"
}
......
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
$contentWidth:690px;
.page {
.bgc {}
.bg {}
.main {
font-size: 28px;
color: #333333;
.top-space {
height: 0px;
}
.content {
position: relative;
width: 690px;
margin: 0 auto;
.func {
@extend .fcc;
height: 80px;
border-bottom: solid 1px #DDDDDD;
font-size: 32px;
color: #3680EB;
.icon {
width: 32px;
height: 32px;
margin: 0 8px;
}
.arrow {
width: 12px;
height: 8px;
margin: 0 8px;
}
}
.sign {
&-item {
display: flex;
justify-content: space-between;
border-bottom: solid 1px #DDDDDD;
padding: 30px 0;
.date {
display: flex;
justify-items: center;
}
.desc {
display: flex;
justify-items: center;
.green {
margin: 0 4px;
color: #7ED321;
}
.red {
color: #FF7900;
}
}
}
}
}
}
}
......
......@@ -4,9 +4,25 @@
<!-- <view class="app__top-shadow"></view> -->
<view class="app__content main">
<view class="top-space"></view>
<view class="content"></view>
<view class="content">
<view class="func">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
时间筛选
<image class="arrow" mode="aspectFit" src="../../image/icon/icon-filter-down-on.png" />
</view>
<view class="sign">
<view class="sign-item">
<view class="date">2019.03.13</view>
<view class="desc">
签到成功，获得
<span class="green red">1</span>
红包
</view>
</view>
</view>
</view>
</view>
</view>
<van-popup show="{{ authorizeVisible }}" >
<van-popup show="{{ authorizeVisible }}">
<authorize-comp bind:evtcomp="evtcomp"></authorize-comp>
</van-popup>
......
......@@ -8,8 +8,9 @@ Page({
authorizeVisible: false,
commonTipsCompVisible: false,
signTipsCompVisible: false,
innerTitle: "留言提交成功！",
innerText: "感谢您宝贵的意见\n我们将尽快回电或回复信息",
giftSignTipsCompVisible: false,
innerTitle: "",
innerText: "",
// innerButton: "",
userInfo: {}, // 用户数据
signInfo: [], // 签到数据
......@@ -65,6 +66,38 @@ Page({
});
},
/**
* 签到记录
*/
onsignInRecordHandler(evt) {
app.router.push({
path: "signInRecord"
})
},
/**
* 积分详情
*/
onIntegralDetailHandler(evt) {
app.router.push({
path: "integralDetail"
})
},
/**
* 我的订单
*/
onMyOrderHandler(evt) {
let navIndex = getBindtapData(evt, "index");
app.router.push({
path: "myOrder",
query: {
navIndex: navIndex
}
})
},
/**
* 我的二维码
*/
......@@ -84,6 +117,24 @@ Page({
},
/**
* 地址管理
*/
onAddressHandler(evt) {
app.router.push({
path: "addressManagement"
})
},
/**
* 我的消息
*/
onMyMessageHandler(evt) {
app.router.push({
path: "myMessage"
})
},
/**
* 点击联系我们
*/
onContactUsHandler(evt) {
......@@ -149,7 +200,8 @@ Page({
this.setData({
authorizeVisible: false,
commonTipsCompVisible: false,
signTipsCompVisible: false
signTipsCompVisible: false,
giftSignTipsCompVisible: false
})
},
// 子组件事件
......
......@@ -19,7 +19,7 @@
</view>
<!-- 右边栏 -->
<view class="user-data">
<view class="wrap">
<view bindtap="onIntegralDetailHandler" class="wrap">
<view class="t1">{{userInfo.memberPoints}}</view>
<view class="t2">我的积分</view>
</view>
......@@ -39,7 +39,7 @@
<view class="border sign ">
<view class="tit">
<view class="t1">连续签到7天赢现金红包</view>
<view class="t2">
<view bindtap="onsignInRecordHandler" class="t2">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-sign-record.png" />
签到记录
</view>
......@@ -61,31 +61,31 @@
</view>
<!-- 订单区 -->
<view class="border order ">
<view class="order-item">
<view bindtap="onMyOrderHandler" data-index="0" class="order-item">
<view class="icon-wrap">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-all-order.png" />
</view>
<view class="txt">全部订单</view>
</view>
<view class="order-item">
<view bindtap="onMyOrderHandler" data-index="1" class="order-item">
<view class="icon-wrap">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-wait-review.png" />
</view>
<view class="txt">待审核</view>
</view>
<view class="order-item">
<view bindtap="onMyOrderHandler" data-index="2" class="order-item">
<view class="icon-wrap">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-review-pass.png" />
</view>
<view class="txt">已通过</view>
</view>
<view class="order-item">
<view bindtap="onMyOrderHandler" data-index="3" class="order-item">
<view class="icon-wrap">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-shipped.png" />
</view>
<view class="txt">已发货</view>
</view>
<view class="order-item">
<view bindtap="onMyOrderHandler" data-index="4" class="order-item">
<view class="icon-wrap">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-up-pass.png" />
</view>
......@@ -106,13 +106,13 @@
</view>
<view class="txt">积分排行</view>
</view>
<view class="func-wrap-item">
<view bindtap="onAddressHandler" class="func-wrap-item">
<view class="icon-wrap">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-my-address.png" />
</view>
<view class="txt">我的地址</view>
</view>
<view class="func-wrap-item">
<view bindtap="onMyMessageHandler" class="func-wrap-item">
<view class="icon-wrap">
<image class="icon" mode="aspectFit" src="../../image/icon/icon-my-message.png" />
</view>
......@@ -139,3 +139,6 @@
<van-popup show="{{ signTipsCompVisible }}">
<sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp>
</van-popup>
<van-popup show="{{ giftSignTipsCompVisible }}">
<gift-sign-tips-comp bind:evtcomp="evtcomp"></gift-sign-tips-comp>
</van-popup>
......
......@@ -36,10 +36,10 @@ Page({
],
maxImg: 1, // 上传数量
files: [], // 上传文件列表
// provinceId: "",
// cityId: "",
// provinceList: [],
// cityList: [],
provinceId: "",
cityId: "",
provinceList: [],
cityList: [],
// form end
},
onShareAppMessage() {},
......@@ -52,7 +52,7 @@ Page({
this.initData();
},
initData() {
this.getProvince();
},
/**
......@@ -62,33 +62,58 @@ Page({
},
// getProvince() {
// return new Promise((resolve, reject) => {
// app.post({
// mode: "custom",
// url: app.api.provinceQuery
// }).then((result) => {
// this.setData({
// provinceList: result
// })
// console.log("provinceList:",result);
// })
// });
// },
// getCity() {
// return new Promise((resolve, reject) => {
// app.post({
// url: app.api.cityQuery,
// data: {
// parentId: this.data.provinceId
// }
// }).then((result) => {
// this.setData({
// cityList: result
// })
// })
// });
// },
getProvince() {
return new Promise((resolve, reject) => {
app.post({
mode: "custom",
url: app.api.areaQuery,
data: {
parentId: ""
}
}).then((result) => {
this.setData({
provinceList: result
})
console.log("provinceList:", result);
})
});
},
getCity() {
return new Promise((resolve, reject) => {
app.post({
mode: "custom",
url: app.api.areaQuery,
data: {
parentId: this.data.provinceId
}
}).then((result) => {
this.setData({
cityList: result
})
console.log("city:", result);
})
});
},
bindPickerChangeProvince(e) {
let index = e.detail.value;
this.setData({
provinceIndex: index,
provinceId: this.data.provinceList[index].areaId,
cityList: [],
cityIndex: -1,
})
this.getCity();
},
bindPickerChangeCity(e) {
let index = e.detail.value;
this.setData({
cityIndex: index,
cityId: this.data.cityList[index].areaId,
})
},
/**
* 参考 contact-table同名方法
......
......@@ -26,9 +26,13 @@
<view class="form-item">
<view class="label">区域</view>
<view class="cont address">
<view class="area">省份</view>
<picker class="area" bindchange="bindPickerChangeProvince" value="{{provinceIndex}}" range="{{provinceList}}" range-key="areaName">
{{provinceList[provinceIndex].areaName ? provinceList[provinceIndex].areaName : '省'}}
</picker>
<view class="line"></view>
<view class="area">城市</view>
<picker class="area" bindchange="bindPickerChangeCity" value="{{cityIndex}}" range="{{cityList}}" range-key="areaName">
{{cityList[cityIndex].areaName ? cityList[cityIndex].areaName : '市'}}
</picker>
</view>
</view>
<view class="form-item">
......