Merge branch 'zhengjei' of pplokijuhyg/deguodaigou into master

components/classify/list/index.js

@@ -1,8 +1,11 @@
 Component({
-    properties: {
+    properties: {},
-    },
+    data: {},
-    data: {
-    },
     methods: {
-    }
+        todetail() {
+            wx.navigateTo({
+                url: "/pages/product/product"
             })
+        }
+    }
+})

components/classify/list/index.wxml

@@ -1,5 +1,5 @@
 <scroll-view class="list" scroll-y="{{true}}" >
-        <view class="commodity">
+        <view class="commodity" bindtap="todetail">
             <view class="content">
                 <image class="imgthumb "></image>
                 <view class="introduce">
@@ -11,7 +11,7 @@
                 </view>
             </view>
         </view>
-        <view class="commodity">
+        <view class="commodity" bindtap="todetail">
             <view class="content">
                 <image class="imgthumb "></image>
                 <view class="introduce">
@@ -23,7 +23,7 @@
                 </view>
             </view>
         </view>
-        <view class="commodity">
+        <view class="commodity" bindtap="todetail">
             <view class="content">
                 <image class="imgthumb "></image>
                 <view class="introduce">

components/order/commodity/index.js

@@ -1,8 +1,11 @@
 Component({
-    properties: {
+    properties: {},
-    },
+    data: {},
-    data: {
-    },
     methods: {
+        todetail() {
+            wx.navigateTo({
+                url: "/pages/undetermined/undetermined"
+            })
+        }
     }
 })

components/order/commodity/index.wxml

@@ -1,4 +1,4 @@
-<view class="commodity">
+<view class="commodity" bindtap="todetail">
                 <message></message>
                 <view class="aggregate">
                     共计1件商品  合计: 

components/order/tab/index.json

@@ -1,7 +1,7 @@
 {
     "component": true,
     "usingComponents": {
-    "commodity":"../commodity/index",
+        "commodity": "../commodity",
         "van-tab": "../utils/dist/tab/index",
         "van-tabs": "../utils/dist/tabs/index"
     }

pages/undetermined/undetermined.js

@@ -11,56 +11,65 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-  onLoad: function (options) {
+    onLoad: function(options) {
 
     },
-
+    chooseaddr() {
+        wx.navigateTo({
+            url: "/pages/chooseaddr/chooseaddr"
+        })
+    },
+    todetail() {
+        wx.navigateTo({
+            url: "/pages/product/product"
+        })
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
-  onReady: function () {
+    onReady: function() {
 
     },
 
     /**
      * 生命周期函数--监听页面显示
      */
-  onShow: function () {
+    onShow: function() {
 
     },
 
     /**
      * 生命周期函数--监听页面隐藏
      */
-  onHide: function () {
+    onHide: function() {
 
     },
 
     /**
      * 生命周期函数--监听页面卸载
      */
-  onUnload: function () {
+    onUnload: function() {
 
     },
 
     /**
      * 页面相关事件处理函数--监听用户下拉动作
      */
-  onPullDownRefresh: function () {
+    onPullDownRefresh: function() {
 
     },
 
     /**
      * 页面上拉触底事件的处理函数
      */
-  onReachBottom: function () {
+    onReachBottom: function() {
 
     },
 
     /**
      * 用户点击右上角分享
      */
-  onShareAppMessage: function () {
+    onShareAppMessage: function() {
 
     }
 })

pages/undetermined/undetermined.wxml

@@ -1,4 +1,4 @@
 <view class="box">
-    <orderchooseaddr></orderchooseaddr>
+    <orderchooseaddr bindtap="chooseaddr"></orderchooseaddr>
-    <content></content>
+    <content bindtap="todetail"></content>
 </view>