Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

src/views/modules/volunteer/Dynamicmanagement/add.vue

@@ -38,8 +38,8 @@
           </el-col>
           <el-col :span="24">
           <el-form-item  label="置顶
-          " style="display: block" prop="peopleCount" label-width="150px">
-              <el-switch v-model="formData.online" :active-value=1 :inactive-value=0
+          " style="display: block" prop="top" label-width="150px">
+              <el-switch v-model="formData.top" :active-value=1 :inactive-value=0
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
         </el-col>

src/views/modules/volunteer/Dynamicmanagement/edit.vue

@@ -38,8 +38,8 @@
           </el-col>
           <el-col :span="24">
           <el-form-item  label="置顶
-          " style="display: block" prop="peopleCount" label-width="150px">
-              <el-switch v-model="formData.online" :active-value=1 :inactive-value=0
+          " style="display: block" prop="top" label-width="150px">
+              <el-switch v-model="formData.top" :active-value=1 :inactive-value=0
                 ></el-switch>
             </el-form-item>
         </el-col>

src/views/modules/volunteer/Dynamicmanagement/info.vue

@@ -42,8 +42,8 @@
           </el-col>
           <el-col :span="24">
           <el-form-item  label="置顶 
-          " disabled="false" style="display: block" prop="peopleCount" label-width="150px">
-              <el-switch v-model="formData.online" :active-value=1 :inactive-value=0 disabled="false"
+          " disabled="false" style="display: block" prop="top" label-width="150px">
+              <el-switch v-model="formData.top" :active-value=1 :inactive-value=0 disabled="false"
                 ></el-switch>
             </el-form-item>
         </el-col>

src/views/modules/volunteer/activityArchive/add.vue

@@ -163,7 +163,7 @@
           </el-col>
           <el-col :span="12">
             <!-- <el-col :span="12"> -->
-            <el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
+            <el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="online">
               <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
@@ -208,6 +208,27 @@
               <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
             </div>
           </el-col>
+
+
+          <el-col :span="12">
+            <el-form-item  label="置顶
+          " style="display: block" prop="top" label-width="150px">
+              <el-switch v-model="formData.top" :active-value=1 :inactive-value=0
+                @change="handleTopSwitchChange"></el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item  label="Banner显示
+          " style="display: block" prop="banner" label-width="150px">
+              <el-switch v-model="formData.banner" :active-value=1 :inactive-value=0
+                @change="handleBannerSwitchChange"></el-switch>
+            </el-form-item>
+          </el-col>
+
+
+
+
         </el-row>
 
 
@@ -299,6 +320,8 @@ export default {
         latitude: this.$store.state.user.latitude,//纬度
         type: "",
         online: 0,
+        top:0,
+        banner:0,
         sponsors: [{
           name: "",
           phone: ""
@@ -735,6 +758,14 @@ export default {
       // 将 value 转换为整数
       this.formData.online = Number(value);
     },
+    handleTopSwitchChange(value) {
+      // 将 value 转换为整数
+      this.formData.top = Number(value);
+    },
+    handleBannerSwitchChange(value) {
+      // 将 value 转换为整数
+      this.formData.banner = Number(value);
+    },
   
     handleOnlineRegistration(value) {
             if (value) {

src/views/modules/volunteer/activityArchive/index.vue

@@ -97,6 +97,12 @@
                 更多<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu split-button="true" slot="dropdown">
+
+                <el-dropdown-item v-if="scope.row.top != 1 &&scope.row.statusType!='已结束'" command="setTop">置顶</el-dropdown-item>
+                <el-dropdown-item v-if="scope.row.top === 1 &&scope.row.statusType!='已结束'" command="setTop">取消置顶</el-dropdown-item>
+                <el-dropdown-item v-if="scope.row.banner != 0 &&scope.row.statusType!='已结束'" command="setBanner">设置Banner</el-dropdown-item>
+                <el-dropdown-item v-if="scope.row.banner === 1 &&scope.row.statusType!='已结束'" command="setBanner">取消Banner</el-dropdown-item>
+
                 <el-dropdown-item command="signup">报名管理</el-dropdown-item>
                 <el-dropdown-item command="clockin">打卡积分</el-dropdown-item>
                 <el-dropdown-item v-if="scope.row.statusType!='进行中'" command="delete">删除活动</el-dropdown-item>
@@ -250,6 +256,52 @@
           })
           
         },
+
+        handleupTop(row){
+          console.log(row,"row");
+          if (row.top==1) {
+            row.top=0
+            
+          }else{
+            row.top=1
+          }
+
+          let url="/voluntary/activityInfo/top",
+          params={
+            id:row.id,
+            top:row.top
+          }
+          requestPost(url,params).then(res=>{
+            console.log(res);
+            this.getTableData()
+            
+          })
+        },
+
+        handleupBanner(row){
+          console.log(row,"row");
+          if (row.banner==1) {
+            row.banner=0
+            
+          }else{
+            row.banner=1
+          }
+
+          let url="/voluntary/activityInfo/banner",
+          params={
+            id:row.id,
+            banner:row.banner
+          }
+          requestPost(url,params).then(res=>{
+            console.log(res);
+            this.getTableData()
+            
+          })
+        },
+
+
+
+
         //查询
         handleSearch(){
           console.log("this.long");
@@ -296,6 +348,10 @@
         handelRegister(command, row) {
       if (command == "signup") {
         this.HandleRegistration(row);
+      } else if (command == "setTop") {
+        this.handleupTop(row);
+      } else if (command == "setBanner") {
+        this.handleupBanner(row);
       } else if (command == "clockin") {
         this.HandlePoints(row);
       } else if (command == "delete") {

src/views/modules/volunteer/activityArchive/realselect.vue

@@ -92,10 +92,20 @@
               {{ formData.deadline }}
             </el-form-item>
 
-            <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
+            <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="online">
               <el-switch disabled=fasle v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
+
+            <el-form-item v-if="formType!=='records'" label="置顶" style="display: block" prop="top">
+              <el-switch disabled=fasle v-model="formData.top" :active-value='1' :inactive-value='0'
+                @change="handleSwitchChange"></el-switch>
+            </el-form-item>
+
+            <el-form-item v-if="formType!=='records'" label="Banner展示" style="display: block" prop="banner">
+              <el-switch disabled=fasle v-model="formData.banner" :active-value='1' :inactive-value='0'
+                @change="handleSwitchChange"></el-switch>
+            </el-form-item>
           </div>
           <div v-if="formData.sponsors" v-for="(item, index) in formData.sponsors" :label="index" :key="item.name"
             :prop=index>
@@ -179,6 +189,8 @@
       latitude: this.$store.state.user.latitude,//纬度
       type:"",
       online:0,
+      top:0,
+      banner:0,
       sponsors:[
       ],
      

src/views/modules/volunteer/activityArchive/select.vue

@@ -163,7 +163,7 @@
           </el-col>
           <el-col :span="12">
             <!-- <el-col :span="12"> -->
-            <el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
+            <el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="online">
               <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
@@ -208,6 +208,25 @@
               <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
             </div>
           </el-col>
+
+
+          <el-col :span="12">
+            <el-form-item  label="置顶
+          " style="display: block" prop="top" label-width="150px">
+              <el-switch v-model="formData.top" :active-value=1 :inactive-value=0
+                @change="handleTopSwitchChange"></el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item  label="Banner显示
+          " style="display: block" prop="banner" label-width="150px">
+              <el-switch v-model="formData.banner" :active-value=1 :inactive-value=0
+                @change="handleBannerSwitchChange"></el-switch>
+            </el-form-item>
+          </el-col>
+
+
         </el-row>
       </el-form>
       <!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
@@ -295,6 +314,8 @@ export default {
         latitude: this.$store.state.user.latitude,//纬度
         type: "",
         online: 0,
+        top:0,
+        banner:0,
         sponsors: [
         ]
 
@@ -728,6 +749,15 @@ export default {
       // 将 value 转换为整数
       this.formData.online = Number(value);
     },
+
+    handleTopSwitchChange(value) {
+      // 将 value 转换为整数
+      this.formData.top = Number(value);
+    },
+    handleBannerSwitchChange(value) {
+      // 将 value 转换为整数
+      this.formData.banner = Number(value);
+    },
   
     handleOnlineRegistration(value) {
             if (value) {