update

lottery/registrationActivity.html

@@ -65,6 +65,9 @@
     font-size: 14px;
     color: #222222; 
   }
+  .item_content p{
+    margin: 0;
+  }
   .foot_btn {
     position: fixed;
     bottom: 14px;
@@ -127,6 +130,12 @@
     color: #222222;
     text-align: right;
   }
+  .el-form-item__content .el-select {
+    margin-left: 18px;
+  }
+  .el-form-item__content .el-cascader {
+    margin-left: 18px;
+  }
   .signup_page {
     width: 100vw;
     height: 100vh;
@@ -292,7 +301,7 @@
       <div class="form_content" v-else-if="step === 2">
         <div class="form_title">报名表单</div>
         <el-form ref="form" label-position="left" label-width="100px">
-          <el-form-item v-for="(item, index) in toshopData.formProList" :key="index" :label="item.name + ':'" :required="Boolean(item.isNeed)">
+          <el-form-item v-for="(item, index) in toshopData.formProList" :key="index" :label="item.name" :required="Boolean(item.isNeed)">
             <el-cascader v-if="item.type === 10" v-model="item.value" :options="transformedData" @change="handleInfoCity">
             </el-cascader>
             <el-select v-if="item.type === 11" v-model="item.value" placeholder="请选择" @change="handlechange">

lottery/signUp.html

@@ -93,6 +93,12 @@
     border-bottom: 1px solid #F9F9F9;
     padding: 10px 0;
   }
+  .el-form-item__content .el-select {
+    margin-left: 18px;
+  }
+  .el-form-item__content .el-cascader {
+    margin-left: 18px;
+  }
   .page6s {
     width: 100vw;
     height: 100vh;
@@ -156,10 +162,10 @@
       <div class="page_title">核销领取礼品</div>
       <div class="form_content">
         <el-form ref="form" label-position="left" label-width="100px">
-          <el-form-item label="核销码：" required>
+          <el-form-item label="核销码" required>
             <el-input v-model="verificationCode" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item v-for="(item, index) in toshopData.formProList" :key="index" :label="item.name + ':'"
+          <el-form-item v-for="(item, index) in toshopData.formProList" :key="index" :label="item.name "
             :required="Boolean(item.isNeed)">
             <el-cascader v-if="item.type === 10" v-model="item.value" :options="transformedData" @change="handleInfoCity">
             </el-cascader>
@@ -395,15 +401,24 @@
           })
       },
       toSignUp() {
-        this.toshopData.formProList.forEach(item => {
+        if (!this.verificationCode) {
+          this.$message({
+            message: '核销码不能为空',
+            type: 'warning'
+          })
+          return
+        }
+        const isValid = this.toshopData.formProList.some(item => {
           if (item.isNeed && !item.value) {
             this.$message({
               message: '必填项不能为空',
               type: 'warning'
             })
-            return false
+            return true
           }
+          return false
         })
+        if (isValid) return
         let cols = []
         cols = this.toshopData.formProList.map(item => {
           return {