最新需求优化

src/views/modules/activity/add.vue

@@ -28,21 +28,21 @@
                     <el-form-item label="活动名称" prop="activityName">
                         <el-input v-model="basicForm.activityName" placeholder="请输入活动名称"></el-input>
                     </el-form-item>
-                    <el-form-item label="报名时间" prop="signupEndTime">
+                    <el-form-item label="报名时间" prop="">
                       <div class="adfac">
                         <el-date-picker v-model="basicForm.signupStartTime" @change="e=>handleSignupDateChange(e,'signupStartTime')" type="datetime" format="yyyy-MM-dd HH:mm" placeholder="年/月/日 - -:- -" style="width: 205px;"></el-date-picker>
                         <span style="margin: 0 10px;">至</span>
                         <el-date-picker v-model="basicForm.signupEndTime" @change="e=>handleSignupDateChange(e,'signupEndTime')" type="datetime" format="yyyy-MM-dd HH:mm" placeholder="年/月/日 - -:- -" style="width: 205px;"></el-date-picker>
                       </div>
                     </el-form-item>
-                    <el-form-item label="活动时间" prop="activityEndTime">
+                    <el-form-item label="活动时间" prop="">
                       <div class="adfac">
                         <el-date-picker v-model="basicForm.activityStartTime" @change="e=>handleActivityDateChange(e,'activityStartTime')" type="datetime" format="yyyy-MM-dd HH:mm" placeholder="年/月/日 - -:- -" style="width: 205px;"></el-date-picker>
                         <span style="margin: 0 10px;">至</span>
                         <el-date-picker v-model="basicForm.activityEndTime" @change="e=>handleActivityDateChange(e,'activityEndTime')" type="datetime" format="yyyy-MM-dd HH:mm" placeholder="年/月/日 - -:- -" style="width: 205px;"></el-date-picker>
                       </div>
                     </el-form-item>
-                    <el-form-item label="活动地点" prop="districtId">
+                    <el-form-item label="活动地点" prop="">
                         <el-select v-model="basicForm.provinceId" placeholder="省" clearable  style="width: 14.5%" @change="val=>regionChange(val, 'province')">
                             <el-option v-for="item in provinceOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
@@ -538,10 +538,10 @@ export default {
     handleNext () {
       this.$refs.basicRef.validate(valid => {
         if (valid) {
-          if (Date.parse(this.basicForm.signupStartTime) > Date.parse(this.basicForm.signupEndTime)) return this.$message.error('报名结束时间不能小于报名开始时间')
-          if (Date.parse(this.basicForm.signupEndTime) < Date.parse(new Date())) return this.$message.error('报名结束时间不能小于当前时间')
-          if (Date.parse(this.basicForm.signupEndTime) > Date.parse(this.basicForm.activityStartTime)) return this.$message.error('活动开始时间不能小于报名结束时间')
-          if (Date.parse(this.basicForm.activityStartTime) > Date.parse(this.basicForm.activityEndTime)) return this.$message.error('活动结束时间不能小于活动开始时间')
+          if (this.basicForm.signupStartTime && this.basicForm.signupEndTime && (Date.parse(this.basicForm.signupStartTime) > Date.parse(this.basicForm.signupEndTime))) return this.$message.error('报名结束时间不能小于报名开始时间')
+          if (this.basicForm.signupEndTime && (Date.parse(this.basicForm.signupEndTime) < Date.parse(new Date()))) return this.$message.error('报名结束时间不能小于当前时间')
+          if (this.basicForm.signupEndTime && this.basicForm.activityStartTime && (Date.parse(this.basicForm.signupEndTime) > Date.parse(this.basicForm.activityStartTime))) return this.$message.error('活动开始时间不能小于报名结束时间')
+          if (this.basicForm.activityStartTime && this.basicForm.activityEndTime && (Date.parse(this.basicForm.activityStartTime) > Date.parse(this.basicForm.activityEndTime))) return this.$message.error('活动结束时间不能小于活动开始时间')
           if (!this.basicForm.coverFile) return this.$message.error('请上传活动列表图片')
           if (!this.basicForm.imageFiles) return this.$message.error('请上传活动详情Banner')
           if (!this.basicForm.activityDetails) return this.$message.error('请输入活动详情')

src/views/modules/advertising.vue

@@ -60,7 +60,7 @@
                         <el-option label="弹框" :value="2"></el-option>
                     </el-select>
                 </el-form-item> -->
-                <el-form-item label="banner图标题" prop="title">
+                <el-form-item label="banner图标题" prop="">
                     <el-input v-model="advertForm.title" placeholder="请输入banner图标题"></el-input>
                 </el-form-item>
                 <el-form-item label="配图" prop="" class="red">
@@ -77,7 +77,7 @@
                     </el-upload>
                     <div class="dialog-tip">图片最小分辨率：702*200</div>
                 </el-form-item>
-                <el-form-item label="跳转链接" prop="redirectType">
+                <el-form-item label="跳转链接" prop="">
                     <el-radio-group v-model="advertForm.redirectType">
                         <el-radio :label="1">微信公众号</el-radio>
                         <el-radio :label="2">微信小程序</el-radio>
@@ -133,7 +133,7 @@ export default {
         space: '',
         type: '',
         title: '',
-        redirectType: 1,
+        redirectType: '',
         redirect: '',
         fileUrl: '',
         enable: 1
@@ -210,12 +210,14 @@ export default {
         space: '',
         type: '',
         title: '',
-        redirectType: 1,
+        redirectType: '',
         redirect: '',
         fileUrl: '',
         enable: 1
       }
       this.$refs['advertRef'].resetFields()
+      this.fileList = []
+      this.advertForm.fileUrl = ''
       this.show = false
     },
     handleDelete (row) {
@@ -276,4 +278,12 @@ export default {
     margin-top: -10px;
 
 }
+
+::v-deep .el-form-item.red label{
+  &::before{
+    content: '*';
+    color: #F56C6C;
+    margin-right: 4px;
+  }
+}
 </style>

src/views/modules/member/add.vue

@@ -39,7 +39,7 @@
                     </el-form-item>
                 </template>
                 <template v-else-if="dataForm.addType === 2">
-                    <el-form-item label="会员昵称" prop="nickName">
+                    <el-form-item label="会员昵称" prop="">
                         <el-input v-model="dataForm.nickName" placeholder="请输入会员昵称"></el-input>
                     </el-form-item>
                     <el-form-item label="渠道方" prop="channelId">
@@ -47,13 +47,13 @@
                             <el-option v-for="item in channelOptions" :key="item.id" :label="item.channelName" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="善行少年编号" prop="uniqueNo">
+                    <el-form-item label="善行少年编号" prop="">
                         <el-input v-model="dataForm.uniqueNo" placeholder="根据选择渠道方自动生成编号" disabled></el-input>
                     </el-form-item>
-                    <el-form-item label="姓名" prop="realName">
+                    <el-form-item label="姓名" prop="">
                         <el-input v-model="dataForm.realName" placeholder="请输入会员姓名"></el-input>
                     </el-form-item>
-                    <el-form-item label="性别" prop="gender">
+                    <el-form-item label="性别" prop="">
                         <el-select v-model="dataForm.gender" placeholder="请选择性别">
                             <el-option v-for="item in genderOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
@@ -61,7 +61,7 @@
                     <el-form-item label="手机号码" prop="phone">
                         <el-input v-model="dataForm.phone" placeholder="请输入手机号码"></el-input>
                     </el-form-item>
-                    <el-form-item label="身份证号" prop="idCard">
+                    <el-form-item label="身份证号" prop="">
                         <el-input v-model="dataForm.idCard" placeholder="请输入身份证号"></el-input>
                     </el-form-item>
                     <!-- <el-form-item label="家庭公益名称" prop="welfareName">
@@ -152,7 +152,7 @@ export default {
   watch: {
     'dataForm.channelId': function (val) {
       if (val) {
-        this.dataForm.uniqueNo = `SXSN-PAB-${new Date().getTime()}`
+        this.dataForm.uniqueNo = `SXSN-FAM-${new Date().getTime()}`
       }
     }
   },

src/views/modules/member/detail.vue

@@ -117,6 +117,9 @@
             <el-form-item label="姓名" prop="realName">
               <el-input v-model="form.realName" placeholder="请输入"></el-input>
             </el-form-item>
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model="form.idCard" placeholder="请输入"></el-input>
+            </el-form-item>
             <el-form-item label="家庭公益名称" prop="welfareName">
               <el-input v-model="form.welfareName" placeholder="请输入"></el-input>
             </el-form-item>
@@ -192,6 +195,10 @@ export default {
         realName: [
           { required: true, message: '请输入姓名', trigger: 'blur' }
         ],
+        idCard: [
+          { required: true, message: '请输入正确的身份证号', trigger: 'blur' },
+          { pattern: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/, message: '请输入正确的身份证号', trigger: 'blur' }
+        ],
         welfareName: [
           { required: true, message: '请输入家庭公益名称', trigger: 'blur' }
         ],