Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

* 'master' of http://120.77.182.185/yanl/mini-shimao:
  ywl

pages/hotelAccommodation/hotelAccommodation.wxss

@@ -48,10 +48,19 @@
 }
 .form-item-nav{
   width: 120rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: justify;
   text-align-last: justify;
   font-size:30rpx;
   color:rgba(149,157,169,1);
 }
+.form-item-nav::after{
+  content: "";
+  display: inline-block;
+  width: 100%;
+  height: 0;
+}
 .form-item-content{
   width: 310rpx;
   font-size:30rpx;

pages/myAppointment/myAppointment.js

@@ -132,7 +132,7 @@ Page({
           let obj =  {
             title:title,
             type: type,
-            time: item.subscribeDate.substring(5,11).replace('-','月').replace(' ','日') + ((type == 0) ? ' 20:00-24:00' : ''),
+            time: item.subscribeDate.substring(0,10) + ((type == 0) ? ' 20:00-24:00' : ''),
             num: item.subscribeNum,
             url: url,
             id: item.id,

pages/myAppointment/myAppointment.wxml

@@ -11,7 +11,7 @@
           <image src="{{item.url}}" class="item-img"></image>
           <view class="item-content">
             <view class="item-title {{item.type == 0 ?'item-num-1' : ''}}">{{item.title}}</view>
-            <view  class="item-time {{item.type == 1 ?'item-time-1' : ''}}">预约时间 {{item.time}}</view>
+            <view  class="item-time {{item.type == 1 ?'item-time-1' : ''}}">预约时间 {{m1.getDate(item.time,item.type)}}</view>
             <view wx:if="{{item.type == 0}}" class="item-num">预约人数 {{item.num}}人</view>
           </view>
           <view class="button" data-item="{{item}}" bindtap="gohotelAccommodation">预约凭证</view>
@@ -28,3 +28,10 @@
       <view class="noActive-botton" data-index="2" bindtap="goAppoint">去预约</view>
     </view>
 </view>
+
+<wxs module = "m1">
+  var getDate = function(date,type){
+    return  date.substring(5,11).replace('-','月').replace(' ','日') + ((type == 0) ? ' 20:00-24:00' : '');
+  }
+  module.exports.getDate = getDate;
+</wxs>

pages/ownerCertification/ownerCertification.wxss

@@ -70,14 +70,18 @@ opacity: 0.4;
 }
 .form-item-nav{
   width: 120rpx;
+  height: 80rpx;
+  line-height: 80rpx;
   text-align:justify;
   text-align-last:justify ;
   font-size:30rpx;
+  vertical-align: middle;
 }
 .form-item-nav::after{
-  content: " ";
+  content: "";
   display: inline-block;
   width: 100%;
+  height: 0;
 }
 .form-input{
   width:510rpx;