Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/address/address.vue

@@ -60,7 +60,7 @@
       @confirm="confirm"
     ></u-modal>
     <u-toast ref="uToast" />
-    <!-- <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"></auth> -->
+    <auth v-if="showAuth" @changeuserinfo="reloadUserinfo"></auth>
   </view>
 </template>
 
@@ -116,7 +116,7 @@ export default {
   	 });
   },
   onLoad(option) {
-    this.u = wx.getStorageSync("userinfo");
+    this.u = wx.getStorageSync("mall_UserInfo");
     if (!this.u) {
       this.u = {
         nickName: "未登录",
@@ -161,7 +161,7 @@ export default {
 	  );
     },
     reloadUserinfo() {
-      this.u = uni.getStorageSync("userinfo");
+      this.u = uni.getStorageSync("mall_UserInfo");
       this.showAuth = false;
     },
     isdefault(item) {