Merge branch 'dev' of gitlab.33.cn:CassiniatSaturn/fns_backend into dev

src/utils/time/transfer.ts

@@ -20,6 +20,27 @@ export function transfterStrToDate(str: string) {
     end = `${d.getFullYear()} ${d.getMonth() + 1} ${d.getDate()} ${end}`
     const startDate = new Date(start)
     const endDate = new Date(end)
+    console.log(start,'start');
+    
+    return [startDate, endDate]
+  } else {
+    return undefined
+  }
+}
+// 早上9：00 下午17:00
+export function transfterStrToDateSafari(str: string) {
+  const arr = str.split(' ')
+  if (arr.length === 2) {
+    let [start, end] = arr
+    start = start.replace('：', ':').replace('早上', '').replace('下午', '')
+    end = end.replace('：', ':').replace('早上', '').replace('下午', '')
+    const d = new Date()
+    start = `${d.getFullYear()}/${d.getMonth() + 1}/${d.getDate()} ${start}`
+    end = `${d.getFullYear()}/${d.getMonth() + 1}/${d.getDate()} ${end}`
+    const startDate = new Date(start)
+    const endDate = new Date(end)
+    console.log(start,'start');
+    console.log(end,'end');
     return [startDate, endDate]
   } else {
     return undefined

src/views/Root/OutletManagement/index.vue

@@ -470,6 +470,7 @@ import transferTimeStampToMoment, {
   getOpeningHoursFromMoment,
   getWeekendStatusFromArr,
   transfterStrToDate,
+  transfterStrToDateSafari
 } from "@/utils/time/transfer";
 import { getSelfOutLet } from "@/utils/outlet/index";
 import { getUserMsg } from "@/utils/userMsg/userMsg";
@@ -619,7 +620,6 @@ export default Vue.extend({
       modalType: undefined as undefined | eModalType,
       dataSource: [] as any[],
       start:'',
-      end:'',
     };
   },
   async mounted() {
@@ -781,7 +781,11 @@ export default Vue.extend({
         this.formData.openDays.push("6");
         this.formData.openDays.push("7");
       }
-      const arr2 = transfterStrToDate(record.opening_hours);
+      // const arr2 = transfterStrToDate(record.opening_hours);
+      const arr2 = transfterStrToDateSafari(record.opening_hours);
+      
+      console.log(transfterStrToDate(record.opening_hours),'transfterStrToDate');
+      console.log(arr2,'arr2');
       
       if (arr2?.length === 2) {
         const [startDate, endDate] = arr2;
@@ -794,18 +798,17 @@ export default Vue.extend({
         const endm=endDate.getMinutes()<10? '0'+endDate.getMinutes():endDate.getMinutes()+''
         const start=starh+':'+starm
         const end=endh+':'+endm
-        this.start=start
-        this.end=end
-        this.formData.startTime = moment(this.start,"HH:mm")
-        this.formData.endTime = moment(this.end,"HH:mm")
-        console.log(this.formData.startTime,'this.formData.startTime');
-        console.log(this.start,'this.start');
-        console.log(startDate,'startDate');
-        
-        
-        
-
+        this.formData.startTime = moment(start,"HH:mm")
+        this.formData.endTime = moment(end,"HH:mm")
+        console.log(typeof start,'start');
+        console.log(end,'end');
         
+        const riqi=moment(startDate,"HH:mm")
+        console.log(riqi,'riqi');
+        console.log(startDate,'startDate');
+        console.log(starh,'starh');
+        console.log(arr2,'arr2');
+        console.log(arr2[0],'0');
                 
       }
       const ret = await AddressService.getInstance().note(record.id);