Sfoglia il codice sorgente

ios屏幕滚动锁定

XuZinan 2 anni fa
parent
commit
9b3d933c2c
6 ha cambiato i file con 88 aggiunte e 198 eliminazioni
  1. 2 1
      App.vue
  2. 1 1
      manifest.json
  3. 0 109
      pages.json
  4. 2 0
      pages/Project/list.vue
  5. 42 44
      pages/WorkingHours/audit.vue
  6. 41 43
      pages/WorkingHours/index.vue

+ 2 - 1
App.vue

@@ -28,9 +28,10 @@ export default {
   font-style: normal;
 }
 .page {
-  position: relative;
+  position: fixed;
   // padding-bottom: 50px;
   min-height: 100vh;
+  width: 100%;
   display: flex;
   flex-direction: column;
   background: url("./static/index/bg.png") no-repeat center;

+ 1 - 1
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "workload",
+    "name" : "人日系统",
     "appid" : "__UNI__2F0D80E",
     "description" : "",
     "versionName" : "2.0.8",

+ 0 - 109
pages.json

@@ -1,112 +1,3 @@
-/*
-{
-  "pages": [
-    {
-      "path": "pages/index/index"
-    },
-    {
-      "path": "pages/WorkingHours/index",
-      "style": {
-        "app-plus": {
-          "titleNView": {
-            "buttons": [
-              {
-                "text": "返回首页",
-                "fontSize": "16px",
-                "width": "80px"
-              }
-            ]
-          }
-        }
-      }
-    },
-    {
-      "path": "pages/login/login",
-      "style": {
-        "navigationBarBackgroundColor": "#7399DB"
-      }
-    },
-    {
-      "path": "pages/WorkingHours/add"
-    },
-    {
-      "path": "pages/WorkingHours/audit",
-      "style": {
-        "app-plus": {
-          "titleNView": {
-            "buttons": [
-              {
-                "text": "返回首页",
-                "fontSize": "16px",
-                "width": "80px"
-              }
-            ]
-          }
-        }
-      }
-    },
-    {
-      "path": "pages/Project/list",
-      "style": {
-        "enablePullDownRefresh": true,
-        "pullToRefresh": {
-          "color": "#2979ff",
-          "offset": "60px"
-        },
-        "app-plus": {
-          "titleNView": {
-            "buttons": [
-              {
-                "text": "返回首页",
-                "fontSize": "16px",
-                "width": "80px"
-              }
-            ]
-          }
-        }
-      }
-    },
-    {
-      "path": "pages/Project/add"
-    },
-    {
-      "path": "pages/Project/detail"
-    },
-    {
-      "path": "pages/Project/auth",
-      "style": {
-        "enablePullDownRefresh": true,
-        "pullToRefresh": {
-          "color": "#2979ff",
-          "offset": "60px"
-        },
-        "app-plus": {
-          "titleNView": {
-            "buttons": [
-              {
-                "text": "返回首页",
-                "fontSize": "16px",
-                "width": "80px"
-              }
-            ]
-          }
-        }
-      }
-    },
-    {
-      "path": "pages/Project/member"
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "white",
-    "navigationBarBackgroundColor": "#2D3E5E",
-    "backgroundColor": "#F8F8F8",
-    "app-plus": {
-      "background": "#efeff4"
-    }
-  }
-}
-*/
 {
   "pages": [
     {

+ 2 - 0
pages/Project/list.vue

@@ -237,6 +237,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  z-index: 1;
   .title {
     font: 18px bold;
     color: #fff;
@@ -250,6 +251,7 @@ export default {
 .list {
   width: 90%;
   margin-top: 150rpx;
+  height: 90vh;
 }
 .loadmore {
   padding: 30rpx 0px;

+ 42 - 44
pages/WorkingHours/audit.vue

@@ -13,56 +13,54 @@
           :key="collapse.name"
           :title="collapse.name"
         >
-          <view class="content">
-            <template v-for="(item, index) in collapse.children">
-              <uni-card
-                :key="index"
-                :title="allType[item.type_id] && allType[item.type_id].name"
-              >
-                <view class="uni-body">
-                  <view class="detail-item">
-                    <view class="detail-label">提交人</view>
-                    <view class="detail-value">
-                      {{ item.User.CName }}
-                    </view>
-                  </view>
-                  <view class="detail-item">
-                    <view class="detail-label">审核状态</view>
-                    <view
-                      class="detail-value"
-                      :style="{ color: stateColor[item.audit_state] }"
-                    >
-                      {{ auditState[item.audit_state] }}
-                    </view>
+          <template v-for="(item, index) in collapse.children">
+            <uni-card
+              :key="index"
+              :title="allType[item.type_id] && allType[item.type_id].name"
+            >
+              <view class="uni-body">
+                <view class="detail-item">
+                  <view class="detail-label">提交人</view>
+                  <view class="detail-value">
+                    {{ item.User.CName }}
                   </view>
-                  <view class="detail-item" v-if="item.audit_state == 3">
-                    <view class="detail-label">拒绝原因</view>
-                    <view class="detail-value">
-                      {{ item.audit_desc }}
-                    </view>
-                  </view>
-                  <view class="detail-item">
-                    <view class="detail-label">工时</view>
-                    <view class="detail-value">
-                      {{ item.workload }}
-                    </view>
+                </view>
+                <view class="detail-item">
+                  <view class="detail-label">审核状态</view>
+                  <view
+                    class="detail-value"
+                    :style="{ color: stateColor[item.audit_state] }"
+                  >
+                    {{ auditState[item.audit_state] }}
                   </view>
                 </view>
-                <view
-                  v-if="item.audit_state == 1"
-                  slot="actions"
-                  class="card-actions"
-                >
-                  <view class="card-actions-item" @click="onHandleAudit(item)">
-                    <text class="card-actions-item-text">通过</text>
+                <view class="detail-item" v-if="item.audit_state == 3">
+                  <view class="detail-label">拒绝原因</view>
+                  <view class="detail-value">
+                    {{ item.audit_desc }}
                   </view>
-                  <view class="card-actions-item" @click="onHandleReject(item)">
-                    <text class="card-actions-item-text">拒绝</text>
+                </view>
+                <view class="detail-item">
+                  <view class="detail-label">工时</view>
+                  <view class="detail-value">
+                    {{ item.workload }}
                   </view>
                 </view>
-              </uni-card>
-            </template>
-          </view>
+              </view>
+              <view
+                v-if="item.audit_state == 1"
+                slot="actions"
+                class="card-actions"
+              >
+                <view class="card-actions-item" @click="onHandleAudit(item)">
+                  <text class="card-actions-item-text">通过</text>
+                </view>
+                <view class="card-actions-item" @click="onHandleReject(item)">
+                  <text class="card-actions-item-text">拒绝</text>
+                </view>
+              </view>
+            </uni-card>
+          </template>
         </uni-collapse-item>
       </uni-collapse>
 

+ 41 - 43
pages/WorkingHours/index.vue

@@ -19,55 +19,53 @@
           :key="collapse.name"
           :title="collapse.name"
         >
-          <view class="content">
-            <uni-card
-              v-for="(item, index) in collapse.children"
-              :key="index"
-              :title="allType[item.type_id] && allType[item.type_id].name"
-            >
-              <view class="uni-body">
-                <view class="detail-item" v-if="item.project_id != '0'">
-                  <view class="detail-label">所属项目</view>
-                  <view class="detail-value">
-                    {{ getProject(item.project_id) }}
-                  </view>
-                </view>
-                <view class="detail-item">
-                  <view class="detail-label">审核状态</view>
-                  <view
-                    class="detail-value"
-                    :style="{ color: stateColor[item.audit_state] }"
-                  >
-                    {{ auditState[item.audit_state] }}
-                  </view>
+          <uni-card
+            v-for="(item, index) in collapse.children"
+            :key="index"
+            :title="allType[item.type_id] && allType[item.type_id].name"
+          >
+            <view class="uni-body">
+              <view class="detail-item" v-if="item.project_id != '0'">
+                <view class="detail-label">所属项目</view>
+                <view class="detail-value">
+                  {{ getProject(item.project_id) }}
                 </view>
-                <view class="detail-item" v-if="item.audit_state == 3">
-                  <view class="detail-label">拒绝原因</view>
-                  <view class="detail-value">
-                    {{ item.audit_desc }}
-                  </view>
-                </view>
-                <view class="detail-item">
-                  <view class="detail-label">工时</view>
-                  <view class="detail-value">
-                    {{ item.workload }}
-                  </view>
+              </view>
+              <view class="detail-item">
+                <view class="detail-label">审核状态</view>
+                <view
+                  class="detail-value"
+                  :style="{ color: stateColor[item.audit_state] }"
+                >
+                  {{ auditState[item.audit_state] }}
                 </view>
               </view>
-              <view
-                v-if="item.audit_state == 0 || item.audit_state == 3"
-                slot="actions"
-                class="card-actions"
-              >
-                <view class="card-actions-item" @click="onHandleSave(item)">
-                  <text class="card-actions-item-text">修改工时</text>
+              <view class="detail-item" v-if="item.audit_state == 3">
+                <view class="detail-label">拒绝原因</view>
+                <view class="detail-value">
+                  {{ item.audit_desc }}
                 </view>
-                <view class="card-actions-item" @click="onHandleAudit(item, 0)">
-                  <text class="card-actions-item-text">上报审批</text>
+              </view>
+              <view class="detail-item">
+                <view class="detail-label">工时</view>
+                <view class="detail-value">
+                  {{ item.workload }}
                 </view>
               </view>
-            </uni-card>
-          </view>
+            </view>
+            <view
+              v-if="item.audit_state == 0 || item.audit_state == 3"
+              slot="actions"
+              class="card-actions"
+            >
+              <view class="card-actions-item" @click="onHandleSave(item)">
+                <text class="card-actions-item-text">修改工时</text>
+              </view>
+              <view class="card-actions-item" @click="onHandleAudit(item, 0)">
+                <text class="card-actions-item-text">上报审批</text>
+              </view>
+            </view>
+          </uni-card>
         </uni-collapse-item>
       </uni-collapse>