bug修复

src/modules/activity/components/FormType.vue

@@ -103,11 +103,12 @@ export default {
           { required: true, message: '请填写支付金额', trigger: 'blur' },
           {
             trigger: 'blur',
+            min: 0,
             validator(rule, value, callback) {
-              if (Number(value) >= 0) {
+              if (Number(value) > 0) {
                 callback()
               } else {
-                callback(new Error('请输小于正整数'))
+                callback(new Error('支付金额不能小于等于0'))
               }
             }
           }

src/modules/activity/views/Create.vue

@@ -21,7 +21,7 @@
         </el-tabs>
       </div>
       <div class="create-bottom_btn">
-        <el-button type="primary" style="margin-right: 80px" @click="hanleSessionStorage">暂存配置</el-button>
+        <el-button type="primary" style="margin-right: 80px" @click="hanleLocalStorage">暂存配置</el-button>
         <el-button type="primary" @click="handleAddPageClick">添加步骤</el-button>
         <el-button @click="handleRemovePageClick">删除步骤</el-button>
       </div>
@@ -113,7 +113,7 @@ export default {
     // 编辑
     handleUpdate() {
       if (this.isDisplayModulesValidate() !== -1) {
-        this.$message.warning('请填写按钮文案')
+        this.$message.warning('请认真检查页面信息是否有误或未填写')
         return
       }
       const params = Object.assign(this.basicForm, { details: this.stepPageInfo })
@@ -233,7 +233,13 @@ export default {
       })
     },
     // 暂存配置
-    hanleSessionStorage() {}
+    hanleLocalStorage() {
+      console.log('111')
+      window.localStorage.setItem('stepPageInfo', JSON.stringify(this.stepPageInfo))
+      console.log(window.localStorage.getItem('stepPageInfo'))
+      this.$message.success('暂存数据成功')
+      // console.log(JSON.parse(window.localStorage.getItem('stepPageInfo'))
+    }
   }
 }
 </script>

src/modules/register/components/SetBasic.vue

@@ -29,6 +29,7 @@ export default {
   },
   data() {
     return {
+      value: '',
       dataList: [],
       allFormList: [
         {

src/modules/register/views/Create.vue

@@ -9,14 +9,19 @@
       <div class="sub-title">展示设置</div>
       <div class="create-bottom_mian">
         <el-tabs @tab-click="handleClick" v-model="activeName">
-          <el-tab-pane :name="`${index}`" :label="`第${index + 1}步`" v-for="(item, index) in stepPageInfo" :key="index">
+          <el-tab-pane
+            :name="`${index}`"
+            :label="`第${index + 1}步`"
+            v-for="(item, index) in stepPageInfo"
+            :key="index"
+          >
             <display-page ref="display" v-if="item.type == '1'" :key="index"></display-page>
             <form-page ref="display" v-if="item.type == '2'" :key="index"></form-page>
           </el-tab-pane>
         </el-tabs>
       </div>
       <div class="create-bottom_btn">
-        <el-button type="primary" style="margin-right:80px">暂存配置</el-button>
+        <el-button type="primary" style="margin-right: 80px" @click="hanleLocalStorage">暂存配置</el-button>
         <el-button type="primary" @click="handleAddPageClick">添加步骤</el-button>
         <el-button @click="handleRemovePageClick">删除步骤</el-button>
       </div>
@@ -26,7 +31,8 @@
       <div class="add-page_select">
         <div class="label">步骤类型：</div>
         <el-select v-model="dialogAddPageValue" placeholder="请选择">
-          <el-option v-for="item in dialogAddPageOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+          <el-option v-for="item in dialogAddPageOptions" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
         </el-select>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -34,7 +40,7 @@
         <el-button type="primary" @click="handleDialogAddPageClick">确 定</el-button>
       </div>
     </el-dialog>
-    <el-button type="primary" @click="handleAddPageClick" style="display:block;margin:30px auto">生成报名</el-button>
+    <el-button type="primary" @click="handleAddPageClick" style="display: block; margin: 30px auto">生成报名</el-button>
   </div>
 </template>
 
@@ -78,7 +84,7 @@ export default {
     },
     // 点击添加步骤按钮判断
     isDisplayPageForm() {
-      const isFormValue = this.$refs.display.findIndex(item => item.submitForm ? !item.submitForm() : false)
+      const isFormValue = this.$refs.display.findIndex(item => (item.submitForm ? !item.submitForm() : false))
       if (isFormValue === -1) {
         this.dialogAddPageVisible = true
       } else {
@@ -91,6 +97,14 @@ export default {
         this.stepPageInfo = this.stepPageInfo.filter((item, index) => index !== parseInt(this.activeName))
         this.activeName = (this.activeName === '0' ? '0' : this.activeName - 1).toString()
       }
+    },
+    // 暂存配置
+    hanleLocalStorage() {
+      console.log('111')
+      window.localStorage.setItem('stepPageInfo', JSON.stringify(this.stepPageInfo))
+      console.log(window.localStorage.getItem('stepPageInfo'))
+      this.$message.success('暂存数据成功')
+      // console.log(JSON.parse(window.localStorage.getItem('stepPageInfo'))
     }
   }
 }
@@ -128,16 +142,16 @@ export default {
       margin-top: 30px;
     }
   }
-  .add-page_select{
+  .add-page_select {
     display: flex;
     align-items: center;
     justify-content: center;
-    .label{
+    .label {
       margin-right: 5px;
     }
   }
 }
-.create-bottom_btn{
+.create-bottom_btn {
   margin-top: 15px;
 }
 </style>

src/modules/register/views/Detail.vue

@@ -5,7 +5,7 @@
       <div class="sub-title">基本信息</div>
       <set-basic v-if="Object.keys(infoData).length" :infoData="infoData" class="set-basic"></set-basic>
     </div>
-    <div class="detail-bottom" v-if="tableData.length">
+    <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="姓名">
@@ -28,7 +28,7 @@
           <el-button type="primary" @click="dialogVisible = true">全部人员缴费</el-button>
           <el-button type="primary" @click="columnsOptionsVisible = true">表头筛选</el-button>
         </div>
-        <el-table :data="tableData" style="width: 100%">
+        <el-table :data="tableData" style="width: 100%" :row-class-name="getRowClass">
           <el-table-column type="expand">
             <template slot-scope="props">
               <div class="demo-table-expand">
@@ -135,6 +135,11 @@ export default {
     this.getRecordsDetail()
   },
   methods: {
+    getRowClass(row) {
+      if (row.row.pay_records.length === 0) {
+        return 'row-expand-cover'
+      }
+    },
     // data
     getRecordsDetail() {
       const params = { join_id: this.$route.query.id }
@@ -236,4 +241,7 @@ export default {
   margin: 8px 0 23px;
   box-sizing: border-box;
 }
+.row-expand-cover td .el-table__expand-icon {
+  visibility: hidden !important;
+}
 </style>

src/modules/register/views/List.vue

@@ -67,6 +67,7 @@
         <template v-for="item in tabelField">
           <el-table-column v-if="item.visible" :label="item.label" :prop="item.key" :key="item.key"></el-table-column>
         </template>
+
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button type="text" @click="$router.push({ path: '/register/detail', query: { id: scope.row.id } })"
@@ -167,8 +168,7 @@ export default {
         { visible: true, key: 'check_in_time', label: '入住时间' },
         { visible: true, key: 'check_out_time', label: '离店时间' },
         { visible: true, key: 'room_type', label: '房型' },
-        { visible: true, key: 'breakfast', label: '早餐' },
-        { visible: true, key: 'user_type', label: '人员类型' }
+        { visible: true, key: 'breakfast', label: '早餐' }
       ]
     }
   },