bug fix

app.js

@@ -114,7 +114,7 @@ App({
     ScreenBottomHeight: 0,
     Dict: [],
     ShareDate: {
-      title: '银城地产·江北公司',
+      title: '银城国际·江北公司',
       path: '/pages/index/index',
       imageUrl: 'https://whole-estate.oss-cn-beijing.aliyuncs.com/miniapp/index-share.jpg'
     },

pages/SelfServiceTool/AboutYinCheng/index.js

@@ -12,7 +12,7 @@ Page({
   },
   onShow() {
     wx.setNavigationBarTitle({
-      title: '关于银城地产'
+      title: '关于银城国际'
     })
   },
   /**

pages/SelfServiceTool/AboutYinCheng/index.wxml

@@ -17,7 +17,7 @@
     <text class="p center">历史最早可以回溯到<text class="b">1993</text>年</text>
     <text class="p center">那一年</text>
     <text class="p center">银城国际前身控股公司</text>
-    <text class="p center"><text class="b">银城地产集团股份有限公司</text>成立</text>
+    <text class="p center"><text class="b">银城国际集团股份有限公司</text>成立</text>
     <text class="p center">为全民所有制</text>
     <text class="p center">2001年底获批<text class="b">重组成立银城国际</text>，实现私有化</text>
     <image mode="widthFix" src="https://whole-estate.oss-cn-beijing.aliyuncs.com/zjyc-img3.jpg" style="width: 100%;"></image>

pages/SelfServiceTool/index.js

@@ -23,7 +23,7 @@ Page({
       value: '购房百科',
       icon: '/assets/images/icon39.png',
     }, {
-      value: '关于银城地产',
+      value: '关于银城国际',
       icon: '/assets/images/icon40.png',
     }]
   },
@@ -44,7 +44,7 @@ Page({
       wx.navigateTo({
         url: '/pages/SelfServiceTool/Cyclopedia/index',
       })
-    } else if (e.currentTarget.dataset.index === 4) { // 关于银城地产
+    } else if (e.currentTarget.dataset.index === 4) { // 关于银城国际
       wx.navigateTo({
         url: '/pages/SelfServiceTool/AboutYinCheng/index',
       })
@@ -53,7 +53,7 @@ Page({
   onShareAppMessage: function () {
     var imageUrl = app.globalData.FdShareImg
     return {
-      title: '银城地产·江北公司',
+      title: '银城国际·江北公司',
       path: '/pages/SelfServiceTool/index',
       imageUrl
     }

pages/SelfServiceTool/index.wxml

@@ -10,5 +10,5 @@
       <image mode="widthFix" src="/assets/images/icon11.png"></image>
     </view>
   </view>
-  <text class="tips">银城地产·江北公司</text>
+  <text class="tips">银城国际·江北公司</text>
 </view>

pages/components/Estate/index.js

@@ -59,6 +59,7 @@ Component({
     },
     ShowLocation() {
       const _that = this
+
       wx.getLocation({
         type: 'wgs84',
         success(res) {

pages/components/Mine/index.js

@@ -1,9 +1,5 @@
 import create from '../../../utils/create'
 import signUp from '../../../utils/signup'
-import fetch from '../../../utils/http'
-import {
-  get as getApi
-} from '../../../config/api'
 
 const app = getApp();
 

pages/components/SubIndex/index.js

@@ -2,14 +2,16 @@
 //获取应用实例
 const app = getApp()
 import fetch from '../../../utils/http'
+import create from '../../../utils/create'
 const $api = require('../../../config/api.js').$api;
 
-Component({
+create({
   behaviors: [],
   properties: {},
   banner: [],
   data: {
     UserInfo: app.globalData.UserInfo,
+    location: {},
     TopNavList: [{
       value: '楼盘展示',
       icon: '/assets/images/icon5.png',
@@ -28,7 +30,7 @@ Component({
   lifetimes: {},
   ready: function() {
     wx.setNavigationBarTitle({
-      title: '银城地产·江北公司'
+      title: '银城国际·江北公司'
     })
     const _that = this
     fetch({
@@ -64,30 +66,30 @@ Component({
   },
   methods: {
     GetBuildingList() {
-      const _that = this
-      wx.getLocation({
-        type: 'wgs84',
-        success(res) {
-          fetch({
-            url: $api.building.mainlist.url,
-            method: $api.building.mainlist.method,
-            data: {
-              pageNum: 1,
-              pageSize: 10
-            }
-          }).then((buildings) => {
-            const records = buildings.data.map(x => {
-              const distance = parseInt(_that.GetGreatCircleDistance(res.latitude, res.longitude, x.coordinate.split(',')[0], x.coordinate.split(',')[1] || res.longitude))
-              return {
-                ...x,
-                distance: distance / 10
-              }
-            })
-            _that.setData({
-              EstateList: records
-            })
-          })
-        }})
+      const {
+        latitude,
+        longitude
+      } = this.data.location
+
+      fetch({
+        url: $api.building.mainlist.url,
+        method: $api.building.mainlist.method,
+        data: {
+          pageNum: 1,
+          pageSize: 10
+        }
+      }).then((buildings) => {
+        const records = buildings.data.map(x => {
+          const distance = parseInt(this.GetGreatCircleDistance(latitude, longitude, x.coordinate.split(',')[0], x.coordinate.split(',')[1] || longitude))
+          return {
+            ...x,
+            distance: distance / 10
+          }
+        })
+        this.setData({
+          EstateList: records
+        })
+      })
     },
     GetGreatCircleDistance(lat1, lng1, lat2, lng2) {
       if (lat1 === lat2 && lng1 === lng2) {

pages/index/index.js

@@ -1,6 +1,7 @@
 import store from '../../store'
 import create from '../../utils/create'
 import fetch from '../../utils/http'
+import signUp from '../..//utils/signup'
 const $api = require('../../config/api.js').$api;
 
 const app = getApp()
@@ -25,6 +26,7 @@ create(store, {
   },
   data: {
     ShowLayer: false,
+    userInfo: {},
     propagandaList: [],
     NavList: [{ // navlist数据
       value: '首页',
@@ -49,11 +51,11 @@ create(store, {
   DealNavCut(index) {
     if (index === 0) {
       wx.setNavigationBarTitle({
-        title: '银城地产·江北公司'
+        title: '银城国际·江北公司'
       })
     } else if (index === 1) {
       wx.setNavigationBarTitle({
-        title: '银城地产·江北公司'
+        title: '银城国际·江北公司'
       })
     } else if (index === 2) {
       wx.setNavigationBarTitle({
@@ -99,6 +101,11 @@ create(store, {
       ShowLayer: false
     })
   },
+  signup(e) {
+    signUp(e.detail.userInfo, app).then((dt) => {
+      //
+    })
+  },
   propagandaClick(e) {
     if (e.target.dataset.pro.skipType && e.target.dataset.pro.skipType == 'building' && e.target.dataset.pro.skipId != ''){
       wx.navigateTo({

pages/index/index.wxml

@@ -46,4 +46,20 @@
     </view>
   </view>
 
+  <!-- 授权 -->
+  <view class="layer" hidden="{{userInfo.hasReg == 1}}">
+    <view class="auth">
+    {{userInfo.hasReg == 1}}
+      <view class="centerLabel">
+        <view class="logo">
+          <image mode="widthFix" src="https://whole-estate.oss-cn-beijing.aliyuncs.com/x-logo.png"></image>
+        </view>
+        <view class="tip">申请获取你的公开信息(昵称、头像等)</view>
+        <button open-type="getUserInfo" bindgetuserinfo="signup">
+          授权围观
+        </button>
+      </view>
+    </view>
+  </view>
+
 </view>

pages/index/index.wxss

@@ -101,9 +101,11 @@
 
 .layer .top image {
   display: block;
-  width: 20rpx;
+  width: 30rpx;
   float: right;
   margin-right: 20rpx;
+  padding: 10rpx;
+  background-color: rgba(255,255,255,.9);
 }
 
 .layer .content {
@@ -118,3 +120,36 @@
   width: 100%;
   display: block;
 }
+
+.layer .auth {
+  width: 100%;
+  height: 100%;
+  border-radius: 0;
+}
+
+.layer .auth .centerLabel {
+  width: calc(100% - 100px);
+  padding: 0 50rpx;
+}
+
+.layer .auth .logo {
+  padding: 0 80rpx;
+}
+
+.layer .auth .logo image {
+  width: 100%;
+}
+
+.layer .auth .tip {
+  font-size: 30rpx;
+  line-height: 2em;
+  color: #666;
+  text-align: center;
+}
+
+.layer .auth button {
+  font-size: 32rpx;
+  line-height: 2.6em;
+  color: #fff;
+  background-color: #BB9C79;
+}