diff --git a/common/http/interface.ts b/common/http/interface.ts
index 6c3be96..2d8510b 100644
--- a/common/http/interface.ts
+++ b/common/http/interface.ts
@@ -21,7 +21,7 @@ function httpRequest(url : string, method : any, data = {}, headerCustom = {}) {
const finalHeader = Object.assign({}, header, headerCustom);
uni.setStorageSync('baseURL', myconfig.base_url)
uni.request({
- url: myconfig.base_url + url, // 拼接基础URL和请求路径
+ url: url==='http://192.168.1.2:7000/v1/auth/login'?url:myconfig.base_url + url, // 拼接基础URL和请求路径
method: method,
data: data, // 如果是GET请求,data应该为null
header: finalHeader,
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 21132d5..f7c6a12 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -44,7 +44,7 @@ const onSubmit = () => {
'username':username.value,
'password':password.value,
}
- postAction('/v1/auth/login',data,{'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'}).then((res:any) => {
+ postAction('http://192.168.1.2:7000/v1/auth/login',data,{'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'}).then((res:any) => {
if (res.code === 200) {
const token = res.data;
localStorage.setItem("token", token);
diff --git a/pages/whiteEmbryo/w-level.vue b/pages/whiteEmbryo/w-level.vue
index 8ddfc0b..a68ba50 100644
--- a/pages/whiteEmbryo/w-level.vue
+++ b/pages/whiteEmbryo/w-level.vue
@@ -10,13 +10,15 @@ const level = ref('' as any)
const id= ref('' as any)
onMounted(()=>{
+ init()
+})
+const init =()=>{
getAction('/rawFabricLevels',{page:1,size:100}).then((res:any)=>{
if(res.code===200){
- list.value=res.data.recond
+ list.value=res.data.record
}
})
-})
-
+}
const onClickLeft = () =>{
history.back()
}
@@ -37,6 +39,7 @@ const submit =()=>{
if(res.code===200){
showPop.value=false
showToast('编辑成功!')
+ init()
}
})
}else{
@@ -44,6 +47,7 @@ const submit =()=>{
if(res.code===200){
showPop.value=false
showToast('提交成功!')
+ init()
}
})
}
@@ -53,6 +57,7 @@ const delItem = (item:any) =>{
deleteAction(url).then((res:any)=>{
if(res.code===200){
showToast('删除成功!')
+ init()
}
})
}
@@ -75,8 +80,8 @@ const delItem = (item:any) =>{
操作
- {{item.name}}
{{item.id}}
+ {{item.level}}
编辑 删除
diff --git a/pages/whiteEmbryo/w-suppliers.vue b/pages/whiteEmbryo/w-suppliers.vue
index 28f5fe5..f430b32 100644
--- a/pages/whiteEmbryo/w-suppliers.vue
+++ b/pages/whiteEmbryo/w-suppliers.vue
@@ -1,23 +1,65 @@
@@ -31,6 +73,18 @@ const submit =()=>{
@click-left="onClickLeft"
@click-right="onClickRight"
/>
+
+
+
+
+
编号
@@ -39,12 +93,12 @@ const submit =()=>{
操作
- {{item.name}}
{{item.id}}
+ {{item.name}}
{{item.id}}
编辑 删除
+ style="color: red" @click="del(item)">删除
@@ -65,9 +119,9 @@ const submit =()=>{
/>
-
- 启用
- 禁用
+
+ 启用
+ 禁用