ZaiZai 1 سال پیش
والد
کامیت
8cbea32b1a
7فایلهای تغییر یافته به همراه26 افزوده شده و 18 حذف شده
  1. 3 0
      components/nav-back-bar/style.scss
  2. 1 2
      pages.json
  3. 4 1
      pages/image/form.vue
  4. 1 1
      pages/image/view.vue
  5. 1 1
      pages/ledger/index.vue
  6. 2 2
      pages/login/login.vue
  7. 14 11
      style/app.scss

+ 3 - 0
components/nav-back-bar/style.scss

@@ -4,6 +4,9 @@
     align-items: center;
     padding: 0.7rem 1.25rem;
     background: white;
+    &.top {
+        padding-top: calc(var(--status-bar-height) + 10rpx);
+    }
     .back {
         position: absolute;
         display: flex;

+ 1 - 2
pages.json

@@ -156,8 +156,7 @@
     "tabBar": {
         "color": "#8E8E93",
         "selectedColor": "#554D84",
-        "blurEffect": "extralight",
-        "backgroundColor": "rgba(255,255,255,0.1)",
+        "backgroundColor": "#FFFFFF",
         "borderStyle": "black",
         "list": [
             {

+ 4 - 1
pages/image/form.vue

@@ -127,7 +127,10 @@ onLoad((options) => {
             shootingTimeStr: dateEnd.value,
             shootingUser: real_name
         }
-        getFileTitleNamedata(nodes.treeId)
+        console.log(nodes.type)
+        if (nodes.type === 1) {
+            getFileTitleNamedata(nodes.treeId)
+        }
         uni.setNavigationBarTitle({title: '新增声像文件'})
     }
 })

+ 1 - 1
pages/image/view.vue

@@ -2,7 +2,7 @@
     <z-paging ref="pageRef" v-model="dataList" @query="getDataList">
         <template #top>
             <view class="hc-paging-top-bar mb-1">
-                <hc-nav-back-bar title="声像文件">
+                <hc-nav-back-bar ui="top" title="声像文件">
                     <text class="text-26" :class="isDelete?'':'text-red-4'" @click="deleteTap" v-if="dataList.length > 0">
                         {{isDelete? '取消' : '删除'}}
                     </text>

+ 1 - 1
pages/ledger/index.vue

@@ -14,7 +14,7 @@
         </view>
 
         <!--内容区域-->
-        <view class="hc-content-bar" :style="[bottomStyle, contentStyle]">
+        <view class="hc-content-bar hc-zindex" :style="[bottomStyle, contentStyle]">
             <view class="arrow-bar" @click="isCollapseUnfold">
                 <text class="i-ri-arrow-down-double-line icon" v-if="isCollapse"/>
                 <text class="i-ri-arrow-up-double-line icon" v-else/>

+ 2 - 2
pages/login/login.vue

@@ -95,8 +95,8 @@ const isAnimation = (data) => {
 //登录表单
 const formData = ref({
     tenantId: "000000",
-    username: 'pengct',
-    password: 'pct123456',
+    username: '',
+    password: '',
     type: "account"
 })
 

+ 14 - 11
style/app.scss

@@ -108,13 +108,6 @@ button[type="info"] {
     }
 }
 
-.uni-popup, .uni-picker-container{
-    z-index: 9999999 !important;
-}
-
-uni-toast, .uni-mask, .uni-toast {
-    z-index: 99999999 !important;
-}
 .hc-popup.uni-popup {
     view[name="content"] {
         transition: -webkit-transform 900ms ease 0ms, transform 900ms ease 0ms !important;
@@ -186,6 +179,14 @@ uni-toast, .uni-mask, .uni-toast {
     }
 }
 
+.uni-popup, .uni-picker-container{
+    z-index: 9999999 !important;
+}
+
+uni-toast, .uni-mask, .uni-toast {
+    z-index: 99999999 !important;
+}
+
 uni-modal {
     z-index: 99999999 !important;
 }
@@ -196,6 +197,12 @@ uni-modal {
 .uni-modal {
     z-index: 999999999 !important;
 }
+.uni-calendar__mask, .uni-calendar__content {
+    z-index: 9999999 !important;
+}
+.hc-zindex {
+    z-index: 99999999 !important;
+}
 
 .mt-1px {
     margin-top: 1px;
@@ -226,7 +233,3 @@ uni-modal {
     overflow: hidden;
     text-overflow: ellipsis;
 }
-
-.uni-calendar__mask, .uni-calendar__content {
-    z-index: 9999999 !important;
-}