HolyKnightIX 2 anni fa
parent
commit
0d807f32bf
9 ha cambiato i file con 33 aggiunte e 32 eliminazioni
  1. +7
    -0
      index/user.js
  2. +6
    -1
      index/user.wxml
  3. +1
    -5
      pages/czdetail/czdetail.js
  4. +0
    -1
      pages/czdetail/czdetail.wxml
  5. +1
    -18
      pages/czdetail/czdetail.wxss
  6. +3
    -2
      pages/integralmall/integraHistory/index.js
  7. +2
    -1
      pages/integralmall/integraHistory/index.wxml
  8. +6
    -3
      pages/integralmall/integraHistory/index.wxss
  9. +7
    -1
      pages/spellGroup/mySpellGroup/index.wxml

+ 7
- 0
index/user.js Vedi File

@@ -142,6 +142,13 @@ Page({
url: '/pages/czdetail/czdetail',
})
},

gotointegralmall: function () {
wx.navigateTo({
url: '/pages/integralmall/integraHistory/index',
})
},

/**
* 跳转到商场信息的页面
*/


+ 6
- 1
index/user.wxml Vedi File

@@ -56,7 +56,12 @@
<!-- <text class="my">更多成长值</text> -->
<text class="view" style='color:{{view}}'>更多成长值</text>
</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>
<!-- <image src="{{memberLogo}}" class="memberLogo"></image> -->
</view>


+ 1
- 5
pages/czdetail/czdetail.js Vedi File

@@ -31,11 +31,7 @@ Page({
url: '/pages/grade/grade',
})
},
gotoMarkRule() {
wx.navigateTo({
url: '/pages/gradeII/gradeII',
})
},

/**
* 生命周期函数--监听页面显示
*/


+ 0
- 1
pages/czdetail/czdetail.wxml Vedi File

@@ -4,7 +4,6 @@
<text>当前</text>
<text>{{score}}</text>
<view class='growRule' bindtap='gotoGrowRule'>成长值规则</view>
<view class='markRule' bindtap='gotoMarkRule'>积分规则</view>
<image class='bg' src='{{bgg}}' mode='widthFix'></image>
</view>
<view class=''>


+ 1
- 18
pages/czdetail/czdetail.wxss Vedi File

@@ -10,7 +10,7 @@
.growRule {
position: absolute;
right: 0;
top: -60rpx;
top: 0;
bottom: 0;
margin: auto;
width: 180rpx;
@@ -25,23 +25,6 @@
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 {
display: block;


+ 3
- 2
pages/integralmall/integraHistory/index.js Vedi File

@@ -28,9 +28,10 @@ Page({
onLoad: function (options) {

},
gotorule: function () {

gotoMarkRule() {
wx.navigateTo({
url: '/pages/grade/grade',
url: '/pages/gradeII/gradeII',
})
},
/**


+ 2
- 1
pages/integralmall/integraHistory/index.wxml Vedi File

@@ -1,9 +1,10 @@
<navbar back home text="积分详情"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<view class='head' >
<view class='head'>
<text>当前</text>
<text>{{creditAmount+'分'}}</text>
<!-- <view class='rule' bindtap='gotorule'>规则</view> -->
<view class='rule' bindtap='gotoMarkRule'>积分规则</view>
<image class='bg' src='{{bgg}}' mode='widthFix'></image>
</view>
<view class=''>


+ 6
- 3
pages/integralmall/integraHistory/index.wxss Vedi File

@@ -20,7 +20,7 @@
background: #fff;
font-size: 28rpx;
font-weight: 400;
color: rgba(2, 192, 255, 1);
color: #fc5b24;
border-bottom-left-radius: 50rpx;
border-top-left-radius: 50rpx;
}
@@ -101,9 +101,11 @@
font-weight: 400;
color: rgba(51, 51, 51, 1);
}
.fr text{

.fr text {
color: #FF3535;
}

.loading {
text-align: center;
height: 80rpx;
@@ -118,7 +120,8 @@
vertical-align: middle;
margin-right: 10rpx;
}
.nonecontent{

.nonecontent {
text-align: center;
font-size: 30rpx;
color: #999;


+ 7
- 1
pages/spellGroup/mySpellGroup/index.wxml Vedi File

@@ -66,7 +66,13 @@
<view>
<text>购买须知</text>
</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>
</view>
</view>


Caricamento…
Annulla
Salva