新增页面

src/components/sale/editOrder-form.vue

@@ -397,12 +397,9 @@
               } else{
                 this.OrderMsg.PreferPrice = Number(guestNum * unit_price).toFixed(2) - this.OrderMsg.LessPrice;
               }
-        
         }
-        
         //留学就业订单
         if (this.OrderMsg.OrderType == 2) {
-          console.log("我进来了2");
           this.OrderMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2);
         }
       },
@@ -413,7 +410,6 @@
           }).then(res => {
             if (res.Code == 1) {
               var tempData = res.Data.OrderInfo;
-              console.log("tempData",tempData);
               this.OrderMsg.ClassId = tempData.ClassId;
               this.OrderMsg.GuestNum = tempData.GuestNum;
               this.OrderMsg.Unit_Price = tempData.Unit_Price;

src/components/schedul/reservestudentlist.vue

@@ -17,7 +17,7 @@
       <template v-slot:body-cell-Demand="props">
         <q-td>
           <template>
-           <div v-html="props.row.Demand"></div>
+            <div v-html="props.row.Demand"></div>
           </template>
         </q-td>
       </template>
@@ -208,7 +208,6 @@
       },
       //编辑试听
       editVisitor(obj) {
-        console.log("reserveObj",obj);
         this.reserveObj = obj
         this.isShowReserve = true;
       },
@@ -219,8 +218,6 @@
       refreshPage() {
         this.$emit('success');
       },
-
-
       //删除试听
       DeleteVisitorReserve(Id) {
         let that = this;

src/components/school/student/student-left.vue

@@ -527,7 +527,6 @@
       this.getStudentDorpDown();
       this.getGetNeedsList();
       this.queryStuTelType();
-      console.log("this.StudentType",this.StudentType);
       if (this.saveObj) {
         if (this.saveObj.StuId > 0) {
           this.customMsg.StuId = this.saveObj.StuId;

src/components/school/student/transfer-order/order-form.vue

@@ -744,34 +744,24 @@
               newPreferPrice = chaBanPrice * guestNum * this.OrderMsg.TotalClassHours
             }
           }
-          console.log("我进来了1");
           this.OrderMsg.PreferPrice =
             Number(newPreferPrice).toFixed(2) - this.OrderMsg.LessPrice;
         } else {
 
           if (this.OrderMsg.Unit_PriceType == 1) {
-            console.log("guestNum", guestNum);
-            console.log("unit_price", unit_price);
-            console.log("this.OrderMsg.LessPrice", this.OrderMsg.LessPrice);
             this.OrderMsg.PreferPrice =
               Number(guestNum * unit_price).toFixed(2) - this.OrderMsg.LessPrice;
-            console.log("我进来了2");
           } else if (this.OrderMsg.Unit_PriceType == 2) {
             this.OrderMsg.PreferPrice =
               Number((guestNum * unit_price * this.OrderMsg.TotalClassHours) + Number(this.OrderMsg.TextbookFee) +
                 Number(this.OrderMsg.CoursewareFee)).toFixed(2) - this.OrderMsg.LessPrice;
-            console.log("我进来了3");
           }
         }
         //留学就业订单
         if (this.OrderMsg.OrderType == 2) {
           this.OrderMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2);
         }
-
-
-
         this.OrderMsg.DiscountMoney = 0;
-
         this.stuData.StuList.map(e => {
           if (e.IsRenewGuest == 0) {
             this.OrderMsg.DiscountMoney = this.accAdd(
@@ -817,7 +807,6 @@
         if (this.OrderMsg.OrderType == 2) {
           this.OrderMsg.OrderNature = 1;
         }
-        console.log("saveObj", this.saveObj);
         if (this.saveObj) {
           if (this.saveObj.ClassId) {
             this.OrderMsg.ClassId = this.saveObj.ClassId;

src/pages/activity/makeAd.vue

@@ -609,7 +609,6 @@
               this.currentMaxId = y.nodeId > this.currentMaxId ? y.nodeId : this.currentMaxId
             })
             let reg = /^http(s)?:\/\/(.*?)\//
-            console.log("getMyAdDetail",data.pictureUrl);
             let getBlob = this.getAnyFileBlob(data.pictureUrl.replace(reg, ''))
             let that = this
             getBlob.then(blob => {

src/pages/financial/utils/commonUtils.js

@@ -359,6 +359,46 @@ var commonUtils = {
     //返回年月日
     return year + '-' + month + "-" + day;
   },
+  //获取指定日期的上一周,下一周
+  getWeeks(date, type) {
+    // 将传入的日期字符串转换为 Date 对象，如果已经是 Date 对象则直接使用
+    const currentDate = new Date(date instanceof Date ? date : date);
+    const oneDay = 24 * 60 * 60 * 1000;
+    var weekStart;
+    var weekEnd;
+    //上一周
+    if (type == 1) {
+      weekStart = new Date(currentDate.getTime() - 7 * oneDay);
+      weekEnd = new Date(weekStart.getTime() + 6 * oneDay);
+    }
+    //下一周
+    else if (type == 2) {
+      weekStart = new Date(currentDate.getTime() + 7 * oneDay);
+      weekEnd = new Date(weekStart.getTime() + 6 * oneDay);
+    }//本周 
+    else {
+      const dayOfWeek = currentDate.getDay();
+      weekStart = new Date(currentDate);
+      if (dayOfWeek === 0) {
+        weekStart.setDate(currentDate.getDate() - 6);
+      } else {
+        weekStart.setDate(currentDate.getDate() - (dayOfWeek - 1));
+      }
+      // 计算本周结束日期（周日）
+      weekEnd = new Date(weekStart.getTime() + 6 * oneDay);
+    }
+    const formatDate = (d) => {
+      const year = d.getFullYear();
+      const month = ('0' + (d.getMonth() + 1)).slice(-2);
+      const day = ('0' + d.getDate()).slice(-2);
+      return `${year}-${month}-${day}`;
+    };
+
+    return {
+      start: formatDate(weekStart),
+      end: formatDate(weekEnd)
+    };
+  },
   //格式化日期
   getFormatDate(dateStr) {
     var myDate = new Date(dateStr);

src/pages/stuMan/StudentProgress.vue

@@ -615,7 +615,6 @@ export default {
     showStuRight(obj) {
       if (obj) {
         this.$q.loading.show();
-        console.log(obj.StuId);
         getStudentInfo({ StuId: obj.StuId })
           .then(r => {
             this.stuOption = r.Data;

src/pages/stuMan/components/setStudyPlan.vue

@@ -497,7 +497,6 @@ export default {
       });
     },
     getPlan(){
-      console.log(this.planTime)
       const p = this.planTime
       getStuAppointPlan({AccountId:p.AccountId,Date:p.Date,ShiftSort:p.ShiftSort}).then(r=>{
         if(r.Code==1){

src/pages/system/surveyStudent.vue

@@ -209,7 +209,6 @@
       getSurveyShowList() {
         this.loading = true;
         querySurveyShowList(this.msg).then(res => {
-          console.log(res);
           this.loading = false
           this.data = res.Data.subList;
           this.pageTitle = res.Data.Title;

src/router/routes.js

@@ -2031,6 +2031,11 @@ const routes = [{
         component: () =>
           import("pages/studyAbroad/subscribe")
       },
+      {
+        path: "/stu/subappoint", //新版预约
+        component: () =>
+          import("pages/studyAbroad/subappoint")
+      },
       {
         path: "/financial/Language/languagePeriodsList", // 小语种业绩提成 分期列表
         component: () =>