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

package-lock.json

     },
     "@babel/runtime": {
       "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
-      "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
+      "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.6.3.tgz?cache=0&sync_timestamp=1570565315026&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.6.3.tgz",
+      "integrity": "sha1-k1Eix0xz0iQMr9Mt21/Cps01zx8=",
       "requires": {
         "regenerator-runtime": "^0.13.2"
       },
       "dependencies": {
         "regenerator-runtime": {
           "version": "0.13.3",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-          "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.3.tgz",
+          "integrity": "sha1-fPanfY9cb2Drc8X8GVWyzrAea/U="
         }
       }
     },
     },
     "@vant/icons": {
       "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.1.15.tgz",
-      "integrity": "sha512-96tbJotfofrKpOrUGWKkiGLJsCFc0OX5pikWLW5yarD+EMhi0zCrQSDb95xGrp/HETAFm+nSTQu2e1zGsWN/7A=="
+      "resolved": "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.1.15.tgz",
+      "integrity": "sha1-U8UaziHpmSv+6y4a2QlPv2UG0RY="
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
-      "integrity": "sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw=="
+      "resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
+      "integrity": "sha1-BI/leZWNpAj7eosqPsBQtQpmEEA="
     },
     "JSV": {
       "version": "4.0.2",
     },
     "vant": {
       "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.2.10.tgz",
-      "integrity": "sha512-O8HhrwMkqwA3fYFDwHLxFNh7ckAafao+4gF0hIdwSjypvEdbd6jgtPep0k3Z+CzPXkvPNUV5XCwR3fSH0AIgKw==",
+      "resolved": "https://registry.npm.taobao.org/vant/download/vant-2.2.10.tgz",
+      "integrity": "sha1-rAqkPn8n5WpyCXdPh7h62TYIO1E=",
       "requires": {
         "@babel/runtime": "7.x",
         "@vant/icons": "1.1.15",
       "dependencies": {
         "vue-lazyload": {
           "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
-          "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
+          "resolved": "https://registry.npm.taobao.org/vue-lazyload/download/vue-lazyload-1.2.3.tgz?cache=0&sync_timestamp=1568801961628&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-lazyload%2Fdownload%2Fvue-lazyload-1.2.3.tgz",
+          "integrity": "sha1-kB+ewVx+bKeHgaK65KNDaGve2yw="
         }
       }
     },

src/router/index.js

 
   {
     path: "/",
-    component: () => import("@/scrm_pages/newsDetail/newsDetail")
+    component: () => import("@/scrm_pages/contact/contactus")
   },
 
   // 医院介绍详情路由

src/scrm_pages/activity/activity.vue

           </div>
         </div>
         <div class="detail" v-else-if="it.title == ''">
-            <div class="noImg">
-                  <img src="../../../static/images/none2.png" alt />
-            </div>
+          <div class="noImg">
+            <img src="../../../static/images/none2.png" alt />
+          </div>
         </div>
       </div>
-     
     </div>
   </div>
 </template>
     //     }
     //   });
     // }
-    singleActivitInfo(id){
-      window.location.href = "http://wx.kuyicloud.com/weixin/activity/"+id;
+    singleActivitInfo(id) {
+      window.location.href = "http://wx.kuyicloud.com/weixin/activity/" + id;
     }
   },
   created() {
       color: rgba(155, 155, 155, 1);
       line-height: 1.125rem;
     }
-     .noImg {
-    width: 3.125rem;
-    height: 3.125rem;
-    margin: 1.25rem auto 0;
-    img {
+    .noImg {
       width: 3.125rem;
       height: 3.125rem;
+      margin: 1.25rem auto 0;
+      img {
+        width: 3.125rem;
+        height: 3.125rem;
+      }
     }
   }
-  }
 }
 .detailBox {
   margin-top: 0.625rem;

src/scrm_pages/contact/contactus.vue

 <template>
   <div class="page_home">
+<<<<<<< .mine
+    <!-- <iframe  :src = this.customUrl width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe> -->
+    <div>
+      <div v-for="item in this.ordmodel" :key="item.id">
+=======
 
       <div v-for="item in this.ordmodel" :key="item.id" class="modeone"> 
-       <div class="focusImg" v-if="item.mode_type == 1">
-        <div class="swiper-container">
-          <div class="swiper-wrapper">
-            <div class="swiper-slide" v-for="it in item.Conrotation" :key="it.id">
-              <img class="imgtwo" :src="it.images" />
+
+>>>>>>> .theirs
+        <div class="focusImg" v-if="item.mode_type == 1">
+          <div class="swiper-container">
+            <div class="swiper-wrapper">
+              <div class="swiper-slide" v-for="it in item.Conrotation" :key="it.id">
+                <img class="imgtwo" :src="it.images" />
+              </div>
             </div>
+            <!-- 如果需要分页器 -->
+            <div class="swiper-pagination"></div>
           </div>
+<<<<<<< .mine
+
+
+=======
   
           <!-- <div class="swiper-pagination"></div> -->
+>>>>>>> .theirs
         </div>
+<<<<<<< .mine
+        <!-- <div class="detail"> -->
+        <div class="row one detail" v-if="item.mode_type == 2">
+          <p class="title">{{item.title}}:</p>
+          <p class="msg">{{item.Hosaddress.address}}</p>
+
+
+
+
+
+
+
+=======
       </div>
       
       <div class="row" v-if="item.mode_type == 2">
           <p class="title">{{it.title}}:</p>
           <p class="msg">{{it.content}}</p>
           <br />
+>>>>>>> .theirs
+        </div>
+        <div class="row" v-if="item.mode_type == 3">
+          <div v-for="it in Connectways" :key="it.id">
+            <p class="title">{{it.title}}:</p>
+            <p class="msg">{{it.content}}</p>
+            <br />
+          </div>
+        </div>
+        <div class="row" v-if="item.mode_type == 4">
+          <p class="title">{{item.title}}:</p>
+          <p class="msg">{{item.Worktime.worktime}}</p>
+        </div>
+        <div class="row one" v-if="item.mode_type == 5">
+          <p class="title">{{item.title}}:</p>
+          <p class="msg">{{item.Rideway.ride_way}}</p>
         </div>
       </div>
+<<<<<<< .mine
+
+
+
+
+
+
+
+
+=======
       <div class="row" v-if="item.mode_type == 4">
         <p class="title">{{item.title}}:</p>
         <p class="msg">{{item.Worktime.worktime}}</p>
         <p class="title">{{item.title}}:</p>
         <p class="msg">{{item.Rideway.ride_way}}</p>
       </div>
+>>>>>>> .theirs
     </div>
 
-
     <!-- tab切换 -->
     <div class="tabs">
       <ul class="tabList">
           class="tabOne"
           v-for="item in this.navigationdata"
           :key="item.id"
-          @click="CallPhone(item.linktype,item.navaddress,item.user_org_id)">
+          @click="CallPhone(item.linktype,item.navaddress,item.user_org_id)"
+        >
           <img :src="item.nonavimages" alt />
           <span>{{item.navtitle}}</span>
         </li>
 <script>
 import Swiper from "swiper";
 import Vue from "vue";
-import { Swipe, SwipeItem} from "mint-ui";
+import { Swipe, SwipeItem } from "mint-ui";
 import "mint-ui/lib/style.css";
-import { getDefalutNavigationData,getOrderModel, getAllConnecWay } from "@/api/micro/micro";
+import {
+  getDefalutNavigationData,
+  getOrderModel,
+  getAllConnecWay
+} from "@/api/micro/micro";
 export default {
   data() {
     return {
       navigationdata: [],
-       ordmodel: [],
-      Connectways: [],
+      ordmodel: [],
+      Connectways: []
     };
   },
   methods: {
-     getDefalutNavigationData(orgid) {
+    getDefalutNavigationData(orgid) {
       getDefalutNavigationData(orgid).then(response => {
         if (response.data.state == 1) {
           var navigation = response.data.data.navigation;
           for (let index = 0; index < navigation.length; index++) {
+<<<<<<< .mine
+            navigation[1].nonavimages =
+              "https://images.shengws.com/2124_o_1571990749565.png";
+=======
               navigation[3].nonavimages = "https://images.shengws.com/2124_o_1571990749565.png";
 
+>>>>>>> .theirs
           }
           console.log("navigation是什么", navigation);
           this.navigationdata = navigation;
         }
       });
     },
-      initSwiper() {
+    initSwiper() {
       var mySwiper1 = new Swiper(".swiper-container", {
         loop: true, // 循环模式选项
         pagination: {
         }
       });
     },
-      CallPhone(linktype, address,orgid) {
-      console.log("orgid是什么啊",orgid)
-      console.log("linktype",linktype)
-      if(linktype == "1"){
-          this.$router.push({
-              path:"/microHome",
-              query:{
-                  orgid:orgid,
-              }
-          })
-     }
+    CallPhone(linktype, address, orgid) {
+      console.log("orgid是什么啊", orgid);
+      console.log("linktype", linktype);
+      if (linktype == "1") {
+        this.$router.push({
+          path: "/microHome",
+          query: {
+            orgid: orgid
+          }
+        });
+      }
       if (linktype == "2") {
         // window.location.href = address;
         this.$router.push({
           query: {
             orgid: orgid
           }
-         });
+        });
       }
       if (linktype == "3") {
         window.location.href = "tel://" + address + "";
       }
+<<<<<<< .mine
+      if (linktype == "4") {
+        // window.location.href = address;
+        this.$router.push({
+          path: "/custom",
+          query: {
+            orgid: orgid
+          }
+        });
+      }
+=======
       // if (linktype == "4") {
       //   // window.location.href = address;
       //   this.$router.push({
       //     }
       //   })
       // }
-    },
+>>>>>>> .theirs
+    }
   },
-   created(){
+  created() {
     const orgid = this.$route.query.orgid;
-       console.log("我的", orgid);
-     this.url = orgid;
+    console.log("我的", orgid);
+    this.url = orgid;
     this.getDefalutNavigationData(orgid);
-     this.getOrderModel(orgid);
-     this.getAllConnecWay(orgid);
+    this.getOrderModel(orgid);
+    this.getAllConnecWay(orgid);
     this.initSwiper();
   },
-updated() {
+  updated() {
     this.initSwiper();
   }
- };
+};
 </script>
 
 <style lang="scss" scoped>
 @import "../../assets/styles/mixin.scss";
+<<<<<<< .mine
+
+.page_home {
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow-y: auto;
+  > div:first-child {
+    flex: 1;
+    overflow: auto;
+  }
+  > div:first-child::-webkit-scrollbar {
+    width: 0;
+  }
+  // border:solid 1px red;
+}
+// .bugone{
+//   border: solid 1px red;
+// }
+
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
 .tabs {
   @include border-top;
   width: 100%;
 .page_home {
   overflow: hidden;
   height: 100%;
+<<<<<<< .mine
+  // > div:nth-of-type(2) {
+  //   min-height: 5.125rem;
+  // }
+
+
+
+
+
+
+=======
   display:flex;
   flex-direction: column;
   >div:first-child{
   > div:nth-of-type(2) {
     min-height: 3.0rem;
   }
+>>>>>>> .theirs
   > div:nth-of-type(3) {
     min-height: 3.125rem;
   } 

src/scrm_pages/contactus/contactus.vue

 <template>
+<<<<<<< .mine
+  <div class="page_contactus">
+    <!-- 联系我们页面 -->
+    <div class="scroll" style="padding:15px 4%;">
+      <div v-for="item in this.ordmodel" :key="item.id">
+        <div v-if="item.mode_type == 1" class="contractmodeone">
+          <mt-swipe :auto="4000" class="swipertwo">
+            <mt-swipe-item v-for="it in item.Conrotation" :key="it.id">
+              <img :src="it.images" style="width:100%;height:100%" />
+            </mt-swipe-item>
+          </mt-swipe>
+        </div>
+
+=======
     <div>
           <!-- 联系我们页面 -->
          <div class="scroll"  style="padding:15px 4%;">
                              </mt-swipe-item>
                         </mt-swipe>
                      </div>
+>>>>>>> .theirs
 
-                     <div v-if="item.mode_type == 2" class="oldmodetwo">
-                          <div><span>{{item.title}}:&nbsp;&nbsp;{{item.Hosaddress.address}}</span></div>
-                     </div>
-                     <div  v-if="item.mode_type == 3">
-                            <div class="oldmodeone" v-for="it in Connectways" :key="it.id">
-                                  <div class="oldmodefive">
-                                      <span>{{it.title}}:&nbsp;&nbsp;{{it.content}}</span>
-                                 </div>
-                             <div class="oldmodesix" @click="tallPhone(it.content)">
-                                  <img src="static/images/u318.png" style="width 100%;height:100%">
-                             </div>
-                            </div>
-                     </div>
-                      <div class="oldmodefour" v-if="item.mode_type == 4">
-                          <div><span>{{item.title}}:&nbsp;&nbsp;{{item.Worktime.worktime}}</span></div>
-                          </div>
-                             <div class="oldmodethree" v-if="item.mode_type == 5">
-                               <div><span>{{item.title}}:&nbsp;&nbsp;{{item.Rideway.ride_way}}</span></div>
-                             </div>
-                        </div>
-                 </div>
+        <div v-if="item.mode_type == 2" class="oldmodetwo">
+          <div>
+            <span>{{item.title}}:&nbsp;&nbsp;{{item.Hosaddress.address}}</span>
+          </div>
+        </div>
+        <div v-if="item.mode_type == 3">
+          <div class="oldmodeone" v-for="it in Connectways" :key="it.id">
+            <div class="oldmodefive">
+              <span>{{it.title}}:&nbsp;&nbsp;{{it.content}}</span>
+            </div>
+            <div class="oldmodesix" @click="tallPhone(it.content)">
+              <img src="static/images/u318.png" style="width 100%;height:100%" />
+            </div>
+          </div>
+        </div>
+        <div class="oldmodefour" v-if="item.mode_type == 4">
+          <div>
+            <span>{{item.title}}:&nbsp;&nbsp;{{item.Worktime.worktime}}</span>
           </div>
+        </div>
+        <div class="oldmodethree" v-if="item.mode_type == 5">
+          <div>
+            <span>{{item.title}}:&nbsp;&nbsp;{{item.Rideway.ride_way}}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-     import Swiper from "swiper";
-     import Vue from 'vue';
-     import { Swipe, SwipeItem } from 'mint-ui';
-     import 'mint-ui/lib/style.css'
-     import { getOrderModel,getAllConnecWay } from "@/api/micro/micro"
-    export default {
-        name: "contactus",
-        data(){
-           return{
-             ordmodel:[],
-             Connectways:[],
-           }
-        },
-        methods:{
-           getOrderModel(orgid){
-               getOrderModel(orgid).then(response=>{
-                 if(response.data.state == 1){
-                   var ordmodel = response.data.data.ordmodel;
-                   console.log("ordmodel是什么",ordmodel)
-                   this.ordmodel = response.data.data.ordmodel;
-                 }
-               })
-           },
-          getAllConnecWay(orgid){
-             getAllConnecWay(orgid).then(response=>{
-                 if(response.data.state == 1){
-                    var connect = response.data.data.connect;
-                    this.Connectways = connect;
-                 }
-             })
-           },
-           tallPhone(content){
-               window.location.href = 'tel://'+content+'';
-           }
-        },
-        created(){
-           const orgid = this.$route.query.orgid;
-          console.log("联系我们orgid是多少",orgid)
-          this.getOrderModel(orgid)
-          this.getAllConnecWay(orgid)
+import Swiper from "swiper";
+import Vue from "vue";
+import { Swipe, SwipeItem } from "mint-ui";
+import "mint-ui/lib/style.css";
+import { getOrderModel, getAllConnecWay } from "@/api/micro/micro";
+export default {
+  name: "contactus",
+  data() {
+    return {
+      ordmodel: [],
+      Connectways: []
+    };
+  },
+  methods: {
+    getOrderModel(orgid) {
+      getOrderModel(orgid).then(response => {
+        if (response.data.state == 1) {
+          var ordmodel = response.data.data.ordmodel;
+          console.log("ordmodel是什么", ordmodel);
+          this.ordmodel = response.data.data.ordmodel;
         }
-
+      });
+    },
+    getAllConnecWay(orgid) {
+      getAllConnecWay(orgid).then(response => {
+        if (response.data.state == 1) {
+          var connect = response.data.data.connect;
+          this.Connectways = connect;
+        }
+      });
+    },
+    tallPhone(content) {
+      window.location.href = "tel://" + content + "";
     }
+  },
+  created() {
+    const orgid = this.$route.query.orgid;
+    console.log("联系我们orgid是多少", orgid);
+    this.getOrderModel(orgid);
+    this.getAllConnecWay(orgid);
+  }
+};
 </script>
 
-<style scoped>
-    .modeone{
-        width: 100%;
-        height: 220px;
-        margin-bottom: 10px;
-        /* border:solid 1px red; */
-    }
-
-   .oldmodetwo{
-    width: 300px;
-    height: 100%;
-    /* border: solid 1px red; */
-    font-size: 14px;
-    margin-bottom: 8px;
+<style lang="scss" scoped>
+.page_contactus {
+  overflow: hidden;
+  height: 100%;
+  padding-bottom: 1.25rem;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 0;
   }
+}
+.modeone {
+  width: 100%;
+  height: 220px;
+  margin-bottom: 10px;
+  /* border:solid 1px red; */
+}
 
-    .oldmodeone{
-        width: 318px;
-        min-height: 22px;
-        /* border: solid 1px red; */
-        margin-bottom: 8px;
-    }
-
-    .oldmodesix{
-       position: absolute;
-       width: 50px;
-       min-height: 20px;
-       /* border: solid 1px blue; */
-       margin-left: 200px;
-       margin-top: -20px;
-    }
+.oldmodetwo {
+  width: 300px;
+  height: 100%;
+  /* border: solid 1px red; */
+  font-size: 14px;
+  margin-bottom: 8px;
+}
 
-    .oldmodefive{
-      width: 250px;
-      min-height: 20px;
-      /* border: solid 1px red; */
-    }
+.oldmodeone {
+  width: 318px;
+  min-height: 22px;
+  /* border: solid 1px red; */
+  margin-bottom: 8px;
+}
 
-  .oldmodefour{
-    width: 300px;
-    height: 30px;
-    color: black;
-    /* border:solid 1px red; */
-    font-size: 14px;
-    margin-bottom: 8px;
-  }
+.oldmodesix {
+  position: absolute;
+  width: 50px;
+  min-height: 20px;
+  /* border: solid 1px blue; */
+  margin-left: 200px;
+  margin-top: -20px;
+}
 
-   .oldmodethree{
-    width: 300px;
-    height: 100%;
-    color: black;
-    /* border:solid 1px red; */
-    font-size: 14px;
-    margin-bottom: 8px;
-  }
-   .contractmodeone{
-     width: 100%;
-     height: 200px;
-     /* border: solid 1px red */
-   }
-     #wrappertwo{
-     width: 40%;
-   }
-   #wrappert{
-       width: 43%;
-   }
+.oldmodefive {
+  width: 250px;
+  min-height: 20px;
+  /* border: solid 1px red; */
+}
 
+.oldmodefour {
+  width: 300px;
+  height: 30px;
+  color: black;
+  /* border:solid 1px red; */
+  font-size: 14px;
+  margin-bottom: 8px;
+}
 
+.oldmodethree {
+  width: 300px;
+  height: 100%;
+  color: black;
+  /* border:solid 1px red; */
+  font-size: 14px;
+  margin-bottom: 8px;
+}
+.contractmodeone {
+  width: 100%;
+  height: 200px;
+  /* border: solid 1px red */
+}
+#wrappertwo {
+  width: 40%;
+}
+#wrappert {
+  width: 43%;
+}
 </style>