bug修复

src/modules/activity/components/FormType.vue

@@ -38,7 +38,7 @@
       </div>
       <div class="form-set-pay">
         <div class="sub-title">缴费设置</div>
-        <el-form-item label="缴费功能：">
+        <el-form-item label="缴费功能:">
           <el-radio v-model="data.can_pay" :label="1">开启</el-radio>
           <el-radio v-model="data.can_pay" :label="0">关闭</el-radio>
         </el-form-item>
@@ -46,31 +46,31 @@
           <el-form-item label="价格：" prop="pay_price">
             <el-input style="width: 20%" v-model="data.pay_price"></el-input>
           </el-form-item>
-          <el-form-item label="开票功能：">
+          <el-form-item label="开票功能:">
             <el-radio v-model="data.can_invoice" :label="1">开启</el-radio>
             <el-radio v-model="data.can_invoice" :label="0">关闭</el-radio>
           </el-form-item>
-          <el-form-item label="单位优惠：">
+          <el-form-item label="单位优惠:">
             <el-radio v-model="data.can_company" :label="1">开启</el-radio>
             <el-radio v-model="data.can_company" :label="0">关闭</el-radio>
           </el-form-item>
-          <el-form-item label="跳转：">
+          <el-form-item label="跳转:">
             <el-radio v-model="data.can_jump" :label="1">开启</el-radio>
             <el-radio v-model="data.can_jump" :label="0">关闭</el-radio>
           </el-form-item>
           <template v-if="!!data.can_jump">
-            <el-form-item label="跳转链接：" prop="jump_url">
+            <el-form-item label="跳转链接:" prop="jump_url">
               <el-input style="width: 20%" v-model="data.jump_url"></el-input>
             </el-form-item>
           </template>
-          <el-form-item label="跳过支付：">
+          <el-form-item label="跳过支付:">
             <el-radio v-model="data.can_skip_pay" :label="1">开启</el-radio>
             <el-radio v-model="data.can_skip_pay" :label="0">关闭</el-radio>
           </el-form-item>
-          <el-form-item label="跳过文案：" prop="skip_pay_title" v-if="!!data.can_skip_pay">
+          <el-form-item label="跳过文案:" prop="skip_pay_title" v-if="!!data.can_skip_pay">
             <el-input style="width: 20%" v-model="data.skip_pay_title"></el-input>
           </el-form-item>
-          <el-form-item label="支付平台：" prop="shop_id">
+          <el-form-item label="支付平台:" prop="shop_id">
             <el-select v-model="data.shop_id" placeholder="请选择">
               <el-option v-for="item in shopMap" :key="item.key" :label="item.value" :value="item.key"> </el-option>
             </el-select>
@@ -79,10 +79,10 @@
       </div>
       <div class="form-set-page">
         <div class="sub-title">页面设置</div>
-        <el-form-item label="标题：" prop="title">
+        <el-form-item label="标题:" prop="title">
           <el-input style="width: 20%" v-model="data.title"></el-input>
         </el-form-item>
-        <el-form-item label="页面头部：" prop="desc">
+        <el-form-item label="页面头部:" prop="desc">
           <v-editor v-model="data.desc"></v-editor>
         </el-form-item>
       </div>

src/modules/activity/components/SetBasic.vue

@@ -17,7 +17,9 @@
           v-model="form.activity_time"
           type="datetime"
           @change="activityDateChange"
-          placeholder="选择日期时间">
+          placeholder="选择日期时间"
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="报名时间：" prop="time">
@@ -43,11 +45,30 @@ export default {
   data() {
     return {
       rules: {
-        name: { required: true, message: '请填写活动标题', trigger: 'change' },
-        max_number: { required: true, message: '请填写最大参与人数', trigger: 'change' },
+        name: { required: true, message: '请填写活动标题', trigger: 'blur' },
+        max_number: [
+          { required: true, message: '请填写最大参与人数', trigger: 'blur' },
+          {
+            trigger: 'blur',
+            min: 1,
+            message: '最大人数限制不能小于1人',
+            validator(rule, value, callback) {
+              if (parseInt(Number(value)) && Number(value) >= 1) {
+                callback()
+              } else {
+                callback(new Error('最大人数限制不能小于1人'))
+              }
+            }
+          }
+        ],
         project_id: { required: true, message: '请关联项目', trigger: 'change' },
         time: { required: true, message: '请选择时间', trigger: 'change' },
         activity_time: { required: true, message: '请选择时间', trigger: 'change' }
+      },
+      pickerOptions: {
+        disabledDate(v) {
+          return v.getTime() < new Date().getTime() - 86400000
+        }
       }
     }
   },
@@ -56,6 +77,9 @@ export default {
       return this.$store.state.commonMap.project_map || {}
     }
   },
+  mounted() {
+    console.log(this.form)
+  },
   methods: {
     submitForm() {
       let flag = false
@@ -88,5 +112,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/modules/activity/views/Create.vue

 <template>
   <div class="create-box">
-    <div class="title">新建活动</div>
+    <div class="title">{{ !$route.query.id ? '新建活动' : '编辑活动' }}</div>
     <div class="create-top">
       <div class="sub-title">基本设置</div>
       <set-basic :form="basicForm" ref="basicInfo" class="set-basic"></set-basic>
@@ -112,27 +112,25 @@ export default {
     },
     // 编辑
     handleUpdate() {
-      if (this.isDisplayModulesValidate() !== -1) {
-        this.$message.warning('请认真检查页面信息是否有误或未填写')
-        return
-      }
-      const params = Object.assign(this.basicForm, { details: this.stepPageInfo })
-      console.log(params, 'this')
-      params.id = this.$route.query.id
-      params.details.map(item => {
-        if (parseInt(item.type) === 2) {
-          item.user_fields = JSON.stringify(item.user_fields)
-        }
-        return item
-      })
-      console.log(params, 'params')
-      updateRegister(params).then(res => {
-        this.$message({
-          message: '更新成功',
-          type: 'success'
+      if (this.isBaseicForm() && this.isDisplayModulesValidate() === -1) {
+        const params = Object.assign(this.basicForm, { details: this.stepPageInfo })
+        console.log(params, 'this')
+        params.id = this.$route.query.id
+        params.details.map(item => {
+          if (parseInt(item.type) === 2) {
+            item.user_fields = JSON.stringify(item.user_fields)
+          }
+          return item
         })
-        this.$router.push({ path: '/activity/list' })
-      })
+        console.log(params, 'params')
+        updateRegister(params).then(res => {
+          this.$message({
+            message: '更新成功',
+            type: 'success'
+          })
+          this.$router.push({ path: '/activity/list' })
+        })
+      }
     },
     // 点击添加页面按钮
     handleAddPageClick() {

src/modules/activity/views/List.vue

@@ -54,12 +54,12 @@ export default {
           {
             type: 'input',
             prop: 'name',
-            label: '活动名称'
+            label: '活动名称:'
           },
           {
             type: 'input',
             prop: 'id',
-            label: '活动id'
+            label: '活动id:'
           },
           {
             type: 'select',
@@ -67,7 +67,7 @@ export default {
             options: this.projectMap,
             labelKey: 'value',
             valueKey: 'key',
-            label: '项目筛选'
+            label: '项目筛选:'
           }
         ],
         columns: [

src/modules/register/components/SetBasic.vue

@@ -2,17 +2,21 @@
   <div>
     <el-form ref="form" :inline="true" :model="form">
       <template v-for="(item, index) in dataList">
-        <el-form-item :label="item.name" v-if="item.type === 'input'" :key="index">
+        <el-form-item :label="item.name + ':'" v-if="item.type === 'input'" :key="index">
           <el-input :disabled="item.enable_edit" v-model="form[item.key]"></el-input>
         </el-form-item>
-        <el-form-item :label="item.name" v-if="item.type === 'radio'" :key="index">
-          <el-radio :key="cIndex" v-for="(opt, cIndex) in item.optionList" v-model="form[item.key]" :label="opt.id">{{
-            opt.option
-          }}</el-radio>
+        <el-form-item :label="item.name + ':'" v-if="item.type === 'radio'" :key="index">
+          <el-radio
+            :key="cIndex"
+            v-for="(opt, cIndex) in item.optionList"
+            v-model="form[item.key]"
+            :label="opt.id + ':'"
+            >{{ opt.option }}</el-radio
+          >
         </el-form-item>
-        <el-form-item :label="item.name" v-if="item.type === 'select'" :key="index">
-          <el-select v-model="value" placeholder="请选择">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+        <el-form-item :label="item.name + ':'" v-if="item.type === 'select'" :key="index">
+          <el-select v-model="form[item.key]" placeholder="请选择">
+            <el-option v-for="(opt, cIndex) in item.optionList" :key="cIndex" :label="opt" :value="opt"> </el-option>
           </el-select>
         </el-form-item>
       </template>
@@ -29,7 +33,7 @@ export default {
   },
   data() {
     return {
-      value: '',
+      // value: '',
       dataList: [],
       allFormList: [
         {
@@ -262,6 +266,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.infoData, 'infoData')
     this.setForm()
   },
   methods: {

src/modules/register/views/Detail.vue

@@ -8,10 +8,10 @@
     <div class="detail-bottom">
       <div class="sub-title">人员信息</div>
       <el-form ref="form" :inline="true" :model="form" label-width="80px" style="margin-top: 20px">
-        <el-form-item label="姓名">
+        <el-form-item label="姓名:">
           <el-input v-model="form.name"></el-input>
         </el-form-item>
-        <el-form-item label="电话">
+        <el-form-item label="电话:">
           <el-input v-model="form.mobile"></el-input>
         </el-form-item>
         <el-form-item v-for="(item, index) in payStatus" :key="index" :label="item.title">

src/modules/register/views/List.vue

 <template>
   <app-card class="register-box">
     <el-form ref="form" :inline="true" :model="form" label-width="80px">
-      <el-form-item label="活动名称">
+      <el-form-item label="活动名称:">
         <el-input v-model="form.activity_name"></el-input>
       </el-form-item>
-      <el-form-item label="项目ID">
+      <el-form-item label="项目ID:">
         <el-input v-model="form.activity_project_id"></el-input>
       </el-form-item>
-      <el-form-item label="性别">
+      <el-form-item label="性别:">
         <el-select v-model="form.gender" placeholder="请选择性别" clearable>
           <el-option label="未知" value="0"></el-option>
           <el-option label="男" value="1"></el-option>
           <el-option label="女" value="2"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="人员类型">
+      <el-form-item label="人员类型:">
         <el-select v-model="form.user_type" placeholder="请选择人员类型" clearable>
           <el-option label="普通成员" value="1"></el-option>
           <el-option label="归属人" value="2"></el-option>
@@ -235,7 +235,11 @@ export default {
     },
     // 删除报名记录
     deleteJoin(id) {
-      this.$confirm('确认删除该条报名记录吗？删除后不可恢复').then(_ => {
+      this.$confirm('确认删除该条报名记录吗？删除后不可恢复', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         deleteJoin({ join_id: id }).then(res => {
           if (res.code === 0) {
             this.$message({