diff --git a/components/diy_user_info/diy_user_info.js b/components/diy_user_info/diy_user_info.js
index 0695126..5de9714 100644
--- a/components/diy_user_info/diy_user_info.js
+++ b/components/diy_user_info/diy_user_info.js
@@ -57,6 +57,11 @@ Component({
if (t_swi) {
th.setData({sys_switch: t_swi});
}
+ var getuserqy_color=e.userqy_color;
+ if (getuserqy_color) getuserqy_color = JSON.parse(getuserqy_color)
+ if(getuserqy_color){
+ th.setData({userqy_color:getuserqy_color})
+ }
})
},
diff --git a/components/diy_user_info/diy_user_info.wxss b/components/diy_user_info/diy_user_info.wxss
index 74d6eb9..376e708 100644
--- a/components/diy_user_info/diy_user_info.wxss
+++ b/components/diy_user_info/diy_user_info.wxss
@@ -228,7 +228,6 @@
}
.gr_box_item{
height: 16rpx;
- width: 100px;
background-color: #999;
}
diff --git a/components/diy_user_info/style1.wxml b/components/diy_user_info/style1.wxml
index 1e78e87..935fc43 100644
--- a/components/diy_user_info/style1.wxml
+++ b/components/diy_user_info/style1.wxml
@@ -25,12 +25,15 @@
{{" "}}
- {{rfmName}}
- {{qy_data.cz_val}} / {{qy_data.need_money}}
+ {{rfmName}}
+ {{qy_data.cz_val}} / {{qy_data.need_money}}
{{" "}}
- {{rfmName}} {{cz_val}}
+
+ {{rfmName}}{{cz_val}}
+
+
diff --git a/components/diy_user_info/style2.wxml b/components/diy_user_info/style2.wxml
index e46205b..d9ed040 100644
--- a/components/diy_user_info/style2.wxml
+++ b/components/diy_user_info/style2.wxml
@@ -24,12 +24,12 @@
{{" "}}
- {{rfmName}}
- {{qy_data.cz_val}} / {{qy_data.need_money}}
+ {{rfmName}}
+ {{qy_data.cz_val}} / {{qy_data.need_money}}
{{" "}}
- {{rfmName}} {{cz_val}}
+ {{rfmName}} {{cz_val}}
diff --git a/components/diy_user_info/style3.wxml b/components/diy_user_info/style3.wxml
index d298595..7707d55 100644
--- a/components/diy_user_info/style3.wxml
+++ b/components/diy_user_info/style3.wxml
@@ -14,9 +14,9 @@
- 距白金卡会员还有111
+ 距{{qy_data.nextGradeName}}还有{{qy_data.need_money-qy_data.cz_val}}
-
+
diff --git a/components/diy_user_my_rights/diy_user_my_rights.js b/components/diy_user_my_rights/diy_user_my_rights.js
index 50e902d..4867e23 100644
--- a/components/diy_user_my_rights/diy_user_my_rights.js
+++ b/components/diy_user_my_rights/diy_user_my_rights.js
@@ -32,6 +32,13 @@ Component({
getApp().showWarning("请稍后重试");
}
},
+
+ //--跳转到权益页面--
+ go_qy: function () {
+ if (!getApp().globalData.userInfo) return false;
+ var url = "/pages/user/userqy/userqy";
+ getApp().goto(url);
+ },
},
observers: {
// 监听 num1 和 num2 数据的变化
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 74c75a5..b596b68 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -441,6 +441,8 @@ Page({
if (cz_vals < im.BuyGradeSum && need_money == 0) {
need_money = im.BuyGradeSum;
obj.need_money = need_money;
+ obj.nextGradeName=im.GradeName;
+ break;
}
}