From dd4996b701a05112e0f8bc7acc93134f82347778 Mon Sep 17 00:00:00 2001
From: cuijie <cuijie@safefw.com>
Date: Fri, 22 May 2020 11:59:41 +0800
Subject: [PATCH] UP

---
 src/pages/activity/ActivityManager.vue      | 314 ++++++++++----------
 src/pages/activity/addActivity.vue          |  26 +-
 src/pages/activity/useActivityStepFoure.vue |   2 +-
 src/pages/activity/useActivityStepOne.vue   |   2 +-
 src/pages/activity/useTable.vue             |   4 +-
 5 files changed, 179 insertions(+), 169 deletions(-)

diff --git a/src/pages/activity/ActivityManager.vue b/src/pages/activity/ActivityManager.vue
index 6f979d4..39e41a6 100644
--- a/src/pages/activity/ActivityManager.vue
+++ b/src/pages/activity/ActivityManager.vue
@@ -1,165 +1,173 @@
 <template>
-	<div class="activityManager">
-		<Row>
-			<i-col class="activityListClass" v-for="(item, index) in activityList" :key="index" span="7" offset="1">
-				<Card>
-					<div class="operateAndThemeItem">
-						<div class="ThemeItem">
-								<img class="img" :src="item.img">
-							<div class="tipItem">
-								<span>{{item.name}}</span>
-								<span>{{item.description}}</span>
-							</div>
-						</div>
-						<div class="operateItem">
-							<div @click="disPlayUseTable(item)">使用</div>
-							<div @click="dispalyAddActivity(item.id)">配置</div>
-						</div>
-					</div>
-				</Card>
-			</i-col>
+  <div class="activityManager">
+    <Row>
+      <i-col class="activityListClass" v-for="(item, index) in activityList" :key="index" span="7" offset="1">
+        <Card>
+          <div class="operateAndThemeItem">
+            <div class="ThemeItem">
+              <img class="img" :src="item.img">
+              <div class="tipItem">
+                <span>{{item.name}}</span>
+                <span>{{item.description}}</span>
+              </div>
+            </div>
+            <div class="operateItem">
+              <div @click="disPlayUseTable(item)">使用</div>
+              <div @click="dispalyAddActivity(item.id)">配置</div>
+            </div>
+          </div>
+        </Card>
+      </i-col>
     </Row>
-		<Row>
-		<i-col span="7" offset="1">
-			<div @click="dispalyAddActivity('')" class="addactivity">
-				<span>+</span>
-				<span>添加活动</span>
-			</div>
-		</i-col>
-		</Row>
-		<useTable @dispalyuseModal="dispalyuseModal" :useModal="useModal" :id="id"></useTable>
-		<addActivity @dispalyAddActivityModal="dispalyAddActivityModal" :addActivityModal="addActivityModal" :id="id"></addActivity>
-	</div>
+    <Row>
+      <i-col span="7" offset="1">
+        <div @click="dispalyAddActivity('')" class="addactivity">
+          <span>+</span>
+          <span>添加活动</span>
+        </div>
+      </i-col>
+    </Row>
+    <useTable @dispalyuseModal="dispalyuseModal" :useModal="useModal" :id="id"></useTable>
+    <addActivity @dispalyAddActivityModal="dispalyAddActivityModal" :addActivityModal="addActivityModal" :id="id"></addActivity>
+  </div>
 </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 {
-	name: "ActivityManager",
-	components: {
-		useTable,
-		addActivity
-	},
-	inject: ['setMenuName'],
-	data() {
-		return {
-			useModal: false,
-			addActivityModal: false,
-			activityList: [],
-			id: '',
-			inputActivityList: []
-		}
-	},
-	mounted() {
-		this.setMenuName("活动管理", "活动池")
-		this.getActivityTable()
-	},
-	methods: {
-		getActivityData(id) {
-      let that = this
-      let data = {
-        instanceId: id
+  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,
+      addActivity
+    },
+    inject: ['setMenuName'],
+    data() {
+      return {
+        useModal: false,
+        addActivityModal: false,
+        activityList: [],
+        id: '',
+        inputActivityList: []
       }
-      ActivityManager.getActivityInfo(data, function (data) {
-        that.inputActivityList = []
-        data.data.results.params.forEach(item => {
-          that.inputActivityList.push({
-            value1: item.name,
-            value2: item.description
-          })
-				})
-				this.useModal = true
-      })
     },
-		getActivityTable() {
-			let that = this
-			ActivityManager.getActivityList({}, function (data) {
-					that.activityList = data.data.results
-			})
-		},
-		disPlayUseTable(item) {
-			let that = this
-			let data = {
-        id: item.id
+    mounted() {
+      this.setMenuName("活动管理", "活动池")
+      this.getActivityTable()
+    },
+    methods: {
+      getActivityData(id) {
+        let that = this
+        let data = {
+          instanceId: id
+        }
+        ActivityManager.getActivityInfo(data, function (data) {
+          that.inputActivityList = []
+          data.data.results.params.forEach(item => {
+            that.inputActivityList.push({
+              value1: item.name,
+              value2: item.description
+            })
+          })
+          this.useModal = true
+        })
+      },
+      getActivityTable() {
+        let that = this
+        ActivityManager.getActivityList({}, function (data) {
+          that.activityList = data.data.results
+        })
+      },
+      disPlayUseTable(item) {
+        let that = this
+        let data = {
+          id: item.id
+        }
+        // let data = new FormData()
+        // data.append('instanceId', item.id)
+        ActivityManager.getActivityInfo(data, function (data) {
+          that.inputActivityList = []
+          data.data.results.params.forEach(item => {
+            that.inputActivityList.push(item)
+          })
+          let useData = {
+            name: data.data.results.name,
+            inputActivityList: that.inputActivityList,
+            scheduleId: item.id,
+          }
+          store.commit('SET_useData', useData)
+          store.commit('SET_ID', item.id)
+          console.log(store.getters.useData)
+          that.useModal = true
+        })
+      },
+      dispalyAddActivity(id) {
+        this.addActivityModal = true
+        this.id = id.toString()
+      },
+      dispalyuseModal(displayModalFlag, isCancle) {
+        this.useModal = displayModalFlag
+        if (isCancle === true) {
+          this.getActivityTable()
+        }
+      },
+      dispalyAddActivityModal(displayModalFlag, isCancle) {
+        this.addActivityModal = displayModalFlag
+        if (isCancle === true) {
+          this.getActivityTable()
+        }
       }
-			// let data = new FormData()
-      // data.append('instanceId', item.id)
-      ActivityManager.getActivityInfo(data, function (data) {
-				that.inputActivityList = []
-        data.data.results.params.forEach(item => {
-          that.inputActivityList.push(item)
-				})
-				let useData = {
-					name: data.data.results.name,
-					inputActivityList: that.inputActivityList
-				}
-				store.commit('SET_useData', useData)
-				store.commit('SET_ID', item.id)
-				console.log(store.getters.useData)
-				that.useModal = true
-      })
-		},
-		dispalyAddActivity(id) {
-			this.addActivityModal = true
-			this.id = id.toString()
-		},
-		dispalyuseModal(displayModalFlag, isCancle) {
-			this.useModal = displayModalFlag
-			if(isCancle === true) {
-				this.getActivityTable()
-			}
-		},
-		dispalyAddActivityModal(displayModalFlag, isCancle) {
-			this.addActivityModal = displayModalFlag
-			if(isCancle === true) {
-				this.getActivityTable()
-			}
-		}
-	}
-}
+    }
+  }
 </script>
 
-<style  scoped>
-	.operateAndThemeItem {
-		display: flex;
-		justify-content: space-between;
-	}
-	.img {
-		width: 200px;
-		height: 200px;
-	}
-	.operateItem {
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		color: #6ac1d1;
-		width: 20%;
-		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{
-		height: 300px;
-		border: 1px dashed;
-		text-align: center;
-		line-height: 300px;
-	}
+<style scoped>
+  .operateAndThemeItem {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .img {
+    width: 200px;
+    height: 200px;
+  }
+
+  .operateItem {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    color: #6ac1d1;
+    width: 20%;
+    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 {
+    height: 300px;
+    border: 1px dashed;
+    text-align: center;
+    line-height: 300px;
+  }
 </style>
 
diff --git a/src/pages/activity/addActivity.vue b/src/pages/activity/addActivity.vue
index fa5d093..3424827 100644
--- a/src/pages/activity/addActivity.vue
+++ b/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,
diff --git a/src/pages/activity/useActivityStepFoure.vue b/src/pages/activity/useActivityStepFoure.vue
index a031793..6af05a7 100644
--- a/src/pages/activity/useActivityStepFoure.vue
+++ b/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">
diff --git a/src/pages/activity/useActivityStepOne.vue b/src/pages/activity/useActivityStepOne.vue
index 8c10ffd..7d0bafc 100644
--- a/src/pages/activity/useActivityStepOne.vue
+++ b/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>
diff --git a/src/pages/activity/useTable.vue b/src/pages/activity/useTable.vue
index cae9d92..5026017 100644
--- a/src/pages/activity/useTable.vue
+++ b/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) {