From e7b14865cec04fff6d1d60f53b72dc0e90e9e546 Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Tue, 11 Oct 2016 17:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=9F=BA=E6=9C=AC=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/address/address.js   | 28 +++++++++-------------------
 pages/address/address.wxml |  2 +-
 pages/cart/cart.js         | 16 +++++++++++++---
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pages/address/address.js b/pages/address/address.js
index e1dcf14..d6dd8a6 100644
--- a/pages/address/address.js
+++ b/pages/address/address.js
@@ -3,7 +3,7 @@ const district = require('../../utils/address_data.js')
 
 Page({
   data: {
-    address: {},
+    detailAddress: '',
     arrayProvince: [],
     indexProvince: 0,
     arrayCity: [],
@@ -16,13 +16,11 @@ Page({
     var p = this.data.arrayProvince[e.detail.value]
     var arrayCity = district.cities(p)
     var c = arrayCity[0]
-    var currentAddress = this.data.address
-    currentAddress.province = p
+
     this.setData({
       indexProvince: e.detail.value,
       arrayCity: arrayCity,
-      arrayCounty:district.counties(p,c),
-      address: currentAddress
+      arrayCounty:district.counties(p,c)
     })
     wx.setStorageSync('currentDistrict', [this.data.indexProvince, this.data.indexCity, this.data.indexCounty])
   },
@@ -30,32 +28,24 @@ Page({
   bindChangeCity: function(e) {
     var p = this.data.arrayProvince[this.data.indexProvince]
     var c = this.data.arrayCity[e.detail.value]
-    var currentAddress = this.data.address
-    currentAddress.city = c
     this.setData({
       indexCity: e.detail.value,
-      arrayCounty: district.counties(p,c),
-      address: currentAddress
+      arrayCounty: district.counties(p,c)
     })
     wx.setStorageSync('currentDistrict', [this.data.indexProvince, this.data.indexCity, this.data.indexCounty])
   },
 
   bindChangeCounty: function(e) {
     var county = this.data.arrayCounty[this.data.indexCounty]
-    var currentAddress = this.data.address
-    currentAddress.county = county
     this.setData({
-      indexCounty: e.detail.value,
-      address: currentAddress
+      indexCounty: e.detail.value
     })
     wx.setStorageSync('currentDistrict', [this.data.indexProvince, this.data.indexCity, this.data.indexCounty])
   },
 
   formSubmit: function(e) {
-    var currentAddress = this.data.address
-    currentAddress.detail = e.detail.value.input
-    this.setData({'address': currentAddress})
-    wx.setStorage({key:'address', data:currentAddress})
+    this.setData({'detailAddress': e.detail.value.input})
+    wx.setStorage({key:'detailAddress', data: e.detail.value.input})
     wx.navigateBack()
   },
   formReset: function(e) {
@@ -63,8 +53,8 @@ Page({
   },
 
   onLoad (params) {
-    var address = wx.getStorageSync('address')
-    this.setData({'address': address})
+    var detailAddress = wx.getStorageSync('detailAddress')
+    this.setData({'detailAddress': detailAddress})
     var currentDistrict = wx.getStorageSync('currentDistrict') || [0, 0, 0]
 
     var arrayProvince = district.provinces()
diff --git a/pages/address/address.wxml b/pages/address/address.wxml
index 9148e82..578b33a 100644
--- a/pages/address/address.wxml
+++ b/pages/address/address.wxml
@@ -28,7 +28,7 @@
 
   <view class="section">
     <view class="section_title">详细地址</view>
-    <input name="input" placeholder="输入地址信息" />
+    <input name="input" placeholder="输入地址信息" value="{{detailAddress}}" />
   </view>
 
   <view class="btn-area">
diff --git a/pages/cart/cart.js b/pages/cart/cart.js
index d3a1953..2d4414a 100644
--- a/pages/cart/cart.js
+++ b/pages/cart/cart.js
@@ -1,14 +1,24 @@
+const district = require('../../utils/address_data.js')
+
 Page({
   data: {
-    address: null
+    address:{}
   },
 
   onLoad: function (params) {
   },
 
   onShow: function (params) {
-    var address = wx.getStorageSync('address')
-    this.setData({'address': address})
+    var address = {}
+    var detailAddress = wx.getStorageSync('detailAddress')
+    address.detail = detailAddress
+
+    var districtIndex = wx.getStorageSync('currentDistrict')
+    address.province = district.provinces()[districtIndex[0]]
+    address.city     = district.cities(address.province)[districtIndex[1]]
+    address.county   = district.counties(address.province, address.city)[districtIndex[2]]
+
+    this.setData({address: address})
   },
 
   // bindBilling: function () {