修复问题

components/cancelPrompt/cancelPrompt.vue

@@ -228,7 +228,7 @@ export default {
             this.$emit('cancel')
         },
         confirm(){
-			let that = this 
+			let that = this
 			if(this.submitCancel) return
             that.submitCancel = true
 			that.apipost(

pages/AggregateOrders/AggregateOrdersSearch.vue

@@ -119,7 +119,7 @@
 </template>
 
 <script>
-	import {mappingListType,transProductEnum} from "../../utils/producttypeenum";
+	import {mappingListType,mappingListTypeTy} from "../../utils/producttypeenum";
 	import EnumHelper from '../../utils/enumhelper';
 	import OrderStatusEnum from '../../utils/orderStautsEnum';
 	import AggOrdSearch from "./components/searchHeader.vue";
@@ -278,7 +278,12 @@
 					res => {
 						if (res.resultCode == 1) {
 							res.data.pageData.forEach(x=>{
+								// #ifdef MP-DI 
 								x.goodTypeEnum = mappingListType(x.goodsType)
+								// #endif
+								// #ifdef MP-AG 
+								x.goodTypeEnum = mappingListTypeTy(x.goodsType)
+								// #endif
 								x.orderStatusInfo = EnumHelper.ParseToEnum(OrderStatusEnum,x.orderStatus,'value')
 							})
 							this.g = this.g.concat(res.data.pageData);