Merge branch 'onlineclass_lvtz' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-v10

business/pages/calendarthemeeditor/index.js

@@ -1277,7 +1277,7 @@ Page({
             this.setData({
               classList: data.list,
               selectClass: this.data.id!=0 ? data.list.find(ele => ele.id == this.data.id) :  data.list[0],
-              id: data.list[0].id
+              id: this.data.id!=0? this.data.id: data.list[0].id
             })
             if (data.total > this.data.classList.length) {
               this.data.circlePage = this.data.circlePage + 1;

business/pages/classservice/rollcallindex.js

@@ -470,5 +470,15 @@ Page({
     })
   },
   // 防止悬浮窗滚动页面滚动，无特殊意义
-  true(){}
+  true(){},
+  // 拨打电话
+  phoneCall(e){
+    const {mobile} = e.currentTarget.dataset;
+    if(!mobile){
+      return
+    }
+    wx.makePhoneCall({
+      phoneNumber: mobile
+    })
+  }
 })
\ No newline at end of file

business/pages/classservice/rollcallindex.wxml

@@ -44,8 +44,11 @@
                 <view class="item-left" wx:if="{{from=='rollcalldetail'}}">
                     <image class="avatar" src="{{filter.imagify(item.formal_school_student.avatar, 'image/resize,w_160/format,jpg')}}" wx:if="{{item.formal_school_student.avatar}}"></image>
                     <image class="avatar" src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}" wx:else></image>
-                    <view class="content">
-                        <view class="name">{{item.formal_school_student.name}}</view>
+                    <view class="content" >
+                        <view class="name-box">
+                            <view class="name">{{item.formal_school_student.name}}</view>
+                            <image src="{{imageRoot}}2b/studentdetail/phone.png?{{imageVersion}}" class="icon-phone" bindtap="phoneCall" data-mobile='{{item.formal_school_student.mobile}}' wx:if="{{item.formal_school_student.mobile}}"></image>
+                        </view>
                         <view class="count">
                             <view class="count-name">剩余课时：</view>
                             <view class="count-data">{{item.student_course?item.student_course.surplus:0}}</view>   
@@ -57,7 +60,10 @@
                     <image class="avatar" src="{{filter.imagify(item.avatar, 'image/resize,w_160/format,jpg')}}" wx:if="{{item.avatar}}"></image>
                     <image class="avatar" src="{{imageRoot}}common/empty/avatar_user.png?{{imageVersion}}" wx:else></image>
                     <view class="content">
-                        <view class="name">{{item.name}}</view>
+                        <view class="name-box">
+                            <view class="name">{{item.name}}</view>
+                            <image src="{{imageRoot}}2b/studentdetail/phone.png?{{imageVersion}}" class="icon-phone" bindtap="phoneCall" data-mobile='{{item.mobile}}' wx:if="{{item.mobile}}"></image>
+                        </view>
                         <view class="count">
                             <view class="count-name">剩余课时：</view>
                             <view class="count-data">{{item.surplus}}</view>   

business/pages/classservice/rollcallindex.wxss

@@ -190,7 +190,6 @@
     justify-content: space-between;
     align-items: center;
     padding: 24rpx 0 24rpx 24rpx;
-    height: 110rpx;
     display: flex;
     align-items: center;
     position: relative;
@@ -217,12 +216,22 @@
 }
 .student-list .list-item .item-left .content{
     
+}
+.student-list .list-item .item-left .content .name-box{
+    display: flex;
+    align-items: center;
 }
 .student-list .list-item .item-left .content .name{
-    font-size:26rpx;
-    color:rgba(0,0,0,1);
-    line-height: 1;
-    padding-bottom: 16rpx;
+    font-size: 26rpx;
+    color: #000;
+    line-height: 1.2;
+    padding: 6rpx 0;
+}
+.student-list .list-item .item-left .content .icon-phone{
+    width: 40rpx;
+    min-width: 40rpx;
+    height: 40rpx;
+    margin-left: 10rpx;
 }
 .student-list .list-item .item-left .content .count{
     display: flex;

business/pages/themeeditor/index.js

@@ -875,7 +875,7 @@ Page({
             this.setData({
               classList: data.list,
               selectClass: this.data.id!=0 ? data.list.find(ele => ele.id == this.data.id) :  data.list[0],
-              id: data.list[0].id
+              id: this.data.id!=0? this.data.id: data.list[0].id
             })
             if (data.total > this.data.classList.length) {
               this.data.circlePage = this.data.circlePage + 1;

business/pages/themeeditorlock/index.js

@@ -379,8 +379,8 @@ Page({
             this.setData({
               classList: data.list,
               selectClass: this.data.id!=0 ? data.list.find(ele => ele.id == this.data.id) :  data.list[0],
-              'params.class_id': data.list[0].id,
-              id: data.list[0].id
+              'params.class_id': this.data.id!=0? this.data.id: data.list[0].id,
+              id: this.data.id!=0? this.data.id: data.list[0].id
             })
             if (data.total > this.data.classList.length) {
               this.data.circlePage = this.data.circlePage + 1;

constants/constants.js

 export default {
   imageRoot: 'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/',
-  host: 'https://qxapi.qingxiao.online/daka',
-  host2: 'https://wx.m.shangjiadao.cn',
+  // host: 'https://qxapi.qingxiao.online/daka',
+  // host2: 'https://wx.m.shangjiadao.cn',
   storageVersion: '4.0',
   imageVersion: '20191104',
-  // host: 'https://clock.wp53.cn',
-  // host2: 'https://test.wp53.cn',
+  host: 'https://clock.wp53.cn',
+  host2: 'https://test.wp53.cn',
   appId: 'wxc1246ea029394785',
   miniProgram: {
     clock: 'wxdeee20e52a1fd7ee'

src/components/brickLayout/index.js

-const DEFAULT_HEIGHT = 182
+// const DEFAULT_HEIGHT = 182
+const DEFAULT_HEIGHT = 0
 
 let init = true
 let _columns = 2
@@ -12,14 +13,6 @@ Component({
     rawData: {}, // 源数据
     orderArr: [], // 记录原始数值
     renderList: [], // 记录用于渲染的数组排序
-    _tplName: 'default',
-    _imageFillMode: 'widthFix', // 图片适配 mode
-    _fontColor: 'black',
-    _likeIcon: {
-      like: '../../asset/icon/icon-like-full.svg',
-      default: '../../asset/icon/icon-like.svg'
-    },
-    _limitContent: true,
   },
 
   properties: {
@@ -95,7 +88,6 @@ Component({
       return new Promise((resolve, reject) => {
         let query = wx.createSelectorQuery().in(this)
         query.select('#card-' + card_id +'-type'+type).boundingClientRect(res => {
-          console.log(res)
           resolve({card_id, height: res.height})
         })
         query.exec()
@@ -163,7 +155,8 @@ Component({
       let heightArr = []
       const arrLength = _columns
       const {orderArr, rawData} = this.data
-      heightArr = Array(arrLength).fill(0)
+      heightArr = Array(arrLength).fill(0);
+
 
       // initial render Arr
       for (let i = 0; i < arrLength; i++) {