更新

build/webpack.base.conf.js

@@ -24,6 +24,9 @@ module.exports = {
   entry: {
     app: './src/main.js'
   },
+  externals: {
+    "BMap": "BMap"
+  },
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',

index.html

@@ -20,5 +20,7 @@
     <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.parse.min.js"></script>
     <div id="app"></div>
     <!-- built files will be auto injected -->
+    <script src='http://api.map.baidu.com/api?v=2.0&ak=？&callback=init'></script>
+    
   </body>
 </html>

package-lock.json

@@ -333,7 +333,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -1550,6 +1549,34 @@
       "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
       "dev": true
     },
+    "bmaplib.curveline": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bmaplib.curveline/-/bmaplib.curveline-1.0.0.tgz",
+      "integrity": "sha512-9wcFMVhiYxNPqpvsLDAADn3qDhNzXp2mA6VyHSHg2XOAgSooC7ZiujdFhy0sp+0QYjTfJ/MjmLuNoUg2HHxH4Q=="
+    },
+    "bmaplib.heatmap": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/bmaplib.heatmap/-/bmaplib.heatmap-1.0.4.tgz",
+      "integrity": "sha512-rmhqUARBpUSJ9jXzUI2j7dIOqnc38bqubkx/8a349U2qtw/ulLUwyzRD535OrA8G7w5cz4aPKm6/rNvUAarg/Q=="
+    },
+    "bmaplib.lushu": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/bmaplib.lushu/-/bmaplib.lushu-1.0.7.tgz",
+      "integrity": "sha512-LVvgpESPii6xGxyjnQjq8u+ic4NjvhdCPV/RiSS/PGTUdZKeTDS7prSpleJLZH3ES0+oc0gYn8bw0LtPYUSz2w=="
+    },
+    "bmaplib.markerclusterer": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/bmaplib.markerclusterer/-/bmaplib.markerclusterer-1.0.13.tgz",
+      "integrity": "sha512-VrLyWSiuDEVNi0yUfwOhFQ6z1oEEHS4w36GNu3iASu6p52QIx9uAXMUkuSCHReNR0bj2Cp9SA1dSx5RpojXajQ==",
+      "requires": {
+        "bmaplib.texticonoverlay": "^1.0.2"
+      }
+    },
+    "bmaplib.texticonoverlay": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bmaplib.texticonoverlay/-/bmaplib.texticonoverlay-1.0.2.tgz",
+      "integrity": "sha512-4ZTWr4ZP3B6qEWput5Tut16CfZgII38YwM3bpyb4gFTQyORlKYryFp9WHWrwZZaHlOyYDAXG9SX0hka43jTADg=="
+    },
     "bn.js": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
@@ -1906,14 +1933,6 @@
         }
       }
     },
-    "can-promise": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/can-promise/-/can-promise-0.0.1.tgz",
-      "integrity": "sha512-gzVrHyyrvgt0YpDm7pn04MQt8gjh0ZAhN4ZDyCRtGl6YnuuK6b4aiUTD7G52r9l4YNmxfTtEscb92vxtAlL6XQ==",
-      "requires": {
-        "window-or-global": "^1.0.1"
-      }
-    },
     "caniuse-api": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
@@ -2353,7 +2372,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
@@ -2361,8 +2379,7 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
       "version": "0.3.0",
@@ -3582,6 +3599,11 @@
         "minimalistic-crypto-utils": "^1.0.0"
       }
     },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    },
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@@ -3597,6 +3619,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -3616,8 +3639,7 @@
     "entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
     },
     "errno": {
       "version": "0.1.7",
@@ -6763,6 +6785,14 @@
         "immediate": "~3.0.5"
       }
     },
+    "linkify-it": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "lint-staged": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-7.2.0.tgz",
@@ -7241,14 +7271,6 @@
         "pify": "^3.0.0"
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -7270,6 +7292,18 @@
         "object-visit": "^1.0.0"
       }
     },
+    "markdown-it": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
+      "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "entities": "~1.1.1",
+        "linkify-it": "^2.0.0",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      }
+    },
     "marked": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.2.tgz",
@@ -7298,6 +7332,11 @@
         "safe-buffer": "^5.1.2"
       }
     },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -7632,11 +7671,6 @@
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@@ -8104,6 +8138,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -8266,21 +8301,11 @@
         "os-tmpdir": "^1.0.0"
       }
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
-    },
     "p-limit": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
@@ -11342,46 +11367,42 @@
       "dev": true
     },
     "qrcode": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.3.3.tgz",
-      "integrity": "sha512-SH7V13AcJusH3GT8bMNOGz4w0L+LjcpNOU/NiOgtBhT/5DoWeZE6D5ntMJnJ84AMkoaM4kjJJoHoh9g++8lWFg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.4.1.tgz",
+      "integrity": "sha512-3JhHQJkKqJL4PfoM6t+B40f0GWv9eNJAJmuNx2X/sHEOLvMyvEPN8GfbdN1qmr19O8N2nLraOzeWjXocHz1S4w==",
       "requires": {
-        "can-promise": "0.0.1",
         "dijkstrajs": "^1.0.1",
         "isarray": "^2.0.1",
         "pngjs": "^3.3.0",
-        "yargs": "^12.0.5"
+        "yargs": "^13.2.4"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "camelcase": {
           "version": "5.3.1",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
           "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
         },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
           }
         },
         "find-up": {
@@ -11392,31 +11413,15 @@
             "locate-path": "^3.0.0"
           }
         },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
         },
         "isarray": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
-          "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="
-        },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
         },
         "locate-path": {
           "version": "3.0.0",
@@ -11427,31 +11432,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "mem": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-          "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^2.0.0",
-            "p-is-promise": "^2.0.0"
-          }
-        },
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-        },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-          "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
-          }
-        },
         "p-limit": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
@@ -11473,43 +11453,65 @@
           "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
           "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
         },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
         },
         "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "version": "13.3.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
+          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
+            "cliui": "^5.0.0",
             "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
+            "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
+            "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
+            "string-width": "^3.0.0",
             "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.1"
           }
         },
         "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "version": "13.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
           "requires": {
             "camelcase": "^5.0.0",
             "decamelize": "^1.2.0"
@@ -13098,8 +13100,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "ssf": {
       "version": "0.10.2",
@@ -13939,6 +13940,11 @@
       "resolved": "https://registry.npmjs.org/typo-js/-/typo-js-1.0.3.tgz",
       "integrity": "sha1-VNjrx5SfGngQkItgAsaEFSbJnVo="
     },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+    },
     "uglify-js": {
       "version": "3.4.10",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
@@ -14283,6 +14289,18 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
       "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
     },
+    "vue-baidu-map": {
+      "version": "0.21.22",
+      "resolved": "https://registry.npmjs.org/vue-baidu-map/-/vue-baidu-map-0.21.22.tgz",
+      "integrity": "sha512-WQMPCih4UTh0AZCKKH/OVOYnyAWjfRNeK6BIeoLmscyY5aF8zzlJhz/NOHLb3mdztIpB0Z6aohn4Jd9mfCSjQw==",
+      "requires": {
+        "bmaplib.curveline": "^1.0.0",
+        "bmaplib.heatmap": "^1.0.4",
+        "bmaplib.lushu": "^1.0.7",
+        "bmaplib.markerclusterer": "^1.0.13",
+        "markdown-it": "^8.4.0"
+      }
+    },
     "vue-count-to": {
       "version": "1.0.13",
       "resolved": "https://registry.npmjs.org/vue-count-to/-/vue-count-to-1.0.13.tgz",
@@ -15163,11 +15181,6 @@
         "string-width": "^1.0.2 || 2"
       }
     },
-    "window-or-global": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/window-or-global/-/window-or-global-1.0.1.tgz",
-      "integrity": "sha1-2+RboqKRqrxW1iz2bEW3+jIpRt4="
-    },
     "window-size": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
@@ -15234,7 +15247,8 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "write": {
       "version": "0.2.1",

package.json

@@ -59,7 +59,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",
-    "qrcode": "^1.3.3",
+    "qrcode": "^1.4.1",
     "qrcodejs2": "0.0.2",
     "screenfull": "4.2.0",
     "serve-static": "1.13.2",
@@ -69,6 +69,7 @@
     "spark-md5": "^3.0.0",
     "swiper": "^4.5.0",
     "vue": "2.5.16",
+    "vue-baidu-map": "^0.21.22",
     "vue-count-to": "1.0.13",
     "vue-i18n": "7.3.2",
     "vue-infinite-scroll": "^2.0.2",

src/App.vue

@@ -20,7 +20,7 @@
     methods: {
        reload(){
          this.isRouterAlive = false;
-         this.$$nextTick(function(){
+         this.$nextTick(function(){
            this.isRouterAlive = true;
          })
        }

src/api/act/submitinfo.js

@@ -35,10 +35,23 @@ export function GetAllArticles(status,id,keyword,limit,page){
 }
 
 export function addCategory(data){
+    console.log("添加分类名称?",data)
     return request({
         url:'/api/article/addCategory',
         method:'Post',
-        data:data
+        data:data,
+    })
+}
+
+export function getAritcleCount(name){
+    console.log("分类名称",name);
+    const params = {
+        name:name,
+    }
+    return request({
+        url:"/api/article/getAritcleCount",
+        method:'Post',
+        params:params,
     })
 }
 

src/api/site/site.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 export function AddRotationChart(data){
-    console.log("新增轮播图",data);
+   
     return request({
         url:"/api/site/addrotationchart",
         method:"Post",
@@ -9,8 +9,17 @@ export function AddRotationChart(data){
     })
 }
 
+export function addRotationUpload(data){
+   
+    return request({
+        url:"/api/site/addrotationupload",
+        method:"Post",
+        data:data,
+    })
+}
+
 export function saveHispital(data){
-    console.log("添加医院",data);
+   
     return request({
         url:"/api/site/savehispital",
         method:"Post",
@@ -19,7 +28,7 @@ export function saveHispital(data){
 }
 
 export function addOffices(data){
-    console.log("添加科室",data);
+  
     return request({
         url:"/api/site/addoffices",
         method:"Post",
@@ -28,7 +37,7 @@ export function addOffices(data){
 }
 
 export function AddDoctor(data){
-    console.log("添加名医",data);
+   
     return request({
         url:"/api/site/adddoctor",
         method:"Post",
@@ -37,7 +46,7 @@ export function AddDoctor(data){
 }
 
 export function AddDoctorInfo(data){
-   console.log("编辑名医介绍",data);
+  
    return request({
        url:"/api/site/adddoctorinfo",
        method:"Post",
@@ -46,7 +55,7 @@ export function AddDoctorInfo(data){
 }
 
 export function AddOfficeEnvironment(data){
-   console.log("新增科室环境",data);
+   
    return request({
        url:"/api/site/keenvironment",
        method:"Post",
@@ -55,7 +64,7 @@ export function AddOfficeEnvironment(data){
 }
 
 export function GetRationImages(params){
-    console.log("获取轮播图片",params)
+  
     return request({
         url:"/api/site/getrationimages",
         method:'Get',
@@ -64,7 +73,7 @@ export function GetRationImages(params){
 }
 
 export function GetHospitalInfo(params){
-   console.log("获取医院信息",params)
+  
    return request({
        url:"/api/site/gethospitalinfo",
        method:'Get',
@@ -73,7 +82,7 @@ export function GetHospitalInfo(params){
 }
 
 export function GetOfficeInfo(params){
-   console.log("获取科室信息",params)
+  
    return request({
        url:"/api/site/getofficeinfo",
        method:'Get',
@@ -82,7 +91,7 @@ export function GetOfficeInfo(params){
 }
 
 export function GetDoctorInfo(params){
-    console.log("获取名医介绍",params)
+    
     return request({
         url:"/api/site/getdoctorinfo",
         method:'Get',
@@ -90,11 +99,187 @@ export function GetDoctorInfo(params){
     })
 }
 
+export function editDoctor(id,data){
+  
+    return request({
+        url:"/api/site/editdoctor?id="+id,
+        method:'Get',
+        data:data,
+    })
+}
+
+export function getQueryDocInfo(params){
+
+    return request({
+        url:"/api/site/getquerydocinfo",
+        method:"Post",
+        params:params,
+    })
+}
+
+export function getQueryDoCHead(params){
+   return request({
+       url:"/api/site/getquerydochead",
+       method:"Post",
+       params:params,
+   })
+}
+
 export function GetOffEnvironment(params){
-   console.log("获取科室环境",params)
+   
    return request({
        url:"/api/site/getOffEnvironment",
        method:'Get',
        params:params,
    })
-}
+}
+
+export function addconnection(data){
+ 
+   return request({
+       url:"/api/site/addconnection",
+       method:"Post",
+       data:data,
+   })
+}
+
+export function addWorkTime(data){
+   
+    return request({
+        url:"/api/site/addworktime",
+        method:"Post",
+        data:data,
+    })
+ }
+
+export function addRideWay(data){
+  
+   return request({
+       url:"/api/site/addrideway",
+       method:"Post",
+       data:data,
+   })
+}
+
+export function queryConnetion(params){
+  
+   return request({
+       url:"/api/site/queryconnetion",
+       method:"Get",
+       params:params,
+   })
+}
+
+export function deleteConnecWay(id,data){
+ 
+   return request({
+       url:"/api/site/delete?id="+id,
+       method:"Get",
+       data:data,
+   })
+}
+
+export function editConnecWay(id,data){
+   return request({
+       url:"/api/site/editconnecway?id="+id,
+       method:"Get",
+       data:data,
+   })
+}
+
+export function saveConnecform(id,data){
+   
+    return request({
+        url:"/api/site/saveconnection?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function addContract(data){
+ 
+   return request({
+       url:"/api/site/addcontract",
+       method:"Post",
+       data:data,
+   })
+}
+
+export function GetUserdModel(params){
+   
+    return request({
+        url:"/api/site/getuserdmodel",
+        method:"Post",
+        params:params,
+    })
+}
+
+export function eidtmodel(id,data){
+  
+   return request({
+       url:"/api/site/eidtmodel?id="+id,
+       method:"Get",
+       data:data,
+   })
+}
+
+export function editRideWay(id,data){
+  return request({
+      url:"/api/site/editrideway?id="+id,
+      method:"Get",
+      data:data,
+  })
+}
+
+export function SaveWorkTime(id,data){
+ 
+  return request({
+      url:"/api/site/saveworktime?id="+id,
+      method:"Post",
+      data:data,
+  })
+}
+
+export function saverideway(id,data){
+ 
+    return request({
+        url:"/api/site/saverideway?id="+id,
+        method:"Post",
+        data:data,
+    })
+}
+
+export function getQueryNewModel(params){
+  
+   return request({
+       url:"/api/site/getquerynewmodel",
+       method:"Post",
+       params:params,
+   })
+}
+
+export function change(id,data){
+   // console.log("编辑医生返回数据",id)
+    return request({
+       url:"/api/site/change?id="+id,
+       method:"Get",
+       data:data,
+    })
+}
+
+export function saveDocInfo(id,data){
+    return request({
+       url:"/api/site/savedocinfo?id="+id,
+       method:"Post",
+       data:data,
+    })
+}
+
+export function deleteDoctor(id,data){
+   return request({
+       url:"/api/site/deletedoctor?id="+id,
+       method:"Get",
+       data:data,
+   })
+}
+

src/main.js

@@ -32,6 +32,7 @@ import vuescroll from 'vuescroll'
 import { read } from 'fs';
 import 'vuescroll/dist/vuescroll.css';
 import 'swiper/dist/css/swiper.min.css'
+import BaiduMap from 'vue-baidu-map'
 Vue.use(vuescroll)
 Vue.use(Element, {
   size: 'medium', // set element-ui default size
@@ -54,3 +55,7 @@ new Vue({
 })
 
 Vue.prototype.Base64 = require('js-base64').Base64
+Vue.use(BaiduMap, {
+  // ak 是在百度地图开发者平台申请的密钥 详见 http://lbsyun.baidu.com/apiconsole/key */
+  ak: 'YOUR_APP_KEY'
+})

src/scrm_pages/article/acticleCategory.vue

@@ -91,7 +91,7 @@
   import BreadCrumb from '../components/bread-crumb'
   import CreateArticleForm from "./components/CreateArticleForm";
   import EditArticleForm from "./components/EditArticleForm";
-  import { GetCategorys,DeleteCategorys } from '@/api/act/submitinfo';
+  import { GetCategorys,DeleteCategorys,getAritcleCount } from '@/api/act/submitinfo';
   export default {
     name: 'acticleCategory',
     components:{
@@ -112,6 +112,7 @@
           order:'',
           id:0,
         },
+        articname:[],
         total:0,
         listQuery:{
           page:1,
@@ -134,6 +135,7 @@
              console.log(response.data.state)
              if(response.data.state === 1){
                this.articsData = response.data.data.category; 
+               var articsData = response.data.data.category; 
                console.log(this.articsData)
                this.total = response.data.data.total;
                console.log("多少",this.total)
@@ -229,9 +231,16 @@
             return false        
           });
         },
+        getAritcleCount(){       
+          getAritcleCount(this.articsData.name).then(response=>{
+              console.log("好烦啊",this.articsData.name)
+          })
+        }
     },
      created(){
-         this.GetCategorys()
+         this.GetCategorys();
+         this.getAritcleCount();
+
        }
   }
 </script>

src/scrm_pages/article/components/CreateArticleForm.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-    import { addCategory } from '@/api/act/submitinfo'
+    import { addCategory,getAritcleCount } from '@/api/act/submitinfo'
     export default {
         name: "CreateArticleForm",       
            props:{
@@ -58,13 +58,14 @@
                     rules: {
                     name: [{required: true, message: "请填写分类名称",},],
                     summary: [{required: true,message:"请填写分类描述"}],
-                    order: [{required: true,message:"请填写排序"}]
+                    order: [{required: true,message:"请填写排序"}],
                  },
                 acticleform:[],
                  form:{
                     name:"",
                     summary:"",
                     order:"",
+                   
                    },
              }
           },   
@@ -77,28 +78,36 @@
                      this.$refs[formName].resetFields();
                    }
                   },
-               addCategory(formName){                 
+               addCategory(formName){   
                    this.$refs[formName].validate((valid)=>{
-                       if(valid){                         
-                            addCategory(this.form).then(response =>{
+                       if(valid){   
+                            var params = new Object();
+                            params.name = this.form.name;      
+                             params.summary = this.form.summary;
+                            params.order = this.form.order;       
+                            console.log("对象params是什么?",params);         
+                            addCategory(params).then(response =>{
                                   console.log("添加分类响应",response.data.state)
                                   if(response.data.state==1){
-                                    var category = response.data.data.category
+                                    var category = response.data.data.category;
                                     console.log("category是什么",category)
                                     this.centerDialogVisible=false;
                                     this.articsData.unshift(category);
                                     this.resetForm("acticleform");
                                     this.$message.success("添加分类成功");                           
+                                  }else{
+                                    this.$message.error("该分类名称已存在");
+                                    
                                   }
-                            });
+                            }).catch(e=>{})
                        }   
                    });         
               },  
-          }
+          },
       }  
 </script>
 
 <style scoped>
-
+   
 </style>
    

src/scrm_pages/article/components/EditArticleForm.vue

@@ -96,6 +96,8 @@ export default {
                               this.articsData[this.artilceIndex].order = categorys.order;
                               this.centerDialogVisible = false;
                               this.$message.success("编辑文章分类成功");
+                           }else{
+                             this.$message.error("该分类名称已存在")
                            }
                       })
                    }

src/scrm_pages/site/components/add-contact.vue

@@ -1,6 +1,7 @@
 <template>
     <div>
          <div class="feature ">
+
             <ul >
                 <li @click="slideshow = true">
                     <span>
@@ -8,7 +9,7 @@
                         <p>轮播图</p>  
                     </span>
                 </li>
-                <li @click="address = true">
+                <li @click="hospitaAddress()">
                     <span>
                         <img :src="new2" alt="" style="width:40px;height:40px">
                         <p>医院地址</p>  
@@ -34,56 +35,83 @@
                 </li>
             </ul>
          </div>
+
 <!-- 轮播图 -->
 <el-dialog
     title="新增轮播图"
     :visible.sync="slideshow"
     width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
+    >
+    <el-form ref="rotationform" :model="rotationform" label-width="90px" :rules="rules" :label-position="labelPosition">
+      <el-form-item label="模块标题:" required prop="title">      
+        <el-input v-model="rotationform.title" ></el-input>
       </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
+      <el-form-item label="排序值:" required prop="sort">
+        <el-input v-model="rotationform.sort"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
-      <el-form-item label="添加图片: ">
-        <el-upload
-          action="https://jsonplaceholder.typicode.com/posts/"
+      <el-form-item label="添加图片:" v-model="rotationform.rotationImages" required prop="rotationImages">
+         <el-upload
+          :data="rotationData"
+          action="https://upload.qiniup.com"
           list-type="picture-card"
-          :on-preview="handlePictureCardPreview"
-          :on-remove="handleRemove">
-          <i class="el-icon-plus"></i>
-        </el-upload>
+          :on-success="RotationchartSuccess"
+         :before-upload="beforeRotationUpload"
+         >
+        <i slot="default" class="el-icon-plus"></i>
+        <div slot="file" slot-scope="{file}">
+          <img
+           class="el-upload-list__item-thumbnail"
+           :src="file.url"
+          >
+        <span class="el-upload-list__item-actions"> 
+         <span
+           v-if="!disabled"
+           class="el-upload-list__item-delete"
+         >
+         <i class="el-icon-edit-outline" @click="rotationEditImages('rotationform')"></i>
+          </span> 
+         <span
+           v-if="!disabled"
+           class="el-upload-list__item-delete"
+         >
+          <i class="el-icon-delete"></i>
+          </span> 
+         </span> 
+        </div> 
+     </el-upload>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="slideshow = false">取 消</el-button>
-      <el-button type="primary" @click="slideshow = false">确 定</el-button>
+      <el-button type="primary" @click="addRotationUpload('rotationform');">确 定</el-button>
     </span>
   </el-dialog>
 
   <!-- 医院地址 -->
   <el-dialog
-    title="新增轮播图"
-    :visible.sync="address"
+    title="新增医院地址"
+    :visible.sync="hostaddress"
     width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
+   >
+    <el-form ref="hospitalform" :model="hospitalform" label-width="80px">
       <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
+        <el-input v-model="hospitalform.title" ></el-input>
       </el-form-item>
       <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
+        <el-input v-model="hospitalform.sort"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
-      <el-form-item label="医院地址: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="医院地图: ">
-
-      </el-form-item>
+      
+       <el-form-item label="医院地址:">
+         <div id="all">
+          <el-input id="suggestId"  v-model="hospitalform.address"></el-input>
+        </div>
+       </el-form-item>
+       <el-form-item label="医院地图:">  
+        <div id="allmap"></div>  
+       </el-form-item>
+    
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="address = false">取 消</el-button>
@@ -91,35 +119,29 @@
     </span>
   </el-dialog>
 
+
 <!-- 新增联系方式 -->
 <el-dialog
     title="新增联系方式"
     :visible.sync="contact"
     width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
+    >
+    <el-form ref="contractform" :model="contractform" label-width="90px">
+      <el-form-item label="模块标题:" required prop="title">
+        <el-input v-model="contractform.title"></el-input>
       </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
+      <el-form-item label="排序值:" required prop="sort">
+        <el-input v-model="contractform.sort"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
-      <el-form-item label="联系方式: ">
+      <el-form-item label="联系方式:" v-model="contractform.way">
         <div class="used">
              <ul>
-                 <li>
-                    <span class="name">医院电话</span>
-                    <span class="icon"> 
-                        <i class="el-icon-edit-outline" @click="addLink = true"></i>
-                        <i class="el-icon-delete" @click="deleteList = true"></i>
-                    </span>
-                 </li>
-                 <li>
-                    <span class="name">微信号</span>
+                 <li v-for="(item,index) in this.connectionway" :key="item.id">
+                    <span class="name">{{item.title}}</span>
                     <span class="icon"> 
-                        <i class="el-icon-edit-outline" @click="addLink = true"></i>
-                        <i class="el-icon-delete" @click="deleteList = true"></i>
+                        <i class="el-icon-edit-outline" @click="editLink=true;editConnecWay(item.id)"></i>
+                        <i class="el-icon-delete" @click="deleteConnecWay(item.id,index)"></i>
                     </span>
                  </li>
              </ul>
@@ -129,46 +151,83 @@
     <span slot="footer" class="dialog-footer">
       <el-button @click="addLink = true">添加联系方式</el-button>      
       <el-button @click="contact = false">取 消</el-button>
-      <el-button type="primary" @click="contact = false">确 定</el-button>
+      <el-button type="primary" @click="addContract('contractform');contact = false">确 定</el-button>
     </span>
   </el-dialog>
 
-
-  <!-- 确定删除组件 -->
-    <el-dialog
-        title="删除提示"
-        :visible.sync="deleteList"
-        width="550px"
-        :before-close="handleClose">
-        <span>确认要删除该组件吗？删除后，该组件将无法恢复</span>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="deleteList = false">取 消</el-button>
-            <el-button type="primary" @click="deleteList = false">确 定</el-button>
-        </span>
-    </el-dialog>
-  <!-- 新增联系方式 -->
+  <!-- 添加联系方式内容 -->
   <el-dialog
     title="新增联系方式"
     :visible.sync="addLink"
     width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-        <el-form-item label="标题:">
-            <el-input v-model="form.name"></el-input>
+    >
+    <el-form ref="connecform" :model="connecform" label-width="90px" :rules="rules" >
+      <el-row>
+        <el-col :span="20">
+        <el-form-item label="标题:" required prop="title">
+            <el-input v-model="connecform.title" style="width:400px"></el-input>
         </el-form-item>
-        <el-form-item label="联系方式:">
-            <el-radio-group v-model="form.resource">
-            <el-radio label="电话"></el-radio>
-            <el-radio label="非电话"></el-radio>
+        </el-col>
+      </el-row>
+        <el-form-item label="联系方式:" required prop="connecway">
+          <el-row>
+            <el-col :span="20">
+            <el-radio-group v-model="connecform.connecway">
+            <el-radio :label="way.id" :value="way.id" v-for="(way,index) in connections" :key="index">{{way.name}}</el-radio>
             </el-radio-group>
+            </el-col>
+          </el-row>  
         </el-form-item>
-        <el-form-item label="内容:">
-            <el-input v-model="form.name"></el-input>
+
+        <el-form-item label="内容:" required prop="content">
+          <el-row>
+            <el-col :span="20">
+            <el-input v-model="connecform.content" style="width:400px"></el-input>
+            </el-col>
+          </el-row>'
         </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
         <el-button @click="addLink = false">取 消</el-button>
-        <el-button type="primary" @click="addLink = false">确 定</el-button>
+        <el-button type="primary" @click="addconnection('connecform');addLink = false">确 定</el-button>
+    </span>
+  </el-dialog>
+
+<!-- 编辑联系方式 -->
+  <el-dialog
+    title="编辑联系方式"
+    :visible.sync="editLink"
+    width="550px"
+    >
+    <el-form ref="editconnecform" :model="editconnecform" label-width="90px" :rules="rules" >
+      <el-row>
+        <el-col :span="20">
+        <el-form-item label="标题:" required prop="title">
+            <el-input v-model="editconnecform.title" style="width:400px"></el-input>
+        </el-form-item>
+        </el-col>
+      </el-row>
+        <el-form-item label="联系方式:" required prop="connecway">
+          <el-row>
+            <el-col :span="20">
+            <el-radio-group v-model="editconnecform.connecway">
+            <el-radio :label="way.id" :value="way.id" v-for="(way,index) in connections" :key="index">{{way.name}}</el-radio>
+            </el-radio-group>
+            </el-col>
+          </el-row>  
+        </el-form-item>
+
+        <el-form-item label="内容:" required prop="content">
+          <el-row>
+            <el-col :span="20">
+            <el-input v-model="editconnecform.content" style="width:400px"></el-input>
+            </el-col>
+          </el-row>'
+        </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="editLink = false">取 消</el-button>
+        <el-button type="primary" @click="saveConnecform('editconnecform')">确 定</el-button>
     </span>
   </el-dialog>
 
@@ -177,27 +236,27 @@
     title="新增工作时间"
     :visible.sync="time"
     width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
+   >
+    <el-form ref="woketimeform" :model="woketimeform" label-width="90px" :rules="rules">
+      <el-form-item label="模块标题:" required prop="title">
+        <el-input v-model="woketimeform.title"></el-input>
       </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
+      <el-form-item label="排序值:" required prop="sort">
+        <el-input v-model="woketimeform.sort"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
-      <el-form-item label="工作时间: ">
+      <el-form-item label="工作时间:" required prop="worktime">
         <el-input
           type="textarea"
           :rows="6"
           placeholder="请输入内容"
-          v-model="textarea">
+          v-model="woketimeform.worktime">
         </el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="time = false">取 消</el-button>
-      <el-button type="primary" @click="time = false">确 定</el-button>
+      <el-button type="primary" @click="addWorkTime('woketimeform');time = false">确 定</el-button>
     </span>
   </el-dialog>
 
@@ -205,66 +264,354 @@
  <el-dialog
     title="新增乘车方式"
     :visible.sync="type"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
+    width="550px">
+    <el-form ref="rideform" :model="rideform" label-width="90px" :rules="rules" :label-position="labelPosition">
+      <template>
+      <el-form-item label="模块标题:" required prop="title">
+        <el-input v-model="rideform.title"></el-input>
       </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
+      <el-form-item label="排序值:" required prop="sort">
+        <el-input v-model="rideform.sort" ></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
-      <el-form-item label="乘车方式: ">
+      <el-form-item label="乘车方式:" required prop="content">
         <el-input
           type="textarea"
           :rows="6"
           placeholder="请输入内容"
-          v-model="textarea">
+          v-model="rideform.content">
         </el-input>
       </el-form-item>
+       </template>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="type = false">取 消</el-button>
-      <el-button type="primary" @click="type = false">确 定</el-button>
+      <el-button type="primary" @click="addRideWay('rideform');">确 定</el-button>
     </span>
-  </el-dialog>
-
-
-    </div>
+   </el-dialog>
+  </div>
 </template>
 
 
 <script>
+ import { getToken } from '@/api/qiniu'
+ import { getFileExtension} from '@/utils/tools'
+ import { addRotationUpload,addRideWay,addWorkTime,addconnection,queryConnetion,deleteConnecWay,editConnecWay,saveConnecform,addContract} from '@/api/site/site'  
+import { truncateSync } from 'fs';
 export default {
   name: "addcontact",
   data() {
     return {
+      dialogshow:false,
       slideshow:false,
       address:false,
+      hostaddress:false,
       contact:false,
       addLink:false,
+      editLink:false,
       time:false,
       type:false,
+      disabled: false,
+      dialogFormVisibleAdd:true,
+      labelPosition: 'left',
+      qiniuDomain: 'https://images.shengws.com/',
+      rotationData: { token:'',key: '' },
       new1: require("../../../assets/preview/u481.png"),
       new2: require("../../../assets/preview/u493.png"),
       new3: require("../../../assets/preview/u496.png"),
       new4: require("../../../assets/preview/u488.png"),
-      new5: require("../../../assets/preview/u500.png"),
-      
+      new5: require("../../../assets/preview/u500.png"),    
       form: {
-        name: ""
-      }
+        name: "",
+        sort:"",
+        title:"",
+      },
+      userlocation: {lng: "", lat: ""},
+      rotationform:{
+        title:"",
+        sort:"",
+        rotationImages:[],
+      },
+      rideform:{
+        title:"",
+        sort:"",
+        content:"",
+      },
+      woketimeform:{
+       title:"",
+       sort:"",
+       worktime:"",
+      },
+      hospitalform:{
+        title:"",
+        sort:"",
+        address:"",
+      },
+      connecform:{
+        title:"",
+        connecway:"",
+        content:"",
+      },
+      editconnecform:{
+        title:"",
+        connecway:"",
+        content:"",
+      },
+      connections:[
+         {id:1,name:'电话'},
+         {id:2,name:'非电话'},
+      ],
+      connectionway:[],
+      contractform:{
+        title:"",
+        sort:"",
+        way:[],
+      },
+      rules: {
+        title: [{required: true, message: "请填写模块标题",},],
+        sort: [{required: true,message:"请填写排序值"}],       
+        rotationImages:[{required:true,message:"请填写添加图片"}],
+        content:[{required:true,message:"请填写乘车方式"}],
+        worktime:[{required:true,message:"请填写工作时间"}],
+        connecway:[{required:true,message:"请选择联系方式"}]
+      },
+
     };
   },
   methods:{
-    
-  }
+       //轮播图
+      RotationchartSuccess(res,file,filelist){         
+         this.rotationform.rotationImages.push(this.qiniuDomain + res.url);  
+         console.log("双层地址",file.url)       
+         console.log("联系我们轮播图地址",this.rotationform.rotationImages); 
+      },
+         beforeRotationUpload(file){
+         console.log("尺寸",file.size)
+         const isJPG = file.type === 'image/jpeg';
+         const isLt2M = file.size / 1024 / 1024 < 2;
+       
+        if (!isJPG) {
+          this.$message.error('上传头像图片只能是 JPG 格式!');
+        }
+        if (!isLt2M) {
+          this.$message.error('上传头像图片大小不能超过 2MB!');
+        }
+      
+         var date = new Date()
+            var ext = getFileExtension(file.name)
+            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token= response.data.data.uptoken
+                    console.log("联系我们轮播图token是什么?",token)
+                    _self._data.rotationData.token = token;
+                    _self._data.rotationData.key = key;
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)
+                })
+            })
+          return isJPG && isLt2M;
+      },
+      //添加轮播图
+      addRotationUpload(formName){
+        this.$refs[formName].validate((valid)=>{
+          if(valid){
+            addRotationUpload(this.rotationform).then(response=>{
+               if(response.data.state==1){
+                 var connecmodel = response.data.data.connecmodel;
+                 this.slideshow = false;
+                 console.log("返回值",connecmodel);
+               }
+            });   
+          }
+        })
+        
+      },
+      rotationEditImages(){
+        
+      },
+
+      //新增联系方式
+      addconnection(formName){
+        this.$refs[formName].validate((valid)=>{
+          if(valid){
+            addconnection(this.connecform).then(response=>{
+              if(response.data.state==1){
+                 var cooection =  response.data.data.connection;
+                 console.log("返回数据",cooection);
+                 this.queryConnetion();
+                 this.connecform.title = "";
+                 this.connecform.content = "";
+              }
+            })
+          }
+        })
+      },
+
+      //获取联系方式
+      queryConnetion(){
+        queryConnetion().then(response=>{
+           if(response.data.state ==1){
+             this.connectionway = response.data.data.conection;
+             this.contractform.way =  response.data.data.cooection.id;
+             console.log("联系方式返回数据",this.connectionway);
+           }
+        })
+      },
+
+      //删除联系方式
+      deleteConnecWay(id,index){
+         this.$confirm('确定要删除该信息么?,删除后将无法恢复!',{
+         dangerouslyUseHTMLString:true,
+         confirmButtonText: '确定',
+         cancelButtonText: '取消',
+          type: 'warning'
+         }).then(()=>{
+            deleteConnecWay(id).then(response=>{
+             if(response.data.state==1){
+                this.connectionway.splice(index,1);
+             }
+           }).catch(e=>{}); 
+         }).catch(e=>{});
+      },
+
+      //编辑联系方式
+      editConnecWay(id){
+        console.log("id是啥",id);
+        editConnecWay(id).then(response=>{
+            if(response.data.state == 1){
+              this.editconnecform = response.data.data.connection;
+              console.log("返回数据",this.connecform);
+            }
+        })      
+      },
+
+      //编辑保存后的联系方式
+      saveConnecform(formName){
+         this.$refs[formName].validate((valid)=>{
+           if(valid){
+              saveConnecform(this.editconnecform.id,this.editconnecform).then(response=>{
+                  if(response.data.state == 1){
+                     var connection =  response.data.data.connection;
+                     console.log("返回数据",connection);
+                      this.editLink =false;
+                      this.queryConnetion();
+                  }    
+              }) 
+           }
+         })
+      },
+
+      //添加联系方式
+      addContract(formName){
+         this.$refs[formName].validate((valid)=>{
+            if(valid){
+              addContract(this.contractform).then(response=>{
+                  if(response.data.state == 1){
+                         
+                  }
+              })           
+            }
+         })
+      },
+
+      //添加工作时间
+      addWorkTime(formName){
+        this.$refs[formName].validate((valid)=>{
+          if(valid){
+            addWorkTime(this.woketimeform).then(response=>{
+                  if(response.data.state==1){
+                    var sgjworktime = response.data.data.sgjworktime;
+                    console.log("返回数据",sgjworktime);
+                    this.time = false;
+                }
+            })
+          }
+        })
+      },
+
+      //添加乘车方式
+      addRideWay(formName){
+        this.$refs[formName].validate((valid)=>{
+          if(valid){
+            addRideWay(this.rideform).then(response=>{
+              if(response.data.state==1){
+                 var rideway = response.data.data.rideway;
+                 console.log("返回数据",rideway);
+                 this.type = false;
+              }
+            })
+          }
+        })
+      },
+      hospitaAddress(){
+        this.hostaddress = true;
+      }
+  },
+       mounted(){
+          this.$nextTick(function () {
+                var th = this
+                // 创建Map实例
+                var map = new BMap.Map("allmap");
+                // 初始化地图,设置中心点坐标，
+                var point = new BMap.Point(121.160724,31.173277); // 创建点坐标，汉得公司的经纬度坐标
+                map.centerAndZoom(point, 15);
+                map.enableScrollWheelZoom();
+                var ac = new BMap.Autocomplete(    //建立一个自动完成的对象
+                    {
+                        "input":"suggestId", 
+                        "location": map,
+                    })
+                var myValue
+                ac.addEventListener("onconfirm", function (e) {    //鼠标点击下拉列表后的事件
+                    var _value = e.item.value;
+                    myValue = _value.province + _value.city + _value.district + _value.street + _value.business;
+                    this.address_detail = myValue
+                    setPlace();
+                });
+
+                function setPlace() {
+                    map.clearOverlays();    //清除地图上所有覆盖物
+                    function myFun() {
+                        th.userlocation = local.getResults().getPoi(0).point;    //获取第一个智能搜索的结果
+                        map.centerAndZoom(th.userlocation, 18);
+                        map.addOverlay(new BMap.Marker(th.userlocation));    //添加标注
+                    }
+
+                    var local = new BMap.LocalSearch(map, { //智能搜索
+                        onSearchComplete: myFun
+                    });
+                    local.search(myValue);
+
+                    //测试输出坐标（指的是输入框最后确定地点的经纬度）
+                    map.addEventListener("click",function(e){
+                        //经度
+                        console.log(th.userlocation.lng);
+                        //维度
+                        console.log(th.userlocation.lat);
+
+                    })
+                }
+
+            })
+        },
+
+        created(){
+          this.queryConnetion();
+        }
 };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
+  #allmap{
+        width: 200px;
+        height: 200px;
+        font-family: "微软雅黑";
+        margin-top: 20px;
+      //  border:1px solid green;
+    }
 .tips {
   font-size: 12px;
   line-height: 18px;

src/scrm_pages/site/components/new-feature.vue

@@ -69,13 +69,15 @@
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="添加图片:" v-model="rotationform.rotationImages" required prop="rotationImages">
+        <div>
+        </div>
          <el-upload
           :data="rotationData"
           action="https://upload.qiniup.com"
           list-type="picture-card"
          :on-success="RotationchartSuccess"
          :before-upload="beforeRotationUpload"
-         >
+         v-show="show">
         <i slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
@@ -98,7 +100,9 @@
          </span> 
         </div> 
      </el-upload>
+      <img  src="static/images/u679.png" @click="addpic()">
       </el-form-item>
+       
        <span class="uploadfont">图片已上传0张,最多上传9张图片</span>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -107,12 +111,106 @@
     </span>
   </el-dialog>
 
+   <!-- 编辑图片 -->
+   <el-dialog
+     title="编辑图片"
+     :visible.sync="addpicVisible"
+     width="30%"
+    >
+  <el-form ref="picform" :model="picform" label-width="90px">
+    <el-form-item label="图片编辑:">
+      <el-col :span="5">
+       <el-upload
+         :data="rotationData"
+         class="avatar-uploader"
+         action="https://upload.qiniup.com"
+        :show-file-list="false"
+         :on-success="RotationchartSuccess"
+        :before-upload="beforeRotationUpload">
+        <img v-if="imageUrl" :src="imageUrl" class="avatar">
+       <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+      </el-upload>
+      </el-col>
+      <el-col :span="19">
+          <div class="tpic"> 
+            <img src="static/images/a.jpg">
+          </div>
+      </el-col>
+    </el-form-item>
+    <el-form-item label="排序值:">
+       <el-col :span="24">
+         <el-input></el-input>
+       </el-col>   
+    </el-form-item>
+    <el-form-item label="图片链接:">
+      <el-radio v-model="radio" label="1">无</el-radio>
+      <el-radio v-model="radio" label="2">自定义</el-radio> 
+    </el-form-item>
+    <el-form-item label="链接地址:">
+      <el-col :span="20">
+      <el-input></el-input>
+      </el-col>
+      <el-col :span="4">
+       <el-button size="medium" @click="addlink()">设置链接</el-button>
+      </el-col>
+    </el-form-item>
+  </el-form>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="addpicVisible = false">取 消</el-button>
+    <el-button type="primary" @click="addpicVisible = false">确 定</el-button>
+  </span>
+</el-dialog>
+  
+  <!-- 设置图片链接地址 -->
+  <el-dialog
+    title="设置图片链接地址"
+    :visible.sync="linkVisible"
+    width="30%">
+     <el-form label-width="90px">
+       <el-form-item label="链接类型">
+       <el-radio v-model="radio" label="1">无</el-radio>
+       <el-radio v-model="radio" label="2">站内链接</el-radio> 
+       <el-radio v-model="radio" label="2">站外链接</el-radio> 
+       </el-form-item>
+       <el-form-item label="链接类型:">
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+         </el-select>
+       </el-form-item>
+       <el-form-item label="站内链接:">
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in option"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+         </el-select>
+       </el-form-item>
+       <el-form-item >
+        <el-input style="width: 300px"  placeholder="请输入您需要搜索的内容"></el-input>
+          <el-button type="primary"  icon="el-icon-search">搜索</el-button>
+       </el-form-item>
+       <el-form-item label="自定义地址:">
+          <el-input></el-input>
+       </el-form-item>
+     </el-form>
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="linkVisible = false">取 消</el-button>
+    <el-button type="primary" @click="linkVisible = false">确 定</el-button>
+  </span>
+  </el-dialog>
+
   <!-- 新增医院介绍 -->
   <el-dialog
     title="新增医院介绍"
     :visible.sync="two"
     width="50%"
-    :before-close="handleClose"
      :modal='false'
      v-dialogDrag
      :close-on-click-modal="false">
@@ -121,11 +219,11 @@
         <el-input v-model="hispitalform.title"></el-input>
       </el-form-item>
       <el-form-item label="排序值:" required prop="sort">
-        <el-input v-model="hispitalform.sort" ></el-input>
+        <el-input v-model="hispitalform.sort"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
       <el-form-item label="医院介绍:" required prop="introduction">
-         <keep-alive v-show="editorshow">
+         <keep-alive>
             <neditor ref="neditor"
               id="editor"
               v-bind:r_content="hispitalform.introduction">
@@ -168,55 +266,180 @@
     </span>
   </el-dialog>
 
-  <!-- 新增名医介绍 -->
+    <!-- 新增名医介绍 -->
   <el-dialog
     title="新增名医介绍"
     :visible.sync="four"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="doctorform" :model="doctorform" label-width="90px" :rules="rules">
+    width="550px">
+    <el-form ref="doctorform" :model="doctorform" label-width="90px" :rules="rules" >
       <el-form-item label="模块标题:" required prop="title">
         <el-input v-model="doctorform.title"></el-input>
       </el-form-item>
-      <el-form-item label="排序值: " required prop="sort">
+      <el-form-item label="排序值:" required prop="sort">
         <el-input v-model="doctorform.sort"></el-input>
         <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
       </el-form-item>
-      <el-form-item label="新增名医:" required prop="image">       
-        <div class="flex-img">
-        <div class="el-upload-list el-upload-list--picture-card" v-show="hideShow">            
-            <div class="el-upload-list__item is-success">              
-                 <img class="flex-img__image" :src="doctorform.image" v-if="doctorform.image">              
+      <el-form-item label="新增名医:" v-model="doctorform.image">
+         <div class="flex-img" v-show="headshow">
+        <div class="el-upload-list el-upload-list--picture-card" >            
+            <div class="el-upload-list__item is-success" v-for="item in this.docform" :key="item.id">             
+                 <img class="flex-img__image" :src="item.dochead">              
                 <label class="el-upload-list__item-status-label">
                     <i class="el-icon-upload-success el-icon-check"></i>
                 </label>
                 <span class="el-upload-list__item-actions">
                     <span class="el-upload-list__item-delete">
-                        <i class="el-icon-edit-outline" @click="editDoctor()"></i>
-                        <i class="el-icon-delete" @click="deleteDoctor"></i>
+                        <i class="el-icon-edit-outline" @click="editDoctor(item.id);editcenterDialogVisible = true"></i>
+                        <i class="el-icon-delete" @click="deleteDoctor(item.id,index)"></i>
                     </span>
                 </span>
             </div>         
-        </div>
-        <el-upload
-            class="image-uploader"
-            action="https://upload.qiniup.com"
-            :show-file-list="false"
-            :data="uploadData"
-            accept="image/jpeg,image/jpg,image/png"
-            :on-success="imageUploadSuccess"
-            :before-upload="beforeUpload"
-            v-show="!hideShow">
-            <i class="el-icon-plus"></i>
-        </el-upload>          
+        </div>        
     </div>
-   </el-form-item>
+      <img src="static/images/u646.png" @click="centerDialogVisible = true">
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="four = false">取 消</el-button>
       <el-button type="primary" @click="AddDoctor('doctorform')">确 定</el-button>
     </span>
   </el-dialog>
+
+    <!-- 编辑名医介绍 -->
+   <el-dialog
+      title="编辑医生介绍"
+      :visible.sync="centerDialogVisible"
+      width="50%"
+      center>
+       <el-form label-width="90px" class="clearfix" :model="eidtDoctorform" ref="eidtDoctorform" :rules="rules">
+          <el-row :span=20>
+            <el-col :span="12">
+             <el-form-item label="医生姓名:">
+              <el-select v-model="eidtDoctorform.name" placeholder="请选择"  @change="change(eidtDoctorform.name)">
+                <el-option
+                 v-for="item in docnames"
+                 :key="item.id"
+                 :label="item.name"
+                 :value="item.id"
+                 >
+                </el-option>
+              </el-select>
+             </el-form-item>     
+             </el-col> 
+             <el-col :span="12">
+              <el-form-item label="医生职称:" required prop="user_title">
+              <el-select v-model="eidtDoctorform.user_title" placeholder="请选择">
+                <el-option
+                 v-for="item in positions"
+                 :key="item.index"
+                 :label="item.name"
+                 :value="item.index">
+                </el-option>
+              </el-select>
+              </el-form-item>   
+             </el-col>
+          </el-row>
+          <el-row :span=20>
+               <el-form-item label="医生头像:" required prop="dochead">
+                 <el-col :span="5">
+                   <el-upload
+                       :data="doctorData"
+                       class="avatar-uploader"
+                       action="https://upload.qiniup.com"
+                       :show-file-list="false"
+                       :on-success="handleAvatarSuccess"
+                       :before-upload="beforeAvatarUpload">
+                       <img v-if="eidtDoctorform.dochead" :src="eidtDoctorform.dochead" class="avatar">
+                       <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
+                   </el-col>
+                   <el-col :span="16">
+                    <el-form-item label="排序值:" required prop="sort">
+                      <el-input v-model="eidtDoctorform.sort"></el-input>
+                    </el-form-item>
+                  </el-col>
+               </el-form-item>  
+          </el-row>
+          <el-row :span=20>
+            <el-form-item label="医生简介:" required prop="content">      
+                 <keep-alive>
+                   <neditor ref="neditor"
+                      id="editor"
+                      v-bind:r_content="eidtDoctorform.content">
+                  </neditor>
+                </keep-alive>
+            </el-form-item>
+          </el-row>
+        </el-form>
+     <span slot="footer" class="dialog-footer">
+      <el-button @click="centerDialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="AddDoctorInfo('eidtDoctorform')">确 定</el-button>
+      </span>
+   </el-dialog>
+
+    <el-dialog
+      title="编辑医生介绍"
+      :visible.sync="editcenterDialogVisible"
+      width="50%"
+      center>
+       <el-form label-width="90px" class="clearfix" :model="editdocfrom" ref="editdocfrom" :rules="rules">
+          <el-row :span=20>
+            <el-col :span="10">
+             <el-form-item label="医生姓名:" required prop="docname">
+              <el-input v-model="editdocfrom.docname"></el-input>
+             </el-form-item>     
+             </el-col> 
+             <el-col :span="12">
+              <el-form-item label="医生职称:" required prop="doc_position">
+              <!-- <el-input v-model="editdocfrom.doc_position"></el-input> -->
+              <el-select v-model="editdocfrom.doc_position" placeholder="请选择">
+                <el-option
+                 v-for="item in positions"
+                 :key="item.index"
+                 :label="item.name"
+                 :value="item.index">
+                </el-option>
+              </el-select>
+              </el-form-item>   
+             </el-col>
+          </el-row>
+          <el-row :span=20>
+               <el-form-item label="医生头像:" required prop="dochead">
+                 <el-col :span="10">
+                   <el-upload
+                       :data="doctorDatatwo"
+                       class="avatar-uploader"
+                       action="https://upload.qiniup.com"
+                       :show-file-list="false"
+                       :on-success="handleAvatarSuccesstwo"
+                       :before-upload="beforeAvatarUploadtwo">
+                       <img v-if="editdocfrom.dochead" :src="editdocfrom.dochead" class="avatar">
+                       <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
+                   </el-col>
+                   <el-col :span="12">
+                    <el-form-item label="排序值:" required prop="doc_sort">
+                      <el-input v-model="editdocfrom.doc_sort"></el-input>
+                    </el-form-item>
+                  </el-col>
+               </el-form-item>  
+          </el-row>
+          <el-row :span=20>
+            <el-form-item label="医生简介:" required prop="docintroduction">      
+                 <keep-alive>
+                   <neditor ref="neditor"
+                      id="editor"
+                      v-bind:r_content="editdocfrom.docintroduction">
+                  </neditor>
+                </keep-alive>
+            </el-form-item>
+          </el-row>
+        </el-form>
+     <span slot="footer" class="dialog-footer">
+      <el-button @click="editcenterDialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="saveDocInfo('editdocfrom')">确 定</el-button>
+      </span>
+   </el-dialog>
   
   <!-- 新增科室环境 -->
    <el-dialog
@@ -356,93 +579,12 @@
     </span>
   </el-dialog>
     
-    <!-- 编辑名医介绍 -->
-   <el-dialog
-      title="编辑医生介绍"
-      :visible.sync="centerDialogVisible"
-      width="30%"
-      center>
-       <el-form label-width="90px" class="clearfix" :model="eidtDoctorform" ref="eidtDoctorform" :rules="rules">
-          <el-row :span=20>
-            <el-form-item label="医生姓名:" required prop="docname">
-              <el-input v-model="eidtDoctorform.docname">
-
-              </el-input>
-            </el-form-item>
-          </el-row>
-          <el-row :span=20>
-               <el-form-item label="医生头像:" required prop="docHead">
-                   <el-upload
-                       :data="doctorData"
-                       class="avatar-uploader"
-                       action="https://upload.qiniup.com"
-                       :show-file-list="false"
-                       :on-success="handleAvatarSuccess"
-                       :before-upload="beforeAvatarUpload">
-                       <img v-if="eidtDoctorform.docHead" :src="eidtDoctorform.docHead" class="avatar">
-                       <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                   </el-upload>
-               </el-form-item>  
-          </el-row>
-          <el-row :span=20>
-            <el-form-item label="医生职称:" required prop="docpositional">
-              <el-input v-model="eidtDoctorform.docpositional">
-
-              </el-input>
-            </el-form-item>
-          </el-row>
-          <el-row :span=20>
-            <el-form-item label="医生简介:" required prop="docintroduction">      
-                <div style="margin: 10px 0;"></div>
-                <el-input
-                 type="textarea"
-                :autosize="{ minRows: 2, maxRows: 4}"
-                 v-model="eidtDoctorform.docintroduction">
-                </el-input>
-            </el-form-item>
-          </el-row>
-        </el-form>
-     <span slot="footer" class="dialog-footer">
-      <el-button @click="centerDialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="AddDoctorInfo('eidtDoctorform')">确 定</el-button>
-      </span>
-   </el-dialog>
-
-   <!-- 编辑图片 -->
-    <el-dialog
-       title="提示"
-       :visible.sync="dialogRotationVisible"
-        width="30%"
-        :before-close="handleClose"
-        center>
-        <div class="eidtRotationimages">
-          <img src="static/images/a.jpg" style="width:260px;height:200px">
-        </div>
-        <el-form label-width="90px" class="clearfix">
-           <el-form-item  label="图片描述:">
-              <el-input></el-input>
-           </el-form-item>
-           <el-form-item label="图片链接:">
-              <el-radio-group v-model="radio">
-                <el-radio :label="3">无</el-radio>
-                <el-radio :label="6">自定义</el-radio>
-              </el-radio-group>
-           </el-form-item>
-           <el-form-item label="链接地址:">
-               <el-input style="width:320px"></el-input>
-               <el-button  type="primary">链接地址</el-button>
-           </el-form-item>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-       <el-button @click="dialogRotationVisible = false">取 消</el-button>
-       <el-button type="primary" @click="dialogRotationVisible = false">确 定</el-button>
-      </span>
-   </el-dialog>
+  
 </div>
 </template>
 
 <script>
-   import { AddRotationChart, saveHispital,addOffices,AddDoctor,AddDoctorInfo,AddOfficeEnvironment } from '@/api/site/site'  
+   import { AddRotationChart, saveHispital,addOffices,AddDoctor,AddDoctorInfo,AddOfficeEnvironment,getQueryDocInfo,change,getQueryDoCHead,editDoctor,saveDocInfo,deleteDoctor } from '@/api/site/site'  
    import { getToken } from '@/api/qiniu'
    import { getFileExtension} from '@/utils/tools'
    import { isIP } from 'net';
@@ -451,6 +593,7 @@
    import 'quill/dist/quill.core.css'
    import 'quill/dist/quill.snow.css'
    import 'quill/dist/quill.bubble.css'
+   import { constants } from 'crypto';
 export default {
   name: "newfeature",
   components:{
@@ -459,6 +602,37 @@ export default {
   props: ['image', 'clearList'],
   data() {
     return {
+      options: [{
+          value: '选项1',
+          label: '文章'
+        }, {
+          value: '选项2',
+          label: '活动'
+        }],
+        option:[{
+           value:'选项1',
+           label:'体育'
+        },{
+          value:'选项2',
+          label:'数学',
+        }],
+       headshow:false,
+       docnames:[],
+       positions:[
+          { 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: '主任护师' },
+          { index: 12, name: '运营专员' },
+       ],
+       value: '',
       new1: require("../../../assets/preview/u481.png"),
       new2: require("../../../assets/preview/u493.png"),
       new3: require("../../../assets/preview/u496.png"),
@@ -469,6 +643,9 @@ export default {
       new8: require("../../../assets/preview/u512.png"),
       dialogVisible: false,
       dialogRotationVisible: false,
+      editcenterDialogVisible: false,
+      addpicVisible:false,
+      radio: '1',
       two: false,
       three: false,
       four: false,
@@ -476,11 +653,13 @@ export default {
       six: false,
       seven: false,
       eight: false,
+      linkVisible:false,
       dialogImageUrl: '',
       disabled: false,
       qiniuDomain: 'https://images.shengws.com/',
       uploadData: { token: '', key: '' },
-      doctorData: { token: '' ,key: '' },
+      doctorData: { token: '', key: '' },
+      doctorDatatwo:  { token: '', key: '' },
       rotationData: { token:'',key: '' },
       keData: { token: '' ,key: ''},
       file: this.image ? this.image : '',
@@ -495,6 +674,9 @@ export default {
         textarea:"",
         image:"",
       },
+      docform:[],
+        
+    
       hispitalform:{
         title:"",
         sort:"",
@@ -509,12 +691,22 @@ export default {
         title:"",
         sort:"",
         image:"",
+        docimages:[],
+      },
+      editdocfrom:{
+        docname:"",
+        dochead:"",
+        doc_position:"",
+        doc_sort:"",
+        docintroduction:"",
       },
       eidtDoctorform:{
-       docname:"",
-       docHead:"",
-       docpositional:"",
-       docintroduction:"",
+       id:"",
+       name:"",
+       dochead:"",
+       user_title:"",
+       sort:"",
+       content:"",
       },
       rotationform:{
         title:"",
@@ -525,6 +717,9 @@ export default {
         title:"",
         sort:"",
         keImages:[],
+      },
+      picform:{
+
       },
 
        rules: {
@@ -534,16 +729,26 @@ export default {
          image: [{required: true,message:"请填写新增名医"}],
          docname: [{required:true,message:"请填写医生姓名"}],
          docHead: [{required: true,message:"请填写医生头像"}],
+         dochead: [{required: true,message:"请填写医生头像"}],
          docpositional:[{required:true,message:"请填写医生职位"}],
          docintroduction:[{required:true,message:"请填写医生简介"}],
          images:[{required:true,message:"请填写新增科室环境"}],
          rotationImages:[{required:true,message:"请填写添加图片"}],
-         keimages:[{required:true,message:"请填写新增科室环境"}]
+         keimages:[{required:true,message:"请填写新增科室环境"}],
+         user_title:[{required:true,message:"请填写医生职称"}],
+         docimages:[{required:true,message:"请填写新增名医"}]
       },
     };
   },
   // 医院介绍模块
   methods:{   
+      addpic(){
+       this.addpicVisible = true;
+      },
+
+      addlink(){
+        this.linkVisible = true;
+      },
      //轮播图
      rotationEditImages(){
         this.dialogRotationVisible = true;
@@ -552,10 +757,12 @@ export default {
       handleRemove(file) {
         console.log(file);
       },
+      handleClose(file){
+        console.log(file);
+      },
       imageUploadSuccess(res,file) {
-        this.doctorform.image = this.qiniuDomain + res.url;  
-        this.hideShow = true;
-        console.log("這是啥?",this.qiniuDomain+res.url)
+        console.log("上传的数据是什么",this.qiniuDomain+res.url)
+        this.doctorform.docimages.push(this.qiniuDomain + res.url)
       },
       beforeUpload(file) {   
         const isJPG = file.type === 'image/jpeg';
@@ -577,8 +784,8 @@ export default {
                 getToken().then(response => {
                     const tokentree = response.data.data.uptoken
                     console.log("token是什么?",tokentree)
-                    _self._data.uploadData.token = tokentree;
-                    _self._data.uploadData.key = key;
+                    _self._data.doctorData.token = tokentree;
+                    _self._data.doctorData.key = key;
                     resolve(true)
                 }).catch(err => {
                     reject(false)
@@ -593,8 +800,10 @@ export default {
 
 
       handleAvatarSuccess(res, file) {
-         this.eidtDoctorform.docHead = this.qiniuDomain + res.url;  
+         this.eidtDoctorform.dochead = this.qiniuDomain + res.url;  
       },
+
+    
       beforeAvatarUpload(file) {
         console.log("尺寸",file.size)
         const isJPG = file.type === 'image/jpeg';
@@ -629,6 +838,45 @@ export default {
           return isJPG && isLt2M;
       },
 
+      handleAvatarSuccesstwo(res,file){
+        this.editdocfrom.dochead = this.qiniuDomain + res.url;
+      },
+
+       beforeAvatarUploadtwo(file) {
+        console.log("尺寸",file.size)
+        const isJPG = file.type === 'image/jpeg';
+        const isLt2M = file.size / 1024 / 1024 < 2;
+       
+        if (!isJPG) {
+          this.$message.error('上传头像图片只能是 JPG 格式!');
+        }
+        if (!isLt2M) {
+          this.$message.error('上传头像图片大小不能超过 2MB!');
+        }
+      
+         var date = new Date()
+            var ext = getFileExtension(file.name)
+            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
+            this.uploading = true;
+            this.loadingText = '封面图片上传中'
+
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token= response.data.data.uptoken
+                    console.log("医生头像token是什么?",token)
+                    _self._data.doctorDatatwo.token = token;
+                    _self._data.doctorDatatwo.key = key;
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)
+                    this.uploading = false;
+                })
+            })
+          return isJPG && isLt2M;
+      },
+
+
       //轮播图
       RotationchartSuccess(res,file,filelist){         
          this.rotationform.rotationImages.push(this.qiniuDomain + res.url);         
@@ -675,7 +923,7 @@ export default {
               AddRotationChart(this.rotationform).then(response=>{
                   if(response.data.state==1){
                     var rotation =  response.data.data.rotation;
-                    console.log("返回数据",rotation);
+                   // console.log("返回数据",rotation);
                     this.$message.success("添加轮播图成功");
                     this.dialogVisible = false;
                   }
@@ -693,7 +941,7 @@ export default {
              saveHispital(this.hispitalform).then(response=>{
                   if(response.data.state==1){
                     var hospital = response.data.data.hospital;
-                    console.log("返回数据",hospital)
+                    //console.log("返回数据",hospital)
                      this.$message.success("添加医院介绍成功");  
                      this.two = false;    
                   }
@@ -710,7 +958,7 @@ export default {
              addOffices(this.administform).then(response=>{
                  if(response.data.state==1){
                     var offices = response.data.data.offices;
-                    console.log("返回数据",offices);
+                   // console.log("返回数据",offices);
                     this.$message.success("添加科室介绍成功");
                     this.three = false;
                  }
@@ -720,25 +968,71 @@ export default {
      },
 
      //名医介绍
-     AddDoctor(formName){
+     AddDoctor(formName){ 
+          var images = [];
+          for (let index = 0; index < this.docform.length; index++) {
+            images.push(this.docform[index].dochead);          
+          }      
+          this.doctorform.docimages = images,
          this.$refs[formName].validate((valid)=>{
            if(valid){
               AddDoctor(this.doctorform).then(response=>{
+                console.log("啊啊啊",this.doctorform);
                 if(response.data.state==1){
-                    var doctor = response.data.data.doctor;
-                    console.log("返回数据",doctor);
-                    this.$message.success("添加名医成功");
-                    this.four = false;
+                  var doctor = response.data.data.doctor;
+                  console.log("返回数据",doctor)
+                  this.four = false;
                 }
               })
            }
          })
      },
-     editDoctor(){
-        this.centerDialogVisible = true;
+      getQueryDocInfo(){
+        getQueryDocInfo(this.doctorform).then(response=>{
+              if(response.data.state==1){
+                 this.docnames = response.data.data.doctor;
+
+              }
+        })
+      },
+      //获取医生头像
+      getQueryDoCHead(){
+        getQueryDoCHead().then(response=>{
+          if(response.data.state==1){
+            //var docHead =  response.data.data.docHead;
+            this.docform =  response.data.data.docHead;
+            console.log("aaa",response.data.data.docHead)
+            this.headshow = true;
+            //console.log("数据返回",docHead)
+          }
+        })
+      },
+      change(id){
+        // alert(id);
+        change(id).then(response=>{
+            if(response.data.state == 1){
+              var docinfo =  response.data.data.docinfo;
+              this.eidtDoctorform = response.data.data.docinfo;
+             console.log("编辑医生返回数据",docinfo);
+
+            }
+        })
+      },
+     editDoctor(id){
+        editDoctor(id).then(response=>{
+           if(response.data.state ==1){
+             var docionfo = response.data.data.docinfo;
+             this.editdocfrom = response.data.data.docinfo;
+             console.log("数据",docionfo);
+           }
+        });
      },
-     deleteDoctor(){
-       this.hideShow = false;
+     deleteDoctor(id,index){
+       deleteDoctor(id,index).then(response=>{
+          if(response.data.state == 1){
+             this.docform.splice(index,1);
+          }
+       })
      },
 
      //编辑医生介绍
@@ -747,15 +1041,32 @@ export default {
            if(valid){
              AddDoctorInfo(this.eidtDoctorform).then(response=>{
                if(response.data.state==1){
-                  var doctor  =  response.data.data.doctor;
-                  console.log("返回数据",doctor);
-                  this.$message.success("编辑名医成功");
-                  this.centerDialogVisible = false;
+                 var doctor =  response.data.data.doctor;
+                 this.centerDialogVisible = false;
+                 console.log("返回数据",doctor);
+                 this.eidtDoctorform = "";
+                 this.getQueryDoCHead();
                }
              })
            }
          })
-     },   
+     }, 
+     saveDocInfo(formName){
+        this.$refs[formName].validate((valid)=>{
+          if(valid){
+               saveDocInfo(this.editdocfrom.id,this.editdocfrom).then(response=>{
+                  if(response.data.state == 1){
+                     var doctor =  response.data.data.doctor;
+                     console.log("返回数据",doctor);
+                     this.editcenterDialogVisible = false;
+                     this.$message.success("保存成功")
+                     this.getQueryDoCHead();
+                  }
+              })
+           }
+        })
+     
+     },
       
       // 科室环境
       deleteKe(){
@@ -811,12 +1122,23 @@ export default {
              })
            }
          })
-      }
+      },
+      add(){
+     
+      },
   },  
+   created(){
+     this.getQueryDocInfo();
+     this.getQueryDoCHead();
+   }
  };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+     .tpic{
+       margin-left: 50px;
+     }
+
      .eidtRotationimages{
        text-align: center;
        margin-bottom: 12px;
@@ -835,6 +1157,9 @@ export default {
     font-size: 12px;
     line-height: 18px;
   }
+  .adddoc{
+    font-size: 14px;
+  }
 
     //上传样式
     .uploadfont{
@@ -868,8 +1193,8 @@ export default {
     cursor: pointer;
     position: relative;
     overflow: hidden;
-    width: 148px;
-    height: 148px;
+    width: 100px;
+    height: 100px;
   }
   .avatar-uploader{
     border-color: #409EFF;
@@ -877,16 +1202,14 @@ export default {
   .avatar-uploader-icon {
     font-size: 28px;
     color: #8c939d;
-    width: 148px;
-    height: 148px;
-    line-height: 148px;
+    width: 50px;
+    height: 50px;
+    line-height: 50px;
+    margin-left: 25px;
+    margin-top: 25px;
     text-align: center;
   }
-  .avatar {
-    width: 178px;
-    height: 178px;
-    display: block;
-  }
+  
 </style>
 <style  /deep/scoped>
      .disabled {
@@ -944,5 +1267,8 @@ export default {
         -webkit-transition: opacity .3s;
         transition: opacity .3s;
     }
+
+
+
 </style>
 

src/scrm_pages/site/components/used-list.vue

@@ -1,321 +1,19 @@
 <template>
 <div>
-    <div class="used">
+    <div class="used" v-for="item in this.model" :key="item.id">
         <ul>
             <li>
-                <span class="name">轮播图</span>
+                <span class="name">{{item.title}}</span>
                 <span class="icon"> 
                     <i class="el-icon-edit-outline" @click="dialogVisible = true"></i>
                     <i class="el-icon-delete" @click="deleteList = true"></i>
                 </span>
             </li>
-            <!-- <li>
-                <span class="name">魔方导航</span>
-                <span class="icon"> 
-                    <i class="el-icon-edit-outline" @click="eight = true"></i>
-                    <i class="el-icon-delete" @click="deleteList = true"></i>
-                </span>
-            </li>
-            <li>
-                <span class="name">医院介绍</span>
-                <span class="icon"> 
-                    <i class="el-icon-edit-outline" @click="two = true"></i>
-                    <i class="el-icon-delete" @click="deleteList = true"></i>
-                </span>
-            </li>
-            <li>
-                <span class="name">科室介绍</span>
-                <span class="icon"> 
-                    <i class="el-icon-edit-outline" @click="three = true"></i>
-                    <i class="el-icon-delete" @click="deleteList = true"></i>
-                </span>
-            </li>
-            <li>
-                <span class="name">名医介绍</span>
-                <span class="icon"> 
-                    <i class="el-icon-edit-outline" @click="four = true"></i>
-                    <i class="el-icon-delete" @click="deleteList = true"></i>
-                </span>
-            </li>
-            <li>
-                <span class="name">科室环境</span>
-                <span class="icon"> 
-                    <i class="el-icon-edit-outline" @click="five = true"></i>
-                    <i class="el-icon-delete" @click="deleteList = true"></i>
-                </span>
-            </li>
-            <li>
-                <span class="name">文章列表</span>
-                <span class="icon"> 
-                    <i class="el-icon-edit-outline" @click="six = true"></i>
-                    <i class="el-icon-delete" @click="deleteList = true"></i>
-                </span>
-            </li>
-            <li>
-                <span class="name">活动列表</span> 
-                <span class="icon"> 
-                    <i class="el-icon-edit-outline" @click="seven = true"></i>
-                    <i class="el-icon-delete" @click="deleteList = true"></i>
-                </span>
-            </li> -->
         </ul>
     </div>
-
-<!-- 确定删除组件 -->
-    <el-dialog
-        title="删除提示"
-        :visible.sync="deleteList"
-        width="550px"
-        :before-close="handleClose">
-        <span>确认要删除该组件吗？删除后，该组件将无法恢复</span>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="deleteList = false">取 消</el-button>
-            <el-button type="primary" @click="deleteList = false">确 定</el-button>
-        </span>
-    </el-dialog>
-
-
-  <!-- 新增轮播图 -->
-  <el-dialog
-    title="新增轮播图"
-    :visible.sync="dialogVisible"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
-      </el-form-item>
-      <el-form-item label="添加图片: ">
-        <el-upload
-          action="https://jsonplaceholder.typicode.com/posts/"
-          list-type="picture-card"
-          :on-preview="handlePictureCardPreview"
-          :on-remove="handleRemove">
-          <i class="el-icon-plus"></i>
-        </el-upload>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-    </span>
-  </el-dialog>
-  <!-- 新增医院介绍 -->
-  <el-dialog
-    title="新增医院介绍"
-    :visible.sync="two"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
-      </el-form-item>
-      <el-form-item label="医院介绍: ">
-          <el-input
-          type="textarea"
-          :rows="6"
-          placeholder="请输入内容"
-          v-model="textarea">
-        </el-input>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="two = false">取 消</el-button>
-      <el-button type="primary" @click="two = false">确 定</el-button>
-    </span>
-  </el-dialog>
-  <!-- 新增科室介绍 -->
-  <el-dialog
-    title="新增科室介绍"
-    :visible.sync="three"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
-      </el-form-item>
-      <el-form-item label="科室介绍: ">
-           <el-input
-          type="textarea"
-          :rows="6"
-          placeholder="请输入内容"
-          v-model="textarea">
-        </el-input>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="three = false">取 消</el-button>
-      <el-button type="primary" @click="three = false">确 定</el-button>
-    </span>
-  </el-dialog>
-
-  <!-- 新增名医介绍 -->
-  <el-dialog
-    title="新增名医介绍"
-    :visible.sync="four"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="80px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
-      </el-form-item>
-      <el-form-item label="新增名医: ">
-        <el-upload
-          action="https://jsonplaceholder.typicode.com/posts/"
-          list-type="picture-card"
-          :on-preview="handlePictureCardPreview"
-          :on-remove="handleRemove">
-          <i class="el-icon-plus"></i>
-        </el-upload>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="four = false">取 消</el-button>
-      <el-button type="primary" @click="four = false">确 定</el-button>
-    </span>
-  </el-dialog>
-
-  <!-- 新增科室环境 -->
-   <el-dialog
-    title="新增科室环境"
-    :visible.sync="five"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="100px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
-      </el-form-item>
-      <el-form-item label="新增科室环境: ">
-        <el-upload
-          action="https://jsonplaceholder.typicode.com/posts/"
-          list-type="picture-card"
-          :on-preview="handlePictureCardPreview"
-          :on-remove="handleRemove">
-          <i class="el-icon-plus"></i>
-        </el-upload>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="five = false">取 消</el-button>
-      <el-button type="primary" @click="five = false">确 定</el-button>
-    </span>
-  </el-dialog>
-
-  <!-- 新增文章列表 -->
-  <el-dialog
-    title="新增文章列表"
-    :visible.sync="six"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="100px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
-      </el-form-item>
-      <el-form-item label="文章分类: ">
-        <el-select v-model="form.region" placeholder="请选择活动区域" style="width:49%;float:left;">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
-        </el-select>
-        <el-select v-model="form.region" placeholder="请选择活动区域" style="width:49%;float:right;">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="首页展示条数: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="six = false">取 消</el-button>
-      <el-button type="primary" @click="six = false">确 定</el-button>
-    </span>
-  </el-dialog>
-
-  <!-- 新增活动列表 -->
-   <el-dialog
-    title="新增活动列表"
-    :visible.sync="seven"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="100px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
-      </el-form-item>
-     
-      <el-form-item label="首页展示条数: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="seven = false">取 消</el-button>
-      <el-button type="primary" @click="seven = false">确 定</el-button>
-    </span>
-  </el-dialog>
-
-  <!-- 新增魔方导航 -->
-  <el-dialog
-    title="新增魔方导航"
-    :visible.sync="eight"
-    width="550px"
-    :before-close="handleClose">
-    <el-form ref="form" :model="form" label-width="100px">
-      <el-form-item label="模块标题: ">
-        <el-input v-model="form.name"></el-input>
-      </el-form-item>
-      <el-form-item label="排序值: ">
-        <el-input v-model="form.name"></el-input>
-        <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
-      </el-form-item>
-      <el-form-item label="新增科室环境: ">
-        <el-upload
-          action="https://jsonplaceholder.typicode.com/posts/"
-          list-type="picture-card"
-          :on-preview="handlePictureCardPreview"
-          :on-remove="handleRemove">
-          <i class="el-icon-plus"></i>
-        </el-upload>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="eight = false">取 消</el-button>
-      <el-button type="primary" @click="eight = false">确 定</el-button>
-    </span>
-  </el-dialog>
-
-
 </div>
-
 </template>
 
-
 <script>
 export default {
   name: "usedlist",
@@ -332,12 +30,28 @@ export default {
       dialogVisible: false,      
       form: {
         name: ""
-      }
+      },
+      modelform:{
+        id:"",
+        title:"",
+        sort:"",
+      },
     };
-    
-   
-    
-  }
+  },
+   methods:{
+     getQueryNewModel(){
+         getQueryNewModel().then(response=>{
+            if(response.data.state ==1){
+             var model  = response.data.data.model;
+             this.modelform  = response.data.data.model;
+             console.log("返回新增模块数据",model);
+            }
+         });
+      }
+    },
+    created(){
+       this.getQueryNewModel();
+    }
 };
 </script>
 

src/scrm_pages/site/preview.vue

@@ -3,36 +3,155 @@
       <div class="position">
         <bread-crumb :crumbs='crumbs'></bread-crumb>
       </div>
-      <div class="app-container">
-            
+      <div class="app-container">           
             <!-- 新增 -->
             <el-row :gutter="24">
-               <el-col :span="6">
-                <div class="phone1">
+               <el-col :span="6">             
                  <el-tabs type="border-card">
                     <el-tab-pane label="首页">
-                        <el-tabs v-model="activeName" @tab-click="handleClick"  >
+                        <el-tabs v-model="activeName" @v-on:click="handleClick"  >
                             <el-tab-pane label="新增模块" name="first">
                                  <new-feature> </new-feature>
                             </el-tab-pane>
                             <el-tab-pane label="已使用" name="second">
-                                 <used-list></used-list>
+                                 <!-- <used-list></used-list> -->
+                                  <div class="used" v-for="item in this.modelform" :key="item.id">
+                                  <ul>
+                                   <li>
+                                    <span class="name">{{item.title}}</span>
+                                    <span class="icon"> 
+                                    <i class="el-icon-edit-outline" @click="dialogVisible = true"></i>
+                                    <i class="el-icon-delete" @click="deleteList = true"></i>
+                                   </span>
+                                   </li>
+                                 </ul>
+                                 </div>
                             </el-tab-pane>
                         </el-tabs>
                     </el-tab-pane>
+
                     <el-tab-pane label="联系我们">
                         <el-tabs v-model="activeName" @tab-click="handleClick">
                             <el-tab-pane label="新增模块" name="three">
                                 <add-contact></add-contact>
                             </el-tab-pane>
                             <el-tab-pane label="已使用" name="four">
-                                 <used-list></used-list>
+                              <div class="used" v-for="(item,index) in this.model" :key="item.id">
+                                 <ul>
+                                   <li>
+                                     <span class="name">{{item.title}}</span>
+                                     <span class="icon"> 
+                                     <i class="el-icon-edit-outline" @click="eidtmodel(item.id,item.mode_type,index)"></i>
+                                     <i class="el-icon-delete" @click="deletemodle(item.id,index)"></i>
+                                    </span>
+                                   </li>
+                                 </ul>
+                              </div>                                                           
                             </el-tab-pane>
                         </el-tabs>                        
                     </el-tab-pane>
                   </el-tabs>
-                </div>
                </el-col>
+                
+                <el-dialog
+                   title="编辑轮播图"
+                   :visible.sync="edialogVisible"
+                   width="30%"
+                 >
+                  <el-form ref="rotationform" :model="rotationform" label-width="90px" :rules="rules" :label-position="labelPosition">
+                 <el-form-item label="模块标题:" required prop="title">      
+                    <el-input v-model="rotationform.title" ></el-input>
+                 </el-form-item>
+                 <el-form-item label="排序值:" required prop="sort">
+                    <el-input v-model="rotationform.sort"></el-input>
+                    <p class="tips">请输入1-99的整数，数值越小，模块排序越靠前</p>
+                </el-form-item>
+                <el-form-item label="添加图片:" v-model="rotationform.rotationImages" required prop="rotationImages">
+                  <el-upload
+                      :data="rotationData"
+                       action="https://upload.qiniup.com"
+                       list-type="picture-card"
+                       :on-success="RotationchartSuccess"
+                       :before-upload="beforeRotationUpload"
+                     >
+                       <i slot="default" class="el-icon-plus"></i>
+                        <div slot="file" slot-scope="{file}">
+                       <img
+                             class="el-upload-list__item-thumbnail"
+                            :src="file.url"
+                       >
+                       <span class="el-upload-list__item-actions"> 
+                        <span
+                         v-if="!disabled"
+                         class="el-upload-list__item-delete"
+                        >
+                          <i class="el-icon-edit-outline"></i>
+                        </span> 
+                          <span
+                           v-if="!disabled"
+                          class="el-upload-list__item-delete"
+                        >
+                          <i class="el-icon-delete"></i>
+                         </span> 
+                       </span> 
+                       </div> 
+                      </el-upload>
+                   </el-form-item>
+                 </el-form>
+                  <span slot="footer" class="dialog-footer">
+                  <el-button @click="edialogVisible = false">取 消</el-button>
+                  <el-button type="primary" @click="edialogVisible = false">确 定</el-button>
+                  </span>
+                </el-dialog>
+
+                <!-- 编辑工作时间 -->
+                 <el-dialog
+                   title="提示"
+                   :visible.sync="dialogVisiblefour"
+                   width="30%"
+                 >
+                  <el-form label-width="90px" ref="workform" :model="workform" :rules="rules">
+                    <el-form-item label="模块标题:" required prop="title" >
+                       <el-input v-model="workform.title" ></el-input>
+                    </el-form-item>
+                    <el-form-item label="模块排序:" required prop="sort">
+                        <el-input v-model="workform.sort"></el-input>
+                    </el-form-item>
+                    <el-form-item label="工作时间:" required prop="worktime">
+                      <el-input type="textarea" v-model="workform.worktime">
+                     </el-input>  
+                    </el-form-item>
+                  </el-form>
+                  <span slot="footer" class="dialog-footer">
+                  <el-button @click="dialogVisiblefour = false">取 消</el-button>
+                  <el-button type="primary" @click="SaveWorkTime('workform')">确 定</el-button>
+                  </span>
+                </el-dialog>
+
+
+               <!-- 编辑乘车方式 -->
+                <el-dialog
+                   title="提示"
+                   :visible.sync="dialogVisiblefive"
+                   width="30%"
+                  >
+                  <el-form label-width="90px" ref="rideform" :model="rideform">
+                    <el-form-item label="模块标题:" >
+                       <el-input v-model="rideform.title" required prop="title" ></el-input>
+                    </el-form-item>
+                    <el-form-item label="模块排序:">
+                        <el-input v-model="rideform.sort" required prop="sort"></el-input>
+                    </el-form-item>
+                    <el-form-item label="乘车方式:">
+                      <el-input type="textarea" v-model="rideform.rideway" rquired prop="rideway">
+                     </el-input>  
+                    </el-form-item>
+                  </el-form>
+                  <span slot="footer" class="dialog-footer">
+                  <el-button @click="dialogVisiblefive = false">取 消</el-button>
+                  <el-button type="primary" @click="saverideway('rideform')">确 定</el-button>
+                  </span>
+                </el-dialog>
 
                <el-col :span="6">
                   <div class="phone">
@@ -201,8 +320,7 @@
                         <div class="swiper-container" id="swiper4">
                          <div class="swiper-wrapper" id="wrapper4">
                            <div class="swiper-slide">
-                                <div class="xiangqing" v-html="officeform.introduction" v-show="keshow">
-                                   
+                                <div class="xiangqing" v-html="officeform.introduction" v-show="keshow">                                
                                 </div>  
                            </div>
                          </div>
@@ -210,17 +328,42 @@
                  </div>   
                </el-col>
               
-               <el-col :span="6">
-                  <div class="qrcode">
-                     <img src="static/images/u169.png">
-                 </div> 
+                 <!-- <el-col :span="5">
+                  <div class="done">
+                     <img src="static/images/u642.png">
+                  </div>
+                </el-col> -->
+
+                <!-- <el-col :span="5">
+                <div class="dfont">
+                  <span>分享管理</span>
+                </div>
+                </el-col>
+
+                <el-col :span="5">
+                  <div class="dtwo">
+                     <img src="static/images/u645.png">
+                  </div>
+                </el-col>
+                  
+                <el-col :span="5">
+                 <div class="dfon">
+                  <span>系统设置</span>
+                </div>
+                 </el-col> -->
+                 
+               <el-col :span="5">
+                 <div id="qrcode" class="qrcode"></div>
                </el-col>
 
                <el-col :span="6">
                  <div class="share">
                   <div class="share2"> 
-                    <span class="share3">分享管理</span>      
+                    <span class="share3">导航设置</span>      
                   </div> 
+                  <div class="addbutton">
+                     <el-button>添加</el-button>
+                  </div>
                  </div>  
                </el-col>
             </el-row>                   
@@ -233,14 +376,18 @@ import BreadCrumb from "../components/bread-crumb";
 import NewFeature from "./components/new-feature";
 import UsedList from "./components/used-list";
 import AddContact from "./components/add-contact";
+import { getToken } from '@/api/qiniu'
+import { getFileExtension} from '@/utils/tools'
 import { Swipe, SwipeItem } from 'mint-ui';
 import Vue from 'vue';
 import 'mint-ui/lib/style.css';
-import { GetRationImages,GetHospitalInfo,GetOfficeInfo,GetDoctorInfo,GetOffEnvironment } from '@/api/site/site'  
+import { GetRationImages,GetHospitalInfo,GetOfficeInfo,GetDoctorInfo,GetOffEnvironment,GetUserdModel,eidtmodel,editRideWay,SaveWorkTime,saverideway, getQueryNewModel } from '@/api/site/site'  
 import { IncomingMessage } from 'http';
 import { isIP } from 'net';
 import Swiper from "swiper";
 import vuedraggable from 'vuedraggable';
+import { constants } from 'crypto';
+import QRCode from 'qrcodejs2';
 Vue.component(Swipe.name, Swipe);
 Vue.component(SwipeItem.name, SwipeItem);
 export default {
@@ -270,6 +417,10 @@ export default {
       shows:false,
       keshow:false,
       showimages:true,
+      edialogVisible:false,
+      dialogVisibletwo:false,
+      dialogVisiblefour:false,
+      dialogVisiblefive:false,
       ellipsis:'',
        ops: {
           vuescroll: {},
@@ -283,8 +434,16 @@ export default {
             background: 'red',
           }
         },
+        rules: {
+          title: [{required: true, message: "请填写模块标题",},],
+          sort: [{required: true,message:"请填写排序值"}],       
+          worktime:[{required:true,message:"请填写工作时间"}],
+          rideway:[{required:true,message:"请填写乘车方式"}]   
+      },
         rotationImages:[],
         keEnvironmentImages:[],
+        qiniuDomain: 'https://images.shengws.com/',
+        rotationData: { token:'',key: '' },
         hispitalform:{
           title:"",
           sort:"",
@@ -301,11 +460,88 @@ export default {
        docpositional:"",
        docintroduction:"",
       },
-      doctorInfos:[],
+      rotationform:{
+        title:"",
+        sort:"",
+        rotationImages:[],
+      },
+      workform:{
+        title:"",
+        sort:"",
+        worktime:"",
+      },
+      rideform:{
+        title:"",
+        sort:"",
+        rideway:"",
+      },
+      doctorInfos:[],    
+      model:{
+         id:"",
+         title:"",
+         sort:"",
+      },
+      modelform:{
+        id:"",
+        title:"",
+        sort:"",
+      }
     };
   },
 
   methods:{   
+         //轮播图
+      RotationchartSuccess(res,file,filelist){         
+         this.rotationform.rotationImages.push(this.qiniuDomain + res.url);  
+         console.log("双层地址",file.url)       
+         console.log("联系我们轮播图地址",this.rotationform.rotationImages); 
+      },
+         beforeRotationUpload(file){
+         console.log("尺寸",file.size)
+         const isJPG = file.type === 'image/jpeg';
+         const isLt2M = file.size / 1024 / 1024 < 2;
+       
+        if (!isJPG) {
+          this.$message.error('上传头像图片只能是 JPG 格式!');
+        }
+        if (!isLt2M) {
+          this.$message.error('上传头像图片大小不能超过 2MB!');
+        }
+      
+         var date = new Date()
+            var ext = getFileExtension(file.name)
+            var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token= response.data.data.uptoken
+                    console.log("联系我们轮播图token是什么?",token)
+                    _self._data.rotationData.token = token;
+                    _self._data.rotationData.key = key;
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)
+                })
+            })
+          return isJPG && isLt2M;
+      },
+      //添加轮播图
+      addRotationUpload(formName){
+        this.$refs[formName].validate((valid)=>{
+          if(valid){
+            addRotationUpload(this.rotationform).then(response=>{
+               if(response.data.state==1){
+                 var connecmodel = response.data.data.connecmodel;
+                 this.slideshow = false;
+                 console.log("返回值",connecmodel);
+               }
+            });   
+          }
+        })       
+      },
+
+      
+
     more(){
       this.show = false;
       this.shows = true;
@@ -327,6 +563,19 @@ export default {
     handleClick(){
 
     },
+    
+     //查询已使用的模块
+     GetUserdModel(){
+        GetUserdModel(this.model).then(response=>{
+             if(response.data.state==1){
+                var title = [];
+                this.model = response.data.data.model;           
+               console.log("模型",this.model);
+             }
+        })
+     },
+
+
     //获取轮播图
       GetRationImages(){
         GetRationImages().then(response=>{
@@ -373,7 +622,7 @@ export default {
            var doctor = response.data.data.doctor;
            this.doctorInfos = response.data.data.doctor;
            this.doctorInfo = response.data,data.doctor
-           console.log("获取名医介绍",this.doctorInfos);
+          // console.log("获取名医介绍",this.doctorInfos);
         }
       })
     },
@@ -392,7 +641,88 @@ export default {
             this.keEnvironmentImages =  Images;
          }
        })
-    }
+    },
+     eidtmodel(id,modetype,index){
+       if(modetype == 1){
+           this.edialogVisible = true;
+       
+       }
+       if(modetype == 4){
+          this.dialogVisiblefour = true;
+          eidtmodel(id).then(response=>{
+             if(response.data.state==1){
+               var connecmodel = response.data.data.connecmodel;
+               this.workform = response.data.data.connecmodel;
+               console.log("返回数据",connecmodel);
+             }
+         });
+       }
+       if(modetype == 5){
+         this.dialogVisiblefive = true;
+         editRideWay(id).then(response=>{
+           if(response.data.state == 1){
+             var connecmodel = response.data.data.connecmodel;
+             this.rideform = response.data.data.connecmodel;
+             console.log("乘车方式返回数据",connecmodel);
+           }
+         })
+       }   
+     },
+     deletemodle(id){
+       alert(id);
+     },
+
+     SaveWorkTime(formName){
+       this.$refs[formName].validate((valid)=>{
+         if(valid){
+           SaveWorkTime(this.workform.id,this.workform).then(response=>{
+                 if(response.data.state == 1){
+                    var connecmodel = response.data.data.connecmodel;
+                    console.log("返回数据",connecmodel);
+                    this.dialogVisiblefour = false;
+                    this.$message.success('数据保存成功');                  
+                 }
+           })
+         }
+       })
+     },
+
+     saverideway(formName){
+       this.$refs[formName].validate((valid)=>{
+         if(valid){
+           saverideway(this.rideform.id,this.rideform).then(response=>{
+              if(response.data.state ==1 ){
+                 var ridewaymodel = response.data.data.ridewaymodel;
+                 console.log("返回数据",ridewaymodel);
+                 this.dialogVisiblefive = false;
+                 this.$message.success("数据保存成功");
+              }
+           })        
+         }
+       })
+     },
+
+      qrcode () {
+      let qrcode = new QRCode('qrcode', {
+        width: 100,
+        height: 100, // 高度
+        text: '56663159' // 二维码内容
+        // render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
+        // background: '#f0f'
+        // foreground: '#ff0'
+      })
+      console.log(qrcode)
+    },
+
+     getQueryNewModel(){
+         getQueryNewModel(this.modelform).then(response=>{
+            if(response.data.state ==1){
+             var model  = response.data.data.model;
+             this.modelform  = response.data.data.model;
+             console.log("返回新增模块数据",model);
+            }
+         });
+      }
   },
   created(){
     this.GetRationImages();
@@ -400,23 +730,26 @@ export default {
     this.GetOfficeInfo();
     this.GetDoctorInfo();
     this.GetOffEnvironment();
-  },
-  mounted(){
-          
-             var swiper = new Swiper('#swiper1', {
-                 direction: 'vertical',
-                 slidesPerView: "auto",
-                 spaceBetween:5,
-                loopAdditionalSlides:10,
-                centeredSlides: false, // active slide 居中
-                observer:true,//动态加载图片
-                observeParents:true,
-                paginationClickable: true,
-                pagination: {
-                    el: '.swiper-pagination',
-                    clickable: true,
-                },
-            });
+    this.GetUserdModel();
+    this.getQueryNewModel();
+    },
+ 
+    mounted(){
+      this.qrcode();
+      var swiper = new Swiper('#swiper1', {
+          direction: 'vertical',
+         slidesPerView: "auto",
+         spaceBetween:5,
+         loopAdditionalSlides:10,
+        centeredSlides: false, // active slide 居中
+        observer:true,//动态加载图片
+        observeParents:true,
+        paginationClickable: true,
+        pagination: {
+            el: '.swiper-pagination',
+           clickable: true,
+            },
+          });
            
             var mySwiper = new Swiper('#swiper2', {
                 direction:"horizontal",
@@ -484,6 +817,60 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 
+
+     .done{
+       position: absolute;
+       width: 50px;
+       height: 50px;
+      // border: solid 1px red;
+       margin-top: 600px;
+     }
+     .dfont{
+       position: absolute;
+       width: 70px;
+       height: 20px;
+     //  border:solid 1px red;
+       margin-top: 615px;
+       margin-left: 920px;
+     }
+      .dfon{
+       position: absolute;
+       width: 70px;
+       height: 20px;
+     //  border:solid 1px red;
+       margin-top: 675px;
+       margin-left: 920px;
+     }
+
+     .dtwo{
+       position: absolute;
+       width:50px;
+       height: 50px;
+    //   border:solid 1px red;
+       margin-top: 670px;
+     }
+
+
+     .used {
+       ul {
+        li {
+         height: 44px;
+         line-height: 44px;
+         font-size: 14px;
+         display: flex;
+         color: #606266;      
+         align-items: center;
+         justify-content: space-between;
+         border-bottom: 1px solid #e4e7ed;
+       i {
+        font-size: 19px;
+        margin: 0 6px;
+        cursor: pointer;
+      }
+    }
+  }
+}
+   
      .el-row {
        margin-bottom: 20px;
        &:last-child {
@@ -498,7 +885,7 @@ export default {
      width: 180px;
      height: 180px;
    //  border: solid 1px red;
-     margin-left: 120px;
+     margin-left: 90px;
      margin-top: 30px;
    }
    .share{
@@ -507,7 +894,7 @@ export default {
      height: 720px;
      border: solid 1px black;
      margin-top: 30px;
-   //  margin-left: 1100px;
+
    }
 
    .share2{
@@ -879,19 +1266,11 @@ export default {
    }
    #wrapper4{
      width: 50%;
-   }
-
-  .phone1{
-    float: left;
-    width: 350px;
-    margin-top: 20px;
-  }
- 
-  
+   }  
 .phone{
    margin-top: 5px;
    position: relative;
-   margin-left: 70px;
+   margin-left: 40px;
    float: left;
    width: 380px;
    height: 750px;
@@ -1341,6 +1720,13 @@ export default {
      color: #FF6600;
    }
 
+   .addbutton{
+     font-size: 14px;
+     color: #FF6600;
+     margin-top: 100px;
+     margin-left: 150px;
+   }
+
 </style>