Skip to content

7
7-Eleven
Commit 671141f0 by 谢中龙
Options

积分换物优化

parent 3557992c
Showing with 155 additions and 48 deletions
src/component/dialogUserLimit/dialogUserLimit.wxml
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
class='close' class='close'
src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_tips_close.png' mode='aspectFit'></image> src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_tips_close.png' mode='aspectFit'></image>
<image class='tips-icon' src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/tips_icon.png' mode='aspectFit'></image> <image class='tips-icon' src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/tips_icon.png' mode='aspectFit'></image>
<view>您已达到上限了哦</view> <view>您已达到兑换上限</view>
</view> </view>
</view> </view>
src/pages/integralWater/integralWater.js
...@@ -42,7 +42,7 @@ wxService.page({ ...@@ -42,7 +42,7 @@ wxService.page({
let data = res.data.data ? res.data.data : {}; let data = res.data.data ? res.data.data : {};
this.data.memberPoint.total = data.point ? data.point : 0; this.data.memberPoint.total = data.point ? data.point : 0;
this.data.memberPoint.expirePoint = data.pointWillExpired ? data.pointWillExpired : 0; this.data.memberPoint.expirePoint = data.pointWillExpired ? data.pointWillExpired : 0;
let expireDate = data.pointExpiredTime ? data.pointExpiredTime : ''; let expireDate = data.pointExpiredTime ? data.pointExpiredTime : '2019-12-31 23:59:59';
if (expireDate){ if (expireDate){
let dateStr = expireDate.replace(/-/g, '/'); let dateStr = expireDate.replace(/-/g, '/');
let da = new Date(dateStr); let da = new Date(dateStr);
......
src/pages/integralWater/integralWater.wxml
...@@ -8,25 +8,23 @@ ...@@ -8,25 +8,23 @@
<view class="integral-vip-rules" bindtap="handleGoMemberRulesRules">积分规则</view> <view class="integral-vip-rules" bindtap="handleGoMemberRulesRules">积分规则</view>
</view> --> </view> -->
<view class='mall-title'> <!-- 新布局 -->
<view class='title-num-point'> <view class='new-container'>
<view class='title-img-point'> <view class='new-container-lf'>
<view class='img-point'> <view class='new-point-info'>
<image class="point-img" src='/assets/imgs/point.png' mode="widthFix" /> <image class="point-img" src='/assets/imgs/point.png' mode="widthFix" />
</view> <label class='text-point'>{{memberPoint.total}}</label>
<view class='text-point'>
{{memberPoint.total}}
</view>
</view>
<view class='integral-vip-rules' bindtap="handleGoMemberRulesRules">积分规则</view>
</view> </view>
<view class='title-time-point' wx:if="{{memberPoint.expirePoint > 0}}"> <view class='title-time-point' wx:if="{{memberPoint.expirePoint > 0}}">
{{memberPoint.expirePoint}} 积分将于 {{memberPoint.expireDate}} 清零 {{memberPoint.expirePoint}} 积分将于 {{memberPoint.expireDate}} 清零
</view> </view>
<view class='title-time-point' wx:if="{{memberPoint.expirePoint == 0}}"> <view class='title-time-point' wx:if="{{memberPoint.expirePoint == 0}}">暂无将过期积分</view>
暂无将过期积分
</view> </view>
<view class='new-container-rg'>
<view class='new-integral-vip-rules' bindtap="handleGoMemberRulesRules">积分规则</view>
</view> </view>
</view>
<view wx:if="{{!integralList.length}}" class="detail-list-no">还没有任何积分记录</view> <view wx:if="{{!integralList.length}}" class="detail-list-no">还没有任何积分记录</view>
<view wx:if="{{integralList.length}}"> <view wx:if="{{integralList.length}}">
......
src/pages/integralWater/integralWater.wxss
...@@ -15,6 +15,62 @@ page{ ...@@ -15,6 +15,62 @@ page{
font-size: 42rpx; font-size: 42rpx;
margin-left: 10rpx; margin-left: 10rpx;
} }
/* 新布局开始 */
.new-container{
height: 150rpx;
padding-left: 50rpx;
padding-right: 42rpx;
box-sizing: border-box;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 8px 5px rgba(0, 0, 0, 0.05),
0px 0px 3px 0px rgba(0, 0, 0, 0.03);
display: flex;
justify-content: space-between;
align-items: center;
}
.new-container .new-container-lf{
display: flex;
flex-direction: column;
justify-content: center;
}
.new-container .new-container-lf .new-point-info{
display: flex;
align-items: center;
}
.new-container .new-container-lf .new-point-info image{
width:28rpx;
height:36rpx;
margin-right: 10rpx;
}
.new-container .new-container-rg{
}
.new-container .new-container-rg .new-integral-vip-rules{
width: 133rpx;
height: 42rpx;
line-height: 42rpx;
border-radius: 34rpx;
font-size: 23rpx;
text-align: center;
border: 1px solid rgba(204, 204, 204, 1);
}
.title-time-point {
color: rgba(102, 102, 102, 1);
font-size: 22rpx;
text-align: left;
margin-top: 8rpx;
}
/* 新布局结束 */
.mall-title { .mall-title {
height: 150rpx; height: 150rpx;
padding-left: 50rpx; padding-left: 50rpx;
...@@ -40,13 +96,7 @@ page{ ...@@ -40,13 +96,7 @@ page{
text-align: center; text-align: center;
border: 1px solid rgba(204, 204, 204, 1); border: 1px solid rgba(204, 204, 204, 1);
} }
.title-time-point {
color: rgba(102, 102, 102, 1);
font-size: 24rpx;
text-align: left;
padding-top: 3rpx;
margin-top: 15rpx;
}
.point-img { .point-img {
width: 28rpx; width: 28rpx;
......
src/project.config.json
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 15, "current": 20,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -167,6 +167,12 @@ ...@@ -167,6 +167,12 @@
"name": "敬请期待", "name": "敬请期待",
"pathName": "subPackage/page/pages/goToHome/goToHome", "pathName": "subPackage/page/pages/goToHome/goToHome",
"query": "" "query": ""
},
{
"id": 20,
"name": "积分换物记录",
"pathName": "subPackage/page/pages/recordList/recordList",
"query": ""
} }
] ]
} }
......
src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.js
...@@ -65,7 +65,7 @@ wxService.page({ ...@@ -65,7 +65,7 @@ wxService.page({
let data = res.data.data ? res.data.data : {}; let data = res.data.data ? res.data.data : {};
this.data.memberPoint.total = data.point ? data.point : 0; this.data.memberPoint.total = data.point ? data.point : 0;
this.data.memberPoint.expirePoint = data.pointWillExpired ? data.pointWillExpired : 0; this.data.memberPoint.expirePoint = data.pointWillExpired ? data.pointWillExpired : 0;
let expireDate = data.pointExpiredTime ? data.pointExpiredTime : ''; let expireDate = data.pointExpiredTime ? data.pointExpiredTime : '2019-12-31 23:59:59';
if (expireDate) { if (expireDate) {
let dateStr = expireDate.replace(/-/g, '/'); let dateStr = expireDate.replace(/-/g, '/');
......
src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.wxml
<!--pages/userCenter.wxml--> <!--pages/userCenter.wxml-->
<view class='page-integral-mall' style="padding-bottom: {{currentTab =='goods' ? '70rpx' : '40rpx'}}"> <view class='page-integral-mall' style="padding-bottom: {{currentTab =='goods' ? '70rpx' : '40rpx'}}">
<!-- title --> <!-- 新布局 -->
<view class='mall-title'> <view class='new-container'>
<view class='title-num-point'> <view class='new-container-lf'>
<view class='title-img-point'> <view class='new-point-info'>
<view class='img-point'>
<image class="point-img" src='/assets/imgs/point.png' mode="widthFix" /> <image class="point-img" src='/assets/imgs/point.png' mode="widthFix" />
</view> <label class='text-point'>{{memberPoint.total}}</label>
<view class='text-point'>
{{memberPoint.total}}
</view>
</view>
<view class='integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view>
</view> </view>
<view class='title-time-point' wx:if="{{memberPoint.expirePoint > 0}}"> <view class='title-time-point' wx:if="{{memberPoint.expirePoint > 0}}">
{{memberPoint.expirePoint}} 积分将于 {{memberPoint.expireDate}} 清零 {{memberPoint.expirePoint}} 积分将于 {{memberPoint.expireDate}} 清零
</view> </view>
<view class='title-time-point' wx:if="{{memberPoint.expirePoint == 0}}"> <view class='title-time-point' wx:if="{{memberPoint.expirePoint == 0}}">暂无将过期积分</view>
暂无将过期积分 </view>
<view class='new-container-rg'>
<view class='new-integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view>
</view> </view>
</view> </view>
......
src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.wxss
...@@ -23,6 +23,61 @@ page { ...@@ -23,6 +23,61 @@ page {
font-size: 28rpx; font-size: 28rpx;
} }
/* 新布局开始 */
.new-container{
height: 150rpx;
padding-left: 50rpx;
padding-right: 42rpx;
box-sizing: border-box;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 8px 5px rgba(0, 0, 0, 0.05),
0px 0px 3px 0px rgba(0, 0, 0, 0.03);
display: flex;
justify-content: space-between;
align-items: center;
}
.new-container .new-container-lf{
display: flex;
flex-direction: column;
justify-content: center;
}
.new-container .new-container-lf .new-point-info{
display: flex;
align-items: center;
}
.new-container .new-container-lf .new-point-info image{
width:28rpx;
height:36rpx;
margin-right: 10rpx;
}
.new-container .new-container-rg{
}
.new-container .new-container-rg .new-integral-vip-rules{
width: 133rpx;
height: 42rpx;
line-height: 42rpx;
border-radius: 34rpx;
font-size: 23rpx;
text-align: center;
border: 1px solid rgba(204, 204, 204, 1);
}
.title-time-point {
color: rgba(102, 102, 102, 1);
font-size: 22rpx;
text-align: left;
margin-top: 8rpx;
}
/* 新布局结束 */
/* 卡劵列表 */ /* 卡劵列表 */
.coupon-wrap { .coupon-wrap {
padding: 20rpx; padding: 20rpx;
...@@ -150,7 +205,7 @@ page { ...@@ -150,7 +205,7 @@ page {
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 0; bottom: 0;
background: rgba(0, 0, 0, 0.65); background: red;
z-index: 2; z-index: 2;
width: 100%; width: 100%;
} }
...@@ -188,13 +243,7 @@ page { ...@@ -188,13 +243,7 @@ page {
text-align: center; text-align: center;
border: 1px solid rgba(204, 204, 204, 1); border: 1px solid rgba(204, 204, 204, 1);
} }
.title-time-point {
color: rgba(102, 102, 102, 1);
font-size: 24rpx;
text-align: left;
padding-top: 3rpx;
margin-top: 15rpx;
}
.mall-tab { .mall-tab {
height: 80rpx; height: 80rpx;
......
src/subPackage/page/pages/exchangeAddress/exchangeAddress.wxml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</picker> </picker>
</view> </view>
<view class='address-form'> <view class='address-form'>
<input placeholder='请输入收货人地址' value='{{form.address}}' data-prop="address" bindinput='onInput' maxlength='20'></input> <input placeholder='请输入收货人地址' value='{{form.address}}' data-prop="address" bindinput='onInput' maxlength='40'></input>
</view> </view>
<view class='sumbit' bindtap='onTapSubmit'>确认</view> <view class='sumbit' bindtap='onTapSubmit'>确认</view>
......
src/subPackage/page/pages/recordList/recordList.wxml
...@@ -10,9 +10,16 @@ ...@@ -10,9 +10,16 @@
<view class="list-point">-{{item.point}}积分</view> <view class="list-point">-{{item.point}}积分</view>
</view> </view>
<view class="desc-address"> <view class="desc-address">
{{item.fullAddress}} 姓名：<text>{{item.exchangeInfo.name}}</text>
<text style='margin-left:20rpx;margin-right:10rpx;'>{{item.exchangeInfo.name}}</text> </view>
<text>{{item.exchangeInfo.mobile}}</text> <view class="desc-address">
联系电话：<text>{{item.exchangeInfo.mobile}}</text>
</view>
<view class="desc-address">
地区：<text>{{item.exchangeInfo.distinct}}</text>
</view>
<view class="desc-address">
具体地址：{{item.address}}
</view> </view>
</view> </view>
</block> </block>
......
src/subPackage/page/pages/recordList/recordList.wxss
...@@ -47,6 +47,7 @@ page{ ...@@ -47,6 +47,7 @@ page{
.desc-address { .desc-address {
color: rgba(170, 170, 170, 1); color: rgba(170, 170, 170, 1);
font-size: 22rpx; font-size: 22rpx;
margin-bottom: 6rpx;
} }
.desc-address { .desc-address {
width: 100%; width: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment