7de4346d by simon

默认提交

1 parent 2f073b2e
......@@ -3,6 +3,7 @@
"pages/index/index",
"pages/detail/detail",
"pages/personal-list/personal-list",
"pages/reward/reward",
"pages/reward-completed/reward-completed",
"pages/more/more",
"pages/poster-example/poster-example",
......
......@@ -105,7 +105,8 @@ button {
.red-p {
.comp {
bottom: auto;
top: 56%;
// top: 56%;
bottom: 10%;
}
}
......
......@@ -53,12 +53,16 @@ Component({
break;
case "red-package":
wx.showModal({
title: '温馨提示',
content: '打赏功能尚未开放,敬请期待!',
showCancel: false,
success(res) {}
});
// wx.showModal({
// title: '温馨提示',
// content: '打赏功能尚未开放,敬请期待!',
// showCancel: false,
// success(res) {}
// });
console.log("1111");
app.router.push({
path: "reward"
})
break;
default:
......
.comp {
position: fixed;
bottom: 10%;
right: 2%;
bottom: 20%;
left: 2%;
z-index: 91;
color: #ffffff;
......
......@@ -2,9 +2,9 @@
<view wx:for="{{types}}" wx:key="{{index}}" data-data="{{item}}" bindtap="onTapHandler" class="btn point">
<span class="iconfont {{typeIconMap[item+''] }}"></span>
</view>
<!-- <view wx:for="{{pics}}" wx:key="{{index}}" data-data="{{item}}" bindtap="onTapHandler" class="btn">
<view wx:for="{{pics}}" wx:key="{{index}}" data-data="{{item}}" bindtap="onTapHandler" class="btn">
<image mode="aspectFit" src="{{'../../image/shortcut/'+item+'.png'}}" class="pics ani-tada" />
</view> -->
</view>
<button class="btn point" wx:if="{{contact}}" open-type="contact" bindcontact="handleContact">
<span class="iconfont iconicon-test3 contact"></span>
</button>
......
......@@ -68,10 +68,12 @@
.t2 {}
}
.btn2{
.btn2 {
background-color: #f67b37;
border: none;
}
}
}
}
......@@ -115,6 +117,8 @@
.btn2 {
background-color: #ae3f48;
}
}
}
......@@ -148,10 +152,12 @@
.t1 {
width: 100%;
font-size: 32px;
font-weight: normal;
}
.name {
font-size: 36px;
// font-size: 36px;
}
.num {
......@@ -197,6 +203,9 @@
color: #7f776e;
}
.btn3 {
background-color: #8d8d8d;
}
}
}
......@@ -278,4 +287,6 @@
margin-right: 12px;
}
}
}
......
......@@ -22,11 +22,11 @@
</view>
<view class="share">
<view class="btn-wrap">
<button open-type="share" class=" btn btn2">
<button open-type="share" class="btn ">
<span class="t1 iconfont iconplane"></span>
<span class="t1">分享给好友</span>
</button>
<button open-type="share" class="ani-scl btn ">
<button open-type="share" class="ani-scl btn btn2">
<span class="t1 iconfont iconplane"></span>
<span class="t1">分享到群</span>
</button>
......@@ -44,7 +44,7 @@
</view>
</view>
<view class="btn-wrap">
<view bindtap="toIndex" class="index-btn btn">
<view bindtap="toIndex" class="index-btn btn btn3">
<span class="t1 iconfont iconhome"></span>
<span>回到首页</span>
</view>
......
......@@ -52,14 +52,14 @@
}
.tit-bg {
opacity: .5;
opacity: .6;
height: 80px;
color: #ffffff;
position: absolute;
width: 100%;
height: 110px;
bottom: 0;
background-image: linear-gradient(to top, #000000, #666666);
background-image: linear-gradient(to top, #000000, #999999);
}
}
......@@ -117,14 +117,14 @@
}
.tit-bg {
opacity: .5;
opacity: .6;
height: 80px;
color: #ffffff;
position: absolute;
width: 100%;
bottom: 0;
@include border-top-radius(8px);
background-image: linear-gradient(to top, #000000, #666666);
background-image: linear-gradient(to top, #000000, #999999);
}
.play {
......@@ -182,11 +182,12 @@
display: flex;
justify-content: center;
align-items: center;
height: 64px;
height: 52px;
border-radius: 52px;
color: #ffffff;
background-color: #3ec03c;
border-radius: 8px;
margin: 0;
font-weight: normal;
.iconfont {
font-size: 40px;
......
......@@ -14,7 +14,7 @@
<block wx:for="{{bannerList}}" wx:key="{{index}}">
<swiper-item>
<image bindtap="onBannerHandler" data-data="{{item}}" data-index="{{index}}" class="swiper-image" src="{{item.imageUrl}}" mode="aspectFill" />
<view class="tit-bg"></view>
<view class="tit-bg" wx:if="{{curBanner && curBanner.bannerTitle}}"></view>
<view wx:if="{{curBanner && curBanner.bannerTitle}}" class="tit">
{{curBanner && curBanner.bannerTitle || ""}}
</view>
......
......@@ -80,6 +80,7 @@
width: $contentWidth;
pointer-events: none;
}
.tit {
font-size: 40px;
height: 80px;
......@@ -94,14 +95,14 @@
}
.tit-bg {
opacity: .5;
opacity: .6;
height: 80px;
color: #ffffff;
position: absolute;
width: 100%;
bottom: 0;
@include border-top-radius(8px);
background-image: linear-gradient(to top, #000000, #666666);
background-image: linear-gradient(to top, #000000, #999999);
}
.play {
......
import {
getBindtapData
} from '../../utils/util';
let app = getApp();
Page({
data: {
authorizeVisible: false,
total: 0,
page: 1,
size: 10,
productList: [], // 产品列表
indexInfo: {},
userInfo: {},
rewardList: [{
price: 6
},
{
price: 18
},
{
price: 66
},
{
price: 88
},
{
price: 168
},
{
price: 388
},
]
},
onShareAppMessage() {},
showAuth() {
this.setData({
authorizeVisible: true
})
},
onLoad(options) {},
/**
* 基础方法
* 授权完毕重拉数据用
*/
initData() {
},
/**
* 到达底部
* 做加载更多操作
*/
onReachBottom() {
if (this.data.dataList.length < this.data.total) {
this.setData({
page: this.data.page + 1
});
this.queryDataList();
}
},
// 重置页面列表 点击搜索条件时需要
resetPage() {
this.setData({
page: 1,
dataList: []
})
},
/**
* 请求DataList
*/
queryDataList() {
return;
return new Promise((resolve, reject) => {
app.post({
sid: false,
url: app.api.dataList,
data: {
page: this.data.page,
size: this.data.size,
},
}).then((result) => {
let dataList = result.list;
dataList = this.data.dataList.concat(dataList);
this.setData({
dataList: dataList,
total: result.total
})
resolve();
})
});
},
/**
* 隐藏蒙层
*/
hideMask() {
this.setData({
productDetailVisible: false,
authorizeVisible: false,
})
},
/**
* 子组件事件
* @param {*} evt
*/
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏蒙层
case "_evt_hide_mask":
this.hideMask();
break;
/**
* 重拉数据已在
*/
case "_evt_auth_complete":
// this.initData();
this.hideMask();
break;
default:
break;
}
},
})
{
"navigationBarTitleText": ""
}
@import '../../assets/scss/mixins';
@import '../../assets/scss/utils';
.page {
$contentWidth: 650px;
.bgc {
background-color: #af3541;
}
.bg {}
.main {
.top-space {
height: 140px;
}
.content {
position: relative;
.portrait {
text-align: center;
&-bg {
width: 207px;
}
}
.reward {
width: $contentWidth;
margin: 124px auto 0;
&-wrap {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
&-item {
width: 320px;
margin-bottom:12px;
}
}
}
}
}
}
<view class="page">
<view class="app__bgc bgc"></view>
<image mode="widthFix" class="app__bg bg" src="../../image/reward/reward-bg.png" />
<!-- <view class="app__bg bg"></view> -->
<view class="app__content main">
<view class="top-space"></view>
<view class="content">
<view class="portrait">
<image class="portrait-bg" mode="widthFix" src="../../image/reward/reward-portrait-bg.png" />
</view>
<view class="reward">
<view class="reward-wrap">
<image class="reward-wrap-item" wx:for="{{rewardList}}" wx:key="{{index}}" mode="widthFix" src="{{'../../image/reward/m-'+item.price+'.png'}}" />
</view>
</view>
</view>
</view>
</view>
......@@ -2,6 +2,7 @@ const routerPath = {
index: '/pages/index/index',
detail: '/pages/detail/detail',
personalList: '/pages/personal-list/personal-list',
reward: '/pages/reward/reward',
rewardCompleted: '/pages/reward-completed/reward-completed',
authorize: '/pages/authorize/authorize', // 授权
......