Merge branch 'shipanpan' into 'master'

我的徽章分类

See merge request !54

pages/index/badgelist/badgelist.js

@@ -7,13 +7,16 @@ Page({
     status: false,
     num: 0,
     arr: [],
+    listArr : [],
     badge_ids: []
   },
   onLoad: function (options) {
     var arr1 = JSON.parse(options.listData)
+
     this.setData({
       arr: arr1
     })
+    console.log(arr1)
     this.getList()
   },
   getList() {
@@ -23,20 +26,28 @@ Page({
     let params = {
       url: 'badges/all',
       callback: (data) => {
+        console.log(data)
         wx.hideLoading()
         data.map((item, index) => {
-          Object.assign(item, { status: false })
+          // console.log(item)
+          item.list.map((item_a) => {
+            Object.assign(item_a, { status: false })
+          })
         });
         this.setData({
           list: data
         })
+        console.log(this.data.list)
         for (var i = 0; i < this.data.list.length; i++) {
-          for (var j = 0; j < this.data.arr.length; j++) {
-            if (this.data.arr[j].id == this.data.list[i].id) {
-              this.data.list[i].status = this.data.arr[j].status
+          for(var a = 0; a < this.data.list[i].list.length; a++){
+            for (var j = 0; j < this.data.arr.length; j++) {
+              if (this.data.arr[j].id == this.data.list[i].list[a].id) {
+                this.data.list[i].list[a].status = this.data.arr[j].status
+              }
             }
           }
         }
+        console.log(this.data.list)
         this.setData({
           list: this.data.list
         })
@@ -46,47 +57,37 @@ Page({
   },
   chooseOne: function (e) {
     let index = e.currentTarget.dataset.index;
-    var list = this.data.list;
-    if (list[index].status) {
-      list[index].status = false
+    let parent_index = e.currentTarget.dataset.parent
+    var listArr = this.data.list;
+    if (listArr[parent_index].list[index].status) {
+      listArr[parent_index].list[index].status = false
     } else {
-      list[index].status = true
+      listArr[parent_index].list[index].status = true
     }
-    //点击图片把status==true的组成新的数组
+    console.log(listArr)
+    // //点击图片把status==true的组成新的数组
     var arr = [];
     var badge_ids = [];
-    for (var i = 0; i < list.length; i++) {
-      if (list[i].status == true) {
-        arr.push(list[i])
-        badge_ids.push(list[i].id)
+    for (var i = 0; i < listArr.length; i++) {
+      for(var j = 0;j<listArr[i].list.length;j++){
+        if(listArr[i].list[j].status == true){
+          arr.push(listArr[i].list[j])
+          badge_ids.push(listArr[i].list[j].id)
+        }
       }
     }
     this.setData({
-      list: list,
+      list: listArr,
       arr: arr,
       badge_ids: badge_ids
     })
+    console.log(arr)
     console.log(badge_ids)
-    var s = badge_ids.toString()
-    console.log(s)
   },
 
   save: function (e) {
     var pages = getCurrentPages();
     var prevPage = pages[pages.length - 2];  //上一个页面
-    // if (this.data.arr.length == 0) {
-    //   base.toast('请至少选择一个徽章')
-    // } else if (this.data.arr.length > 3) {
-    //   base.toast('最多选择三个徽章')
-    // } else {
-    //   prevPage.setData({
-    //     arr: this.data.arr,
-    //     badge_ids: this.data.badge_ids
-    //   })
-    //   wx.navigateBack({
-    //     delta: 1
-    //   })
-    // }
     if (this.data.arr.length > 3) {
       base.toast('最多选择三个徽章')
     } else {

pages/index/badgelist/badgelist.wxml

 <view>
 	<view class="tip">提示：最多选择三个徽章</view>
 	<view class="top">
-		<view class="title">运动大满贯</view>
-		<view class="imgbox flex-h flex-vc flex-hw">
-			<view wx:for="{{list}}" wx:key='index' wx:for-item='item_a' data-index="{{index}}" bindtap="chooseOne" data-id="{{item_a.id}}">
-        <image wx:if="{{item_a.status}}" class="bigimg" src="{{item_a.icon_active}}"></image>
-        <image wx:else class="bigimg" src="{{item_a.icon}}"></image>
+		<block wx:for="{{list}}" wx:key='index' wx:for-item='item_a' wx:for-index='idx'>
+			<view class="title">{{item_a.name}}</view>
+			<view class="imgbox flex-h flex-vc flex-hw">
+				<view wx:for="{{item_a.list}}" wx:key='index' data-index="{{index}}" data-parent="{{idx}}" bindtap="chooseOne" data-id="{{item.id}}">
+					<image wx:if="{{item.status}}" class="bigimg" src="{{item.icon_active}}"></image>
+					<image wx:else class="bigimg" src="{{item.icon}}"></image>
+				</view>
 			</view>
-		</view>
+		</block>
 	</view>
 </view>
 <view class="button">

pages/tabbar/index/index.wxss

@@ -24,7 +24,7 @@
   border-radius: 0;
   overflow: hidden;
   /* height: 220rpx; */
-  height: 560rpx;
+  height: 640rpx;
 }
 .heightBoard {
   height: auto;