heyang hace 1 año
padre
commit
bd77b67e2c

+ 1 - 1
pages/login.vue

@@ -157,7 +157,7 @@ export default {
       if(data.code == 200){
         uni.setStorageSync('token','Bearer '+data.data.access_token);
         uni.setStorageSync('userId',data.data.user_id);
-		tenantId:uni.getStorageSync('tenantId'),//0 系统 1化学与材料学院 2环境气候研究院
+		uni.setStorageSync('tenantId',data.data.tenantId);//0 系统 1化学与材料学院 2环境气候研究院
         this.getOpenId();//获取openid
         if(data.data.type == "00" ||data.data.type == "11"){//管理端
           uni.setStorageSync('userType',"1");

+ 14 - 4
pages/manageWorkbench.vue

@@ -438,10 +438,20 @@ export default {
         uni.navigateTo({
           url: '/pages_manage/gradingControl/gradingControl',//分级管控
         });
-      }else if(type == 'gas' && this.tenantId!=1){//气瓶管理
-        uni.navigateTo({
-          url: '/pages_manage/gasManage/gasManage',
-        });
+      }else if(type == 'gas'){//气瓶管理
+		if(this.tenantId==1){
+			uni.showToast({
+			  title: '暂未开放',
+			  icon:"none",
+			  mask:true,
+			  duration: 2000
+			});
+		}else{
+			uni.navigateTo({
+			  url: '/pages_manage/gasManage/gasManage',
+			});
+		}
+        
       }else if(type == 'none'){
         uni.showToast({
           title: '暂未开放',

+ 14 - 4
pages/studentWorkbench.vue

@@ -196,10 +196,20 @@ export default {
         uni.navigateTo({
           url: '/pages_manage/workbench/problemRectification/rectifyList',//安全检查
         });
-      }else if(type == 'gas'  && this.tenantId!=1){//气瓶管理
-        uni.navigateTo({
-          url: '/pages_student/gasManage/gasManage',
-        });
+      }else if(type == 'gas'){//气瓶管理
+        
+		if(this.tenantId==1){
+			uni.showToast({
+			  title: '暂未开放',
+			  icon:"none",
+			  mask:true,
+			  duration: 2000
+			});
+		}else{
+			uni.navigateTo({
+			  url: '/pages_student/gasManage/gasManage',
+			});
+		}
       }else if(type == 'none'){
 		  uni.showToast({
 		    title: '暂未开放',

+ 1 - 1
pages_manage/workbench/receiveCasuallyPat/casuallyPatInfo.vue

@@ -177,7 +177,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',