1

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_w06lw9ydl0q.css');
+@import url('//at.alicdn.com/t/font_2077629_byb6agikplo.css');
 
 html,
 body,

src/api/common/common.js

@@ -231,7 +231,6 @@ export function UploadFileToSystem(uploadConfig, fileFullPath, fileObj, uploadLo
   xhr.onload = function () {
     uploadLoadding.hide();
     var jsonObj = JSON.parse(xhr.responseText);
-    console.log(206, jsonObj, successCall)
     if (jsonObj.StatusCode === 1 && successCall) {
       var tempArray = [];
       if (jsonObj.OtherFile && jsonObj.OtherFile.length > 0) {

src/components/activity/active-item.vue

-<template>
-    <div>
-
-    </div>
-</template>
-<script>
-export default {
-    
-}
-</script>
\ No newline at end of file

src/pages/activity/activeDetail.vue

@@ -3,6 +3,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    margin-bottom: 40px;
 }
   .p_title {
     color: #000000;
@@ -11,6 +12,9 @@
     display: flex;
     align-items: center;
 }
+.activeDetail{
+    overflow-y: scroll;
+}
 </style>
 <template>
   <div class="page-body activeDetail">
@@ -19,127 +23,125 @@
           <q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" />
                 <span class="p_title">活动详情</span>
       </div>
-      <q-btn color="accent" size="sm" class="q-mr-md" label="新增活动" @click="" />
+      <div>
+           <q-btn color="accent" size="sm" class="q-mr-md" label="新增活动" @click="addActiveList" />
+            <q-btn color="accent" size="sm"  label="保存" @click="save" />
+      </div>
+     
     </div>
-    <div class="page-content">
-      
+    <div class="">
+      <div v-for="(item,index) in ActivityTitle" :key="item.id" class="flex " >
+         
+        <DetailItem :itemData="item" :index="index+1" @success="getItemData($event,index)"/>
+        <el-tooltip class="item" effect="dark" content="删除当前活动" placement="top"  v-if="index>0">
+                      <i class="iconfont icon-img_delete_small q-ml-sm" style="color: #2961FE" @click="delActiveList(index)"></i>
+        </el-tooltip>
+
+      </div>
+        
     </div>
     
   </div>
 </template>
 <script>
+import DetailItem from "../../components/activity/activeDetail-item"
   export default {
     meta: {
       title: "活动详情"
     },
     components: {
-      
+      DetailItem
     },
     data() {
       return {
-        data: [],
-        loading: true,
-       
+       msg:{
+         Id:0,
+         ActivityTitle:[]
+       },
+       ActivityTitle:[
+         {
+            Title:"",//活动大标题
+            TripSort:0,//活动排序
+            ActivityPlanList:[//活动安排
+                {
+                    TripSort:0,//排序
+                    StartTime:"",//开始时间
+                    ActivityDuration:"",//活动时长（单位：分钟）
+                    LonLat:"",//活动地址经纬度
+                    LocationName:"",//活动地址
+                    TripTitle:"",//安排标题
+                    TripContent:"",//内容
+                    TripPicList:[]//图片
+                }
+            ]
+        }
+       ],
+       item:{
+         
+       }
       }
     },
 
-    mounted() {
-     
-    },
+     mounted(){
+          if(this.$route.query.Id){
+            this.msg.Id=this.$route.query.Id
+          }
+      },
     methods: {
       goBack(){
           this.$router.go(-1)
       },
       
-      
-      
-      //获取活动类型下拉
-        getActiveTypeList(){
-            this.apipostDS("/api/Education/GetCommerceActivityTypeList",{},(res)=>{
-                if(res.data.resultCode===1){
-                   this.activityTypeList = res.data.data;
-                   this.activityTypeList.unshift({
-                       Id:-1,
-                       TypeName:"不限"
-                   })
+      addActiveList(){
+        let obj={
+          Title:"",//活动大标题
+            TripSort:this.ActivityTitle.length,//活动排序
+            ActivityPlanList:[//活动安排
+                {
+                    TripSort:0,//排序
+                    StartTime:"",//开始时间
+                    ActivityDuration:"",//活动时长（单位：分钟）
+                    LonLat:"",//活动地址经纬度
+                    LocationName:"",//活动地址
+                    TripTitle:"",//安排标题
+                    TripContent:"",//内容
+                    TripPicList:[]//图片
                 }
-            })
-        },
-        getList(){
-            this.loading = true;
-            this.apipostDS("/api/Education/GetActivityPage",this.msg,(res)=>{
-                this.loading = false
-                if(res.data.resultCode===1){
-                    this.data = res.data.data.pageData;
-                    this.pageCount = res.data.data.pageCount;
-                }
-            })
-        },
-       delActive(item){
-            let that = this;
-            that.Confirm("是否删除?", function () {
-              that.apipostDS(
-                "/api/Education/RemoveActivity", {
-                  Id: item.Id,
-                  Status: 1
-                },
-                res => {
-                  if (res.data.resultCode == 1) {
-                    that.Success(res.data.message);
-                    that.getList();
-                  } else {
-                    that.Error(res.data.message);
-                  }
-               },
-             );
-          })
-       },
-      //刷新页面
-      refreshPage() {
-        this.showForm = false;
-        this.getList();
-      },
-      //显示修改
-      editQuotation(item) {
-         this.showForm = true;
-        if (item) {
-          this.typeObj = item;
-        }else{
-           this.typeObj = {};
+            ]
         }
+        
+        this.ActivityTitle.push(obj)
       },
-      //重新查询
-      resetSearch() {
-        this.msg.pageIndex = 1;
-        this.getList();
+      delActiveList(index){
+         this.ActivityTitle.splice(index,1)
       },
-      //翻页
-      changePage(val) {
-        this.msg.pageIndex = val;
-        this.getList()
+      getItemData(val,index){
+        console.log('119', val,index)
       },
-      //关闭弹窗
-      closeruleset() {
-        this.showForm = false;
+      //保存信息
+      save() {
+        this.msg.ActivityTitle=this.ActivityTitle
+        // this.$refs.Name.validate();
+        // this.$refs.StartTime.validate();
+        // this.$refs.EndTime.validate();
+        // this.$refs.SignStartTime.validate();
+        // this.$refs.SignEndTime.validate();
+        // if (!this.$refs.Name.hasError &&
+        //   !this.$refs.StartTime.hasError &&
+        //   !this.$refs.EndTime.hasError &&
+        //   !this.$refs.SignStartTime.hasError &&
+        //   !this.$refs.SignEndTime.hasError) {
+
+          this.apipostDS("/api/Education/GetSetActivityPlan", this.msg, (res) => {
+            console.log(136,res)
+            if (res.data.resultCode === 1) {
+              this.Success(res.data.message);
+            } else {
+              this.Error(res.data.message);
+            }
+          })
+        // }
       },
-      goUrl(url,item,type=0){
-        if(type===1){
-          this.$router.push({
-          path:url,
-          query:{
-            name:item.ActivityName
-          }
-        })
-        }else{
-          this.$router.push({
-          path:url,
-          query:{
-            Id:item.Id
-          }
-        })
-        }
-        
-      }
     }
   }