Merge branch 'master' of http://git.ycjcjy.com/whole-estate/wxmini

pages/EstateDetail/index.wxml

@@ -72,11 +72,11 @@
         <text class="title">相册（{{EstateDetail.Photos.length}}）</text>
         <view class="list">
           <view class="item" wx:for="{{EstateDetail.Photos}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
-            <view class="img">
-              <image mode="aspectFit" src="{{item.imgUrl}}" class="centerLabel contain" data-type="Photos" data-index="{{idx}}" bindtap="CheckMaxImg"></image>
+            <view class="img photos">
+              <image mode="aspectFill" src="{{item.imgUrl}}" class="centerLabel cover" data-type="Photos" data-index="{{idx}}" bindtap="CheckMaxImg"></image>
             </view>
             <view class="info">
-              <text>{{item.apartmentName}}</text>
+              <text>{{item.apartmentName}}（{{EstateDetail.Photos[idx].buildingImgList.length}}张）</text>
             </view>
           </view>
         </view>

pages/EstateDetail/index.wxss

@@ -216,6 +216,11 @@
   overflow: hidden;
 }
 
+.roomType .list > view .img.photos{
+  padding-bottom: 60%;
+  border-radius: 10rpx;
+}
+
 .roomType .item > text {
   display: inline-block;
   line-height: 32rpx;

pages/components/Mine/index.js

@@ -1,7 +1,7 @@
 import create from '../../../utils/create'
 import signUp from '../../../utils/signup'
 
-const app =  getApp();
+const app = getApp();
 
 create({
   behaviors: [],
@@ -51,7 +51,7 @@ create({
     },
     ListTap(e) { // 用户选项点击事件
       if (e.target.dataset.type === 0) { // 个人资料
-        if(!this.checkUserLogin()){
+        if (!this.checkUserLogin()) {
           return
         }
         wx.navigateTo({
@@ -84,10 +84,12 @@ create({
           url: '/pages/SelfServiceTool/index'
         })
       } else if (e.target.dataset.type === 6) { // 电话咨询
-
+        wx.makePhoneCall({
+          phoneNumber: '025-86505555'
+        })
       }
     },
-    signup(e) {      
+    signup(e) {
       signUp(e.detail.userInfo, app).then((dt) => {
         wx.showToast({
           title: '注册成功',

pages/components/SubIndex/index.js

@@ -82,7 +82,7 @@ Component({
         })
       } else if (e.target.dataset.type === 2) { // 电话咨询
         wx.makePhoneCall({
-          phoneNumber: '025-12345678'
+          phoneNumber: '025-86505555'
         })
       }
     }