页面整合

package-lock.json

@@ -132,6 +132,11 @@
       "resolved": "https://registry.npmjs.org/@types/spark-md5/-/spark-md5-3.0.1.tgz",
       "integrity": "sha512-sjiWYRmuuFZMo/DdysQe/yX6x40Q0WZXsNgvbUIg7gUaQYNoXx4CqWq27rDikQyc+0JKkqsoNiIBAA0GUxbUXw=="
     },
+    "@types/swiper": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.3.tgz",
+      "integrity": "sha512-z4RRt3/4ERHizeU8qIKmUsUpmoXFeEAJu0WLBZtjoVczaCnNL0KYQX0aBFZNhEu3bSNlMfWbZSHrg5gqAIucNA=="
+    },
     "JSV": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
@@ -3435,6 +3440,14 @@
         "entities": "^1.1.1"
       }
     },
+    "dom7": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
+      "integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
+      "requires": {
+        "ssr-window": "^1.0.1"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -3542,9 +3555,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.9.1.tgz",
-      "integrity": "sha512-w8vrCW5Q+2gfDzs19MUrFdnCy5IjF98rs7DBsKnJQKFfZJZiZ2O+YAsSp/EuPrCm3P/2o/N3MtvZ34VANel13g==",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.10.1.tgz",
+      "integrity": "sha512-V3WMDoVd1rOT+UI4xasvS8hmUkmc0ezXRuLzlTznBD0bN6jXAiGOeCtmYjj8GFN3lpGNeKyQ/8LCAFuAbxaEww==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -13113,6 +13126,11 @@
         "tweetnacl": "~0.14.0"
       }
     },
+    "ssr-window": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz",
+      "integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg=="
+    },
     "ssri": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
@@ -13619,6 +13637,15 @@
         }
       }
     },
+    "swiper": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-4.5.0.tgz",
+      "integrity": "sha512-jRCd/CGet9kaHwthHdd/sL/YU8CI157PWLyItnIcn/o/jP4haVky3zTF6f9F3JDpmQIw7jdWihISiYx0/oTHsg==",
+      "requires": {
+        "dom7": "^2.1.3",
+        "ssr-window": "^1.0.1"
+      }
+    },
     "symbol-observable": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
@@ -14360,17 +14387,17 @@
       "dev": true
     },
     "vuedraggable": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.20.0.tgz",
-      "integrity": "sha512-mrSWGkzY40nkgLDuuoxrs6/0u+A7VwXtQRruLQYOVjwd8HcT3BZatRvzw4qVCwJczsAYPbaMubkGOEtzDOzhsQ==",
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.0.tgz",
+      "integrity": "sha512-RgdH16k43WNoxyRcv/OarB/DZh9SY5TYthk9TS4YiHXpelD1DytEG0phLAXiXx5EhsmdH8ltSWxklGa4g1WTCw==",
       "requires": {
-        "sortablejs": "^1.8.4"
+        "sortablejs": "^1.9.0"
       },
       "dependencies": {
         "sortablejs": {
-          "version": "1.8.4",
-          "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.8.4.tgz",
-          "integrity": "sha512-Brqnzelu1AhFuc0Fn3N/qFex1tlIiuQIUsfu2J8luJ4cRgXYkWrByxa+y5mWEBlj8A0YoABukflIJwvHyrwJ6Q=="
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.9.0.tgz",
+          "integrity": "sha512-Ot6bYJ6PoqPmpsqQYXjn1+RKrY2NWQvQt/o4jfd/UYwVWndyO5EPO8YHbnm5HIykf8ENsm4JUrdAvolPT86yYA=="
         }
       }
     },

package.json

@@ -38,6 +38,7 @@
   "dependencies": {
     "@types/qrcode": "^1.3.3",
     "@types/spark-md5": "^3.0.1",
+    "@types/swiper": "^4.4.3",
     "ajv": "^6.5.3",
     "axios": "0.17.1",
     "clipboard": "1.7.1",
@@ -47,7 +48,7 @@
     "driver.js": "0.5.2",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "^2.9.1",
+    "element-ui": "^2.10.1",
     "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
@@ -66,6 +67,7 @@
     "simplemde": "1.11.2",
     "sortablejs": "1.7.0",
     "spark-md5": "^3.0.0",
+    "swiper": "^4.5.0",
     "vue": "2.5.16",
     "vue-count-to": "1.0.13",
     "vue-i18n": "7.3.2",
@@ -73,7 +75,7 @@
     "vue-multiselect": "2.0.8",
     "vue-router": "3.0.1",
     "vue-splitpane": "1.0.2",
-    "vuedraggable": "^2.16.0",
+    "vuedraggable": "^2.23.0",
     "vuescroll": "^4.13.1",
     "vuex": "3.0.1",
     "webim-tencent": "^1.0.2",

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

@@ -4,31 +4,31 @@
             <ul >
                 <li @click="slideshow = true">
                     <span>
-                        <img :src="new1" alt="">
+                        <img :src="new1" alt="" style="width:40px;height:40px">
                         <p>轮播图</p>  
                     </span>
                 </li>
                 <li @click="address = true">
                     <span>
-                        <img :src="new1" alt="">
+                        <img :src="new2" alt="" style="width:40px;height:40px">
                         <p>医院地址</p>  
                     </span>
                 </li>
                 <li @click="contact = true">
                     <span>
-                        <img :src="new1" alt="">
+                        <img :src="new3" alt="" style="width:40px;height:40px">
                         <p>联系方式</p>  
                     </span>
                 </li>
                 <li @click="time = true">
                     <span>
-                        <img :src="new1" alt="">
+                        <img :src="new4" alt="" style="width:40px;height:40px">
                         <p>工作时间</p>  
                     </span>
                 </li>
                 <li @click="type = true">
                     <span>
-                        <img :src="new1" alt="">
+                        <img :src="new1" alt="" style="width:40px;height:40px">
                         <p>乘车方式</p>  
                     </span>
                 </li>
@@ -246,7 +246,12 @@ export default {
       addLink:false,
       time:false,
       type:false,
-      new1: require("../../../assets/preview/new-1.png"),
+      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"),
+      
       form: {
         name: ""
       }

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

@@ -4,49 +4,49 @@
       <ul >
           <li @click="dialogVisible = true">
               <span>
-                <img :src="new1" alt="">
+                <img :src="new1" alt="" style="width:40px;height:40px">
                 <p>轮播图</p>  
               </span>
           </li>
           <li @click="two = true">
             <span>
-                <img :src="new1" alt="">
+                <img :src="new2" alt="" style="width:40px;height:40px">
                 <p>医院介绍</p>  
               </span>  
           </li>
           <li @click="three = true">
             <span>
-                <img :src="new1" alt="">
+                <img :src="new3" alt="" style="width:40px;height:40px">
                 <p>科室介绍</p>  
               </span>  
           </li>
           <li @click="four = true">
             <span>
-                <img :src="new1" alt="">
+                <img :src="new4" alt="" style="width:40px;height:40px">
                 <p>名医介绍</p>  
               </span>  
           </li>
           <li @click="five = true">
             <span>
-                <img :src="new1" alt="">
+                <img :src="new5" alt="" style="width:40px;height:40px">
                 <p class="title">科室环境</p>  
               </span>  
           </li>
           <li @click="six = true">
             <span>
-                <img :src="new1" alt="">
+                <img :src="new6" alt="" style="width:40px;height:40px">
                 <p class="title">文章列表</p>  
               </span>  
           </li>
           <li @click="seven = true">
             <span>
-                <img :src="new1" alt="">
+                <img :src="new7" alt="" style="width:40px;height:40px">
                 <p class="title">活动列表</p>  
               </span>  
           </li>
-          <li @click="eight = true">
+          <li @click="eight = true" >
             <span>
-                <img :src="new1" alt="">
+                <img :src="new8" alt="" style="width:40px;height:40px">
                 <p class="title">魔方导航</p>  
               </span>  
           </li>
@@ -459,7 +459,14 @@ export default {
   props: ['image', 'clearList'],
   data() {
     return {
-      new1: require("../../../assets/preview/new-1.png"),
+      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"),
+      new6: require("../../../assets/preview/u504.png"),
+      new7: require("../../../assets/preview/u508.png"),
+      new8: require("../../../assets/preview/u512.png"),
       dialogVisible: false,
       dialogRotationVisible: false,
       two: false,

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

@@ -9,7 +9,7 @@
                     <i class="el-icon-delete" @click="deleteList = true"></i>
                 </span>
             </li>
-            <li>
+            <!-- <li>
                 <span class="name">魔方导航</span>
                 <span class="icon"> 
                     <i class="el-icon-edit-outline" @click="eight = true"></i>
@@ -57,7 +57,7 @@
                     <i class="el-icon-edit-outline" @click="seven = true"></i>
                     <i class="el-icon-delete" @click="deleteList = true"></i>
                 </span>
-            </li>
+            </li> -->
         </ul>
     </div>
 
@@ -334,6 +334,9 @@ export default {
         name: ""
       }
     };
+    
+   
+    
   }
 };
 </script>