微网站

src/scrm_pages/activity/activity.vue

@@ -1,116 +1,21 @@
 <template>
   <div>
     <div class="content">
-      <div class="contentOne">
+      <div class="contentOne" v-for="it in Activitieslist" :key="it.id"  @click="singleActivitInfo(it.id,it.user_org_id)">
         <div class="img">
-          <img src="static\images\img1.jpg" alt />
+          <img :src="it.poster_photo" style="width:100%;height:100%" alt />
         </div>
         <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
+          <p class="detailTitle">{{it.title}}</p>
           <div class="detailBox">
             <div class="activityTime">
               <p>
-                7月28日 08:30开始
-                深圳市南山区
+               {{staffCreateTime(it.start_time)}}开始<br>
+                <!-- {{it.address}} -->
               </p>
             </div>
             <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
+              <p>{{it.join_num}}</p>
             </div>
           </div>
         </div>
@@ -118,8 +23,47 @@
     </div>
   </div>
 </template>
-
-
+  <script>
+      import {getFileExtension,uParseTime} from '@/utils/tools'
+      import { Activitiesmore } from "@/api/micro/micro"
+      export default{
+        data(){
+            return{
+               Activitieslist:[],
+            }
+        },
+        methods:{
+           Activitiesmore(id,orgid){
+                Activitiesmore(id,orgid).then(response=>{
+                     if(response.data.state == 1){
+                       var activity =  response.data.data.activity;
+                       this.Activitieslist =  response.data.data.activity;                 
+                       console.log("获取活动列表",activity)
+                    }
+                })
+            },
+           staffCreateTime(time) {
+               return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+           },
+           singleActivitInfo(id,orgid){
+                this.$router.push({
+                    path:'/activityDetail',
+                    query:{
+                     id:id,
+                     orgid,orgid,
+                   }
+                })
+            }
+        },
+        created(){
+           const id = this.$route.query.id;
+            const orgid = this.$route.query.orgid;
+            console.log("id是多少",id)
+            console.log("orgid是多少",orgid)
+            this.Activitiesmore(id,orgid)
+        }
+      }
+  </script>
 <style lang="scss" scoped>
 .contentOne {
   margin: auto;

src/scrm_pages/activityDetail/activityDetail.vue

@@ -1,48 +1,80 @@
 <template>
   <div>
     <div class="banner">
-      <img src="static\images\banner.jpg" alt />
+      <img :src="activitys.poster_photo" style="width:100%;height:100%" alt />
     </div>
     <div class="headline">
-      <div class="top">与孩子一起挑选采摘新鲜有机马陆葡萄，体验采摘乐趣</div>
-      <div class="bottom">
+      <div class="top">{{activitys.title}}</div>
+      <!-- <div class="bottom">
         <p class="browse">
           <i class="iconfont">&#xe629;</i>
           <span>浏览400次</span>
         </p>
-      </div>
+      </div> -->
     </div>
     <div class="detail">
       <p class="row">
         <i class="iconfont">&#xe608;</i>
-        <span>06-19 14:00 至 17:00</span>
+        <span>{{staffCreateTime(activitys.start_time)}}</span>
       </p>
       <p class="row">
         <i class="iconfont">&#xe608;</i>
-        <span>广东省深圳市南山去时代大厦3楼赛盒科技观海...</span>
+        <span>{{activitys.address}}</span>
       </p>
       <p class="row">
         <i class="iconfont">&#xe608;</i>
-        <span>已报名49人 / 限55人</span>
+        <span>{{activitys.join_num}} / {{activitys.limit_num}}</span>
       </p>
       <p class="row">
         <i class="iconfont">&#xe608;</i>
-        <span>0755-8548673</span>
+        <span>{{activitys.phone_number}}</span>
       </p>
     </div>
     <div class="introduce">
       <div class="common_title">
         <div class="one"></div>
-        <div class="dynamicTxt">活动介绍</div>
+        <div class="dynamicTxt">报名须知</div>
       </div>
       <div
         class="introduceDetail"
-      >深圳市南山区人民医院(深圳市第六人民医院)，坐落于深圳经济特区西部南头半岛中心区，是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院...</div>
+      >{{activitys.sign_up_notice}}</div>
     </div>
-    <div class="apply">我要报名</div>
+    <!-- <div class="apply">我要报名</div> -->
   </div>
 </template>
-
+ <script>
+        import {uParseTime} from "@/utils/tools";
+        import { singleActivitInfo } from "@/api/micro/micro"
+        export default{
+          data(){
+             return{
+                activitys:[],
+             }
+          },
+          methods:{
+              staffCreateTime(time) {
+                console.log("time是多少",time)
+               return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");       
+              },
+            singleActivitInfo(id,orgid){
+               singleActivitInfo(id,orgid).then(response=>{
+                  if(response.data.state ==1){
+                  var activitys = response.data.data.activity;
+                  this.activitys = activitys;
+                  console.log("activitys",activitys)
+                }   
+               })
+            }
+          },
+          created(){
+            const id = this.$route.query.id;
+            const orgid = this.$route.query.orgid;
+            console.log("id是多少",id)
+            console.log("orgid是多少",orgid)
+            this.singleActivitInfo(id,orgid)   
+          }
+        }
+ </script>
 
 <style lang="scss" scoped>
 .banner {

src/scrm_pages/microHome/microHome.vue

@@ -45,7 +45,7 @@
             </div>
             <div class="detail">
               <p class="detailTitle">{{it.title}}</p>
-              <!-- <p class="detailMessage">高三学生周某出生在潍坊市固堤镇一个普通的农村家庭，她的父母一直希望成绩优异的女儿能考上一所好...</p> -->
+              <!-- <p class="detailMessage"></p> -->
             </div>
           </div>
         </div>
@@ -127,12 +127,12 @@
         <div class="common_title">
           <div class="one"></div>
           <div class="dynamicTxt">{{item.title}}</div>
-          <div class="more">
+          <!-- <div class="more">
             <p>
               查看更多
               <i class="iconfont">&#xe632;</i>
             </p>
-          </div>
+          </div> -->
         </div>
         <div class="imgs">
           <div class="swiper-container imgSwiper">
@@ -152,7 +152,7 @@
         <div class="common_title">
           <div class="one"></div>
           <div class="dynamicTxt">{{item.title}}</div>
-          <div class="more">
+          <div class="more" @click="Activitiesmore(item.id,item.user_org_id)">
             <p>
               查看更多
               <i class="iconfont">&#xe632;</i>
@@ -187,21 +187,9 @@
     <!-- tab切换 -->
     <div class="tabs">
       <ul class="tabList">
-        <li class="tabOne">
-          <img src="static\images\home.jpg" alt />
-          <span>首页</span>
-        </li>
-        <li class="tabOne">
-          <img src="static\images\msg.jpg" alt />
-          <span>在线客服</span>
-        </li>
-        <li class="tabOne">
-          <img src="static\images\tel.jpg" alt />
-          <span>电话</span>
-        </li>
-        <li class="tabOne">
-          <img src="static\images\service.jpg" alt />
-          <span>联系我们</span>
+        <li class="tabOne" v-for="item in this.navigationdata" :key="item.id">
+          <img :src="item.navimages" alt />
+          <span>{{item.navtitle}}</span>
         </li>
       </ul>
     </div>
@@ -211,13 +199,14 @@
 
 <script>
 import Swiper from "swiper";
-import { getHospitaldata,getArticlelist,getActivities } from '@/api/micro/micro'
+import { getHospitaldata,getArticlelist,getActivities,getDefalutNavigationData } from '@/api/micro/micro'
 export default {
   data() {
     return {
       bannerList: [],
       patientModels:[],
       Articlelist:[],
+      navigationdata:[],
     };
   },
   methods: {
@@ -299,6 +288,24 @@ export default {
                 orgid,orgid,
               }
          })
+      },
+      Activitiesmore(id,orgid){
+          this.$router.push({
+           path:'/activity',
+           query:{
+             id:id,
+             orgid,orgid,
+           }
+         }) 
+      },
+      getDefalutNavigationData(orgid){
+          getDefalutNavigationData(orgid).then(response=>{
+             if(response.data.state == 1){
+               var navigation =  response.data.data.navigation;
+               console.log("navigation是什么",navigation)
+               this.navigationdata = navigation; 
+             }
+           })
       }
   },
   created(){
@@ -307,18 +314,15 @@ export default {
      this.getHospitaldata(orgid); 
      this.getArticlelist(orgid);
      this.getActivities(orgid);
+      this.getDefalutNavigationData(orgid);
   },
   mounted() {
     this.initSwiper();
-<<<<<<< .mine
-  },
-  updated(){
-    this.initSwiper();
-=======
   },
+
+
   updated() {
     this.initSwiper();
->>>>>>> .theirs
   }
 
 };
@@ -462,17 +466,12 @@ export default {
     margin-left: 0.8125rem;
     width: 13.125rem;
     .detailTitle {
-<<<<<<< .mine
       margin-top: 8px;
-      width: 203px;
-      height: 15px;
       font-size: 15px;
-=======
       margin-top: 0.5rem;
       width: 12.6875rem;
-      height: 1.0625rem;
+      height: 1.0rem;
       font-size: 0.9375rem;
->>>>>>> .theirs
       font-weight: 600;
       color: rgba(7, 18, 40, 1);
       overflow: hidden;
@@ -482,17 +481,10 @@ export default {
       -webkit-box-orient: vertical;
     }
     .detailMessage {
-<<<<<<< .mine
-      margin-top: 4px;
-      width: 212px;
-      height: 52px;
-      font-size: 13px;
-=======
       margin-top: 0.25rem;
       width: 13.25rem;
       height: 3.625rem;
       font-size: 0.75rem;
->>>>>>> .theirs
       font-weight: 400;
       color: rgba(155, 155, 155, 1);
       line-height: 1.125rem;
@@ -524,19 +516,10 @@ export default {
     border-radius: 10px;
   }
   .commonMessage {
-<<<<<<< .mine
-    // margin-top: 22px;
-    width: 284px;
-    // height: 81px;
-    height: 240px;
-    font-size: 14px;
-=======
     margin-top: 1.375rem;
     width: 17.75rem;
     height: 5.0625rem;
     font-size: 0.875rem;
-
->>>>>>> .theirs
     color: rgba(60, 60, 60, 1);
     line-height: 1.375rem;
     // border: solid 1px red;

src/scrm_pages/news/news.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="content">
 
-      <div class="contentOne"  v-for="it in articlelist" :key="it.id">
+      <div class="contentOne"  v-for="it in articlelist" :key="it.id" @click="singleArticleInfo(it.id,it.user_org_id)">
         <div class="img">
           <img :src="it.imgs" style="width:100%;height:100%" alt />
         </div>
@@ -15,7 +15,7 @@
   </div>
 </template>
   <script>
-     import { articlemore,singleArticleInfo } from "@/api/micro/micro"
+     import { articlemore } from "@/api/micro/micro"
       export default{
         data(){
           return{
@@ -32,6 +32,15 @@
                }
             })  
           },
+           singleArticleInfo(id,orgid){
+            this.$router.push({
+                path:"/activityDetail",
+                query:{
+                    id:id,
+                    orgid:orgid,
+                }
+            })
+          }
         },
         created(){
            const id = this.$route.query.id;
@@ -66,17 +75,10 @@
     margin-left: 0.8125rem;
     width: 13.125rem;
     .detailTitle {
-<<<<<<< .mine
-      margin-top: 8px;
-      width: 203px;
-      height: 15px;
-      font-size: 15px;
-=======
       margin-top: 0.5rem;
       width: 12.6875rem;
       height: 1.0625rem;
       font-size: 0.9375rem;
->>>>>>> .theirs
       font-weight: 600;
       color: rgba(7, 18, 40, 1);
       overflow: hidden;