From ae3675b1ebbdac08e899e2763535c5d376c18c6a Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Wed, 10 Nov 2021 14:33:20 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 ++-
 src/apis/project.js                           |  2 +-
 src/components/Globals/Globals.vue            | 21 +++++++++++++++---
 src/components/TimeLine/component/TimeBox.vue |  7 +++++-
 src/main.js                                   | 10 ++++-----
 src/pages/project/project.vue                 | 22 +++++++++----------
 6 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f3897d..98aecef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-09-28)
+# 0.1.0 (2021-11-10)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -158,6 +158,7 @@
  - | 添加页面返回功能 解决角色滚动bug | 87ce0f7
  - | 跳转详情页返回路径修改 | c5e17c0
  - | 下拉加载定期任务传参，时间格式化修改 | 0b95a0e
+ - | 修复日常任务面板内容显示不全的问题 | 053be5b
  - | 修改报错 | 531c14d
  - | 修改定期任务状态0和4时不加载圆圈 | 30e352f
  - | 修改角色栏组件 | a54c601
diff --git a/src/apis/project.js b/src/apis/project.js
index fd893a0..e50a43e 100644
--- a/src/apis/project.js
+++ b/src/apis/project.js
@@ -10,7 +10,7 @@ const install = (Vue, vm) => {
   vm.$u.api.clickShare = param => vm.$u.post(`${uni.$t.domain}/share/click`, param);
 
   //查询医院是否填写了调查问卷
-  vm.$u.api.queryNotWrite = param => vm.$u.post(`${uni.$t.domain}/questionnaire/queryNotWrite`, param);
+  // vm.$u.api.queryNotWrite = param => vm.$u.post(`${uni.$t.domain}/questionnaire/queryNotWrite`, param);
 };
 
 export default { install };
diff --git a/src/components/Globals/Globals.vue b/src/components/Globals/Globals.vue
index a2af6da..3278dd1 100644
--- a/src/components/Globals/Globals.vue
+++ b/src/components/Globals/Globals.vue
@@ -1,9 +1,16 @@
 <template>
-  <view class="m-2" v-if="globals && globals.length">
-    <u-card @click="openCard" :show-foot="false" :show-head="false" style="max-height: 340rpx" border-radius="25" margin="0">
+  <view class="m-2" v-show="globals && globals.length">
+    <u-card
+      @click="openCard"
+      :show-foot="false"
+      :show-head="false"
+      :style="{ 'max-height': globalsHeight + 'px' }"
+      border-radius="25"
+      margin="0"
+    >
       <!-- :style="{ 'max-height': isShrink ? '106rpx' : '340rpx' }" -->
       <view slot="body">
-        <scroll-view :scrollY="true" style="max-height: 280rpx">
+        <scroll-view :scrollY="true" :style="{ 'max-height': globalsHeight - 30 + 'px' }">
           <!-- <scroll-view :scrollY="true" :style="{ 'max-height': isShrink ? '50rpx' : '280rpx' }"> -->
           <skeleton :banner="false" :loading="!globals.length" :row="4" animate class="u-line-2 skeleton"></skeleton>
           <view class="grid gap-2">
@@ -36,6 +43,8 @@
 import { mapGetters, mapMutations, mapState } from 'vuex';
 import Skeleton from '@/components/Skeleton/Skeleton';
 
+const sysHeight = uni.getSystemInfoSync().screenHeight;
+
 export default {
   name: 'Global',
   components: { Skeleton },
@@ -44,12 +53,18 @@ export default {
     return {
       // loading: true,
       task: null,
+      sysHeight: sysHeight,
     };
   },
 
   computed: {
     ...mapState('task', ['isShrink']),
     ...mapGetters('task', ['globals']),
+
+    globalsHeight: function () {
+      let h = ((this.sysHeight - 44 - 30 - 10) / 5) * 4;
+      return h;
+    },
   },
 
   methods: {
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index 9ce1ac0..409ef6d 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="column">
+  <view class="column" v-finger:pinch="pinchHandler">
     <!-- v-if="tasks && tasks.length" -->
     <view>
       <view :key="task.id" v-for="task in tasks" :id="`a${task.id}`">
@@ -113,6 +113,11 @@ export default {
       this.$t.storage.setStorageSync('taskId', taskId);
       this.$t.storage.setStorageSync('roleId', this.roleId);
     },
+
+    pinchHandler(evt) {
+      //evt.scale代表两个手指缩放的比例
+      console.log('缩放：' + evt.zoom);
+    },
   },
 };
 </script>
diff --git a/src/main.js b/src/main.js
index 5fa4fac..a645b5a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,3 +1,7 @@
+//#ifdef H5
+// import './registerServiceWorker';
+import AlloyFinger from 'alloyfinger';
+import AlloyFingerPlugin from 'alloyfinger/vue/alloy_finger_vue';
 import App from './App';
 import Tall from '@/utils/tall';
 import Vue from 'vue';
@@ -13,11 +17,7 @@ import task from '@/apis/task.js';
 import uView from 'uview-ui';
 import wbs from '@/apis/wbs.js';
 
-//#ifdef H5
-// import './registerServiceWorker';
-// import AlloyFinger from 'alloyfinger';
-// import AlloyFingerPlugin from 'alloyfinger/vue/alloy_finger_vue';
-// Vue.use(AlloyFingerPlugin, { AlloyFinger });
+Vue.use(AlloyFingerPlugin, { AlloyFinger });
 // indexedDB
 // import indexedDB from '@/utils/indexedDB';
 // Vue.use(indexedDB);
diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue
index e18b1d4..a601c7c 100644
--- a/src/pages/project/project.vue
+++ b/src/pages/project/project.vue
@@ -360,7 +360,7 @@ export default {
         // TODO
         this.getProjectById({ projectId: options.p, num: 0 }); // 根据项目id获取项目信息
         // 查询医院是否填写了调查问卷
-        this.handleQueryNotWrite(options.p);
+        // this.handleQueryNotWrite(options.p);
       }
     },
 
@@ -466,16 +466,16 @@ export default {
      * 查询医院是否填写了调查问卷
      * @param {string} projectId 项目id
      */
-    async handleQueryNotWrite(projectId) {
-      try {
-        const param = { projectId };
-        const data = await this.$u.api.queryNotWrite(param);
-        console.log('data: ', data);
-        this.questionnaires = data;
-      } catch (error) {
-        console.error('error: ', error);
-      }
-    },
+    // async handleQueryNotWrite(projectId) {
+    //   try {
+    //     const param = { projectId };
+    //     const data = await this.$u.api.queryNotWrite(param);
+    //     console.log('data: ', data);
+    //     this.questionnaires = data;
+    //   } catch (error) {
+    //     console.error('error: ', error);
+    //   }
+    // },
 
     // 打开问卷
     openQuestionnaire(value) {