From 0b4542aa144443380ad816984850bd6f55fe9f33 Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Tue, 6 Dec 2016 21:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=87=8F=E5=B0=91call=20API?=
 =?UTF-8?q?=20=E7=9A=84=E6=AC=A1=E6=95=B0=E3=80=82=E3=80=82=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=80=E4=B8=AA=E5=8F=AA=E9=80=89=E6=8B=A9province?=
 =?UTF-8?q?=E6=98=AF=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=9A=84bug=EF=BC=9Aform?=
 =?UTF-8?q?=20submit=20=E6=B2=A1=E6=9C=89=E8=AE=BE=E7=BD=AEstorage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/address/address.js | 10 +++++++---
 pages/cart/cart.js       | 33 +++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/pages/address/address.js b/pages/address/address.js
index b817f56..aa905b9 100644
--- a/pages/address/address.js
+++ b/pages/address/address.js
@@ -17,9 +17,9 @@ Page({
     var that = this
     var p = this.data.arrayProvince[e.detail.value]
     district.cities(p, function(arrayCity){
-      that.setData({arrayCity: arrayCity})
+      that.setData({arrayCity: arrayCity, indexCity: 0})
       district.counties(p, arrayCity[0], function(arrayCounty){
-        that.setData({arrayCounty: arrayCounty})
+        that.setData({arrayCounty: arrayCounty, indexCounty: 0})
       })
     })
 
@@ -32,7 +32,7 @@ Page({
     var p = this.data.arrayProvince[this.data.indexProvince]
     var c = this.data.arrayCity[e.detail.value]
     district.counties(p, c, function(arrayCounty){
-      that.setData({arrayCounty: arrayCounty})
+      that.setData({arrayCounty: arrayCounty, indexCounty: 0})
     })
     this.setData({indexCity: e.detail.value})
     wx.setStorageSync('currentDistrict', [this.data.indexProvince, this.data.indexCity, this.data.indexCounty])
@@ -61,6 +61,10 @@ Page({
     }
     wx.setStorage({key:'receiverName', data: receiverName})
     wx.setStorage({key:'receiverMobile', data: receiverMobile})
+    wx.setStorageSync('currentDistrict', [this.data.indexProvince, this.data.indexCity, this.data.indexCounty])
+    var pages = getCurrentPages()
+    var cartPage = pages[pages.length - 2]
+    cartPage.setData({refreshAddress: true})
     wx.navigateBack()
   },
 
diff --git a/pages/cart/cart.js b/pages/cart/cart.js
index f1933fd..b35bfc5 100644
--- a/pages/cart/cart.js
+++ b/pages/cart/cart.js
@@ -5,6 +5,7 @@ var app = getApp()
 
 Page({
   data: {
+    refreshAddress: true,
     wantToDeleteItem: '',
     address: null,
     cartItems: [],
@@ -19,31 +20,35 @@ Page({
 
   onShow: function (params) {
     var that = this
+    // 判断要显示什么类型的价格
     if (app.globalData.currentCustomer) {
       var accountType = app.globalData.currentCustomer.account_type
       this.setData({accountType: accountType})
     }
+
     var cartItems = wx.getStorageSync("cartItems")
     this.setData({cartItems: cartItems || []})
 
     this.changeCartAmount()
 
-    var detailAddress  = wx.getStorageSync('detailAddress')
-    var receiverName   = wx.getStorageSync('receiverName')
-    var receiverMobile = wx.getStorageSync('receiverMobile')
-    var address = {detail_address: detailAddress, customer_name: receiverName, customer_mobile: receiverMobile}
-
-    var districtIndex = wx.getStorageSync('currentDistrict') || [1,0,0]
-    address.province = district.provinces()[districtIndex[0]]
-    that.setData({address: address})
-    district.cities(address.province, function(arrayCity){
-      address.city = arrayCity[districtIndex[1]]
-      that.setData({address: address})
-      district.counties(address.province, address.city, function(arrayCounty){
-        address.county = arrayCounty[districtIndex[2]]
+    if (this.data.refreshAddress) {
+      var detailAddress  = wx.getStorageSync('detailAddress')
+      var receiverName   = wx.getStorageSync('receiverName')
+      var receiverMobile = wx.getStorageSync('receiverMobile')
+      var address = {detail_address: detailAddress, customer_name: receiverName, customer_mobile: receiverMobile}
+
+      var districtIndex = wx.getStorageSync('currentDistrict') || [1,0,0]
+      address.province = district.provinces()[districtIndex[0]]
+      that.setData({address: address, refreshAddress: false})
+      district.cities(address.province, function(arrayCity){
+        address.city = arrayCity[districtIndex[1]]
         that.setData({address: address})
+        district.counties(address.province, address.city, function(arrayCounty){
+          address.county = arrayCounty[districtIndex[2]]
+          that.setData({address: address})
+        })
       })
-    })
+    }
   },
 
   bindSelectCoupon: function() {