Browse Source

修改样式

See999 4 years ago
parent
commit
73d53bea08

+ 51 - 40
build/webpack.base.conf.js View File

@@ -1,11 +1,12 @@
1
-'use strict'
2
-const path = require('path')
3
-const utils = require('./utils')
4
-const config = require('../config')
5
-const vueLoaderConfig = require('./vue-loader.conf')
1
+"use strict";
2
+const path = require("path");
3
+const utils = require("./utils");
4
+const config = require("../config");
5
+const vueLoaderConfig = require("./vue-loader.conf");
6
+const webpack = require("webpack");
6 7
 
7
-function resolve (dir) {
8
-  return path.join(__dirname, '..', dir)
8
+function resolve(dir) {
9
+  return path.join(__dirname, "..", dir);
9 10
 }
10 11
 
11 12
 // const createLintingRule = () => ({
@@ -20,25 +21,26 @@ function resolve (dir) {
20 21
 // })
21 22
 
22 23
 module.exports = {
23
-  context: path.resolve(__dirname, '../'),
24
+  context: path.resolve(__dirname, "../"),
24 25
   entry: {
25
-    app: './src/main.js'
26
+    app: "./src/main.js"
26 27
   },
27 28
   externals: {
28
-    "BMap": "BMap"
29
+    BMap: "BMap"
29 30
   },
30 31
   output: {
31 32
     path: config.build.assetsRoot,
32
-    filename: '[name].js',
33
-    publicPath: process.env.NODE_ENV === 'production'
34
-      ? config.build.assetsPublicPath
35
-      : config.dev.assetsPublicPath
33
+    filename: "[name].js",
34
+    publicPath:
35
+      process.env.NODE_ENV === "production"
36
+        ? config.build.assetsPublicPath
37
+        : config.dev.assetsPublicPath
36 38
   },
37 39
   resolve: {
38
-    extensions: ['.js', '.vue', '.json'],
40
+    extensions: [".js", ".vue", ".json"],
39 41
     alias: {
40
-      'vue$': 'vue/dist/vue.esm.js',
41
-      '@': resolve('src'),
42
+      vue$: "vue/dist/vue.esm.js",
43
+      "@": resolve("src")
42 44
     }
43 45
   },
44 46
   module: {
@@ -46,52 +48,55 @@ module.exports = {
46 48
       ...(config.dev.useEslint ? [] : []),
47 49
       {
48 50
         test: /\.vue$/,
49
-        loader: 'vue-loader',
51
+        loader: "vue-loader",
50 52
         options: vueLoaderConfig
51 53
       },
52 54
       {
53 55
         test: /\.js$/,
54
-        loader: 'babel-loader?cacheDirectory',
55
-        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
56
+        loader: "babel-loader?cacheDirectory",
57
+        include: [
58
+          resolve("src"),
59
+          resolve("test"),
60
+          resolve("node_modules/webpack-dev-server/client")
61
+        ]
56 62
       },
57 63
       {
58 64
         test: /\.svg$/,
59
-        loader: 'svg-sprite-loader',
60
-        include: [resolve('src/icons')],
65
+        loader: "svg-sprite-loader",
66
+        include: [resolve("src/icons")],
61 67
         options: {
62
-          symbolId: 'icon-[name]'
68
+          symbolId: "icon-[name]"
63 69
         }
64 70
       },
65 71
       {
66 72
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
67
-        loader: 'url-loader',
68
-        exclude: [resolve('src/icons')],
73
+        loader: "url-loader",
74
+        exclude: [resolve("src/icons")],
69 75
         options: {
70 76
           limit: 10000,
71
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
77
+          name: utils.assetsPath("img/[name].[hash:7].[ext]")
72 78
         }
73 79
       },
74 80
       {
75 81
         test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
76
-        loader: 'url-loader',
82
+        loader: "url-loader",
77 83
         options: {
78 84
           limit: 10000,
79
-          name: utils.assetsPath('media/[name].[hash:7].[ext]')
85
+          name: utils.assetsPath("media/[name].[hash:7].[ext]")
80 86
         }
81 87
       },
82 88
       {
83 89
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
84
-        loader: 'url-loader',
90
+        loader: "url-loader",
85 91
         options: {
86 92
           limit: 10000,
87
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
93
+          name: utils.assetsPath("fonts/[name].[hash:7].[ext]")
88 94
         }
89 95
       },
90 96
       {
91 97
         test: /\.sass$/,
92
-        loaders: ['style', 'css', 'sass']
93
-      },
94
-      
98
+        loaders: ["style", "css", "sass"]
99
+      }
95 100
     ]
96 101
   },
97 102
   node: {
@@ -100,10 +105,16 @@ module.exports = {
100 105
     setImmediate: false,
101 106
     // prevent webpack from injecting mocks to Node native modules
102 107
     // that does not make sense for the client
103
-    dgram: 'empty',
104
-    fs: 'empty',
105
-    net: 'empty',
106
-    tls: 'empty',
107
-    child_process: 'empty'
108
-  }
109
-}
108
+    dgram: "empty",
109
+    fs: "empty",
110
+    net: "empty",
111
+    tls: "empty",
112
+    child_process: "empty"
113
+  },
114
+  plugins: [
115
+    new webpack.ProvidePlugin({
116
+      $: "jquery",
117
+      jQuery: "jquery"
118
+    })
119
+  ]
120
+};

+ 100 - 56
package-lock.json View File

@@ -210,12 +210,12 @@
210 210
       "dependencies": {
211 211
         "camelcase": {
212 212
           "version": "1.2.1",
213
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
213
+          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz",
214 214
           "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
215 215
         },
216 216
         "lodash.defaults": {
217 217
           "version": "3.1.2",
218
-          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
218
+          "resolved": "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-3.1.2.tgz",
219 219
           "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
220 220
           "requires": {
221 221
             "lodash.assign": "^3.0.0",
@@ -224,7 +224,7 @@
224 224
           "dependencies": {
225 225
             "lodash.assign": {
226 226
               "version": "3.2.0",
227
-              "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
227
+              "resolved": "https://registry.npm.taobao.org/lodash.assign/download/lodash.assign-3.2.0.tgz",
228 228
               "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
229 229
               "requires": {
230 230
                 "lodash._baseassign": "^3.0.0",
@@ -534,7 +534,7 @@
534 534
     },
535 535
     "autoprefixer-loader": {
536 536
       "version": "3.2.0",
537
-      "resolved": "https://registry.npmjs.org/autoprefixer-loader/-/autoprefixer-loader-3.2.0.tgz",
537
+      "resolved": "https://registry.npm.taobao.org/autoprefixer-loader/download/autoprefixer-loader-3.2.0.tgz",
538 538
       "integrity": "sha1-Oae2ZGqCaYZQc9lYyX9IYVLCyEo=",
539 539
       "requires": {
540 540
         "autoprefixer": "^6.0.2",
@@ -545,17 +545,17 @@
545 545
       "dependencies": {
546 546
         "ansi-regex": {
547 547
           "version": "2.1.1",
548
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
548
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz?cache=0&sync_timestamp=1570188663907&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-2.1.1.tgz",
549 549
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
550 550
         },
551 551
         "ansi-styles": {
552 552
           "version": "2.2.1",
553
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
553
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
554 554
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
555 555
         },
556 556
         "autoprefixer": {
557 557
           "version": "6.7.7",
558
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
558
+          "resolved": "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-6.7.7.tgz?cache=0&sync_timestamp=1571039940822&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fautoprefixer%2Fdownload%2Fautoprefixer-6.7.7.tgz",
559 559
           "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
560 560
           "requires": {
561 561
             "browserslist": "^1.7.6",
@@ -573,7 +573,7 @@
573 573
         },
574 574
         "browserslist": {
575 575
           "version": "1.7.7",
576
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
576
+          "resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-1.7.7.tgz",
577 577
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
578 578
           "requires": {
579 579
             "caniuse-db": "^1.0.30000639",
@@ -582,7 +582,7 @@
582 582
         },
583 583
         "chalk": {
584 584
           "version": "1.1.3",
585
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
585
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
586 586
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
587 587
           "requires": {
588 588
             "ansi-styles": "^2.2.1",
@@ -594,19 +594,19 @@
594 594
           "dependencies": {
595 595
             "supports-color": {
596 596
               "version": "2.0.0",
597
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
597
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
598 598
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
599 599
             }
600 600
           }
601 601
         },
602 602
         "has-flag": {
603 603
           "version": "1.0.0",
604
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
604
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
605 605
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
606 606
         },
607 607
         "loader-utils": {
608 608
           "version": "0.2.17",
609
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
609
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz",
610 610
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
611 611
           "requires": {
612 612
             "big.js": "^3.1.3",
@@ -628,12 +628,12 @@
628 628
         },
629 629
         "source-map": {
630 630
           "version": "0.5.7",
631
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
631
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
632 632
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
633 633
         },
634 634
         "strip-ansi": {
635 635
           "version": "3.0.1",
636
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
636
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
637 637
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
638 638
           "requires": {
639 639
             "ansi-regex": "^2.0.0"
@@ -641,7 +641,7 @@
641 641
         },
642 642
         "supports-color": {
643 643
           "version": "3.2.3",
644
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
644
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz",
645 645
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
646 646
           "requires": {
647 647
             "has-flag": "^1.0.0"
@@ -2806,8 +2806,8 @@
2806 2806
     },
2807 2807
     "css-loader": {
2808 2808
       "version": "0.28.7",
2809
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
2810
-      "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==",
2809
+      "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-0.28.7.tgz",
2810
+      "integrity": "sha1-Xy7pid0y7dkHcX+VMxdlYWCZnBs=",
2811 2811
       "requires": {
2812 2812
         "babel-code-frame": "^6.11.0",
2813 2813
         "css-selector-tokenizer": "^0.7.0",
@@ -2861,8 +2861,8 @@
2861 2861
         },
2862 2862
         "postcss": {
2863 2863
           "version": "5.2.18",
2864
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
2865
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
2864
+          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz",
2865
+          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
2866 2866
           "requires": {
2867 2867
             "chalk": "^1.1.3",
2868 2868
             "js-base64": "^2.1.9",
@@ -2919,8 +2919,8 @@
2919 2919
     },
2920 2920
     "css-selector-tokenizer": {
2921 2921
       "version": "0.7.1",
2922
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
2923
-      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
2922
+      "resolved": "https://registry.npm.taobao.org/css-selector-tokenizer/download/css-selector-tokenizer-0.7.1.tgz",
2923
+      "integrity": "sha1-oXcnGovKUBkXL0+JH8bu2cv2jV0=",
2924 2924
       "requires": {
2925 2925
         "cssesc": "^0.1.0",
2926 2926
         "fastparse": "^1.1.1",
@@ -4317,8 +4317,8 @@
4317 4317
     },
4318 4318
     "fastparse": {
4319 4319
       "version": "1.1.2",
4320
-      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
4321
-      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="
4320
+      "resolved": "https://registry.npm.taobao.org/fastparse/download/fastparse-1.1.2.tgz",
4321
+      "integrity": "sha1-kXKMWllC7O2FMSg8eUQe5BIsNak="
4322 4322
     },
4323 4323
     "faye-websocket": {
4324 4324
       "version": "0.10.0",
@@ -6323,6 +6323,12 @@
6323 6323
         "pretty-format": "^23.6.0"
6324 6324
       }
6325 6325
     },
6326
+    "jquery": {
6327
+      "version": "3.4.1",
6328
+      "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.4.1.tgz",
6329
+      "integrity": "sha1-cU8fjZ3eS9+lV2S6N+8hRjDYDvI=",
6330
+      "dev": true
6331
+    },
6326 6332
     "js-base64": {
6327 6333
       "version": "2.5.1",
6328 6334
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@@ -6841,7 +6847,7 @@
6841 6847
     },
6842 6848
     "lodash._baseassign": {
6843 6849
       "version": "3.2.0",
6844
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
6850
+      "resolved": "https://registry.npm.taobao.org/lodash._baseassign/download/lodash._baseassign-3.2.0.tgz",
6845 6851
       "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
6846 6852
       "requires": {
6847 6853
         "lodash._basecopy": "^3.0.0",
@@ -6850,17 +6856,17 @@
6850 6856
     },
6851 6857
     "lodash._basecopy": {
6852 6858
       "version": "3.0.1",
6853
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
6859
+      "resolved": "https://registry.npm.taobao.org/lodash._basecopy/download/lodash._basecopy-3.0.1.tgz",
6854 6860
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
6855 6861
     },
6856 6862
     "lodash._bindcallback": {
6857 6863
       "version": "3.0.1",
6858
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
6864
+      "resolved": "https://registry.npm.taobao.org/lodash._bindcallback/download/lodash._bindcallback-3.0.1.tgz",
6859 6865
       "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
6860 6866
     },
6861 6867
     "lodash._createassigner": {
6862 6868
       "version": "3.1.1",
6863
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
6869
+      "resolved": "https://registry.npm.taobao.org/lodash._createassigner/download/lodash._createassigner-3.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash._createassigner%2Fdownload%2Flodash._createassigner-3.1.1.tgz",
6864 6870
       "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
6865 6871
       "requires": {
6866 6872
         "lodash._bindcallback": "^3.0.0",
@@ -6870,12 +6876,12 @@
6870 6876
     },
6871 6877
     "lodash._getnative": {
6872 6878
       "version": "3.9.1",
6873
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
6879
+      "resolved": "https://registry.npm.taobao.org/lodash._getnative/download/lodash._getnative-3.9.1.tgz",
6874 6880
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
6875 6881
     },
6876 6882
     "lodash._isiterateecall": {
6877 6883
       "version": "3.0.9",
6878
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
6884
+      "resolved": "https://registry.npm.taobao.org/lodash._isiterateecall/download/lodash._isiterateecall-3.0.9.tgz",
6879 6885
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
6880 6886
     },
6881 6887
     "lodash.assign": {
@@ -6896,22 +6902,22 @@
6896 6902
     },
6897 6903
     "lodash.defaults": {
6898 6904
       "version": "4.2.0",
6899
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
6905
+      "resolved": "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz",
6900 6906
       "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
6901 6907
     },
6902 6908
     "lodash.isarguments": {
6903 6909
       "version": "3.1.0",
6904
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
6910
+      "resolved": "https://registry.npm.taobao.org/lodash.isarguments/download/lodash.isarguments-3.1.0.tgz",
6905 6911
       "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
6906 6912
     },
6907 6913
     "lodash.isarray": {
6908 6914
       "version": "3.0.4",
6909
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
6915
+      "resolved": "https://registry.npm.taobao.org/lodash.isarray/download/lodash.isarray-3.0.4.tgz",
6910 6916
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
6911 6917
     },
6912 6918
     "lodash.keys": {
6913 6919
       "version": "3.1.2",
6914
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
6920
+      "resolved": "https://registry.npm.taobao.org/lodash.keys/download/lodash.keys-3.1.2.tgz",
6915 6921
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
6916 6922
       "requires": {
6917 6923
         "lodash._getnative": "^3.0.0",
@@ -6932,7 +6938,7 @@
6932 6938
     },
6933 6939
     "lodash.restparam": {
6934 6940
       "version": "3.6.1",
6935
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
6941
+      "resolved": "https://registry.npm.taobao.org/lodash.restparam/download/lodash.restparam-3.6.1.tgz",
6936 6942
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
6937 6943
     },
6938 6944
     "lodash.tail": {
@@ -7678,7 +7684,7 @@
7678 7684
     },
7679 7685
     "normalize.css": {
7680 7686
       "version": "7.0.0",
7681
-      "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-7.0.0.tgz",
7687
+      "resolved": "https://registry.npm.taobao.org/normalize.css/download/normalize.css-7.0.0.tgz",
7682 7688
       "integrity": "sha1-q/sd2CRwZ04DIrU86xqvQSk45L8="
7683 7689
     },
7684 7690
     "npm-path": {
@@ -7797,7 +7803,7 @@
7797 7803
     },
7798 7804
     "object-path": {
7799 7805
       "version": "0.9.2",
7800
-      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
7806
+      "resolved": "https://registry.npm.taobao.org/object-path/download/object-path-0.9.2.tgz",
7801 7807
       "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU="
7802 7808
     },
7803 7809
     "object-visit": {
@@ -9743,8 +9749,8 @@
9743 9749
     },
9744 9750
     "postcss-modules-extract-imports": {
9745 9751
       "version": "1.2.1",
9746
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz",
9747
-      "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==",
9752
+      "resolved": "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-1.2.1.tgz",
9753
+      "integrity": "sha1-3IfjQUjsfqtfeR981YSYMzdbdBo=",
9748 9754
       "requires": {
9749 9755
         "postcss": "^6.0.1"
9750 9756
       }
@@ -10390,7 +10396,7 @@
10390 10396
     },
10391 10397
     "postcss-safe-parser": {
10392 10398
       "version": "1.0.7",
10393
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-1.0.7.tgz",
10399
+      "resolved": "https://registry.npm.taobao.org/postcss-safe-parser/download/postcss-safe-parser-1.0.7.tgz",
10394 10400
       "integrity": "sha1-Q70MjITV99hHTeglxpnk2ryscqg=",
10395 10401
       "requires": {
10396 10402
         "postcss": "^5.0.18"
@@ -10398,17 +10404,17 @@
10398 10404
       "dependencies": {
10399 10405
         "ansi-regex": {
10400 10406
           "version": "2.1.1",
10401
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
10407
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz?cache=0&sync_timestamp=1570188663907&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-regex%2Fdownload%2Fansi-regex-2.1.1.tgz",
10402 10408
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
10403 10409
         },
10404 10410
         "ansi-styles": {
10405 10411
           "version": "2.2.1",
10406
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
10412
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
10407 10413
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
10408 10414
         },
10409 10415
         "chalk": {
10410 10416
           "version": "1.1.3",
10411
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
10417
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
10412 10418
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
10413 10419
           "requires": {
10414 10420
             "ansi-styles": "^2.2.1",
@@ -10420,14 +10426,14 @@
10420 10426
           "dependencies": {
10421 10427
             "supports-color": {
10422 10428
               "version": "2.0.0",
10423
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
10429
+              "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
10424 10430
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
10425 10431
             }
10426 10432
           }
10427 10433
         },
10428 10434
         "has-flag": {
10429 10435
           "version": "1.0.0",
10430
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
10436
+          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
10431 10437
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
10432 10438
         },
10433 10439
         "postcss": {
@@ -10443,12 +10449,12 @@
10443 10449
         },
10444 10450
         "source-map": {
10445 10451
           "version": "0.5.7",
10446
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
10452
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
10447 10453
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
10448 10454
         },
10449 10455
         "strip-ansi": {
10450 10456
           "version": "3.0.1",
10451
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
10457
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
10452 10458
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
10453 10459
           "requires": {
10454 10460
             "ansi-regex": "^2.0.0"
@@ -10456,7 +10462,7 @@
10456 10462
         },
10457 10463
         "supports-color": {
10458 10464
           "version": "3.2.3",
10459
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
10465
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-3.2.3.tgz",
10460 10466
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
10461 10467
           "requires": {
10462 10468
             "has-flag": "^1.0.0"
@@ -11649,7 +11655,7 @@
11649 11655
       "dependencies": {
11650 11656
         "source-map": {
11651 11657
           "version": "0.5.7",
11652
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
11658
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
11653 11659
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
11654 11660
         }
11655 11661
       }
@@ -11671,7 +11677,7 @@
11671 11677
     },
11672 11678
     "rework": {
11673 11679
       "version": "1.0.1",
11674
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
11680
+      "resolved": "https://registry.npm.taobao.org/rework/download/rework-1.0.1.tgz",
11675 11681
       "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
11676 11682
       "requires": {
11677 11683
         "convert-source-map": "^0.3.3",
@@ -11680,14 +11686,14 @@
11680 11686
       "dependencies": {
11681 11687
         "convert-source-map": {
11682 11688
           "version": "0.3.5",
11683
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
11689
+          "resolved": "https://registry.npm.taobao.org/convert-source-map/download/convert-source-map-0.3.5.tgz",
11684 11690
           "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
11685 11691
         }
11686 11692
       }
11687 11693
     },
11688 11694
     "rework-visit": {
11689 11695
       "version": "1.0.0",
11690
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
11696
+      "resolved": "https://registry.npm.taobao.org/rework-visit/download/rework-visit-1.0.0.tgz",
11691 11697
       "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
11692 11698
     },
11693 11699
     "right-align": {
@@ -12869,12 +12875,39 @@
12869 12875
       "dev": true
12870 12876
     },
12871 12877
     "style-loader": {
12872
-      "version": "0.19.1",
12873
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
12874
-      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
12878
+      "version": "1.0.0",
12879
+      "resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-1.0.0.tgz",
12880
+      "integrity": "sha1-HVKW+RZejiyF0k7uC3yvnsjKH4I=",
12875 12881
       "requires": {
12876
-        "loader-utils": "^1.0.2",
12877
-        "schema-utils": "^0.3.0"
12882
+        "loader-utils": "^1.2.3",
12883
+        "schema-utils": "^2.0.1"
12884
+      },
12885
+      "dependencies": {
12886
+        "ajv": {
12887
+          "version": "6.10.2",
12888
+          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.10.2.tgz",
12889
+          "integrity": "sha1-086gTWsBeyiUrWkED+yLYj60vVI=",
12890
+          "requires": {
12891
+            "fast-deep-equal": "^2.0.1",
12892
+            "fast-json-stable-stringify": "^2.0.0",
12893
+            "json-schema-traverse": "^0.4.1",
12894
+            "uri-js": "^4.2.2"
12895
+          }
12896
+        },
12897
+        "ajv-keywords": {
12898
+          "version": "3.4.1",
12899
+          "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.4.1.tgz",
12900
+          "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo="
12901
+        },
12902
+        "schema-utils": {
12903
+          "version": "2.5.0",
12904
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.5.0.tgz?cache=0&sync_timestamp=1571141316329&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.5.0.tgz",
12905
+          "integrity": "sha1-jyVPYY1ALMgCV0hiE8iXDt/Xwi8=",
12906
+          "requires": {
12907
+            "ajv": "^6.10.2",
12908
+            "ajv-keywords": "^3.4.1"
12909
+          }
12910
+        }
12878 12911
       }
12879 12912
     },
12880 12913
     "supports-color": {
@@ -13880,6 +13913,17 @@
13880 13913
         "vue-template-compiler": "^2.4.4",
13881 13914
         "webpack": "^3.6.0",
13882 13915
         "webpack-dev-server": "^2.9.1"
13916
+      },
13917
+      "dependencies": {
13918
+        "style-loader": {
13919
+          "version": "0.19.1",
13920
+          "resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-0.19.1.tgz",
13921
+          "integrity": "sha1-WR/8gLzv4mi3fF2evAUF13Jhn4U=",
13922
+          "requires": {
13923
+            "loader-utils": "^1.0.2",
13924
+            "schema-utils": "^0.3.0"
13925
+          }
13926
+        }
13883 13927
       }
13884 13928
     },
13885 13929
     "vue-quill-editor": {

+ 4 - 2
package.json View File

@@ -56,7 +56,7 @@
56 56
     "jszip": "3.1.5",
57 57
     "mint-ui": "^2.2.13",
58 58
     "mockjs": "1.0.1-beta3",
59
-    "normalize.css": "7.0.0",
59
+    "normalize.css": "^7.0.0",
60 60
     "nprogress": "0.2.0",
61 61
     "print-js": "^1.0.50",
62 62
     "qrcode": "^1.4.1",
@@ -67,6 +67,7 @@
67 67
     "simplemde": "1.11.2",
68 68
     "sortablejs": "1.7.0",
69 69
     "spark-md5": "^3.0.0",
70
+    "style-loader": "^1.0.0",
70 71
     "swiper": "^4.5.1",
71 72
     "v-viewer": "^1.4.2",
72 73
     "vue": "2.5.16",
@@ -99,7 +100,7 @@
99 100
     "chalk": "2.3.0",
100 101
     "copy-webpack-plugin": "4.3.0",
101 102
     "cross-env": "5.1.1",
102
-    "css-loader": "0.28.7",
103
+    "css-loader": "^0.28.7",
103 104
     "eslint": "4.13.1",
104 105
     "eslint-friendly-formatter": "3.0.0",
105 106
     "eslint-loader": "1.9.0",
@@ -108,6 +109,7 @@
108 109
     "file-loader": "1.1.5",
109 110
     "friendly-errors-webpack-plugin": "1.6.1",
110 111
     "html-webpack-plugin": "2.30.1",
112
+    "jquery": "^3.4.1",
111 113
     "lint-staged": "7.2.0",
112 114
     "node-notifier": "5.1.2",
113 115
     "node-sass": "^4.7.2",

+ 5 - 1
src/scrm_pages/activity/activity.vue View File

@@ -186,7 +186,9 @@ export default {
186 186
     float: left;
187 187
     width: 5rem;
188 188
     height: 5rem;
189
-    border-radius: 12px;
189
+    img {
190
+      border-radius: 0.75rem;
191
+    }
190 192
   }
191 193
   .detail {
192 194
     float: left;
@@ -196,6 +198,7 @@ export default {
196 198
       margin-top: 0.5rem;
197 199
       width: 12.6875rem;
198 200
       height: 1.0625rem;
201
+      line-height: 1.0625rem;
199 202
       font-size: 0.9375rem;
200 203
       font-weight: 600;
201 204
       color: rgba(7, 18, 40, 1);
@@ -213,6 +216,7 @@ export default {
213 216
 }
214 217
 .detailBox {
215 218
   margin-top: 0.625rem;
219
+  height: 3rem;
216 220
   .activityTime {
217 221
     float: left;
218 222
     width: 7.375rem;

+ 4 - 1
src/scrm_pages/medicalTeam/medicalTeam.vue View File

@@ -125,7 +125,9 @@ export default {
125 125
     float: left;
126 126
     width: 5rem;
127 127
     height: 5rem;
128
-    border-radius: 12px;
128
+    img {
129
+      border-radius: 0.75rem;
130
+    }
129 131
   }
130 132
   .detail {
131 133
     float: left;
@@ -135,6 +137,7 @@ export default {
135 137
       margin-top: 0.5rem;
136 138
       width: 12.6875rem;
137 139
       height: 1.0625rem;
140
+      line-height: 1.0625rem;
138 141
       font-size: 0.9375rem;
139 142
       font-weight: 600;
140 143
       color: rgba(7, 18, 40, 1);

+ 25 - 16
src/scrm_pages/microHome/microHome.vue View File

@@ -205,6 +205,7 @@
205 205
 
206 206
 <script>
207 207
 import Swiper from "swiper";
208
+import $ from "jquery";
208 209
 import {
209 210
   getHospitaldata,
210 211
   getArticlelist,
@@ -345,7 +346,9 @@ export default {
345 346
 
346 347
 <style lang="scss" scoped>
347 348
 @import "../../assets/styles/mixin.scss";
349
+
348 350
 .page_home {
351
+  overflow: hidden;
349 352
   display: flex;
350 353
   flex-direction: column;
351 354
   height: 100%;
@@ -401,14 +404,14 @@ export default {
401 404
   img {
402 405
     margin-bottom: 0.3125rem;
403 406
     text-align: center;
404
-    width: 2.8125rem;
405
-    height: 2.8125rem;
406
-    background: linear-gradient(
407
-      0deg,
408
-      rgba(255, 201, 115, 1),
409
-      rgba(254, 207, 57, 1)
410
-    );
411
-    box-shadow: 0px 3px 12px 0px rgba(254, 206, 64, 0.25);
407
+    width: 3.125rem;
408
+    height: 3.125rem;
409
+    // background: linear-gradient(
410
+    //   0deg,
411
+    //   rgba(255, 201, 115, 1),
412
+    //   rgba(254, 207, 57, 1)
413
+    // );
414
+    // box-shadow: 0px 3px 12px 0px rgba(254, 206, 64, 0.25);
412 415
     border-radius: 50%;
413 416
   }
414 417
   .title {
@@ -474,7 +477,9 @@ export default {
474 477
     float: left;
475 478
     width: 5rem;
476 479
     height: 5rem;
477
-    border-radius: 12px;
480
+    img {
481
+      border-radius: 0.75rem;
482
+    }
478 483
   }
479 484
   .detail {
480 485
     float: left;
@@ -536,15 +541,19 @@ export default {
536 541
   .commonMessage {
537 542
     margin-top: 1.375rem;
538 543
     width: 17.75rem;
539
-    height: 5.0625rem;
544
+    height: 15rem;
540 545
     font-size: 0.875rem;
541 546
     color: rgba(60, 60, 60, 1);
542 547
     line-height: 1.375rem;
548
+    overflow: hidden;
543 549
     // border: solid 1px red;
544
-
545 550
     display: -webkit-box;
546 551
     -webkit-line-clamp: 8;
547 552
     -webkit-box-orient: vertical;
553
+    p {
554
+      height: 100%;
555
+      line-height: 1.375rem;
556
+    }
548 557
   }
549 558
   // border:solid 1px red;
550 559
 }
@@ -611,14 +620,14 @@ export default {
611 620
     align-items: center;
612 621
 
613 622
     img {
614
-      margin-top: 0.5rem;
615
-      width: 1.25rem;
616
-      height: 1.25rem;
623
+      // margin-top: 0.5rem;
624
+      width: 1.875rem;
625
+      height: 1.875rem;
617 626
     }
618 627
     span {
619 628
       font-size: 0.75rem;
620
-      color: rgba(182, 186, 193, 1);
621
-      line-height: 1.3125rem;
629
+      color: #999;
630
+      // line-height: 1.3125rem;
622 631
     }
623 632
   }
624 633
 }

+ 4 - 1
src/scrm_pages/news/news.vue View File

@@ -72,7 +72,9 @@ export default {
72 72
     float: left;
73 73
     width: 5rem;
74 74
     height: 5rem;
75
-    border-radius: 12px;
75
+    img {
76
+      border-radius: 0.75rem;
77
+    }
76 78
   }
77 79
   .detail {
78 80
     float: left;
@@ -82,6 +84,7 @@ export default {
82 84
       margin-top: 0.5rem;
83 85
       width: 12.6875rem;
84 86
       height: 1rem;
87
+      line-height: 1rem;
85 88
       font-size: 0.9375rem;
86 89
       font-weight: 600;
87 90
       color: rgba(7, 18, 40, 1);