Browse Source

Merge branch 'master' of http://git.shengws.com/xmg123/micro_vue

xiaoming_global 5 years ago
parent
commit
992e239cff

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

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
 // const createLintingRule = () => ({
12
 // const createLintingRule = () => ({
20
 // })
21
 // })
21
 
22
 
22
 module.exports = {
23
 module.exports = {
23
-  context: path.resolve(__dirname, '../'),
24
+  context: path.resolve(__dirname, "../"),
24
   entry: {
25
   entry: {
25
-    app: './src/main.js'
26
+    app: "./src/main.js"
26
   },
27
   },
27
   externals: {
28
   externals: {
28
-    "BMap": "BMap"
29
+    BMap: "BMap"
29
   },
30
   },
30
   output: {
31
   output: {
31
     path: config.build.assetsRoot,
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
   resolve: {
39
   resolve: {
38
-    extensions: ['.js', '.vue', '.json'],
40
+    extensions: [".js", ".vue", ".json"],
39
     alias: {
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
   module: {
46
   module: {
46
       ...(config.dev.useEslint ? [] : []),
48
       ...(config.dev.useEslint ? [] : []),
47
       {
49
       {
48
         test: /\.vue$/,
50
         test: /\.vue$/,
49
-        loader: 'vue-loader',
51
+        loader: "vue-loader",
50
         options: vueLoaderConfig
52
         options: vueLoaderConfig
51
       },
53
       },
52
       {
54
       {
53
         test: /\.js$/,
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
         test: /\.svg$/,
64
         test: /\.svg$/,
59
-        loader: 'svg-sprite-loader',
60
-        include: [resolve('src/icons')],
65
+        loader: "svg-sprite-loader",
66
+        include: [resolve("src/icons")],
61
         options: {
67
         options: {
62
-          symbolId: 'icon-[name]'
68
+          symbolId: "icon-[name]"
63
         }
69
         }
64
       },
70
       },
65
       {
71
       {
66
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
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
         options: {
75
         options: {
70
           limit: 10000,
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
         test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
81
         test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
76
-        loader: 'url-loader',
82
+        loader: "url-loader",
77
         options: {
83
         options: {
78
           limit: 10000,
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
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
89
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
84
-        loader: 'url-loader',
90
+        loader: "url-loader",
85
         options: {
91
         options: {
86
           limit: 10000,
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
         test: /\.sass$/,
97
         test: /\.sass$/,
92
-        loaders: ['style', 'css', 'sass']
93
-      },
94
-      
98
+        loaders: ["style", "css", "sass"]
99
+      }
95
     ]
100
     ]
96
   },
101
   },
97
   node: {
102
   node: {
100
     setImmediate: false,
105
     setImmediate: false,
101
     // prevent webpack from injecting mocks to Node native modules
106
     // prevent webpack from injecting mocks to Node native modules
102
     // that does not make sense for the client
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
       "dependencies": {
210
       "dependencies": {
211
         "camelcase": {
211
         "camelcase": {
212
           "version": "1.2.1",
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
           "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
214
           "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
215
         },
215
         },
216
         "lodash.defaults": {
216
         "lodash.defaults": {
217
           "version": "3.1.2",
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
           "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
219
           "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
220
           "requires": {
220
           "requires": {
221
             "lodash.assign": "^3.0.0",
221
             "lodash.assign": "^3.0.0",
224
           "dependencies": {
224
           "dependencies": {
225
             "lodash.assign": {
225
             "lodash.assign": {
226
               "version": "3.2.0",
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
               "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
228
               "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
229
               "requires": {
229
               "requires": {
230
                 "lodash._baseassign": "^3.0.0",
230
                 "lodash._baseassign": "^3.0.0",
534
     },
534
     },
535
     "autoprefixer-loader": {
535
     "autoprefixer-loader": {
536
       "version": "3.2.0",
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
       "integrity": "sha1-Oae2ZGqCaYZQc9lYyX9IYVLCyEo=",
538
       "integrity": "sha1-Oae2ZGqCaYZQc9lYyX9IYVLCyEo=",
539
       "requires": {
539
       "requires": {
540
         "autoprefixer": "^6.0.2",
540
         "autoprefixer": "^6.0.2",
545
       "dependencies": {
545
       "dependencies": {
546
         "ansi-regex": {
546
         "ansi-regex": {
547
           "version": "2.1.1",
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
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
549
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
550
         },
550
         },
551
         "ansi-styles": {
551
         "ansi-styles": {
552
           "version": "2.2.1",
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
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
554
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
555
         },
555
         },
556
         "autoprefixer": {
556
         "autoprefixer": {
557
           "version": "6.7.7",
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
           "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
559
           "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
560
           "requires": {
560
           "requires": {
561
             "browserslist": "^1.7.6",
561
             "browserslist": "^1.7.6",
573
         },
573
         },
574
         "browserslist": {
574
         "browserslist": {
575
           "version": "1.7.7",
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
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
577
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
578
           "requires": {
578
           "requires": {
579
             "caniuse-db": "^1.0.30000639",
579
             "caniuse-db": "^1.0.30000639",
582
         },
582
         },
583
         "chalk": {
583
         "chalk": {
584
           "version": "1.1.3",
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
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
586
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
587
           "requires": {
587
           "requires": {
588
             "ansi-styles": "^2.2.1",
588
             "ansi-styles": "^2.2.1",
594
           "dependencies": {
594
           "dependencies": {
595
             "supports-color": {
595
             "supports-color": {
596
               "version": "2.0.0",
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
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
598
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
599
             }
599
             }
600
           }
600
           }
601
         },
601
         },
602
         "has-flag": {
602
         "has-flag": {
603
           "version": "1.0.0",
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
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
605
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
606
         },
606
         },
607
         "loader-utils": {
607
         "loader-utils": {
608
           "version": "0.2.17",
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
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
610
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
611
           "requires": {
611
           "requires": {
612
             "big.js": "^3.1.3",
612
             "big.js": "^3.1.3",
628
         },
628
         },
629
         "source-map": {
629
         "source-map": {
630
           "version": "0.5.7",
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
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
632
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
633
         },
633
         },
634
         "strip-ansi": {
634
         "strip-ansi": {
635
           "version": "3.0.1",
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
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
637
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
638
           "requires": {
638
           "requires": {
639
             "ansi-regex": "^2.0.0"
639
             "ansi-regex": "^2.0.0"
641
         },
641
         },
642
         "supports-color": {
642
         "supports-color": {
643
           "version": "3.2.3",
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
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
645
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
646
           "requires": {
646
           "requires": {
647
             "has-flag": "^1.0.0"
647
             "has-flag": "^1.0.0"
2806
     },
2806
     },
2807
     "css-loader": {
2807
     "css-loader": {
2808
       "version": "0.28.7",
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
       "requires": {
2811
       "requires": {
2812
         "babel-code-frame": "^6.11.0",
2812
         "babel-code-frame": "^6.11.0",
2813
         "css-selector-tokenizer": "^0.7.0",
2813
         "css-selector-tokenizer": "^0.7.0",
2861
         },
2861
         },
2862
         "postcss": {
2862
         "postcss": {
2863
           "version": "5.2.18",
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
           "requires": {
2866
           "requires": {
2867
             "chalk": "^1.1.3",
2867
             "chalk": "^1.1.3",
2868
             "js-base64": "^2.1.9",
2868
             "js-base64": "^2.1.9",
2919
     },
2919
     },
2920
     "css-selector-tokenizer": {
2920
     "css-selector-tokenizer": {
2921
       "version": "0.7.1",
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
       "requires": {
2924
       "requires": {
2925
         "cssesc": "^0.1.0",
2925
         "cssesc": "^0.1.0",
2926
         "fastparse": "^1.1.1",
2926
         "fastparse": "^1.1.1",
4317
     },
4317
     },
4318
     "fastparse": {
4318
     "fastparse": {
4319
       "version": "1.1.2",
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
     "faye-websocket": {
4323
     "faye-websocket": {
4324
       "version": "0.10.0",
4324
       "version": "0.10.0",
6323
         "pretty-format": "^23.6.0"
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
     "js-base64": {
6332
     "js-base64": {
6327
       "version": "2.5.1",
6333
       "version": "2.5.1",
6328
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
6334
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
6841
     },
6847
     },
6842
     "lodash._baseassign": {
6848
     "lodash._baseassign": {
6843
       "version": "3.2.0",
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
       "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
6851
       "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
6846
       "requires": {
6852
       "requires": {
6847
         "lodash._basecopy": "^3.0.0",
6853
         "lodash._basecopy": "^3.0.0",
6850
     },
6856
     },
6851
     "lodash._basecopy": {
6857
     "lodash._basecopy": {
6852
       "version": "3.0.1",
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
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
6860
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
6855
     },
6861
     },
6856
     "lodash._bindcallback": {
6862
     "lodash._bindcallback": {
6857
       "version": "3.0.1",
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
       "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
6865
       "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
6860
     },
6866
     },
6861
     "lodash._createassigner": {
6867
     "lodash._createassigner": {
6862
       "version": "3.1.1",
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
       "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
6870
       "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
6865
       "requires": {
6871
       "requires": {
6866
         "lodash._bindcallback": "^3.0.0",
6872
         "lodash._bindcallback": "^3.0.0",
6870
     },
6876
     },
6871
     "lodash._getnative": {
6877
     "lodash._getnative": {
6872
       "version": "3.9.1",
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
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
6880
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
6875
     },
6881
     },
6876
     "lodash._isiterateecall": {
6882
     "lodash._isiterateecall": {
6877
       "version": "3.0.9",
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
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
6885
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
6880
     },
6886
     },
6881
     "lodash.assign": {
6887
     "lodash.assign": {
6896
     },
6902
     },
6897
     "lodash.defaults": {
6903
     "lodash.defaults": {
6898
       "version": "4.2.0",
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
       "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
6906
       "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
6901
     },
6907
     },
6902
     "lodash.isarguments": {
6908
     "lodash.isarguments": {
6903
       "version": "3.1.0",
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
       "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
6911
       "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
6906
     },
6912
     },
6907
     "lodash.isarray": {
6913
     "lodash.isarray": {
6908
       "version": "3.0.4",
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
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
6916
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
6911
     },
6917
     },
6912
     "lodash.keys": {
6918
     "lodash.keys": {
6913
       "version": "3.1.2",
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
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
6921
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
6916
       "requires": {
6922
       "requires": {
6917
         "lodash._getnative": "^3.0.0",
6923
         "lodash._getnative": "^3.0.0",
6932
     },
6938
     },
6933
     "lodash.restparam": {
6939
     "lodash.restparam": {
6934
       "version": "3.6.1",
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
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
6942
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
6937
     },
6943
     },
6938
     "lodash.tail": {
6944
     "lodash.tail": {
7678
     },
7684
     },
7679
     "normalize.css": {
7685
     "normalize.css": {
7680
       "version": "7.0.0",
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
       "integrity": "sha1-q/sd2CRwZ04DIrU86xqvQSk45L8="
7688
       "integrity": "sha1-q/sd2CRwZ04DIrU86xqvQSk45L8="
7683
     },
7689
     },
7684
     "npm-path": {
7690
     "npm-path": {
7797
     },
7803
     },
7798
     "object-path": {
7804
     "object-path": {
7799
       "version": "0.9.2",
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
       "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU="
7807
       "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU="
7802
     },
7808
     },
7803
     "object-visit": {
7809
     "object-visit": {
9743
     },
9749
     },
9744
     "postcss-modules-extract-imports": {
9750
     "postcss-modules-extract-imports": {
9745
       "version": "1.2.1",
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
       "requires": {
9754
       "requires": {
9749
         "postcss": "^6.0.1"
9755
         "postcss": "^6.0.1"
9750
       }
9756
       }
10390
     },
10396
     },
10391
     "postcss-safe-parser": {
10397
     "postcss-safe-parser": {
10392
       "version": "1.0.7",
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
       "integrity": "sha1-Q70MjITV99hHTeglxpnk2ryscqg=",
10400
       "integrity": "sha1-Q70MjITV99hHTeglxpnk2ryscqg=",
10395
       "requires": {
10401
       "requires": {
10396
         "postcss": "^5.0.18"
10402
         "postcss": "^5.0.18"
10398
       "dependencies": {
10404
       "dependencies": {
10399
         "ansi-regex": {
10405
         "ansi-regex": {
10400
           "version": "2.1.1",
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
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
10408
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
10403
         },
10409
         },
10404
         "ansi-styles": {
10410
         "ansi-styles": {
10405
           "version": "2.2.1",
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
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
10413
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
10408
         },
10414
         },
10409
         "chalk": {
10415
         "chalk": {
10410
           "version": "1.1.3",
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
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
10418
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
10413
           "requires": {
10419
           "requires": {
10414
             "ansi-styles": "^2.2.1",
10420
             "ansi-styles": "^2.2.1",
10420
           "dependencies": {
10426
           "dependencies": {
10421
             "supports-color": {
10427
             "supports-color": {
10422
               "version": "2.0.0",
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
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
10430
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
10425
             }
10431
             }
10426
           }
10432
           }
10427
         },
10433
         },
10428
         "has-flag": {
10434
         "has-flag": {
10429
           "version": "1.0.0",
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
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
10437
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
10432
         },
10438
         },
10433
         "postcss": {
10439
         "postcss": {
10443
         },
10449
         },
10444
         "source-map": {
10450
         "source-map": {
10445
           "version": "0.5.7",
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
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
10453
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
10448
         },
10454
         },
10449
         "strip-ansi": {
10455
         "strip-ansi": {
10450
           "version": "3.0.1",
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
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
10458
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
10453
           "requires": {
10459
           "requires": {
10454
             "ansi-regex": "^2.0.0"
10460
             "ansi-regex": "^2.0.0"
10456
         },
10462
         },
10457
         "supports-color": {
10463
         "supports-color": {
10458
           "version": "3.2.3",
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
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
10466
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
10461
           "requires": {
10467
           "requires": {
10462
             "has-flag": "^1.0.0"
10468
             "has-flag": "^1.0.0"
11649
       "dependencies": {
11655
       "dependencies": {
11650
         "source-map": {
11656
         "source-map": {
11651
           "version": "0.5.7",
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
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
11659
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
11654
         }
11660
         }
11655
       }
11661
       }
11671
     },
11677
     },
11672
     "rework": {
11678
     "rework": {
11673
       "version": "1.0.1",
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
       "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
11681
       "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
11676
       "requires": {
11682
       "requires": {
11677
         "convert-source-map": "^0.3.3",
11683
         "convert-source-map": "^0.3.3",
11680
       "dependencies": {
11686
       "dependencies": {
11681
         "convert-source-map": {
11687
         "convert-source-map": {
11682
           "version": "0.3.5",
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
           "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
11690
           "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
11685
         }
11691
         }
11686
       }
11692
       }
11687
     },
11693
     },
11688
     "rework-visit": {
11694
     "rework-visit": {
11689
       "version": "1.0.0",
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
       "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
11697
       "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
11692
     },
11698
     },
11693
     "right-align": {
11699
     "right-align": {
12869
       "dev": true
12875
       "dev": true
12870
     },
12876
     },
12871
     "style-loader": {
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
       "requires": {
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
     "supports-color": {
12913
     "supports-color": {
13880
         "vue-template-compiler": "^2.4.4",
13913
         "vue-template-compiler": "^2.4.4",
13881
         "webpack": "^3.6.0",
13914
         "webpack": "^3.6.0",
13882
         "webpack-dev-server": "^2.9.1"
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
     "vue-quill-editor": {
13929
     "vue-quill-editor": {

+ 4 - 2
package.json View File

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

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

90
     float: left;
90
     float: left;
91
     width: 5rem;
91
     width: 5rem;
92
     height: 5rem;
92
     height: 5rem;
93
-    border-radius: 12px;
93
+    img {
94
+      border-radius: 0.75rem;
95
+    }
94
   }
96
   }
95
   .detail {
97
   .detail {
96
     float: left;
98
     float: left;
100
       margin-top: 0.5rem;
102
       margin-top: 0.5rem;
101
       width: 12.6875rem;
103
       width: 12.6875rem;
102
       height: 1.0625rem;
104
       height: 1.0625rem;
105
+      line-height: 1.0625rem;
103
       font-size: 0.9375rem;
106
       font-size: 0.9375rem;
104
       font-weight: 600;
107
       font-weight: 600;
105
       color: rgba(7, 18, 40, 1);
108
       color: rgba(7, 18, 40, 1);
117
 }
120
 }
118
 .detailBox {
121
 .detailBox {
119
   margin-top: 0.625rem;
122
   margin-top: 0.625rem;
123
+  height: 3rem;
120
   .activityTime {
124
   .activityTime {
121
     float: left;
125
     float: left;
122
     width: 7.375rem;
126
     width: 7.375rem;

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

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

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

198
 
198
 
199
 <script>
199
 <script>
200
 import Swiper from "swiper";
200
 import Swiper from "swiper";
201
+import $ from "jquery";
201
 import {
202
 import {
202
   getHospitaldata,
203
   getHospitaldata,
203
   getArticlelist,
204
   getArticlelist,
355
 
356
 
356
 <style lang="scss" scoped>
357
 <style lang="scss" scoped>
357
 @import "../../assets/styles/mixin.scss";
358
 @import "../../assets/styles/mixin.scss";
359
+
358
 .page_home {
360
 .page_home {
361
+  overflow: hidden;
359
   display: flex;
362
   display: flex;
360
   flex-direction: column;
363
   flex-direction: column;
361
   height: 100%;
364
   height: 100%;
411
   img {
414
   img {
412
     margin-bottom: 0.3125rem;
415
     margin-bottom: 0.3125rem;
413
     text-align: center;
416
     text-align: center;
414
-    width: 2.8125rem;
415
-    height: 2.8125rem;
416
-    background: linear-gradient(
417
-      0deg,
418
-      rgba(255, 201, 115, 1),
419
-      rgba(254, 207, 57, 1)
420
-    );
421
-    box-shadow: 0px 3px 12px 0px rgba(254, 206, 64, 0.25);
417
+    width: 3.125rem;
418
+    height: 3.125rem;
419
+    // background: linear-gradient(
420
+    //   0deg,
421
+    //   rgba(255, 201, 115, 1),
422
+    //   rgba(254, 207, 57, 1)
423
+    // );
424
+    // box-shadow: 0px 3px 12px 0px rgba(254, 206, 64, 0.25);
422
     border-radius: 50%;
425
     border-radius: 50%;
423
   }
426
   }
424
   .title {
427
   .title {
484
     float: left;
487
     float: left;
485
     width: 5rem;
488
     width: 5rem;
486
     height: 5rem;
489
     height: 5rem;
487
-    border-radius: 12px;
490
+    img {
491
+      border-radius: 0.75rem;
492
+    }
488
   }
493
   }
489
   .detail {
494
   .detail {
490
     float: left;
495
     float: left;
546
   .commonMessage {
551
   .commonMessage {
547
     margin-top: 1.375rem;
552
     margin-top: 1.375rem;
548
     width: 17.75rem;
553
     width: 17.75rem;
549
-    height: 5.0625rem;
554
+    height: 15rem;
550
     font-size: 0.875rem;
555
     font-size: 0.875rem;
551
     color: rgba(60, 60, 60, 1);
556
     color: rgba(60, 60, 60, 1);
552
     line-height: 1.375rem;
557
     line-height: 1.375rem;
558
+    overflow: hidden;
553
     // border: solid 1px red;
559
     // border: solid 1px red;
554
-
555
     display: -webkit-box;
560
     display: -webkit-box;
556
     -webkit-line-clamp: 8;
561
     -webkit-line-clamp: 8;
557
     -webkit-box-orient: vertical;
562
     -webkit-box-orient: vertical;
563
+    p {
564
+      height: 100%;
565
+      line-height: 1.375rem;
566
+    }
558
   }
567
   }
559
   // border:solid 1px red;
568
   // border:solid 1px red;
560
 }
569
 }
621
     align-items: center;
630
     align-items: center;
622
 
631
 
623
     img {
632
     img {
624
-      margin-top: 0.5rem;
625
-      width: 1.25rem;
626
-      height: 1.25rem;
633
+      // margin-top: 0.5rem;
634
+      width: 1.875rem;
635
+      height: 1.875rem;
627
     }
636
     }
628
     span {
637
     span {
629
       font-size: 0.75rem;
638
       font-size: 0.75rem;
630
-      color: rgba(182, 186, 193, 1);
631
-      line-height: 1.3125rem;
639
+      color: #999;
640
+      // line-height: 1.3125rem;
632
     }
641
     }
633
   }
642
   }
634
 }
643
 }

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

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