Merge remote-tracking branch 'origin/dev-circle-nine-20201231' into dev-circle-nine-20201231

src/components/activitymanagement/baseinfo.vue

@@ -238,7 +238,7 @@
     created() {
       vm = this;
       vm.getCircleList();//可以放在自组件优化
-      vm.getModuleData();
+  
     },
     data() {
       let checkProjectStr = (rule, value, callback) => {
@@ -359,6 +359,7 @@
      
       // 获取模块下拉数据
       getModuleData() {
+      
         getModuleData().then(function (res) {
           if(res.code == "000000") {
             vm.moduleArray = JSON.parse(JSON.stringify(res.data));
@@ -648,6 +649,7 @@
           closeLoading(vm);
           if (res.code == "000000") {
              vm.circleList = res.data
+             vm.getModuleData();
           }
         }).catch(err => {
           this.$message.error('请求失败');

src/utils/activitymanagement/activitymanagementApi.js

@@ -32,7 +32,24 @@ export const getActivityInfoReq = (activityId) => {
       description: '专区活动列表与搜索',
     })
   };
-
+  export const removeActivity = (params) => {
+    return fetch({
+      headers,
+      url: getBaseUrl(`circle/sso/activity/remove`),
+      method: 'delete',
+      data: params,
+      description: '后台管理--专区活动删除',
+    })
+  };
+  export const updateActivityStatus = (params) => {
+    return fetch({
+      headers,
+      url: getBaseUrl(`circle/sso/activity/deploy`),
+      method: 'post',
+      data: params,
+      description: '后台管理--专区活动上下线',
+    })
+  };
 
 
 export const getActivityDocList = (params) => {

src/utils/filter.js

@@ -512,6 +512,14 @@ const vueFilter = {
             return '-'
         }
     },
+    //活动发布状态 1 已经发布 2未发布
+    activityStatus:(value) => {
+        if (value == 1) {
+            return '已发布'
+        }else if (value == 2) {
+            return '未发布'
+        }
+    },
     liveStatusFilter: (value) => {
         if (value == 1) {
             return '预告'

src/views/activitymanagement/create-activity.vue

@@ -77,7 +77,7 @@
       this.enterType = enterType;
       this.roleType = roleType;
 
-      if(this.enterType != null && this.roleType != null){
+      if(this.enterType == 2){
         this.curmbSecond = "编辑活动"
       }
 
@@ -117,10 +117,7 @@
 
       //完成
       complete() {
-        // if(this.$refs.org.selectionList == null || this.$refs.org.selectionList == ""){
-        //   this.$message.warning('请选择机构');
-        //   return;
-        // }
+
         console.log(this.formData.id);
         let req = {
           circleId: this.formData.id,
@@ -168,18 +165,9 @@
       },
       //更新活动信息
       commitActivityInfo() {
-        
         let req = vm.formData;
-        
-        console.log("commitActivityInfo() : name = " + req.titleManager + ", headUrl = " + req.listImage
-          + ", coverUrl = " + req.introImage)
         vm.POST("circle/sso/activity/save", req).then(res => {
           if (res.code == "000000") {
-            // console.log(res);
-            // console.log(this.$refs);
-            // vm.formData.id = res.data;
-            // // this.active = 1;
-            // this.stepData = [false, true];
             this.$message.success('保存成功');
             const _this = this;
             setTimeout(function () {