xiaoming_global před 5 roky
rodič
revize
67ae90a509

+ 1 - 1
config/dev.env.js Zobrazit soubor

@@ -2,7 +2,7 @@ module.exports = {
2 2
   NODE_ENV: '"development"',
3 3
   ENV_CONFIG: '"dev"',
4 4
   // BASE_API: '"http://api.test1.sgjyun.com"'
5
-   BASE_API: '"http://localhost:9535"'
5
+  BASE_API: '"http://localhost:9535"'
6 6
   // BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
7 7
 
8 8
   //  SSO_HOST: '"https://testsso.sgjyun.com"',

+ 4 - 0
src/main.js Zobrazit soubor

@@ -39,6 +39,10 @@ import BaiduMap from "vue-baidu-map";
39 39
 import Viewer from "v-viewer";
40 40
 import "viewerjs/dist/viewer.css";
41 41
 
42
+import preview from "vue-photo-preview";
43
+import "vue-photo-preview/dist/skin.css";
44
+Vue.use(preview);
45
+
42 46
 import "./libs/rem.js";
43 47
 
44 48
 //Vue.use(Viewer) 默认配置写法

+ 1 - 1
src/router/index.js Zobrazit soubor

@@ -112,7 +112,7 @@ var _constant_router_map = [
112 112
   },
113 113
   {
114 114
     path: "/",
115
-    component: () => import("@/scrm_pages/apply/apply")
115
+    component: () => import("@/scrm_pages/news/news")
116 116
   },
117 117
 
118 118
   // 医院介绍详情路由

+ 100 - 1
src/scrm_pages/activity/activity.vue Zobrazit soubor

@@ -15,11 +15,110 @@
15 15
               </p>
16 16
             </div>
17 17
             <div class="people">
18
-              <p>{{it.join_num}}</p>
18
+<<<<<<< HEAD
19
+              <p>100人已报名</p>
20
+            </div>
21
+          </div>
22
+        </div>
23
+      </div>
24
+      <div class="contentOne">
25
+        <div class="img">
26
+          <img src="static\images\img1.jpg" alt />
27
+        </div>
28
+        <div class="detail">
29
+          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
30
+          <div class="detailBox">
31
+            <div class="activityTime">
32
+              <p>
33
+                7月28日 08:30开始
34
+                深圳市南山区
35
+              </p>
36
+            </div>
37
+            <div class="people">
38
+              <p>100人已报名</p>
39
+            </div>
40
+          </div>
41
+        </div>
42
+      </div>
43
+      <!-- <div class="contentOne">
44
+        <div class="img">
45
+          <img src="static\images\img1.jpg" alt />
46
+        </div>
47
+        <div class="detail">
48
+          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
49
+          <div class="detailBox">
50
+            <div class="activityTime">
51
+              <p>
52
+                7月28日 08:30开始
53
+                深圳市南山区
54
+              </p>
55
+            </div>
56
+            <div class="people">
57
+              <p>100人已报名</p>
58
+            </div>
59
+          </div>
60
+        </div>
61
+      </div>
62
+      <div class="contentOne">
63
+        <div class="img">
64
+          <img src="static\images\img1.jpg" alt />
65
+        </div>
66
+        <div class="detail">
67
+          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
68
+          <div class="detailBox">
69
+            <div class="activityTime">
70
+              <p>
71
+                7月28日 08:30开始
72
+                深圳市南山区
73
+              </p>
74
+            </div>
75
+            <div class="people">
76
+              <p>100人已报名</p>
19 77
             </div>
20 78
           </div>
21 79
         </div>
22 80
       </div>
81
+      <div class="contentOne">
82
+        <div class="img">
83
+          <img src="static\images\img1.jpg" alt />
84
+        </div>
85
+        <div class="detail">
86
+          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
87
+          <div class="detailBox">
88
+            <div class="activityTime">
89
+              <p>
90
+                7月28日 08:30开始
91
+                深圳市南山区
92
+              </p>
93
+            </div>
94
+            <div class="people">
95
+              <p>100人已报名</p>
96
+            </div>
97
+          </div>
98
+        </div>
99
+      </div>
100
+      <div class="contentOne">
101
+        <div class="img">
102
+          <img src="static\images\img1.jpg" alt />
103
+        </div>
104
+        <div class="detail">
105
+          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
106
+          <div class="detailBox">
107
+            <div class="activityTime">
108
+              <p>
109
+                7月28日 08:30开始
110
+                深圳市南山区
111
+              </p>
112
+            </div>
113
+            <div class="people">
114
+              <p>100人已报名</p>
115
+=======
116
+              <p>{{it.join_num}}</p>
117
+>>>>>>> b16550aa910aaf7d56c03d34730cdaf88ad2c98f
118
+            </div>
119
+          </div>
120
+        </div>
121
+      </div>-->
23 122
     </div>
24 123
   </div>
25 124
 </template>

+ 294 - 200
src/scrm_pages/microHome/microHome.vue Zobrazit soubor

@@ -1,115 +1,180 @@
1 1
 <template>
2 2
   <div class="page_home">
3
-
4 3
     <div class="swiper-slide">
5
-      <div   v-for="item in this.patientModels" :key="item.id">
6
-    <!-- 轮播图 -->
7
-      <div class="banner" v-if="item.mode_type == 1">
8
-        <div class="swiper-container bannerSwiper" >
9
-          <div class="swiper-wrapper">
10
-            <div class="swiper-slide" v-for="it in item.PatientEditpiclink" :key="it.id">
11
-              <img class="imgtwo" :src="it.images" />
4
+      <div v-for="item in this.patientModels" :key="item.id">
5
+        <!-- 轮播图 -->
6
+        <div class="banner" v-if="item.mode_type == 1">
7
+          <div class="swiper-container bannerSwiper">
8
+            <div class="swiper-wrapper">
9
+              <div class="swiper-slide" v-for="it in item.PatientEditpiclink" :key="it.id">
10
+                <img class="imgtwo" :src="it.images" />
11
+              </div>
12 12
             </div>
13
+            <!-- 如果需要分页器 -->
14
+            <div class="swiper-pagination"></div>
13 15
           </div>
14
-          <!-- 如果需要分页器 -->
15
-          <div class="swiper-pagination"></div>
16 16
         </div>
17
-      </div>
18 17
 
19
-       <!-- 魔方导航 -->
20
-      <div class="btnList" v-if="item.mode_type== 8" >
21
-        <div class="btnOne" v-for="it in item.Editmargin" :key="it.id">
22
-          <div>
23
-            <img :src="it.margimage" alt />
24
-          </div>
25
-          <div>
26
-            <p class="title">{{it.margtitle}}</p>
18
+        <!-- 魔方导航 -->
19
+        <div class="btnList" v-if="item.mode_type== 8">
20
+          <div class="btnOne" v-for="it in item.Editmargin" :key="it.id">
21
+            <div>
22
+              <img :src="it.margimage" alt />
23
+            </div>
24
+            <div>
25
+              <p class="title">{{it.margtitle}}</p>
26
+            </div>
27 27
           </div>
28 28
         </div>
29
-      </div>
30 29
 
31
-
32
-      <!-- 文章列表 -->
33
-      <div class="dynamic" v-if="item.mode_type == 6">
34
-        <div class="common_title">
35
-          <div class="one"></div>
36
-          <div class="dynamicTxt">{{item.title}}</div>
37
-          <div class="more" @click="articlemore(item.id,item.user_org_id)">
38
-            <p>查看更多 <i class="iconfont">&#xe632;</i></p>
30
+        <!-- 文章列表 -->
31
+        <div class="dynamic" v-if="item.mode_type == 6">
32
+          <div class="common_title">
33
+            <div class="one"></div>
34
+            <div class="dynamicTxt">{{item.title}}</div>
35
+            <div class="more" @click="articlemore(item.id,item.user_org_id)">
36
+              <p>
37
+                查看更多
38
+                <i class="iconfont">&#xe632;</i>
39
+              </p>
40
+            </div>
39 41
           </div>
42
+<<<<<<< .mine
40 43
         </div>
41 44
         <div class="content" @click="articlemore(item.id,item.user_org_id)">
42 45
           <div class="contentOne" v-for="it in Articlelist" :key="it.id">
43 46
             <div class="img">
44 47
               <img :src="it.imgs" style="width:100%;height:100%" alt/>
45
-            </div>
46
-            <div class="detail">
47
-              <p class="detailTitle">{{it.title}}</p>
48
-              <!-- <p class="detailMessage"></p> -->
48
+
49
+
50
+
51
+
52
+=======
53
+          <div class="content">
54
+            <div class="contentOne" v-for="it in Articlelist" :key="it.id">
55
+              <div class="img">
56
+                <img :src="it.imgs" style="width:100%;height:100%" alt />
57
+              </div>
58
+              <div class="detail">
59
+                <p class="detailTitle">{{it.title}}</p>
60
+                <!-- <p class="detailMessage"></p> -->
61
+              </div>
62
+>>>>>>> .theirs
49 63
             </div>
50 64
           </div>
51 65
         </div>
52
-      </div>
53
-
54 66
 
55
-      <!-- 医院介绍 -->
56
-      <div class="common" v-if="item.mode_type == 2">
57
-        <div class="common_title">
58
-          <div class="one"></div>
59
-          <div class="dynamicTxt">{{item.title}}</div>
60
-          <div class="more" @click="hispitalmore(item.id,item.user_org_id)">
61
-            <p> 查看更多 <i class="iconfont">&#xe632;</i></p>
67
+        <!-- 医院介绍 -->
68
+        <div class="common" v-if="item.mode_type == 2">
69
+          <div class="common_title">
70
+            <div class="one"></div>
71
+            <div class="dynamicTxt">{{item.title}}</div>
72
+            <div class="more" @click="hispitalmore(item.id,item.user_org_id)">
73
+              <p>
74
+                查看更多
75
+                <i class="iconfont">&#xe632;</i>
76
+              </p>
77
+            </div>
62 78
           </div>
79
+<<<<<<< .mine
63 80
         </div>
64 81
         <div class="commonBox" v-html="item.Hospitals.introduction">
65 82
           <!-- <div class="commonImg">
83
+=======
84
+          <div class="commonBox">
85
+            <!-- <div class="commonImg">
86
+
87
+>>>>>>> .theirs
66 88
             <img src="static\images\img2.png" alt />
89
+<<<<<<< .mine
67 90
           </div> -->
68 91
           <!-- <div class="commonMessage" ></div> -->
69
-        </div>
70
-      </div>
71 92
 
72 93
 
73
-      <!-- 科室介绍 -->
74
-      <div class="common" v-if="item.mode_type == 3">
75
-        <div class="common_title">
76
-          <div class="one"></div>
77
-          <div class="dynamicTxt">{{item.title}}</div>
78
-          <div class="more" @click="officemore(item.id,item.user_org_id)">
79
-            <p>查看更多<i class="iconfont">&#xe632;</i>   </p>
94
+
95
+
96
+
97
+
98
+=======
80 99
           </div>
100
+          <div class="commonMessage">
101
+            深圳市南山区人民医院(深圳市第六人民医院),坐落于深圳经济特区西部南头半岛中心区,是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院
102
+            深圳市南山区人民医院(深圳市第六人民医院),坐落于深圳经济特区西部南头半岛中心区,是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院...
103
+          </div>
104
+            </div>-->
105
+            <div class="commonMessage" v-html="item.Hospitals.introduction"></div>
106
+          </div>
107
+>>>>>>> .theirs
108
+        </div>
109
+
110
+        <!-- 科室介绍 -->
111
+        <div class="common" v-if="item.mode_type == 3">
112
+          <div class="common_title">
113
+            <div class="one"></div>
114
+            <div class="dynamicTxt">{{item.title}}</div>
115
+            <div class="more" @click="officemore(item.id,item.user_org_id)">
116
+              <p>
117
+                查看更多
118
+                <i class="iconfont">&#xe632;</i>
119
+              </p>
120
+            </div>
121
+          </div>
122
+<<<<<<< .mine
81 123
         </div>
82 124
         <div class="commonBox" v-html="item.Offices.introduction">
83 125
           <!-- <div class="commonImg">
126
+=======
127
+          <div class="commonBox">
128
+            <!-- <div class="commonImg">
129
+
130
+>>>>>>> .theirs
84 131
             <img src="static\images\img2.png" alt />
132
+<<<<<<< .mine
85 133
           </div> -->
86 134
           <!-- <div class="commonMessage"  ></div> -->
135
+
136
+=======
137
+            </div>-->
138
+            <div class="commonMessage" v-html="item.Offices.introduction"></div>
139
+          </div>
140
+>>>>>>> .theirs
87 141
         </div>
88
-      </div>
89 142
 
90
-      <!-- 医护团队 -->
91
-      <div class="dynamic" v-if="item.mode_type == 4">
92
-        <div class="common_title">
93
-          <div class="one"></div>
94
-          <div class="dynamicTxt">{{item.title}}</div>
95
-          <div class="more" @click="docmore(item.id,item.user_org_id)">
96
-            <p>
97
-              查看更多
98
-              <i class="iconfont">&#xe632;</i>
99
-            </p>
143
+        <!-- 医护团队 -->
144
+        <div class="dynamic" v-if="item.mode_type == 4">
145
+          <div class="common_title">
146
+            <div class="one"></div>
147
+            <div class="dynamicTxt">{{item.title}}</div>
148
+            <div class="more" @click="docmore(item.id,item.user_org_id)">
149
+              <p>
150
+                查看更多
151
+                <i class="iconfont">&#xe632;</i>
152
+              </p>
153
+            </div>
100 154
           </div>
155
+<<<<<<< .mine
101 156
         </div>
102 157
         <div class="content" @click="docmore(item.id,item.user_org_id)" >
103 158
           <div class="contentOne"  v-for="doc in item.Editdoctor" :key="doc.id">
104 159
             <div class="img">
105 160
               <img :src="doc.dochead" style="width:100%;height:100%" alt />
161
+
162
+
163
+
164
+
165
+=======
166
+          <div class="content">
167
+            <div class="contentOne" v-for="doc in item.Editdoctor" :key="doc.id">
168
+              <div class="img">
169
+                <img :src="doc.dochead" style="width:100%;height:100%" alt />
170
+              </div>
171
+              <div class="detail">
172
+                <p class="detailTitle">{{doc.doc_name}}</p>
173
+                <p class="detailMessage" v-html="doc.docintroduction"></p>
174
+              </div>
175
+>>>>>>> .theirs
106 176
             </div>
107
-            <div class="detail">
108
-              <p class="detailTitle">{{doc.doc_name}}</p>
109
-              <p class="detailMessage"  v-html="doc.docintroduction"></p>
110
-            </div>
111
-          </div>
112
-          <!-- <div class="contentOne">
177
+            <!-- <div class="contentOne">
113 178
             <div class="img">
114 179
               <img src="static\images\img1.jpg" alt />
115 180
             </div>
@@ -117,46 +182,46 @@
117 182
               <p class="detailTitle">欧巧漫</p>
118 183
               <p class="detailMessage">苏安,女,主任医师,教授,妇产科主任,湖南省医学会理事、湖南省肿瘤学会委员瘤学肿瘤学会员......</p>
119 184
             </div>
120
-          </div> -->
185
+            </div>-->
186
+          </div>
121 187
         </div>
122
-      </div>
123
-
124 188
 
125
-      <!-- 科室环境 -->
126
-      <div class="dynamic" v-if="item.mode_type == 5">
127
-        <div class="common_title">
128
-          <div class="one"></div>
129
-          <div class="dynamicTxt">{{item.title}}</div>
130
-          <!-- <div class="more">
189
+        <!-- 科室环境 -->
190
+        <div class="dynamic" v-if="item.mode_type == 5">
191
+          <div class="common_title">
192
+            <div class="one"></div>
193
+            <div class="dynamicTxt">{{item.title}}</div>
194
+            <!-- <div class="more">
131 195
             <p>
132 196
               查看更多
133 197
               <i class="iconfont">&#xe632;</i>
134 198
             </p>
135
-          </div> -->
136
-        </div>
137
-        <div class="imgs">
138
-          <div class="swiper-container imgSwiper">
139
-            <div class="swiper-wrapper">
140
-              <div class="swiper-slide carousel" v-for="itms in item.Enviroimages" :key="itms.id">
141
-                <img class="img" :src="itms.enviroimages" preview="1" />
199
+            </div>-->
200
+          </div>
201
+          <div class="imgs">
202
+            <div class="swiper-container imgSwiper">
203
+              <div class="swiper-wrapper">
204
+                <div class="swiper-slide carousel" v-for="itms in item.Enviroimages" :key="itms.id">
205
+                  <img class="img" :src="itms.enviroimages" :preview="itms.modeid" />
206
+                </div>
142 207
               </div>
143 208
             </div>
144 209
           </div>
145 210
         </div>
146
-      </div>
147 211
 
148
-
149
-      <!-- 医院活动 -->
150
-      <div class="dynamic bottom" v-if="item.mode_type == 7">
151
-        <div class="common_title">
152
-          <div class="one"></div>
153
-          <div class="dynamicTxt">{{item.title}}</div>
154
-          <div class="more" @click="Activitiesmore(item.id,item.user_org_id)">
155
-            <p>
156
-              查看更多
157
-              <i class="iconfont">&#xe632;</i>
158
-            </p>
212
+        <!-- 医院活动 -->
213
+        <div class="dynamic bottom" v-if="item.mode_type == 7">
214
+          <div class="common_title">
215
+            <div class="one"></div>
216
+            <div class="dynamicTxt">{{item.title}}</div>
217
+            <div class="more" @click="Activitiesmore(item.id,item.user_org_id)">
218
+              <p>
219
+                查看更多
220
+                <i class="iconfont">&#xe632;</i>
221
+              </p>
222
+            </div>
159 223
           </div>
224
+<<<<<<< .mine
160 225
         </div>
161 226
         <div class="content" @click="Activitiesmore(item.id,item.user_org_id)">
162 227
           <div class="contentOne" v-for="it in Activitieslist" :key="it.id">
@@ -166,6 +231,17 @@
166 231
             <div class="detail">
167 232
               <p class="detailTitle">{{it.title}}</p>
168 233
               <!-- <div class="detailBox">
234
+=======
235
+          <div class="content">
236
+            <div class="contentOne" v-for="it in Activitieslist" :key="it.id">
237
+              <div class="img">
238
+                <img :src="it.poster_photo" style="widht:100%;height:100%" alt />
239
+              </div>
240
+              <div class="detail">
241
+                <p class="detailTitle">{{it.title}}</p>
242
+                <!-- <div class="detailBox">
243
+
244
+>>>>>>> .theirs
169 245
                 <div class="activityTime">
170 246
                   <p>
171 247
                     7月28日 08:30开始
@@ -175,13 +251,12 @@
175 251
                 <div class="people">
176 252
                   <p>100人已报名</p>
177 253
                 </div>
178
-              </div> -->
254
+                </div>-->
255
+              </div>
179 256
             </div>
180 257
           </div>
181 258
         </div>
182 259
       </div>
183
-
184
-       </div>
185 260
     </div>
186 261
     <!-- tab切换 -->
187 262
     <div class="tabs">
@@ -198,14 +273,19 @@
198 273
 
199 274
 <script>
200 275
 import Swiper from "swiper";
201
-import { getHospitaldata,getArticlelist,getActivities,getDefalutNavigationData } from '@/api/micro/micro'
276
+import {
277
+  getHospitaldata,
278
+  getArticlelist,
279
+  getActivities,
280
+  getDefalutNavigationData
281
+} from "@/api/micro/micro";
202 282
 export default {
203 283
   data() {
204 284
     return {
205 285
       bannerList: [],
206
-      patientModels:[],
207
-      Articlelist:[],
208
-      navigationdata:[],
286
+      patientModels: [],
287
+      Articlelist: [],
288
+      navigationdata: []
209 289
     };
210 290
   },
211 291
   methods: {
@@ -224,106 +304,110 @@ export default {
224 304
         slidesPerView: 2
225 305
       });
226 306
     },
227
-    getHospitaldata(orgid){
228
-      getHospitaldata(orgid).then(response=>{
229
-         if(response.data.state == 1){            
230
-             this.patientModels = response.data.data.patientModels;
231
-             console.log("数据是什么",this.patientModels)
232
-         }
233
-      })
307
+    getHospitaldata(orgid) {
308
+      getHospitaldata(orgid).then(response => {
309
+        if (response.data.state == 1) {
310
+          this.patientModels = response.data.data.patientModels;
311
+          console.log("数据是什么", this.patientModels);
312
+        }
313
+      });
314
+    },
315
+    getArticlelist(orgid) {
316
+      getArticlelist(orgid, this.Articlelist).then(response => {
317
+        if (response.data.state == 1) {
318
+          var articlelist = response.data.data.articlelists;
319
+          this.Articlelist = response.data.data.articlelists;
320
+          console.log("文章列表", this.Articlelist);
321
+        }
322
+      });
323
+    },
324
+    getActivities(orgid) {
325
+      getActivities(orgid, this.Activitieslist).then(response => {
326
+        if (response.data.state == 1) {
327
+          var activity = response.data.data.activity;
328
+          this.Activitieslist = response.data.data.activity;
329
+          console.log("活动列表", activity);
330
+          console.log(this.Activitieslist);
331
+        }
332
+      });
234 333
     },
235
-      getArticlelist(orgid){
236
-          getArticlelist(orgid,this.Articlelist).then(response=>{
237
-           if(response.data.state ==1){
238
-            var articlelist =  response.data.data.articlelists;
239
-             this.Articlelist =  response.data.data.articlelists;
240
-             console.log("文章列表",this.Articlelist);
241
-           } 
242
-        })
243
-       }, 
244
-      getActivities(orgid){
245
-        getActivities(orgid,this.Activitieslist).then(response=>{
246
-        if(response.data.state ==1){
247
-         var activity =   response.data.data.activity;
248
-         this.Activitieslist = response.data.data.activity;
249
-         console.log("活动列表",activity);
250
-         console.log(this.Activitieslist)
334
+    hispitalmore(id, orgid) {
335
+      this.$router.push({
336
+        path: "/hospitalIntroduction",
337
+        query: {
338
+          id: id,
339
+          orgid,
340
+          orgid
251 341
         }
252
-       })
253
-      },
254
-      hispitalmore(id,orgid){
255
-         this.$router.push({
256
-              path:'/hospitalIntroduction',
257
-              query:{
258
-                id:id,
259
-                orgid,orgid,
260
-              }
261
-         })
262
-      },
263
-
264
-      officemore(id,orgid){
265
-        this.$router.push({
266
-              path:'/officeIntroduction',
267
-              query:{
268
-                id:id,
269
-                orgid,orgid,
270
-              }
271
-         })
272
-      },
273
-      docmore(id,orgid){
274
-         this.$router.push({
275
-              path:'/medicalTeam',
276
-              query:{
277
-                id:id,
278
-                orgid,orgid,
279
-              }
280
-         })
281
-      },
282
-      articlemore(id,orgid){
283
-         this.$router.push({
284
-              path:'/news',
285
-              query:{
286
-                id:id,
287
-                orgid,orgid,
288
-              }
289
-         })
290
-      },
291
-      Activitiesmore(id,orgid){
292
-          this.$router.push({
293
-           path:'/activity',
294
-           query:{
295
-             id:id,
296
-             orgid,orgid,
297
-           }
298
-         }) 
299
-      },
300
-      getDefalutNavigationData(orgid){
301
-          getDefalutNavigationData(orgid).then(response=>{
302
-             if(response.data.state == 1){
303
-               var navigation =  response.data.data.navigation;
304
-               console.log("navigation是什么",navigation)
305
-               this.navigationdata = navigation; 
306
-             }
307
-           })
308
-      }
342
+      });
343
+    },
344
+
345
+    officemore(id, orgid) {
346
+      this.$router.push({
347
+        path: "/officeIntroduction",
348
+        query: {
349
+          id: id,
350
+          orgid,
351
+          orgid
352
+        }
353
+      });
354
+    },
355
+    docmore(id, orgid) {
356
+      this.$router.push({
357
+        path: "/medicalTeam",
358
+        query: {
359
+          id: id,
360
+          orgid,
361
+          orgid
362
+        }
363
+      });
364
+    },
365
+    articlemore(id, orgid) {
366
+      this.$router.push({
367
+        path: "/news",
368
+        query: {
369
+          id: id,
370
+          orgid,
371
+          orgid
372
+        }
373
+      });
374
+    },
375
+    Activitiesmore(id, orgid) {
376
+      this.$router.push({
377
+        path: "/activity",
378
+        query: {
379
+          id: id,
380
+          orgid,
381
+          orgid
382
+        }
383
+      });
384
+    },
385
+    getDefalutNavigationData(orgid) {
386
+      getDefalutNavigationData(orgid).then(response => {
387
+        if (response.data.state == 1) {
388
+          var navigation = response.data.data.navigation;
389
+          console.log("navigation是什么", navigation);
390
+          this.navigationdata = navigation;
391
+        }
392
+      });
393
+    }
309 394
   },
310
-  created(){
311
-     const orgid = this.$route.query.orgid;
312
-     console.log("机构id是",orgid);
313
-     this.getHospitaldata(orgid); 
314
-     this.getArticlelist(orgid);
315
-     this.getActivities(orgid);
316
-      this.getDefalutNavigationData(orgid);
395
+  created() {
396
+    const orgid = this.$route.query.orgid;
397
+    console.log("机构id是", orgid);
398
+    this.getHospitaldata(orgid);
399
+    this.getArticlelist(orgid);
400
+    this.getActivities(orgid);
401
+    this.getDefalutNavigationData(orgid);
317 402
   },
318 403
   mounted() {
319 404
     this.initSwiper();
320 405
   },
321 406
 
322
-
323 407
   updated() {
324 408
     this.initSwiper();
409
+    this.$previewRefresh();
325 410
   }
326
-
327 411
 };
328 412
 </script>
329 413
 
@@ -363,9 +447,9 @@ export default {
363 447
   width: 100px;
364 448
   height: 100px;
365 449
 }
366
-.imgtwo{
450
+.imgtwo {
367 451
   width: 100%;
368
-  height: 100%
452
+  height: 100%;
369 453
 }
370 454
 .btnList {
371 455
   display: flex;
@@ -469,13 +553,14 @@ export default {
469 553
       font-size: 15px;
470 554
       margin-top: 0.5rem;
471 555
       width: 12.6875rem;
472
-      height: 1.0rem;
556
+      height: 1rem;
557
+      line-height: 1rem;
473 558
       font-size: 0.9375rem;
474 559
       font-weight: 600;
475 560
       color: rgba(7, 18, 40, 1);
476 561
       overflow: hidden;
477 562
       text-overflow: ellipsis;
478
-       display: -webkit-box;
563
+      display: -webkit-box;
479 564
       -webkit-line-clamp: 1;
480 565
       -webkit-box-orient: vertical;
481 566
     }
@@ -487,9 +572,9 @@ export default {
487 572
       font-weight: 400;
488 573
       color: rgba(155, 155, 155, 1);
489 574
       line-height: 1.125rem;
490
-       overflow: hidden;
491
-       text-overflow: ellipsis;
492
-       display: -webkit-box;
575
+      overflow: hidden;
576
+      text-overflow: ellipsis;
577
+      display: -webkit-box;
493 578
       -webkit-line-clamp: 1;
494 579
       -webkit-box-orient: vertical;
495 580
       //  border: solid 1px red;
@@ -509,6 +594,7 @@ export default {
509 594
     box-shadow: 0px 6px 20px 0px rgba(0, 0, 0, 0.05);
510 595
     border-radius: 16px;
511 596
     padding: 1.125rem 1.3125rem 1.3125rem 1.3125rem;
597
+<<<<<<< .mine
512 598
      overflow: hidden;
513 599
     text-overflow: ellipsis;
514 600
     display: -webkit-box;
@@ -516,6 +602,15 @@ export default {
516 602
     -webkit-box-orient: vertical;
517 603
     // border: solid 1px red;
518 604
 
605
+=======
606
+    overflow: hidden;
607
+    text-overflow: ellipsis;
608
+
609
+
610
+
611
+
612
+
613
+>>>>>>> .theirs
519 614
   }
520 615
   .commonImg {
521 616
     width: 18.4375rem;
@@ -530,8 +625,7 @@ export default {
530 625
     color: rgba(60, 60, 60, 1);
531 626
     line-height: 1.375rem;
532 627
     // border: solid 1px red;
533
-    overflow: hidden;
534
-    text-overflow: ellipsis;
628
+
535 629
     display: -webkit-box;
536 630
     -webkit-line-clamp: 8;
537 631
     -webkit-box-orient: vertical;