diff --git a/pages/cart/cart.js b/pages/cart/cart.js index d910d13..674f7ff 100644 --- a/pages/cart/cart.js +++ b/pages/cart/cart.js @@ -1,4 +1,5 @@ const district = require('../../utils/address_data.js') +const product = require('../../utils/product.js') Page({ data: { @@ -16,8 +17,8 @@ Page({ var cartItems = wx.getStorageSync("cartItems") this.setData({cartItems: cartItems}) - var detailAddress = wx.getStorageSync('detailAddress') - var receiverName = wx.getStorageSync('receiverName') + var detailAddress = wx.getStorageSync('detailAddress') + var receiverName = wx.getStorageSync('receiverName') var receiverMobile = wx.getStorageSync('receiverMobile') var address = {detail: detailAddress, name: receiverName, mobile: receiverMobile} @@ -69,9 +70,19 @@ Page({ }) }, - // bindBilling: function () { - // var cartItems = wx.getStorageSync('cartItems') - // }, + bindBilling: function () { + var cartItems = wx.getStorageSync('cartItems') + if (cartItems) { + var cartArray = cartItems.map(function(obj){ + var rObj = {}; + rObj['id'] = obj.id; + rObj['quantity'] = obj.quantity; + return rObj; + }); + product.postBilling({items: cartArray, + address: this.data.address}) + } + }, bindTapAddress () { wx.navigateTo({ diff --git a/pages/cart/cart.wxml b/pages/cart/cart.wxml index 97717de..05c7e1a 100644 --- a/pages/cart/cart.wxml +++ b/pages/cart/cart.wxml @@ -43,7 +43,7 @@ - + diff --git a/pages/show_product/show_product.js b/pages/show_product/show_product.js index 4c1d28d..57bdf3e 100644 --- a/pages/show_product/show_product.js +++ b/pages/show_product/show_product.js @@ -6,13 +6,11 @@ Page({ toastAddProduct: true, title: '', id: 0, - address: '', quantity: 1, product: {} }, onShow () { - this.setData({'address': Date.now()}) }, onLoad (params) { diff --git a/utils/product.js b/utils/product.js index de990a0..ead6f66 100644 --- a/utils/product.js +++ b/utils/product.js @@ -12,18 +12,6 @@ function getProducts (data) { }) } -function postBuyProduct (data) { - return new Promise((resolve, reject) => { - wx.request({ - url: `${API_URL}/products/buy`, - data: Object.assign({}, data), - header: { 'Content-Type': 'application/json' }, - success: resolve, - fail: reject - }) - }) -} - function getSlides () { return new Promise((resolve, reject) => { wx.request({ @@ -39,7 +27,7 @@ function postBilling (data) { return new Promise((resolve, reject) => { wx.request({ method: 'POST', - url: `${API_URL}/cart/billing`, + url: `${API_URL}/carts/billings`, data: data, header: { 'Content-Type': 'application/json'}, success: resolve,