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

src/assets/styles/iconfont.css

@@ -1,12 +1,12 @@
 @font-face {
   font-family: "iconfont"; /* project id 1470572 */
-  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot");
-  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot?#iefix")
+  src: url("//at.alicdn.com/t/font_1470572_akb6p0j0dy9.eot");
+  src: url("//at.alicdn.com/t/font_1470572_akb6p0j0dy9.eot?#iefix")
       format("embedded-opentype"),
-    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff2") format("woff2"),
-    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff") format("woff"),
-    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.ttf") format("truetype"),
-    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.svg#iconfont") format("svg");
+    url("//at.alicdn.com/t/font_1470572_akb6p0j0dy9.woff2") format("woff2"),
+    url("//at.alicdn.com/t/font_1470572_akb6p0j0dy9.woff") format("woff"),
+    url("//at.alicdn.com/t/font_1470572_akb6p0j0dy9.ttf") format("truetype"),
+    url("//at.alicdn.com/t/font_1470572_akb6p0j0dy9.svg#iconfont") format("svg");
 }
 
 .iconfont {

src/router/index.js

@@ -120,7 +120,7 @@ var _constant_router_map = [
   },
   {
     path: "/",
-    component: () => import("@/scrm_pages/contact/contact")
+    component: () => import("@/scrm_pages/news/news")
   },
 
   // 医院介绍详情路由

src/scrm_pages/activityDetail/activityDetail.vue

@@ -10,23 +10,23 @@
           <i class="iconfont">&#xe629;</i>
           <span>浏览400次</span>
         </p>
-      </div> -->
+      </div>-->
     </div>
     <div class="detail">
       <p class="row">
-        <i class="iconfont">&#xe608;</i>
+        <i class="iconfont">&#xe614;</i>
         <span>{{staffCreateTime(activitys.start_time)}}</span>
       </p>
       <p class="row">
-        <i class="iconfont">&#xe608;</i>
+        <i class="iconfont">&#xe668;</i>
         <span>{{activitys.address}}</span>
       </p>
       <p class="row">
-        <i class="iconfont">&#xe608;</i>
+        <i class="iconfont">&#xe61f;</i>
         <span>{{activitys.join_num}} / {{activitys.limit_num}}</span>
       </p>
       <p class="row">
-        <i class="iconfont">&#xe608;</i>
+        <i class="iconfont">&#xe6a9;</i>
         <span>{{activitys.phone_number}}</span>
       </p>
     </div>
@@ -35,46 +35,44 @@
         <div class="one"></div>
         <div class="dynamicTxt">报名须知</div>
       </div>
-      <div
-        class="introduceDetail"
-      >{{activitys.sign_up_notice}}</div>
+      <div class="introduceDetail">{{activitys.sign_up_notice}}</div>
     </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)   
-          }
+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);
         }
- </script>
+      });
+    }
+  },
+  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 {
@@ -86,7 +84,7 @@
   }
 }
 .headline {
-  position: fixed;
+  position: relative;
   width: 20.875rem;
   height: 6.5625rem;
   margin-top: -1.25rem;
@@ -114,7 +112,7 @@
 }
 .detail {
   margin-left: 1.25rem;
-  margin-top: 5.625rem;
+  // margin-top: 5.625rem;
   .row {
     margin: 0.625rem 0;
     i {

src/scrm_pages/microHome/microHome.vue

@@ -416,6 +416,7 @@ export default {
 .imgtwo {
   width: 100%;
   height: 100%;
+  border-radius: 0.75rem;
 }
 .btnList {
   display: flex;
@@ -570,9 +571,9 @@ export default {
     border-radius: 10px;
   }
   .commonMessage {
-    margin-top: 1.375rem;
+    // margin-top: 1.375rem;
     width: 17.75rem;
-    height: 15rem;
+    height: 14.375rem;
     font-size: 0.875rem;
     color: rgba(60, 60, 60, 1);
     line-height: 1.375rem;