Merge remote-tracking branch 'origin/release-201816-wcz' into release-201816-wcz

pages/mobile/order/index.vue

@@ -31,7 +31,7 @@
               <!--<span class="red">待发货</span>-->
               <span class="red" v-else-if="item.status === 602 || item.status === 603 || item.status === 315 || item.status === 604 || item.status === 605 || item.status === 606">订单已取消</span>
               <span class="red" v-else-if="item.status === 501 || item.status === 524">待买家付款</span>
-              <span class="red" v-else-if="item.status === 404 || item.status === 503">待买家收货</span>
+              <span class="red" v-else-if="item.status === 404">待买家收货</span>
               <span class="red" v-else-if="item.status === 405 || item.status === 514 || item.status === 503 || item.status === 506">待商城付款</span>
               <span class="red" v-else-if="item.status === 606">交易关闭</span>
               <span class="red" v-else-if="item.status === 520">交易完成</span>