wenmenghao 1 vuosi sitten
vanhempi
commit
2a51bf3450
3 muutettua tiedostoa jossa 30 lisäystä ja 30 poistoa
  1. 3 3
      jydocs-mobile/package.json
  2. 13 13
      jydocs-mobile/src/style/_mixin.scss
  3. 14 14
      jydocs-mobile/yarn.lock

+ 3 - 3
jydocs-mobile/package.json

@@ -8,8 +8,8 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@vue-office/docx": "^1.6.0",
-    "@vue-office/excel": "^1.7.3",
+    "@vue-office/docx": "1.6.0",
+    "@vue-office/excel": "1.7.3",
     "axios": "^0.19.2",
     "core-js": "^3.8.3",
     "html2canvas": "^1.0.0-rc.6",
@@ -18,7 +18,7 @@
     "vant": "^2.8.2",
     "vue": "^2.7.16",
     "vue-class-component": "^7.2.3",
-    "vue-demi": "^0.14.6",
+    "vue-demi": "0.14.6",
     "vue-pdf": "^4.2.0",
     "vue-property-decorator": "^8.4.2",
     "vue-router": "^3.2.0",

+ 13 - 13
jydocs-mobile/src/style/_mixin.scss

@@ -10,7 +10,7 @@
     @else if $width and $height {
         width: $width;
         height: $height;
-        margin: -($height / 2) #{0 0} -($width / 2);
+        margin: -($height / 2) #{0 0} (-($width / 2));
     }
 
     @else if not $height {
@@ -104,7 +104,7 @@
 }
 
 /*渐变(从上到下)*/
-@mixin linear-gradient($direction:bottom, $color1:transparent, $color2:#306eff, $color3:transparent) {
+@mixin linear-gradient($direction: bottom, $color1: transparent, $color2: #306eff, $color3: transparent) {
     //background: -webkit-linear-gradient($direction,$colorTop, $colorCenter, $colorBottom); /* Safari 5.1 - 6.0 */
     background: -o-linear-gradient($direction, $color1, $color2, $color3);
     /* Opera 11.1 - 12.0 */
@@ -116,7 +116,7 @@
 }
 
 /* 行高 */
-@mixin line-height($height:30px, $line-height:30px) {
+@mixin line-height($height: 30px, $line-height: 30px) {
     @if ($height !=null) {
         height: $height;
     }
@@ -127,7 +127,7 @@
 }
 
 /* 定义滚动条样式 圆角和阴影不需要则传入null */
-@mixin scrollBar($width:10px, $height:10px, $outColor:$bgColor, $innerColor:$bgGrey, $radius:5px, $shadow:null) {
+@mixin scrollBar($width: 10px, $height: 10px, $outColor: $bgColor, $innerColor: $bgGrey, $radius: 5px, $shadow: null) {
 
     /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
     &::-webkit-scrollbar {
@@ -165,7 +165,7 @@
 }
 
 /* css3动画 默认3s宽度到200px */
-@mixin animation($from:(width:0px), $to:(width:200px), $name:mymove, $animate:mymove 2s 1 linear infinite) {
+@mixin animation($from: (width:0px), $to: (width:200px), $name: mymove, $animate: mymove 2s 1 linear infinite) {
     -webkit-animation: $animate;
     -o-animation: $animate;
     animation: $animate;
@@ -208,11 +208,11 @@
 }
 
 @mixin diy-icon ($name, $width: 24, $height: 24) {
-  ::v-deep .van-icon-diy-#{$name} {
-    background: url("~@/assets/icon/#{$name}.png") no-repeat;
-    background-size: cover;
-    display: inline-block;
-    width: #{$width}px;
-    height: #{$height}px;
-  }
-}
+    ::v-deep .van-icon-diy-#{$name} {
+        background: url("~@/assets/icon/#{$name}.png") no-repeat;
+        background-size: cover;
+        display: inline-block;
+        width: #{$width}px;
+        height: #{$height}px;
+    }
+}

+ 14 - 14
jydocs-mobile/yarn.lock

@@ -1253,15 +1253,15 @@
   resolved "http://192.168.3.71:4873/@vant/popperjs/-/popperjs-1.3.0.tgz#e0eff017124b5b2352ef3b36a6df06277f4400f2"
   integrity sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==
 
-"@vue-office/docx@^1.6.0":
-  version "1.6.2"
-  resolved "http://192.168.3.71:4873/@vue-office/docx/-/docx-1.6.2.tgz#c97d28db60db5325dd351d90b0202dd3d54ad427"
-  integrity sha512-OHAoUHeY8nHjhWvwDhlPx+/rmRkxmqLpvPgtfCEOZ4H1c1LCdJ6eDbdV3152ww8dcdZ7fgGQu3fmSSaI7JwdpQ==
+"@vue-office/docx@1.6.0":
+  version "1.6.0"
+  resolved "http://192.168.3.71:4873/@vue-office/docx/-/docx-1.6.0.tgz#af451d20c24b9075da1506c6b7024e8846e173bd"
+  integrity sha512-OKEapOPq223uszA8mRSOWPhdfBchJa6sIqP46eMrMMe5RSUrG9m3QE/o0JBIaMgxDrtNd7aI9CvF2kDvb7G2hw==
 
-"@vue-office/excel@^1.7.3":
-  version "1.7.8"
-  resolved "http://192.168.3.71:4873/@vue-office/excel/-/excel-1.7.8.tgz#3cd064b4d4003a9460ccddef06230e156e2cd70c"
-  integrity sha512-pQxogMRDECFElpDcZhQBDtM9GpL8d1/w+fjAXiqJRTIjzbrW/JiOURExgE5LoUkfc+cDhUfSGtfvCvwSx30yQw==
+"@vue-office/excel@1.7.3":
+  version "1.7.3"
+  resolved "http://192.168.3.71:4873/@vue-office/excel/-/excel-1.7.3.tgz#436f038d15fdb844697ae87cf1c55a4c509b7c3a"
+  integrity sha512-E0k6gvsWi3wjdLmRqgkSi8Se8LAQ2aoVijbDkFMXTZJhKFFeyUyI/PvEDo8MwKcjytMu1lrAfzaVOZRtOiRj3Q==
 
 "@vue/babel-helper-vue-jsx-merge-props@^1.0.0", "@vue/babel-helper-vue-jsx-merge-props@^1.4.0":
   version "1.4.0"
@@ -10062,10 +10062,10 @@ vue-class-component@^7.1.0, vue-class-component@^7.2.3:
   resolved "http://192.168.3.71:4873/vue-class-component/-/vue-class-component-7.2.6.tgz#8471e037b8e4762f5a464686e19e5afc708502e4"
   integrity sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==
 
-vue-demi@^0.14.6:
-  version "0.14.8"
-  resolved "http://192.168.3.71:4873/vue-demi/-/vue-demi-0.14.8.tgz#00335e9317b45e4a68d3528aaf58e0cec3d5640a"
-  integrity sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==
+vue-demi@0.14.6:
+  version "0.14.6"
+  resolved "http://192.168.3.71:4873/vue-demi/-/vue-demi-0.14.6.tgz#dc706582851dc1cdc17a0054f4fec2eb6df74c92"
+  integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==
 
 vue-eslint-parser@^7.0.0:
   version "7.11.0"
@@ -10138,7 +10138,7 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.7.16:
+vue-template-compiler@~2.7.16:
   version "2.7.16"
   resolved "http://192.168.3.71:4873/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b"
   integrity sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==
@@ -10151,7 +10151,7 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "http://192.168.3.71:4873/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue@^2.7.16:
+vue@~2.7.16:
   version "2.7.16"
   resolved "http://192.168.3.71:4873/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9"
   integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==