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

pages/customerService/customerService.js

@@ -17,7 +17,7 @@ Page({
       {title:'如何预订儿童营地门票？'},
     ],
     mask:false,//控制客服微信的遮罩层显示
-    phone:'13685970580',
+    phone:'13316748039',
     hotline:false,//客服热线
     bottom:0,
     focus:false,

pages/customerService/customerService.wxml

@@ -40,7 +40,7 @@
   </view>
 </view>
 <view class="footer-nav">
-  <view class="nav-item" bindtap="showHotline">
+  <view class="nav-item" bindtap="call">
     <image class="nav-icon" src="./images/Hotline@2x.png"></image>
     <view class="nav-item-title">客服热线</view>
   </view>

pages/home/home.wxml

-<!-- <l-toast /> -->
-
 <navigation class="navigation" background="{{'rgba(255, 255, 255, ' + navigationAnimationShow + ')'}}"></navigation>
 
 <view class="container">
@@ -7,7 +5,7 @@
     <image class="logo" src="/image/logo-b.png" hidden="{{isNavigationLogoWhite}}" style="{{'top: ' + navigationLogoTop + 'px'}}"></image>
 
     <view id="banner" class="banner">
-        <swiper autoplay circular class="banner-swiper" indicator-dots="{{false}}" interval="4000" duration="500" bindchange="onSwiperChange">
+        <swiper autoplay circular class="banner-swiper" indicator-dots="{{false}}" interval="5000" duration="500" bindchange="onSwiperChange">
             <block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
                 <swiper-item class="banner-swiper-item" data-item="{{item}}" bindtap="bannerClick">
                     <image class="banner-swiper-image" src="{{item.img}}"></image>
@@ -24,7 +22,7 @@
         </view>
 
         <view class="banner-notice row align-c">
-            <view class="row align-c">
+            <view class="row align-c" bindtap="onNotice">
                 <image src="./image/inform.png"></image>
                 <text>最新动态</text>
             </view>

pages/hotelAccommodation/hotelAccommodation.js

@@ -44,7 +44,7 @@ Page({
       name: detail.name,
       mobile: detail.mobile,
       num: detail.num,
-      time: detail.time.substring(5,11).replace('-','月').replace(' ','日') + ((detail.type == 0) ? ' 20:00-24:00' : ''),
+      time: detail.time,
     })
   },
 

pages/mine/mine.js

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

pages/myAppointment/myAppointment.js

@@ -28,6 +28,7 @@ Page({
   },
   //预约凭证
   gohotelAccommodation(e){
+    console.log(e)
     wx.navigateTo({
       url: '../hotelAccommodation/hotelAccommodation?detail='+JSON.stringify(e.currentTarget.dataset.item),
     })

pages/notice-detail/notice-detail.js

@@ -28,7 +28,7 @@ Page({
             url: '/api/v1/dynamic/getDetail',
             data: { id: that.data.id },
             success: function (res) {
-                var content = res.data.content.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
+                var content = res.data.content.replace(/<img/gi, '<img style="width:100%;height:auto;display:block" ')
                 .replace(/<table/gi, '<table style="max-width:100%;height:auto;display:block" ')
                 .replace(/<section/g, '<div')
                 .replace(/\/section>/g, '\div>');

pages/notice-detail/notice-detail.wxml

@@ -8,9 +8,9 @@
     <view class="date row con-s">
         <text>{{notice.date}}</text>
     </view>
-    <view class="cover" wx:if="{{notice.cover !== ''}}">
+    <!-- <view class="cover" wx:if="{{notice.cover !== ''}}">
         <image src="{{notice.cover}}" mode="widthFix"></image>
-    </view>
+    </view> -->
     <view class="describe">
         <parser html="{{notice.describe}}"/>
     </view>

pages/notice-detail/notice-detail.wxss

@@ -29,6 +29,7 @@
 .describe {
     width: 670rpx;
     margin-top: 50rpx;
+    margin-bottom: 50rpx;
     font-size: 30rpx;
     font-weight: 300;
     color: #15191F;

pages/notice/notice.js

@@ -41,7 +41,7 @@ Page({
                 let count = that.data.notice.length
                 var tmpArr = [];
                 res.data.list.forEach(item => {
-                    var content = item.summary.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
+                    var content = item.summary.replace(/<img/gi, '<img style="width:100%;height:auto;display:block" ')
                     .replace(/<table/gi, '<table style="max-width:100%;height:auto;display:block" ')
                     .replace(/<section/g, '<div')
                     .replace(/\/section>/g, '\div>');

pages/shop-detail/shop-detail.js

@@ -75,7 +75,7 @@ Page({
                     App.globalData.appResourcesBase + 'shop/banner/banner-2-1-2.png',
                     App.globalData.appResourcesBase + 'shop/banner/banner-2-1-3.png',
                 ],
-                name: '元养水韵',
+                name: '元养水韵SPA',
                 title: '元养水韵SPA',
                 date: '周一至周日  10:00 - 22:00',
                 describe: [

pages/shop-detail/shop-detail.wxss

@@ -56,7 +56,7 @@
 
 /* 详情样式 */
 .detail {
-    padding-bottom: 200rpx;
+    padding-bottom: 160rpx;
 }
 
 .detail-black {

pages/strategy/strategy.js

@@ -85,11 +85,11 @@ Page({
 
                 /**
                 * 此代码段处理目的为，匹配富文本代码中的 <img> 标签，并将其图片的宽度修改为适应屏幕
-                * max-width:100%       --- 图片宽度加以限制，避免超出屏幕
+                * width:100%       --- 图片宽度加以限制，避免超出屏幕
                 * height:auto          --- 高度自适应
                 * display:block        --- 此代码，可以去掉图片之间的空白间隔，个人觉得好用
                 */
-               var content = res.data.content.replace(/<img/gi, '<img style="max-width:100%;height:auto;display:block" ')
+               var content = res.data.content.replace(/<img/gi, '<img style="width:100%;height:auto;display:block" ')
                .replace(/<table/gi, '<table style="max-width:100%;height:auto;display:block" ')
                .replace(/<section/g, '<div')
                .replace(/\/section>/g, '\div>');