Merge branch 'qa' into 'master'

Qa See merge request !92

Merge branch 'qa' into 'master'
Qa See merge request !92
后端研发-苏明海
2 parents fc213fc2 2a3b9387
Showing 2 changed files with 4 additions and 2 deletions
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsList/goodsList.js
@@ -33,7 +33,7 @@
                         <text class='f_item_over_t'>{{fitem.items.name}}</text></view>
                     <view class='fenlei_text_v'>
                         <view class='f_text'  wx:for="{{fitem.array}}" wx:for-item="item"
-                          bindtap="go_cate" data-cid="{{item.id}}" data-pid="{{fitem.items.id}}">{{item.name}}</view>
+                          bindtap="go_cate" data-cid="{{item.id}}" data-pid="1">{{item.name}}</view>
                     </view>
                 </view> 
                 </block>  
@@ -31,8 +31,10 @@ Page({
       if (0 != t.cat_id && t.cat_id != undefined) { 
            url += "&cat_id=" + t.cat_id; 
-           if (t.pid != undefined && t.pid != null){
+           if (t.pid == undefined || t.pid == null){
               url +=  "&parent_id=0"; 
+           }else{
+               url +=  "&parent_id="+t.pid;
            }
       }