@@ -142,6 +142,13 @@ Page({ | |||||
url: '/pages/czdetail/czdetail', | url: '/pages/czdetail/czdetail', | ||||
}) | }) | ||||
}, | }, | ||||
gotointegralmall: function () { | |||||
wx.navigateTo({ | |||||
url: '/pages/integralmall/integraHistory/index', | |||||
}) | |||||
}, | |||||
/** | /** | ||||
* 跳转到商场信息的页面 | * 跳转到商场信息的页面 | ||||
*/ | */ | ||||
@@ -56,7 +56,12 @@ | |||||
<!-- <text class="my">更多成长值</text> --> | <!-- <text class="my">更多成长值</text> --> | ||||
<text class="view" style='color:{{view}}'>更多成长值</text> | <text class="view" style='color:{{view}}'>更多成长值</text> | ||||
</view> | </view> | ||||
<view class="integral">我的积分:{{credit}}</view> | |||||
<view bindtap='gotointegralmall'> | |||||
<text class="integral">我的积分:{{credit}}</text> | |||||
<text class="my my_line">|</text> | |||||
<!-- <text class="my">更多成长值</text> --> | |||||
<text class="view" style='color:{{view}}'>积分详情</text> | |||||
</view> | |||||
</view> | </view> | ||||
<!-- <image src="{{memberLogo}}" class="memberLogo"></image> --> | <!-- <image src="{{memberLogo}}" class="memberLogo"></image> --> | ||||
</view> | </view> | ||||
@@ -31,11 +31,7 @@ Page({ | |||||
url: '/pages/grade/grade', | url: '/pages/grade/grade', | ||||
}) | }) | ||||
}, | }, | ||||
gotoMarkRule() { | |||||
wx.navigateTo({ | |||||
url: '/pages/gradeII/gradeII', | |||||
}) | |||||
}, | |||||
/** | /** | ||||
* 生命周期函数--监听页面显示 | * 生命周期函数--监听页面显示 | ||||
*/ | */ | ||||
@@ -4,7 +4,6 @@ | |||||
<text>当前</text> | <text>当前</text> | ||||
<text>{{score}}</text> | <text>{{score}}</text> | ||||
<view class='growRule' bindtap='gotoGrowRule'>成长值规则</view> | <view class='growRule' bindtap='gotoGrowRule'>成长值规则</view> | ||||
<view class='markRule' bindtap='gotoMarkRule'>积分规则</view> | |||||
<image class='bg' src='{{bgg}}' mode='widthFix'></image> | <image class='bg' src='{{bgg}}' mode='widthFix'></image> | ||||
</view> | </view> | ||||
<view class=''> | <view class=''> | ||||
@@ -10,7 +10,7 @@ | |||||
.growRule { | .growRule { | ||||
position: absolute; | position: absolute; | ||||
right: 0; | right: 0; | ||||
top: -60rpx; | |||||
top: 0; | |||||
bottom: 0; | bottom: 0; | ||||
margin: auto; | margin: auto; | ||||
width: 180rpx; | width: 180rpx; | ||||
@@ -25,23 +25,6 @@ | |||||
border-top-left-radius: 50rpx; | border-top-left-radius: 50rpx; | ||||
} | } | ||||
.markRule { | |||||
position: absolute; | |||||
right: 0; | |||||
top: 60rpx; | |||||
bottom: 0; | |||||
margin: auto; | |||||
width: 180rpx; | |||||
height: 48rpx; | |||||
line-height: 48rpx; | |||||
text-align: center; | |||||
background: #fff; | |||||
font-size: 28rpx; | |||||
font-weight: 400; | |||||
color: #fc5b24; | |||||
border-bottom-left-radius: 50rpx; | |||||
border-top-left-radius: 50rpx; | |||||
} | |||||
.head text { | .head text { | ||||
display: block; | display: block; | ||||
@@ -28,9 +28,10 @@ Page({ | |||||
onLoad: function (options) { | onLoad: function (options) { | ||||
}, | }, | ||||
gotorule: function () { | |||||
gotoMarkRule() { | |||||
wx.navigateTo({ | wx.navigateTo({ | ||||
url: '/pages/grade/grade', | |||||
url: '/pages/gradeII/gradeII', | |||||
}) | }) | ||||
}, | }, | ||||
/** | /** | ||||
@@ -1,9 +1,10 @@ | |||||
<navbar back home text="积分详情"></navbar> | <navbar back home text="积分详情"></navbar> | ||||
<view style="height:{{navigationBarHeight}} "></view> | <view style="height:{{navigationBarHeight}} "></view> | ||||
<view class='head' > | |||||
<view class='head'> | |||||
<text>当前</text> | <text>当前</text> | ||||
<text>{{creditAmount+'分'}}</text> | <text>{{creditAmount+'分'}}</text> | ||||
<!-- <view class='rule' bindtap='gotorule'>规则</view> --> | <!-- <view class='rule' bindtap='gotorule'>规则</view> --> | ||||
<view class='rule' bindtap='gotoMarkRule'>积分规则</view> | |||||
<image class='bg' src='{{bgg}}' mode='widthFix'></image> | <image class='bg' src='{{bgg}}' mode='widthFix'></image> | ||||
</view> | </view> | ||||
<view class=''> | <view class=''> | ||||
@@ -20,7 +20,7 @@ | |||||
background: #fff; | background: #fff; | ||||
font-size: 28rpx; | font-size: 28rpx; | ||||
font-weight: 400; | font-weight: 400; | ||||
color: rgba(2, 192, 255, 1); | |||||
color: #fc5b24; | |||||
border-bottom-left-radius: 50rpx; | border-bottom-left-radius: 50rpx; | ||||
border-top-left-radius: 50rpx; | border-top-left-radius: 50rpx; | ||||
} | } | ||||
@@ -101,9 +101,11 @@ | |||||
font-weight: 400; | font-weight: 400; | ||||
color: rgba(51, 51, 51, 1); | color: rgba(51, 51, 51, 1); | ||||
} | } | ||||
.fr text{ | |||||
.fr text { | |||||
color: #FF3535; | color: #FF3535; | ||||
} | } | ||||
.loading { | .loading { | ||||
text-align: center; | text-align: center; | ||||
height: 80rpx; | height: 80rpx; | ||||
@@ -118,7 +120,8 @@ | |||||
vertical-align: middle; | vertical-align: middle; | ||||
margin-right: 10rpx; | margin-right: 10rpx; | ||||
} | } | ||||
.nonecontent{ | |||||
.nonecontent { | |||||
text-align: center; | text-align: center; | ||||
font-size: 30rpx; | font-size: 30rpx; | ||||
color: #999; | color: #999; | ||||
@@ -66,7 +66,13 @@ | |||||
<view> | <view> | ||||
<text>购买须知</text> | <text>购买须知</text> | ||||
</view> | </view> | ||||
<view> | |||||
<view wx:if="{{data.contentType==0}}"> | |||||
<text><text class='spot'></text>{{data.remark}}</text> | |||||
</view> | |||||
<view wx:if="{{data.contentType==1}}"> | |||||
<rich-text nodes="{{curHtml}}"></rich-text> | |||||
</view> | |||||
<view wx:if="{{!data.contentType&&data.contentType!=0}}"> | |||||
<text><text class='spot'></text>{{data.remark}}</text> | <text><text class='spot'></text>{{data.remark}}</text> | ||||
</view> | </view> | ||||
</view> | </view> | ||||