UP

src/pages/activity/ActivityManager.vue

@@ -33,12 +33,13 @@
 </template>
 
 <script>
-import Img from '../../assets/logo.png'
-import useTable from './useTable'
-import addActivity from './addActivity'
-import ActivityManager from "../../services/ActivityManager/ActivityManager"
-import store from "../../store/index"
-export default {
+  import Img from '../../assets/logo.png'
+  import useTable from './useTable'
+  import addActivity from './addActivity'
+  import ActivityManager from "../../services/ActivityManager/ActivityManager"
+  import store from "../../store/index"
+
+  export default {
     name: "ActivityManager",
     components: {
       useTable,
@@ -95,7 +96,8 @@ export default {
           })
           let useData = {
             name: data.data.results.name,
-					inputActivityList: that.inputActivityList
+            inputActivityList: that.inputActivityList,
+            scheduleId: item.id,
           }
           store.commit('SET_useData', useData)
           store.commit('SET_ID', item.id)
@@ -109,18 +111,18 @@ export default {
       },
       dispalyuseModal(displayModalFlag, isCancle) {
         this.useModal = displayModalFlag
-			if(isCancle === true) {
+        if (isCancle === true) {
           this.getActivityTable()
         }
       },
       dispalyAddActivityModal(displayModalFlag, isCancle) {
         this.addActivityModal = displayModalFlag
-			if(isCancle === true) {
+        if (isCancle === true) {
           this.getActivityTable()
         }
       }
     }
-}
+  }
 </script>
 
 <style scoped>
@@ -128,10 +130,12 @@ export default {
     display: flex;
     justify-content: space-between;
   }
+
   .img {
     width: 200px;
     height: 200px;
   }
+
   .operateItem {
     display: flex;
     flex-direction: column;
@@ -141,21 +145,25 @@ export default {
     text-align: right;
     cursor: pointer;
   }
+
   .ThemeItem {
     display: flex;
     justify-content: flex-start;
     width: 80%;
   }
+
   .tipItem {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     margin-left: 50px;
   }
+
   .activityListClass {
     margin-bottom: 50px;
   }
-	.addactivity{
+
+  .addactivity {
     height: 300px;
     border: 1px dashed;
     text-align: center;

src/pages/activity/addActivity.vue

@@ -59,8 +59,8 @@
         类型{{index+1}}
       </i-col>
       <i-col :span="20">
-        <i-input class="inputClass" type="text" v-model="item.value1" placeholder="参数名称"></i-input>
-        <i-input class="inputClass" type="text" style="margin-left: 20px" v-model="item.value2" placeholder="默认值"></i-input>
+        <i-input class="inputClass" type="text" v-model="item.name" placeholder="参数名称"></i-input>
+        <i-input class="inputClass" type="text" style="margin-left: 20px" v-model="item.defaultVal" placeholder="默认值"></i-input>
         <Button style="margin-left: 20px" type="error" @click="delActivityInput(index)">删除</Button>
       </i-col>
     </Row>
@@ -125,8 +125,8 @@ export default {
   methods: {
     addActivityInput() {
       this.inputActivityList.push({
-        value1: '',
-        value2: ''
+        name: '',
+        defaultVal: ''
       })
     },
     delActivityInput(index) {
@@ -152,10 +152,12 @@ export default {
         that.formValidate.activityDsc = data.data.results.description
         that.formValidate.activityName = data.data.results.name
         that.formValidate.uri = data.data.results.uri
+        that.formValidate.logo = data.data.results.logo || '';
         data.data.results.params.forEach(item => {
           that.inputActivityList.push({
-            value1: item.name,
-            value2: item.description
+            id: item.id,
+            name: item.name,
+            defaultVal: item.defaultVal
           })
         })
       })
@@ -188,14 +190,14 @@ export default {
             let param = []
             that.inputActivityList.forEach(element => {
               param.push({
-                defaultVal: element.value1,
-                description: that.formValidate.activityDsc,
-                key: element.value2,
-                name: 1,
+                defaultVal: element.defaultVal,
+                description: element.name,
+                key: element.name,
+                name: element.name,
                 type: 2,
-                id: that.id
-              })
+                id: element.id,
               })
+            });
             // param = JSON.stringify(param)
             let data = {
                   appId: that.formValidate.appId,

src/pages/activity/useActivityStepFoure.vue

@@ -12,7 +12,7 @@
           <FormItem label="活动类型" prop="activityStyle">
             <div style="display:flex" v-for="(item, index) in formValidate.activityStyle" :key="index">
               <i-input class="inputClass" disabled type="text" v-model="item.name" placeholder=""></i-input>
-              <i-input class="inputClass" style="margin-left: 20px" disabled type="text" v-model="item.description" placeholder=""></i-input>
+              <i-input class="inputClass" style="margin-left: 20px" disabled type="text" v-model="item.defaultVal" placeholder=""></i-input>
             </div>
           </FormItem>
           <FormItem label="活动范围" prop="activityRange">

src/pages/activity/useActivityStepOne.vue

@@ -18,7 +18,7 @@
           <FormItem label="活动类型" prop="activityStyle">
               <div v-for="(item, index) in formValidate.activityStyle" :key="index">
                 <i-input class="inputClass" disabled type="text" v-model="item.name" placeholder=""></i-input>
-                <i-input class="inputClass" style="margin-left: 20px" disabled type="text" v-model="item.description" placeholder=""></i-input>
+                <i-input class="inputClass" style="margin-left: 20px" disabled type="text" v-model="item.defaultVal" placeholder=""></i-input>
               </div>
           </FormItem>
         </i-col>

src/pages/activity/useTable.vue

@@ -74,8 +74,8 @@ export default {
         organizations: store.getters.useData.selectCompanyValue,
         params: store.getters.useData.inputActivityList,
         stores: store.getters.useData.selectShopValue,
-        id: store.getters.id,
-        scheduleId: '123',
+        id: store.getters.useData.id,
+        scheduleId: store.getters.useData.scheduleId,
         isGetActivityInfo: true
       }
       ActivityManager.saveActivityData(data, function (data) {