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

src/scrm_pages/contact/contact.vue

@@ -55,10 +55,9 @@ export default {
         pagination: {
           el: ".swiper-pagination"
         },
-        // autoplay: {
-        //   disableOnInteraction: false
-        // }
-        autoplay: true
+        autoplay: {
+          disableOnInteraction: false
+        }
       });
     },
     getOrderModel(orgid) {
@@ -87,6 +86,8 @@ export default {
     console.log("联系我们orgid是多少", orgid);
     this.getOrderModel(orgid);
     this.getAllConnecWay(orgid);
+  },
+  mounted() {
     this.initSwiper();
   },
   updated() {

src/scrm_pages/doctorIntroduction/doctorIntroduction.vue

@@ -6,11 +6,8 @@
           <img :src="doctors.dochead" style="width:100%;height:100%" alt />
         </div>
         <div class="detail">
-          <p class="detailTitle">
-            {{doctors.doc_name}}
-            <span>{{doctors.doc_postion}}</span>
-          </p>
-          <p class="detailMessage" v-html="doctors.docintroduction"></p>
+          <p class="detailTitle">{{doctors.doc_name}}</p>
+          <p class="detailMessage">{{doctors.doc_postion}}</p>
         </div>
       </div>
       <!-- <div class="good">