浏览代码

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

wangfei 6 年前
父节点
当前提交
7751273f8e

+ 3
- 3
pages/EstateDetail/index.wxml 查看文件

72
         <text class="title">相册({{EstateDetail.Photos.length}})</text>
72
         <text class="title">相册({{EstateDetail.Photos.length}})</text>
73
         <view class="list">
73
         <view class="list">
74
           <view class="item" wx:for="{{EstateDetail.Photos}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
74
           <view class="item" wx:for="{{EstateDetail.Photos}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
75
-            <view class="img">
76
-              <image mode="aspectFit" src="{{item.imgUrl}}" class="centerLabel contain" data-type="Photos" data-index="{{idx}}" bindtap="CheckMaxImg"></image>
75
+            <view class="img photos">
76
+              <image mode="aspectFill" src="{{item.imgUrl}}" class="centerLabel cover" data-type="Photos" data-index="{{idx}}" bindtap="CheckMaxImg"></image>
77
             </view>
77
             </view>
78
             <view class="info">
78
             <view class="info">
79
-              <text>{{item.apartmentName}}</text>
79
+              <text>{{item.apartmentName}}({{EstateDetail.Photos[idx].buildingImgList.length}}张)</text>
80
             </view>
80
             </view>
81
           </view>
81
           </view>
82
         </view>
82
         </view>

+ 5
- 0
pages/EstateDetail/index.wxss 查看文件

216
   overflow: hidden;
216
   overflow: hidden;
217
 }
217
 }
218
 
218
 
219
+.roomType .list > view .img.photos{
220
+  padding-bottom: 60%;
221
+  border-radius: 10rpx;
222
+}
223
+
219
 .roomType .item > text {
224
 .roomType .item > text {
220
   display: inline-block;
225
   display: inline-block;
221
   line-height: 32rpx;
226
   line-height: 32rpx;

+ 6
- 4
pages/components/Mine/index.js 查看文件

1
 import create from '../../../utils/create'
1
 import create from '../../../utils/create'
2
 import signUp from '../../../utils/signup'
2
 import signUp from '../../../utils/signup'
3
 
3
 
4
-const app =  getApp();
4
+const app = getApp();
5
 
5
 
6
 create({
6
 create({
7
   behaviors: [],
7
   behaviors: [],
51
     },
51
     },
52
     ListTap(e) { // 用户选项点击事件
52
     ListTap(e) { // 用户选项点击事件
53
       if (e.target.dataset.type === 0) { // 个人资料
53
       if (e.target.dataset.type === 0) { // 个人资料
54
-        if(!this.checkUserLogin()){
54
+        if (!this.checkUserLogin()) {
55
           return
55
           return
56
         }
56
         }
57
         wx.navigateTo({
57
         wx.navigateTo({
84
           url: '/pages/SelfServiceTool/index'
84
           url: '/pages/SelfServiceTool/index'
85
         })
85
         })
86
       } else if (e.target.dataset.type === 6) { // 电话咨询
86
       } else if (e.target.dataset.type === 6) { // 电话咨询
87
-
87
+        wx.makePhoneCall({
88
+          phoneNumber: '025-86505555'
89
+        })
88
       }
90
       }
89
     },
91
     },
90
-    signup(e) {      
92
+    signup(e) {
91
       signUp(e.detail.userInfo, app).then((dt) => {
93
       signUp(e.detail.userInfo, app).then((dt) => {
92
         wx.showToast({
94
         wx.showToast({
93
           title: '注册成功',
95
           title: '注册成功',

+ 1
- 1
pages/components/SubIndex/index.js 查看文件

82
         })
82
         })
83
       } else if (e.target.dataset.type === 2) { // 电话咨询
83
       } else if (e.target.dataset.type === 2) { // 电话咨询
84
         wx.makePhoneCall({
84
         wx.makePhoneCall({
85
-          phoneNumber: '025-12345678'
85
+          phoneNumber: '025-86505555'
86
         })
86
         })
87
       }
87
       }
88
     }
88
     }