Commit 428705d17dce04615e43bd30ae750e12bb486c84
1 parent
91c73cb1
标签bug修改
Showing
6 changed files
with
26 additions
and
18 deletions
pages/index/index/index.js
pages/user/labels/labels.js
| ... | ... | @@ -31,17 +31,25 @@ Page({ |
| 31 | 31 | check_label.splice(i, 1); |
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | + th.setData({ | |
| 35 | + [labels_check]: labels_cid, | |
| 36 | + check_label: check_label | |
| 37 | + }) | |
| 34 | 38 | } else { |
| 39 | + if (check_label.length>9){ | |
| 40 | + getApp().my_warnning("最多可选10个哦",0,th); | |
| 41 | + }else{ | |
| 35 | 42 | var check_new = { |
| 36 | 43 | lable: labels[index] |
| 37 | 44 | }; |
| 38 | 45 | labels_cid = 1; |
| 39 | 46 | check_label.push(labels[index]); |
| 47 | + } | |
| 48 | + th.setData({ | |
| 49 | + [labels_check]: labels_cid, | |
| 50 | + check_label: check_label | |
| 51 | + }) | |
| 40 | 52 | } |
| 41 | - th.setData({ | |
| 42 | - [labels_check]: labels_cid, | |
| 43 | - check_label: check_label | |
| 44 | - }) | |
| 45 | 53 | |
| 46 | 54 | }, |
| 47 | 55 | //获取配置信息 |
| ... | ... | @@ -84,7 +92,9 @@ Page({ |
| 84 | 92 | var interest_lables = th.data.interest_lables; //兴趣标签集合 |
| 85 | 93 | getApp().request.promiseGet(url, { |
| 86 | 94 | data: { |
| 87 | - storeId: a.stoid | |
| 95 | + storeId: a.stoid, | |
| 96 | + pageSize:50, | |
| 97 | + page:1 | |
| 88 | 98 | } |
| 89 | 99 | }).then(res => { |
| 90 | 100 | if (res.data.code == 0) { | ... | ... |
pages/user/labels/labels.wxml
| ... | ... | @@ -15,8 +15,8 @@ |
| 15 | 15 | <!-- 标签内容 --> |
| 16 | 16 | <view class="label_aggregate"> |
| 17 | 17 | <!-- 单个标签 --> |
| 18 | - <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"> | |
| 19 | - <view>{{item.LabelName}}</view> | |
| 18 | + <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"> | |
| 19 | + <view class="ellipsis-1">{{item.LabelName}}</view> | |
| 20 | 20 | </view> |
| 21 | 21 | </view> |
| 22 | 22 | |
| ... | ... | @@ -26,15 +26,14 @@ |
| 26 | 26 | <view class="padding"> |
| 27 | 27 | <view class="fs32 check_head">已选中</view> |
| 28 | 28 | <view class="check_labels"> |
| 29 | - <view class="check_label ellipsis-1 fs28" wx:for="{{check_label}}" wx:for-item="it" wx:for-index="key"> | |
| 30 | - <view> | |
| 29 | + <view class="check_label fs28" wx:for="{{check_label}}" wx:for-item="it" wx:for-index="key"> | |
| 30 | + <view class="ellipsis-1"> | |
| 31 | 31 | {{it.LabelName}} |
| 32 | 32 | </view> |
| 33 | 33 | </view> |
| 34 | 34 | </view> |
| 35 | 35 | </view> |
| 36 | 36 | |
| 37 | - <view class="flex-center"> | |
| 38 | 37 | <!-- 领取选择标签的奖励按钮 --> |
| 39 | 38 | <block wx:if="{{is_modify==0}}"> |
| 40 | 39 | <view class="receive flex-center fs36" bindtap="update_label" data-url="/pages/user/userinfo/userinfo"> |
| ... | ... | @@ -55,7 +54,6 @@ |
| 55 | 54 | </view> |
| 56 | 55 | </block> |
| 57 | 56 | |
| 58 | - </view> | |
| 59 | 57 | </view> |
| 60 | 58 | <!-- 引入提示组件 --> |
| 61 | 59 | <warn id="warn"></warn> | ... | ... |
pages/user/labels/labels.wxss
| ... | ... | @@ -65,7 +65,8 @@ |
| 65 | 65 | } |
| 66 | 66 | .receive{ |
| 67 | 67 | position: fixed; |
| 68 | - bottom:130rpx; | |
| 68 | + bottom:60rpx; | |
| 69 | + left: 65rpx; | |
| 69 | 70 | width: 620rpx; |
| 70 | 71 | height: 70rpx; |
| 71 | 72 | line-height: 70rpx; |
| ... | ... | @@ -74,6 +75,6 @@ |
| 74 | 75 | border-radius: 40rpx; |
| 75 | 76 | } |
| 76 | 77 | .check_labels{ |
| 77 | - height: 280rpx; | |
| 78 | + height: 120rpx; | |
| 78 | 79 | overflow-y: scroll; |
| 79 | 80 | } |
| 80 | 81 | \ No newline at end of file | ... | ... |
pages/user/userinfo/userinfo.wxml
| ... | ... | @@ -186,8 +186,8 @@ |
| 186 | 186 | </view> |
| 187 | 187 | </view> |
| 188 | 188 | </view> |
| 189 | - <!-- 我的兴趣 --> | |
| 190 | - <view wx:if="{{is_lable_set!=null || is_lable_set==1}}" class="padding Bbottom"> | |
| 189 | + <!-- 我的兴趣 isBool==1 && --> | |
| 190 | + <view wx:if="{{is_lable_set==1}}" class="padding Bbottom"> | |
| 191 | 191 | <view class="interest fs28"> |
| 192 | 192 | <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels"> |
| 193 | 193 | <view class="fs30">我的兴趣</view> | ... | ... |
pages/user/userinfo/userinfo.wxss