Skip to content

7
7-Eleven
Commit 053c130b by 赵雅纹
Options

Merge branch 'feature-zyw' into 'dev_7.0.1' 

Feature zyw

See merge request !29
parents 557c6640 9aeaea39
Showing with 28 additions and 13 deletions
src/component/personCenter/personCenter.js
...@@ -50,7 +50,7 @@ Component({ ...@@ -50,7 +50,7 @@ Component({
memberActivateStatus: false, memberActivateStatus: false,
integralNum: 0, integralNum: 0,
couponNum: 0, couponNum: 0,
baseUrl: '/assets/imgs/0606.png', baseUrl: '/assets/imgs/060610.png',
isAuthorization: false, isAuthorization: false,
_token: '', _token: '',
currentMobile: '' currentMobile: ''
...@@ -100,7 +100,7 @@ Component({ ...@@ -100,7 +100,7 @@ Component({
} }
}, },
handleGoWxCard() { handleGoWxCard() {
wxService.openCardList() wxService.openCard()
} }
} }
}) })
\ No newline at end of file
src/component/personCenter/personCenter.wxml
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
<view class='user-name-content'> <view class='user-name-content'>
<view class='user-name'> <view class='user-name'>
<open-data type="userNickName" class="userinfo-nickname" lang="zh_CN"></open-data> <open-data type="userNickName" class="userinfo-nickname" lang="zh_CN"></open-data>
<!--<navigator url='/pages/memberOfOwn/memberOfOwn' style='display:inline-block' hover-class="none"> <!-- <navigator url='/pages/memberOfOwn/memberOfOwn' style='display:inline-block' hover-class="none">
<image class='icon-edit' src='/assets/imgs/711_12.png'></image> <image class='icon-edit' src='/assets/imgs/711_12.png'></image>
</navigator>--> </navigator> -->
</view> </view>
<view class='user-id'>{{memberCardNo}}</view> <view class='user-id'>{{memberCardNo}}</view>
</view> </view>
<!-- <view class='qr-code pr'> <view class='qr-code pr'>
<image src='/assets/imgs/711_11.png' bindtap="handleGoWxCard"></image> <image src='/assets/imgs/711_11.png' catchtap="handleGoWxCard"></image>
</view>--> </view>
</view> </view>
</view> </view>
<view class='df tc person-num' wx:if='{{currentMobile}}'> <view class='df tc person-num' wx:if='{{currentMobile}}'>
......
src/component/personCenter/personCenter.wxss
...@@ -101,4 +101,16 @@ ...@@ -101,4 +101,16 @@
} }
.un-active-btn{ .un-active-btn{
/* font-family:"iconfont-711" !important; */ /* font-family:"iconfont-711" !important; */
}
.user-info{
position: relative;
}
.qr-code{
position: absolute;
right: 0;
top: 6rpx;
}
.qr-code>image{
width: 100rpx;
height: 100rpx;
} }
\ No newline at end of file
src/pages/couponDetail/couponDetail.js
...@@ -36,6 +36,7 @@ wxService.page({ ...@@ -36,6 +36,7 @@ wxService.page({
wx.hideLoading() wx.hideLoading()
data.coupon.startTime = data.coupon.startTime.substring(0,10) data.coupon.startTime = data.coupon.startTime.substring(0,10)
data.coupon.endTime = data.coupon.endTime.substring(0,10) data.coupon.endTime = data.coupon.endTime.substring(0,10)
data.couponSetting.notice = JSON.parse(data.couponSetting.notice)
this.setData({ this.setData({
couponDetail: data couponDetail: data
}) })
......
src/pages/couponDetail/couponDetail.wxml
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
<view class='coupon-code fs-24' bindtap="handelPresentCouponCode">出示券码</view> <view class='coupon-code fs-24' bindtap="handelPresentCouponCode">出示券码</view>
</view> </view>
<view class='integral-detail'> <view class='integral-detail'>
<view class='integral-list'> <!-- <view class='integral-list'>
<text class='integral-title'>优惠详情</text> <text class='integral-title'>优惠详情</text>
<text class='integral-desc'>{{couponDetail.couponSetting.notice}}</text> <text class='integral-desc'>{{couponDetail.couponSetting.notice}}</text>
</view> </view> -->
<view class='integral-list'> <view class='integral-list' wx:for="{{couponDetail.couponSetting.notice}}" wx:key="{{index}}">
<text class='integral-title'>有效期</text> <text class='integral-title'>{{item.label}}</text>
<text class='integral-desc'>{{couponDetail.coupon.startTime}} 至 {{couponDetail.coupon.endTime}}</text> <text class='integral-desc'>{{item.value}}</text>
</view> </view>
</view> </view>
<!--<button type='primary' class="redeem-now" bindtap="handelPresentCouponCode">出示券码</button>--> <!--<button type='primary' class="redeem-now" bindtap="handelPresentCouponCode">出示券码</button>-->
......
src/pages/coupons/coupons.wxml
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<view class='coupon-info' data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail"> <view class='coupon-info' data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
<view class='coupon-name fs-28'>{{item.title}}</view> <view class='coupon-name fs-28'>{{item.title}}</view>
<view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view> <view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view>
<view class='coupon-desc fs-24'>{{item.notice}}</view> <!-- <view class='coupon-desc fs-24'>{{item.notice}}</view> -->
</view> </view>
<view class='coupon-code fs-24' data-cardNo="{{item.cardNo}}" bindtap="handelPresentCouponCode">出示劵码</view> <view class='coupon-code fs-24' data-cardNo="{{item.cardNo}}" bindtap="handelPresentCouponCode">出示劵码</view>
</view> </view>
......
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