From dab9e65720dfdecde19a14b3635ac65e6ad764d6 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Mon, 27 Dec 2021 17:19:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/apis/role.js                              |  1 +
 .../components/Evaluated/EvaluatedNLCP.vue    |  4 +-
 .../project/components/Title/Title.vue        | 14 ++--
 src/pagesProject/project/project.vue          | 65 ++++++-------------
 .../transfer-page/transfer-page.vue           | 17 +++--
 src/store/project/getters.js                  |  8 +++
 src/utils/tall.js                             |  2 +-
 8 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac80ab1..76904b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -199,6 +199,7 @@
  - | 添加canvas | [9bc13c7](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/9bc13c7)
  - | 添加分享功能 | [b882484](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/b882484)
  - | 添加绑定WiFi | [c523022](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/c523022)
+ - | 添加长者信息提示 | [c30cdc2](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/c30cdc2)
  - | 监听时间基本点 | [033fca0](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/033fca0)
  - | 答题时记录做到第几题 | [547eb6e](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/547eb6e)
  - | 绘制canvas | [3c9d471](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/3c9d471)
diff --git a/src/apis/role.js b/src/apis/role.js
index d0cc264..f1fcc73 100644
--- a/src/apis/role.js
+++ b/src/apis/role.js
@@ -1,4 +1,5 @@
 const install = (Vue, vm) => {
+  console.log('uni.$t.domain: ', uni.$t.domain);
   vm.$u.api = { ...vm.$u.api } || {};
   //根据项目id查找角色
   vm.$u.api.findShowRole = param => vm.$u.post(`${uni.$t.domain}/role/show`, param);
diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
index e970769..3929d47 100644
--- a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
+++ b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
@@ -78,7 +78,9 @@ export default {
         .exec();
 
       this.cHeight = uni.upx2px(400);
-      this.getData();
+      setTimeout(() => {
+        this.getData();
+      }, 1000);
     });
   },
 
diff --git a/src/pagesProject/project/components/Title/Title.vue b/src/pagesProject/project/components/Title/Title.vue
index 957f788..cc5e867 100644
--- a/src/pagesProject/project/components/Title/Title.vue
+++ b/src/pagesProject/project/components/Title/Title.vue
@@ -4,7 +4,7 @@
     <!-- :is-back="false" -->
     <u-navbar :custom-back="onBack" class="overflow-hidden">
       <view class="flex justify-start flex-1 px-3 min-0 text-base">
-        <view class="truncate">{{ project.name }}</view>
+        <view class="truncate">{{ projectName }}</view>
       </view>
     </u-navbar>
     <!-- #endif -->
@@ -12,8 +12,8 @@
     <!-- #ifdef H5 -->
     <view class="overflow-hidden py-3">
       <view class="flex justify-start flex-1 px-3 min-0 text-base">
-        <u-icon name="arrow-left" @click="onBack" class="mr-3" size="40" />
-        <view class="truncate">{{ project.name }}</view>
+        <u-icon name="arrow-left" @click="openIndex" class="mr-3" size="40" />
+        <view class="truncate">{{ projectName }}</view>
       </view>
     </view>
     <!-- #endif -->
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { mapGetters, mapState } from 'vuex';
+import { mapGetters } from 'vuex';
 
 export default {
   name: 'ProjectTitle',
@@ -47,8 +47,8 @@ export default {
   },
 
   computed: {
-    ...mapState('project', ['project']),
     ...mapGetters('user', ['userId']),
+    ...mapGetters('project', ['projectName']),
   },
 
   methods: {
@@ -70,7 +70,8 @@ export default {
     // 点击返回按钮
     onBack() {
       // eslint-disable-next-line no-undef
-      uni.navigateBack();
+      // uni.navigateBack();
+      uni.reLaunch({ url: `/pages/index/index?u=${this.userId}` });
     },
 
     // LWBS提示
@@ -83,7 +84,6 @@ export default {
     },
     // 回到首页
     openIndex() {
-      console.log(111);
       uni.webView.reLaunch({ url: `/pages/index/index?u=${this.userId}` });
     },
 
diff --git a/src/pagesProject/project/project.vue b/src/pagesProject/project/project.vue
index 388d810..6c7e8b9 100644
--- a/src/pagesProject/project/project.vue
+++ b/src/pagesProject/project/project.vue
@@ -79,12 +79,9 @@ export default {
   },
 
   onLoad(options) {
-    console.log('AAA: ', options);
     this.templateCode = options.code;
     if (options.share && options.share === '1') {
-      console.log('0001');
       // TODO: 判断用户第一次进来才会显示引导页
-      console.log('options.code: ', options.code);
       this.queryGuide(options.code);
       this.shareInit(options);
     } else {
@@ -97,19 +94,11 @@ export default {
           }
         }, 300);
       } else {
-        console.log('0002');
-        this.shareWeixinInit(options);
         // TODO: 判断用户第一次进来才会显示引导页
-        // this.queryGuide(options.code);
-        // this.init(options);
+        this.queryGuide(options.code);
+        this.init(options);
       }
     }
-
-    // 分享
-    // wx.showShareMenu({
-    //   withShareTicket: true,
-    //   menus: ['shareAppMessage', 'shareTimeline'],
-    // });
   },
 
   watch: {
@@ -391,7 +380,6 @@ export default {
      * @param {object | null} options
      */
     async init(options) {
-      console.log('init options: ', options);
       if (!this.token) {
         // 不论有没有token都直接从userId获取token
         // token有过期时间 从本地获取可能是过期 干脆直接从userId获取
@@ -403,7 +391,11 @@ export default {
       }
 
       // 参数里有项目名称  就设置标题里的项目名称
-      options && options.pname && this.setProjectName(options.pname);
+      if (this.project && this.project.id) {
+        this.setProjectName(this.project.name);
+      } else {
+        options && options.pname && this.setProjectName(options.pname);
+      }
 
       if (!options || !options.p) {
         this.$t.ui.showToast('缺少项目信息参数'); // 没有项目id参数
@@ -442,23 +434,9 @@ export default {
 
     // 小程序进来的初始化
     async shareWeixinInit(options) {
-      console.log('小程序进来的初始化options: ', options);
       await this.getProjectById({ projectId: options.p, num: 0, templateCode: options.code }); // 根据项目id获取项目信息
       await this.queryGuide(options.code);
-      await this.queryFamilyIsMember(options.p);
-      const obj = {
-        p: options.p,
-        u: this.userId,
-        pname: options.pname,
-        code: options.code,
-      };
-      this.init(obj);
-      // let timer = null;
-      // timer = setInterval(() => {
-      //   if (!this.showGuide) {
-      //     clearInterval(timer);
-      //   }
-      // }, 300);
+      await this.queryFamilyIsMember(options.p, options);
     },
 
     /**
@@ -481,13 +459,10 @@ export default {
      */
     async getProjectById(params) {
       try {
-        console.log('项目params: ', params);
-        console.log('项目 api', uni.$u.api.findProjectById);
-        const data = await uni.$u.api.findProjectById(params);
-        console.log('项目信息: ', data);
+        const data = await this.$u.api.findProjectById(params);
         this.setProject(data);
       } catch (error) {
-        console.error('通过项目id获取项目信息 error: ', error || '获取项目信息失败');
+        console.error('通过项目id获取项目信息error: ', error || '获取项目信息失败');
       }
     },
 
@@ -565,7 +540,7 @@ export default {
         await this.$u.api.updateGuide(params);
         this.showGuide = false;
       } catch (error) {
-        console.log('error: ', error);
+        console.error('error: ', error);
       }
     },
 
@@ -573,26 +548,28 @@ export default {
      * 查询用户是否是项目成员
      * @param {string} projectId
      */
-    async queryFamilyIsMember(projectId) {
+    async queryFamilyIsMember(projectId, options) {
       try {
         const params = { projectId };
         const data = await this.$u.api.familyIsMember(params);
-        console.log('data: ', data);
         // 是 直接打开   否  询问是否成为家属
-        if (data.familyStatus === 2 && data.keyUserId) {
-          console.log('不是成员  询问是否成为家属');
+        if ((data.familyStatus === -1 || data.familyStatus === 2) && data.keyUserId) {
           const arr = [{ keyUserId: data.keyUserId, sex: data.sex, userName: data.userName }];
           this.setElderlyInfo(arr);
           this.showElder = true;
         }
         if (data.familyStatus === 1) {
-          console.log('是  直接打开');
+          const obj = {
+            p: options.p,
+            u: this.userId,
+            pname: options.pname,
+            code: options.code,
+          };
+          this.init(obj);
         }
         if (data.familyStatus === 0) {
-          console.log('申请已提交，返回首页');
-          this.transferContent = '家属申请已提交，请等待审核';
           // 申请成为家属
-          this.$t.page.openPage('/pagesYanyuan/transfer-page/transfer-page?type=jiashu');
+          this.$t.page.openPage('/pagesYanyuan/transfer-page/transfer-page?type=isjiashu');
         }
       } catch (error) {
         console.error('error: ', error);
diff --git a/src/pagesYanyuan/transfer-page/transfer-page.vue b/src/pagesYanyuan/transfer-page/transfer-page.vue
index 00a4ca7..af79e5a 100644
--- a/src/pagesYanyuan/transfer-page/transfer-page.vue
+++ b/src/pagesYanyuan/transfer-page/transfer-page.vue
@@ -21,23 +21,30 @@ export default {
       this.content = '工具箱已绑定';
     }
     if (options.type === 'jiashu') {
-      this.openApplyModal();
+      this.openApplyModal(1);
+    }
+    if (options.type === 'isjiashu') {
+      this.openApplyModal(0);
     }
   },
 
   mounted() {
     this.$nextTick(() => {
       setTimeout(() => {
-        uni.redirectTo({ url: '/pages/index/index' });
+        uni.reLaunch({ url: `/pages/index/index?u=${this.userId}` });
       }, 5000);
     });
   },
 
   methods: {
     // 申请成为家属弹框
-    async openApplyModal() {
-      await this.applyFamily();
-      this.content = this.transferContent;
+    async openApplyModal(type) {
+      if (type === 1) {
+        await this.applyFamily();
+        this.content = this.transferContent;
+      } else {
+        this.content = '家属申请已提交，请等待审核';
+      }
       this.timer = setInterval(() => {
         this.time--;
         if (this.time === 0) {
diff --git a/src/store/project/getters.js b/src/store/project/getters.js
index 39b22a7..8e86c42 100644
--- a/src/store/project/getters.js
+++ b/src/store/project/getters.js
@@ -6,6 +6,14 @@ const getters = {
   projectId({ project }) {
     return project.id;
   },
+
+  /**
+   * 当前项目的名字
+   * @param {object} project
+   */
+  projectName({ project }) {
+    return project.name;
+  },
 };
 
 export default getters;
diff --git a/src/utils/tall.js b/src/utils/tall.js
index 564dbf4..4ceddc6 100644
--- a/src/utils/tall.js
+++ b/src/utils/tall.js
@@ -23,7 +23,7 @@ const $t = {
   timeConfig, // 时间相关配置
   ui, // ui界面提示相关
   chooseAndUpload: upload.chooseAndUpload, // 选择并上传单个文件相关的封装
-  domain: `${gateway}/defaultwbs`,
+  domain: `${gateway}/yanyuan/v2.0`,
   cache, // 本地存储相关
   $q: cacheAndRequest,
   user, // 用户相关配置