图片放大

package-lock.json

@@ -196,8 +196,8 @@
     },
     "adjust-sourcemap-loader": {
       "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/adjust-sourcemap-loader/download/adjust-sourcemap-loader-1.2.0.tgz",
-      "integrity": "sha1-4z/eleUNufKoAuNkfjEdL8UADGk=",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz",
+      "integrity": "sha512-958oaHHVEXMvsY7v7cC5gEkNIcoaAVIhZ4mBReYVZJOTP9IgKmzLjIOhTtzpLMu+qriXvLsVjJ155EeInp45IQ==",
       "requires": {
         "assert": "^1.3.0",
         "camelcase": "^1.2.1",
@@ -210,12 +210,12 @@
       "dependencies": {
         "camelcase": {
           "version": "1.2.1",
-          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
           "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
         },
         "lodash.defaults": {
           "version": "3.1.2",
-          "resolved": "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-3.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
           "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
           "requires": {
             "lodash.assign": "^3.0.0",
@@ -224,7 +224,7 @@
           "dependencies": {
             "lodash.assign": {
               "version": "3.2.0",
-              "resolved": "https://registry.npm.taobao.org/lodash.assign/download/lodash.assign-3.2.0.tgz",
+              "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
               "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
               "requires": {
                 "lodash._baseassign": "^3.0.0",
@@ -534,7 +534,7 @@
     },
     "autoprefixer-loader": {
       "version": "3.2.0",
-      "resolved": "https://registry.npm.taobao.org/autoprefixer-loader/download/autoprefixer-loader-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/autoprefixer-loader/-/autoprefixer-loader-3.2.0.tgz",
       "integrity": "sha1-Oae2ZGqCaYZQc9lYyX9IYVLCyEo=",
       "requires": {
         "autoprefixer": "^6.0.2",
@@ -545,17 +545,17 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "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",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "ansi-styles": {
           "version": "2.2.1",
-          "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",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "autoprefixer": {
           "version": "6.7.7",
-          "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",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
           "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
           "requires": {
             "browserslist": "^1.7.6",
@@ -568,12 +568,12 @@
         },
         "big.js": {
           "version": "3.2.0",
-          "resolved": "https://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz",
-          "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4="
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
         },
         "browserslist": {
           "version": "1.7.7",
-          "resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-1.7.7.tgz",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "requires": {
             "caniuse-db": "^1.0.30000639",
@@ -582,7 +582,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "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",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -594,19 +594,19 @@
           "dependencies": {
             "supports-color": {
               "version": "2.0.0",
-              "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",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
             }
           }
         },
         "has-flag": {
           "version": "1.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
         },
         "loader-utils": {
           "version": "0.2.17",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "requires": {
             "big.js": "^3.1.3",
@@ -617,8 +617,8 @@
         },
         "postcss": {
           "version": "5.2.18",
-          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "requires": {
             "chalk": "^1.1.3",
             "js-base64": "^2.1.9",
@@ -628,12 +628,12 @@
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -641,7 +641,7 @@
         },
         "supports-color": {
           "version": "3.2.3",
-          "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",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "requires": {
             "has-flag": "^1.0.0"
@@ -2790,8 +2790,8 @@
     },
     "css": {
       "version": "2.2.4",
-      "resolved": "https://registry.npm.taobao.org/css/download/css-2.2.4.tgz",
-      "integrity": "sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk=",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
       "requires": {
         "inherits": "^2.0.3",
         "source-map": "^0.6.1",
@@ -6841,7 +6841,7 @@
     },
     "lodash._baseassign": {
       "version": "3.2.0",
-      "resolved": "https://registry.npm.taobao.org/lodash._baseassign/download/lodash._baseassign-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
       "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
       "requires": {
         "lodash._basecopy": "^3.0.0",
@@ -6850,17 +6850,17 @@
     },
     "lodash._basecopy": {
       "version": "3.0.1",
-      "resolved": "https://registry.npm.taobao.org/lodash._basecopy/download/lodash._basecopy-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
     },
     "lodash._bindcallback": {
       "version": "3.0.1",
-      "resolved": "https://registry.npm.taobao.org/lodash._bindcallback/download/lodash._bindcallback-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
       "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
     },
     "lodash._createassigner": {
       "version": "3.1.1",
-      "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",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
       "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
       "requires": {
         "lodash._bindcallback": "^3.0.0",
@@ -6870,12 +6870,12 @@
     },
     "lodash._getnative": {
       "version": "3.9.1",
-      "resolved": "https://registry.npm.taobao.org/lodash._getnative/download/lodash._getnative-3.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
     },
     "lodash._isiterateecall": {
       "version": "3.0.9",
-      "resolved": "https://registry.npm.taobao.org/lodash._isiterateecall/download/lodash._isiterateecall-3.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
     },
     "lodash.assign": {
@@ -6896,22 +6896,22 @@
     },
     "lodash.defaults": {
       "version": "4.2.0",
-      "resolved": "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
       "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
     },
     "lodash.isarguments": {
       "version": "3.1.0",
-      "resolved": "https://registry.npm.taobao.org/lodash.isarguments/download/lodash.isarguments-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
       "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
     },
     "lodash.isarray": {
       "version": "3.0.4",
-      "resolved": "https://registry.npm.taobao.org/lodash.isarray/download/lodash.isarray-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
     },
     "lodash.keys": {
       "version": "3.1.2",
-      "resolved": "https://registry.npm.taobao.org/lodash.keys/download/lodash.keys-3.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
       "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
       "requires": {
         "lodash._getnative": "^3.0.0",
@@ -6932,7 +6932,7 @@
     },
     "lodash.restparam": {
       "version": "3.6.1",
-      "resolved": "https://registry.npm.taobao.org/lodash.restparam/download/lodash.restparam-3.6.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
       "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
     },
     "lodash.tail": {
@@ -7797,7 +7797,7 @@
     },
     "object-path": {
       "version": "0.9.2",
-      "resolved": "https://registry.npm.taobao.org/object-path/download/object-path-0.9.2.tgz",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
       "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU="
     },
     "object-visit": {
@@ -8236,8 +8236,8 @@
     },
     "photoswipe": {
       "version": "4.1.3",
-      "resolved": "https://registry.npm.taobao.org/photoswipe/download/photoswipe-4.1.3.tgz",
-      "integrity": "sha1-WfSUlO653atYiNAzkpJqGbwZdVA="
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.3.tgz",
+      "integrity": "sha512-89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA=="
     },
     "pify": {
       "version": "3.0.0",
@@ -10390,7 +10390,7 @@
     },
     "postcss-safe-parser": {
       "version": "1.0.7",
-      "resolved": "https://registry.npm.taobao.org/postcss-safe-parser/download/postcss-safe-parser-1.0.7.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-1.0.7.tgz",
       "integrity": "sha1-Q70MjITV99hHTeglxpnk2ryscqg=",
       "requires": {
         "postcss": "^5.0.18"
@@ -10398,17 +10398,17 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "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",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "ansi-styles": {
           "version": "2.2.1",
-          "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",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "chalk": {
           "version": "1.1.3",
-          "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",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -10420,20 +10420,20 @@
           "dependencies": {
             "supports-color": {
               "version": "2.0.0",
-              "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",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
               "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
             }
           }
         },
         "has-flag": {
           "version": "1.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
         },
         "postcss": {
           "version": "5.2.18",
-          "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-5.2.18.tgz",
-          "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "requires": {
             "chalk": "^1.1.3",
             "js-base64": "^2.1.9",
@@ -10443,12 +10443,12 @@
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -10456,7 +10456,7 @@
         },
         "supports-color": {
           "version": "3.2.3",
-          "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",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "requires": {
             "has-flag": "^1.0.0"
@@ -11442,8 +11442,8 @@
     },
     "regex-parser": {
       "version": "2.2.10",
-      "resolved": "https://registry.npm.taobao.org/regex-parser/download/regex-parser-2.2.10.tgz",
-      "integrity": "sha1-nmao9z2JoQdhbmOznU3t3+6RKzc="
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
+      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA=="
     },
     "regexpu-core": {
       "version": "2.0.0",
@@ -11633,8 +11633,8 @@
     },
     "resolve-url-loader": {
       "version": "2.3.2",
-      "resolved": "https://registry.npm.taobao.org/resolve-url-loader/download/resolve-url-loader-2.3.2.tgz",
-      "integrity": "sha1-g7uevDkrZsVjeV7vIvB4lwNXom4=",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-2.3.2.tgz",
+      "integrity": "sha512-sc/UVgiADdoTc+4cGPB7cUCnlEkzlxD1NXHw4oa9qA0fp30H8mAQ2ePJBP9MQ029DUuhEPouhNdvzT37pBCV0g==",
       "requires": {
         "adjust-sourcemap-loader": "^1.1.0",
         "camelcase": "^4.1.0",
@@ -11649,7 +11649,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
@@ -11671,7 +11671,7 @@
     },
     "rework": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/rework/download/rework-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
       "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
       "requires": {
         "convert-source-map": "^0.3.3",
@@ -11680,14 +11680,14 @@
       "dependencies": {
         "convert-source-map": {
           "version": "0.3.5",
-          "resolved": "https://registry.npm.taobao.org/convert-source-map/download/convert-source-map-0.3.5.tgz",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
           "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
         }
       }
     },
     "rework-visit": {
       "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/rework-visit/download/rework-visit-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
       "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
     },
     "right-align": {
@@ -12870,8 +12870,8 @@
     },
     "style-loader": {
       "version": "0.19.1",
-      "resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-0.19.1.tgz",
-      "integrity": "sha1-WR/8gLzv4mi3fF2evAUF13Jhn4U=",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
+      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
       "requires": {
         "loader-utils": "^1.0.2",
         "schema-utils": "^0.3.0"
@@ -13861,8 +13861,8 @@
     },
     "vue-photo-preview": {
       "version": "1.1.3",
-      "resolved": "https://registry.npm.taobao.org/vue-photo-preview/download/vue-photo-preview-1.1.3.tgz",
-      "integrity": "sha1-juYpI+hl08uvAQsHsMyEGJJjMCg=",
+      "resolved": "https://registry.npmjs.org/vue-photo-preview/-/vue-photo-preview-1.1.3.tgz",
+      "integrity": "sha512-L9JTQh62rYqLHNCdpy7zQdqVisks9dvkmUpM8+7kIKG7l+KkbRLzKWK7lCjCKc6OQT42o6/ngK6B13niXunS9Q==",
       "requires": {
         "autoprefixer-loader": "^3.2.0",
         "babel-core": "^6.26.0",

src/api/micro/micro.js

@@ -3,6 +3,7 @@ import org from '../../router/modules/org';
 import { link } from 'fs';
 
 export function getHospitaldata(orgid,params){
+    console.log("orgid",orgid)
     return request({
         url:"/api/site/getdata?orgid="+orgid,
         method:"Get",

src/main.js

@@ -39,6 +39,10 @@ import BaiduMap from "vue-baidu-map";
 import Viewer from "v-viewer";
 import "viewerjs/dist/viewer.css";
 
+import preview from "vue-photo-preview";
+import "vue-photo-preview/dist/skin.css";
+Vue.use(preview);
+
 import "./libs/rem.js";
 
 //Vue.use(Viewer) 默认配置写法

src/router/index.js

@@ -66,20 +66,34 @@ var _constant_router_map = [
     path: "/microHome",
     component: () => import("@/scrm_pages/microHome/microHome")
   },
+
+  // 医院介绍详情
   {
     path: "/hospitalIntroduction",
     component: () =>
       import("@/scrm_pages/hospitalIntroduction/hospitalIntroduction")
   },
+  
+  // 科室介绍详情
+  {
+    path:"/officeIntroduction",
+    component:() =>
+    import('@/scrm_pages/officeIntroduction/officeIntroduction')
+  },
+
   {
     path: "/medicalTeam",
     component: () => import("@/scrm_pages/medicalTeam/medicalTeam")
   },
+  
+  // 名医介绍详情
+
   {
     path: "/doctorIntroduction",
     component: () =>
       import("@/scrm_pages/doctorIntroduction/doctorIntroduction")
   },
+
   {
     path: "/news",
     component: () => import("@/scrm_pages/news/news")

src/scrm_pages/activity/activity.vue

@@ -1,20 +1,21 @@
 <template>
   <div>
     <div class="content">
-      <div class="contentOne">
+      <div class="contentOne" v-for="it in Activitieslist" :key="it.id"  @click="singleActivitInfo(it.id,it.user_org_id)">
         <div class="img">
-          <img src="static\images\img1.jpg" alt />
+          <img :src="it.poster_photo" style="width:100%;height:100%" alt />
         </div>
         <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
+          <p class="detailTitle">{{it.title}}</p>
           <div class="detailBox">
             <div class="activityTime">
               <p>
-                7月28日 08:30开始
-                深圳市南山区
+               {{staffCreateTime(it.start_time)}}开始<br>
+                <!-- {{it.address}} -->
               </p>
             </div>
             <div class="people">
+<<<<<<< HEAD
               <p>100人已报名</p>
             </div>
           </div>
@@ -111,6 +112,9 @@
             </div>
             <div class="people">
               <p>100人已报名</p>
+=======
+              <p>{{it.join_num}}</p>
+>>>>>>> b16550aa910aaf7d56c03d34730cdaf88ad2c98f
             </div>
           </div>
         </div>
@@ -118,8 +122,47 @@
     </div>
   </div>
 </template>
-
-
+  <script>
+      import {getFileExtension,uParseTime} from '@/utils/tools'
+      import { Activitiesmore } from "@/api/micro/micro"
+      export default{
+        data(){
+            return{
+               Activitieslist:[],
+            }
+        },
+        methods:{
+           Activitiesmore(id,orgid){
+                Activitiesmore(id,orgid).then(response=>{
+                     if(response.data.state == 1){
+                       var activity =  response.data.data.activity;
+                       this.Activitieslist =  response.data.data.activity;                 
+                       console.log("获取活动列表",activity)
+                    }
+                })
+            },
+           staffCreateTime(time) {
+               return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+           },
+           singleActivitInfo(id,orgid){
+                this.$router.push({
+                    path:'/activityDetail',
+                    query:{
+                     id:id,
+                     orgid,orgid,
+                   }
+                })
+            }
+        },
+        created(){
+           const id = this.$route.query.id;
+            const orgid = this.$route.query.orgid;
+            console.log("id是多少",id)
+            console.log("orgid是多少",orgid)
+            this.Activitiesmore(id,orgid)
+        }
+      }
+  </script>
 <style lang="scss" scoped>
 .contentOne {
   margin: auto;

src/scrm_pages/activityDetail/activityDetail.vue

@@ -1,48 +1,80 @@
 <template>
   <div>
     <div class="banner">
-      <img src="static\images\banner.jpg" alt />
+      <img :src="activitys.poster_photo" style="width:100%;height:100%" alt />
     </div>
     <div class="headline">
-      <div class="top">与孩子一起挑选采摘新鲜有机马陆葡萄，体验采摘乐趣</div>
-      <div class="bottom">
+      <div class="top">{{activitys.title}}</div>
+      <!-- <div class="bottom">
         <p class="browse">
           <i class="iconfont">&#xe629;</i>
           <span>浏览400次</span>
         </p>
-      </div>
+      </div> -->
     </div>
     <div class="detail">
       <p class="row">
         <i class="iconfont">&#xe608;</i>
-        <span>06-19 14:00 至 17:00</span>
+        <span>{{staffCreateTime(activitys.start_time)}}</span>
       </p>
       <p class="row">
         <i class="iconfont">&#xe608;</i>
-        <span>广东省深圳市南山去时代大厦3楼赛盒科技观海...</span>
+        <span>{{activitys.address}}</span>
       </p>
       <p class="row">
         <i class="iconfont">&#xe608;</i>
-        <span>已报名49人 / 限55人</span>
+        <span>{{activitys.join_num}} / {{activitys.limit_num}}</span>
       </p>
       <p class="row">
         <i class="iconfont">&#xe608;</i>
-        <span>0755-8548673</span>
+        <span>{{activitys.phone_number}}</span>
       </p>
     </div>
     <div class="introduce">
       <div class="common_title">
         <div class="one"></div>
-        <div class="dynamicTxt">活动介绍</div>
+        <div class="dynamicTxt">报名须知</div>
       </div>
       <div
         class="introduceDetail"
-      >深圳市南山区人民医院(深圳市第六人民医院)，坐落于深圳经济特区西部南头半岛中心区，是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院...</div>
+      >{{activitys.sign_up_notice}}</div>
     </div>
-    <div class="apply">我要报名</div>
+    <!-- <div class="apply">我要报名</div> -->
   </div>
 </template>
-
+ <script>
+        import {uParseTime} from "@/utils/tools";
+        import { singleActivitInfo } from "@/api/micro/micro"
+        export default{
+          data(){
+             return{
+                activitys:[],
+             }
+          },
+          methods:{
+              staffCreateTime(time) {
+                console.log("time是多少",time)
+               return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");       
+              },
+            singleActivitInfo(id,orgid){
+               singleActivitInfo(id,orgid).then(response=>{
+                  if(response.data.state ==1){
+                  var activitys = response.data.data.activity;
+                  this.activitys = activitys;
+                  console.log("activitys",activitys)
+                }   
+               })
+            }
+          },
+          created(){
+            const id = this.$route.query.id;
+            const orgid = this.$route.query.orgid;
+            console.log("id是多少",id)
+            console.log("orgid是多少",orgid)
+            this.singleActivitInfo(id,orgid)   
+          }
+        }
+ </script>
 
 <style lang="scss" scoped>
 .banner {

src/scrm_pages/doctorIntroduction/doctorIntroduction.vue

@@ -3,38 +3,111 @@
     <div>
       <div class="contentOne">
         <div class="img">
-          <img src="static\images\img1.jpg" alt />
+          <img :src="doctors.dochead" style="width:100%;height:100%" alt />
         </div>
         <div class="detail">
           <p class="detailTitle">
-            欧巧漫
-            <span>主任医师</span>
+              {{doctors.doc_name}}
+            <span>{{doctors.doc_postion}}</span>
           </p>
-          <p class="detailMessage">深圳大学第二附属医院-内科</p>
+          <p class="detailMessage" v-html="doctors.docintroduction"></p>
         </div>
       </div>
-      <div class="good">
+      <!-- <div class="good">
         <div class="common_title">
           <div class="one"></div>
           <div class="dynamicTxt">医生擅长</div>
         </div>
         <div class="goodtxt">擅长甲状腺、胆结石</div>
-      </div>
+      </div> -->
       <div class="good">
         <div class="common_title">
           <div class="one"></div>
           <div class="dynamicTxt">医生简介</div>
         </div>
-        <div class="goodtxt">
-          于1996年毕业于中国医科大学，从事医疗工作
-          近20年，经验丰富
+        <div class="goodtxt" v-html="doctors.docintroduction">
+           
         </div>
       </div>
     </div>
   </div>
 </template>
+  
+  <script>
+     import { singleDoctorInfo } from "@/api/micro/micro"
+     export default{
+       data(){
+          return{
+            doctors:[],
+          }
+       },
+       methods:{
+         singleDoctorInfo(id,orgid){
+                singleDoctorInfo(id,orgid).then(response=>{
+                    if(response.data.state ==1){
+                     var editdoctor = response.data.data.editdoctor;
+                     if(editdoctor.doc_postion == 1){
+                        editdoctor.doc_postion = "医士"
+                     }
+                     if(editdoctor.doc_postion == 2){
+                        editdoctor.doc_postion = "医师"
+                     }
+                       if(editdoctor.doc_postion == 3){
+                        editdoctor.doc_postion = "住院医师"
+                     }                    
+                       if(editdoctor.doc_postion == 4){
+                        editdoctor.doc_postion = "主治医师"
+                     }
+                       if(editdoctor.doc_postion == 5){
+                        editdoctor.doc_postion = "副主任医师"
+                     }
+                       if(editdoctor.doc_postion == 6){
+                        editdoctor.doc_postion = "主任医师"
+                     }
+                       if(editdoctor.doc_postion == 7){
+                        editdoctor.doc_postion = "护士"
+                     }
+                       if(editdoctor.doc_postion == 8){
+                        editdoctor.doc_postion = "护师"
+                     }
+                       if(editdoctor.doc_postion == 9){
+                        editdoctor.doc_postion = "主管护师"
+                     }
+                      if(editdoctor.doc_postion == 10){
+                        editdoctor.doc_postion = "副主任护师"
+                     }
+                      if(editdoctor.doc_postion == 11){
+                        editdoctor.doc_postion = "主任护师"
+                     }
+                   
+                     console.log("editdoctor",editdoctor)
+                     this.doctors = editdoctor;
+                    }
+                })
 
+            //      { index: 1, name: '医士' },
+            // { index: 2, name: '医师' },
+            // { index: 3, name: '住院医师' },
+            // { index: 4, name: '主治医师' },
+            // { index: 5, name: '副主任医师' },
+            // { index: 6, name: '主任医师' },
+            // { index: 7, name: '护士' },
+            // { index: 8, name: '护师' },
+            // { index: 9, name: '主管护师' },
+            // { index: 10, name: '副主任护师' },
+            // { index: 11, name: '主任护师' },
+            }  
+       },
+       created(){
+          const id = this.$route.query.id;
+           const orgid = this.$route.query.orgid;
+           console.log("id是多少",id)
+           console.log("orgid是多少",orgid)
+           this.singleDoctorInfo(id,orgid)
+       }
+     }
 
+  </script>
 <style lang="scss" scoped>
 .contentOne {
   margin: auto;
@@ -78,6 +151,13 @@
       line-height: 1.5rem;
       font-weight: 400;
       margin-top: 0.875rem;
+      height: 30px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+       display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      // border: solid 1px red;
     }
   }
 }

src/scrm_pages/hospitalIntroduction/hospitalIntroduction.vue

@@ -1,18 +1,41 @@
 <template>
   <div class="main">
-    <div class="bannerImg">
+    <!-- <div class="bannerImg">
       <img src="static\images\banner.jpg" alt />
-    </div>
-    <div class="detail">
-      <p>
-        蛇口位于深圳湾半岛，与香港隔海相望，西依珠江口，背靠大南山,拥有得天独厚的地理位置；作为改革开放的前沿阵地，经过数十年的发展，如今已成为一个融合居住与旅游、本土与国际、富饶与休闲的国际化城区，区域内集中了鲸山别墅九期、双玺花园、兰溪谷等一系列高尚住宅，聚集着一大批具有高品质生活、高消费能力的优质人群，同时也吸引了来自70多个国家和地区，占深圳市60%以上的外籍人士聚居于此，拥有“小联合国”的美誉。
-        深圳市南山区蛇口人民医院暨中南大学湘雅二医院深圳医院，坐落于蛇口半岛中心地带，目前已成为外籍人士与港澳居。
-        深圳市南山区蛇口人民医院暨中南大学湘雅二医院深圳医院，坐落于蛇口半岛中心地带，目前已成为外籍人士与港澳居
-      </p>
+    </div> -->
+      <div class="detail" v-html="hospitalform.introduction">
     </div>
   </div>
 </template>
-
+ <script>
+    import { hispitalmore } from "@/api/micro/micro"
+     export default{
+        name:"hospitalIntroduction",
+        data(){
+            return{
+              hospitalform:[],
+            }
+        },
+        methods:{
+           hispitalmore(id,orgid){
+             hispitalmore(id,orgid).then(response=>{
+                 if(response.data.state ==1){
+                   var hospital =  response.data.data.hospital;
+                   console.log("hospital",hospital)
+                   this.hospitalform =  response.data.data.hospital;
+                }
+               })
+            }
+        },
+        created(){
+           const id = this.$route.query.id;
+           const orgid = this.$route.query.orgid;
+           console.log("id是多少",id)
+           console.log("orgid是多少",orgid)
+           this.hispitalmore(id,orgid)
+        }
+     }
+ </script>
 
 
 <style lang="scss" scoped>

src/scrm_pages/medicalTeam/medicalTeam.vue

@@ -9,65 +9,66 @@
     </div>
     <div class="msg">贴心的服务，让您的就医更轻松</div>
     <div class="content">
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">欧巧漫</p>
-          <p class="detailMessage">苏安，女，主任医师，教授，妇产科主任，湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">欧巧漫</p>
-          <p class="detailMessage">苏安，女，主任医师，教授，妇产科主任，湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">欧巧漫</p>
-          <p class="detailMessage">苏安，女，主任医师，教授，妇产科主任，湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">欧巧漫</p>
-          <p class="detailMessage">苏安，女，主任医师，教授，妇产科主任，湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">欧巧漫</p>
-          <p class="detailMessage">苏安，女，主任医师，教授，妇产科主任，湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
-        </div>
-      </div>
-      <div class="contentOne">
+
+      <div class="contentOne" v-for="item in this.editdocfrom" :key="item.id" @click="singleDoctorInfo(item.id,item.user_org_id)">
         <div class="img">
-          <img src="static\images\img1.jpg" alt />
+          <img :src="item.dochead" style="width:100%;height:100%" alt />
         </div>
         <div class="detail">
-          <p class="detailTitle">欧巧漫</p>
-          <p class="detailMessage">苏安，女，主任医师，教授，妇产科主任，湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
+          <p class="detailTitle">{{item.doc_name}}</p>
+          <p class="detailMessage" v-html="item.docintroduction"></p>
         </div>
       </div>
+
     </div>
   </div>
 </template>
+  <script>
+     import { docmore } from "@/api/micro/micro"
+    export default{
+         data(){
+           return{
+              editdocfrom:[],
+           }   
+         },
+         methods:{
+             docmore(id,orgid){
+                docmore(id,orgid).then(response=>{
+                     if(response.data.state == 1){
+                       var editdoctor =  response.data.data.editdoctor;
+                       if(this.editdocfrom.doc_postion == 1){
+                          this.editdocfrom.doc_postion = ""
+                       }
+                        console.log("编辑医生返回数据",editdoctor)
+                        this.editdocfrom  =  editdoctor;
+                       if(this.editdocfrom.doc_postion == 1){
+                           return "医生"
+                       }
+                      
+                    }
+                 })
+            },
 
-
+          singleDoctorInfo(id,orgid){
+              this.$router.push({
+                       path:'/doctorIntroduction',
+                       query:{
+                           id:id,
+                           orgid:orgid,
+                       }
+                    }
+                )
+            }
+         },
+         created(){
+           const id = this.$route.query.id;
+          const orgid = this.$route.query.orgid;
+          console.log("id是多少",id)
+          console.log("orgid是多少",orgid)
+          this.docmore(id,orgid)
+         }
+    }
+  </script>
 <style lang="scss" scoped>
 .header {
   height: 1.25rem;
@@ -142,6 +143,11 @@
       font-weight: 400;
       color: rgba(155, 155, 155, 1);
       line-height: 1.125rem;
+       overflow: hidden;
+      text-overflow: ellipsis;
+       display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
     }
   }
 }

src/scrm_pages/micro/micro.vue

@@ -4,7 +4,7 @@
          <div class="swiper-container swiper-no-swiping swiperone">
              <div class="swiper-wrapper">
                  <div class="swiper-slide">      
-                   <div v-for="item in this.patientModels" :key="item.id" v-show="modelshow">                    
+                   <div v-for="item in this.patientModels" :key="item.id" v-show="modelshow" class="bugone">                    
                       <!-- 轮播图 -->
                        <div class="modeone" v-if="item.mode_type == 1">
                           <mt-swipe :auto="2000" class="swipertwo">
@@ -1179,6 +1179,7 @@ import { link } from 'fs';
       height: 90px;
       /* border:solid 1px red; */
       margin-left: 5px;
+      border: solid 1px red;
     }
 
     .acthead{
@@ -1211,4 +1212,7 @@ import { link } from 'fs';
       -webkit-box-orient: vertical;
     }
    
+   .bugone{
+     border:solid 1px blue;
+   }
 </style>

src/scrm_pages/microHome/microHome.vue

@@ -1,132 +1,125 @@
 <template>
   <div class="page_home">
-    <div>
-      <div class="banner">
-        <div class="swiper-container bannerSwiper">
-          <div class="swiper-wrapper">
-            <div class="swiper-slide">
-              <img class="img" src="static\images\banner.jpg" />
-            </div>
-            <div class="swiper-slide">
-              <img class="img" src="static\images\img3.jpg" />
-            </div>
-            <div class="swiper-slide">
-              <img class="img" src="static\images\img2.png" />
+    <div class="swiper-slide">
+      <div v-for="item in this.patientModels" :key="item.id">
+        <!-- 轮播图 -->
+        <div class="banner" v-if="item.mode_type == 1">
+          <div class="swiper-container bannerSwiper">
+            <div class="swiper-wrapper">
+              <div class="swiper-slide" v-for="it in item.PatientEditpiclink" :key="it.id">
+                <img class="imgtwo" :src="it.images" />
+              </div>
             </div>
-          </div>
-          <!-- 如果需要分页器 -->
-          <div class="swiper-pagination"></div>
-        </div>
-      </div>
-      <div class="btnList">
-        <div class="btnOne" v-for="(item,index) in 8" :key="index">
-          <div>
-            <img src="static\images\icon1.jpg" alt />
-          </div>
-          <div>
-            <p class="title">医院介绍</p>
+            <!-- 如果需要分页器 -->
+            <div class="swiper-pagination"></div>
           </div>
         </div>
-      </div>
-      <!-- 医院动态 -->
-      <div class="dynamic">
-        <div class="common_title">
-          <div class="one"></div>
-          <div class="dynamicTxt">医院动态</div>
-          <div class="more">
-            <p>
-              查看更多
-              <i class="iconfont">&#xe632;</i>
-            </p>
-          </div>
-        </div>
-        <div class="content">
-          <div class="contentOne">
-            <div class="img">
-              <img src="static\images\img1.jpg" alt />
+
+        <!-- 魔方导航 -->
+        <div class="btnList" v-if="item.mode_type== 8">
+          <div class="btnOne" v-for="it in item.Editmargin" :key="it.id">
+            <div>
+              <img :src="it.margimage" alt />
             </div>
-            <div class="detail">
-              <p class="detailTitle">山东潍坊，高考还剩最一门...</p>
-              <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p>
+            <div>
+              <p class="title">{{it.margtitle}}</p>
             </div>
           </div>
-          <div class="contentOne">
-            <div class="img">
-              <img src="static\images\img1.jpg" alt />
+        </div>
+
+        <!-- 文章列表 -->
+        <div class="dynamic" v-if="item.mode_type == 6">
+          <div class="common_title">
+            <div class="one"></div>
+            <div class="dynamicTxt">{{item.title}}</div>
+            <div class="more" @click="articlemore(item.id,item.user_org_id)">
+              <p>
+                查看更多
+                <i class="iconfont">&#xe632;</i>
+              </p>
             </div>
-            <div class="detail">
-              <p class="detailTitle">山东潍坊，高考还剩最一门...</p>
-              <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p>
+          </div>
+          <div class="content">
+            <div class="contentOne" v-for="it in Articlelist" :key="it.id">
+              <div class="img">
+                <img :src="it.imgs" style="width:100%;height:100%" alt />
+              </div>
+              <div class="detail">
+                <p class="detailTitle">{{it.title}}</p>
+                <!-- <p class="detailMessage"></p> -->
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <!-- 医院介绍 -->
-      <div class="common">
-        <div class="common_title">
-          <div class="one"></div>
-          <div class="dynamicTxt">医院介绍</div>
-          <div class="more">
-            <p>
-              查看更多
-              <i class="iconfont">&#xe632;</i>
-            </p>
+
+        <!-- 医院介绍 -->
+        <div class="common" v-if="item.mode_type == 2">
+          <div class="common_title">
+            <div class="one"></div>
+            <div class="dynamicTxt">{{item.title}}</div>
+            <div class="more" @click="hispitalmore(item.id,item.user_org_id)">
+              <p>
+                查看更多
+                <i class="iconfont">&#xe632;</i>
+              </p>
+            </div>
           </div>
-        </div>
-        <div class="commonBox">
-          <div class="commonImg">
+          <div class="commonBox">
+            <!-- <div class="commonImg">
             <img src="static\images\img2.png" alt />
           </div>
           <div class="commonMessage">
             深圳市南山区人民医院（深圳市第六人民医院），坐落于深圳经济特区西部南头半岛中心区，是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院
             深圳市南山区人民医院（深圳市第六人民医院），坐落于深圳经济特区西部南头半岛中心区，是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院...
           </div>
-        </div>
-      </div>
-      <!-- 医院环境 -->
-      <div class="common">
-        <div class="common_title">
-          <div class="one"></div>
-          <div class="dynamicTxt">医院环境</div>
-          <div class="more">
-            <p>
-              查看更多
-              <i class="iconfont">&#xe632;</i>
-            </p>
+            </div>-->
+            <div class="commonMessage" v-html="item.Hospitals.introduction"></div>
           </div>
         </div>
-        <div class="commonBox">
-          <div class="commonImg">
-            <img src="static\images\img2.png" alt />
+
+        <!-- 科室介绍 -->
+        <div class="common" v-if="item.mode_type == 3">
+          <div class="common_title">
+            <div class="one"></div>
+            <div class="dynamicTxt">{{item.title}}</div>
+            <div class="more" @click="officemore(item.id,item.user_org_id)">
+              <p>
+                查看更多
+                <i class="iconfont">&#xe632;</i>
+              </p>
+            </div>
           </div>
-          <div
-            class="commonMessage"
-          >深圳市南山区人民医院（深圳市第六人民医院），坐落于深圳经济特区西部南头半岛中心区，是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院...</div>
-        </div>
-      </div>
-      <!-- 医护团队 -->
-      <div class="dynamic">
-        <div class="common_title">
-          <div class="one"></div>
-          <div class="dynamicTxt">医院团队</div>
-          <div class="more">
-            <p>
-              查看更多
-              <i class="iconfont">&#xe632;</i>
-            </p>
+          <div class="commonBox">
+            <!-- <div class="commonImg">
+            <img src="static\images\img2.png" alt />
+            </div>-->
+            <div class="commonMessage" v-html="item.Offices.introduction"></div>
           </div>
         </div>
-        <div class="content">
-          <div class="contentOne">
-            <div class="img">
-              <img src="static\images\img1.jpg" alt />
-            </div>
-            <div class="detail">
-              <p class="detailTitle">欧巧漫</p>
-              <p class="detailMessage">苏安，女，主任医师，教授，妇产科主任，湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
+
+        <!-- 医护团队 -->
+        <div class="dynamic" v-if="item.mode_type == 4">
+          <div class="common_title">
+            <div class="one"></div>
+            <div class="dynamicTxt">{{item.title}}</div>
+            <div class="more" @click="docmore(item.id,item.user_org_id)">
+              <p>
+                查看更多
+                <i class="iconfont">&#xe632;</i>
+              </p>
             </div>
           </div>
-          <div class="contentOne">
+          <div class="content">
+            <div class="contentOne" v-for="doc in item.Editdoctor" :key="doc.id">
+              <div class="img">
+                <img :src="doc.dochead" style="width:100%;height:100%" alt />
+              </div>
+              <div class="detail">
+                <p class="detailTitle">{{doc.doc_name}}</p>
+                <p class="detailMessage" v-html="doc.docintroduction"></p>
+              </div>
+            </div>
+            <!-- <div class="contentOne">
             <div class="img">
               <img src="static\images\img1.jpg" alt />
             </div>
@@ -134,76 +127,53 @@
               <p class="detailTitle">欧巧漫</p>
               <p class="detailMessage">苏安，女，主任医师，教授，妇产科主任，湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
             </div>
+            </div>-->
           </div>
         </div>
-      </div>
-      <!-- 医院环境 -->
-      <div class="dynamic">
-        <div class="common_title">
-          <div class="one"></div>
-          <div class="dynamicTxt">医院环境</div>
-          <div class="more">
+
+        <!-- 科室环境 -->
+        <div class="dynamic" v-if="item.mode_type == 5">
+          <div class="common_title">
+            <div class="one"></div>
+            <div class="dynamicTxt">{{item.title}}</div>
+            <!-- <div class="more">
             <p>
               查看更多
               <i class="iconfont">&#xe632;</i>
             </p>
+            </div>-->
           </div>
-        </div>
-        <div class="imgs">
-          <div class="swiper-container imgSwiper">
-            <div class="swiper-wrapper">
-              <div class="swiper-slide carousel">
-                <img class="img" src="static\images\img3.jpg" preview="1" />
-              </div>
-              <div class="swiper-slide carousel">
-                <img class="img" src="static\images\banner.jpg" preview="1" />
-              </div>
-              <div class="swiper-slide carousel">
-                <img class="img" src="static\images\img2.png" preview="1" />
+          <div class="imgs">
+            <div class="swiper-container imgSwiper">
+              <div class="swiper-wrapper">
+                <div class="swiper-slide carousel" v-for="itms in item.Enviroimages" :key="itms.id">
+                  <img class="img" :src="itms.enviroimages" :preview="itms.modeid" />
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-      <!-- 医院活动 -->
-      <div class="dynamic bottom">
-        <div class="common_title">
-          <div class="one"></div>
-          <div class="dynamicTxt">医院活动</div>
-          <div class="more">
-            <p>
-              查看更多
-              <i class="iconfont">&#xe632;</i>
-            </p>
-          </div>
-        </div>
-        <div class="content">
-          <div class="contentOne">
-            <div class="img">
-              <img src="static\images\img1.jpg" alt />
-            </div>
-            <div class="detail">
-              <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-              <div class="detailBox">
-                <div class="activityTime">
-                  <p>
-                    7月28日 08:30开始
-                    深圳市南山区
-                  </p>
-                </div>
-                <div class="people">
-                  <p>100人已报名</p>
-                </div>
-              </div>
+
+        <!-- 医院活动 -->
+        <div class="dynamic bottom" v-if="item.mode_type == 7">
+          <div class="common_title">
+            <div class="one"></div>
+            <div class="dynamicTxt">{{item.title}}</div>
+            <div class="more" @click="Activitiesmore(item.id,item.user_org_id)">
+              <p>
+                查看更多
+                <i class="iconfont">&#xe632;</i>
+              </p>
             </div>
           </div>
-          <div class="contentOne">
-            <div class="img">
-              <img src="static\images\img1.jpg" alt />
-            </div>
-            <div class="detail">
-              <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-              <div class="detailBox">
+          <div class="content">
+            <div class="contentOne" v-for="it in Activitieslist" :key="it.id">
+              <div class="img">
+                <img :src="it.poster_photo" style="widht:100%;height:100%" alt />
+              </div>
+              <div class="detail">
+                <p class="detailTitle">{{it.title}}</p>
+                <!-- <div class="detailBox">
                 <div class="activityTime">
                   <p>
                     7月28日 08:30开始
@@ -213,6 +183,7 @@
                 <div class="people">
                   <p>100人已报名</p>
                 </div>
+                </div>-->
               </div>
             </div>
           </div>
@@ -222,21 +193,9 @@
     <!-- tab切换 -->
     <div class="tabs">
       <ul class="tabList">
-        <li class="tabOne">
-          <img src="static\images\home.jpg" alt />
-          <span>首页</span>
-        </li>
-        <li class="tabOne">
-          <img src="static\images\msg.jpg" alt />
-          <span>在线客服</span>
-        </li>
-        <li class="tabOne">
-          <img src="static\images\tel.jpg" alt />
-          <span>电话</span>
-        </li>
-        <li class="tabOne">
-          <img src="static\images\service.jpg" alt />
-          <span>联系我们</span>
+        <li class="tabOne" v-for="item in this.navigationdata" :key="item.id">
+          <img :src="item.navimages" alt />
+          <span>{{item.navtitle}}</span>
         </li>
       </ul>
     </div>
@@ -246,11 +205,19 @@
 
 <script>
 import Swiper from "swiper";
-
+import {
+  getHospitaldata,
+  getArticlelist,
+  getActivities,
+  getDefalutNavigationData
+} from "@/api/micro/micro";
 export default {
   data() {
     return {
-      bannerList: []
+      bannerList: [],
+      patientModels: [],
+      Articlelist: [],
+      navigationdata: []
     };
   },
   methods: {
@@ -268,13 +235,110 @@ export default {
       var mySwiper2 = new Swiper(".imgSwiper", {
         slidesPerView: 2
       });
+    },
+    getHospitaldata(orgid) {
+      getHospitaldata(orgid).then(response => {
+        if (response.data.state == 1) {
+          this.patientModels = response.data.data.patientModels;
+          console.log("数据是什么", this.patientModels);
+        }
+      });
+    },
+    getArticlelist(orgid) {
+      getArticlelist(orgid, this.Articlelist).then(response => {
+        if (response.data.state == 1) {
+          var articlelist = response.data.data.articlelists;
+          this.Articlelist = response.data.data.articlelists;
+          console.log("文章列表", this.Articlelist);
+        }
+      });
+    },
+    getActivities(orgid) {
+      getActivities(orgid, this.Activitieslist).then(response => {
+        if (response.data.state == 1) {
+          var activity = response.data.data.activity;
+          this.Activitieslist = response.data.data.activity;
+          console.log("活动列表", activity);
+          console.log(this.Activitieslist);
+        }
+      });
+    },
+    hispitalmore(id, orgid) {
+      this.$router.push({
+        path: "/hospitalIntroduction",
+        query: {
+          id: id,
+          orgid,
+          orgid
+        }
+      });
+    },
+
+    officemore(id, orgid) {
+      this.$router.push({
+        path: "/officeIntroduction",
+        query: {
+          id: id,
+          orgid,
+          orgid
+        }
+      });
+    },
+    docmore(id, orgid) {
+      this.$router.push({
+        path: "/medicalTeam",
+        query: {
+          id: id,
+          orgid,
+          orgid
+        }
+      });
+    },
+    articlemore(id, orgid) {
+      this.$router.push({
+        path: "/news",
+        query: {
+          id: id,
+          orgid,
+          orgid
+        }
+      });
+    },
+    Activitiesmore(id, orgid) {
+      this.$router.push({
+        path: "/activity",
+        query: {
+          id: id,
+          orgid,
+          orgid
+        }
+      });
+    },
+    getDefalutNavigationData(orgid) {
+      getDefalutNavigationData(orgid).then(response => {
+        if (response.data.state == 1) {
+          var navigation = response.data.data.navigation;
+          console.log("navigation是什么", navigation);
+          this.navigationdata = navigation;
+        }
+      });
     }
   },
+  created() {
+    const orgid = this.$route.query.orgid;
+    console.log("机构id是", orgid);
+    this.getHospitaldata(orgid);
+    this.getArticlelist(orgid);
+    this.getActivities(orgid);
+    this.getDefalutNavigationData(orgid);
+  },
   mounted() {
     this.initSwiper();
   },
+
   updated() {
     this.initSwiper();
+    this.$previewRefresh();
   }
 };
 </script>
@@ -292,9 +356,15 @@ export default {
   > div:first-child::-webkit-scrollbar {
     width: 0;
   }
+  // border:solid 1px red;
 }
+// .bugone{
+//   border: solid 1px red;
+// }
+
 .banner {
   height: 9.4375rem;
+  // border:solid 1px red;
 }
 .swiper-container {
   height: 100%;
@@ -306,7 +376,10 @@ export default {
   //   width: 334px;
 }
 .img {
-  //   width: 334px;
+  width: 100px;
+  height: 100px;
+}
+.imgtwo {
   width: 100%;
   height: 100%;
 }
@@ -318,6 +391,7 @@ export default {
   width: 100%;
   //   height: 180px;
   margin-top: 1.25rem;
+  // border:solid 1px yellow;
 }
 .btnOne {
   display: block;
@@ -347,6 +421,7 @@ export default {
 }
 .dynamic {
   margin-top: 3.0625rem;
+  // border: solid 1px red;
 }
 .common_title {
   width: 20.9375rem;
@@ -406,12 +481,20 @@ export default {
     margin-left: 0.8125rem;
     width: 13.125rem;
     .detailTitle {
+      margin-top: 8px;
+      font-size: 15px;
       margin-top: 0.5rem;
       width: 12.6875rem;
-      height: 1.0625rem;
+      height: 1rem;
+      line-height: 1rem;
       font-size: 0.9375rem;
       font-weight: 600;
       color: rgba(7, 18, 40, 1);
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
     }
     .detailMessage {
       margin-top: 0.25rem;
@@ -421,8 +504,15 @@ export default {
       font-weight: 400;
       color: rgba(155, 155, 155, 1);
       line-height: 1.125rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      // border: solid 1px red;
     }
   }
+  // border: solid 1px red;
 }
 .common {
   margin-top: 1.875rem;
@@ -435,6 +525,8 @@ export default {
     box-shadow: 0px 6px 20px 0px rgba(0, 0, 0, 0.05);
     border-radius: 16px;
     padding: 1.125rem 1.3125rem 1.3125rem 1.3125rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
   .commonImg {
     width: 18.4375rem;
@@ -448,9 +540,13 @@ export default {
     font-size: 0.875rem;
     color: rgba(60, 60, 60, 1);
     line-height: 1.375rem;
-    overflow: hidden; //超出的文本隐藏
-    text-overflow: ellipsis; //溢出用省略号显示
+    // border: solid 1px red;
+
+    display: -webkit-box;
+    -webkit-line-clamp: 8;
+    -webkit-box-orient: vertical;
   }
+  // border:solid 1px red;
 }
 .imgs {
   margin-top: 1.875rem;

src/scrm_pages/news/news.vue

@@ -1,65 +1,57 @@
 <template>
   <div>
     <div class="content">
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">山东潍坊，高考还剩最一门...</p>
-          <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">山东潍坊，高考还剩最一门...</p>
-          <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">山东潍坊，高考还剩最一门...</p>
-          <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">山东潍坊，高考还剩最一门...</p>
-          <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">山东潍坊，高考还剩最一门...</p>
-          <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p>
-        </div>
-      </div>
-      <div class="contentOne">
+
+      <div class="contentOne"  v-for="it in articlelist" :key="it.id" @click="singleArticleInfo(it.id,it.user_org_id)">
         <div class="img">
-          <img src="static\images\img1.jpg" alt />
+          <img :src="it.imgs" style="width:100%;height:100%" alt />
         </div>
         <div class="detail">
-          <p class="detailTitle">山东潍坊，高考还剩最一门...</p>
-          <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p>
+          <p class="detailTitle">{{it.title}}</p>
+          <p class="detailMessage"></p>
         </div>
       </div>
     </div>
   </div>
 </template>
+  <script>
+     import { articlemore } from "@/api/micro/micro"
+      export default{
+        data(){
+          return{
+            articlelist:[], 
+          }
+        },
+        methods:{
+           articlemore(id,orgid){
+            articlemore(id,orgid).then(response=>{
+                  if(response.data.state == 1){
+                   var articlelist =  response.data.data.articlelists;  
+                   console.log("文章列表数据",articlelist)             
+                   this.articlelist =  response.data.data.articlelists;
+               }
+            })  
+          },
+           singleArticleInfo(id,orgid){
+            this.$router.push({
+                path:"/activityDetail",
+                query:{
+                    id:id,
+                    orgid:orgid,
+                }
+            })
+          }
+        },
+        created(){
+           const id = this.$route.query.id;
+           const orgid = this.$route.query.orgid;
+           console.log("id是多少",id)
+           console.log("orgid是多少",orgid)
+           this.articlemore(id,orgid)
+        }
+      }
 
-
+  </script>
 <style lang="scss" scoped>
 .contentOne {
   margin: auto;
@@ -89,6 +81,11 @@
       font-size: 0.9375rem;
       font-weight: 600;
       color: rgba(7, 18, 40, 1);
+      overflow: hidden;
+      text-overflow: ellipsis;
+       display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
     }
     .detailMessage {
       margin-top: 0.25rem;

src/scrm_pages/officeIntroduction/officeIntroduction.vue

@@ -0,0 +1,55 @@
+<template>
+     <div class="main">
+         <div class="detail" v-html="officeform.introduction"></div>
+     </div>
+</template>
+
+<script>
+    import { officemore } from "@/api/micro/micro"
+    export default {
+        name: "officeIntroduction",
+        data(){
+            return{
+                officeform:[],
+            }
+        },
+        methods:{
+            officemore(id,orgid){
+               officemore(id,orgid).then(response=>{
+                   if(response.data.state ==1){
+                     var offices = response.data.data.offices;
+                     this.officeform = response.data.data.offices;
+                     console.log("科室详情数据",offices)
+
+                   }
+               })
+           }
+        },
+        created(){
+           const id = this.$route.query.id;
+           const orgid = this.$route.query.orgid;
+           console.log("id是多少",id)
+           console.log("orgid是多少",orgid)
+           this.officemore(id,orgid)
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+.bannerImg {
+  width: 339px;
+  height: 194px;
+  margin: 0 auto;
+  border-radius: 10px;
+  box-sizing: border-box;
+  padding: 18px 0;
+}
+.detail {
+  margin: 0 auto;
+  width: 336px;
+  height: 368px;
+  font-size: 16px;
+  color: rgba(7, 18, 40, 1);
+  line-height: 24px;
+}
+</style>

src/xt_permission.js

@@ -1,6 +1,6 @@
 import router from './router'
 import store from './store'
-const loginWhiteList = ['/qrcode'] // 登录验证白名单
+const loginWhiteList = ['/microHome'] // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
     if (loginWhiteList.indexOf(to.path) !== -1) {