Merge remote-tracking branch 'origin/master'

miniapp/app/pages/bookService/index.wxml

@@ -162,4 +162,5 @@
         </view>
         <view class="btn-book" bindtap="bookServer">立即预约</view>
     </view>
-</view>
+</view>
+<button class="btn-join" type="default" open-type="contact" session-from="homeApp"><image class="icon-service" src="/img/icon-service.png"></image>咨询</button>

miniapp/app/pages/bookService/index.wxss

@@ -68,4 +68,29 @@ radio {
 checkbox-group,
 radio-group {
     display: block;
-}
+}
+
+
+.icon-service{
+    width: 54rpx;
+    height: 60rpx;
+    vertical-align: -14rpx;
+}
+
+.btn-join{
+    position: fixed;
+    bottom: 300rpx;
+    right: 0;
+    font-size: 34rpx;
+    color: #00a0e9;
+    background-color: #ddd;
+    z-index: 999;
+    padding: 0 10rpx;
+    border: solid 1rpx #ccc;
+    border-radius: 0;
+    border-right: 0;
+}
+
+button[type=default].button-hover{
+    background-color: #ddd;
+}

miniapp/app/pages/classify/index.js

@@ -61,9 +61,9 @@ new $.Page({
                     path: `/pages/goodsList/index`
                 });
             } else if (name.includes('咨询')) {
-                $.router.goto({
-                    path: `/pages/service/index`
-                });
+                // $.router.goto({
+                //     path: `/pages/service/index`
+                // });
             } else {
                 $.router.goto({
                     path: `/pages/introduce/index`,

miniapp/app/pages/classify/index.wxml

@@ -6,12 +6,12 @@
             <view class="bd">
                 <view class="item" wx:for="{{item.array}}" wx:for-item="l" data-name="{{l.name}}" data-id="{{l.id}}"
                     bindtap="toIntroduce">
-                    <!-- <button class="inner" hover-class="none" open-type="contact" session-from="" wx:if="{{l.isConsult}}">
-                                <view class="text">{{l.name}}</view>
-                                <view class="sub-text">{{l.info}}</view>
-                                <image class="icon-arr" src="/img/arr1.png"></image>
-                            </button> -->
-                    <view class="inner">
+                    <button class="inner" hover-class="none" open-type="contact" session-from="" wx:if="{{l.isConsult}}">
+                        <view class="text">{{l.name}}</view>
+                        <view class="sub-text">{{l.info}}</view>
+                        <image class="icon-arr" src="/img/arr1.png"></image>
+                    </button>
+                    <view class="inner" wx:else>
                         <view class="text">{{l.name}}</view>
                         <view class="sub-text">{{l.info}}</view>
                         <image class="icon-arr" src="/img/arr1.png"></image>

miniapp/app/pages/home/index.wxml

@@ -44,18 +44,18 @@
                     <view class="name">催乳及产后康复</view>
                 </view>
             </view>
-            <!-- <button class="item" hover-class="none" open-type="contact" session-from="homeApp">
+            <button class="item" hover-class="none" open-type="contact" session-from="homeApp">
                 <view class="entrance">
                     <image class="img" mode="widthFix" src="/img/entrance5.png"></image>
                     <view class="name">月子及育婴知识咨询</view>
                 </view>
-            </button> -->
-            <view class="item">
+            </button>
+            <!-- <view class="item">
                 <view class="entrance" bindtap="handleJump" data-route="service">
                     <image class="img" mode="widthFix" src="/img/entrance5.png"></image>
                     <view class="name">月子及育婴知识咨询</view>
                 </view>
-            </view>
+            </view> -->
             <view class="item" bindtap="handleJump" data-route="classify" data-type="5">
                 <view class="entrance">
                     <image class="img" mode="widthFix" src="/img/entrance6.png"></image>

miniapp/app/pages/order/index.wxml

@@ -52,7 +52,7 @@
                         <view class="text-top">{{item.orderText}}</view>
                         <view class="text-bottom">￥{{item.price}}</view>
                         <view class="btn-blue" bindtap="toPay" data-id="{{item.id}}" data-type="{{item.order_type}}"
-                            wx:if="{{item.status == 0}}">立即付款</view>
+                            wx:if="{{item.status == 1}}">立即付款</view>
                         <view class="btn-blue" bindtap="addComment" data-id="{{item.id}}" data-type="{{item.order_type}}"
                             wx:if="{{item.status == 2 && !item.comment}}">添加评价</view>
                     </view>

miniapp/app/pages/yuesao/index.wxml

@@ -67,4 +67,6 @@
         </view>
         <view class="btn-book" bindtap="bookServer">立即预约</view>
     </view>
-</view>
+</view>
+
+<button class="btn-join" type="default" open-type="contact" session-from="homeApp"><image class="icon-service" src="/img/icon-service.png"></image>咨询</button>

miniapp/app/pages/yuesao/index.wxss

@@ -68,4 +68,28 @@ radio {
 checkbox-group,
 radio-group {
     display: block;
+}
+
+.icon-service{
+    width: 54rpx;
+    height: 60rpx;
+    vertical-align: -14rpx;
+}
+
+.btn-join{
+    position: fixed;
+    bottom: 300rpx;
+    right: 0;
+    font-size: 34rpx;
+    color: #00a0e9;
+    background-color: #ddd;
+    z-index: 999;
+    padding: 0 10rpx;
+    border: solid 1rpx #ccc;
+    border-radius: 0;
+    border-right: 0;
+}
+
+button[type=default].button-hover{
+    background-color: #ddd;
 }