From a01151d6fff5e196c09dab09d6e38ee1a733458f Mon Sep 17 00:00:00 2001
From: iceling <iceling.qian@meidd.com>
Date: Fri, 20 Dec 2019 09:53:21 +0800
Subject: [PATCH] 会员标签bug修改跟个人资料

---
 pages/user/labels/labels.js       |  6 +++---
 pages/user/labels/labels.wxss     |  4 ++--
 pages/user/userinfo/userinfo.wxml |  9 ++++-----
 pages/user/userinfo/userinfo.wxss |  7 +++++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pages/user/labels/labels.js b/pages/user/labels/labels.js
index 004b14a..994c89f 100644
--- a/pages/user/labels/labels.js
+++ b/pages/user/labels/labels.js
@@ -13,7 +13,7 @@ Page({
     interest_lables: [], //兴趣标签   
     check_label: [], //用户选中的标签集合
     user_label_val: "", //奖励多少
-    user_label_type: "", //奖励类型（0积分，1类型）
+    user_label_type: "", //奖励类型（1积分，1成长值）
     is_modify: 0, //判断是第一次填写还是修改（0填写，1修改）
   },
   //点击选择兴趣标签把值放到已选中
@@ -169,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 = "修改";
@@ -178,7 +178,7 @@ Page({
       getApp().my_warnning("完成兴趣标签才能" + remark + "哦~", 0, th);
     } else {
       var user_label_val = th.data.user_label_val; //选择标签奖励多少
-      var user_label_type = th.data.user_label_type; //增送类型
+      var user_label_type = th.data.user_label_type; //赠送类型
       var url = "/api/weshop/marketing/holiday/vip/interest/label/update"; //更新标签接口地址
       var nav_url = "/pages/user/userinfo/userinfo"; //领取成功之后跳转页面
       var vipLabel = ""; //选择的标签名称
diff --git a/pages/user/labels/labels.wxss b/pages/user/labels/labels.wxss
index aac7af4..06711c5 100644
--- a/pages/user/labels/labels.wxss
+++ b/pages/user/labels/labels.wxss
@@ -31,9 +31,9 @@
   display: inline-block;
   max-width: 200rpx;
   height: 46rpx;
+    line-height: 46rpx;
   border: 2rpx solid rgb(204, 204, 204);
   border-radius: 30rpx;
-  line-height: 46rpx;
   padding: 0rpx 30rpx;
   margin-right: 25rpx;
   margin-bottom: 45rpx;
@@ -57,7 +57,7 @@
   border: 2rpx solid rgb(255, 138, 160);
   line-height: 46rpx;
   margin-right: 25rpx;
-  margin-bottom: 45rpx;
+  margin-bottom: 30rpx;
   padding: 0rpx 30rpx;
   border-radius: 30rpx;
   color: rgb(255, 255, 255);
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index e350097..e881db5 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -186,12 +186,10 @@
         </view>
       </view>
     </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 wx:if="{{ isBool==1 && is_lable_set==1}}" class="padding Bbottom">
+    <!-- 我的兴趣 -->
+    <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="Bbottom">
       <view class="interest fs28">
         <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels">
           <view class="fs30">我的兴趣</view>
@@ -394,4 +392,5 @@
     </block>
   </view>
 </block>
+</view>
 <warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/userinfo/userinfo.wxss b/pages/user/userinfo/userinfo.wxss
index a28b25b..a75baab 100644
--- a/pages/user/userinfo/userinfo.wxss
+++ b/pages/user/userinfo/userinfo.wxss
@@ -632,18 +632,21 @@ input {
 
 .lable {
   display: inline-block;
-  /* height: 46rpx; *//* line-height: 46rpx; */
+  height: 44rpx; 
+   line-height: 44rpx;
   margin-right: 15rpx;
   color: rgb(255, 255, 255);
   border: 2rpx solid rgb(255, 138, 160);
   background-color: rgb(255, 138, 160);
   padding: 0rpx 25rpx;
   border-radius: 30rpx;
-  margin-bottom: 20rpx;
+  margin-bottom: 21rpx;
   max-width: 195rpx;
 }
 
 .add_lable {
+    height: 44rpx; 
+   line-height: 44rpx;
   color: rgb(189, 189, 189);
   border: 2rpx solid rgb(189, 189, 189);
   border-radius: 30rpx;
--
libgit2 0.21.4