wxd / MShopWeApp

Commit ec6a3fbf09a19e8dbfed33db0c6cdf9618287714

Authored by season
1 parent 91c73cb1

标签修改

Inline Side-by-side
Showing 4 changed files with 21 additions and 12 deletions
pages/index/index/index.js
  View file @ec6a3fb
... ... @@ -10,7 +10,7 @@ var api = require('../../../api/api.js');
10 10 Page({
11 11 data: {
12 12 url: o.imghost,
13   - swiperimage: ["/miniapp/images/title.png","/miniapp/images/newpeople/newpeople.png"],
  13 + swiperimage: ["/miniapp/images/title.png"],//,"/miniapp/images/newpeople/newpeople.png"
14 14 resourceUrl: o.resourceUrl,
15 15 logo: o.appLogo,
16 16 homeData: null,
... ... @@ -56,7 +56,7 @@ Page({
56 56 gd_category:null,
57 57 is_no_more:0,
58 58 max_sw_height:0, //banner的最大高度
59   - is_disgraceful:1,//是否显示新人广告
  59 + is_disgraceful:0,//是否显示新人广告
60 60 },
61 61  
62 62 onLoad: function () {
... ...
pages/user/labels/labels.js
  View file @ec6a3fb
... ... @@ -50,9 +50,20 @@ Page({
50 50 getApp().getConfig2(function(ee) {
51 51 var sms_conf = ee.switch_list;
52 52 sms_conf = JSON.parse(sms_conf);
  53 + var getuser_label_type=1;
  54 + var getuser_label_val = 0;
  55 + if (sms_conf.user_label_type!=undefined)
  56 + {
  57 + getuser_label_type = parseInt(sms_conf.user_label_type)+1;
  58 + }
  59 + if (sms_conf.user_label_val != undefined) {
  60 + getuser_label_val = sms_conf.user_label_val;
  61 + }
  62 +
  63 +
53 64 th.setData({
54   - user_label_val: sms_conf.user_label_val,
55   - user_label_type: sms_conf.user_label_type
  65 + user_label_val: getuser_label_val,
  66 + user_label_type: getuser_label_type
56 67 })
57 68 })
58 69 },
... ... @@ -148,7 +159,7 @@ Page({
148 159 var th = this;
149 160 var is_modify = th.data.is_modify; //是否是修改
150 161 var check_label = th.data.check_label; //用户选择
151   - var remark = "领取";
  162 + var remark = "兴趣标签赠送";
152 163 if (is_modify) {
153 164 user_label_type = 0;
154 165 remark = "修改";
... ...
pages/user/labels/labels.wxml
  View file @ec6a3fb
... ... @@ -4,12 +4,10 @@
4 4 <!-- 兴趣标签标题 -->
5 5 <view class="flex-vertical-between labels_head">
6 6 <view class="fs36">兴趣标签</view>
7   - <view wx:if="{{is_modify==0}}" class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
8   - <view>跳过</view>
9   - </view>
10   - <view wx:if="{{is_modify==1}}" class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
  7 + <view class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
11 8 <view>关闭</view>
12 9 </view>
  10 +
13 11 </view>
14 12  
15 13 <!-- 标签内容 -->
... ... @@ -41,10 +39,10 @@
41 39 <block wx:if="{{user_label_val<1 || user_label_val==''}}">
42 40 <view>确定选择</view>
43 41 </block>
44   - <block wx:if="{{user_label_type==0 && user_label_val>0 && user_label_val!=''}}">
  42 + <block wx:if="{{user_label_type==1 && user_label_val>0 && user_label_val!=''}}">
45 43 <view>领取{{user_label_val}}积分</view>
46 44 </block>
47   - <block wx:if="{{user_label_type==1 && user_label_val>0 && user_label_val!=''}}">
  45 + <block wx:if="{{user_label_type==2 && user_label_val>0 && user_label_val!=''}}">
48 46 <view>领取{{user_label_val}}成长值</view>
49 47 </block>
50 48 </view>
... ...
pages/user/userinfo/userinfo.wxml
  View file @ec6a3fb
... ... @@ -187,7 +187,7 @@
187 187 </view>
188 188 </view>
189 189 <!-- 我的兴趣 -->
190   - <view wx:if="{{is_lable_set!=null || is_lable_set==1}}" class="padding Bbottom">
  190 + <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="padding Bbottom">
191 191 <view class="interest fs28">
192 192 <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels">
193 193 <view class="fs30">我的兴趣</view>
... ...