ホーム エクスプローラ ヘルプ
登録 サインイン
xmg123
/
micro_vue
Watch 0
Star 0
Fork 0
コード 課題 0 プルリクエスト 0 リリース 0 Wiki Activity
ソースを参照

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

See999 5 年 前
親
8e793ebd7c 2efc09672e
コミット
15f6d4ceb7
共有19 個のファイルを変更した、406 個の追加 と 67 個の削除を含む
分割表示 差分情報を表示
  1. 1 1
      index.html
  2. 43 0
      package-lock.json
  3. 1 0
      package.json
  4. 12 0
      src/api/micro/micro.js
  5. 2 1
      src/main.js
  6. 5 0
      src/router/index.js
  7. 74 0
      src/scrm_pages/Enviroments/enviromentsdetail.vue
  8. 26 13
      src/scrm_pages/activity/activity.vue
  9. 2 0
      src/scrm_pages/contact/contact.vue
  10. 124 3
      src/scrm_pages/contact/contactus.vue
  11. 16 0
      src/scrm_pages/contactus/contactus.vue
  12. 11 11
      src/scrm_pages/custom/custom.vue
  13. 3 3
      src/scrm_pages/hospitalIntroduction/hospitalIntroduction.vue
  14. 3 3
      src/scrm_pages/medicalTeam/medicalTeam.vue
  15. 42 29
      src/scrm_pages/microHome/microHome.vue
  16. 15 1
      src/scrm_pages/news/news.vue
  17. 24 0
      src/scrm_pages/newsDetail/newsDetail.vue
  18. 2 2
      src/scrm_pages/officeIntroduction/officeIntroduction.vue
  19. BIN
      static/images/non.png.lnk

+ 1 - 1
index.html ファイルの表示 

@@ -8,7 +8,7 @@
8 8 
     <meta name=”referrer” content=”never”>
9 9 
     <meta name="referrer" content="no-referrer"/>
10 10 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
11 
-    <title>血透管理-酷医云</title>
11 
+    <title>微网站</title>
12 12 
   </head>
13 13 
   <body>
14 14 
     <script src="<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js"></script>

+ 43 - 0
package-lock.json ファイルの表示 

@@ -36,6 +36,21 @@
36 36 
         "@babel/types": "7.0.0-beta.31"
37 37 
       }
38 38 
     },
39 
+    "@babel/runtime": {
40 
+      "version": "7.6.3",
41 
+      "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",
42 
+      "integrity": "sha1-k1Eix0xz0iQMr9Mt21/Cps01zx8=",
43 
+      "requires": {
44 
+        "regenerator-runtime": "^0.13.2"
45 
+      },
46 
+      "dependencies": {
47 
+        "regenerator-runtime": {
48 
+          "version": "0.13.3",
49 
+          "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",
50 
+          "integrity": "sha1-fPanfY9cb2Drc8X8GVWyzrAea/U="
51 
+        }
52 
+      }
53 
+    },
39 54 
     "@babel/template": {
40 55 
       "version": "7.0.0-beta.31",
41 56 
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.31.tgz",
 
@@ -152,6 +167,16 @@
152 167 
       "resolved": "https://registry.npmjs.org/@types/swiper/-/swiper-4.4.3.tgz",
153 168 
       "integrity": "sha512-z4RRt3/4ERHizeU8qIKmUsUpmoXFeEAJu0WLBZtjoVczaCnNL0KYQX0aBFZNhEu3bSNlMfWbZSHrg5gqAIucNA=="
154 169 
     },
170 
+    "@vant/icons": {
171 
+      "version": "1.1.15",
172 
+      "resolved": "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.1.15.tgz",
173 
+      "integrity": "sha1-U8UaziHpmSv+6y4a2QlPv2UG0RY="
174 
+    },
175 
+    "@vue/babel-helper-vue-jsx-merge-props": {
176 
+      "version": "1.0.0",
177 
+      "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",
178 
+      "integrity": "sha1-BI/leZWNpAj7eosqPsBQtQpmEEA="
179 
+    },
155 180 
     "JSV": {
156 181 
       "version": "4.0.2",
157 182 
       "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
 
@@ -13807,6 +13832,24 @@
13807 13832 
         "spdx-expression-parse": "^3.0.0"
13808 13833 
       }
13809 13834 
     },
13835 
+    "vant": {
13836 
+      "version": "2.2.10",
13837 
+      "resolved": "https://registry.npm.taobao.org/vant/download/vant-2.2.10.tgz",
13838 
+      "integrity": "sha1-rAqkPn8n5WpyCXdPh7h62TYIO1E=",
13839 
+      "requires": {
13840 
+        "@babel/runtime": "7.x",
13841 
+        "@vant/icons": "1.1.15",
13842 
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
13843 
+        "vue-lazyload": "1.2.3"
13844 
+      },
13845 
+      "dependencies": {
13846 
+        "vue-lazyload": {
13847 
+          "version": "1.2.3",
13848 
+          "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",
13849 
+          "integrity": "sha1-kB+ewVx+bKeHgaK65KNDaGve2yw="
13850 
+        }
13851 
+      }
13852 
+    },
13810 13853 
     "vary": {
13811 13854 
       "version": "1.1.2",
13812 13855 
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",

+ 1 - 0
package.json ファイルの表示 

@@ -70,6 +70,7 @@
70 70 
     "style-loader": "^1.0.0",
71 71 
     "swiper": "^4.5.1",
72 72 
     "v-viewer": "^1.4.2",
73 
+    "vant": "^2.2.10",
73 74 
     "vue": "2.5.16",
74 75 
     "vue-baidu-map": "^0.21.22",
75 76 
     "vue-count-to": "1.0.13",

+ 12 - 0
src/api/micro/micro.js ファイルの表示 

@@ -188,3 +188,15 @@ export function GetRotationLinkAddress(linkid, orgid) {
188 188 
     params: params
189 189 
   });
190 190 
 }
191 
+
192 
+export function getEnviromentImages(id,orgid){
193 
+  const params = {
194 
+    id:id,
195 
+    orgid:orgid,
196 
+  }
197 
+   return request({
198 
+     url:"/api/site/getenviromentimages",
199 
+     Get:"Get",
200 
+     params:params
201 
+   })
202 
+}

+ 2 - 1
src/main.js ファイルの表示 

@@ -42,7 +42,8 @@ import "viewerjs/dist/viewer.css";
42 42 
 import preview from "vue-photo-preview";
43 43 
 import "vue-photo-preview/dist/skin.css";
44 44 
 Vue.use(preview);
45 
-
45 
+import { Grid, GridItem } from 'vant';
46 
+Vue.use(Grid).use(GridItem);
46 47 
 import "./libs/rem.js";
47 48
48 49 
 //Vue.use(Viewer) 默认配置写法

+ 5 - 0
src/router/index.js ファイルの表示 

@@ -194,6 +194,11 @@ var _constant_router_map = [
194 194 
     path: "/contactus",
195 195 
     component: () => import("@/scrm_pages/contact/contactus")
196 196 
   },
197 
+  {
198 
+    path:"/departmentEnvironment",
199 
+    component: () => import("@/scrm_pages/enviroments/enviromentsdetail")
200 
+  },
201 
+
197 202
198 203 
   {
199 204 
     path: "/activity/preview",

+ 74 - 0
src/scrm_pages/Enviroments/enviromentsdetail.vue ファイルの表示 

@@ -0,0 +1,74 @@
1 
+<template>
2 
+    <div>
3 
+       <div class="swiper-container imgSwiper">
4 
+              <div class="swiper-wrapper">
5 
+                <div class="swiper-slide carousel">
6 
+                  <img class="img" src="static/images/a.jpg" />
7 
+                </div>
8 
+                <div class="swiper-slide carousel">
9 
+                  <img class="img" src="static/images/a.jpg" />
10 
+                </div>
11 
+             </div>
12 
+        </div>
13 
+    </div>
14 
+</template>
15 
+
16 
+<script>
17 
+    import Swiper from "swiper";
18 
+   import {getEnviromentImages } from "@/api/micro/micro";
19 
+    export default {
20 
+        name: "enviromentsdetail",
21 
+        data(){
22 
+            return{
23 
+
24 
+            }
25 
+        },
26 
+        created(){
27 
+          const id =  this.$route.query.id;
28 
+          const orgid = this.$route.query.orgid;
29 
+          console.log("id是多少",id)
30 
+          console.log("orgid是多少",orgid)
31 
+          getEnviromentImages(id,orgid);
32 
+        },
33 
+        methods:{
34 
+         initSwiper() {
35 
+           var mySwiper2 = new Swiper(".imgSwiper", {
36 
+           slidesPerView: 2,
37 
+          });
38 
+         },
39 
+         getEnviromentImages(id,orgid){
40 
+            getEnviromentImages(id,orgid).then(response=>{
41 
+                 if(response.data.state == 1){
42 
+
43 
+                 }
44 
+            })
45 
+         }
46 
+        },
47 
+      mounted() {
48 
+        this.initSwiper();
49 
+     },
50 
+
51 
+     updated() {
52 
+       this.initSwiper();
53 
+       this.$previewRefresh();
54 
+      }
55 
+    }
56 
+</script>
57 
+
58 
+<style lang="scss">
59 
+  .carousel {
60 
+    width: 100%;
61 
+    height: 200px;
62 
+    float: left;
63 
+    padding-right: 1rem;
64 
+    .img{
65 
+        width: 100%;
66 
+        height: 100%;
67 
+        float: left;
68 
+    }
69 
+  }
70 
+
71 
+ .swiper-wrapper{
72 
+     width:50%;
73 
+ }
74 
+</style>

+ 26 - 13
src/scrm_pages/activity/activity.vue ファイルの表示 

@@ -10,7 +10,7 @@
10 10 
         <div class="img">
11 11 
           <img :src="it.poster_photo" style="width:100%;height:100%" alt />
12 12 
         </div>
13 
-        <div class="detail">
13 
+        <div class="detail" v-if="it.title !=''">
14 14 
           <p class="detailTitle">{{it.title}}</p>
15 15 
           <div class="detailBox">
16 16 
             <div class="activityTime">
 
@@ -24,8 +24,12 @@
24 24 
             </div>
25 25 
           </div>
26 26 
         </div>
27 
+        <div class="detail" v-else-if="it.title == ''">
28 
+          <div class="noImg">
29 
+            <img src="../../../static/images/none2.png" alt />
30 
+          </div>
31 
+        </div>
27 32 
       </div>
28 
-
29 33 
     </div>
30 34 
   </div>
31 35 
 </template>
 
@@ -51,18 +55,18 @@ export default {
51 55 
     staffCreateTime(time) {
52 56 
       return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
53 57 
     },
54 
-    singleActivitInfo(id, orgid) {
55 
-      this.$router.push({
56 
-        path: "/activityDetail",
57 
-        query: {
58 
-          id: id,
59 
-          orgid: orgid
60 
-        }
61 
-      });
62 
-    }
63 
-    // singleActivitInfo(id){
64 
-    //   window.location.href = "http://wx.kuyicloud.com/weixin/activity/"+id;
58 
+    // singleActivitInfo(id, orgid) {
59 
+    //   this.$router.push({
60 
+    //     path: "/activityDetail",
61 
+    //     query: {
62 
+    //       id: id,
63 
+    //       orgid: orgid
64 
+    //     }
65 
+    //   });
65 66 
     // }
67 
+    singleActivitInfo(id) {
68 
+      window.location.href = "http://wx.kuyicloud.com/weixin/activity/" + id;
69 
+    }
66 70 
   },
67 71 
   created() {
68 72 
     const id = this.$route.query.id;
 
@@ -124,6 +128,15 @@ export default {
124 128 
       color: rgba(155, 155, 155, 1);
125 129 
       line-height: 1.125rem;
126 130 
     }
131 
+    .noImg {
132 
+      width: 3.125rem;
133 
+      height: 3.125rem;
134 
+      margin: 1.25rem auto 0;
135 
+      img {
136 
+        width: 3.125rem;
137 
+        height: 3.125rem;
138 
+      }
139 
+    }
127 140 
   }
128 141 
 }
129 142 
 .detailBox {

+ 2 - 0
src/scrm_pages/contact/contact.vue ファイルの表示 

@@ -5,7 +5,9 @@
5 5 
         <div class="swiper-container">
6 6 
           <div class="swiper-wrapper">
7 7 
             <div class="swiper-slide" v-for="it in item.Conrotation" :key="it.id">
8 
+              <a :href="it.linkaddress.length > 0 ? it.linkaddress: 'javascript:;' ">
8 9 
               <img class="imgtwo" :src="it.images" />
10 
+              </a>
9 11 
             </div>
10 12 
           </div>
11 13 
           <!-- 如果需要分页器 -->

+ 124 - 3
src/scrm_pages/contact/contactus.vue ファイルの表示 

@@ -1,8 +1,14 @@
1 1 
 <template>
2 2 
   <div class="page_home">
3 
+<<<<<<< .mine
3 4 
     <!-- <iframe  :src = this.customUrl width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe> -->
4 5 
     <div>
5 6 
       <div v-for="item in this.ordmodel" :key="item.id">
7 
+=======
8 
+
9 
+      <div v-for="item in this.ordmodel" :key="item.id" class="modeone">
10 
+
11 
+>>>>>>> .theirs
6 12 
         <div class="focusImg" v-if="item.mode_type == 1">
7 13 
           <div class="swiper-container">
8 14 
             <div class="swiper-wrapper">
 
@@ -13,11 +19,39 @@
13 19 
             <!-- 如果需要分页器 -->
14 20 
             <div class="swiper-pagination"></div>
15 21 
           </div>
22 
+<<<<<<< .mine
23 
+
24 
+
25 
+=======
26 
+
27 
+          <!-- <div class="swiper-pagination"></div> -->
28 
+>>>>>>> .theirs
16 29 
         </div>
30 
+<<<<<<< .mine
17 31 
         <!-- <div class="detail"> -->
18 32 
         <div class="row one detail" v-if="item.mode_type == 2">
19 33 
           <p class="title">{{item.title}}:</p>
20 34 
           <p class="msg">{{item.Hosaddress.address}}</p>
35 
+
36 
+
37 
+
38 
+
39 
+
40 
+
41 
+
42 
+=======
43 
+      </div>
44 
+
45 
+      <div class="row" v-if="item.mode_type == 2">
46 
+        <p class="title">{{item.title}}:</p>
47 
+        <p class="msg">{{item.Hosaddress.address}}</p>
48 
+      </div>
49 
+      <div class="row" v-if="item.mode_type == 3">
50 
+        <div v-for="it in Connectways" :key="it.id">
51 
+          <p class="title">{{it.title}}:</p>
52 
+          <p class="msg">{{it.content}}</p>
53 
+          <br />
54 
+>>>>>>> .theirs
21 55 
         </div>
22 56 
         <div class="row" v-if="item.mode_type == 3">
23 57 
           <div v-for="it in Connectways" :key="it.id">
 
@@ -35,6 +69,25 @@
35 69 
           <p class="msg">{{item.Rideway.ride_way}}</p>
36 70 
         </div>
37 71 
       </div>
72 
+<<<<<<< .mine
73 
+
74 
+
75 
+
76 
+
77 
+
78 
+
79 
+
80 
+
81 
+=======
82 
+      <div class="row" v-if="item.mode_type == 4">
83 
+        <p class="title">{{item.title}}:</p>
84 
+        <p class="msg">{{item.Worktime.worktime}}</p>
85 
+      </div>
86 
+      <div class="row" v-if="item.mode_type == 5">
87 
+        <p class="title">{{item.title}}:</p>
88 
+        <p class="msg">{{item.Rideway.ride_way}}</p>
89 
+      </div>
90 
+>>>>>>> .theirs
38 91 
     </div>
39 92
40 93 
     <!-- tab切换 -->
 
@@ -78,8 +131,13 @@ export default {
78 131 
         if (response.data.state == 1) {
79 132 
           var navigation = response.data.data.navigation;
80 133 
           for (let index = 0; index < navigation.length; index++) {
134 
+<<<<<<< .mine
81 135 
             navigation[1].nonavimages =
82 136 
               "https://images.shengws.com/2124_o_1571990749565.png";
137 
+=======
138 
+              navigation[3].nonavimages = "https://images.shengws.com/2124_o_1571990749565.png";
139 
+
140 
+>>>>>>> .theirs
83 141 
           }
84 142 
           console.log("navigation是什么", navigation);
85 143 
           this.navigationdata = navigation;
 
@@ -129,7 +187,7 @@ export default {
129 187 
       if (linktype == "2") {
130 188 
         // window.location.href = address;
131 189 
         this.$router.push({
132 
-          path: "/contactus",
190 
+          path: "/custom",
133 191 
           query: {
134 192 
             orgid: orgid
135 193 
           }
 
@@ -138,6 +196,7 @@ export default {
138 196 
       if (linktype == "3") {
139 197 
         window.location.href = "tel://" + address + "";
140 198 
       }
199 
+<<<<<<< .mine
141 200 
       if (linktype == "4") {
142 201 
         // window.location.href = address;
143 202 
         this.$router.push({
 
@@ -147,6 +206,17 @@ export default {
147 206 
           }
148 207 
         });
149 208 
       }
209 
+=======
210 
+      // if (linktype == "4") {
211 
+      //   // window.location.href = address;
212 
+      //   this.$router.push({
213 
+      //     path:"/custom",
214 
+      //     query:{
215 
+      //       orgid:orgid
216 
+      //     }
217 
+      //   })
218 
+      // }
219 
+>>>>>>> .theirs
150 220 
     }
151 221 
   },
152 222 
   created() {
 
@@ -166,6 +236,7 @@ export default {
166 236
167 237 
 <style lang="scss" scoped>
168 238 
 @import "../../assets/styles/mixin.scss";
239 
+<<<<<<< .mine
169 240
170 241 
 .page_home {
171 242 
   overflow: hidden;
 
@@ -186,6 +257,28 @@ export default {
186 257 
 //   border: solid 1px red;
187 258 
 // }
188 259
260 
+=======
261 
+
262 
+
263 
+
264 
+
265 
+
266 
+
267 
+
268 
+
269 
+
270 
+
271 
+
272 
+
273 
+
274 
+
275 
+
276 
+
277 
+
278 
+
279 
+
280 
+
281 
+>>>>>>> .theirs
189 282 
 .tabs {
190 283 
   @include border-top;
191 284 
   width: 100%;
 
@@ -217,9 +310,33 @@ export default {
217 310 
 .page_home {
218 311 
   overflow: hidden;
219 312 
   height: 100%;
313 
+<<<<<<< .mine
220 314 
   // > div:nth-of-type(2) {
221 315 
   //   min-height: 5.125rem;
222 316 
   // }
317 
+
318 
+
319 
+
320 
+
321 
+
322 
+
323 
+=======
324 
+  display:flex;
325 
+  flex-direction: column;
326 
+  >div:first-child{
327 
+    flex: 1;
328 
+    overflow: auto;
329 
+  }
330 
+  > div:nth-of-type(2) {
331 
+    min-height: 3.0rem;
332 
+  }
333 
+>>>>>>> .theirs
334 
+  > div:nth-of-type(3) {
335 
+    min-height: 3.125rem;
336 
+  }
337 
+  > div:nth-of-type(4) {
338 
+    min-height: 2.9rem;
339 
+  }
223 340 
   .focusImg {
224 341 
     width: 23.4375rem;
225 342 
     height: 11.5625rem;
 
@@ -244,7 +361,6 @@ export default {
244 361 
     width: 21.125rem;
245 362 
     margin: 0 1.25rem;
246 363 
     // border: 1px solid #000;
247 
-
248 364 
     .title {
249 365 
       float: left;
250 366 
       width: 5rem;
 
@@ -260,13 +376,18 @@ export default {
260 376 
     }
261 377 
   }
262 378 
   .one {
263 
-    min-height: 2.375rem;
379 
+    min-height: 1.0rem;
264 380 
     // line-height: 3rem;
265 381 
   }
266 382 
   .detail {
267 383 
     width: 21.125rem;
268 384 
     margin: 1.1875rem 1.25rem 0 1.25rem;
385 
+
269 386 
   }
270 387 
 }
388 
+.modeone{
389 
+  min-height: 210px;
390 
+  // border:solid 1px red;
391 
+}
271 392 
 </style>
272 393

+ 16 - 0
src/scrm_pages/contactus/contactus.vue ファイルの表示 

@@ -1,4 +1,5 @@
1 1 
 <template>
2 
+<<<<<<< .mine
2 3 
   <div class="page_contactus">
3 4 
     <!-- 联系我们页面 -->
4 5 
     <div class="scroll" style="padding:15px 4%;">
 
@@ -11,6 +12,21 @@
11 12 
           </mt-swipe>
12 13 
         </div>
13 14
15 
+=======
16 
+    <div>
17 
+          <!-- 联系我们页面 -->
18 
+         <div class="scroll"  style="padding:15px 4%;">
19 
+              <div v-for="item in this.ordmodel" :key="item.id">
20 
+
21 
+                     <div v-if="item.mode_type == 1" class="contractmodeone">
22 
+                        <mt-swipe :auto="4000" class="swipertwo">
23 
+                             <mt-swipe-item  v-for="it in item.Conrotation" :key="it.id">
24 
+                                    <img :src="it.images" style="width:100%;height:100%" >
25 
+                             </mt-swipe-item>
26 
+                        </mt-swipe>
27 
+                     </div>
28 
+>>>>>>> .theirs
29 
+
14 30 
         <div v-if="item.mode_type == 2" class="oldmodetwo">
15 31 
           <div>
16 32 
             <span>{{item.title}}:&nbsp;&nbsp;{{item.Hosaddress.address}}</span>

+ 11 - 11
src/scrm_pages/custom/custom.vue ファイルの表示 

@@ -37,7 +37,7 @@ export default {
37 37 
         if (response.data.state == 1) {
38 38 
           var navigation = response.data.data.navigation;
39 39 
           for (let index = 0; index < navigation.length; index++) {
40 
-              navigation[3].nonavimages = "https://images.shengws.com/2101_o_1571990903053.png";
40 
+              navigation[1].nonavimages = "https://images.shengws.com/2101_o_1571990903053.png";
41 41
42 42 
           }
43 43 
           console.log("navigation是什么", navigation);
 
@@ -57,22 +57,22 @@ export default {
57 57 
               }
58 58 
           })
59 59 
      }
60 
-      if (linktype == "2") {
61 
-        // window.location.href = address;
62 
-        this.$router.push({
63 
-          path: "/contactus",
64 
-          query: {
65 
-            orgid: orgid
66 
-          }
67 
-         });
68 
-      }
60 
+      // if (linktype == "2") {
61 
+      //   // window.location.href = address;
62 
+      //   this.$router.push({
63 
+      //     path: "/contactus",
64 
+      //     query: {
65 
+      //       orgid: orgid
66 
+      //     }
67 
+      //    });
68 
+      // }
69 69 
       if (linktype == "3") {
70 70 
         window.location.href = "tel://" + address + "";
71 71 
       }
72 72 
       if (linktype == "4") {
73 73 
         // window.location.href = address;
74 74 
         this.$router.push({
75 
-          path:"/custom",
75 
+          path:"/contactus",
76 76 
           query:{
77 77 
             orgid:orgid
78 78 
           }

+ 3 - 3
src/scrm_pages/hospitalIntroduction/hospitalIntroduction.vue ファイルの表示 

@@ -3,9 +3,9 @@
3 3 
     <!-- <div class="bannerImg">
4 4 
       <img src="static\images\banner.jpg" alt />
5 5 
     </div>-->
6 
-    <!-- <div class="detail" v-html="hospitalform.introduction">
7 
-    </div>-->
8 
-    <div class="noImg">
6 
+    <div class="detail" v-html="hospitalform.introduction" v-if="hospitalform.introduction != ''">
7 
+    </div>
8 
+    <div class="noImg" v-else-if="hospitalform.introduction == ''">
9 9 
       <img src="../../../static/images/none2.png" alt />
10 10 
     </div>
11 11 
   </div>

+ 3 - 3
src/scrm_pages/medicalTeam/medicalTeam.vue ファイルの表示 

@@ -18,11 +18,11 @@
18 18 
         <div class="img">
19 19 
           <img :src="item.dochead" style="width:100%;height:100%" alt />
20 20 
         </div>
21 
-        <!-- <div class="detail">
21 
+        <div class="detail" v-if="item.docintroduction !=''">
22 22 
           <p class="detailTitle">{{item.doc_name}}</p>
23 23 
           <p class="detailMessage" v-html="item.docintroduction"></p>
24 
-        </div>-->
25 
-        <div class="detail">
24 
+        </div>
25 
+        <div class="detail" v-else-if="item.docintroduction == ''">
26 26 
           <div class="noImg">
27 27 
             <img src="../../../static/images/none2.png" alt />
28 28 
           </div>

+ 42 - 29
src/scrm_pages/microHome/microHome.vue ファイルの表示 

@@ -7,7 +7,9 @@
7 7 
           <div class="swiper-container bannerSwiper">
8 8 
             <div class="swiper-wrapper">
9 9 
               <div class="swiper-slide" v-for="it in item.PatientEditpiclink" :key="it.id">
10 
-                <img class="imgtwo" :src="it.images" />
10 
+                  <a :href="it.linkaddress.length > 0 ? it.linkaddress: 'javascript:;'">
11 
+                  <img class="imgtwo" :src="it.images" />
12 
+                  </a>
11 13 
               </div>
12 14 
             </div>
13 15 
             <!-- 如果需要分页器 -->
 
@@ -49,10 +51,15 @@
49 51 
               <div class="img">
50 52 
                 <img :src="it.imgs" style="width:100%;height:100%" alt />
51 53 
               </div>
52 
-              <div class="detail">
54 
+              <div class="detail" v-if="it.title !=''">
53 55 
                 <p class="detailTitle">{{it.title}}</p>
54 56 
                 <!-- <p class="detailMessage">{{it.content}}</p> -->
55 57 
               </div>
58 
+              <div class="detail" v-else-if="it.title ==''">
59 
+                <div class="noImg">
60 
+                  <img src="../../../static/images/none2.png" alt />
61 
+                </div>
62 
+              </div>
56 63 
             </div>
57 64 
           </div>
58 65 
         </div>
 
@@ -70,8 +77,8 @@
70 77 
             </div>
71 78 
           </div>
72 79 
           <div class="commonBox">
73 
-            <!-- <div class="commonMessage" v-html="item.Hospitals.introduction"></div> -->
74 
-            <div class="noImg">
80 
+            <div class="commonMessage" v-html="item.Hospitals.introduction" v-if="item.Hospitals.introduction!=''"></div>
81 
+            <div class="noImg" v-else-if="item.Hospitals.introcution == ''">
75 82 
               <img src="../../../static/images/none2.png" alt />
76 83 
             </div>
77 84 
           </div>
 
@@ -93,8 +100,8 @@
93 100 
             <!-- <div class="commonImg">
94 101 
             <img src="static\images\img2.png" alt />
95 102 
             </div>-->
96 
-            <!-- <div class="commonMessage" v-html="item.Offices.introduction"></div> -->
97 
-            <div class="noImg">
103 
+            <div class="commonMessage" v-html="item.Offices.introduction" v-if="item.Offices.introduction != ''"></div>
104 
+            <div class="noImg" v-else-if="item.Offices.introduction">
98 105 
               <img src="../../../static/images/none2.png" alt />
99 106 
             </div>
100 107 
           </div>
 
@@ -117,12 +124,12 @@
117 124 
               <div class="img">
118 125 
                 <img :src="doc.dochead" style="width:100%;height:100%" alt />
119 126 
               </div>
120 
-              <!-- <div class="detail">
127 
+              <div class="detail" v-if="doc.docintroduction != ''">
121 128 
                 <p class="detailTitle">{{doc.doc_name}}</p>
122 129 
                 <p class="detailMessage" v-html="doc.docintroduction"></p>
123 130
124 
-              </div>-->
125 
-              <div class="detail">
131 
+              </div>
132 
+              <div class="detail" v-else-if="doc.docintroduction ==''">
126 133 
                 <div class="noImg">
127 134 
                   <img src="../../../static/images/none2.png" alt />
128 135 
                 </div>
 
@@ -145,12 +152,12 @@
145 152 
           <div class="common_title">
146 153 
             <div class="one"></div>
147 154 
             <div class="dynamicTxt">{{item.title}}</div>
148 
-            <!-- <div class="more">
155 
+            <div class="more" @click="EnviromentClick(item.id,item.user_org_id)">
149 156 
             <p>
150 157 
               查看更多
151 158 
               <i class="iconfont">&#xe632;</i>
152 159 
             </p>
153 
-            </div>-->
160 
+            </div>
154 161 
           </div>
155 162 
           <div class="imgs">
156 163 
             <div class="swiper-container imgSwiper">
 
@@ -180,19 +187,13 @@
180 187 
               <div class="img">
181 188 
                 <img :src="it.poster_photo" style="widht:100%;height:100%" alt />
182 189 
               </div>
183 
-              <div class="detail">
190 
+              <div class="detail" v-if="it.title != ''">
184 191 
                 <p class="detailTitle">{{it.title}}</p>
185 
-                <!-- <div class="detailBox">
186 
-                <div class="activityTime">
187 
-                  <p>
188 
-                    7月28日 08:30开始
189 
-                    深圳市南山区
190 
-                  </p>
191 
-                </div>
192 
-                <div class="people">
193 
-                  <p>100人已报名</p>
192 
+              </div>
193 
+               <div class="detail" v-else-if="it.title ==''">
194 
+                <div class="noImg">
195 
+                  <img src="../../../static/images/none2.png" alt />
194 196 
                 </div>
195 
-                </div>-->
196 197 
               </div>
197 198 
             </div>
198 199 
           </div>
 
@@ -267,7 +268,7 @@ export default {
267 268 
         if (response.data.state == 1) {
268 269 
           var articlelist = response.data.data.articlelists;
269 270 
           this.Articlelist = response.data.data.articlelists;
270 
-          console.log("文章列表", this.Articlelist);
271 
+          console.log("文章列表", this.Articlelist);
271 272 
         }
272 273 
       });
273 274 
     },
 
@@ -327,6 +328,15 @@ export default {
327 328 
         }
328 329 
       });
329 330 
     },
331 
+    EnviromentClick(id,orgid){
332 
+      this.$router.push({
333 
+        path:"/departmentEnvironment",
334 
+        query:{
335 
+          id:id,
336 
+          orgid: orgid,
337 
+        }
338 
+      })
339 
+    },
330 340 
     getDefalutNavigationData(orgid) {
331 341 
       getDefalutNavigationData(orgid).then(response => {
332 342 
         if (response.data.state == 1) {
 
@@ -373,6 +383,7 @@ export default {
373 383 
     },
374 384
375 385 
     CallPhone(linktype, address, orgid) {
386 
+
376 387 
       if (linktype == "2") {
377 388 
         this.$router.push({
378 389 
           path: "/contactus",
 
@@ -387,9 +398,9 @@ export default {
387 398 
       if (linktype == "4") {
388 399 
         // window.location.href = address;
389 400 
         this.$router.push({
390 
-          path: "custom",
391 
-          query: {
392 
-            orgid: orgid
401 
+          path:"/custom",
402 
+          query:{
403 
+            orgid:orgid,
393 404 
           }
394 405 
         });
395 406 
       }
 
@@ -401,16 +412,18 @@ export default {
401 412 
           console.log("数据是什么", this.patientModels);
402 413 
         }
403 414 
       });
404 
-    }
415 
+    },
416 
+
417 
+
405 418 
   },
406 419 
   created() {
407 420 
     const orgid = this.$route.query.orgid;
408 421 
     console.log("机构id是什么", orgid);
409 
-    // this.getHospitaldata(orgid);
422 
+    this.getHospitaldata(orgid);
410 423 
     this.getArticlelist(orgid);
411 424 
     this.getActivities(orgid);
412 425 
     this.getDefalutNavigationData(orgid);
413 
-    this.getData(orgid);
426 
+    // this.getData(orgid);
414 427 
   },
415 428 
   mounted() {
416 429 
     this.initSwiper();

+ 15 - 1
src/scrm_pages/news/news.vue ファイルの表示 

@@ -5,10 +5,15 @@
5 5 
         <div class="img">
6 6 
           <img :src="it.imgs" style="width:100%;height:100%" alt />
7 7 
         </div>
8 
-        <div class="detail" @click="singleArticleInfo(it.id,it.user_org_id)">
8 
+        <div class="detail" @click="singleArticleInfo(it.id,it.user_org_id)" v-if="it.title !=''">
9 9 
           <p class="detailTitle">{{it.title}}</p>
10 10 
           <p class="detailMessage"></p>
11 11 
         </div>
12 
+        <div class="detail" v-else-if="it.title ==''">
13 
+             <div class="noImg">
14 
+               <img src="../../../static/images/none2.png" alt />
15 
+            </div>
16 
+       </div>
12 17 
       </div>
13 18 
     </div>
14 19 
   </div>
 
@@ -109,6 +114,15 @@ export default {
109 114 
       color: rgba(155, 155, 155, 1);
110 115 
       line-height: 1.125rem;
111 116 
     }
117 
+  .noImg {
118 
+    width: 3.125rem;
119 
+    height: 3.125rem;
120 
+    margin: 1.25rem auto 0;
121 
+    img {
122 
+      width: 3.125rem;
123 
+      height: 3.125rem;
124 
+    }
125 
+  }
112 126 
   }
113 127 
 }
114 128 
 </style>

+ 24 - 0
src/scrm_pages/newsDetail/newsDetail.vue ファイルの表示 

@@ -2,6 +2,23 @@
2 2 
   <div class="page_newsDetail">
3 3 
     <div class="newsTitle">{{articles.title}}</div>
4 4 
     <div class="msg" v-html="articles.content" v-show="articleshow"></div>
5 
+<<<<<<< .mine
6 
+     <div class="video" v-show="videoshow">
7 
+          <video id="example_video_1" class="video-js vjs-default-skin"
8 
+                 controls preload="auto" width="100%" height="100%"
9 
+                 poster="http://video-js.zencoder.com/oceans-clip.png"
10 
+                 data-setup='{"example_option":true}' ref="video">
11 
+               <source :src="articles.video_url" type='video/mp4' />
12 
+        </video>
13 
+        </div>
14 
+
15 
+
16 
+
17 
+
18 
+
19 
+
20 
+
21 
+=======
5 22 
     <div class="video" v-show="videoshow">
6 23 
       <video
7 24 
         id="example_video_1"
 
@@ -17,6 +34,7 @@
17 34 
         <source :src="articles.video_url" type="video/mp4" />
18 35 
       </video>
19 36 
     </div>
37 
+>>>>>>> .theirs
20 38 
   </div>
21 39 
 </template>
22 40 
   <script>
 
@@ -88,4 +106,10 @@ export default {
88 106 
   line-height: 1.375rem;
89 107 
   margin: 1.25rem 1.25rem 0 1.125rem;
90 108 
 }
109 
+
110 
+.video{
111 
+  width: 100%;
112 
+  height: 250px;
113 
+  // border: solid 1px red;
114 
+}
91 115 
 </style>

+ 2 - 2
src/scrm_pages/officeIntroduction/officeIntroduction.vue ファイルの表示 

@@ -1,7 +1,7 @@
1 1 
 <template>
2 2 
   <div class="main">
3 
-    <!-- <div class="detail" v-html="officeform.introduction"></div> -->
4 
-    <div class="noImg">
3 
+    <div class="detail" v-html="officeform.introduction" v-if="officeform.introduction !=''"></div>
4 
+    <div class="noImg" v-else-if="officeform.introduction == ''">
5 5 
       <img src="../../../static/images/none2.png" alt />
6 6 
     </div>
7 7 
   </div>

BIN
static/images/non.png.lnk ファイルの表示