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

package2/shop/merchantCenter.vue

@@ -426,9 +426,12 @@
 												if (res.code == 200) {
 													that.tui.toast("核销成功",1500)
 												} else {
-													that.tui.toast(res.message)
+													uni.showModal({
+														title: '提示',
+														content: res.message,
+														showCancel:false
+													});
 												}
-												//
 											}).catch((res) => {})
 										}
 									}

pages/index/index.vue

@@ -319,7 +319,7 @@
 							</view>
 						</view>
 						
-					<view class="delivery-list-wrap">
+						<view class="delivery-list-wrap">
 
 							<view class="empty-delivery" v-if="deliveryItem.length <= 0">
 								<view class="empty-delivery-icon">校园</view>