diff --git a/pages/mainme/mainmeinfo.vue b/pages/mainme/mainmeinfo.vue
index 547bdca9eff1fd7eb424f4ba42feb7fddf18a726..f92a03393267acb7caaaf940ce6c4e855a264109 100644
--- a/pages/mainme/mainmeinfo.vue
+++ b/pages/mainme/mainmeinfo.vue
@@ -68,8 +68,8 @@
-
-
+
+
@@ -118,6 +118,7 @@
return {
//进入类型
operType: 'get',
+ saveLoading:false,
//Popup
popupTitle: '',
popupColumn: '',
@@ -271,6 +272,7 @@
delete _self.userinfo.status
delete _self.userinfo.permission
console.log(_self.userinfo);
+ _self.saveLoading=true;
// return
this.$myCloud
.callFunction({
@@ -282,6 +284,7 @@
})
.then(res => {
uni.hideLoading()
+ _self.saveLoading=false;
console.log(res);
if (res.result.success) {
uni.showToast({
@@ -309,6 +312,7 @@
})
.catch(err => {
uni.hideLoading()
+ _self.saveLoading=false;
console.error(err)
})
},
diff --git a/pages/mainuser_oper/mainuserinfo.vue b/pages/mainuser_oper/mainuserinfo.vue
index 865c4a8235494056869c5923fbc2907959a46896..683fe0c7bc4e51e9891a8a4eebc72803051f7184 100644
--- a/pages/mainuser_oper/mainuserinfo.vue
+++ b/pages/mainuser_oper/mainuserinfo.vue
@@ -87,14 +87,14 @@
-
+
-
+
+
+
@@ -129,6 +129,7 @@
return {
//进入类型
operType: 'add',
+ saveLoading:false,
//Popup
popupTitle: '',
popupColumn: '',
@@ -414,6 +415,7 @@
console.log(_self.userinfo);
}
_self.userinfo.power = _self.qxList;
+ _self.saveLoading=true;
// return
this.$myCloud
.callFunction({
@@ -425,6 +427,7 @@
})
.then(res => {
uni.hideLoading()
+ _self.saveLoading=false;
console.log(res);
if (res.result.success) {
uni.showToast({
@@ -455,6 +458,7 @@
})
.catch(err => {
uni.hideLoading()
+ _self.saveLoading=false;
console.error(err)
})
},
@@ -782,6 +786,8 @@
justify-content: center;
width: 22vw;
height: 10vw;
+ margin: 0px;
+ padding: 0px;
border-radius: 1vw;
border: 1rpx solid #BEBEBE;
background: #F1F1F1;
diff --git a/pages/mater_oper/materInfo.vue b/pages/mater_oper/materInfo.vue
index ecc748197032c18d6d8ee8a7df26b5910dfef414..29e78b9ae182b7c9fe48fcc70acf6b2a89a4ee79 100644
--- a/pages/mater_oper/materInfo.vue
+++ b/pages/mater_oper/materInfo.vue
@@ -155,14 +155,15 @@
-
+
-
+
+
+
+
@@ -202,6 +203,8 @@
imgSrc: '../../static/logo.png',
//请求类型
operType: 'add',
+ saveLoading:false,
+
//==
page_type:1, //1入库 //2出库 page_typeTitle[page_type]
page_typeTitle:['入库','发放'],
@@ -452,7 +455,7 @@
uni.showLoading({
title: '数据上传中...'
})
-
+ _self.saveLoading=true;
//==AAA
let promiseArr = []
_self.grant.fj_imgTemp.forEach((item, index) => {
@@ -485,6 +488,7 @@
})
.then(res => {
uni.hideLoading()
+ _self.saveLoading=false;
if (res.result.success) {
uni.removeStorageSync("materials_save")
uni.showToast({
@@ -1042,6 +1046,8 @@
justify-content: center;
width: 28vw;
height: 10vw;
+ margin: 0px;
+ padding: 0px;
border-radius: 1vw;
border: 1rpx solid #BEBEBE;
background: #F1F1F1;
diff --git a/pages/materialtype_oper/materialtypeInfo.vue b/pages/materialtype_oper/materialtypeInfo.vue
index 2caaa9d9931e95337de80041996a61f6b1ec8202..867455f5de076bf08a81f3a7620387ef026d4dd7 100644
--- a/pages/materialtype_oper/materialtypeInfo.vue
+++ b/pages/materialtype_oper/materialtypeInfo.vue
@@ -15,14 +15,14 @@
-
+
-
+
+
+
@@ -47,6 +47,8 @@
operType: 'add',
//Popup
popupTitle: '',
+ saveLoading:false,
+
popupColumn: '',
popupValue: '',
//基本信息
@@ -156,6 +158,7 @@
});
return
}
+ _self.saveLoading=true;
this.$myCloud
.callFunction({
name: 'materialtype_oper',
@@ -166,6 +169,7 @@
})
.then(res => {
uni.hideLoading()
+ _self.saveLoading=false;
console.log(res);
if (res.result.success) {
uni.showToast({
@@ -196,6 +200,7 @@
})
.catch(err => {
uni.hideLoading()
+ _self.saveLoading=false;
console.error(err)
})
},
@@ -290,6 +295,8 @@
justify-content: center;
width: 22vw;
height: 10vw;
+ margin: 0px;
+ padding:0px;
border-radius: 1vw;
border: 1rpx solid #BEBEBE;
background: #F1F1F1;
diff --git a/pages/matermodel_oper/matermodelInfo.vue b/pages/matermodel_oper/matermodelInfo.vue
index c6a8ef603266eade59010d1002d2a7b307c9c057..947ed2807513dbdff9dc32d4ed4fb585bf033f23 100644
--- a/pages/matermodel_oper/matermodelInfo.vue
+++ b/pages/matermodel_oper/matermodelInfo.vue
@@ -45,14 +45,14 @@
-
+
-
+
+
+
@@ -571,6 +571,8 @@
justify-content: center;
width: 22vw;
height: 10vw;
+ margin:0px;
+ padding:0px;
border-radius: 1vw;
border: 1rpx solid #BEBEBE;
background: #F1F1F1;
diff --git a/pages/mecompany_oper/mecompanyInfo.vue b/pages/mecompany_oper/mecompanyInfo.vue
index a4f9352e95b68079c79b59940b65ed2db9228598..8ccaef23f5b8684558f4953e2da78ceeb98470dc 100644
--- a/pages/mecompany_oper/mecompanyInfo.vue
+++ b/pages/mecompany_oper/mecompanyInfo.vue
@@ -17,14 +17,14 @@
-
+
-
+
+
+
@@ -47,6 +47,7 @@
return {
//进入类型
operType: 'add',
+ saveLoading:false,
//Popup
popupTitle: '',
popupColumn: '',
@@ -202,6 +203,7 @@
});
return
}
+ _self.saveLoading=true;
this.$myCloud
.callFunction({
name: 'mecompany_oper',
@@ -211,6 +213,7 @@
}
})
.then(res => {
+ _self.saveLoading=false;
uni.hideLoading()
console.log(res);
if (res.result.success) {
@@ -242,6 +245,7 @@
})
.catch(err => {
uni.hideLoading()
+ _self.saveLoading=false;
console.error(err)
})
},
@@ -348,6 +352,8 @@
justify-content: center;
width: 22vw;
height: 10vw;
+ margin: 0px;
+ padding: 0px;
border-radius: 1vw;
border: 1rpx solid #BEBEBE;
background: #F1F1F1;
diff --git a/pages/medepartment_oper/medepartmentInfo.vue b/pages/medepartment_oper/medepartmentInfo.vue
index 5b280ea59f87f0abb629d566eac7fe2d668b8aeb..1dddf2223d93bb0b60070941b0626ca6fa755568 100644
--- a/pages/medepartment_oper/medepartmentInfo.vue
+++ b/pages/medepartment_oper/medepartmentInfo.vue
@@ -27,14 +27,14 @@
-
+
-
+
+
+
@@ -57,6 +57,7 @@
return {
//进入类型
operType: 'add',
+ saveLoading:false,
//Popup
popupTitle: '',
popupColumn: '',
@@ -248,6 +249,7 @@
});
return
}
+ _self.saveLoading=true;
this.$myCloud
.callFunction({
name: 'medepartment_oper',
@@ -257,6 +259,7 @@
}
})
.then(res => {
+ _self.saveLoading=false;
uni.hideLoading()
console.log(res);
if (res.result.success) {
@@ -288,6 +291,7 @@
})
.catch(err => {
uni.hideLoading()
+ _self.saveLoading=false;
console.error(err)
})
},
@@ -398,6 +402,8 @@
justify-content: center;
width: 22vw;
height: 10vw;
+ margin: 0px;
+ padding:0px;
border-radius: 1vw;
border: 1rpx solid #BEBEBE;
background: #F1F1F1;