Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

package2/shop/merchantCenter.vue

@@ -36,7 +36,7 @@
 							0
 						</view>
 						<view class="order55">
-							待接单
+							待出餐
 						</view>
 					</view>
 					<view class="order33" @tap="goDetail('db',4)">
@@ -70,15 +70,7 @@
 							0
 						</view>
 						<view class="order55">
-							待退款
-						</view>
-					</view>
-					<view class="order33" @tap="goDetail('db',11)">
-						<view class="order44">
-							0
-						</view>
-						<view class="order55">
-							待售后
+							待退款/售后
 						</view>
 					</view>
 					<view class="order33" @tap="goDetail('pj')">