From 2a69f73f5491c8dc0cf2ca30da005c76a56941c8 Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Mon, 14 Nov 2016 11:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=A2=AB=E5=BC=83=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84API=E7=9A=84=E6=94=B9=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/address/address.js             | 24 ++++++----------
 pages/address/address.wxml           |  4 ---
 pages/cart/cart.js                   | 41 ++++++++++++++--------------
 pages/cart/cart.wxml                 |  7 +----
 pages/show_product/show_product.js   | 11 ++++----
 pages/show_product/show_product.wxml |  5 ----
 6 files changed, 36 insertions(+), 56 deletions(-)

diff --git a/pages/address/address.js b/pages/address/address.js
index d1cbad7..0abc5e8 100644
--- a/pages/address/address.js
+++ b/pages/address/address.js
@@ -12,9 +12,6 @@ Page({
     indexProvince: 0,
     indexCity: 0,
     indexCounty: 0,
-
-    errorHidden: true,
-    msg: '不能为空'
   },
 
   bindChangeProvince: function(e) {
@@ -54,17 +51,11 @@ Page({
     var receiverName = e.detail.value.inputName.trim()
     var receiverMobile = e.detail.value.inputMobile.trim()
     if (!(receiverName && receiverMobile)) {
-      this.setData({
-        msg: '收货人姓名和手机号不能为空',
-        errorHidden: false
-      })
+      this.errorModal('收货人姓名和手机号不能为空')
       return
     }
     if (!receiverMobile.match(/^1[3-9][0-9]\d{8}$/)) {
-      this.setData({
-        msg: '手机号格式不正确，仅支持国内手机号码',
-        errorHidden: false
-      })
+      this.errorModal('手机号格式不正确，仅支持国内手机号码')
       return
     }
     wx.setStorage({key:'receiverName', data: receiverName})
@@ -72,10 +63,6 @@ Page({
     wx.navigateBack()
   },
 
-  confirmError: function(){
-    this.setData({errorHidden: true})
-  },
-
   onLoad (params) {
     var currentDistrict = wx.getStorageSync('currentDistrict') || [0, 0, 0]
     var arrayProvince = district.provinces()
@@ -93,5 +80,12 @@ Page({
       receiverName:   wx.getStorageSync('receiverName'),
       receiverMobile: wx.getStorageSync('receiverMobile')
     })
+  },
+
+  errorModal: function(content) {
+    wx.showModal({
+      title: '出现错误',
+      content: content
+    })
   }
 })
diff --git a/pages/address/address.wxml b/pages/address/address.wxml
index 945b5f2..ad30393 100644
--- a/pages/address/address.wxml
+++ b/pages/address/address.wxml
@@ -46,7 +46,3 @@
     <!--<button formType="reset">清空表单</button>-->
   </view>
 </form>
-
-<modal title="错误提示" confirm-text="确定" no-cancel hidden="{{errorHidden}}" bindconfirm="confirmError">
-  {{msg}}
-</modal>
\ No newline at end of file
diff --git a/pages/cart/cart.js b/pages/cart/cart.js
index f24ef22..e909f62 100644
--- a/pages/cart/cart.js
+++ b/pages/cart/cart.js
@@ -4,7 +4,6 @@ const order = require('../../utils/order.js')
 
 Page({
   data: {
-    deleteModalHidden: true,
     wantToDeleteItem: '',
     address: null,
     cartItems: [],
@@ -49,30 +48,32 @@ Page({
 
   // tap on item to delete cart item
   catchTapOnItem: function (e) {
+    var that = this
     this.setData({
-      deleteModalHidden: false,
       wantToDeleteItem: e.currentTarget.dataset.id
     })
-  },
 
-  deleteModalChange: function (e) {
-    var that = this
-    if (e.type === "confirm") {
-      var cartItems = that.data.cartItems
-      var index = cartItems.findIndex(function(ele){
-        return ele.id === that.data.wantToDeleteItem
-      })
-      cartItems.splice(index, 1)
-      this.setData({ cartItems: cartItems })
-      wx.setStorage({
-        key: 'cartItems',
-        data: cartItems
-      })
-    }
-    this.setData({
-      deleteModalHidden: true
+    wx.showModal({
+      title: '删除商品',
+      content: '是否要删除购物车中的这件商品？',
+      confirmText: '删除',
+      cancelText: '别删',
+      success: function(res) {
+        if (res.confirm) {
+          var cartItems = that.data.cartItems
+          var index = cartItems.findIndex(function(ele){
+            return ele.id === that.data.wantToDeleteItem
+          })
+          cartItems.splice(index, 1)
+          that.setData({ cartItems: cartItems })
+          wx.setStorage({
+            key: 'cartItems',
+            data: cartItems
+          })
+          that.changeCartAmount()
+        }
+      }
     })
-    this.changeCartAmount()
   },
 
   bindBilling: function () {
diff --git a/pages/cart/cart.wxml b/pages/cart/cart.wxml
index 0dd8d38..18b8c93 100644
--- a/pages/cart/cart.wxml
+++ b/pages/cart/cart.wxml
@@ -1,4 +1,4 @@
-<view class="address-container" wx:if="{{ address.detail_address }}"  bindtap="bindTapAddress">
+<view class="address-container" wx:if="{{ address.detail_address && address.name && address.mobile }}"  bindtap="bindTapAddress">
   <view class="receiver">
     <view>
       <text>收货人：{{address.name}}</text>
@@ -48,8 +48,3 @@
   <view>总计：¥{{amount}}元</view>
   <button class="button" type='warn' bindtap="bindBilling"> 去支付 </button>
 </view>
-
-
-<modal title="删除该商品" confirm-text="我不要它了" cancel-text="别删" hidden="{{deleteModalHidden}}" bindconfirm="deleteModalChange" bindcancel="deleteModalChange">
-  是否要删除购物车中的这件商品？
-</modal>
\ No newline at end of file
diff --git a/pages/show_product/show_product.js b/pages/show_product/show_product.js
index 42c86ae..f2a342c 100644
--- a/pages/show_product/show_product.js
+++ b/pages/show_product/show_product.js
@@ -2,7 +2,6 @@ const product = require('../../utils/product.js')
 
 Page({
   data: {
-    toastAddProduct: true,
     title: '',
     id: 0,
     quantity: 1,
@@ -43,7 +42,11 @@ Page({
         product: this.data.product
       })
     }
-    this.setData({ toastAddProduct:false });
+    wx.showToast({
+      title: '成功加入购物车',
+      icon: 'success',
+      duration: 1200
+    })
     wx.setStorage({
       key: 'cartItems',
       data: cartItems
@@ -53,8 +56,4 @@ Page({
   bindQuantityInput (e) {
     this.setData({'quantity': e.detail.value})
   },
-
-  toastChange: function(){
-    this.setData({ toastAddProduct:true });
-  }
 })
diff --git a/pages/show_product/show_product.wxml b/pages/show_product/show_product.wxml
index 15deae1..37c56f6 100644
--- a/pages/show_product/show_product.wxml
+++ b/pages/show_product/show_product.wxml
@@ -29,9 +29,4 @@
       </view>
     </block>
   </view>
-
-  <toast hidden="{{toastAddProduct}}" bindchange="toastChange" duration="1200">
-    <text style="font-size:28rpx">成功加入购物车</text>
-  </toast>
-
 </view>