Merge branch '03/18VipActive' into test

src/views/visitManager/addVisit.vue

@@ -299,7 +299,7 @@ export default {
       }
     },
     async onSubmit() {
-      const form = this.form;
+      let form = this.form;
       if (!form.studentId) {
         this.$toast("请选择学员");
         return;
@@ -324,14 +324,20 @@ export default {
       }
       this.clickStatus = true;
       setLoading(true);
-      let visitTime = this.form.visitTime.replace(/[^\d]/g,'/');
-      let someDate = new Date(visitTime)
-      let res = await visitAdd({...form,visitTime:dayjs(someDate).format("YYYY-MM-DD")});
+      // let visitTime = this.form.visitTime.replace(/[^\d]/g,'/');
+      // let someDate = new Date(visitTime)
+      let { visitTime, ...more } =  this.from
+      visitTime = dayjs(this.dataForm.currentDate).format("YYYY-MM-DD")
+      let params = {
+        ...more,
+        visitTime
+      }
+      let res = await visitAdd({ ...params });
       let result = res.data;
       setLoading(false);
       if (result.code == 200) {
         this.$toast("添加成功");
-        this.$router.push("visitList"); 
+        this.$router.push("visitList");
       } else {
         this.$toast(result.msg);
         this.clickStatus = false;