diff --git a/index/user.js b/index/user.js
index 287cdfd..ea44edb 100644
--- a/index/user.js
+++ b/index/user.js
@@ -142,6 +142,13 @@ Page({
url: '/pages/czdetail/czdetail',
})
},
+
+ gotointegralmall: function () {
+ wx.navigateTo({
+ url: '/pages/integralmall/integraHistory/index',
+ })
+ },
+
/**
* 跳转到商场信息的页面
*/
diff --git a/index/user.wxml b/index/user.wxml
index 0a5bbe5..90a1c06 100644
--- a/index/user.wxml
+++ b/index/user.wxml
@@ -56,7 +56,12 @@
更多成长值
- 我的积分:{{credit}}
+
+ 我的积分:{{credit}}
+ |
+
+ 积分详情
+
diff --git a/pages/czdetail/czdetail.js b/pages/czdetail/czdetail.js
index cc2d325..7e66708 100644
--- a/pages/czdetail/czdetail.js
+++ b/pages/czdetail/czdetail.js
@@ -31,11 +31,7 @@ Page({
url: '/pages/grade/grade',
})
},
- gotoMarkRule() {
- wx.navigateTo({
- url: '/pages/gradeII/gradeII',
- })
- },
+
/**
* 生命周期函数--监听页面显示
*/
diff --git a/pages/czdetail/czdetail.wxml b/pages/czdetail/czdetail.wxml
index 2080ecc..6a48fc9 100644
--- a/pages/czdetail/czdetail.wxml
+++ b/pages/czdetail/czdetail.wxml
@@ -4,7 +4,6 @@
当前
{{score}}
成长值规则
- 积分规则
diff --git a/pages/czdetail/czdetail.wxss b/pages/czdetail/czdetail.wxss
index 64440de..f5172e9 100644
--- a/pages/czdetail/czdetail.wxss
+++ b/pages/czdetail/czdetail.wxss
@@ -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;
diff --git a/pages/integralmall/integraHistory/index.js b/pages/integralmall/integraHistory/index.js
index 194178c..14d38ac 100644
--- a/pages/integralmall/integraHistory/index.js
+++ b/pages/integralmall/integraHistory/index.js
@@ -28,9 +28,10 @@ Page({
onLoad: function (options) {
},
- gotorule: function () {
+
+ gotoMarkRule() {
wx.navigateTo({
- url: '/pages/grade/grade',
+ url: '/pages/gradeII/gradeII',
})
},
/**
diff --git a/pages/integralmall/integraHistory/index.wxml b/pages/integralmall/integraHistory/index.wxml
index 07b1bfb..27d3416 100644
--- a/pages/integralmall/integraHistory/index.wxml
+++ b/pages/integralmall/integraHistory/index.wxml
@@ -1,9 +1,10 @@
-
+
当前
{{creditAmount+'分'}}
+ 积分规则
diff --git a/pages/integralmall/integraHistory/index.wxss b/pages/integralmall/integraHistory/index.wxss
index 75d1722..1f96f9d 100644
--- a/pages/integralmall/integraHistory/index.wxss
+++ b/pages/integralmall/integraHistory/index.wxss
@@ -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;
diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml
index 6615795..aa86114 100644
--- a/pages/spellGroup/mySpellGroup/index.wxml
+++ b/pages/spellGroup/mySpellGroup/index.wxml
@@ -66,7 +66,13 @@
购买须知
-
+
+ {{data.remark}}
+
+
+
+
+
{{data.remark}}