Merge branch 'master' of http://git.sotype.com/chenxiqiang/houseworking

miniapp/app/pages/classify/index.js

@@ -26,6 +26,9 @@ new $.Page({
                     if (d.pid) {
                         list.forEach((l, index) => {
                             l.color = colors[index];
+                            if (d.name.includes('咨询')) {
+                                d.isConsult = true;
+                            }
                             if (l.id === d.pid) {
                                 l['array'].push(d);
                             }
@@ -49,9 +52,9 @@ new $.Page({
                     path: `/pages/goodsList/index`
                 });
             } else if (name.includes('咨询')) {
-                $.wx.showToast({
-                    title: '持续开发中'
-                });
+                // $.wx.showToast({
+                //     title: '持续开发中'
+                // });
             } else {
                 $.router.goto({
                     path: `/pages/introduce/index`,

miniapp/app/pages/classify/index.json

@@ -1,3 +1,4 @@
 {
-    "navigationBarTitleText": "分类"
+    "navigationBarTitleText": "分类",
+    "backgroundColor": "#ebebeb"
 }

miniapp/app/pages/classify/index.wxml

@@ -7,7 +7,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">
-                        <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/classify/index.wxss

@@ -86,6 +86,7 @@ page {
     border-radius: 6rpx;
     padding: 20rpx 12rpx;
     position: relative;
+    line-height: 1.4;
 }
 
 .icon-arr {
@@ -104,4 +105,5 @@ page {
     font-size: 20rpx;
     color: #999999;
     margin-top: 10rpx;
+    text-align: left;
 }

miniapp/app/pages/home/index.js

@@ -51,8 +51,8 @@ new $.Page({
         }
     },
     toConsult() {
-        $.wx.showToast({
-            title: '持续开发中'
-        });
+        // $.wx.showToast({
+        //     title: '持续开发中'
+        // });
     }
 });

miniapp/app/pages/home/index.wxml

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

miniapp/app/pages/home/index.wxss

@@ -16,6 +16,8 @@
     width: 33.33%;
     vertical-align: top;
     margin-bottom: 20rpx;
+    padding: 0;
+    font-size: 0;
 }
 
 .entrance {

miniapp/app/pages/yuesao/index.js

@@ -12,7 +12,10 @@ new $.Page({
          * 4.target为Page对象,一般为this(必填)
          * 5.imagePadding为当图片自适应是左右的单一padding(默认为0,可选)
          */
-        WxParse.wxParse('article', 'html', article, this, 5)
+        WxParse.wxParse('article', 'html', article, this, 5);
+        $.request('server_fields', 'GET', {}).then((res) => {
+
+        });
     },
     bookServer() {
         const {