Merge branch 'zhengjei' of pplokijuhyg/deguodaigou into master

components/classify/list/index.js

@@ -1,5 +1,7 @@
 Component({
-    properties: {},
+    properties: {
+
+    },
     data: {},
     methods: {
         todetail() {

components/classify/navigation/index.js

@@ -1,11 +1,13 @@
 Component({
     properties: {
+        types: Array
     },
     data: {
         id: 0
     },
     methods: {
         select(a) {
+            // console.log(this.data.a.target.dataset.id)
             // console.log(a.target.dataset.id)
             this.setData({
                 id: a.target.dataset.id

components/classify/navigation/index.wxml

@@ -1,10 +1,11 @@
     <scroll-view class="navigation" scroll-y="{{true}}" bind:tap="select" >
-        <view data-id="0" class="{{id == 0?'on' : ''}}">热门商品</view>
+      <view wx:for="{{types}}" data-id="{{index}}" class="{{id == index?'on' : ''}}">{{item.name}}</view>
+        <!-- <view data-id="0" class="{{id == 0?'on' : ''}}">热门商品</view>
         <view data-id="1" class="{{id == 1?'on' : ''}}">美容健身</view>
         <view data-id="2" class="{{id == 2?'on' : ''}}">美容健身</view>
         <view data-id="3" class="{{id == 3?'on' : ''}}">美容健身</view>
         <view data-id="4" class="{{id == 4?'on' : ''}}">美容健身</view>
         <view data-id="5" class="{{id == 5?'on' : ''}}">美容健身</view>
         <view data-id="6" class="{{id == 6?'on' : ''}}">美容健身</view>
-        <view data-id="7" class="{{id == 7?'on' : ''}}">美容健身</view>
+        <view data-id="7" class="{{id == 7?'on' : ''}}">美容健身</view> -->
     </scroll-view>

pages/classify/classify.js

@@ -1,17 +1,30 @@
 // pages/classify/classify.js
+import { request } from "../../utils/bin"
 Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-
+        type: []
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function(options) {
+        request({
+            url: "Goods/goodsCategoryList",
+            data: {
+                parent_id: 2
+            }
+        }).then((res) => {
+            // console.log(res)
+            this.setData({
+                type: res.data.result
+            })
+            console.log(this.data.type, 150)
+        })
 
     },
 

pages/classify/classify.wxml

@@ -1,4 +1,4 @@
 <view class="box">
-<navigation></navigation>
+<navigation types="{{type}}"></navigation>
 <list ></list>
 </view>