Forráskód Böngészése

修改样式,升级ui版本库

lex-xin 3 éve
szülő
commit
a5552da153

+ 23 - 9
package-lock.json

@@ -893,6 +893,11 @@
       "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
       "dev": true
     },
+    "@popperjs/core": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npm.taobao.org/@popperjs/core/download/@popperjs/core-2.9.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40popperjs%2Fcore%2Fdownload%2F%40popperjs%2Fcore-2.9.2.tgz",
+      "integrity": "sha1-rep7aVPLs0ZRdmsFSEaOdDxqI1M="
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.7.1",
       "resolved": "https://registry.npm.taobao.org/@soda/friendly-errors-webpack-plugin/download/@soda/friendly-errors-webpack-plugin-1.7.1.tgz",
@@ -988,9 +993,17 @@
       "dev": true
     },
     "@vant/icons": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.2.1.tgz",
-      "integrity": "sha512-5ivsKQR4ySbdBW5UPoQDVqO6rdc1um3rvq/0VL+ZSA7Y3MdBQ3E4/NL0hoAY5/sZZeYfIDKEP21gpjUzdeEDQQ=="
+      "version": "1.6.0",
+      "resolved": "https://registry.nlark.com/@vant/icons/download/@vant/icons-1.6.0.tgz?cache=0&sync_timestamp=1621322269707&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vant%2Ficons%2Fdownload%2F%40vant%2Ficons-1.6.0.tgz",
+      "integrity": "sha1-Pbfrf5Y/UaKghnZyDVr5xMNRL+s="
+    },
+    "@vant/popperjs": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npm.taobao.org/@vant/popperjs/download/@vant/popperjs-1.1.0.tgz?cache=0&sync_timestamp=1617713442527&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vant%2Fpopperjs%2Fdownload%2F%40vant%2Fpopperjs-1.1.0.tgz",
+      "integrity": "sha1-tO3uW7+m+xhwWYbjE9T9XxeUKg8=",
+      "requires": {
+        "@popperjs/core": "^2.9.2"
+      }
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.0.0",
@@ -11097,12 +11110,13 @@
       }
     },
     "vant": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.5.4.tgz",
-      "integrity": "sha512-eIeXrzsEP5cNbMkskFwxu3i6kkzS2pR7/fF0pFoTXhl/oYRdkXUt46RnRQtazz/BNHVBf2j3dVnwLTIBPRGstQ==",
+      "version": "2.12.21",
+      "resolved": "https://registry.nlark.com/vant/download/vant-2.12.21.tgz?cache=0&sync_timestamp=1623659246335&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvant%2Fdownload%2Fvant-2.12.21.tgz",
+      "integrity": "sha1-pRYKE1hienoCxae7apEbzCwOcX4=",
       "requires": {
         "@babel/runtime": "7.x",
-        "@vant/icons": "1.2.1",
+        "@vant/icons": "^1.5.3",
+        "@vant/popperjs": "^1.0.0",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "vue-lazyload": "1.2.3"
       }
@@ -11215,8 +11229,8 @@
     },
     "vue-lazyload": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
-      "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
+      "resolved": "https://registry.npm.taobao.org/vue-lazyload/download/vue-lazyload-1.2.3.tgz",
+      "integrity": "sha1-kB+ewVx+bKeHgaK65KNDaGve2yw="
     },
     "vue-loader": {
       "version": "15.7.1",

+ 1 - 1
package.json

@@ -21,7 +21,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "qs": "^6.8.0",
-    "vant": "^2.5.4",
+    "vant": "^2.12.21",
     "vconsole": "^3.3.4",
     "vue": "^2.6.10",
     "vue-amap": "^0.5.10",

+ 1 - 1
src/assets/commonLess/common.less

@@ -52,7 +52,7 @@
 
 .van-field__control {
   color: #808080 !important;
-  font-size: .16rem;
+  font-size: .14rem;
 }
 
 input::-webkit-input-placeholder,

+ 6 - 7
src/assets/commonLess/variable.less

@@ -34,18 +34,17 @@
   color: #c0c0c0;
 }
 
-.van-dropdown-menu__title--down {
-  &::after{border-color: transparent transparent @mColor @mColor;}
-  
-}
+// .van-dropdown-menu__title--down {
+//   &::after{border-color: transparent transparent @mColor @mColor;}
+// }
 /deep/.van-dropdown-menu__title {
   font-size: 0.17rem;
   color: #1a1a1a;
   line-height: inherit;
   height: auto;
-  &::after{
-    border-color: transparent transparent @mColor @mColor;
-  }
+  // &::after{
+  //   border-color: transparent transparent @mColor @mColor;
+  // }
 }
 /deep/ .van-rate__item:not(:last-child) {
   padding-right: .15rem;

+ 10 - 1
src/views/audition/ArrangeWork.vue

@@ -42,7 +42,10 @@
     </van-popup>
 
     <van-popup position="bottom" v-model="accompanimentStatus"  :style="{ height: '100%' }" style=" border-radius: 0; overflow: inherit;">
-      <accompaniment-modal @onSelectMusic="onSelectMusic" />
+      <van-sticky>
+        <m-header name="作业曲目" :backUrl="backUrl" />
+      </van-sticky>
+      <accompaniment-modal isHead @onSelectMusic="onSelectMusic" />
     </van-popup>
   </div>
 </template>
@@ -64,6 +67,12 @@ export default {
       that: this,
       memberNum: query.memberNum,
       headerStatus: true,
+      backUrl: {
+        status: true,
+        callBack: () => {
+          this.accompanimentStatus = false
+        }
+      },
       dateSection: {
         status: false,
         minDate: new Date(),

+ 1 - 1
src/views/audition/ManageEvaluation.vue

@@ -16,7 +16,7 @@
       <!-- <div class="searchMore">
                 筛选<i class="arrowDown"></i>
       </div>-->
-      <van-dropdown-menu>
+      <van-dropdown-menu active-color="#01C1B5">
         <!-- <div class="susqurt">|</div> -->
         <van-dropdown-item title="筛选" ref="item" v-model="search.status">
           <div class="dropList">

+ 1 - 1
src/views/audition/MonthAppeal.vue

@@ -5,7 +5,7 @@
           <div @click="onAppealRecord">申诉记录</div>
       </template>
     </m-header>
-    <van-dropdown-menu>
+    <van-dropdown-menu active-color="#01C1B5">
       <van-dropdown-item v-model="value1" :options="option1" @change="getList" />
     </van-dropdown-menu>
 

+ 17 - 4
src/views/audition/modal/accompanimentModal.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="accompanimentModal">
-        <van-sticky>
-            <van-dropdown-menu class="cateDropDown">
+        <van-sticky :offset-top="isHead ? '.46rem' : 0">
+            <van-dropdown-menu class="cateDropDown" active-color="#01C1B5">
                 <van-dropdown-item v-model="levelId" :options="levelOptions" @change="levelChange" />
                 <van-dropdown-item v-model="subjectId" :options="subjectOptions" @change="subjectChange" />
             </van-dropdown-menu>
@@ -12,7 +12,7 @@
                 shape="round"
             >
                 <template #label>
-                    <van-dropdown-menu class="headDropDown">
+                    <van-dropdown-menu class="headDropDown" active-color="#01C1B5">
                         <van-dropdown-item v-model="typeId" :options="typeOptions" @change="typeChange" />
                     </van-dropdown-menu>
                 </template>
@@ -63,6 +63,14 @@ import { find } from 'lodash'
 import { sysMusicScoreCategoriesTree, queryPageLimit, querySubjectIds } from './api'
 import MusicIcon from './icons/music.png'
 export default {
+    props: {
+        isHead: {
+            type: Boolean,
+            default() {
+                return false
+            }
+        }
+    },
     data() {
         return {
             MusicIcon,
@@ -84,7 +92,7 @@ export default {
                 page: 1,
                 rows: 20,
             },
-            list: []
+            list: [],
         }
     },
     async mounted() {
@@ -193,6 +201,11 @@ export default {
             padding: 0.05rem 0.08rem;
             line-height: 0.24rem;
         }
+        .van-dropdown-menu__bar {
+            height: .36rem;
+            background: transparent;
+            box-shadow: none;
+        }
     }
 
     .headDropDown {

+ 3 - 3
src/views/visitManager/visitList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="visitList">
     <m-header v-if="headerStatus" />
-    <van-dropdown-menu  :close-on-click-outside="false">
+    <van-dropdown-menu  :close-on-click-outside="false" active-color="#01C1B5">
       <van-dropdown-item v-model="value1" @change="onTypeChange" title="回访类型" :options="option1" />
       <van-dropdown-item
         v-model="value2"
@@ -266,7 +266,7 @@ export default {
   min-height: 100vh;
   .visitTime {
     .van-cell__right-icon{
-      line-height: .48rem;
+      line-height: .36rem;
     }
   }
 }
@@ -360,7 +360,7 @@ export default {
 }
 .van-cell{
     color: #1A1A1A;
-    line-height: .48rem!important;
+    line-height: .36rem!important;
     font-size: .16rem;
 }