diff --git a/apis/http.js b/apis/http.js
index e047f60..fb31fda 100644
--- a/apis/http.js
+++ b/apis/http.js
@@ -10,7 +10,7 @@ class HttpConfig {
// baseUrl = "http://112.29.103.165:21626"
// baseUrl = "http://172.20.10.3:8080"
// baseUrl = "http://10.40.92.8:8080"
- // baseUrl = "http://192.168.0.96:28080"
+ // baseUrl = "http://192.168.0.96:18080"
// baseUrl = "http://10.40.92.78:28080"
// baseUrl = "http://192.168.2.127:28080"
// baseUrl = "https://z.csgmall.com.cn/gl"
@@ -170,7 +170,7 @@ class HttpConfig {
},
preCrashExam: {
fetchPreCrashList: "/scrap/getScrapApplyList", //获取预报废审核列表
- fetchPreCrashDetail: "/scrap/getScrapRefuseList", //获取预报废审核列表详情
+ fetchPreCrashDetail: "/scrap/getScrapAuditList", //获取预报废审核列表详情
submitPreExam: "/scrap/forecastWasteAudit", //提交审核
},
preCrashList: {
diff --git a/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue b/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue
index acebb05..ce92c9e 100644
--- a/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue
+++ b/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue
@@ -23,10 +23,10 @@
-->
- {{ fetch.createBy == null ? '' : fetch.createBy.slice(0, 1) }}
+ {{ fetch.applyFor == null ? '' : fetch.applyFor.slice(0, 1) }}
- {{ fetch.createBy }}
+ {{ fetch.applyFor }}
{{ fetch.phoneNumber }}
diff --git a/pages/newInStore/newInStore.vue b/pages/newInStore/newInStore.vue
index 62caa36..6490c1c 100644
--- a/pages/newInStore/newInStore.vue
+++ b/pages/newInStore/newInStore.vue
@@ -16,10 +16,10 @@
-->
- {{ fetch.purchaserName == null ? '' : fetch.purchaserName.slice(0, 1) }}
+ {{ fetch.inputUser == null ? '' : fetch.inputUser.slice(0, 1) }}
- {{ fetch.purchaserName }}
+ {{ fetch.inputUser }}
diff --git a/pages/orderCart/orderCart.vue b/pages/orderCart/orderCart.vue
index 184a4fc..df5ca6f 100644
--- a/pages/orderCart/orderCart.vue
+++ b/pages/orderCart/orderCart.vue
@@ -370,6 +370,8 @@ import { basePath } from '../../public';
}
})
}
+ }).catch(() => {
+ that.btnDisabled = false
})
}
},
diff --git a/pages/preCrashExamDetail/preCrashExamDetail.vue b/pages/preCrashExamDetail/preCrashExamDetail.vue
index 45b1ff0..0e52c9d 100644
--- a/pages/preCrashExamDetail/preCrashExamDetail.vue
+++ b/pages/preCrashExamDetail/preCrashExamDetail.vue
@@ -158,7 +158,7 @@
item.checked = false;
});
that.preDetailList = res.data.rows;
- console.log(that.preDetailList);
+ console.log('🚀 ~ .then ~ that.preDetailList:', that.preDetailList)
}
})
.catch((err) => {
@@ -290,6 +290,7 @@
}
});
}
+ console.log('🚀 ~ this.preDetailList.map ~ this.preDetailList:', this.preDetailList)
},
clickPass() {
let that = this;
@@ -353,6 +354,7 @@
},
},
onLoad(params) {
+ console.log('🚀 ~ onLoad ~ params:', params)
this.showBtn = params.showBtn;
this.taskId = params.taskId;
},