From af69895b350c7539576582aa1e4577ee5264db83 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 28 Dec 2019 20:16:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E4=B8=9A=E4=B8=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                                    | 2 +-
 app.json.bak                                                | 1 -
 constant/UrlConstant.js                                     | 3 ++-
 factory/LoginFactory.js                                     | 6 +++---
 pages/{bingOwner/bingOwner.js => bindOwner/bindOwner.js}    | 0
 .../{bingOwner/bingOwner.json => bindOwner/bindOwner.json}  | 0
 .../{bingOwner/bingOwner.wxml => bindOwner/bindOwner.wxml}  | 0
 .../{bingOwner/bingOwner.wxss => bindOwner/bindOwner.wxss}  | 0
 pages/my/my.js                                              | 6 +++---
 pages/my/my.wxml                                            | 2 +-
 project.config.json                                         | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename pages/{bingOwner/bingOwner.js => bindOwner/bindOwner.js} (100%)
 rename pages/{bingOwner/bingOwner.json => bindOwner/bindOwner.json} (100%)
 rename pages/{bingOwner/bingOwner.wxml => bindOwner/bindOwner.wxml} (100%)
 rename pages/{bingOwner/bingOwner.wxss => bindOwner/bindOwner.wxss} (100%)

diff --git a/app.json b/app.json
index a30b59a..23ec894 100644
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
   "pages": [
     
     "pages/index/index",
-    "pages/bingOwner/bingOwner",
+    "pages/bindOwner/bindOwner",
     "pages/family/family",
     "pages/circle/circle",
     "pages/location/location",
diff --git a/app.json.bak b/app.json.bak
index 59b1a87..a30b59a 100644
--- a/app.json.bak
+++ b/app.json.bak
@@ -7,7 +7,6 @@
     "pages/circle/circle",
     "pages/location/location",
     "pages/my/my",
-    "pages/detail/detail",
     "pages/notice/index",
     "pages/notice/detail/detail",
     "pages/repairList/repairList",
diff --git a/constant/UrlConstant.js b/constant/UrlConstant.js
index 563120e..f3518a8 100644
--- a/constant/UrlConstant.js
+++ b/constant/UrlConstant.js
@@ -7,7 +7,8 @@
 
 
   // 服务器域名
-  const baseUrl = 'http://hc.demo.winqi.cn:8012/';
+const baseUrl = 'https://app.demo.winqi.cn/';
+//const baseUrl = 'http://hc.demo.winqi.cn:8012/';
 
   // 登录接口
   const loginUrl=baseUrl + 'app/loginWx';
diff --git a/factory/LoginFactory.js b/factory/LoginFactory.js
index 55ea722..3c10bd3 100644
--- a/factory/LoginFactory.js
+++ b/factory/LoginFactory.js
@@ -56,7 +56,7 @@ class LoginFactory {
       },
       fail: function (error) {
         // 调用 wx.login 接口失败
-        that.coreUtil.showInfo('接口调用失败');
+        that.coreUtil.showInfo('接口调用失败' + error);
         console.log(error);
       }
     }); 
@@ -87,7 +87,7 @@ class LoginFactory {
         res = res.data;
 
         if (res.result == 0) {
-          that.globalData.userInfo = res.userInfo;
+          //that.globalData.userInfo = res.userInfo;
           console.log(res.userInfo);
           wx.setStorageSync(constant.mapping.USER_INFO, JSON.stringify(res.userInfo));
           wx.setStorageSync(constant.mapping.LOGIN_FLAG, res.sessionKey);
@@ -108,7 +108,7 @@ class LoginFactory {
 
 
   // 获取用户登录标示 供全局调用
-  static getLoginFlag() {
+   getLoginFlag() {
     return wx.getStorageSync(constant.mapping.LOGIN_FLAG);
   }
 
diff --git a/pages/bingOwner/bingOwner.js b/pages/bindOwner/bindOwner.js
similarity index 100%
rename from pages/bingOwner/bingOwner.js
rename to pages/bindOwner/bindOwner.js
diff --git a/pages/bingOwner/bingOwner.json b/pages/bindOwner/bindOwner.json
similarity index 100%
rename from pages/bingOwner/bingOwner.json
rename to pages/bindOwner/bindOwner.json
diff --git a/pages/bingOwner/bingOwner.wxml b/pages/bindOwner/bindOwner.wxml
similarity index 100%
rename from pages/bingOwner/bingOwner.wxml
rename to pages/bindOwner/bindOwner.wxml
diff --git a/pages/bingOwner/bingOwner.wxss b/pages/bindOwner/bindOwner.wxss
similarity index 100%
rename from pages/bingOwner/bingOwner.wxss
rename to pages/bindOwner/bindOwner.wxss
diff --git a/pages/my/my.js b/pages/my/my.js
index 405e604..4385ce3 100644
--- a/pages/my/my.js
+++ b/pages/my/my.js
@@ -23,12 +23,12 @@ Page({
     onShow: function() {
         let that = this;
         that.setData({
-            userInfo: app.globalData.userInfo
+            userInfo: context.getUserInfo()
         });
     },
-    enterCommunity:function(){
+    bindingOwner:function(){
       wx.navigateTo({
-        url: '../enterCommunity/enterCommunity',
+        url: '../bindOwner/bindOwner',
       })
     }
 })
\ No newline at end of file
diff --git a/pages/my/my.wxml b/pages/my/my.wxml
index d4fbf02..df7896b 100644
--- a/pages/my/my.wxml
+++ b/pages/my/my.wxml
@@ -25,7 +25,7 @@
 
 <view class="tab-container bg-white">
 
-    <view class="tab-item border-bottom" hover-class="tab-item-hover" catchtap="enterCommunity">
+    <view class="tab-item border-bottom" hover-class="tab-item-hover" catchtap="bindingOwner">
         <view>
             <text class="iconfont iconaccount icon"></text>
             <text class="tab-text">绑定业主</text>
diff --git a/project.config.json b/project.config.json
index 034644d..e16263a 100644
--- a/project.config.json
+++ b/project.config.json
@@ -21,7 +21,7 @@
 	"compileType": "miniprogram",
 	"libVersion": "2.9.4",
 	"isGameTourist": false,
-	"appid": "wx4333bd218847a1ca",
+	"appid": "wxf83d66b0e9f5964d",
 	"projectname": "WechatOwnerService",
 	"simulatorType": "wechat",
 	"simulatorPluginLibVersion": {},