更新

src/views/common/home.vue

@@ -494,7 +494,7 @@ export default {
                 { url: require('@/assets/images/zyfb.png'), name: '资源发布', path: '/service/characteristic' },
                 { url: require('@/assets/images/zcfw.png'), name: '政策服务', path: '/zhaoshang/list' },
                 { url: require('@/assets/images/yqpx.png'), name: '园区培训', path: '/service/activities' },
-                { url: require('@/assets/images/qyhd.png'), name: '企业活动', path: '/service/educate' }
+                { url: require('@/assets/images/qyhd.png'), name: '园区活动', path: '/service/educate' }
             ],
             notices: {
                 park: [

src/views/common/homepage.vue

@@ -34,7 +34,7 @@
                       <p>
                         <router-link
                           :to="{ path: '/service/activities' }"
-                        >企业活动</router-link>
+                        >园区活动</router-link>
                       </p>
                       <p>
                         <router-link
@@ -127,7 +127,7 @@
                         <router-link
                           exact-active-class="nav-active"
                           :to="{ path: '/service/activities' }"
-                        >企业活动</router-link>
+                        >园区活动</router-link>
                       </p>
                       <p @click="menuBtn()">
                         <router-link

src/views/services/activities/detail1.vue

@@ -1,127 +1,127 @@
 <template>
-    <div style="background: #f0f0f0;padding-bottom:50px">
-        <div class="banner">
-            <img src="~@/assets/images/yqhd.jpg" alt="">
-        </div>
-        <div class="bread">
-            <div>
-                <span>当前位置:首页-园区活动-园区活动详情</span>
-            </div>
+  <div style="background: #f0f0f0;padding-bottom:50px">
+    <div class="banner">
+      <img src="~@/assets/images/yqhd.jpg" alt="">
+    </div>
+    <div class="bread">
+      <div>
+        <span>当前位置:首页-园区活动-园区活动详情</span>
+      </div>
+    </div>
+    <div class="smart-device">
+      <div class="smart-title">
+        <span><span>园区活动</span>PARK AVTIVITIES</span>
+      </div>
+      <div class="smart-device-content">
+        <div class="titles">
+          <h3>{{ activityDetail.activityName }}</h3>
         </div>
-        <div class="smart-device">
-            <div class="smart-title">
-                <span><span>园区活动</span>PARK AVTIVITIES</span>
-            </div>
-            <div class="smart-device-content">
-                <div class="titles">
-                    <h3>{{ activityDetail.activityName }}</h3>
-                </div>
-                <div class="list-content">
-                    <span>活动详情</span>
-                    <h3>活动主办方</h3>
-                    <p>{{ activityDetail.activityHold }}</p>
-                    <h3>活动内容</h3>
-                    <p>{{ activityDetail.activityContent }} </p>
-                    <h3>活动时间</h3>
-                    <p> {{ activityDetail.activityStartTime }} — {{ activityDetail.activityEndTime }}</p>
-                    <h3>活动地址</h3>
-                    <p>{{ activityDetail.activityAddress }}</p>
-                    <h3>联系电话</h3>
-                    <p>{{ activityDetail.contactPhone }}</p>
-                    <h3>报名条件</h3>
-                    <p>{{ activityDetail.registrationConditions }}</p>
-<!--                    <div>-->
-<!--                        <p>以Josh Bersin & IBM Institute 的 HR 3.0 为主线，讲解传统HR （1.0）向战略型HR （3.0）转型的十大关键举措，用实操案例聚集三大主题：敏捷组织，员工体验，HR能力转型，提供帮助企业及人力资源自身提升的战略与方法，推动业务的突破。</p>-->
-<!--                        <p>1、数字化时代企业挑战及员工特点；</p>-->
-<!--                        <p>2、数字化时代人力资源10大关键举措3.敏捷组织，员工体验，HR能力转型（Dave Urich 第八轮胜任力模型）案例。</p>-->
-<!--                        <img src="~@/assets/images/pxxq.png" alt="">-->
-<!--                    </div>-->
-                    <button @click="detail(1)" v-if="activityDetail.registrationStatus=='1'">我要报名</button>
-                </div>
-            </div>
+        <div class="list-content">
+          <span>活动详情</span>
+          <h3>活动主办方</h3>
+          <p>{{ activityDetail.activityHold }}</p>
+          <h3>活动内容</h3>
+          <p v-html="activityDetail.activityContent"></p>
+          <h3>活动时间</h3>
+          <p> {{ activityDetail.activityStartTime }} — {{ activityDetail.activityEndTime }}</p>
+          <h3>活动地址</h3>
+          <p>{{ activityDetail.activityAddress }}</p>
+          <h3>联系电话</h3>
+          <p>{{ activityDetail.contactPhone }}</p>
+<!--          <h3>报名条件</h3>-->
+<!--          <p>{{ activityDetail.registrationConditions }}</p>-->
+          <!--                    <div>-->
+          <!--                        <p>以Josh Bersin & IBM Institute 的 HR 3.0 为主线，讲解传统HR （1.0）向战略型HR （3.0）转型的十大关键举措，用实操案例聚集三大主题：敏捷组织，员工体验，HR能力转型，提供帮助企业及人力资源自身提升的战略与方法，推动业务的突破。</p>-->
+          <!--                        <p>1、数字化时代企业挑战及员工特点；</p>-->
+          <!--                        <p>2、数字化时代人力资源10大关键举措3.敏捷组织，员工体验，HR能力转型（Dave Urich 第八轮胜任力模型）案例。</p>-->
+          <!--                        <img src="~@/assets/images/pxxq.png" alt="">-->
+          <!--                    </div>-->
+          <button v-if="activityDetail.registrationStatus=='1'" @click="detail(1)">我要报名</button>
         </div>
-      <Message :show-dialog="showInfo" @closePop="closeMessage"/>
+      </div>
     </div>
+    <Message :show-dialog="showInfo" @closePop="closeMessage" />
+  </div>
 </template>
 
 <script>
-import {getActivityById} from "@/service/api_service";
+import { getActivityById } from '@/service/api_service'
 
 import Message from '@/views/message/index'
 export default {
-        components: {
-          Message
-        },
-        data () {
-            return {
-              showInfo:false,
-                active:1,
-                zsList:[
-                    {
-                        img:'zs1.png',
-                        name:'专项扶持政策',
-                        eventIndex:1,
-                        detail:''
-                    },
-                    {
-                        img:'zs2.png',
-                        name:'税收优惠',
-                        eventIndex:2,
-                        detail:''
-                    },
-                    {
-                        img:'zs3.png',
-                        name:'奖励措施',
-                        eventIndex:3,
-                        detail:''
-                    },
-                ],
-              id:'',
-              activityDetail: '',
-              number:0
-            }
-        },
-        mounted() {
-            document.documentElement.scrollTop = document.body.scrollTop =0; //回到顶部
-            this.id = this.$route.query.id
-           this.getActivityById()
-        },
-        methods: {
-          getActivityById() {
+    components: {
+        Message
+    },
+    data() {
+        return {
+            showInfo: false,
+            active: 1,
+            zsList: [
+                {
+                    img: 'zs1.png',
+                    name: '专项扶持政策',
+                    eventIndex: 1,
+                    detail: ''
+                },
+                {
+                    img: 'zs2.png',
+                    name: '税收优惠',
+                    eventIndex: 2,
+                    detail: ''
+                },
+                {
+                    img: 'zs3.png',
+                    name: '奖励措施',
+                    eventIndex: 3,
+                    detail: ''
+                }
+            ],
+            id: '',
+            activityDetail: '',
+            number: 0
+        }
+    },
+    mounted() {
+        document.documentElement.scrollTop = document.body.scrollTop = 0 // 回到顶部
+        this.id = this.$route.query.id
+        this.getActivityById()
+    },
+    methods: {
+        getActivityById() {
             const _this = this
             getActivityById(this.id, null).then((res) => {
-              if (res.data) {
-                _this.activityDetail = res.data
-                _this.activityDetail.registrationStartTime = this.$common.transBaseDateTime(
-                    _this.activityDetail.registrationStartTime
-                )
-                _this.activityDetail.registrationEndTime = this.$common.transBaseToDateTime(
-                    _this.activityDetail.registrationEndTime
-                )
-                _this.activityDetail.activityStartTime = this.$common.transBaseDateTime(
-                    _this.activityDetail.activityStartTime
-                )
-                _this.activityDetail.activityEndTime = this.$common.transBaseToDateTime(
-                    _this.activityDetail.activityEndTime
-                )
-                if (_this.activityDetail.collectorsStatus === '2') {
-                  _this.active = true
-                } else {
-                  _this.active = false
+                if (res.data) {
+                    _this.activityDetail = res.data
+                    _this.activityDetail.registrationStartTime = this.$common.transBaseDateTime(
+                        _this.activityDetail.registrationStartTime
+                    )
+                    _this.activityDetail.registrationEndTime = this.$common.transBaseToDateTime(
+                        _this.activityDetail.registrationEndTime
+                    )
+                    _this.activityDetail.activityStartTime = this.$common.transBaseDateTime(
+                        _this.activityDetail.activityStartTime
+                    )
+                    _this.activityDetail.activityEndTime = this.$common.transBaseToDateTime(
+                        _this.activityDetail.activityEndTime
+                    )
+                    if (_this.activityDetail.collectorsStatus === '2') {
+                        _this.active = true
+                    } else {
+                        _this.active = false
+                    }
+                    _this.number = _this.activityDetail.activityQuota - _this.activityDetail.partakeNumber
                 }
-                _this.number = _this.activityDetail.activityQuota - _this.activityDetail.partakeNumber
-              }
             })
-          },
-          closeMessage(){
-            this.showInfo =false
-          },
-          detail(index){
-            // this.$router.push({path:'/zhaoshang/detail1?smallType='+index})
-            this.showInfo =true
-          }
         },
-    };
+        closeMessage() {
+            this.showInfo = false
+        },
+        detail(index) {
+            // this.$router.push({path:'/zhaoshang/detail1?smallType='+index})
+            this.showInfo = true
+        }
+    }
+}
 </script>
 
 <style scoped>

src/views/services/activities/index.vue

@@ -5,12 +5,12 @@
     </div>
     <div class="bread">
       <div>
-        <span>当前位置:首页-<span style="color: rgba(75, 175, 227, 1)">企业活动</span></span>
+        <span>当前位置:首页-<span style="color: rgba(75, 175, 227, 1)">园区活动</span></span>
         <div>
           <ul class="area-nav">
             <li><router-link :to="{path: '/service/characteristic'}">资源发布</router-link></li>
 <!--            <li><router-link :to="{path: '/zhaoshang/list'}">政策服务</router-link></li>-->
-            <li class="tabs"><router-link :to="{path: '/service/activities'}">企业活动</router-link></li>
+            <li class="tabs"><router-link :to="{path: '/service/activities'}">园区活动</router-link></li>
             <li><router-link :to="{path: '/service/educate'}">园区培训</router-link></li>
           </ul>
         </div>

src/views/services/characteristic/index.vue

@@ -10,7 +10,7 @@
           <ul class="area-nav">
             <li class="tabs"><router-link :to="{path: '/service/characteristic'}">资源发布</router-link></li>
 <!--            <li><router-link :to="{path: '/zhaoshang/list'}">政策服务</router-link></li>-->
-            <li><router-link :to="{path: '/service/activities'}">企业活动</router-link></li>
+            <li><router-link :to="{path: '/service/activities'}">园区活动</router-link></li>
             <li><router-link :to="{path: '/service/educate'}">园区培训</router-link></li>
           </ul>
         </div>

src/views/services/educate/index.vue

@@ -10,7 +10,7 @@
           <ul class="area-nav">
             <li><router-link :to="{path: '/service/characteristic'}">资源发布</router-link></li>
 <!--            <li><router-link :to="{path: '/zhaoshang/list'}">政策服务</router-link></li>-->
-            <li><router-link :to="{path: '/service/activities'}">企业活动</router-link></li>
+            <li><router-link :to="{path: '/service/activities'}">园区活动</router-link></li>
             <li class="tabs"><router-link :to="{path: '/service/educate'}">园区培训</router-link></li>
           </ul>
         </div>
@@ -51,7 +51,7 @@
                   <div class="a-status">
                     <span v-if="item.status==2" class="over">已结束</span>
                     <span v-else class="loading">报名中</span>
-                    <span v-if="item.status==1"class="loading">线下</span>
+                    <span v-if="item.onlineOfflineStatus=='线下'" class="loading">线下</span>
                   </div>
                   <div class="a-option">
                     <span>参与人数:{{ item.num }}</span>
@@ -61,6 +61,7 @@
                 <div v-else class="detail-btn">
                   <div class="a-status">
                     <span class="loading" style="background:#C5B2ED">可观看</span>
+                    <span v-if="item.onlineOfflineStatus=='线上'" class="loading2">线上</span>
                   </div>
                   <div class="a-option">
                     <span style="background: rgba(75, 175, 227, 1);color: white">查看详情</span>
@@ -95,7 +96,7 @@ export default {
     data() {
         return {
             dc_key: ['trainType'],
-            active: '',
+            active: 0,
             total: 0,
             currentPage: 1,
             zsList: [
@@ -337,7 +338,10 @@ export default {
       background: #666;
     }
     .a-status .loading{
-      background: #FF6A00;
+      background: #da8a48;
+    }
+    .a-status .loading2{
+      background: #229f59;
     }
     .a-option span{
       color: #666;

src/views/services/periphery/index.vue

@@ -10,7 +10,7 @@
           <ul class="area-nav">
             <li><router-link :to="{path: '/service/characteristic'}">资源发布</router-link></li>
             <li class="tabs"><router-link :to="{path: '/service/periphery'}">政策服务</router-link></li>
-            <li><router-link :to="{path: '/service/activities'}">企业活动</router-link></li>
+            <li><router-link :to="{path: '/service/activities'}">园区活动</router-link></li>
             <li><router-link :to="{path: '/service/educate'}">园区培训</router-link></li>
           </ul>
         </div>

src/views/zhaoshang/index.vue

@@ -10,7 +10,7 @@
 <!--          <ul class="area-nav">-->
 <!--            <li><router-link :to="{path: '/service/characteristic'}">资源发布</router-link></li>-->
 <!--            <li class="tabs"><router-link :to="{path: '/zhaoshang/list'}">政策服务</router-link></li>-->
-<!--            <li><router-link :to="{path: '/service/activities'}">企业活动</router-link></li>-->
+<!--            <li><router-link :to="{path: '/service/activities'}">园区活动</router-link></li>-->
 <!--            <li ><router-link :to="{path: '/service/educate'}">园区培训</router-link></li>-->
 <!--          </ul>-->
 <!--        </div>-->