Commit 20bc551e85e5bf1a78d379a3bda08c3e5b6e8c74
标签bug修改和界面兼容调整
Showing
4 changed files
with
23 additions
and
10 deletions
pages/index/index/index.js
| ... | ... | @@ -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, | ... | ... |
pages/user/labels/labels.js
| ... | ... | @@ -58,9 +58,20 @@ Page({ |
| 58 | 58 | getApp().getConfig2(function(ee) { |
| 59 | 59 | var sms_conf = ee.switch_list; |
| 60 | 60 | sms_conf = JSON.parse(sms_conf); |
| 61 | + var getuser_label_type=1; | |
| 62 | + var getuser_label_val = 0; | |
| 63 | + if (sms_conf.user_label_type!=undefined) | |
| 64 | + { | |
| 65 | + getuser_label_type = parseInt(sms_conf.user_label_type)+1; | |
| 66 | + } | |
| 67 | + if (sms_conf.user_label_val != undefined) { | |
| 68 | + getuser_label_val = sms_conf.user_label_val; | |
| 69 | + } | |
| 70 | + | |
| 71 | + | |
| 61 | 72 | th.setData({ |
| 62 | - user_label_val: sms_conf.user_label_val, | |
| 63 | - user_label_type: sms_conf.user_label_type | |
| 73 | + user_label_val: getuser_label_val, | |
| 74 | + user_label_type: getuser_label_type | |
| 64 | 75 | }) |
| 65 | 76 | }) |
| 66 | 77 | }, |
| ... | ... | @@ -158,7 +169,7 @@ Page({ |
| 158 | 169 | var th = this; |
| 159 | 170 | var is_modify = th.data.is_modify; //是否是修改 |
| 160 | 171 | var check_label = th.data.check_label; //用户选择 |
| 161 | - var remark = "领取"; | |
| 172 | + var remark = "兴趣标签赠送"; | |
| 162 | 173 | if (is_modify) { |
| 163 | 174 | user_label_type = 0; |
| 164 | 175 | remark = "修改"; | ... | ... |
pages/user/labels/labels.wxml
| ... | ... | @@ -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 | <!-- 标签内容 --> |
| ... | ... | @@ -40,10 +38,10 @@ |
| 40 | 38 | <block wx:if="{{user_label_val<1 || user_label_val==''}}"> |
| 41 | 39 | <view>确定选择</view> |
| 42 | 40 | </block> |
| 43 | - <block wx:if="{{user_label_type==0 && user_label_val>0 && user_label_val!=''}}"> | |
| 41 | + <block wx:if="{{user_label_type==1 && user_label_val>0 && user_label_val!=''}}"> | |
| 44 | 42 | <view>领取{{user_label_val}}积分</view> |
| 45 | 43 | </block> |
| 46 | - <block wx:if="{{user_label_type==1 && user_label_val>0 && user_label_val!=''}}"> | |
| 44 | + <block wx:if="{{user_label_type==2 && user_label_val>0 && user_label_val!=''}}"> | |
| 47 | 45 | <view>领取{{user_label_val}}成长值</view> |
| 48 | 46 | </block> |
| 49 | 47 | </view> | ... | ... |
pages/user/userinfo/userinfo.wxml
| ... | ... | @@ -188,6 +188,10 @@ |
| 188 | 188 | </view> |
| 189 | 189 | <!-- 我的兴趣 isBool==1 && --> |
| 190 | 190 | <view wx:if="{{is_lable_set==1}}" class="padding Bbottom"> |
| 191 | +======= | |
| 192 | + <!-- 我的兴趣 --> | |
| 193 | + <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="padding Bbottom"> | |
| 194 | +>>>>>>> ec6a3fbf09a19e8dbfed33db0c6cdf9618287714 | |
| 191 | 195 | <view class="interest fs28"> |
| 192 | 196 | <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels"> |
| 193 | 197 | <view class="fs30">我的兴趣</view> | ... | ... |