Browse Source

修改获取租户id

yangg 2 months ago
parent
commit
0eec1543c3

+ 7 - 2
pages/camera/camera.vue

@@ -178,7 +178,12 @@
 			async fetchInterviewList() {
 				try {
 					this.loading = true;
-					const res = await getQuestions({position_id:JSON.parse(uni.getStorageSync('selectedJob')).id,page:1,limit:999,tenant_id:1});
+					const res = await getQuestions({
+						position_id:JSON.parse(uni.getStorageSync('selectedJob')).id,
+						page:1,
+						limit:999,
+						tenant_id:JSON.parse(uni.getStorageSync('userInfo')).tenant_id || 1
+					});
 					console.log(res.items);
 										// 使用第一个面试
 					this.interviewId = res.items//[0].id;
@@ -558,7 +563,7 @@
 						// answer_content: answerContent,
 						answer_options: answerOptions, 
 						answer_duration: this.currentAnswer.answerDuration || 0,
-						tenant_id: 1
+						tenant_id:JSON.parse(uni.getStorageSync('userInfo')).tenant_id || 1
 					};
 					
 					console.log('提交数据:', submitData);

+ 2 - 2
pages/face-photo/face-photo.vue

@@ -219,7 +219,7 @@ export default {
     uploadMedia(callback) {
       // 获取openid和tenant_id,可以从缓存或全局状态获取
       const openid = JSON.parse(uni.getStorageSync('userInfo')).openid || '';
-      const tenant_id = 1 || '';
+      const tenant_id =JSON.parse(uni.getStorageSync('userInfo')).tenant_id || 1;
       
       if (!openid || !tenant_id) {
         uni.hideLoading();
@@ -270,7 +270,7 @@ export default {
     // 提交照片URL到指定接口 - 修改为直接上传文件
     submitPhotoUrl() {
       const openid = JSON.parse(uni.getStorageSync('userInfo')).openid || '';
-      const tenant_id = 1 || '';
+      const tenant_id =JSON.parse(uni.getStorageSync('userInfo')).tenant_id || 1;
       
       if (!this.mediaSource) {
         uni.hideLoading();

+ 4 - 4
pages/identity-verify/identity-verify.vue

@@ -1642,7 +1642,7 @@ export default {
       // 获取用户信息
       const userInfo = uni.getStorageSync('userInfo');
       const openid = userInfo ? (JSON.parse(userInfo).openid || '') : '';
-      const tenant_id = uni.getStorageSync('tenant_id') || '1';
+      const tenant_id = JSON.parse(uni.getStorageSync('userInfo')).tenant_id || '1';
       
       // 创建FormData
       const formData = new FormData();
@@ -1717,7 +1717,7 @@ export default {
       // 获取用户信息
       const userInfo = uni.getStorageSync('userInfo');
       const openid = userInfo ? (JSON.parse(userInfo).openid || '') : '';
-      const tenant_id = uni.getStorageSync('tenant_id') || '1';
+      const tenant_id = JSON.parse(uni.getStorageSync('userInfo')).tenant_id || '1';
       
       // 创建上传任务
       const uploadTask = uni.uploadFile({
@@ -1846,7 +1846,7 @@ export default {
         application_id: uni.getStorageSync('appId'),
         question_id: questionId,
         video_url: videoUrl,
-        tenant_id: uni.getStorageSync('tenant_id') || '1'
+        tenant_id: JSON.parse(uni.getStorageSync('userInfo')).tenant_id || '1'
       };
       
       console.log('提交面试请求参数:', requestData);
@@ -2536,7 +2536,7 @@ export default {
       this.loading = true;
       
       // 获取tenant_id,如果没有则使用默认值1
-      const tenant_id = uni.getStorageSync('tenant_id') || '1';
+      const tenant_id = JSON.parse(uni.getStorageSync('userInfo')).tenant_id || '1';
       
       // 获取当前选择的职位ID
       let position_id = 1; // 默认值

+ 7 - 2
unpackage/dist/dev/mp-weixin/pages/camera/camera.js

@@ -80,7 +80,12 @@ const _sfc_main = {
     async fetchInterviewList() {
       try {
         this.loading = true;
-        const res2 = await api_user.getQuestions({ position_id: JSON.parse(common_vendor.index.getStorageSync("selectedJob")).id, page: 1, limit: 999, tenant_id: 1 });
+        const res2 = await api_user.getQuestions({
+          position_id: JSON.parse(common_vendor.index.getStorageSync("selectedJob")).id,
+          page: 1,
+          limit: 999,
+          tenant_id: JSON.parse(common_vendor.index.getStorageSync("userInfo")).tenant_id || 1
+        });
         console.log(res2.items);
         this.interviewId = res2.items;
         this.fetchInterviewData(res2.items);
@@ -365,7 +370,7 @@ const _sfc_main = {
           // answer_content: answerContent,
           answer_options: answerOptions,
           answer_duration: this.currentAnswer.answerDuration || 0,
-          tenant_id: 1
+          tenant_id: JSON.parse(common_vendor.index.getStorageSync("userInfo")).tenant_id || 1
         };
         console.log("提交数据:", submitData);
         const res2 = await this.$http.post(`${common_config.apiBaseUrl}/api/job/submit_answer`, submitData);

+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/face-photo/face-photo.js

@@ -158,7 +158,7 @@ const _sfc_main = {
     // 上传媒体文件方法 - 不再使用
     uploadMedia(callback) {
       const openid = JSON.parse(common_vendor.index.getStorageSync("userInfo")).openid || "";
-      const tenant_id = 1;
+      const tenant_id = JSON.parse(common_vendor.index.getStorageSync("userInfo")).tenant_id || 1;
       if (!openid || !tenant_id) {
         common_vendor.index.hideLoading();
         common_vendor.index.showToast({
@@ -203,7 +203,7 @@ const _sfc_main = {
     // 提交照片URL到指定接口 - 修改为直接上传文件
     submitPhotoUrl() {
       const openid = JSON.parse(common_vendor.index.getStorageSync("userInfo")).openid || "";
-      const tenant_id = 1;
+      const tenant_id = JSON.parse(common_vendor.index.getStorageSync("userInfo")).tenant_id || 1;
       if (!this.mediaSource) {
         common_vendor.index.hideLoading();
         common_vendor.index.showToast({

+ 4 - 4
unpackage/dist/dev/mp-weixin/pages/identity-verify/identity-verify.js

@@ -1095,7 +1095,7 @@ const _sfc_main = {
     uploadFileWithXHR(task) {
       const userInfo = common_vendor.index.getStorageSync("userInfo");
       const openid = userInfo ? JSON.parse(userInfo).openid || "" : "";
-      const tenant_id = common_vendor.index.getStorageSync("tenant_id") || "1";
+      const tenant_id = JSON.parse(common_vendor.index.getStorageSync("userInfo")).tenant_id || "1";
       const formData = new FormData();
       formData.append("file", task.file);
       formData.append("openid", openid);
@@ -1150,7 +1150,7 @@ const _sfc_main = {
     uploadFileWithUni(task) {
       const userInfo = common_vendor.index.getStorageSync("userInfo");
       const openid = userInfo ? JSON.parse(userInfo).openid || "" : "";
-      const tenant_id = common_vendor.index.getStorageSync("tenant_id") || "1";
+      const tenant_id = JSON.parse(common_vendor.index.getStorageSync("userInfo")).tenant_id || "1";
       const uploadTask = common_vendor.index.uploadFile({
         url: `${common_config.apiBaseUrl}/api/upload/`,
         filePath: task.file,
@@ -1243,7 +1243,7 @@ const _sfc_main = {
         application_id: common_vendor.index.getStorageSync("appId"),
         question_id: questionId,
         video_url: videoUrl,
-        tenant_id: common_vendor.index.getStorageSync("tenant_id") || "1"
+        tenant_id: JSON.parse(common_vendor.index.getStorageSync("userInfo")).tenant_id || "1"
       };
       console.log("提交面试请求参数:", requestData);
       common_vendor.index.request({
@@ -1730,7 +1730,7 @@ const _sfc_main = {
     // 添加获取问题数据的方法
     fetchQuestions() {
       this.loading = true;
-      const tenant_id = common_vendor.index.getStorageSync("tenant_id") || "1";
+      const tenant_id = JSON.parse(common_vendor.index.getStorageSync("userInfo")).tenant_id || "1";
       let position_id = 1;
       try {
         const selectedJob = JSON.parse(common_vendor.index.getStorageSync("selectedJob") || "{}");