Merge branch 'master-pro' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.1.4.0",
-    "versionCode" : 1140,
+    "versionName" : "1.1.4.2",
+    "versionCode" : 1142,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/groupMeal/orders/order-alist.vue

@@ -233,7 +233,11 @@ export default {
 				};
 				this.$http.get('/groupmeal/merchantPackageOrder/orderReady', {params}).then(res => {
 					if (res.data.code === 200) {
-						this.$tip.success(res.data.message);
+						// this.$tip.success(res.data.message);
+						uni.showToast({
+							icon:'success',
+							title:res.data.message
+						})
 						// 触发更新
 						this.isManaging = false;
 						this.currentStatusTab = 1;
@@ -242,7 +246,11 @@ export default {
 							this.$refs.listScroll.downCallback();
 						});
 					} else {
-						this.$tip.error(res.data.message);
+						// this.$tip.error(res.data.message);
+						uni.showToast({
+							icon:'error',
+							title:res.data.message
+						})
 					}
 				});
 			});