前后端联调

miniapp/app/app.json

@@ -9,7 +9,8 @@
         "pages/goodsDetail/index",
         "pages/introduce/index",
         "pages/bookService/index",
-        "pages/yuesao/index"
+        "pages/yuesao/index",
+        "pages/detail/index"
     ],
     "window": {
         "backgroundTextStyle": "light",

miniapp/app/base/libs/request.js

@@ -28,7 +28,7 @@ const request = (cmd, method = 'POST', params = {}, handleStatus = false) => {
             data: params,
             success: res => {
                 res = res.data;
-                if (res.status === 105) {
+                if (res.status && res.status === 105) {
                     // token失效
                     global.memory.setData('USER_INFO', {}, {
                         localSave: true
@@ -38,7 +38,7 @@ const request = (cmd, method = 'POST', params = {}, handleStatus = false) => {
                         type: global.ROUTER_TYPE.CLOSE_ALL
                     });
                 } else {
-                    if (handleStatus || res.status === 0) {
+                    if (handleStatus || !res.status) {
                         resolve(res);
                     } else if (res.message) {
                         global.wx.showToast({

miniapp/app/pages/classify/index.js

@@ -1,19 +1,54 @@
 const $ = global;
-
+const colors = [
+    'blue',
+    'green',
+    'pink',
+    'orange',
+    'purple'
+];
 new $.Page({
     data: {
-        toView: ''
+        toView: '',
+        list: []
     },
     onLoad() {
-        const meta = $.router.getMeta();
-        const target = meta && meta.params && meta.params.target || '';
-
-        if (target) {
-            setTimeout(() => {
+        $.request('classifies', 'GET', {}).then((res) => {
+            const data = res.data;
+            const list = [];
+            if (data.length > 0) {
+                data.forEach(d => {
+                    if (!d.pid) {
+                        d.array = [];
+                        list.push(d);
+                    }
+                });
+                data.forEach(d => {
+                    if (d.pid) {
+                        list.forEach((l, index) => {
+                            l.color = colors[index];
+                            if (l.id === d.pid) {
+                                l['array'].push(d);
+                            }
+                        });
+                    }
+                });
                 this.setData({
-                    toView: target
+                    list
                 });
-            }, 10);
+            }
+        });
+    },
+    toIntroduce(e) {
+        const {
+            id
+        } = e.currentTarget.dataset;
+        if (id) {
+            $.router.goto({
+                path: `/pages/introduce/index`,
+                query: {
+                    id
+                }
+            });
         }
     }
 });

miniapp/app/pages/classify/index.wxml

@@ -1,118 +1,17 @@
 <view class="page">
-    <scroll-view scroll-y scroll-with-animation="true" scroll-into-view="{{toView}}">
+    <scroll-view scroll-y scroll-with-animation scroll-into-view="{{toView}}">
         <view class="page-bd">
-            <view class="classify blue">
+            <view class="classify {{item.color}}" wx:for="{{list}}" id="jiazheng">
                 <view class="hd">
-                    <text class="dot">●</text>家政</view>
+                    <text class="dot">●</text>{{item.name}}</view>
                 <view class="bd">
-                    <view class="item">
+                    <view class="item" wx:for="{{item.array}}" wx:for-item="l" data-id="{{l.id}}" bindtap="toIntroduce">
                         <view class="inner">
-                            <view class="text">月嫂</view>
-                            <view class="sub-text">月嫂</view>
+                            <view class="text">{{l.name}}</view>
+                            <view class="sub-text">{{l.info}}</view>
                             <image class="icon-arr" src="/img/arr1.png"></image>
                         </view>
                     </view>
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">育婴师</view>
-                            <view class="sub-text">育婴师</view>
-                            <image class="icon-arr" src="/img/arr1.png"></image>
-                        </view>
-                    </view>
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">病人护理</view>
-                            <view class="sub-text">病人护理</view>
-                            <image class="icon-arr" src="/img/arr1.png"></image>
-                        </view>
-                    </view>
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">老人看护</view>
-                            <view class="sub-text">老人看护</view>
-                            <image class="icon-arr" src="/img/arr1.png"></image>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="classify green" id="zhongdian">
-                <view class="hd">
-                    <text class="dot">●</text>钟点/家庭保洁服务</view>
-                <view class="bd">
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">空调清洗</view>
-                            <view class="sub-text">空调清洗</view>
-                            <image class="icon-arr" src="/img/arr2.png"></image>
-                        </view>
-                    </view>
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">冰箱清洁</view>
-                            <view class="sub-text">冰箱清洁</view>
-                            <image class="icon-arr" src="/img/arr2.png"></image>
-                        </view>
-                    </view>
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">抽油烟机清洗</view>
-                            <view class="sub-text">抽油烟机清洗</view>
-                            <image class="icon-arr" src="/img/arr2.png"></image>
-                        </view>
-                    </view>
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">家庭除螨</view>
-                            <view class="sub-text">家庭除螨</view>
-                            <image class="icon-arr" src="/img/arr2.png"></image>
-                        </view>
-                    </view>
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">开荒清洁</view>
-                            <view class="sub-text">开荒清洁</view>
-                            <image class="icon-arr" src="/img/arr2.png"></image>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="classify pink">
-                <view class="hd">
-                    <text class="dot">●</text>母婴产品</view>
-                <view class="bd">
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">母婴产品</view>
-                            <view class="sub-text">母婴产品</view>
-                            <image class="icon-arr" src="/img/arr3.png"></image>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="classify orange">
-                <view class="hd">
-                    <text class="dot">●</text>催乳及产后康复</view>
-                <view class="bd">
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">催乳及产后康复</view>
-                            <view class="sub-text">催乳及产后康复</view>
-                            <image class="icon-arr" src="/img/arr4.png"></image>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="classify purple">
-                <view class="hd">
-                    <text class="dot">●</text>月子及育婴知识咨询</view>
-                <view class="bd">
-                    <view class="item">
-                        <view class="inner">
-                            <view class="text">月子及育婴知识咨询</view>
-                            <view class="sub-text">月子及育婴咨询</view>
-                            <image class="icon-arr" src="/img/arr5.png"></image>
-                        </view>
-                    </view>
                 </view>
             </view>
         </view>

miniapp/app/pages/classify/index.wxss

@@ -71,6 +71,7 @@ page {
 
 .bd {
     margin: 0 10rpx;
+    font-size: 0;
 }
 
 .item {

miniapp/app/pages/detail/index.js

@@ -0,0 +1,25 @@
+const WxParse = require('../../wxParse/wxParse.js')
+const $ = global
+
+new $.Page({
+    onLoad(options) {
+        const id = options.id;
+        if (id) {
+            $.request('classifies', 'GET', {
+                id
+            }).then((res) => {
+                var article = '<div>我是富文本</div>'
+                /**
+                 * WxParse.wxParse(bindName , type, data, target,imagePadding)
+                 * 1.bindName绑定的数据名(必填)
+                 * 2.type可以为html或者md(必填)
+                 * 3.data为传入的具体数据(必填)
+                 * 4.target为Page对象,一般为this(必填)
+                 * 5.imagePadding为当图片自适应是左右的单一padding(默认为0,可选)
+                 */
+                WxParse.wxParse('article', 'html', article, this, 5)
+            });
+        }
+    },
+    bookServer() {}
+})

miniapp/app/pages/detail/index.json

@@ -0,0 +1,3 @@
+{
+    "navigationBarTitleText": "详情页"
+}

miniapp/app/pages/detail/index.wxml

@@ -0,0 +1,8 @@
+<import src="/wxParse/wxParse.wxml" />
+<view class="page">
+    <view class="page-bd">
+        <view class="introduce">
+            <template is="wxParse" data="{{wxParseData:article.nodes}}" />
+        </view>
+    </view>
+</view>

miniapp/app/pages/detail/index.wxss

@@ -0,0 +1,21 @@
+page {
+    background-color: #fff;
+}
+
+.introduce {
+    margin: 40rpx 20rpx 80rpx;
+}
+
+.btn-book {
+    display: block;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    position: fixed;
+    bottom: 60rpx;
+    background-color: #00a0e9;
+    color: #fff;
+    font-size: 28rpx;
+    left: 40rpx;
+    right: 40rpx;
+}

miniapp/app/pages/home/index.js

@@ -9,7 +9,20 @@ new $.Page({
         ]
     },
     onLoad() {
-        WxParse.wxParse('article', 'html', '<div>hello world</div>', this);
+        $.request('server_infos', 'GET', {}).then((res) => {
+            const {
+                bottom,
+                top,
+                introduce
+            } = res;
+            WxParse.wxParse('article', 'html', introduce, this);
+            this.setData({
+                bottom,
+                top,
+                introduce
+            });
+        });
+
     },
     handleJump(e) {
         const {
@@ -20,9 +33,19 @@ new $.Page({
         if (route) {
             $.router.goto({
                 path: `/pages/${route}/index`,
-                type: type && parseInt(type),
-                params: {
-                    target: target || ''
+                type: type && parseInt(type)
+            });
+        }
+    },
+    toDetail(e) {
+        const {
+            id
+        } = e.target.dataset;
+        if (id) {
+            $.router.goto({
+                path: `/pages/detail/index`,
+                query: {
+                    id
                 }
             });
         }

miniapp/app/pages/home/index.wxml

@@ -3,9 +3,9 @@
     <view class="page-hd">
         <swiper indicator-dots="true" indicator-color="#ffffff" indicator-active-color="#00a0e9" autoplay="true"
             interval="5000" duration="500">
-            <block wx:for="{{imgUrls}}">
+            <block wx:for="{{top}}">
                 <swiper-item>
-                    <image src="{{item}}" class="slide-image" />
+                    <image src="{{item.photo}}" class="slide-image" data-id="{{item.id}}" bindtap="toDetail" />
                 </swiper-item>
             </block>
         </swiper>
@@ -19,7 +19,7 @@
             </view>
         </view>
         <view class="entrances">
-            <view class="item" bindtap="handleJump" data-route="classify" data-type="5">
+            <view class="item" bindtap="handleJump" data-route="classify" data-target="jiazheng" data-type="5">
                 <view class="entrance">
                     <image class="img" mode="widthFix" src="/img/entrance1.png"></image>
                     <view class="name">家政</view>
@@ -38,7 +38,7 @@
                 </view>
             </view>
             <view class="item">
-                <view class="entrance">
+                <view class="entrance" bindtap="handleJump" data-route="classify" data-target="cuiru" data-type="5">
                     <image class="img" mode="widthFix" src="/img/entrance4.png"></image>
                     <view class="name">催乳及产后康复</view>
                 </view>
@@ -49,13 +49,14 @@
                     <view class="name">月子及育婴知识咨询</view>
                 </view>
             </view>
-            <view class="item" bindtap="handleJump" data-route="classify" data-type="5">
+            <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>
                     <view class="name">更多</view>
                 </view>
             </view>
         </view>
-        <image class="bottom-banner" mode="widthFix" src="/img/demo/banner2.jpg"></image>
+        <image class="bottom-banner" wx:if="{{bottom.photo}}" mode="widthFix" src="{{bottom.photo}}" data-id="{{bottom.id}}"
+            bindtap="toDetail"></image>
     </view>
 </view>