1

src/pages/activity/ActivityManager.vue

@@ -143,6 +143,7 @@ export default {
 
 .img {
   height: 100px;
+  width: 150px;
 }
 
 .operateItem {

src/pages/activity/ActivityPlan.vue

@@ -321,6 +321,7 @@ export default {
     modify (instance) {
       this.activityInstance = instance;
       this.showUse = true;
+      console.log("instance", instance)
       store.commit("SET_useData", Object.assign({}, instance));
     },
     navigateCode (instance) {

src/pages/activity/addActivity.vue

@@ -79,14 +79,14 @@
         <i-input class="inputClass"
                  type="text"
                  v-model="item.name"
-                 placeholder="参数名称"></i-input>
+                 placeholder="请输入活动类型名称"></i-input>
       </i-col>
       <i-col :span="9">
         <i-input class="inputClass"
                  type="text"
                  style="margin-left: 20px"
-                 v-model="item.key"
+                 v-model="item.defaultVal"
-                 placeholder="默认值"></i-input>
+                 placeholder="请输入参数"></i-input>
       </i-col>
       <i-col :span="4">
         <Button style="margin-left: 20px"
@@ -229,6 +229,23 @@ export default {
         that.loading = false;
         return false;
       }
+      let i = 0;
+      for (const key in that.formValidate.params) {
+        i++;
+        if (that.formValidate.params.hasOwnProperty(key)) {
+          const element = that.formValidate.params[key];
+          if (element.name.length <= 0) {
+            that.$Message.error(`请输入类型${i}的活动类型名称!`);
+            that.loading = false;
+            return false;
+          }
+          if (element.defaultVal.length <= 0) {
+            that.$Message.error(`请输入类型${i}的参数!`);
+            that.loading = false;
+            return false;
+          }
+        }
+      }
       if (
         typeof that.formValidate.logo == "undefined" ||
         that.formValidate.logo == "" ||

src/pages/activity/useActivityStepFoure.vue

@@ -1,40 +1,42 @@
 <template>
   <div style="padding: 0 40px;">
-    <Form ref="formValidate" :model="useData" :label-width="80">
+    <Form ref="formValidate"
+          :model="useData"
+          :label-width="80">
       <Row>
-        <i-col span="22" offset="2">
+        <i-col span="22"
-          <FormItem label="活动名称" prop="activityName">
+               offset="2">
+          <FormItem label="活动名称"
+                    prop="activityName">
             <div>{{ useData.name }}</div>
           </FormItem>
-          <Form-item label="活动时间" prop="activityDate">
+          <Form-item label="活动时间"
+                     prop="activityDate">
             <div>{{ useData.beginTime }} - {{ useData.endTime }}</div>
           </Form-item>
-          <FormItem label="活动类型" prop="activityStyle">
+          <FormItem label="活动类型"
-            <div
+                    prop="activityStyle">
-              style="display:flex"
+            <div style="display:flex"
                  v-for="(item, index) in useData.params"
-              :key="index"
+                 :key="index">
-            >
+              <i-input class="inputClass"
-              <i-input
-                class="inputClass"
                        disabled
                        type="text"
                        v-model="item.name"
-                placeholder=""
+                       placeholder=""></i-input>
-              ></i-input>
+              <i-input class="inputClass"
-              <i-input
-                class="inputClass"
                        style="margin-left: 20px"
                        disabled
                        type="text"
-                v-model="item.key"
+                       v-model="item.defaultVal"
-                placeholder=""
+                       placeholder=""></i-input>
-              ></i-input>
             </div>
           </FormItem>
-          <FormItem label="活动范围" prop="activityRange">
+          <FormItem label="活动范围"
+                    prop="activityRange">
             <Collapse simple>
-              <Panel :key="index" v-for="(item, index) in groups">
+              <Panel :key="index"
+                     v-for="(item, index) in groups">
                 {{
                   item.name
                 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
@@ -42,12 +44,11 @@
                 }}家店铺
                 <div slot="content">
                   <div class="activityShopClass">
-                    <div
+                    <div class="mr10"
-                      class="mr10"
                          v-for="(item, index) in item.stores"
-                      :key="index"
+                         :key="index">
-                    >
+                      <Tag class="tagClass"
-                      <Tag class="tagClass" color="blue">{{ item.name }}</Tag>
+                           color="blue">{{ item.name }}</Tag>
                     </div>
                   </div>
                 </div>
@@ -63,7 +64,7 @@
 import store from "../../store/index";
 export default {
   name: "useActivityStepFoure",
-  data() {
+  data () {
     return {
       useData: store.getters.useData,
       operate: "收起",
@@ -71,7 +72,7 @@ export default {
       groups: [],
     };
   },
-  created() {
+  created () {
     let _this = this;
     console.log(this.useData.stores);
     this.useData.company.forEach((item) => {
@@ -81,10 +82,10 @@ export default {
       );
       _this.groups.push(item);
     });
-    console.log(this.groups);
+    console.log(this.useData);
   },
   methods: {
-    isDisplay() {
+    isDisplay () {
       if (this.operate === "展开") {
         this.operate = "收起";
         this.displayActivityShopFlag = false;

src/pages/activity/useActivityStepOne.vue

@@ -18,7 +18,7 @@
           </FormItem>
           <div class="dateClass">
             <Form-item label="活动时间"
-                       prop="activityStartDate">
+                       prop="beginTime">
               <Date-picker @on-change="storeStartDate"
                            type="date"
                            v-if="isModify"
@@ -37,7 +37,7 @@
             </Form-item>
             <div class="text">至</div>
             <Form-item label
-                       prop="activityEndDate">
+                       prop="endTime">
               <Date-picker @on-change="storeEndDate"
                            type="date"
                            v-if="isModify"
@@ -57,34 +57,38 @@
           </div>
           <FormItem label="活动类型"
                     prop="activityStyle">
-            <RadioGroup @on-change="onChange"
+            <RadioGroup v-if="isModify"
+                        @on-change="onChange"
                         v-model="formValidate.activityStyle"
                         vertical>
               <Radio :border="true"
                      v-for="(item, index) in schedule.params"
                      :key="index"
-                     :label="item.id"
-                     v-if="isModify"
                      disabled
+                     :label="item.id"
                      style="margin-bottom: 10px">
                 <Icon type="social-apple"></Icon>
                 <span>{{
                     item.name
                   }}&nbsp;&nbsp;&nbsp;&nbsp;----&nbsp;&nbsp;&nbsp;&nbsp;{{
-                    item.key
+                    item.defaultVal
                   }}</span>
               </Radio>
+            </RadioGroup>
+            <RadioGroup v-else
+                        @on-change="onChange"
+                        v-model="formValidate.activityStyle"
+                        vertical>
               <Radio :border="true"
                      v-for="(item, index) in schedule.params"
                      :key="index"
                      :label="item.id"
-                     v-else
                      style="margin-bottom: 10px">
                 <Icon type="social-apple"></Icon>
                 <span>{{
                     item.name
                   }}&nbsp;&nbsp;&nbsp;&nbsp;----&nbsp;&nbsp;&nbsp;&nbsp;{{
-                    item.key
+                    item.defaultVal
                   }}</span>
               </Radio>
             </RadioGroup>
@@ -107,7 +111,7 @@ export default {
         activityName: [
           { required: true, message: "活动名称不能为空", trigger: "blur" },
         ],
-        activityStartDate: [
+        beginTime: [
           {
             required: true,
             type: "date",
@@ -115,7 +119,7 @@ export default {
             trigger: "change",
           },
         ],
-        activityEndDate: [
+        endTime: [
           {
             required: true,
             type: "date",
@@ -140,7 +144,7 @@ export default {
         _this.formValidate.activityStyle = item.id;
       });
     }
-    console.log(22, this.formValidate);
+    console.log(22, this.isModify);
   },
   methods: {
     onChange (e) {

src/pages/activity/useTable.vue

@@ -55,6 +55,7 @@ import useActivityStepThree from "./useActivityStepThree";
 import useActivityStepFoure from "./useActivityStepFoure";
 import ActivityManager from "../../services/ActivityManager/ActivityManager";
 import store from "../../store/index";
+import { formatDate } from '../../utils/Common';
 export default {
   name: "useTable",
   components: {
@@ -74,7 +75,10 @@ export default {
     id: String,
     schedule: Object,
     show: Boolean,
-    isModify: Boolean
+    isModify: {
+      type: Boolean,
+      default: false
+    }
   },
   watch: {
     show () {
@@ -129,6 +133,13 @@ export default {
           return;
         }
       }
+      if (typeof data.beginTime == "object") {
+        data.beginTime = formatDate(data.beginTime);
+      }
+      if (typeof data.endTime == "object") {
+        data.endTime = formatDate(data.endTime);
+      }
+      console.log("data", data)
       store.commit("SET_useData", data);
       this.currentStep = this.currentStep + 1;
     },

src/utils/Common.js

@@ -5,7 +5,7 @@
  * @company kiisoo
  */
 
-import roter from "../router";
+import roter from '../router'
 // import store from '../store'
 
 /**
@@ -15,19 +15,20 @@ import roter from "../router";
  */
 export function goToLogin() {
   // store.commit("LOGOUT");
-  roter.push("/login");
+  roter.push('/login')
 }
 
 export function formatDate(dt) {
-  dt = new Date(dt);
+  dt = new Date(dt)
-  let year = dt.getFullYear();
+  let year = dt.getFullYear()
-  let month = dt.getMonth() + 1;
+  let month = dt.getMonth() + 1
-  let day = dt.getDate();
+  let day = dt.getDate()
-  month = month < 10 ? "0" + month : month;
+  month = month < 10 ? '0' + month : month
-  day = day < 10 ? "0" + day : day;
+  day = day < 10 ? '0' + day : day
-  return year + "-" + month + "-" + day;
+  return year + '-' + month + '-' + day
 }
 
 export default {
   goToLogin,
-};
+  formatDate,
+}