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

pages/groupMeal/goods/form-step1.vue

@@ -292,7 +292,7 @@ export default {
 		},
 		// 编辑数据
 		getData() {
-			this.$http.get('/groupmeal/gmCustomerPackage/queryById', { params: { id: this.query.id } }).then(res => {
+			this.$http.get('/groupmeal/gmCustomerPackage/mer/queryById', { params: { id: this.query.id } }).then(res => {
 				if (res.data.code === 200) {
 					let data = res.data.result;
 					// 查找商品分类名称

pages/groupMeal/goods/list.vue

@@ -335,7 +335,7 @@ export default {
 		editGoods(goods) {
 			this.isManaging = false;
 			uni.navigateTo({
-				url: '/pages/groupMeal/goods/form?id=' + goods.id
+				url: '/pages/groupMeal/goods/form-step1?id=' + goods.id
 			});
 		},
 		// 单选