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

src/utils/time/transfer.ts

@@ -20,8 +20,6 @@ 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
@@ -39,8 +37,6 @@ export function transfterStrToDateSafari(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');
-    console.log(end,'end');
     return [startDate, endDate]
   } else {
     return undefined

src/views/Root/Banner/index.vue

@@ -2,7 +2,7 @@
   <div>
     <p class="text-2xl font-bold mb-5">Banner管理</p>
     <!-- timepicker -->
-    <span class="font-semibold">新增时间：</span>
+    <span class="font-semibold">操作时间：</span>
     <timerange
       class="mr-3"
       @getNewTime="getNewTime"

src/views/Root/News/index.vue

@@ -4,7 +4,7 @@
     <!-- 搜索框 -->
     <a-input placeholder="标题模糊搜索"  v-model="searchPageReqParams.title" style="width: 150px; margin-right:10px;"/>
      <!-- timepicker -->
-      <span class=" font-semibold">新增时间：</span>
+      <span class=" font-semibold">操作时间：</span>
       <timerange class=" mr-3" :startTime="searchPageReqParams.start_time" :endTime="searchPageReqParams.end_time"
                  @getNewTime="getNewTime"/>
       <!-- 咨询分类 -->

src/views/Root/OutletManagement/index.vue

@@ -784,32 +784,10 @@ export default Vue.extend({
       // 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;
-        // this.formData.startTime = moment("00:00", "HH:mm");
-        // this.formData.endTime = moment("22:00", "HH:mm"); 
-          
-        const starh=startDate.getHours()<10? '0'+startDate.getHours():startDate.getHours()+''
-        const starm=startDate.getMinutes()<10? '0'+startDate.getMinutes():startDate.getMinutes()+''
-        const endh=endDate.getHours()<10? '0'+endDate.getHours():endDate.getHours()+''
-        const endm=endDate.getMinutes()<10? '0'+endDate.getMinutes():endDate.getMinutes()+''
-        const start=starh+':'+starm
-        const end=endh+':'+endm
-        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');
-                
+        this.formData.startTime = moment(startDate, "HH:mm");
+        this.formData.endTime = moment(endDate, "HH:mm"); 
       }
       const ret = await AddressService.getInstance().note(record.id);
       if (ret.code === 200) {

src/views/Root/User/client.vue

@@ -2,7 +2,7 @@
   <div>
     <p class=" text-2xl font-bold mb-5"> {{$route.query.firstSub}}客户信息</p>
       <!-- timepicker -->
-      <span class=" font-semibold">新增时间：</span>
+      <span class=" font-semibold">操作时间：</span>
       <timerange class=" mr-3" :startTime="queryParam.start" :endTime="queryParam.end"
                  @getNewTime="getNewTime"/>
       <!-- <a-input placeholder="姓名模糊搜索" v-model="queryParam.user_name" style=" width:150px; margin-right:10px;"/> -->