From e5eb9236c625126e4211ea43aa9c3ba86e2fc679 Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Thu, 20 Oct 2016 09:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8=20Promise?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/cart.js         |  2 +-
 pages/category/category.js |  2 +-
 pages/index/index.js       |  4 +-
 utils/address.js           | 33 +++++++---------
 utils/product.js           | 77 +++++++++++++++++---------------------
 5 files changed, 52 insertions(+), 66 deletions(-)

diff --git a/pages/cart/cart.js b/pages/cart/cart.js
index 62caecd..c957b6c 100644
--- a/pages/cart/cart.js
+++ b/pages/cart/cart.js
@@ -83,7 +83,7 @@ Page({
       product.postBilling({
         items: cartArray,
         address: this.data.address
-      }).then(function(result){
+      }, function(result){
 
       })
     }
diff --git a/pages/category/category.js b/pages/category/category.js
index 89b7869..10c3465 100644
--- a/pages/category/category.js
+++ b/pages/category/category.js
@@ -10,7 +10,7 @@ Page({
     wx.setNavigationBarTitle({
       title: params.type
     })
-    product.getCategories(params.type).then(function(result) {
+    product.getCategories(params.type, function(result) {
       var data = getApp().store.sync(result.data)
       that.setData({items: data})
       wx.setStorage({
diff --git a/pages/index/index.js b/pages/index/index.js
index 4ec6d10..8e94db4 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -30,7 +30,7 @@ Page({
   onLoad: function() {
     var that = this
 
-    product.getSlides().then(function(result) {
+    product.getSlides(function(result) {
       var data = getApp().store.sync(result.data)
       that.setData({'slides': data})
       wx.setStorage({
@@ -43,7 +43,7 @@ Page({
       success: function(res) {
         var networkType = res.networkType // 返回网络类型2g，3g，4g，wifi
         if (networkType) {
-          product.getProducts().then(function(result) {
+          product.getProducts(function(result) {
             var data = getApp().store.sync(result.data)
             that.setData({
               items: data,
diff --git a/utils/address.js b/utils/address.js
index 2409e4d..e74bc51 100644
--- a/utils/address.js
+++ b/utils/address.js
@@ -1,22 +1,20 @@
 const API_URL = 'http://127.0.0.1:3000'
 
 function postAddress (data) {
-  return new Promise((resolve, reject) => {
-    wx.request({
-      method: 'POST',
-      url: `${API_URL}/addresses/new`,
-      data: Object.assign({}, data),
-      header: { 'Content-Type': 'application/json' },
-      success (res) {
-        console.log('success')
-        wx.setStorageSync('addrss', res.data)
-        wx.navigateBack()
-      },
-      fail (e) {
-        console.log('error')
-        console.error(e)
-      }
-    })
+  wx.request({
+    method: 'POST',
+    url: `${API_URL}/addresses/new`,
+    data: Object.assign({}, data),
+    header: { 'Content-Type': 'application/json' },
+    success (res) {
+      console.log('success')
+      wx.setStorageSync('addrss', res.data)
+      wx.navigateBack()
+    },
+    fail (e) {
+      console.log('error')
+      console.error(e)
+    }
   })
 }
 
@@ -34,7 +32,4 @@ function getLocation () {
 
 
 module.exports = {
-  postAddress (data) {
-    return postAddress(data).then(res => res.data)
-  }
 }
diff --git a/utils/product.js b/utils/product.js
index fb39625..29e5a46 100644
--- a/utils/product.js
+++ b/utils/product.js
@@ -1,67 +1,58 @@
 const API_URL = 'http://localhost:3000'
 
-function getProducts (data) {
-  data = data ? `/${data}` : ''
-  return new Promise((resolve, reject) => {
-    wx.request({
-        url: `${API_URL}/products${data}`,
-        header: { 'Content-Type': 'application/json' },
-        success: resolve,
-        fail: reject
-    })
+function getProducts (resolve) {
+  wx.request({
+    url: `${API_URL}/products`,
+    header: { 'Content-Type': 'application/json' },
+    success: resolve,
+    fail: function(){}
   })
 }
 
-function getSlides () {
-  return new Promise((resolve, reject) => {
-    wx.request({
-        url: `${API_URL}/home_slides`,
-        header: { 'Content-Type': 'application/json' },
-        success: resolve,
-        fail: reject
-    })
+function getSlides (resolve) {
+  wx.request({
+    url: `${API_URL}/home_slides`,
+    header: { 'Content-Type': 'application/json' },
+    success: resolve,
+    fail: function(){}
   })
 }
 
-function postBilling (data) {
-  return new Promise((resolve, reject) => {
-    wx.request({
-      method: 'POST',
-      url: `${API_URL}/carts/billings`,
-      data: data,
-      header: { 'Content-Type': 'application/json'},
-      success: resolve,
-      fail: reject
-    })
+function postBilling (data, resolve) {
+  wx.request({
+    method: 'POST',
+    url: `${API_URL}/carts/billings`,
+    data: data,
+    header: { 'Content-Type': 'application/json'},
+    success: resolve,
+    fail: function(){}
   })
 }
 
-function getCategories (data) {
-  return new Promise((resolve, reject) => {
-    wx.request({
-      url: `${API_URL}/products/category?type=${data}`,
-      header: { 'Content-Type': 'application/json'},
-      success: resolve,
-      fail: reject
-    })
+function getCategories (data, resolve, reject) {
+  wx.request({
+    url: `${API_URL}/products/category?type=${data}`,
+    header: { 'Content-Type': 'application/json'},
+    success: resolve,
+    fail: reject
   })
 }
 
 
 module.exports = {
-  getProducts () {
-    return getProducts()
+  getProducts (resolve) {
+    return getProducts(resolve)
   },
 
-  getSlides () {
-    return getSlides()
+  getSlides (resolve) {
+    return getSlides(resolve)
   },
 
-  postBilling (data) {
-    return postBilling(data)
+  postBilling (data, resolve) {
+    return postBilling(data, resolve)
   },
 
-  getCategories (data) {
-    return getCategories(data)
+  getCategories (data, resolve, reject) {
+    return getCategories(data, resolve, reject)
   }
 }