Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/service/impl/IcCardServiceImpl.java

@@ -39,7 +39,7 @@ public class IcCardServiceImpl implements IcCardService {
     @Autowired
     private IcCardMapper icCardMapper;
 
-    @Value("${icCard.send.url}")
+    @Value("${smartschool.wechat.pushUrl}")
     private String targetURL;
 
     public String consumePush(List<AccTransDetail> accTransDetailList, String school){

applications/device/device-server/src/main/resources/config/application-docker-cloud.yml

@@ -20,4 +20,7 @@ spring:
         maximum-pool-size: 50
         idle-timeout: 30000
         max-lifetime: 1800000
-        connection-timeout: 30000
+        connection-timeout: 30000
+smartschool:
+  wechat:
+    pushUrl: https://school-api.ydyhz.com/api/wechat/send/Messages

applications/device/device-server/src/main/resources/config/application-docker-prod.yml

@@ -12,4 +12,7 @@ spring:
     password: select111***
   redis:
     host: 10.10.100.166
-    port: 6379
+    port: 6379
+smartschool:
+  wechat:
+    pushUrl: https://school-api.ubtob.com/api/wechat/send/Messages

frontend/wechat-web/src/components/PhonesItem.jsx

@@ -44,13 +44,11 @@ export default class PhonesItem extends Component {
                             phonesBean.phone.length <= 1 ?
                                 <a href={'tel:' + phonesBean.phone[0]} style={{display: 'flex', alignItems: 'center'}}>
                                     <div className='phones-item-phone'>{phonesBean.phone[0]}</div>
-                                    <span style={{widths:10,background:'#FFFFFF',color:'#FFFFFF'}}>22</span>
-                                    <img style={{height:14,height:14,marginLeft:10}} src={phone_img} alt=""/>
+                                    <div><img style={{height:14,height:14,marginLeft:10}} src={phone_img} alt=""/></div>
                                 </a> :
                                 <div style={{display: 'flex', alignItems: 'center'}} onClick={this.onPhoneSelect}>
                                     <div className='phones-item-phone'>{phonesBean.phone[0]}</div>
-                                    <span style={{widths:10,background:'#FFFFFF',color:'#FFFFFF'}}>22</span>
-                                    <img style={{height:14,height:14,marginLeft:10}} src={phone_img} alt=""/>
+                                   <div> <img style={{height:14,height:14,marginLeft:10}} src={phone_img} alt=""/></div>
                                 </div>)}
                     </div>
 

frontend/wechat-web/src/modules/hiPages/send-vote/SendVote.js

@@ -175,6 +175,7 @@ class SendVote extends Component {
                 </div>
 
                 <div className="comhline_sty"></div>
+
                 <div className="common-column-layout">
                     <Picker
                         data={this.state.typeVote} title='投票类型' extra='请选择'

frontend/wechat-web/src/modules/leave/LeaveAddCPage.js

@@ -96,7 +96,7 @@ class LeaveAddCPage extends Component {
                         dismissText: '取消'
                     }}
                     onChange={date => this.setState({startValue: date})}>
-                    <List.Item arrow="horizontal"></List.Item>
+                    <List.Item arrow="horizontal">开始时间</List.Item>
                 </DatePicker>
 
                 <div className="comhline_sty1"></div>

frontend/wechat-web/src/modules/leave/LeaveListPage.css

@@ -12,4 +12,10 @@
     margin: 5px;
     border: #f5f5f5;
     background-color: #0098FD
+}
+
+.no_data{
+    background: #F4F4F4;
+    background-size: 100% 100%;
+    height: 100vh;
 }

frontend/wechat-web/src/modules/leave/LeaveListPage.js

@@ -20,6 +20,7 @@ import RefreshLayout from "../../components/RefreshLayout";
 import {saveListState} from "../../redux/actions/listState";
 import {getIntValue, getStrValue, isObjEmpty} from "../../utils/common";
 import {Toast} from 'antd-mobile';
+import nodata_img from '../../style/imgs/no_data.png';
 
 let LEAVE_LIST_URL = ''
 let mPageIndex = 0
@@ -67,25 +68,29 @@ class LeaveListPage extends React.Component{
 
     render(){
         return <div   style={{background: '#F2F2F2'}}>
-
-            <RefreshLayout
+            {
+                this.state.data.length > 0 ?
+                    <RefreshLayout
                         refreshing={this.state.isRefreshing}
-                         ref={el => {
-                             this.container = el
+                        ref={el => {
+                            this.container = el
                         }}
                         onRefresh={this.getListData}>
                         <Skeleton loading={this.state.isLoading} active paragraph={{rows: 3}}>
-                            {/*{this.state.selectContentArray.map((itemata,index) => <UserItem index ={index} itemata = {itemata} handelRItem={this.handelRItem} removeSItem={this.removeSItem}></UserItem>)}*/}
                             {this.state.data.map((itemdata,index) =>  <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
                             )}
-                            {/*<List dataSource={this.state.data}*/}
-                                  {/*renderItem={(itemdata,index) =>(*/}
-                                      {/*<List.Item  >*/}
-                                          {/*<LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>*/}
-                                      {/*</List.Item>*/}
-                                  {/*)}/>*/}
+                            {/*  <List dataSource={this.state.data}
+                                  renderItem={(itemdata,index) =>(
+                                      <List.Item  >
+                                          <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
+                                      </List.Item>
+                                  )}/>*/}
                         </Skeleton>
                     </RefreshLayout>
+                    :
+                    <div className="no_data"><img src={nodata_img} alt="" style={{width:'100%',height:'auto'}}/></div>
+            }
+
                     {
                         this.state.role=="teacher"?(""):(<Icon type="plus-circle" theme='filled' className='common-add-icon'
                                                                onClick={this.onAddAction} />)

frontend/wechat-web/src/style/css/phones.css

@@ -61,7 +61,6 @@
 }
 
 .phones-item-phone {
-    width: 100px;
     font-family: PingFangSC-Regular;
     font-size: 15px;
     color: #666666;