标签bug修改和界面兼容调整

前端研发-钱巧玲
2 parents 428705d1 ec6a3fbf
Showing 4 changed files with 23 additions and 10 deletions
pages/index/index/index.js
pages/user/labels/labels.js
pages/user/labels/labels.wxml
pages/user/userinfo/userinfo.wxml
@@ -10,7 +10,7 @@ var api = require(&#39;../../../api/api.js&#39;);
 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,
@@ -58,9 +58,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
       })
     })
   },
@@ -158,7 +169,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 = "修改";
@@ -4,12 +4,10 @@
     <!-- 兴趣标签标题 -->
     <view class="flex-vertical-between labels_head">
       <view class="fs36">兴趣标签</view>
-      <view wx:if="{{is_modify==0}}" class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
-        <view>跳过</view>
-      </view>
-      <view wx:if="{{is_modify==1}}" class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
+      <view  class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
         <view>关闭</view>
       </view>
+    
     </view>
     <!-- 标签内容 -->
@@ -40,10 +38,10 @@
         <block wx:if="{{user_label_val<1 || user_label_val==''}}">
           <view>确定选择</view>
         </block>
-        <block wx:if="{{user_label_type==0 && user_label_val>0 && user_label_val!=''}}">
+        <block wx:if="{{user_label_type==1 && user_label_val>0 && user_label_val!=''}}">
           <view>领取{{user_label_val}}积分</view>
         </block>
-        <block wx:if="{{user_label_type==1 && user_label_val>0 && user_label_val!=''}}">
+        <block wx:if="{{user_label_type==2 && user_label_val>0 && user_label_val!=''}}">
           <view>领取{{user_label_val}}成长值</view>
         </block>
       </view>
@@ -188,6 +188,10 @@
     </view>
     <!-- 我的兴趣 isBool==1 && -->
     <view wx:if="{{is_lable_set==1}}" class="padding Bbottom">
+=======
+    <!-- 我的兴趣 -->
+    <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="padding Bbottom">
+>>>>>>> ec6a3fbf09a19e8dbfed33db0c6cdf9618287714
       <view class="interest fs28">
         <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels">
           <view class="fs30">我的兴趣</view>