Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
80e76f2b by simon
Options

no message

1 parent 11d4ac48
Inline Side-by-side
Showing 11 changed files with 198 additions and 73 deletions
......@@ -10,9 +10,9 @@
@extend .shadow;
width: 670px;
margin: 0 auto;
min-height: 896px;
min-height: 900px;
@extend .bb;
padding: 40px 30px 30px;
padding: 20px 30px 20px;
.tit {
font-size: 40px;
......@@ -20,19 +20,21 @@
}
.img-wrap {
$imgWidth: 610px;
$imgHeight: 480px;
margin: 20px 0;
width: 610px;
height: 322px;
width: $imgWidth;
height: $imgHeight;
border: 1px solid #F0F0F0;
border-radius: 4px;
.swiper {
width: 610px;
height: 322px;
width: $imgWidth;
height: $imgHeight;
.swiper-image {
width: 610px;
height: 322px;
width: $imgWidth;
height: $imgHeight;
}
}
}
......@@ -40,7 +42,7 @@
.desc {
color: #333333;
font-size: 28px;
height: 404px;
height: 320px;
line-height: 48px;
}
......
......@@ -69,8 +69,6 @@ Page({
defaultReceiver,
indexInfo
} = this.data;
console.log("indexInfo:", indexInfo);
console.log("item:", item);
if (indexInfo.memberPoints < item.commodityPrice) {
// 积分不足
this.setData({
......@@ -116,6 +114,9 @@ Page({
item,
defaultReceiver
} = this.data;
console.log("item:", item);
console.log("defaultReceiver:", defaultReceiver);
wx.showModal({
title: '兑换确认',
content: `将花费${item.commodityPrice}兑换${item.commodityTitle}一份`,
......@@ -125,7 +126,7 @@ Page({
url: app.api.commodityExchange,
data: {
commodityCode: item.commodityCode,
receiverCode: defaultReceiver.receiverCode,
receiverCode: defaultReceiver && defaultReceiver.receiverCode || "",
remark: _this.data.remark
}
}).then((result) => {
......
......@@ -91,6 +91,7 @@ Page({
this.setData({
orderSort
})
this.resetPage();
this.queryProduct();
},
......@@ -102,6 +103,19 @@ Page({
this.queryProduct();
},
/**
* 我的订单
*/
onMyOrderHandler(evt) {
let navIndex = getBindtapData(evt, "index");
app.router.push({
path: "myOrder",
query: {
navIndex: navIndex
}
})
},
bindKeyWordsInput(e) {
this.setData({
keyWords: e.detail.value
......
......@@ -68,8 +68,44 @@ $contentWidth:690px;
}
}
.border {
width: $contentWidth;
@extend .shadow;
background-color: #ffffff;
@extend .bb;
padding: 24px 26px;
margin: 0 auto 20px;
}
// 订单区域
.order {
display: flex;
justify-content: space-between;
font-size: 24px;
color: #131415;
text-align: center;
&-item {
width: 110px;
.icon-wrap {
@extend .fcc;
height: 100px;
height: 100px;
.icon {
height: 64px;
height: 64px;
}
}
.txt {}
}
}
.top-space {
height: 116px;
height: 130px;
}
.content {
......
......@@ -22,6 +22,39 @@
</div>
</view>
<view class="top-space"></view>
<!-- 订单区 -->
<view class="border order ">
<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 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 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 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 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>
<view class="txt">未通过</view>
</view>
</view>
<view class="content">
<view class="product">
<view class="product-item" wx:for="{{productList}}" wx:key="{{index}}">
......
......@@ -34,7 +34,7 @@
<view class="line"></view>
<view class="cont">
<view class="prize">
<image class="image" mode="aspectFit" />
<image class="image" mode="aspectFit" src="{{item.orderCommodityThumbnail}}" />
</view>
<view class="detail">
<view class="t1">{{item.orderCommodityTitle}}</view>
......
......@@ -46,6 +46,7 @@ Page({
this.setData({
rankInfo: rankInfo
})
console.log("rankInfo 1:", rankInfo);
resolve();
})
});
......@@ -72,7 +73,7 @@ Page({
this.setData({
historyRankInfoList: historyRankInfoList
})
console.log("historyRankInfoList:", historyRankInfoList);
console.log("rankInfo 2:", historyRankInfoList);
this.setHistory();
resolve();
})
......@@ -141,7 +142,12 @@ Page({
this.setData({
turnsIndex: curIndex
});
this.queryActivityHistory();
console.log("curIndex:", curIndex);
if (curIndex == 0) {
this.queryActivity();
} else {
this.queryActivityHistory();
}
}
},
......
......@@ -77,7 +77,7 @@ $contentWidth:690px;
justify-content: space-between;
&-item {
width: 50%;
width: 60%;
// 本轮排行
.pubish {
......@@ -137,6 +137,10 @@ $contentWidth:690px;
padding: 10px 32px;
}
}
&-item2 {
width: 40%;
}
}
// 标题
......
......@@ -46,7 +46,7 @@
</picker>
</view>
</view>
<view class="rank-func-item pubish fje">
<view class="rank-func-item rank-func-item2 pubish fje">
<view wx:if="{{turnsIndex == 0}}" data-index="1" bindtap="onChangeTurnsHandler" class="mode">
查看历史排行
</view>
......
......@@ -61,7 +61,7 @@ $contentWidth: 690px;
border-radius: 8px;
}
.vip-check{
.vip-check {
background: #6DD400;
}
}
......@@ -155,24 +155,37 @@ $contentWidth: 690px;
justify-content: space-between;
&-item {
width: 68px;
height: 100px;
border-radius: 8px;
text-align: center;
background: #F0F0F0;
padding: 8px 4px;
@extend .bb;
display: flex;
// align-items: center;
.no {
@extend .fcc;
color: #333333;
font-size: 28px;
height: 40px;
.line {
background: #F0F0F0;
width: 46px;
height: 2px;
margin-top: 26px;
}
.icon {
image {
margin-top: 4px;
.day {
text-align: center;
.circle {
background: #F0F0F0;
width: 52px;
height: 52px;
line-height: 52px;
border-radius: 26px;
font-size: 28px;
color: #FFFFFF;
}
.num {
font-size: 24px;
color: #3680EB;
margin-top: 6px;
}
.icon {
margin-top: 6px;
width: 40px;
height: 40px;
}
......@@ -180,13 +193,51 @@ $contentWidth: 690px;
}
&-item-act {
color: #FFFFFF;
background: #3680EB;
.line {
background: #3680EB;
}
.day {
.circle {
background: #3680EB;
}
.no {
color: #ffffff;
}
}
// &-item {
// width: 68px;
// height: 100px;
// border-radius: 8px;
// text-align: center;
// background: #F0F0F0;
// padding: 8px 4px;
// @extend .bb;
// .no {
// @extend .fcc;
// color: #333333;
// font-size: 28px;
// height: 40px;
// }
// .icon {
// image {
// margin-top: 4px;
// width: 40px;
// height: 40px;
// }
// }
// }
// &-item-act {
// color: #FFFFFF;
// background: #3680EB;
// .no {
// color: #ffffff;
// }
// }
}
// 签到按钮
......@@ -198,7 +249,8 @@ $contentWidth: 690px;
font-size: 28px;
color: #FFFFFF;
}
&-btn-disable{
&-btn-disable {
background: #ECECEC;
}
}
......
......@@ -48,7 +48,7 @@
</view>
</view>
<!-- 7天签到 -->
<view class="check">
<!-- <view class="check">
<view wx:for="{{signInfo}}" wx:key="{{index}}" class="check-item {{item ? 'check-item-act' :''}}">
<view class="no">{{index+1}}</view>
<view class="icon">
......@@ -57,44 +57,21 @@
<image wx:else mode="aspectFit" src="../../image/icon/icon-integral.png" />
</view>
</view>
</view> -->
<view class="check">
<view wx:for="{{signInfo}}" wx:key="{{index}}" class="check-item {{item ? 'check-item-act' :''}}">
<view wx:if="{{index != 0}}" class="line"></view>
<view class="day">
<view class="circle">{{index+1}}</view>
<view wx:if="{{index != signInfo.length-1}}" class="num">+10</view>
<image wx:else class="icon" mode="aspectFit" src="../../image/icon/icon-red-package.png" />
</view>
</view>
</view>
<!-- 签到按钮 -->
<view wx:if="{{userInfo.isSign == 1}}" class="sign-btn sign-btn-disable">已签到</view>
<view wx:else class="sign-btn" bindtap="onSignHandler">签到 (第{{signNum}}天)</view>
</view>
<!-- 订单区 -->
<view class="border order ">
<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 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 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 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 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>
<view class="txt">未通过</view>
</view>
</view>
<!-- 功能区 -->
<view class="border func">
<view class="my-qrcode">
......