周立森 пре 5 година
родитељ
комит
378f11731f

+ 36
- 244
package-lock.json Прегледај датотеку

@@ -930,11 +930,6 @@
930 930
       "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
931 931
       "dev": true
932 932
     },
933
-    "@sindresorhus/is": {
934
-      "version": "0.7.0",
935
-      "resolved": "https://registry.npm.taobao.org/@sindresorhus/is/download/@sindresorhus/is-0.7.0.tgz",
936
-      "integrity": "sha1-mgb08TfuhNffBGDB/bETX/psUP0="
937
-    },
938 933
     "@soda/friendly-errors-webpack-plugin": {
939 934
       "version": "1.7.1",
940 935
       "resolved": "https://registry.npm.taobao.org/@soda/friendly-errors-webpack-plugin/download/@soda/friendly-errors-webpack-plugin-1.7.1.tgz",
@@ -3068,42 +3063,6 @@
3068 3063
         "schema-utils": "^1.0.0"
3069 3064
       }
3070 3065
     },
3071
-    "cacheable-request": {
3072
-      "version": "2.1.4",
3073
-      "resolved": "https://registry.npm.taobao.org/cacheable-request/download/cacheable-request-2.1.4.tgz",
3074
-      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
3075
-      "requires": {
3076
-        "clone-response": "1.0.2",
3077
-        "get-stream": "3.0.0",
3078
-        "http-cache-semantics": "3.8.1",
3079
-        "keyv": "3.0.0",
3080
-        "lowercase-keys": "1.0.0",
3081
-        "normalize-url": "2.0.1",
3082
-        "responselike": "1.0.2"
3083
-      },
3084
-      "dependencies": {
3085
-        "get-stream": {
3086
-          "version": "3.0.0",
3087
-          "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz",
3088
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
3089
-        },
3090
-        "lowercase-keys": {
3091
-          "version": "1.0.0",
3092
-          "resolved": "https://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-1.0.0.tgz",
3093
-          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY="
3094
-        },
3095
-        "normalize-url": {
3096
-          "version": "2.0.1",
3097
-          "resolved": "http://registry.npm.taobao.org/normalize-url/download/normalize-url-2.0.1.tgz",
3098
-          "integrity": "sha1-g1qdoVUfom9w6SMpBpojqmV01+Y=",
3099
-          "requires": {
3100
-            "prepend-http": "^2.0.0",
3101
-            "query-string": "^5.0.1",
3102
-            "sort-keys": "^2.0.0"
3103
-          }
3104
-        }
3105
-      }
3106
-    },
3107 3066
     "call-me-maybe": {
3108 3067
       "version": "1.0.1",
3109 3068
       "resolved": "http://registry.npm.taobao.org/call-me-maybe/download/call-me-maybe-1.0.1.tgz",
@@ -3393,14 +3352,6 @@
3393 3352
       "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
3394 3353
       "dev": true
3395 3354
     },
3396
-    "clone-response": {
3397
-      "version": "1.0.2",
3398
-      "resolved": "https://registry.npm.taobao.org/clone-response/download/clone-response-1.0.2.tgz",
3399
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
3400
-      "requires": {
3401
-        "mimic-response": "^1.0.0"
3402
-      }
3403
-    },
3404 3355
     "coa": {
3405 3356
       "version": "2.0.2",
3406 3357
       "resolved": "http://registry.npm.taobao.org/coa/download/coa-2.0.2.tgz",
@@ -3763,7 +3714,8 @@
3763 3714
     "core-util-is": {
3764 3715
       "version": "1.0.2",
3765 3716
       "resolved": "http://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz",
3766
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
3717
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
3718
+      "dev": true
3767 3719
     },
3768 3720
     "cosmiconfig": {
3769 3721
       "version": "5.2.1",
@@ -4190,15 +4142,8 @@
4190 4142
     "decode-uri-component": {
4191 4143
       "version": "0.2.0",
4192 4144
       "resolved": "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz",
4193
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
4194
-    },
4195
-    "decompress-response": {
4196
-      "version": "3.3.0",
4197
-      "resolved": "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz",
4198
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
4199
-      "requires": {
4200
-        "mimic-response": "^1.0.0"
4201
-      }
4145
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
4146
+      "dev": true
4202 4147
     },
4203 4148
     "deep-equal": {
4204 4149
       "version": "1.0.1",
@@ -4559,11 +4504,6 @@
4559 4504
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
4560 4505
       "dev": true
4561 4506
     },
4562
-    "duplexer3": {
4563
-      "version": "0.1.4",
4564
-      "resolved": "https://registry.npm.taobao.org/duplexer3/download/duplexer3-0.1.4.tgz",
4565
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
4566
-    },
4567 4507
     "duplexify": {
4568 4508
       "version": "3.7.1",
4569 4509
       "resolved": "https://registry.npm.taobao.org/duplexify/download/duplexify-3.7.1.tgz",
@@ -5433,6 +5373,7 @@
5433 5373
       "version": "2.3.0",
5434 5374
       "resolved": "http://registry.npm.taobao.org/from2/download/from2-2.3.0.tgz",
5435 5375
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
5376
+      "dev": true,
5436 5377
       "requires": {
5437 5378
         "inherits": "^2.0.1",
5438 5379
         "readable-stream": "^2.0.0"
@@ -6120,42 +6061,6 @@
6120 6061
         "slash": "^2.0.0"
6121 6062
       }
6122 6063
     },
6123
-    "got": {
6124
-      "version": "8.3.2",
6125
-      "resolved": "https://registry.npm.taobao.org/got/download/got-8.3.2.tgz",
6126
-      "integrity": "sha1-HSP2Q5Dpf3dsrFLluTbl9RTS6Tc=",
6127
-      "requires": {
6128
-        "@sindresorhus/is": "^0.7.0",
6129
-        "cacheable-request": "^2.1.1",
6130
-        "decompress-response": "^3.3.0",
6131
-        "duplexer3": "^0.1.4",
6132
-        "get-stream": "^3.0.0",
6133
-        "into-stream": "^3.1.0",
6134
-        "is-retry-allowed": "^1.1.0",
6135
-        "isurl": "^1.0.0-alpha5",
6136
-        "lowercase-keys": "^1.0.0",
6137
-        "mimic-response": "^1.0.0",
6138
-        "p-cancelable": "^0.4.0",
6139
-        "p-timeout": "^2.0.1",
6140
-        "pify": "^3.0.0",
6141
-        "safe-buffer": "^5.1.1",
6142
-        "timed-out": "^4.0.1",
6143
-        "url-parse-lax": "^3.0.0",
6144
-        "url-to-options": "^1.0.1"
6145
-      },
6146
-      "dependencies": {
6147
-        "get-stream": {
6148
-          "version": "3.0.0",
6149
-          "resolved": "http://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz",
6150
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
6151
-        },
6152
-        "pify": {
6153
-          "version": "3.0.0",
6154
-          "resolved": "http://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz",
6155
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
6156
-        }
6157
-      }
6158
-    },
6159 6064
     "graceful-fs": {
6160 6065
       "version": "4.2.2",
6161 6066
       "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.2.tgz",
@@ -6218,25 +6123,12 @@
6218 6123
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
6219 6124
       "dev": true
6220 6125
     },
6221
-    "has-symbol-support-x": {
6222
-      "version": "1.4.2",
6223
-      "resolved": "https://registry.npm.taobao.org/has-symbol-support-x/download/has-symbol-support-x-1.4.2.tgz",
6224
-      "integrity": "sha1-FAn5i8ACR9pF2mfO4KNvKC/yZFU="
6225
-    },
6226 6126
     "has-symbols": {
6227 6127
       "version": "1.0.0",
6228 6128
       "resolved": "http://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.0.tgz",
6229 6129
       "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
6230 6130
       "dev": true
6231 6131
     },
6232
-    "has-to-string-tag-x": {
6233
-      "version": "1.4.1",
6234
-      "resolved": "https://registry.npm.taobao.org/has-to-string-tag-x/download/has-to-string-tag-x-1.4.1.tgz",
6235
-      "integrity": "sha1-oEWrOD17SyASoAFIqwql8pAETU0=",
6236
-      "requires": {
6237
-        "has-symbol-support-x": "^1.4.1"
6238
-      }
6239
-    },
6240 6132
     "has-value": {
6241 6133
       "version": "1.0.0",
6242 6134
       "resolved": "http://registry.npm.taobao.org/has-value/download/has-value-1.0.0.tgz",
@@ -6475,11 +6367,6 @@
6475 6367
         }
6476 6368
       }
6477 6369
     },
6478
-    "http-cache-semantics": {
6479
-      "version": "3.8.1",
6480
-      "resolved": "https://registry.npm.taobao.org/http-cache-semantics/download/http-cache-semantics-3.8.1.tgz",
6481
-      "integrity": "sha1-ObDhat2bYFvwqe89nar0hDtMrNI="
6482
-    },
6483 6370
     "http-deceiver": {
6484 6371
       "version": "1.2.7",
6485 6372
       "resolved": "http://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz",
@@ -6692,7 +6579,8 @@
6692 6579
     "inherits": {
6693 6580
       "version": "2.0.4",
6694 6581
       "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz?cache=0&sync_timestamp=1560975547815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finherits%2Fdownload%2Finherits-2.0.4.tgz",
6695
-      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w="
6582
+      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
6583
+      "dev": true
6696 6584
     },
6697 6585
     "inquirer": {
6698 6586
       "version": "6.5.1",
@@ -6796,22 +6684,6 @@
6796 6684
         }
6797 6685
       }
6798 6686
     },
6799
-    "into-stream": {
6800
-      "version": "3.1.0",
6801
-      "resolved": "https://registry.npm.taobao.org/into-stream/download/into-stream-3.1.0.tgz",
6802
-      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
6803
-      "requires": {
6804
-        "from2": "^2.1.1",
6805
-        "p-is-promise": "^1.1.0"
6806
-      },
6807
-      "dependencies": {
6808
-        "p-is-promise": {
6809
-          "version": "1.1.0",
6810
-          "resolved": "https://registry.npm.taobao.org/p-is-promise/download/p-is-promise-1.1.0.tgz",
6811
-          "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4="
6812
-        }
6813
-      }
6814
-    },
6815 6687
     "invariant": {
6816 6688
       "version": "2.2.4",
6817 6689
       "resolved": "http://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz",
@@ -7025,11 +6897,6 @@
7025 6897
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
7026 6898
       "dev": true
7027 6899
     },
7028
-    "is-object": {
7029
-      "version": "1.0.1",
7030
-      "resolved": "https://registry.npm.taobao.org/is-object/download/is-object-1.0.1.tgz",
7031
-      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA="
7032
-    },
7033 6900
     "is-path-cwd": {
7034 6901
       "version": "2.2.0",
7035 6902
       "resolved": "https://registry.npm.taobao.org/is-path-cwd/download/is-path-cwd-2.2.0.tgz?cache=0&sync_timestamp=1562347283002&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-path-cwd%2Fdownload%2Fis-path-cwd-2.2.0.tgz",
@@ -7057,7 +6924,8 @@
7057 6924
     "is-plain-obj": {
7058 6925
       "version": "1.1.0",
7059 6926
       "resolved": "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-1.1.0.tgz",
7060
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
6927
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
6928
+      "dev": true
7061 6929
     },
7062 6930
     "is-plain-object": {
7063 6931
       "version": "2.0.4",
@@ -7089,11 +6957,6 @@
7089 6957
       "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
7090 6958
       "dev": true
7091 6959
     },
7092
-    "is-retry-allowed": {
7093
-      "version": "1.1.0",
7094
-      "resolved": "https://registry.npm.taobao.org/is-retry-allowed/download/is-retry-allowed-1.1.0.tgz",
7095
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
7096
-    },
7097 6960
     "is-stream": {
7098 6961
       "version": "1.1.0",
7099 6962
       "resolved": "https://registry.npm.taobao.org/is-stream/download/is-stream-1.1.0.tgz",
@@ -7139,7 +7002,8 @@
7139 7002
     "isarray": {
7140 7003
       "version": "1.0.0",
7141 7004
       "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz?cache=0&sync_timestamp=1562592096220&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fisarray%2Fdownload%2Fisarray-1.0.0.tgz",
7142
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
7005
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
7006
+      "dev": true
7143 7007
     },
7144 7008
     "isexe": {
7145 7009
       "version": "2.0.0",
@@ -7159,15 +7023,6 @@
7159 7023
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
7160 7024
       "dev": true
7161 7025
     },
7162
-    "isurl": {
7163
-      "version": "1.0.0",
7164
-      "resolved": "https://registry.npm.taobao.org/isurl/download/isurl-1.0.0.tgz",
7165
-      "integrity": "sha1-sn9PSfPNqj6kSgpbfzRi5u3DnWc=",
7166
-      "requires": {
7167
-        "has-to-string-tag-x": "^1.2.0",
7168
-        "is-object": "^1.0.1"
7169
-      }
7170
-    },
7171 7026
     "javascript-stringify": {
7172 7027
       "version": "1.6.0",
7173 7028
       "resolved": "https://registry.npm.taobao.org/javascript-stringify/download/javascript-stringify-1.6.0.tgz",
@@ -7223,11 +7078,6 @@
7223 7078
       "integrity": "sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q=",
7224 7079
       "dev": true
7225 7080
     },
7226
-    "json-buffer": {
7227
-      "version": "3.0.0",
7228
-      "resolved": "https://registry.npm.taobao.org/json-buffer/download/json-buffer-3.0.0.tgz",
7229
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
7230
-    },
7231 7081
     "json-parse-better-errors": {
7232 7082
       "version": "1.0.2",
7233 7083
       "resolved": "http://registry.npm.taobao.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz",
@@ -7302,14 +7152,6 @@
7302 7152
         "verror": "1.10.0"
7303 7153
       }
7304 7154
     },
7305
-    "keyv": {
7306
-      "version": "3.0.0",
7307
-      "resolved": "https://registry.npm.taobao.org/keyv/download/keyv-3.0.0.tgz",
7308
-      "integrity": "sha1-RJI7o55osSp87H32wyaMAx8u83M=",
7309
-      "requires": {
7310
-        "json-buffer": "3.0.0"
7311
-      }
7312
-    },
7313 7155
     "killable": {
7314 7156
       "version": "1.0.1",
7315 7157
       "resolved": "http://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -7584,11 +7426,6 @@
7584 7426
       "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
7585 7427
       "dev": true
7586 7428
     },
7587
-    "lowercase-keys": {
7588
-      "version": "1.0.1",
7589
-      "resolved": "https://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-1.0.1.tgz",
7590
-      "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8="
7591
-    },
7592 7429
     "lru-cache": {
7593 7430
       "version": "4.1.5",
7594 7431
       "resolved": "http://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz",
@@ -7776,11 +7613,6 @@
7776 7613
       "integrity": "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs=",
7777 7614
       "dev": true
7778 7615
     },
7779
-    "mimic-response": {
7780
-      "version": "1.0.1",
7781
-      "resolved": "https://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz",
7782
-      "integrity": "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs="
7783
-    },
7784 7616
     "mini-css-extract-plugin": {
7785 7617
       "version": "0.6.0",
7786 7618
       "resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.6.0.tgz?cache=0&sync_timestamp=1563310319732&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.6.0.tgz",
@@ -7893,6 +7725,11 @@
7893 7725
         "minimist": "0.0.8"
7894 7726
       }
7895 7727
     },
7728
+    "moment": {
7729
+      "version": "2.24.0",
7730
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
7731
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
7732
+    },
7896 7733
     "move-concurrently": {
7897 7734
       "version": "1.0.1",
7898 7735
       "resolved": "http://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
@@ -8144,7 +7981,8 @@
8144 7981
     "object-assign": {
8145 7982
       "version": "4.1.1",
8146 7983
       "resolved": "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
8147
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
7984
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
7985
+      "dev": true
8148 7986
     },
8149 7987
     "object-copy": {
8150 7988
       "version": "0.1.0",
@@ -8381,11 +8219,6 @@
8381 8219
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
8382 8220
       "dev": true
8383 8221
     },
8384
-    "p-cancelable": {
8385
-      "version": "0.4.1",
8386
-      "resolved": "https://registry.npm.taobao.org/p-cancelable/download/p-cancelable-0.4.1.tgz",
8387
-      "integrity": "sha1-NfNj1n1SCByNlYXje8zrfgu8sqA="
8388
-    },
8389 8222
     "p-defer": {
8390 8223
       "version": "1.0.0",
8391 8224
       "resolved": "https://registry.npm.taobao.org/p-defer/download/p-defer-1.0.0.tgz?cache=0&sync_timestamp=1559922734651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-defer%2Fdownload%2Fp-defer-1.0.0.tgz",
@@ -8395,7 +8228,8 @@
8395 8228
     "p-finally": {
8396 8229
       "version": "1.0.0",
8397 8230
       "resolved": "https://registry.npm.taobao.org/p-finally/download/p-finally-1.0.0.tgz",
8398
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
8231
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
8232
+      "dev": true
8399 8233
     },
8400 8234
     "p-is-promise": {
8401 8235
       "version": "2.1.0",
@@ -8453,14 +8287,6 @@
8453 8287
         "retry": "^0.12.0"
8454 8288
       }
8455 8289
     },
8456
-    "p-timeout": {
8457
-      "version": "2.0.1",
8458
-      "resolved": "https://registry.npm.taobao.org/p-timeout/download/p-timeout-2.0.1.tgz",
8459
-      "integrity": "sha1-2N0ZeVldLcATnh/ka4tkbLPN8Dg=",
8460
-      "requires": {
8461
-        "p-finally": "^1.0.0"
8462
-      }
8463
-    },
8464 8290
     "p-try": {
8465 8291
       "version": "1.0.0",
8466 8292
       "resolved": "http://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz",
@@ -9203,7 +9029,8 @@
9203 9029
     "prepend-http": {
9204 9030
       "version": "2.0.0",
9205 9031
       "resolved": "https://registry.npm.taobao.org/prepend-http/download/prepend-http-2.0.0.tgz",
9206
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
9032
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
9033
+      "dev": true
9207 9034
     },
9208 9035
     "prettier": {
9209 9036
       "version": "1.16.3",
@@ -9236,7 +9063,8 @@
9236 9063
     "process-nextick-args": {
9237 9064
       "version": "2.0.1",
9238 9065
       "resolved": "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz",
9239
-      "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I="
9066
+      "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=",
9067
+      "dev": true
9240 9068
     },
9241 9069
     "progress": {
9242 9070
       "version": "2.0.3",
@@ -9357,6 +9185,7 @@
9357 9185
       "version": "5.1.1",
9358 9186
       "resolved": "https://registry.npm.taobao.org/query-string/download/query-string-5.1.1.tgz?cache=0&sync_timestamp=1564173124567&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fquery-string%2Fdownload%2Fquery-string-5.1.1.tgz",
9359 9187
       "integrity": "sha1-p4wBK3HBfgXy4/ojGd0zBoLvs8s=",
9188
+      "dev": true,
9360 9189
       "requires": {
9361 9190
         "decode-uri-component": "^0.2.0",
9362 9191
         "object-assign": "^4.1.0",
@@ -9448,6 +9277,7 @@
9448 9277
       "version": "2.3.6",
9449 9278
       "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freadable-stream%2Fdownload%2Freadable-stream-2.3.6.tgz",
9450 9279
       "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
9280
+      "dev": true,
9451 9281
       "requires": {
9452 9282
         "core-util-is": "~1.0.0",
9453 9283
         "inherits": "~2.0.3",
@@ -9461,12 +9291,14 @@
9461 9291
         "safe-buffer": {
9462 9292
           "version": "5.1.2",
9463 9293
           "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz",
9464
-          "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
9294
+          "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
9295
+          "dev": true
9465 9296
         },
9466 9297
         "string_decoder": {
9467 9298
           "version": "1.1.1",
9468 9299
           "resolved": "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz",
9469 9300
           "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
9301
+          "dev": true,
9470 9302
           "requires": {
9471 9303
             "safe-buffer": "~5.1.0"
9472 9304
           }
@@ -9758,14 +9590,6 @@
9758 9590
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
9759 9591
       "dev": true
9760 9592
     },
9761
-    "responselike": {
9762
-      "version": "1.0.2",
9763
-      "resolved": "https://registry.npm.taobao.org/responselike/download/responselike-1.0.2.tgz",
9764
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
9765
-      "requires": {
9766
-        "lowercase-keys": "^1.0.0"
9767
-      }
9768
-    },
9769 9593
     "restore-cursor": {
9770 9594
       "version": "2.0.0",
9771 9595
       "resolved": "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz",
@@ -9866,7 +9690,8 @@
9866 9690
     "safe-buffer": {
9867 9691
       "version": "5.2.0",
9868 9692
       "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.0.tgz",
9869
-      "integrity": "sha1-t02uxJsRSPiMZLaNSbHoFcHy9Rk="
9693
+      "integrity": "sha1-t02uxJsRSPiMZLaNSbHoFcHy9Rk=",
9694
+      "dev": true
9870 9695
     },
9871 9696
     "safe-regex": {
9872 9697
       "version": "1.1.0",
@@ -10245,11 +10070,6 @@
10245 10070
         }
10246 10071
       }
10247 10072
     },
10248
-    "social-share.js": {
10249
-      "version": "1.0.16",
10250
-      "resolved": "https://registry.npm.taobao.org/social-share.js/download/social-share.js-1.0.16.tgz",
10251
-      "integrity": "sha1-H9SpHEbIxoNWcPEUcuyy4pMhUxA="
10252
-    },
10253 10073
     "sockjs": {
10254 10074
       "version": "0.3.19",
10255 10075
       "resolved": "http://registry.npm.taobao.org/sockjs/download/sockjs-0.3.19.tgz",
@@ -10298,6 +10118,7 @@
10298 10118
       "version": "2.0.0",
10299 10119
       "resolved": "https://registry.npm.taobao.org/sort-keys/download/sort-keys-2.0.0.tgz?cache=0&sync_timestamp=1565864727994&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsort-keys%2Fdownload%2Fsort-keys-2.0.0.tgz",
10300 10120
       "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
10121
+      "dev": true,
10301 10122
       "requires": {
10302 10123
         "is-plain-obj": "^1.0.0"
10303 10124
       }
@@ -10568,7 +10389,8 @@
10568 10389
     "strict-uri-encode": {
10569 10390
       "version": "1.1.0",
10570 10391
       "resolved": "http://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz",
10571
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
10392
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
10393
+      "dev": true
10572 10394
     },
10573 10395
     "string-width": {
10574 10396
       "version": "2.1.1",
@@ -10909,11 +10731,6 @@
10909 10731
       "integrity": "sha1-9d9zJFNAewkZHa5z4qjMc/OBqCY=",
10910 10732
       "dev": true
10911 10733
     },
10912
-    "timed-out": {
10913
-      "version": "4.0.1",
10914
-      "resolved": "https://registry.npm.taobao.org/timed-out/download/timed-out-4.0.1.tgz",
10915
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
10916
-    },
10917 10734
     "timers-browserify": {
10918 10735
       "version": "2.0.11",
10919 10736
       "resolved": "https://registry.npm.taobao.org/timers-browserify/download/timers-browserify-2.0.11.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftimers-browserify%2Fdownload%2Ftimers-browserify-2.0.11.tgz",
@@ -11304,19 +11121,6 @@
11304 11121
         "requires-port": "^1.0.0"
11305 11122
       }
11306 11123
     },
11307
-    "url-parse-lax": {
11308
-      "version": "3.0.0",
11309
-      "resolved": "https://registry.npm.taobao.org/url-parse-lax/download/url-parse-lax-3.0.0.tgz",
11310
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
11311
-      "requires": {
11312
-        "prepend-http": "^2.0.0"
11313
-      }
11314
-    },
11315
-    "url-to-options": {
11316
-      "version": "1.0.1",
11317
-      "resolved": "https://registry.npm.taobao.org/url-to-options/download/url-to-options-1.0.1.tgz",
11318
-      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k="
11319
-    },
11320 11124
     "use": {
11321 11125
       "version": "3.1.1",
11322 11126
       "resolved": "http://registry.npm.taobao.org/use/download/use-3.1.1.tgz",
@@ -11343,7 +11147,8 @@
11343 11147
     "util-deprecate": {
11344 11148
       "version": "1.0.2",
11345 11149
       "resolved": "http://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz",
11346
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
11150
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
11151
+      "dev": true
11347 11152
     },
11348 11153
     "util.promisify": {
11349 11154
       "version": "1.0.0",
@@ -11417,11 +11222,6 @@
11417 11222
       "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.10.tgz",
11418 11223
       "integrity": "sha1-pysaQqTYKnIepDjRtr9V5mGVxjc="
11419 11224
     },
11420
-    "vue-axios": {
11421
-      "version": "2.1.4",
11422
-      "resolved": "https://registry.npm.taobao.org/vue-axios/download/vue-axios-2.1.4.tgz",
11423
-      "integrity": "sha1-qdKY9+h2+ah/6zNrN63LzjT/n58="
11424
-    },
11425 11225
     "vue-eslint-parser": {
11426 11226
       "version": "5.0.0",
11427 11227
       "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-5.0.0.tgz",
@@ -11496,14 +11296,6 @@
11496 11296
         }
11497 11297
       }
11498 11298
     },
11499
-    "vue-resource": {
11500
-      "version": "1.5.1",
11501
-      "resolved": "https://registry.npm.taobao.org/vue-resource/download/vue-resource-1.5.1.tgz",
11502
-      "integrity": "sha1-Dz1oXjJU0hgAvr2Wbtz1bDSztuQ=",
11503
-      "requires": {
11504
-        "got": "^8.0.3"
11505
-      }
11506
-    },
11507 11299
     "vue-router": {
11508 11300
       "version": "3.1.2",
11509 11301
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.1.2.tgz",

+ 1
- 0
package.json Прегледај датотеку

@@ -11,6 +11,7 @@
11 11
     "axios": "^0.19.0",
12 12
     "core-js": "^2.6.5",
13 13
     "element-ui": "^2.11.1",
14
+    "moment": "^2.24.0",
14 15
     "scroll-js": "^3.0.0",
15 16
     "swiper": "^4.5.0",
16 17
     "vue": "^2.6.10",

+ 46
- 114
src/App.vue Прегледај датотеку

@@ -112,7 +112,32 @@ export default {
112 112
 .messageBox-Contace {
113 113
   width: 80% !important;
114 114
 }
115
+
116
+.btn:hover {
117
+  color: #e03723;
118
+  border: 1px solid #e03723;
119
+  outline: none;
120
+}
121
+.btn:active {
122
+  color: #e03723;
123
+  border: 1px solid #e03723;
124
+  background-color: #fff;
125
+  box-shadow: none;
126
+}
127
+
128
+.btn-default:active:focus {
129
+  color: #e03723;
130
+  background-color: #fff;
131
+  border: 1px solid #e03723;
132
+  outline: none;
133
+}
134
+.btn:active:focus {
135
+  color: #e03723;
136
+  border: 1px solid #e03723;
137
+}
115 138
 </style>
139
+
140
+
116 141
 <style scoped>
117 142
 p {
118 143
   margin: 0 50px;
@@ -121,8 +146,8 @@ p {
121 146
 
122 147
 <style>
123 148
 #app {
124
-  font-family: "Microsoft Yahei Light", "Microsoft Yahei",
125
-    "KaiGenGothicSC-Light", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
149
+  font-family: 'Microsoft Yahei Light', 'Microsoft Yahei', 'KaiGenGothicSC-Light', 'Helvetica Neue',
150
+    'Helvetica', 'Arial', sans-serif;
126 151
   -webkit-font-smoothing: antialiased;
127 152
   -moz-osx-font-smoothing: grayscale;
128 153
   text-align: center;
@@ -133,8 +158,8 @@ p {
133 158
   margin: 0;
134 159
 }
135 160
 .app {
136
-  font-family: "Microsoft Yahei", "KaiGenGothicSC-Light", "Helvetica Neue",
137
-    "Helvetica", "Arial", sans-serif;
161
+  font-family: 'Microsoft Yahei', 'KaiGenGothicSC-Light', 'Helvetica Neue', 'Helvetica', 'Arial',
162
+    sans-serif;
138 163
 }
139 164
 
140 165
 .coll {
@@ -145,11 +170,10 @@ p {
145 170
   /* padding: 0; */
146 171
   border: none;
147 172
 }
148
-
149
-
150
-
151
-
152
-
173
+a:focus, a:hover {
174
+    /* color: #23527c; */
175
+    text-decoration: none;
176
+}
153 177
 @media (min-width: 992px) {
154 178
   .coll {
155 179
     display: block;
@@ -198,117 +222,28 @@ p {
198 222
 
199 223
 <style lang="less" scoped>
200 224
 @media (max-width: 992px) {
201
-  .navbar {
202
-    height: 60px;
203
-  }
204
-  .navbar-brand {
205
-    padding: 0;
206
-  }
207
-  .logo {
208
-    margin-top: 15px;
209
-    margin-left: 20px;
210
-    width: 150px;
211
-    height: 30px;
212
-    background-size: 100% 100% !important;
213
-    background: url("./assets/logo1.png");
214
-  }
215
-  .logoimg {
216
-    margin: -20px auto 0px;
217
-  }
218
-  .a {
219
-    font-size: 2.4rem;
220
-    margin-top: 2rem;
221
-    color: #000;
222
-  }
223
-  .a a {
224
-    color: #000;
225
-  }
225
+  
226
+ 
227
+ 
226 228
   .main {
227 229
     padding-bottom: 3rem;
228 230
   }
229 231
 
230
-  .line {
231
-    height: 2px;
232
-    width: 300px;
233
-    background: -webkit-linear-gradient(
234
-      left,
235
-      rgba(255, 255, 255, 0),
236
-      #aaa,
237
-      rgba(255, 255, 255, 0)
238
-    );
239
-    background: linear-gradient(
240
-      to right,
241
-      rgba(255, 255, 255, 0),
242
-      #aaa,
243
-      rgba(255, 255, 255, 0)
244
-    );
245
-    margin-bottom: 30px;
232
+
233
+  .page-footer {
234
+    height: 9.8vw;
246 235
   }
247
-  .footer-p{
248
-    margin:0;
236
+  .footer-p {
237
+    line-height: 9.8vw;
238
+    font-size: 3vw;
239
+    margin: 0;
249 240
   }
250 241
 }
251 242
 @media (min-width: 768px) {
252
-  .navbar {
253
-    padding: 30px 0;
254
-    // background-color: transparent;
255
-    border: none;
256
-    padding: 30px 0;
257
-    z-index: 50;
258
-    height: 116px;
259
-    margin: 0;
260
-
261
-    .navbar-brand {
262
-      padding: 0;
263
-
264
-      img {
265
-        height: 100%;
266
-      }
267
-    }
268
-
269
-    .nav {
270
-      font-size: 2.6rem;
271
-      li {
272
-        margin-left: 2vw;
273
-        a {
274
-          color: #000;
275
-          padding-left: 5px;
276
-          padding-right: 5px;
277
-          margin: 0 10px;
278
-          &:hover {
279
-            border-bottom: 3px solid #000;
280
-          }
281
-        }
282
-      }
283
-    }
284
-
285
-    .logo {
286
-      width: 300px;
287
-      height: 60px;
288
-      background: url("./assets/logo1.png");
289
-    }
290 243
 
291
-    // &.scroll {
292
-    //   transition: all 0.5s;
293
-    //   background: #fff;
294
-
295
-    //   .nav {
296
-    //     li {
297
-    //       a {
298
-    //         color: #000;
299
-
300
-    //         &:hover {
301
-    //           border-bottom: 3px solid #000;
302
-    //         }
303
-    //       }
304
-    //     }
305
-    //   }
306
-
307
-    //   .logo {
308
-    //     background: url("./assets/logo1.png");
309
-    //   }
310
-    // }
311
-  }
244
+   
245
+ 
246
+  
312 247
 }
313 248
 @media (min-width: 992px) and (max-width: 1200px) {
314 249
   .back-top1 {
@@ -328,7 +263,4 @@ p {
328 263
     z-index: 3;
329 264
   }
330 265
 }
331
-
332
-
333
-
334 266
 </style>

+ 8
- 9
src/components/Business.vue Прегледај датотеку

@@ -19,7 +19,7 @@
19 19
         <div class="swiper-button-next"></div>
20 20
       </div>
21 21
     </div>
22
-    
22
+
23 23
     <div v-if="!show" class="row st">
24 24
       <div class="col-xs-6 col-md-3 sw" v-for="(item,index) in service" :key="index">
25 25
         <img :src="item.serviceImageUrl" width="100%" height="100%" alt="..." />
@@ -121,7 +121,7 @@ export default {
121 121
 
122 122
 
123 123
 <style scoped>
124
-.col-xs-6{
124
+.col-xs-6 {
125 125
   padding: 0px;
126 126
 }
127 127
 @media (max-width: 992px) {
@@ -130,22 +130,22 @@ export default {
130 130
   }
131 131
 
132 132
   h4 {
133
-    font-family: "Microsoft Yahei Light";
134
-    font-size: 1.6rem;
135
-    padding: 5px;
133
+    font-family: 'Microsoft Yahei Light';
134
+    font-size: 1.4rem;
135
+    /* padding: 5px; */
136 136
     background-color: #e03723;
137 137
     color: #fff;
138 138
     margin: 0;
139 139
     height: 30px;
140 140
     letter-spacing: 6px;
141
+    line-height: 30px;
141 142
   }
142 143
   .st {
143 144
     margin-bottom: 20px !important;
144 145
     padding: 0 1% !important;
145
-    
146 146
   }
147 147
   .sw {
148
-   padding-left: 2% !important;
148
+    padding-left: 2% !important;
149 149
     padding-right: 2% !important;
150 150
   }
151 151
 }
@@ -210,7 +210,7 @@ export default {
210 210
   }
211 211
 
212 212
   h4 {
213
-    font-family: "Microsoft Yahei Light";
213
+    font-family: 'Microsoft Yahei Light';
214 214
     font-size: 2.4rem;
215 215
     padding: 0px;
216 216
     background-color: #e03723;
@@ -228,7 +228,6 @@ export default {
228 228
   padding-left: 9%;
229 229
   padding-right: 9%;
230 230
   margin: 0;
231
-  
232 231
 }
233 232
 </style>
234 233
 

+ 26
- 24
src/components/CaseCard.vue Прегледај датотеку

@@ -1,13 +1,13 @@
1 1
 <template>
2
-<div class="hover">
3
-  <el-card class="case-card app" shadow="never" :body-style="{ padding: '0px' }" style=" padding: 0px">
4
-    <img :style="{background: `url(${thumb})`}" class="image" />
5
-    <div class="body">
6
-      <h3>{{title}}</h3>
7
-      <div class="bottom clearfix caption">{{caption}}</div>
8
-    </div>
9
-  </el-card>
10
-  <!-- shadow="hover" -->
2
+  <div class="hover">
3
+    <el-card class="case-card app" shadow="never" :body-style="{ padding: '0px' }" style=" padding: 0px">
4
+      <img :style="{background: `url(${thumb})`}" class="image" />
5
+      <div class="body">
6
+        <h3>{{title}}</h3>
7
+        <div class="bottom clearfix caption">{{caption}}</div>
8
+      </div>
9
+    </el-card>
10
+    <!-- shadow="hover" -->
11 11
   </div>
12 12
 </template>
13 13
 
@@ -60,20 +60,21 @@ export default {
60 60
       }
61 61
     }
62 62
   }
63
-  .hover:hover{
64
-  .case-card{
65
-    margin-top: -20px; 
66
-     margin-bottom: 20px;
67
-    box-shadow:0px 0px 16px 5px rgba(0,0,0,0.12);
68
-  }
69
-  }
63
+  // .hover:hover {
64
+  //   .case-card {
65
+  //     margin-top: -20px;
66
+  //     margin-bottom: 20px;
67
+  //     box-shadow: 0px 0px 16px 5px rgba(0, 0, 0, 0.12);
68
+  //   }
69
+  // }
70 70
 }
71 71
 
72 72
 @media (max-width: 992px) {
73 73
   .case-card {
74 74
     width: 100%;
75 75
     padding: 0;
76
-
76
+    border-radius: 0px;
77
+    border: none;
77 78
     .image {
78 79
       bottom: 0;
79 80
       width: 100%;
@@ -127,11 +128,12 @@ export default {
127 128
       }
128 129
     }
129 130
   }
130
-   .hover:hover{
131
-  .case-card{
132
-    margin-top: -10px; 
133
-    margin-bottom: 10px; 
134
-    box-shadow:0px 0px 10px 3px rgba(0,0,0,0.12);
135
-  }
136
-}}
131
+  // .hover:hover {
132
+  //   .case-card {
133
+  //     margin-top: -10px;
134
+  //     margin-bottom: 10px;
135
+  //     box-shadow: 0px 0px 10px 3px rgba(0, 0, 0, 0.12);
136
+  //   }
137
+  // }
138
+}
137 139
 </style>

+ 57
- 80
src/components/Navbars.vue Прегледај датотеку

@@ -20,10 +20,10 @@
20 20
               </li>
21 21
               <!-- class="case" class-active="" -->
22 22
               <li class="a">
23
-                <a href="/case"  :class="{linkactive:'/case'==routepath}">案例</a>
23
+                <a href="/case" :class="{linkactive:'/case'==routepath}">案例</a>
24 24
               </li>
25 25
               <li class="a">
26
-                <a href="/Share" :class="{linkactive:'/Share/'==routepath}">动态</a>
26
+                <a href="/Share" :class="{linkactive:'/Share'==routepath}">动态</a>
27 27
               </li>
28 28
               <li class="a">
29 29
                 <a href="/about" :class="{linkactive:'/about'==routepath}">关于</a>
@@ -44,29 +44,31 @@
44 44
             <img src="../assets/image/mobile/Sidemenulogo.png" width="46%" class="logoimg" />
45 45
           </el-col>
46 46
           <el-col class="line"></el-col>
47
-          <el-col :span="24" class="a">
48
-            <a href="/" class="btn1" :class="{moblinkactive:'/'==routepath}">01 回到首页</a>
49
-          </el-col>
50
-
51
-          <el-col :span="24" class="a">
52
-            <a href="/case" class="btn1" :class="{moblinkactive:'/case'==routepath}">02 案例展示</a>
53
-          </el-col>
54
-
55
-          <el-col :span="24" class="a">
56
-            <a href="/Share" class="btn1" :class="{moblinkactive:'/Share/'==routepath}">03 动态分享</a>
57
-          </el-col>
58
-
59
-          <el-col :span="24" class="a">
60
-            <a href="/about" class="btn1" :class="{moblinkactive:'/about'==routepath}">04 关于福予</a>
61
-          </el-col>
62
-
63
-          <el-col :span="24" class="a">
64
-            <a href="/contact" class="btn1" :class="{moblinkactive:'/contact'==routepath}">05 联系我们</a>
65
-          </el-col>
66
-
67
-          <el-col :span="24" class="a">
68
-            <button type="button" class="btn btn-default rebtn" @click="navdrawer = flase" style="color:black;font-size: 24px;">继续浏览</button>
69
-          </el-col>
47
+          <div>
48
+            <el-col :span="24" class="a">
49
+              <a href="/" class="btn1" :class="{moblinkactive:'/'==routepath}">01 回到首页</a>
50
+            </el-col>
51
+
52
+            <el-col :span="24" class="a">
53
+              <a href="/case" class="btn1" :class="{moblinkactive:'/case'==routepath}">02 案例展示</a>
54
+            </el-col>
55
+
56
+            <el-col :span="24" class="a">
57
+              <a href="/Share" class="btn1" :class="{moblinkactive:'/Share'==routepath}">03 动态分享</a>
58
+            </el-col>
59
+
60
+            <el-col :span="24" class="a">
61
+              <a href="/about" class="btn1" :class="{moblinkactive:'/about'==routepath}">04 关于福予</a>
62
+            </el-col>
63
+
64
+            <el-col :span="24" class="a">
65
+              <a href="/contact" class="btn1" :class="{moblinkactive:'/contact'==routepath}">05 联系我们</a>
66
+            </el-col>
67
+
68
+            <el-col :span="24" class="a">
69
+              <button type="button" class="btn btn-default rebtn" @click="navdrawer = flase" style="color:black;font-size: 24px;">继续浏览</button>
70
+            </el-col>
71
+          </div>
70 72
         </el-row>
71 73
       </div>
72 74
     </el-drawer>
@@ -85,12 +87,12 @@ export default {
85 87
       navdrawer: false,
86 88
       direction: 'rtl',
87 89
 
88
-      routepath:'',
90
+      routepath: '',
89 91
     }
90 92
   },
91
- mounted () {
92
-         this.routepath  =  this.$route.path;
93
-         console.log(this.routepath);
93
+  mounted () {
94
+    this.routepath = this.$route.path;
95
+    console.log(this.routepath);
94 96
   },
95 97
 
96 98
 
@@ -112,17 +114,17 @@ p {
112 114
 </style>
113 115
 
114 116
 <style scoped>
115
-.icon-caidan
116
-.coll {
117
+.icon-caidan .coll {
117 118
   display: none;
118 119
 }
119 120
 .navbar-toggle {
120 121
   margin: 0 10px 0 0;
121 122
   /* padding: 0; */
122 123
   border: none;
124
+  /* padding-top: 6px; */
123 125
 }
124 126
 .navbar-default .navbar-toggle:hover {
125
-    background-color: none;
127
+  background-color: none;
126 128
 }
127 129
 
128 130
 /* .navbar-toggle:hover{
@@ -131,10 +133,11 @@ padding-bottom: 0px
131 133
 } */
132 134
 .iconfont {
133 135
   border: none;
134
-  font-size: 30px;
136
+  font-size: 24px;
137
+  color: #595757;
135 138
 }
136 139
 .iconfont:hover {
137
-  color:#e03723;
140
+  color: #e03723;
138 141
 }
139 142
 
140 143
 @media (min-width: 768px) and (max-width: 992px) {
@@ -186,26 +189,31 @@ padding-bottom: 0px
186 189
 }
187 190
 
188 191
 @media (max-width: 992px) {
192
+  .navbar-default .navbar-toggle:hover {
193
+    background: none;
194
+  }
189 195
   .navbar {
190
-    height: 60px;
196
+    height: 47.8px;
197
+    background-color: #fff;
191 198
   }
192 199
   .navbar-brand {
193 200
     padding: 0;
194 201
   }
195 202
   .logo {
196
-    margin-top: 15px;
203
+    margin-top: 11px;
197 204
     margin-left: 20px;
198 205
     width: 150px;
199 206
     height: 30px;
200 207
     background-size: 100% 100% !important;
201
-    background: url("../assets/logo1.png");
208
+    background: url('../assets/logo1.png');
202 209
   }
203 210
   .logoimg {
204 211
     margin: -20px auto 0px;
205 212
   }
206 213
   .a {
214
+    height: 11vh;
207 215
     font-size: 2.4rem;
208
-    margin-top: 2rem;
216
+    /* margin-top: 2rem; */
209 217
     color: #000;
210 218
   }
211 219
   .a a {
@@ -217,19 +225,9 @@ padding-bottom: 0px
217 225
 
218 226
   .line {
219 227
     height: 2px;
220
-    width: 300px;
221
-    background: -webkit-linear-gradient(
222
-      left,
223
-      rgba(255, 255, 255, 0),
224
-      #aaa,
225
-      rgba(255, 255, 255, 0)
226
-    );
227
-    background: linear-gradient(
228
-      to right,
229
-      rgba(255, 255, 255, 0),
230
-      #aaa,
231
-      rgba(255, 255, 255, 0)
232
-    );
228
+    width: 80vw;
229
+    background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0), #aaa, rgba(255, 255, 255, 0));
230
+    background: linear-gradient(to right, rgba(255, 255, 255, 0), #aaa, rgba(255, 255, 255, 0));
233 231
     margin-bottom: 30px;
234 232
   }
235 233
   .btn1 {
@@ -290,43 +288,22 @@ padding-bottom: 0px
290 288
     .logo {
291 289
       width: 300px;
292 290
       height: 60px;
293
-      background: url("../assets/logo1.png");
291
+      background: url('../assets/logo1.png');
294 292
     }
295
-
296
-    // &.scroll {
297
-    //   transition: all 0.5s;
298
-    //   background: #fff;
299
-
300
-    //   .nav {
301
-    //     li {
302
-    //       a {
303
-    //         color: #000;
304
-
305
-    //         &:hover {
306
-    //           border-bottom: 3px solid #000;
307
-    //         }
308
-    //       }
309
-    //     }
310
-    //   }
311
-
312
-    //   .logo {
313
-    //     background: url("./assets/logo1.png");
314
-    //   }
315
-    // }
316 293
   }
317 294
 }
318
-.linkactive{
295
+.linkactive {
319 296
   border-bottom: 3px solid #000;
320 297
 }
321
-.moblinkactive{
322
-  color:#e03723 !important;
298
+.moblinkactive {
299
+  color: #e03723 !important;
323 300
 }
324
-.rebtn{
301
+.rebtn {
325 302
   border-radius: 0px;
326 303
 }
327
-.rebtn:hover{
304
+.rebtn:hover {
328 305
   color: #e03723 !important;
329
-    border: 1px solid #e03723;
330
-    background: #fff;
306
+  border: 1px solid #e03723;
307
+  background: #fff;
331 308
 }
332 309
 </style>

src/components/Share.vue → src/components/Shares.vue Прегледај датотеку

@@ -11,7 +11,7 @@
11 11
 
12 12
 <script>
13 13
 export default {
14
-  name: 'Share',
14
+  name: 'Shares',
15 15
   props: [
16 16
     'config',
17 17
   ],

+ 1
- 1
src/components/Wheelplanting.vue Прегледај датотеку

@@ -87,7 +87,7 @@ export default {
87 87
 @media (max-width: 992px) {
88 88
   .wheelplanting .con-swiper {
89 89
     width: 100%;
90
-    height: 300px;
90
+    height: 52.3vw;
91 91
   }
92 92
 }
93 93
 </style>

+ 33
- 12
src/views/About.vue Прегледај датотеку

@@ -16,7 +16,7 @@
16 16
             <br />
17 17
             <div class>
18 18
               <div class="abc">
19
-                <img src="../assets/image/about/FOYO.jpg" style="width:60vw" />
19
+                <img src="../assets/image/about/FOYO.jpg" class="foyoimg" style="width:60vw" />
20 20
               </div>
21 21
             </div>
22 22
           </div>
@@ -168,16 +168,19 @@ export default {
168 168
 @media (min-width: 768px) {
169 169
 }
170 170
 
171
-@media (max-width: 768px) {
171
+@media (max-width: 992px) {
172 172
   .about {
173
-    padding-top: 58px;
173
+    padding-top: 47.8px;
174 174
   }
175 175
   .about-1-img {
176 176
     width: 80px;
177 177
     height: 80px;
178 178
   }
179
+  .foyoimg{
180
+    width: 80vw !important;
181
+  }
179 182
   .sssss {
180
-    font-size: 1.5rem;
183
+    font-size: 1.2rem;
181 184
     color: #3e3a39;
182 185
     padding: 20px 20px;
183 186
   }
@@ -348,13 +351,14 @@ export default {
348 351
           }
349 352
           .teamp2 {
350 353
             font-size: 1.2rem;
354
+            margin-bottom: 0;
351 355
           }
352 356
         }
353 357
       }
354 358
     }
355 359
   }
356 360
   .about-3 {
357
-    margin-top: 28px;
361
+    margin-top: 40px;
358 362
 
359 363
     div {
360 364
       margin: 0;
@@ -405,17 +409,34 @@ export default {
405 409
     padding-right: 40px;
406 410
   }
407 411
   .abc {
408
-
409
-   
410 412
     padding-bottom: 60px;
411
-
412
-}
413
-.about-1-img {
414
-
413
+  }
414
+  .about-1-img {
415 415
     width: 140px;
416 416
     height: 140px;
417
-
417
+  }
418 418
 }
419
+@media (max-width: 550px) {
420
+
421
+ .about-1 {
422
+    padding: 20px 0px;
423
+    div {
424
+      // .about-1-img {
425
+      // }
426
+      .caption {
427
+        h2 {
428
+          font-size: 2.1rem;
429
+          font-weight: bold;
430
+        }
431
+        .p1 {
432
+          font-size: 1.2rem;
433
+        }
434
+      }
435
+    }
436
+  }
437
+
438
+  
439
+
419 440
 }
420 441
 </style>
421 442
 

+ 57
- 12
src/views/Case.vue Прегледај датотеку

@@ -24,9 +24,9 @@
24 24
       </div>
25 25
     </div>
26 26
 
27
-    <el-drawer :visible.sync="drawer" :direction="direction" :show-close="true" size="80%">
28
-      <div>
29
-        <el-row style="text-align: center;">
27
+    <el-drawer :visible.sync="drawer" :direction="direction" :show-close="true" size="80%" style="text-align: center;">
28
+      <div >
29
+        <el-row style="text-align: center;height:72.5vh;display: grid;">
30 30
           <el-col :span="24">
31 31
             <button type="button" @click="() => filterCase()" class="btn-link" style="color:black;font-size: 24px;" :class="{btnactive:thisbtn==''}">全部案例</button>
32 32
           </el-col>
@@ -34,10 +34,9 @@
34 34
             <!-- @click="() => filterCase(cas)" -->
35 35
             <button type="button" class="btn-link" @click="() => filterCase(cas)" style="color:black;font-size: 24px" :class="{btnactive:thisbtn==cas.typeName}">{{cas.typeName}}</button>
36 36
           </el-col>
37
-          <el-col :span="24">
38
-            <button type="button" class="btn btn-default rebtn" @click="drawer = flase" style="color:black;font-size: 24px;padding-left: 40px;padding-right: 40px; margin-top:30px">返回</button>
39
-          </el-col>
37
+          
40 38
         </el-row>
39
+        <button type="button" class="btn btn-default rebtn" @click="drawer = flase" style="text-align:center;color:black;font-size: 24px;padding-left: 40px;padding-right: 40px;">返回</button>
41 40
       </div>
42 41
     </el-drawer>
43 42
 
@@ -52,7 +51,7 @@
52 51
     </div>
53 52
     <!--  -->
54 53
     <div style="margin-top:40px">
55
-      <button type="button" v-if="!allLoaded" class="btn btn-default" @click="more">加载更多</button>
54
+      <button type="button" v-if="!allLoaded" class="btn btn-default rebtn" @click="more">加载更多</button>
56 55
       <p v-else>已经到底了~更多案例敬请期待~</p>
57 56
     </div>
58 57
   </div>
@@ -178,6 +177,10 @@ export default {
178 177
   margin-top: 10px;
179 178
 }
180 179
 
180
+.case{
181
+  min-height: 90vh;
182
+}
183
+
181 184
 /* .casecard {
182 185
   width: 100%;
183 186
 
@@ -211,7 +214,7 @@ export default {
211 214
   border-radius: 0px;
212 215
 
213 216
   background-color: rgb(252, 151, 252);
214
-  border: 2px solid #bfbfbf;
217
+  /* border: 2px solid #bfbfbf; */
215 218
 }
216 219
 
217 220
 .text-left {
@@ -229,7 +232,10 @@ export default {
229 232
 
230 233
 @media (max-width: 992px) {
231 234
   .case {
232
-    margin-top: 58px;
235
+    margin-top: 47.8px;
236
+    margin-bottom: -47.8px;
237
+    padding-bottom: 47.8px;
238
+    background-color: #fafafa;
233 239
   }
234 240
   .comtype {
235 241
     display: none;
@@ -238,13 +244,13 @@ export default {
238 244
   .dyn-main {
239 245
     margin-top: 20px;
240 246
 
241
-     padding-left: 1.6vw;
247
+    padding-left: 1.6vw;
242 248
     padding-right: 1.6vw;
243 249
   }
244 250
   .marginTP {
245 251
     margin-top: 3.2vw;
246 252
   }
247
-  .cards{
253
+  .cards {
248 254
     padding-left: 1.6vw;
249 255
     padding-right: 1.6vw;
250 256
   }
@@ -285,10 +291,27 @@ export default {
285 291
     color: #000;
286 292
     background-color: #fff;
287 293
     border: 1px solid #aaaaaa;
294
+    outline: none;
288 295
   }
289 296
   .btn:hover {
290 297
     color: #e03723;
291 298
     border: 1px solid #e03723;
299
+    outline: none;
300
+  }
301
+  .btn:active{
302
+    color: #e03723;
303
+    border: 1px solid #e03723;
304
+  }
305
+
306
+  .btn-default:active:focus{
307
+color: #e03723;
308
+    background-color: #fff;
309
+    border: 1px solid #e03723;
310
+     outline: none;
311
+  }
312
+  .btn:active:focus{
313
+    color: #e03723;
314
+    border: 1px solid #e03723;
292 315
   }
293 316
 
294 317
   .dyn-main {
@@ -342,5 +365,27 @@ export default {
342 365
 </style>
343 366
 
344 367
 
345
-
368
+<style lang="less" scoped>
369
+@media (min-width: 992px){
370
+.cards:hover {
371
+  
372
+  .casecard {
373
+    transition: all 0.4s;
374
+    margin-top: -20px;
375
+    margin-bottom: 20px;
376
+    box-shadow: 0px 0px 16px 5px rgba(0, 0, 0, 0.12);
377
+  }
378
+}
379
+}
380
+@media (min-width: 992px) and (max-width: 1500px) {
381
+  .cards:hover {
382
+    transition: all 0.4s;
383
+    .casecard {
384
+      margin-top: -10px;
385
+      margin-bottom: 10px;
386
+      box-shadow: 0px 0px 10px 3px rgba(0, 0, 0, 0.12);
387
+    }
388
+  }
389
+}
390
+</style>
346 391
 

+ 39
- 10
src/views/Contact.vue Прегледај датотеку

@@ -30,7 +30,7 @@
30 30
         </div>
31 31
         <div>
32 32
           <a v-if="isMobilePhone" href="tel:13585167730">
33
-            <img src="../assets/image/contact/photo.jpg" alt style="padding-top:100px;width:90%" />
33
+            <img src="../assets/image/contact/photo.jpg" alt style="padding-top:7vw;width:61.2vw" />
34 34
           </a>
35 35
           <img v-else src="../assets/image/contact/photo.jpg" alt style="padding-top:100px;width:80%" />
36 36
         </div>
@@ -80,6 +80,11 @@ export default {
80 80
 </style>
81 81
 
82 82
 <style lang="less" scoped>
83
+.contact{
84
+  min-height: 85vh;
85
+}
86
+
87
+
83 88
 .col-md-6,
84 89
 .col-xs-6 {
85 90
   padding: 0px;
@@ -87,12 +92,13 @@ export default {
87 92
 @media (max-width: 992px) {
88 93
   .address {
89 94
     .p1 {
90
-      padding-top: 70px;
91
-      font-size: 2rem;
95
+      padding-top: 7.57vw;
96
+      font-size: 2.9vw;
97
+      margin-bottom: 0;
92 98
     }
93 99
     .p2 {
94
-      font-size: 1.2rem;
95
-      padding-top: 14px;
100
+      font-size: 2.4vw;
101
+      padding-top: 1.9vw;
96 102
     }
97 103
   }
98 104
 }
@@ -124,11 +130,32 @@ export default {
124 130
 <style lang="less" scoped>
125 131
 @media (max-width: 992px) {
126 132
   .contact {
127
-    margin-top: 60px;
133
+    margin-top: 47.8px;
128 134
   }
129 135
 
130 136
   .img1 {
131
-    width: 80%;
137
+    width: 20vw !important;
138
+  }
139
+  .pull-right1{
140
+    float: right;
141
+    margin-right: 8.5vw;
142
+  }
143
+  .pull-left1{
144
+    float: left;
145
+    margin-left: 8.5vw
146
+  }
147
+  h1{
148
+    font-size: 3.22vw;
149
+    margin-top: 4.9vw;
150
+    margin-bottom: 5vw !important;
151
+  }
152
+  h2{
153
+    font-size: 2.4vw;
154
+    margin-top: 1.6vw;
155
+   
156
+  margin-bottom: 0.08vw !important;
157
+
158
+
132 159
   }
133 160
 }
134 161
 
@@ -156,9 +183,11 @@ export default {
156 183
   .contact-2 {
157 184
     padding: 98px 98px 27px 98px;
158 185
   }
186
+  
159 187
 }
160 188
 h2 {
161 189
   margin-bottom: -22px;
190
+
162 191
 }
163 192
 
164 193
 @media (min-width: 992px) and (max-width: 1551px) {
@@ -190,8 +219,8 @@ h2 {
190 219
   }
191 220
 }
192 221
 @media  (max-width: 551px) {
193
-  h2{
194
-    font-size: 2rem
195
-  }
222
+  // h2{
223
+  //   font-size: 2rem
224
+  // }
196 225
 }
197 226
 </style>

+ 86
- 27
src/views/Details.vue Прегледај датотеку

@@ -2,15 +2,18 @@
2 2
   <div class="details">
3 3
     <Navbars></Navbars>
4 4
     <div class="head">
5
-      <img :src="current.caseCoverImg" width="100%" />
5
+      <img :src="current.caseDetailCoverImg" width="100%" />
6 6
     </div>
7 7
 
8 8
     <div class="contanier st">
9 9
       <h1 style>{{current.caseTitle}}</h1>
10
-
11
-      <p>
10
+      <div v-if="type=='分享'&&isMobilePhone" class="p1" style="text-align: left;padding-left:15px;">
11
+        <p style="font-size:1.2rem;margin-bottom:5px">分享时间:{{date}}</p>
12
+        <p style="font-size:1.2rem;margin-bottom:5px">来源:{{url}}</p>
13
+      </div>
14
+      <p v-else class="p1">
12 15
         客户:
13
-        <img :src="current.caseLogoImg" alt />
16
+        <img :src="current.caseLogoImg" />
14 17
         &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 所属行业:{{current.caseIndustry}}
15 18
       </p>
16 19
 
@@ -18,8 +21,8 @@
18 21
 
19 22
       <div class="row zan-share" style="margin-left :0; margin-right:0">
20 23
         <div class="col-xs-6 col-md-6" style="padding 0;">
21
-          <div class="pull-left" @click="postLike">
22
-            <span role="button" class="iconfont icon-zan"></span>
24
+          <div class="pull-left zan" @click="postLike">
25
+            <span role="button" class="iconfont icon-zan" :style="{ color: activeColor}"></span>
23 26
             <span class="zantext">赞 | {{current.likeNum || 0}}</span>
24 27
           </div>
25 28
         </div>
@@ -27,7 +30,7 @@
27 30
           <div class="pull-right">
28 31
             <div style=" display: flex;">
29 32
               <span class="sharetext">分享:</span>
30
-              <share :config="shareConfig" />
33
+              <shares :config="shareConfig" />
31 34
             </div>
32 35
             <div></div>
33 36
           </div>
@@ -82,17 +85,21 @@
82 85
 import request from '../../utils/request'
83 86
 import apis from '../config/api'
84 87
 
85
-
88
+import { isMobilePhone } from '../../utils'
89
+import moment from 'moment';
86 90
 
87 91
 export default {
88 92
   name: 'Details',
89 93
 
90 94
   data () {
91 95
     return {
92
-
93
-      type: '案例',
96
+      url:window.location.href,
97
+      type: '',
94 98
       detail: {},
95
-      // config: {
99
+      activeColor: '#000',
100
+      isMobilePhone,
101
+      date: moment().format('YYYY年MM月DD日 h:mm')
102
+      // config: {T00:00:00.000
96 103
       //   // url: '', // 网址,默认使用 window.location.href
97 104
       //   // source: '', // 来源(QQ空间会用到), 默认读取head标签:<meta name="site" content="http://overtrue" />
98 105
       //   // title: '', // 标题,默认读取 document.title 或者 <meta name="title" content="share.js" />
@@ -107,18 +114,20 @@ export default {
107 114
 
108 115
   },
109 116
   components: {
110
-    share: () => import('../components/Share'),
117
+    shares: () => import('../components/Shares'),
111 118
 
112 119
     Navbars: () => import('../components/Navbars'),
113 120
 
114 121
   },
115 122
   computed: {
123
+
124
+
116 125
     shareConfig () {
117 126
       return {
118 127
 
119 128
         url: window.location.href,
120 129
         title: this.current.caseTitle,
121
-        image: this.current.caseCoverImg, // 图片, 默认取网页中第一个img标签
130
+        image: this.current.caseDetailCoverImg, // 图片, 默认取网页中第一个img标签
122 131
         description: this.current.caseSummary,
123 132
       }
124 133
     },
@@ -130,6 +139,7 @@ export default {
130 139
     },
131 140
     brothers () {
132 141
       let b = this.detail.brothers
142
+      // console.log(b, '111')
133 143
       if (!b || !b.length) {
134 144
         b = [{}, {}]
135 145
       } else if (b.length === 1) {
@@ -139,7 +149,7 @@ export default {
139 149
           b.push({})
140 150
         }
141 151
       }
142
-
152
+      // console.log(b, '222')
143 153
       return b
144 154
     },
145 155
     recommends () {
@@ -148,17 +158,22 @@ export default {
148 158
   },
149 159
 
150 160
   created () {
161
+//  console.log(moment().format())
162
+// console.log(moment().format('YYYY年MM月DD日 h:mm'))
151 163
 
152 164
 
165
+    this.getDetail(this.$route.params.id)
166
+    // console.log(this.detail, 'data')
153 167
 
154 168
 
155
-    this.getDetail(this.$route.params.id)
156 169
   },
157 170
   beforeRouteUpdate (to, from, next) {
158 171
     this.getDetail(to.params.id)
172
+
159 173
     next()
160 174
   },
161 175
   methods: {
176
+
162 177
     getDetail (id) {
163 178
       request({
164 179
         ...apis.case.get,
@@ -166,8 +181,9 @@ export default {
166 181
       }).then(res => {
167 182
         this.detail = res || {}
168 183
 
169
-         this.type =  this.detail.current.type == 'case' ? '案例' : '分享'
170
-        // console.log(this.detail.current.type,'1234')
184
+        this.type = this.detail.current.type == 'case' ? '案例' : '分享'
185
+        // console.log(this.detail.current, '1234')
186
+        //  console.log(this.detail, '1234')
171 187
       })
172 188
     },
173 189
 
@@ -185,19 +201,21 @@ export default {
185 201
             likeNum: res || 0,
186 202
           }
187 203
         }
188
-
189
-        this.$message({
190
-          message: res == this.current.likeNum ? '已赞' : '赞 +1',
191
-          type: res == this.current.likeNum ? 'warning' : 'success'
192
-        });
204
+        this.activeColor = '#e03723'
205
+        // this.$message({
206
+        //   message: res == this.current.likeNum ? '已赞' : '赞 +1',
207
+        //   type: res == this.current.likeNum ? 'warning' : 'success'
208
+        // });
193 209
       })
194 210
     },
195 211
 
196 212
 
197 213
 
198
-  
214
+
199 215
   },
200
-  
216
+
217
+
218
+
201 219
 
202 220
 }
203 221
 </script>
@@ -210,10 +228,16 @@ export default {
210 228
     border: 2px solid #e03723;
211 229
   }
212 230
 }
231
+
232
+// .btn-default {
233
+// }
213 234
 @media (max-width: 992px) {
214 235
   .casetitle {
215 236
     display: none;
216 237
   }
238
+  .p1 {
239
+    margin-bottom: 0px;
240
+  }
217 241
 }
218 242
 
219 243
 @media (min-width: 992px) {
@@ -258,6 +282,9 @@ export default {
258 282
   .button-hover:hover {
259 283
     color: #e03723;
260 284
     border: 1px solid #e03723;
285
+    background-color: #fff !important;
286
+    outline: none;
287
+    box-shadow: none;
261 288
   }
262 289
   .btn1 {
263 290
     font-size: 2.4rem !important;
@@ -276,6 +303,28 @@ export default {
276 303
     background-color: #fff;
277 304
     border: 1px solid #aaaaaa;
278 305
     border-radius: 0px;
306
+    outline: none;
307
+  }
308
+  .btn:hover {
309
+    color: #e03723;
310
+    border: 1px solid #e03723;
311
+    outline: none;
312
+  }
313
+  .btn:active {
314
+    color: #e03723;
315
+    border: 1px solid #e03723;
316
+    box-shadow: none;
317
+  }
318
+
319
+  .btn-default:active:focus {
320
+    color: #e03723;
321
+    background-color: #fff;
322
+    border: 1px solid #e03723;
323
+    outline: none;
324
+  }
325
+  .btn:active:focus {
326
+    color: #e03723;
327
+    border: 1px solid #e03723;
279 328
   }
280 329
   .next-prev {
281 330
     width: 80%;
@@ -295,7 +344,11 @@ export default {
295 344
 }
296 345
 
297 346
 @media (max-width: 992px) {
347
+  .details {
348
+    margin-top: 47.8px;
349
+  }
298 350
   .btn1 {
351
+    line-height: 25px;
299 352
     font-size: 1.2rem !important;
300 353
     color: black !important;
301 354
     border: none !important;
@@ -312,12 +365,18 @@ export default {
312 365
   }
313 366
   .pull-left {
314 367
     .iconfont {
315
-      font-size: 2.4rem;
368
+      font-size: 1.6rem;
316 369
     }
317 370
   }
371
+  .iconfont:visited {
372
+    color: red;
373
+  }
318 374
   .pull-right {
319 375
     display: flex;
320 376
   }
377
+  .zan {
378
+    padding-top: 9px;
379
+  }
321 380
   .zantext {
322 381
     // margin-top: -3px;
323 382
     margin-left: 10px;
@@ -360,7 +419,7 @@ export default {
360 419
     }
361 420
   }
362 421
   h2 {
363
-    font-size: 2rem;
422
+    font-size: 1.2rem;
364 423
   }
365 424
 
366 425
   // .share {
@@ -467,7 +526,7 @@ export default {
467 526
 <style lang="less" scoped>
468 527
 .icon-nobefore {
469 528
   &::before {
470
-    content: "" !important;
529
+    content: '' !important;
471 530
   }
472 531
 }
473 532
 

+ 73
- 27
src/views/Dynamic.vue Прегледај датотеку

@@ -8,7 +8,7 @@
8 8
 
9 9
     <div class="border-bottom comtype">
10 10
       <div>
11
-        <button type="button" class="btn1 btn-link app" @click="() => filterCase()"  :class="{btnactive:thisbtn==''}">全部动态</button>
11
+        <button type="button" class="btn1 btn-link app" @click="() => filterCase()" :class="{btnactive:thisbtn==''}">全部动态</button>
12 12
         <button v-for="cas in casetype" :key="cas.id" @click="() => filterCase(cas)" type="button" class="btn1 btn-link app" :class="{btnactive:thisbtn==cas.typeName}">{{cas.typeName}}</button>
13 13
       </div>
14 14
     </div>
@@ -23,19 +23,18 @@
23 23
         <el-button class="btn-link mobbtn" @click="drawer = true" type="button" style="margin-left: 16px;;width:140px;padding-left:0;padding-right:0">{{currentTypeName}}</el-button>
24 24
       </div>
25 25
     </div>
26
-    <el-drawer :visible.sync="drawer" :direction="direction" :show-close="true" size="80%">
26
+    <el-drawer :visible.sync="drawer" :direction="direction" :show-close="true" size="80%" style="text-align: center;">
27 27
       <div>
28
-        <el-row style="text-align: center;">
28
+        <el-row style="text-align: center;height:72.5vh;display: grid;">
29 29
           <el-col :span="24">
30 30
             <button type="button" class="btn-link" @click="() => filterCase()" style="color:black;font-size: 24px;" :class="{btnactive:thisbtn==''}">全部动态</button>
31 31
           </el-col>
32 32
           <el-col :span="24" v-for="cas in casetype" :key="cas.id">
33 33
             <button type="button" class="btn-link" @click="() => filterCase(cas)" style="color:black;font-size: 24px" :class="{btnactive:thisbtn==cas.typeName}">{{cas.typeName}}</button>
34 34
           </el-col>
35
-          <el-col :span="24">
36
-            <button type="button" class="btn btn-default rebtn" @click="drawer = flase" style="color:black;font-size: 24px;padding-left: 40px;padding-right: 40px; margin-top:30px">返回</button>
37
-          </el-col>
35
+          
38 36
         </el-row>
37
+         <button type="button" class="btn btn-default rebtn" @click="drawer = flase" style="text-align:center;color:black;font-size: 24px;padding-left: 40px;padding-right: 40px;">返回</button>
39 38
       </div>
40 39
     </el-drawer>
41 40
 
@@ -43,14 +42,14 @@
43 42
       <div class="row">
44 43
         <div class="col-md-6 col-xs-6 cards" v-for="(item,index) in caselist" :key="index" :class="{ marginTP: index > 1 }">
45 44
           <router-link :to="{ name: 'details', params: { id: item.id }}" class="routelink">
46
-            <case-card :thumb="item.caseCoverImg" :title="item.caseTitle" :caption="item.caseSummary"></case-card>
45
+            <case-card :thumb="item.caseCoverImg" :title="item.caseTitle" :caption="item.caseSummary" class="casecard"></case-card>
47 46
           </router-link>
48 47
         </div>
49 48
       </div>
50 49
     </div>
51 50
 
52 51
     <div style="margin-top:40px">
53
-      <button type="button" class="btn btn-default" @click="more" v-if="!allLoaded">加载更多</button>
52
+      <button type="button" class="btn btn-default rebtn" @click="more" v-if="!allLoaded">加载更多</button>
54 53
       <p v-else>已经到底了~更多动态敬请期待~</p>
55 54
     </div>
56 55
   </div>
@@ -85,7 +84,7 @@ export default {
85 84
       direction: 'rtl',
86 85
 
87 86
       currentTypeName: '全部动态',
88
-      thisbtn:''
87
+      thisbtn: ''
89 88
     }
90 89
   },
91 90
   components: {
@@ -164,7 +163,7 @@ export default {
164 163
 
165 164
       this.getCaseList({ pageNum: 1, caseType: caseType ? caseType.id : '' });
166 165
       this.drawer = false;
167
-       this.thisbtn = caseType ? caseType.typeName : ''
166
+      this.thisbtn = caseType ? caseType.typeName : ''
168 167
     },
169 168
   }
170 169
 
@@ -177,15 +176,19 @@ export default {
177 176
   text-decoration: none;
178 177
 }
179 178
 
180
-.casecard {
179
+.dynamic {
180
+  min-height: 90vh;
181
+}
182
+
183
+/* .casecard {
181 184
   width: 100%;
182 185
 
183 186
   padding-bottom: 100%;
184 187
   background-size: 100% 100% !important;
185
-  /* position: relative; */
188
+  position: relative;
186 189
 
187 190
   margin: 0;
188
-}
191
+} */
189 192
 
190 193
 .border-bottom {
191 194
   /* display: none; */
@@ -207,7 +210,7 @@ export default {
207 210
   padding: 12px 40px;
208 211
   border-radius: 0px;
209 212
   background-color: rgb(252, 151, 252);
210
-  border: 2px solid #bfbfbf;
213
+  /* border: 2px solid #bfbfbf; */
211 214
 }
212 215
 
213 216
 .text-left {
@@ -225,7 +228,10 @@ export default {
225 228
 
226 229
 @media (max-width: 992px) {
227 230
   .dynamic {
228
-    margin-top: 58px;
231
+    margin-top: 47.8px;
232
+    margin-bottom: -47.8px;
233
+    padding-bottom: 47.8px;
234
+    background-color: #fafafa;
229 235
   }
230 236
   .comtype {
231 237
     display: none;
@@ -234,23 +240,22 @@ export default {
234 240
   .dyn-main {
235 241
     margin-top: 20px;
236 242
 
237
-     padding-left: 1.6vw;
243
+    padding-left: 1.6vw;
238 244
     padding-right: 1.6vw;
239 245
   }
240 246
   .marginTP {
241 247
     margin-top: 3.2vw;
242 248
   }
243
-  .cards{
249
+  .cards {
244 250
     padding-left: 1.6vw;
245 251
     padding-right: 1.6vw;
246 252
   }
247 253
 }
248 254
 .row {
249
-    margin-left: 0;
255
+  margin-left: 0;
250 256
   margin-right: 0;
251 257
 }
252 258
 
253
-
254 259
 @media (min-width: 992px) {
255 260
   .main {
256 261
     display: -webkit-flex; /* Safari */
@@ -261,8 +266,8 @@ export default {
261 266
     justify-content: center;
262 267
   }
263 268
   .marginTP {
264
-  margin-top: 3rem;
265
-}
269
+    margin-top: 3rem;
270
+  }
266 271
   .dynamic {
267 272
     margin-top: 116px;
268 273
     margin-bottom: -116px;
@@ -286,6 +291,22 @@ export default {
286 291
   .btn:hover {
287 292
     color: #e03723;
288 293
     border: 1px solid #e03723;
294
+    outline: none;
295
+  }
296
+  .btn:active {
297
+    color: #e03723;
298
+    border: 1px solid #e03723;
299
+  }
300
+
301
+  .btn-default:active:focus {
302
+    color: #e03723;
303
+    background-color: #fff;
304
+    border: 1px solid #e03723;
305
+    outline: none;
306
+  }
307
+  .btn:active:focus {
308
+    color: #e03723;
309
+    border: 1px solid #e03723;
289 310
   }
290 311
 
291 312
   .dyn-main {
@@ -319,15 +340,40 @@ export default {
319 340
     margin-top: 28px;
320 341
   }
321 342
 }
322
-.btnactive{
323
-  color:#e03723 !important;
343
+.btnactive {
344
+  color: #e03723 !important;
324 345
 }
325
-.rebtn{
346
+.rebtn {
326 347
   border-radius: 0px;
327 348
 }
328
-.rebtn:hover{
349
+.rebtn:hover {
329 350
   color: #e03723 !important;
330
-    border: 1px solid #e03723;
331
-    background: #fff;
351
+  border: 1px solid #e03723;
352
+  background: #fff;
353
+}
354
+</style>
355
+
356
+
357
+
358
+<style lang="less" scoped>
359
+@media (min-width: 992px) {
360
+  .cards:hover {
361
+    .casecard {
362
+      transition: all 0.4s;
363
+      margin-top: -20px;
364
+      margin-bottom: 20px;
365
+      box-shadow: 0px 0px 16px 5px rgba(0, 0, 0, 0.12);
366
+    }
367
+  }
368
+}
369
+@media (min-width: 992px) and (max-width: 1500px) {
370
+  .cards:hover {
371
+    .casecard {
372
+      transition: all 0.4s;
373
+      margin-top: -10px;
374
+      margin-bottom: 10px;
375
+      box-shadow: 0px 0px 10px 3px rgba(0, 0, 0, 0.12);
376
+    }
377
+  }
332 378
 }
333 379
 </style>

+ 29
- 12
src/views/Home.vue Прегледај датотеку

@@ -185,8 +185,8 @@ export default {
185 185
   created () {
186 186
 
187 187
     //合作伙伴
188
-
189
-
188
+// 
189
+// console.log(isMobilePhone)
190 190
     // axios.get('http://localhost:8080/pc/partner/list/?pageNum=1&pageSize=18')
191 191
     request({
192 192
       ...apis.partner.list,
@@ -299,13 +299,13 @@ export default {
299 299
     padding: 2% !important;
300 300
   }
301 301
   .ph-logo {
302
-    width: 100%;
302
+    width: 80%;
303 303
     /* padding-bottom: 37px; */
304 304
     /* height: 100%; */
305 305
     height: 0;
306
-    padding-bottom: 45.8%;
306
+    padding-bottom: 36.64%;
307 307
     background-size: 100% 100% !important;
308
-    margin: 3px auto;
308
+    margin: 1.8vw auto;
309 309
   }
310 310
   .top-news {
311 311
     margin-top: 30px;
@@ -313,7 +313,7 @@ export default {
313 313
   .top-case {
314 314
     margin-top: 40px;
315 315
     padding: 0;
316
-    padding-bottom: 30px !important;
316
+    padding-bottom: 6vw !important;
317 317
     border: none;
318 318
   }
319 319
   .aarow_box {
@@ -336,16 +336,23 @@ export default {
336 336
   .btn {
337 337
     font-size: 1.2rem;
338 338
     margin-top: 0px;
339
-    width: 140px;
340
-
339
+    width: 120px;
340
+height: 32px;
341
+padding: 0;
342
+line-height: 30px;
341 343
     border-radius: 0px;
342 344
     color: #000;
343 345
     background-color: #fff;
344 346
     border: 1px solid #aaaaaa;
347
+  }
348
+   .btn:hover {
349
+    color: #e03723;
350
+    border: 1px solid #e03723;
351
+    background: #fff;
345 352
   }
346 353
   h1 {
347
-    margin-top: 30px;
348
-
354
+    margin-top: 9.7vw;
355
+    margin-bottom: 3vw;
349 356
     font-size: 1.8rem;
350 357
     font-weight: bold;
351 358
     letter-spacing: 0.3rem;
@@ -376,6 +383,7 @@ export default {
376 383
   .btn:hover {
377 384
     color: #e03723;
378 385
     border: 1px solid #e03723;
386
+    background: #fff;
379 387
   }
380 388
 
381 389
   p {
@@ -581,6 +589,15 @@ h3 {
581 589
       padding: 20px;
582 590
     }
583 591
   }
592
+  .p2{
593
+    padding: 0;
594
+    margin-bottom: 5.2vw;
595
+  }
596
+  .btn-lg {
597
+    width: 18.3vw;
598
+    height: 6.3vw;
599
+    line-height: 6vw;
600
+  }
584 601
 }
585 602
 @media (min-width: 992px) {
586 603
   .st4 .casetitle {
@@ -734,10 +751,10 @@ h3 {
734 751
   }
735 752
 }
736 753
 @media (max-width: 600px) {
737
-  h3 {font-size: 1.4rem}
754
+  h3 {font-size: 1.2rem}
738 755
 }
739 756
 @media (max-width: 400px) {
740
-  h3 {font-size: 1rem}
757
+  h3 {font-size: 0.8rem}
741 758
 }
742 759
 
743 760
 </style>