Merge remote-tracking branch 'origin/master'

miniapp/app/pages/introduce/index.js

@@ -29,7 +29,7 @@ new $.Page({
             name,
             id
         } = this.data;
-        if (name && name.includes('月嫂')) {
+        if (name && name.includes('月嫂') || id == 6) {
             $.router.goto({
                 path: '/pages/yuesao/index',
                 query: {

miniapp/app/pages/order/index.wxml

@@ -41,7 +41,7 @@
             <view class="goods" wx:if="{{goods.length > 0}}">
                 <view class="cell" wx:for="{{goods}}">
                     <view class="left">
-                        <image class="order-img" src="{{item.photo}}"></image>
+                        <image class="order-img" src="{{item.products[0].photo}}"></image>
                         <view class="info">
                             <view class="name">{{item.text}}</view>
                             <!-- <view class="text">{{item.classify2}}</view> -->