Merge remote-tracking branch 'origin/master'

doum

16 小时以前 2da6cac0a9bab5ce7ad04ac17f73d456732f907e

 mini-program/pages/address/address.vue

@@ -3,13 +3,13 @@
      <view class="list-item" v-for="(item, index) in list" :key="index">
         <view class="list-item-left">
            <view class="list-item-a">
               <text>李金平</text>
               <text>18188778293</text>
               <text>默认</text>
               <text>{{item.name}}</text>
               <text>{{item.phone}}</text>
               <text v-if="item.isDefault === 1">默认</text>
            </view>
            <view class="list-item-b">山西省太原市经开区长江东路巴黎春天小区1期4栋302</view>
            <view class="list-item-b">{{item.areaDetail}}{{item.addr}}</view>
         </view>
         <image src="/static/icon/address_ic_edit@2x.png" mode="widthFix"></image>
         <image src="/static/icon/address_ic_edit@2x.png" mode="widthFix" @click="edit(item)"></image>
      </view>
      <view class="button" @click="add">
         <image src="/static/images/icon_add_dz@2x.png" mode="widthFix"></image>
@@ -25,7 +25,7 @@
            list: []
         };
      },
      onLoad(option) {
      onShow() {
         this.getAddr()
      },
      methods: {
@@ -41,6 +41,12 @@
            uni.navigateTo({
               url: '/pages/new-address/new-address'
            })
         },
         edit(item) {
            uni.setStorageSync('addr', item);
            uni.navigateTo({
               url: '/pages/new-address/new-address'
            })
         }
      }
   }