diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index c8d7cf0..f1b886a 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -10,7 +10,7 @@ var api = require('../../../api/api.js');
Page({
data: {
url: o.imghost,
- swiperimage: ["/miniapp/images/title.png","/miniapp/images/newpeople/newpeople.png"],
+ swiperimage: ["/miniapp/images/title.png"],//,"/miniapp/images/newpeople/newpeople.png"
resourceUrl: o.resourceUrl,
logo: o.appLogo,
homeData: null,
@@ -56,7 +56,7 @@ Page({
gd_category:null,
is_no_more:0,
max_sw_height:0, //banner的最大高度
- is_disgraceful:1,//是否显示新人广告
+ is_disgraceful:0,//是否显示新人广告
},
onLoad: function () {
diff --git a/pages/user/labels/labels.js b/pages/user/labels/labels.js
index d3d7b09..f8c33db 100644
--- a/pages/user/labels/labels.js
+++ b/pages/user/labels/labels.js
@@ -50,9 +50,20 @@ Page({
getApp().getConfig2(function(ee) {
var sms_conf = ee.switch_list;
sms_conf = JSON.parse(sms_conf);
+ var getuser_label_type=1;
+ var getuser_label_val = 0;
+ if (sms_conf.user_label_type!=undefined)
+ {
+ getuser_label_type = parseInt(sms_conf.user_label_type)+1;
+ }
+ if (sms_conf.user_label_val != undefined) {
+ getuser_label_val = sms_conf.user_label_val;
+ }
+
+
th.setData({
- user_label_val: sms_conf.user_label_val,
- user_label_type: sms_conf.user_label_type
+ user_label_val: getuser_label_val,
+ user_label_type: getuser_label_type
})
})
},
@@ -148,7 +159,7 @@ Page({
var th = this;
var is_modify = th.data.is_modify; //是否是修改
var check_label = th.data.check_label; //用户选择
- var remark = "领取";
+ var remark = "兴趣标签赠送";
if (is_modify) {
user_label_type = 0;
remark = "修改";
diff --git a/pages/user/labels/labels.wxml b/pages/user/labels/labels.wxml
index a855aaa..2651860 100644
--- a/pages/user/labels/labels.wxml
+++ b/pages/user/labels/labels.wxml
@@ -4,12 +4,10 @@
兴趣标签
-
- 跳过
-
-
+
关闭
+
@@ -41,10 +39,10 @@
确定选择
-
+
领取{{user_label_val}}积分
-
+
领取{{user_label_val}}成长值
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index cf21be0..2165790 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -187,7 +187,7 @@
-
+
我的兴趣