From fd87fc83fb54bb250435aeab07aad1c403133fda Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Mon, 3 Jun 2024 18:00:50 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=20=E4=BB=8E=E4=B8=9A?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=A6=BB=E5=B2=97=E5=90=8E=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/application/safetymeeting/home.vue      |  1 +
 .../safetymeeting/safetymeeting-detail.vue    |  3 +-
 pages/basics/basic-info/home.vue              | 32 ++++++++++++++++---
 pages/basics/basic-info/user-info.vue         |  2 --
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/pages/application/safetymeeting/home.vue b/pages/application/safetymeeting/home.vue
index 61376da..23002be 100644
--- a/pages/application/safetymeeting/home.vue
+++ b/pages/application/safetymeeting/home.vue
@@ -222,6 +222,7 @@
 					},
 					success: (res) => {
 						uni.hideLoading(); //结束加载中动画
+            console.log(res.data)
 						if (res.data != null) {
 							_this.totalPage = res.data.page.totalPage;
 							if (_this.list.length == 0) {
diff --git a/pages/application/safetymeeting/safetymeeting-detail.vue b/pages/application/safetymeeting/safetymeeting-detail.vue
index ef1b3f2..587ea69 100644
--- a/pages/application/safetymeeting/safetymeeting-detail.vue
+++ b/pages/application/safetymeeting/safetymeeting-detail.vue
@@ -262,7 +262,8 @@
               type: 'gcj02',
               geocode: true,
               success: function (locationRes) {
-                const locationAddress = `${locationRes.address.province}${locationRes.address.city}${locationRes.address.district}${locationRes.address.street}${locationRes.address.streetNum}${locationRes.address.poiName}`;
+                let locationAddress = `${locationRes.address.province}${locationRes.address.city}${locationRes.address.district}${locationRes.address.street}${locationRes.address.streetNum}${locationRes.address.poiName}`;
+                locationAddress = locationAddress.replace(/undefined/g,'')
                 // 创建画布
                 const ctx = uni.createCanvasContext('watermarkCanvas', _this);
                 ctx.drawImage(tempFilePath, 0, 0, 300, 150); // 图片大小
diff --git a/pages/basics/basic-info/home.vue b/pages/basics/basic-info/home.vue
index 1c15b4c..e95460e 100644
--- a/pages/basics/basic-info/home.vue
+++ b/pages/basics/basic-info/home.vue
@@ -42,10 +42,10 @@
 </template>
 
 <script>
-	import {
-		basePath,
-    loginUser
-	} from '@/common/tool.js';
+import {
+  basePath, corpinfoId,
+  loginUser
+} from '@/common/tool.js';
   import ykAuthpup from "@/components/yk-authpup/yk-authpup"
 	export default {
     components: {
@@ -88,7 +88,29 @@
             uni.hideLoading();
             if (res.data.pd) {  //已有申请
               _this.pd = res.data.pd;
-              console.log("222",_this.pd)
+            }
+          }
+        });
+        this.getUserStatus();
+      },
+      getUserStatus() {
+        var _this = this;
+        uni.request({
+          url: basePath + '/app/user/getUserStatus',
+          method: 'POST',
+          dataType: 'json',
+          header: {
+            'Content-type': 'application/x-www-form-urlencoded'
+          },
+          data: {
+            USER_ID: loginUser.USER_ID,
+            CORPINFO_ID: corpinfoId,
+            ISDELETE: '0',
+          },
+          success: (res) => {
+            if (res.data.pd) {
+              _this.pd = res.data.pd;
+              this.pd.APPLY_TYPE = _this.pd.APPLY_TYPE
             }
           }
         });
diff --git a/pages/basics/basic-info/user-info.vue b/pages/basics/basic-info/user-info.vue
index 9740c35..4c4bc49 100644
--- a/pages/basics/basic-info/user-info.vue
+++ b/pages/basics/basic-info/user-info.vue
@@ -277,7 +277,6 @@ import Apply from "./components/apply.vue"
                   _this.form.QUALIFICATION_CERTIFICATE_CATEGORY = item.ALLOW_QUALIFICATION ? item.ALLOW_QUALIFICATION.split(',') : []
                 }
               })
-              console.log("111",this.applyType)
 						} else {
 							uni.showToast({
 								title: res.data.message,
@@ -292,7 +291,6 @@ import Apply from "./components/apply.vue"
         this.TabCur = tabCur
       },
       goEdit(e){
-        console.log(e)
         this.forbidEdit = false
         this.colorValue = '#000000'
       },