Browse Source

还原度修改

yunxing 4 years ago
parent
commit
2e48e1a0ce

BIN
src/assets/images/screen.png


BIN
src/assets/images/screen@2x.png


+ 2 - 1
src/components/ImagePreview.vue

@@ -15,7 +15,8 @@
             @change='onChange'
         ></van-image-preview>
         <div class='direction' @click='changeOri'>
-            <i class='iconfont wanda-hengshuping'></i>
+            <!-- <i class='iconfont wanda-hengshuping'></i> -->
+            <img src='../assets/images/screen.png' />
         </div>
     </div>
 </template> 

+ 2 - 2
src/components/Navbar.vue

@@ -5,8 +5,8 @@
                 <van-icon name='wap-home-o' size='1.5em' color='#000' @click='backApp' />
             </template>
             <template #right>
-                <van-icon name='scan' size='1.5em' color='#000' @click='scan' />
-                <van-icon name='search' size='1.5em' color='#000' style='margin-left:0.5em' @click='query' />
+                <van-icon name='search' size='1.5em' color='#000' @click='query' />
+                <van-icon name='scan' size='1.5em' color='#000' style='margin-left:0.5em' @click='scan' />
             </template>
         </van-nav-bar>
     </div>

+ 19 - 0
src/style/common.less

@@ -148,3 +148,22 @@ body {
         opacity: 0;
     }
 }
+// 下拉菜单修改
+.van-dropdown-menu {
+    .van-dropdown-menu__bar {
+        box-shadow: none !important;
+        .van-dropdown-menu__title::after {
+            border-color: transparent transparent #707070 #707070 !important;
+        }
+    }
+    // 去除右侧对号
+    .van-cell__value {
+        display: none !important;
+    }
+}
+// nav-bar 返回左箭头
+.van-nav-bar__left {
+    .van-icon-arrow-left {
+        color: #333333 !important;
+    }
+}

+ 8 - 7
src/views/otherMatter/ComprehensiveMatterList.vue

@@ -55,8 +55,8 @@
  * 综合事项,政府/其他部门 列表页面
  */
 import Vue from 'vue'
-import { NavBar, List } from 'vant'
-Vue.use(NavBar).use(List)
+import { NavBar, List, Empty } from 'vant'
+Vue.use(NavBar).use(List).use(Empty)
 import { queryDetailList } from '@/api/other'
 import { mapGetters } from 'vuex'
 import moment from 'moment'
@@ -182,7 +182,7 @@ export default {
                 width: 100%;
                 padding: 15px;
                 background-color: #fff;
-                margin-bottom: 10px;
+                // margin-bottom: 10px;
                 .date-attachment,
                 .record,
                 .work,
@@ -194,7 +194,7 @@ export default {
                     font-size: 14px;
                     font-weight: 400;
                     color: #666666;
-                    margin-bottom: 12px;
+                    margin-bottom: 15px;
                     .label {
                         width: 70px;
                     }
@@ -221,8 +221,8 @@ export default {
                 .show-less {
                     margin: 0 auto;
                     width: 72px;
-                    height: 30px;
-                    line-height: 30px;
+                    height: 24px;
+                    line-height: 24px;
                     text-align: center;
                     background: #e5eef6;
                     border-radius: 2px;
@@ -235,9 +235,10 @@ export default {
                     border-radius: 3px;
                     i {
                         position: relative;
-                        top: 2px;
+                        top: 3px;
                         right: 3px;
                         width: 25px;
+                        font-size: 14px;
                     }
                     span {
                         height: 100%;

+ 16 - 1
src/views/otherMatter/index.vue

@@ -1,6 +1,14 @@
 <template>
     <div class='other-matter'>
-        <van-tabs v-model='active' class='other-tabs' color='#025BAA' @change='changeTab' title-active-color='#025BAA' :line-width='60'>
+        <van-tabs
+            v-model='active'
+            class='other-tabs'
+            color='#025BAA'
+            @change='changeTab'
+            title-active-color='#025BAA'
+            :line-width='70'
+            :line-height='2'
+        >
             <van-tab title='综合事项'>
                 <ComprehensiveMatter />
             </van-tab>
@@ -52,6 +60,13 @@ export default {
         }
         /deep/ .van-tabs__wrap {
             height: 45px;
+            border-bottom: 1px solid #eaeaea;
+            .van-tabs__nav--line {
+                box-sizing: content-box;
+                height: 100%;
+                width: 80%;
+                margin: 0 auto;
+            }
         }
         /deep/ .van-tabs__content {
             height: calc(100% - 45px);

+ 4 - 1
src/views/overview/UpdateRecord.vue

@@ -255,6 +255,9 @@ export default {
     width: 100%;
     height: 100%;
     // background-color: lightblue;
+    /deep/ .van-icon-arrow-left {
+        color: #333333 !important;
+    }
     // 下拉菜单
     /deep/.van-dropdown-menu__item {
         justify-content: flex-start !important;
@@ -293,7 +296,7 @@ export default {
                         width: 2px;
                         flex: 1;
                         margin-top: 6px;
-                        background: #dcdcdc;
+                        background: #e0e0e0;
                         // background-color: red;
                     }
                 }

+ 1 - 1
src/views/overview/index.vue

@@ -576,7 +576,7 @@ export default {
                             }
                         }
                         .info + .info {
-                            border-top: 1px solid #aaa;
+                            border-top: 1px solid #E6E6E6;
                             margin-top: 5px;
                             padding-top: 5px;
                         }