个人资料和兴趣标签的排版已经兴趣标签页面的部分数据填充

DESKTOP-QHAFKU5\iceling
1 parent ad3ae98b
Showing 7 changed files with 390 additions and 307 deletions
pages/user/labels/labels.js
pages/user/labels/labels.json
pages/user/labels/labels.wxml
pages/user/labels/labels.wxss
pages/user/userinfo/userinfo.js
pages/user/userinfo/userinfo.wxml
pages/user/userinfo/userinfo.wxss
-// pages/user/labels/labels.js
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
 Page({
   /**
    * 页面的初始数据
    */
   data: {
-    interest_lables: [{
-      lable: "学生"
-    }, {
-      lable: "白领",
-      check: 0
-    }, {
-      lable: "高级蓝领",
-      check: 0
-    }, {
-      lable: "工程师",
-      check: 0
-    }, {
-      lable: "军人",
-      check: 0
-    }, {
-      lable: "公务员",
-      check: 0
-    }, {
-      lable: "网红",
-      check: 0
-    }, {
-      lable: "网红主播",
-      check: 0
-    }, {
-      lable: "辣妈",
-    }, {
-      lable: "学生",
-      check: 0
-    }, {
-      lable: "博主",
-      check: 0
-    }, {
-      lable: "学生",
-      check: 0
-    }, {
-      lable: "留学生",
-      check: 0
-    }, {
-      lable: "网红主播",
-      check: 0
-    }, {
-      lable: "学生",
-      check: 0
-    }], //兴趣标签   
+    url: a.url, //接口网址
+    interest_lables: [], //兴趣标签   
     check_label: [], //用户选中的标签集合
   },
   //点击选择兴趣标签把值放到已选中
@@ -60,16 +22,19 @@ Page({
     var labels_cid = th.data.interest_lables[index].check; //当前标签是否选中
     var labels_check = 'interest_lables[' + index + '].check'; //用于点击标签把点击状态赋值进去 
     if (labels_cid) {
-      check_label = [];
       labels_cid = 0;
+      for (var i = 0; i < check_label.length; i++) {
+        if (index == check_label[i].id) {
+          check_label.splice(i, 1);
+        }
+      }
     } else {
+      var check_new = {
+        lable: labels[index].LabelName,
+        id: index
+      };
       labels_cid = 1;
-    }
-    //循环看哪些标签选中
-    for (var i = 0; i < labels.length; i++) {
-      if (labels[i].check) {
-        check_label.push(labels[i].lable);
-      }
+      check_label.push(check_new);
     }
     th.setData({
       [labels_check]: labels_cid,
@@ -77,29 +42,100 @@ Page({
     })
   },
-  //   var th = this;
-  //   var evaluate = th.data.is_evaluate; //0为未评价，未评价才可点击标签
-  //   if(evaluate == 0) {
-  //   var index = e.currentTarget.dataset.index;
-  //   var label_id = th.data.labels[index].check;
-  //   var labels = 'labels[' + index + '].check';
-  //   if (label_id) {
-  //     label_id = 0
-  //   } else {
-  //     label_id = 1
-  //   }
-  //   th.setData({
-  //     [labels]: label_id
-  //   })
-  // }
-
+  //页面跳转
+  goto: function(e) {
+    var th = this;
+    wx.navigateBack({ //返回
+      delta: 1
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+    var th = this;
+    var pages = getCurrentPages();
+    var prevPage = pages[pages.length - 2]; //上一个页面
+    //直接调用上一个页面的setData()方法，把数据存到上一个页面中去
+    prevPage.setData({
+      is_zy: 1
+    })
+    th.query_nolabels();
+    th.query_checklabels();
+  },
+  //获取标签集合
+  query_nolabels: function() {
+    var th = this;
+    var url = "/api/weshop/marketing/holiday/vip/interest/label/page";
+    var interest_lables = th.data.interest_lables; //兴趣标签集合
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        th.setData({
+          interest_lables: res.data.data.pageData
+        })
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+  },
+  //查找会员选择的兴趣标签
+  query_checklabels: function() {
+    var th = this;
+    var url = "/api/weshop/marketing/holiday/vip/interest/label/get";
+    var interest_lables = th.data.interest_lables; //兴趣标签集合
+    getApp().request.promiseGet(url, {
+      data: {
+        userId: d.user_id,
+        storeId: a.stoid
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        th.setData({
+          check_label: res.data.data.pageData
+        })
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+  },
+  //更新会员兴趣标签
+  update_label: function() {
+    var th = this;
+    var check_label = th.data.check_label;
+    if (check_label.length < 1) {
+      getApp().my_warnning("完成兴趣标签才能领取哦~", 0, th);
+      return false;
+    }
+    var url = th.data.url + "/api/weshop/marketing/holiday/vip/interest/label/update";
+    check_label = "美,美";
+    var json = {
+      "storeId": a.stoid,
+      "userId": d.user_id,
+      "vipLabel": check_label,
+      "type":0,
+      "vipLabelId":"1,1"
+    };
+    var data = JSON.stringify(json);
+    wx.request({
+      url: url,
+      data: data,
+      method: 'put',
+      header: {
+        'content-type': 'application/json'
+      }, // 设置请求的 header
+      success: function(res) {
+        if (res.data.code == 0) {
+          getApp().my_warnning("领取成功", 1, th);
+        } else {
+          getApp().my_warnning("领取失败", 1, th);
+        }
+      }
+    })
   },
-
   /**
    * 生命周期函数--监听页面显示
    */
 {
-  "navigationBarTitleText": "兴趣标签"
+  "navigationBarTitleText": "兴趣标签",
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
+  }
 }
 \ No newline at end of file
@@ -4,7 +4,7 @@
     <!-- 兴趣标签标题 -->
     <view class="flex-vertical-between labels_head">
       <view class="fs36">兴趣标签</view>
-      <view class="skip flex-center fs28">
+      <view class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
         <view>跳过</view>
       </view>
     </view>
@@ -13,7 +13,7 @@
     <view class="label_aggregate">
       <!-- 单个标签 -->
       <view class="label fs28 ellipsis-1 {{item.check==1?'click':''}}" wx:for="{{interest_lables}}" wx:for-item="item" wx:for-index="index" data-index="{{index}}" bindtap="click_label">
-        <view>{{item.lable}}</view>
+        <view>{{item.LabelName}}</view>
       </view>
     </view>
@@ -25,7 +25,7 @@
     <view class="check_labels">
       <view class="check_label ellipsis-1 fs28" wx:for="{{check_label}}" wx:for-item="it" wx:for-index="key">
         <view>
-          {{it}}
+          {{it.lable}}
         </view>
       </view>
     </view>
@@ -33,11 +33,10 @@
   <view class="flex-center">
     <!-- 领取选择标签的奖励按钮 -->
-    <view class="receive flex-center fs36">
+    <view class="receive flex-center fs36" bindtap="update_label">
       <view>领取200成长值</view>
     </view>
   </view>
-
-
-
-</view>
 \ No newline at end of file
+</view>
+<!-- 引入提示组件 -->
+<warn id="warn"></warn>
 \ No newline at end of file
@@ -39,6 +39,7 @@
   margin-bottom: 45rpx;
 }
 .click{
+  color: rgb(255,255,255);
   border: 2rpx solid rgb(255, 138, 160);
   background-color: rgb(255, 138, 160);
 }
@@ -64,7 +65,7 @@
 }
 .receive{
   position: fixed;
-  bottom:100rpx;
+  bottom:130rpx;
   width: 620rpx;
   height: 70rpx;
   line-height: 70rpx;
@@ -73,6 +74,6 @@
   border-radius: 40rpx;
 }
 .check_labels{
-  height: 300rpx;
+  height: 280rpx;
   overflow-y: scroll;
 }
 \ No newline at end of file
@@ -2,23 +2,24 @@ function e(e, a, r) {
   return a in e ? Object.defineProperty(e, a, {
     value: r,
     enumerable: !0,
-    configurable: !0, 
+    configurable: !0,
     writable: !0
   }) : e[a] = r, e;
-} 
+}
 var a = getApp(),
   r = a.globalData.setting,
   t = a.request,
   s = require("../../../utils/common.js"),
-  util = require("../../../utils/util.js"),ut=util;
+  util = require("../../../utils/util.js"),
+  ut = util;
 var timestamp = Date.parse(new Date());
 var date = new Date(timestamp);
 Page({
   data: {
-    phone:"",
+    phone: "",
     url: r.url,
     resourceUrl: r.resourceUrl,
     iurl: r.imghost,
@@ -46,37 +47,53 @@ Page({
     lon: 0,
     only_pk: 0,
     open_ind_store: 0, //哪里打开的门店列表的控制属性
-    ispwhid:1,//是否隐藏密码显示
-    isstcsp:1,//是否启动密码消费
-    isGender:1,//什么性别
-    iscalendar:1,//是否是农历
-    consumption:"",//消费密码
-    identity_card:"",//身份证值
-    address:"",//地址
-    openid:"",//openid
-    pulscardname:"",//puls会员的卡
-    gradename:"",//会员权益的卡
-    isBool:"",
-    sto_sele_id:"",//所属门店id
-	  is_zy:0,
- 
+    ispwhid: 1, //是否隐藏密码显示
+    isstcsp: 1, //是否启动密码消费
+    isGender: 1, //什么性别
+    iscalendar: 1, //是否是农历
+    consumption: "", //消费密码
+    identity_card: "", //身份证值
+    address: "", //地址
+    openid: "", //openid
+    pulscardname: "", //puls会员的卡
+    gradename: "", //会员权益的卡
+    isBool: "",
+    sto_sele_id: "", //所属门店id
+    is_zy: 0, //是否执行onshow
+    is_lable_set:"",//是否启用我的兴趣标签
+  },
+  //通过路径跳转到其他页面
+  goto: function(e) {
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+  },
+  //获取配置信息
+  get_config: function() {
+    var th = this;
+    getApp().getConfig2(function(ee) {
+      var sms_conf = ee.switch_list;
+      sms_conf = JSON.parse(sms_conf);
+      th.setData({
+        is_lable_set: sms_conf.user_label_set
+      })
+    })
   },
   //是否启动密码消费
-  isstcsp:function(){
+  isstcsp: function() {
     var th = this;
     var isstcsp = th.data.isstcsp;
-    if (isstcsp==0){
-          th.setData({
-            isstcsp:1
-          })
-      }else{
+    if (isstcsp == 0) {
+      th.setData({
+        isstcsp: 1
+      })
+    } else {
       th.setData({
         isstcsp: 0
       })
-      }
+    }
   },
   //出生日期是否是农历
-  iscalendar:function(){
+  iscalendar: function() {
     var th = this;
     var iscalendar = th.data.iscalendar;
     if (iscalendar == 0) {
@@ -90,21 +107,21 @@ Page({
     }
   },
   //性别
-  isGender:function(e){
+  isGender: function(e) {
     var th = this;
     var sex = e.currentTarget.dataset.sex;
-    console.log("点击选择性别",sex);
-      th.setData({
-        isGender:sex
-      })
+    console.log("点击选择性别", sex);
+    th.setData({
+      isGender: sex
+    })
+
-  
   },
   //密码是否隐藏显示
-  ispwhid:function(){
+  ispwhid: function() {
     var th = this;
     var ispwhid = th.data.ispwhid;
-   
+
     if (ispwhid == 0) {
       th.setData({
         ispwhid: 1
@@ -505,92 +522,96 @@ Page({
   },
   //------初始化加载----------
   onLoad: function(t) {
-    console.log("oNLOAD", "你好");
-   var user=getApp().globalData.userInfo;
-   if(user.card_field!=''&& user.card_field!=null && user.card_field!=undefined){
-	     var now=ut.gettimestamp();
-	     var str= user.card_expiredate;
-	     var end = new Date(str);
-	     end = Date.parse(end) / 1000;
-		 if(now<end ){
-			  this.puls_user();	
-		 }	       
-   }
-  
+    var user = getApp().globalData.userInfo;
+    if (user.card_field != '' && user.card_field != null && user.card_field != undefined) {
+      var now = ut.gettimestamp();
+      var str = user.card_expiredate;
+      var end = new Date(str);
+      end = Date.parse(end) / 1000;
+      if (now < end) {
+        this.puls_user();
+      }
+    }
     this.initial_user();
+    this.get_config();
   },
- //-----------会员是否初始化---------------------
- initial_user: function () {
- 
+  //-----------会员是否初始化---------------------
+  initial_user: function() {
+
     var th = this;
     getApp().request.get("/api/weshop/users/grade/vip/init/get", {
       data: {
         storeId: r.stoid,
       },
-      success: function (su) {
+      success: function(su) {
         var isBool = su.data.data.isBool;
         console.log("会员是否初始化", isBool);
-        th.setData({isBool:isBool});
-		
-	      if(!isBool) return false;	
-		  //-----会员权益获取--------------		
-		  getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
-		    data: {
-		      storeId: r.stoid,
-		      userId: getApp().globalData.user_id,
-		    },
-		    success: function (su) {
-		    var gradename=su.data.data.GradeName;
-		      th.setData({gradename: gradename});		   
-		    }
-		  });
-		 
-	  }
-    }); 
-  },
- 
+        th.setData({
+          isBool: isBool
+        });
+
+        if (!isBool) return false;
+        //-----会员权益获取--------------		
+        getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
+          data: {
+            storeId: r.stoid,
+            userId: getApp().globalData.user_id,
+          },
+          success: function(su) {
+            var gradename = su.data.data.GradeName;
+            th.setData({
+              gradename: gradename
+            });
+          }
+        });
+
+      }
+    });
+  },
+
   //-----Plus会员获取-----------
-  puls_user:function(){
-    var  th=this;
+  puls_user: function() {
+    var th = this;
     getApp().request.get("/api/weshop/plus/vip/mem/list", {
       data: {
         storeId: r.stoid,
-        userId: getApp().globalData.user_id, },
-      success: function (su) {
+        userId: getApp().globalData.user_id,
+      },
+      success: function(su) {
         if (su.data.code == 0) {
-         var cardname=su.data.data[0].MemCardName;
+          var cardname = su.data.data[0].MemCardName;
           console.log("卡的名字", cardname);
-         th.setData({pulscardname:cardname});
+          th.setData({
+            pulscardname: cardname
+          });
         }
       }
     });
   },
- 
-  onShow: function() {   
-    console.log(this.data.is_zy ,"是什么东西");
-	if(this.data.is_zy) return false;	  
+
+  onShow: function() {
+    if (this.data.is_zy) return false;
     this.wait_for_store_config();
-    console.log(this.data.is_zy, "sssss是什么东西");
     var e = this;
     var req = t;
     req.get("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + getApp().globalData.user_id, {
-      success: function (src) {
-        var a=src.data.data;
-        var time = util.formatTime(a.reg_time,"'Y/M/D");
+      success: function(src) {
+        var a = src.data.data;
+        var time = util.formatTime(a.reg_time, "'Y/M/D");
         var birthday = util.formatTime(a.birthday, "'Y/M/D");
         a.reg_time = time;
         a.birthday = birthday
         e.setData({
-        phone: a.mobile,
-        user: a,
-        openid: a.openid,
-        sto_sele_id: a.pickup_id,
-        consumption: a.paypwd,
-        identity_card:a.idcard,
-        address:a.address,
-      });
+          phone: a.mobile,
+          user: a,
+          openid: a.openid,
+          sto_sele_id: a.pickup_id,
+          consumption: a.paypwd,
+          identity_card: a.idcard,
+          address: a.address,
+        });
       }
     })
     a.getUserInfo(function(a) {
@@ -600,10 +621,10 @@ Page({
       var txt2 = util.formatTime(a.reg_time, 'yyyy-M-d'),
         arr2 = txt.split(' ');
       a.reg_time = arr2[0];
-      if (a.pickup_id!=null) {
+      if (a.pickup_id != null) {
         req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
           success: function(da) {
-           
+
             //设置门店
             e.setData({
               stoname: da.data.data.pickup_name
@@ -614,12 +635,12 @@ Page({
       // var phone = "";
       // phone+=a.mobile.substr(0, 3)+"****";
       // phone += a.mobile.substr(7, 12);
-    
-  
-     
-    //   e.setData({
-    //     isGender:e.data.user.sex
-    //   })
+
+
+
+      //   e.setData({
+      //     isGender:e.data.user.sex
+      //   })
     }, !0);
   },
@@ -665,134 +686,146 @@ Page({
     });
   },
   //消费密码输入框失去焦点事件
-  lose_focus:function(e){
-    var  th=this;
-    var val=e.detail.value;
-    console.log("是什么东西",val);
-    if (val.length > 6 || val!=""){
-    
-      this.setData({ consumption: val });
+  lose_focus: function(e) {
+    var th = this;
+    var val = e.detail.value;
+    console.log("是什么东西", val);
+    if (val.length > 6 || val != "") {
+
+      this.setData({
+        consumption: val
+      });
       console.log("是什么东西", val);
     }
-   
-   
+
+
   },
-  
-//地址
-  address:function(e){
+
+  //地址
+  address: function(e) {
     var val = e.detail;
     console.log("地址55555555", val.value);
-    this.setData({ address: val.value });
+    this.setData({
+      address: val.value
+    });
   },
   //身份证验证
-  identity_card:function(e){
+  identity_card: function(e) {
     var val = e.detail;
- 
-      this.setData({ identity_card: val.value });
- 
+
+    this.setData({
+      identity_card: val.value
+    });
+
   },
   //用户名字
-  user_name:function(e){
+  user_name: function(e) {
     var name = e.detail.value;
-    if (name !=""||name!=null){
-      
-      this.setData({ user_name: name });
-  
+    if (name != "" || name != null) {
+
+      this.setData({
+        user_name: name
+      });
+
     }
-  
+
   },
   //点击确认修改信息
-   confirm_revision:function(){
-      var th=this;
-     var isstcsp=th.data.isstcsp;//是否启用消费密码
-     var phone=th.data.phone;//手机号码
-     if (phone == "" || phone==null){
-       getApp().my_warnning("手机不能为空", 0, th); 
-    
-       return false;
-     }
-	 
-	 
-     var consumption = th.data.consumption;//消费密码    
-     var isstcsp = th.data.isstcsp;
-     if(isstcsp==1){
-       
-       if (consumption==null ||  consumption=="" || consumption==undefined ){
-          getApp().my_warnning("消费密码不能为空", 0, th); return false;
-       }   
-	   if (consumption.length < 6){
-		   getApp().my_warnning("消费密码不能小于6位", 0, th); return false;
-	   }
-     }
-     var sex = th.data.isGender;//性别
-     
-     if (sex!="1"&&sex!="2" ) {
-       getApp().my_warnning("请选择性别", 0, th);
-       return false;
-     }
-     var user_name = th.data.user.vipname;//用户姓名
-     console.log("名字77777",user_name);
-     if (user_name==""|| user_name== null) {
-       getApp().my_warnning("请输入名字", 0, th);
-       return false;
-     }
-     var identity_card = th.data.identity_card;//身份证
-     console.log("身份证",identity_card);
-     
-     if (identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))){
-       getApp().my_warnning("身份证号码错误",0, th);
-       return false;
-     }
-     var address = th.data.address;//地址
+  confirm_revision: function() {
+    var th = this;
+    var isstcsp = th.data.isstcsp; //是否启用消费密码
+    var phone = th.data.phone; //手机号码
+    if (phone == "" || phone == null) {
+      getApp().my_warnning("手机不能为空", 0, th);
+
+      return false;
+    }
+
+
+    var consumption = th.data.consumption; //消费密码    
+    var isstcsp = th.data.isstcsp;
+    if (isstcsp == 1) {
+
+      if (consumption == null || consumption == "" || consumption == undefined) {
+        getApp().my_warnning("消费密码不能为空", 0, th);
+        return false;
+      }
+      if (consumption.length < 6) {
+        getApp().my_warnning("消费密码不能小于6位", 0, th);
+        return false;
+      }
+    }
+    var sex = th.data.isGender; //性别
+
+    if (sex != "1" && sex != "2") {
+      getApp().my_warnning("请选择性别", 0, th);
+      return false;
+    }
+    var user_name = th.data.user.vipname; //用户姓名
+    console.log("名字77777", user_name);
+    if (user_name == "" || user_name == null) {
+      getApp().my_warnning("请输入名字", 0, th);
+      return false;
+    }
+    var identity_card = th.data.identity_card; //身份证
+    console.log("身份证", identity_card);
+
+    if (identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) {
+      getApp().my_warnning("身份证号码错误", 0, th);
+      return false;
+    }
+    var address = th.data.address; //地址
     //  console.log("地址1010101", address)
     //  if (address == "" || address == null) {
     //    getApp().my_warnning("请输入地址", 0, th);
     //    return false;
     //  }
-     //保存所属门店的id
-     var sto_sele_id=th.data.sto_sele_id;
+    //保存所属门店的id
+    var sto_sele_id = th.data.sto_sele_id;
     //  console.log("请输入所属门店的id", sto_sele_id);
     //  if (sto_sele_id == null || sto_sele_id==""){
     //    getApp().my_warnning("请输入所属门店", 0, th);
     //    return false;
     //  }
-     console.log("要保存的数据", sex, consumption, identity_card, address, user_name);
-     var datas = {
-       mobile: phone,//手机号码
-       store_id: r.stoid,
-       user_id: getApp().globalData.user_id,
-       vipnopwd: isstcsp,
-       vippass: consumption,//消费密码
-       sex: sex,//性别
-       nickname:user_name,//昵称
-       idcard:identity_card,//身份证
-       address:address,//地址
-       pickup_id: sto_sele_id//自提门店 所属门店
-     }
-     getApp().request.put("/api/weshop/users/updateUserInfo", {
-       data: datas,
-       success: function (res) {
-       
-         if (res.data.code==0){
-           getApp().showWarning("修改成功");
-       }else{
-           getApp().showWarning("修改失败");
-       }
-
-       }
-     })
-   } ,
-   //选择地址
-  goto_address:function(){
-   // this.setData({ is_zy: 1 });
-  },
-   //更换手机
-   go_phone:function(e){
-	   var url=e.currentTarget.dataset.url;
-	   this.setData({is_zy:1});
-	   getApp().goto(url);
-   }
-  
+    console.log("要保存的数据", sex, consumption, identity_card, address, user_name);
+    var datas = {
+      mobile: phone, //手机号码
+      store_id: r.stoid,
+      user_id: getApp().globalData.user_id,
+      vipnopwd: isstcsp,
+      vippass: consumption, //消费密码
+      sex: sex, //性别
+      nickname: user_name, //昵称
+      idcard: identity_card, //身份证
+      address: address, //地址
+      pickup_id: sto_sele_id //自提门店 所属门店
+    }
+    getApp().request.put("/api/weshop/users/updateUserInfo", {
+      data: datas,
+      success: function(res) {
+
+        if (res.data.code == 0) {
+          getApp().showWarning("修改成功");
+        } else {
+          getApp().showWarning("修改失败");
+        }
+
+      }
+    })
+  },
+  //选择地址
+  goto_address: function() {
+    // this.setData({ is_zy: 1 });
+  },
+  //更换手机
+  go_phone: function(e) {
+    var url = e.currentTarget.dataset.url;
+    this.setData({
+      is_zy: 1
+    });
+    getApp().goto(url);
+  }
+
 });
 \ No newline at end of file
@@ -187,21 +187,21 @@
       </view>
     </view>
     <!-- 我的兴趣 -->
-    <view class="padding Bbottom">
+    <view wx:if="{{is_lable_set!=null || is_lable_set==1 || true}}" class="padding Bbottom">
       <view class="interest fs28">
-        <view class="flex-vertical-between">
+        <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels">
           <view class="fs30">我的兴趣</view>
           <view class="angle">∟</view>
         </view>
         <!-- 选中的标签 -->
-        <view class="lables flex">
-          <view class="lable">
-            <view>白领</view>
+        <view class="lables">
+          <view class="lable" wx:for="{{4}}">
+            <view class="ellipsis-1 lable_wh">高级蓝领</view>
           </view>
           <!-- 添加标签按钮 -->
-          <view class="add_lable flex-center">
-            <view class="fs36 plus">+</view>
-            <view>标签</view>
+          <view class="add_lable ib" bindtap="goto" data-url="/pages/user/labels/labels">
+              <text class="fs36">+</text>
+              <text>标签</text>
           </view>
         </view>
       </view>
@@ -612,17 +612,20 @@ input {
 .s_btn {
   margin-top: 25rpx;
 }
-.padding{
-  padding:0rpx 20rpx;
-  
+
+.padding {
+  padding: 0rpx 20rpx;
 }
-.interest{
-  padding:0rpx 20rpx;
+
+.interest {
+  padding: 0rpx 20rpx;
   padding-top: 30rpx;
   padding-bottom: 30rpx;
 }
+
 .lables {
-  max-height: 200rpx;
+  display: inline-block;
+  max-height: 125rpx;
   overflow-y: scroll;
   padding-top: 25rpx;
   padding-bottom: 20rpx;
@@ -630,24 +633,32 @@ input {
 .lable {
   display: inline-block;
-  height: 46rpx;
-  line-height: 46rpx;
+  /* height: 46rpx; *//* line-height: 46rpx; */
   margin-right: 15rpx;
   color: rgb(255, 255, 255);
-  border:2rpx solid rgb(255, 138, 160);
+  border: 2rpx solid rgb(255, 138, 160);
   background-color: rgb(255, 138, 160);
   padding: 0rpx 25rpx;
   border-radius: 30rpx;
+  margin-bottom: 20rpx;
+  max-width: 195rpx;
 }
 .add_lable {
-  width: 110rpx;
-  height: 46rpx;
-  line-height: 46rpx;
+  width: 88rpx;
+  /* height: 46rpx; *//* line-height: 46rpx; */
   color: rgb(189, 189, 189);
-  border:2rpx solid rgb(189, 189, 189);
+  border: 2rpx solid rgb(189, 189, 189);
   border-radius: 30rpx;
+  margin-bottom: 20rpx;
+  padding: 0rpx 25rpx;
 }
-.plus{
+
+.plus {
   font-weight: bold;
-}
 \ No newline at end of file
+}
+
+.lable_wh {
+  height: 46rpx;
+  line-height: 46rpx;
+}