diff --git a/pages/user/labels/labels.js b/pages/user/labels/labels.js index e35a05a..9ab8562 100644 --- a/pages/user/labels/labels.js +++ b/pages/user/labels/labels.js @@ -16,6 +16,7 @@ Page({ user_label_val: "", //奖励多少 user_label_type: "", //奖励类型(1积分,1成长值) is_modify: 0, //判断是第一次填写还是修改(0填写,1修改) + isread:0,//是否读取 }, //点击选择兴趣标签把值放到已选中 click_label: function(e) { @@ -111,11 +112,15 @@ Page({ }).then(res => { if (res.data.code == 0) { th.setData({ - interest_lables: res.data.data.pageData + interest_lables: res.data.data.pageData, + isread:1 }) th.query_checklabels(); } else { getApp().my_warnning("系统繁忙,请稍后再试", 0, th); + th.setData({ + isread: 1 + }) return false; } }) @@ -150,7 +155,7 @@ Page({ } } //如何有之前有选择兴趣标签的话,再进来的话就是修改 - if (data.VipLabelId != "") { + if (data.VipLabelId !='') { th.setData({ is_modify: 1 }) @@ -170,16 +175,17 @@ Page({ var th = this; var is_modify = th.data.is_modify; //是否是修改 var check_label = th.data.check_label; //用户选择 + var user_label_val = th.data.user_label_val; //选择标签奖励多少 var remark = "领取"; + var user_label_type = th.data.user_label_type; //赠送类型 if (is_modify) { user_label_type = 0; remark = "修改"; + user_label_val = 0; } if (check_label.length < 1) { getApp().my_warnning("完成兴趣标签才能" + remark + "哦~", 0, th); } else { - var user_label_val = th.data.user_label_val; //选择标签奖励多少 - var user_label_type = th.data.user_label_type; //赠送类型 var url = "/api/weshop/marketing/holiday/vip/interest/label/update"; //更新标签接口地址 var nav_url = "/pages/user/userinfo/userinfo"; //领取成功之后跳转页面 var vipLabel = ""; //选择的标签名称 @@ -197,7 +203,7 @@ Page({ } } var my_confirm = th.selectComponent("#my_confirm"); //组件的id - remark = "标签赠送"; + remark = "兴趣标签赠送"; if (is_modify) { my_confirm.open_cancel(0); diff --git a/pages/user/labels/labels.wxml b/pages/user/labels/labels.wxml index 243dbc4..2ddb72b 100644 --- a/pages/user/labels/labels.wxml +++ b/pages/user/labels/labels.wxml @@ -54,7 +54,7 @@ - + diff --git a/pages/user/labels/labels.wxss b/pages/user/labels/labels.wxss index cc46f8c..7af2cb9 100644 --- a/pages/user/labels/labels.wxss +++ b/pages/user/labels/labels.wxss @@ -1,6 +1,6 @@ -/* page{ +page{ height: 100%; -} */ +} .padding { padding: 0rpx 65rpx; }