标签bug修改

DESKTOP-QHAFKU5\iceling
1 parent 91c73cb1
Showing 6 changed files with 26 additions and 18 deletions
pages/index/index/index.js
pages/user/labels/labels.js
pages/user/labels/labels.wxml
pages/user/labels/labels.wxss
pages/user/userinfo/userinfo.wxml
pages/user/userinfo/userinfo.wxss
@@ -56,7 +56,7 @@ Page({
     gd_category:null,
     is_no_more:0,
     max_sw_height:0,  //banner的最大高度
-    is_disgraceful:1,//是否显示新人广告
+    is_disgraceful:0,//是否显示新人广告
   },
   onLoad: function () {
@@ -31,17 +31,25 @@ Page({
           check_label.splice(i, 1);
         }
       }
+      th.setData({
+        [labels_check]: labels_cid,
+        check_label: check_label
+      })
     } else {
+      if (check_label.length>9){
+        getApp().my_warnning("最多可选10个哦",0,th);
+      }else{
       var check_new = {
         lable: labels[index]
       };
       labels_cid = 1;
       check_label.push(labels[index]);
+      }
+      th.setData({
+        [labels_check]: labels_cid,
+        check_label: check_label
+      })
     }
-    th.setData({
-      [labels_check]: labels_cid,
-      check_label: check_label
-    })
   },
   //获取配置信息
@@ -84,7 +92,9 @@ Page({
     var interest_lables = th.data.interest_lables; //兴趣标签集合
     getApp().request.promiseGet(url, {
       data: {
-        storeId: a.stoid
+        storeId: a.stoid,
+        pageSize:50,
+        page:1
       }
     }).then(res => {
       if (res.data.code == 0) {
@@ -15,8 +15,8 @@
     <!-- 标签内容 -->
     <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.LabelName}}</view>
+      <view class="label fs28 {{item.check==1?'click':''}}" wx:for="{{interest_lables}}" wx:for-item="item" wx:for-index="index" data-index="{{index}}" bindtap="click_label">
+        <view class="ellipsis-1">{{item.LabelName}}</view>
       </view>
     </view>
@@ -26,15 +26,14 @@
   <view class="padding">
     <view class="fs32 check_head">已选中</view>
     <view class="check_labels">
-      <view class="check_label ellipsis-1 fs28" wx:for="{{check_label}}" wx:for-item="it" wx:for-index="key">
-        <view>
+      <view class="check_label fs28" wx:for="{{check_label}}" wx:for-item="it" wx:for-index="key">
+        <view class="ellipsis-1">
           {{it.LabelName}}
         </view>
       </view>
     </view>
   </view>
-  <view class="flex-center">
     <!-- 领取选择标签的奖励按钮 -->
     <block wx:if="{{is_modify==0}}">
       <view class="receive flex-center fs36" bindtap="update_label" data-url="/pages/user/userinfo/userinfo">
@@ -55,7 +54,6 @@
       </view>
     </block>
-  </view>
 </view>
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
@@ -65,7 +65,8 @@
 }
 .receive{
   position: fixed;
-  bottom:130rpx;
+  bottom:60rpx;
+  left: 65rpx;
   width: 620rpx;
   height: 70rpx;
   line-height: 70rpx;
@@ -74,6 +75,6 @@
   border-radius: 40rpx;
 }
 .check_labels{
-  height: 280rpx;
+  height: 120rpx;
   overflow-y: scroll;
 }
 \ No newline at end of file
@@ -186,8 +186,8 @@
         </view>
       </view>
     </view>
-    <!-- 我的兴趣 -->
-    <view wx:if="{{is_lable_set!=null || is_lable_set==1}}" class="padding Bbottom">
+    <!-- 我的兴趣 isBool==1 && -->
+    <view wx:if="{{is_lable_set==1}}" class="padding Bbottom">
       <view class="interest fs28">
         <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels">
           <view class="fs30">我的兴趣</view>
@@ -625,10 +625,9 @@ input {
 .lables {
   display: inline-block;
-  max-height: 125rpx;
+  max-height: 120rpx;
   overflow-y: scroll;
   padding-top: 25rpx;
-  padding-bottom: 20rpx;
 }
 .lable {