活动管理

src/config/server.js

@@ -17,12 +17,12 @@
 // export const SERVER_WS_URL = "wss://apiy.thuers.com"; // websocket
 
 // 测试
-// export const SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; // 正式环境
-// export const DEVELOPMENT_SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; //开发环境
-// export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
+export const SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; // 正式环境
+export const DEVELOPMENT_SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; //开发环境
+export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
 
 // 正式
-export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
-export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
-export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
+// export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
+// export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
+// export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
 

src/views/base/active/Active.vue

@@ -6,68 +6,68 @@
         <div class="content-item">
           <div class="content-item-tit">活动状态</div>
           <el-checkbox
+            @change="handleCheckAllChange($event,3, statusList)"
             class="is-check-all"
             v-model="checkAllStatus"
-            @change="handleCheckAllChange($event,3, statusList)"
           >全部
           </el-checkbox>
-          <el-checkbox-group v-model="isStatus"
-                             @change="handleCheckedItemChange($event,3, statusList)">
-            <el-checkbox v-for="(item, index) in statusList"
-                         :key="index"
+          <el-checkbox-group @change="handleCheckedItemChange($event,3, statusList)"
+                             v-model="isStatus">
+            <el-checkbox :key="index"
                          :label="item.lableId"
-                         border>{{item.lableName}}
+                         border
+                         v-for="(item, index) in statusList">{{item.lableName}}
             </el-checkbox>
           </el-checkbox-group>
         </div>
-        <div class="content-item" v-for="(item, index) in labelList" :key="index">
+        <div :key="index" class="content-item" v-for="(item, index) in labelList">
           <div class="content-item-tit">{{item.categoryName}}</div>
           <el-checkbox
+            @change="handleCheckAllChange($event,1, item.labelLists, index)"
             class="is-check-all"
             v-model="checkAll[index]"
-            @change="handleCheckAllChange($event,1, item.labelLists, index)"
           >全部
           </el-checkbox>
-          <el-checkbox-group v-model="selectIds[index]"
-                             @change="handleCheckedItemChange($event,1, item.labelLists, index)">
-            <el-checkbox v-for="(item2, index2) in item.labelLists"
-                         :key="index2"
+          <el-checkbox-group @change="handleCheckedItemChange($event,1, item.labelLists, index)"
+                             v-model="selectIds[index]">
+            <el-checkbox :key="index2"
                          :label="item2.lableId"
-                         border>{{item2.lableName}}
+                         border
+                         v-for="(item2, index2) in item.labelLists">{{item2.lableName}}
             </el-checkbox>
           </el-checkbox-group>
         </div>
         <div class="content-item">
           <div class="content-item-tit">活动天数</div>
-          <el-input v-model="queryForm.minDay"
-                    type="number"
-                    :min="1"
-                    placeholder="最小天数"
+          <el-input :min="1"
                     class="ml"
                     oninput="value=value.replace(/^0/g, '')"
+                    placeholder="最小天数"
+                    type="number"
+                    v-model="queryForm.minDay"
           ></el-input>
           <div class="line">——</div>
-          <el-input v-model="queryForm.maxDay"
-                    type="number"
-                    :min="1"
-                    placeholder="最大天数"
+          <el-input :min="1"
                     oninput="value=value.replace(/^0/g, '')"
+                    placeholder="最大天数"
+                    type="number"
+                    v-model="queryForm.maxDay"
           ></el-input>
         </div>
         <div class="content-item">
           <div class="content-item-tit">本站报名</div>
           <el-checkbox
+            @change="handleCheckAllChange($event,2, supportList)"
             class="is-check-all"
             v-model="checkAllSupp"
-            @change="handleCheckAllChange($event,2, supportList)"
           >全部
           </el-checkbox>
-          <el-checkbox-group v-model="isSupport"
-                             @change="handleCheckedItemChange($event,2, supportList)">
-            <el-checkbox v-for="(item, index) in supportList"
-                         :key="index"
+          <el-checkbox-group @change="handleCheckedItemChange($event,2, supportList)"
+                             v-model="isSupport">
+            <el-checkbox :key="index"
                          :label="item.lableId"
-                         border>{{item.lableName}}
+                         border
+                         v-for="(item, index) in supportList">{{item.lableName}}
             </el-checkbox>
             <div class="btn-area">
               <el-button @click="resetHandle">重置</el-button>
@@ -80,8 +80,8 @@
 
     <template v-if="activeList.length>0">
       <div class="active-list">
-        <div class="active-list-item" v-for="(item, index) in activeList" :key="index"
-             :style="animationTime(index)">
+        <div :key="index" :style="animationTime(index)" class="active-list-item"
+             v-for="(item, index) in activeList">
           <div class="inner">
             <div class="active-list-item-bg">
               <el-image :src="item.activityCover" fit="cover"></el-image>
@@ -89,30 +89,33 @@
             <div class="active-list-item-cont">
               <div class="active-list-item-cont-header">
                 <div class="label" v-if="item.activityLabel">
-                <span v-for="(item2, index2) in item.activityLabel.split(',')"
-                      :key="index2">{{item2}}</span>
+                <span :key="index2"
+                      v-for="(item2, index2) in item.activityLabel.split(',')">{{item2}}</span>
                 </div>
                 <div class="title">{{item.name}}</div>
               </div>
               <div class="active-list-item-cont-txt1">
                 <div class="sign-box" v-if="item.schoolName">
-                  <div class="sign"
-                       v-for="(item2, index2) in item.schoolName.split(',')"
-                       :key="index2">{{item2}}
+                  <div :key="index2"
+                       class="sign"
+                       v-for="(item2, index2) in item.schoolName.split(',')">{{item2}}
                   </div>
                 </div>
                 <div class="sign-box" v-if="item.subjectName">
-                  <div class="sign"
-                       v-for="(item2, index2) in item.subjectName.split(',')"
-                       :key="index2">{{item2}}
+                  <div :key="index2"
+                       class="sign"
+                       v-for="(item2, index2) in item.subjectName.split(',')">{{item2}}
                   </div>
                 </div>
               </div>
-              <div class="active-list-item-cont-txt2">{{formatYMD(item.activityStartTime)}} （共{{item.activityTime}}天）
+              <div class="active-list-item-cont-txt2" v-if="item.activityStartTime!=null">
+                {{formatYMD(item.activityStartTime)}} （共{{item.activityTime}}天）
+              </div>
+              <div class="active-list-item-cont-txt3" v-if="item.bmEndTime!=null">
+                报名截止时间：{{formatYMDChina(item.bmEndTime)}}
               </div>
-              <div class="active-list-item-cont-txt3">报名截止时间：{{formatYMDChina(item.bmEndTime)}}</div>
             </div>
-            <div class="active-list-item-bottom" @click="toActive(item.id)">
+            <div @click="toActive(item.id)" class="active-list-item-bottom">
               <div>查看详情</div>
               <i class="el-icon-right"></i>
             </div>
@@ -121,13 +124,13 @@
       </div>
       <div class="pagination-area">
         <el-pagination
-          background
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
           :current-page.sync="queryForm.pageNum"
           :page-size="queryForm.pageSize"
-          layout="total, prev, pager, next, jumper"
-          :total="total">
+          :total="total"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          background
+          layout="total, prev, pager, next, jumper">
         </el-pagination>
       </div>
     </template>
@@ -138,7 +141,7 @@
 </template>
 
 <script>
-  import {LabelType, HotList} from "r/base/active";
+  import {HotList, LabelType} from "r/base/active";
 
   export default {
     name: "Active",
@@ -410,9 +413,9 @@
         }
       },
       //查看详情
-      toActive(id){
-        this.commonApi(36,id)
-        this.$router.push('/active/'+id);
+      toActive(id) {
+        this.commonApi(36, id)
+        this.$router.push('/active/' + id);
       },
     }
   }

src/views/base/active/ActiveInfo.vue

@@ -9,15 +9,17 @@
         <el-image :src="activeInfo.activityCover" fit="cover"/>
       </div>
       <div class="active-info-cont">
-
         <div class="active-info-cont-header">
-          <template v-if="activeInfo.activityLabel">
-            <div :key="index"
-                 class="label"
-                 v-for="(item, index) in activeInfo.activityLabel.split(',')">
-              <span> {{item}}</span>
-            </div>
-          </template>
+          <div class="labelList">
+            <template v-if="activeInfo.activityLabel">
+              <div :key="index"
+                   class="label"
+                   v-for="(item, index) in activeInfo.activityLabel.split(',')">
+                <span> {{item}}</span>
+              </div>
+            </template>
+          </div>
+
           <div class="title">{{activeInfo.name}}</div>
         </div>
         <div class="active-info-cont-txt1">
@@ -40,11 +42,11 @@
             </div>
           </div>
         </div>
-        <div class="active-info-cont-txt2">
+        <div class="active-info-cont-txt2" v-if="activeInfo.activityStartTime!=null">
           活动时间：{{formatYMD(activeInfo.activityStartTime)}}
           至 {{formatYMD(activeInfo.activityEndTime)}}
         </div>
-        <div class="active-info-cont-txt3">
+        <div class="active-info-cont-txt3" v-if="activeInfo.bmEndTime!=null">
           <div>报名截止：{{formatYMDChina(activeInfo.bmEndTime)}}</div>
           <div v-if="activeInfo.activityFee && activeInfo.activityFee!='0'">
             活动费用：￥{{activeInfo.activityFee}}
@@ -53,10 +55,10 @@
             </el-tooltip>
           </div>
         </div>
-        <div class="btn-area" v-if="(activeInfo.status==1)||
+        <div class="btn-area" v-if="((activeInfo.status==1)||
 (activeInfo.status==2 && activeInfo.source==2)||
 (activeInfo.status==3 || activeInfo.status==4)||
-(activeInfo.status==5)">
+(activeInfo.status==5))&&activeInfo.activityStartTime!=null">
           <el-button :disabled="true" v-if="activeInfo.status==1">报名未开放</el-button>
           <el-button @click="signUp" v-if="activeInfo.status==2 && activeInfo.source==2">立即报名</el-button>
           <el-button :disabled="true" v-if="activeInfo.status==3 || activeInfo.status==4">报名已截止</el-button>
@@ -387,13 +389,20 @@
         margin-left: 70px;
         display: flex;
         flex-flow: column;
-        justify-content: space-around;
+        /*justify-content: stretch;*/
+
+        div {
+          margin-bottom: 5px;
+        }
 
         .active-info-cont-header {
           /*display: flex;*/
           /*flex-flow: row;*/
           /*align-items: center;*/
           /*margin-bottom: 10px;*/
+          .labelList {
+            display: flex;
+          }
 
           span {
             font-size: 14px;