Merge commit 'f36e496e' into dev

@@ -139,6 +139,7 @@ function getData(){
   }else{
   }else{
     currentDate.value= currentDate1.value = query.value.currentDate = dayjs(toDay).format('YYYY-MM-DD')
     currentDate.value= currentDate1.value = query.value.currentDate = dayjs(toDay).format('YYYY-MM-DD')
   }
   }
+  calendarRange.value=[dayjs(currentDate.value).toDate(),(dayjs(currentDate.value).toDate())]
 }
 }
 
 
 function getScheduleList() {
 function getScheduleList() {

@@ -98,6 +98,7 @@ import * as booking from "@/apiPc/booking"
 import {useStorage} from "@vueuse/core/index";
 import {useStorage} from "@vueuse/core/index";
 import useUserStore from "/@/store/modules/user";
 import useUserStore from "/@/store/modules/user";
 import {getActivityPhotoVoListByShootId, getBaseInfoByActiveId} from "@/apiPc/booking";
 import {getActivityPhotoVoListByShootId, getBaseInfoByActiveId} from "@/apiPc/booking";
+import {ElMessageBox} from'element-plus'
 
 
 const user = useUserStore().user
 const user = useUserStore().user
 const language = useStorage('language', 0)
 const language = useStorage('language', 0)
@@ -137,6 +138,7 @@ function getData(){
   }else{
   }else{
     currentDate1.value = query.value.currentDate = dayjs(toDay).format('YYYY-MM-DD')
     currentDate1.value = query.value.currentDate = dayjs(toDay).format('YYYY-MM-DD')
   }
   }
+  calendarRange.value=[dayjs(currentDate1.value).toDate(),(dayjs(currentDate1.value).toDate())]
 }
 }
 
 
 
 

@@ -31,7 +31,7 @@
         </el-row>
         </el-row>
 
 
         <div style="display: flex">
         <div style="display: flex">
-          <div class="title">工作室简介：</div>
+          <div style="min-width: 130px" class="title">{{language.value==0?'工作室简介:':'Studio profile:'}}</div>
           <div v-html="form.introduction"></div>
           <div v-html="form.introduction"></div>
         </div>
         </div>
       </el-card>
       </el-card>
@@ -273,7 +273,7 @@ function getData() {
 }
 }
 .oddmb:nth-child(2){margin-bottom: 20px;}
 .oddmb:nth-child(2){margin-bottom: 20px;}
 .title{
 .title{
-  width: 120px;
+  width: 130px;
   font-weight: 500;
   font-weight: 500;
   font-size: 18px;
   font-size: 18px;
 }
 }

@@ -243,7 +243,7 @@ function submit() {
             ElMessage.warning(language.value == 0 ? '无可预订的时间' : 'No booking time available')
             ElMessage.warning(language.value == 0 ? '无可预订的时间' : 'No booking time available')
           }
           }
         }).catch(err => {
         }).catch(err => {
-          ElMessage.warning(language.value == 0 ? '无可预订的时间' : 'No booking time available')
+          // ElMessage.warning(language.value == 0 ? '无可预订的时间' : 'No booking time available')
         })
         })
       })
       })
 
 

@@ -30,7 +30,7 @@
          {{form.remarks}}
          {{form.remarks}}
         </el-row>
         </el-row>
         <div style="display: flex">
         <div style="display: flex">
-          <div class="title">工作室简介：</div>
+          <div style="min-width: 130px" class="title">{{language.value==0?'工作室简介:':'Studio profile:'}}</div>
           <div v-html="form.introduction"></div>
           <div v-html="form.introduction"></div>
         </div>
         </div>
       </el-card>
       </el-card>
@@ -285,7 +285,7 @@ function getData() {
 }
 }
 .oddmb:nth-child(2){margin-bottom: 20px;}
 .oddmb:nth-child(2){margin-bottom: 20px;}
 .title{
 .title{
-  width: 120px;
+  width: 130px;
   font-weight: 500;
   font-weight: 500;
   font-size: 18px;
   font-size: 18px;
 }
 }

@@ -236,7 +236,7 @@ function submit() {
             ElMessage.warning(language.value == 0 ? '无可预订的时间' : 'No booking time available')
             ElMessage.warning(language.value == 0 ? '无可预订的时间' : 'No booking time available')
           }
           }
         }).catch(err => {
         }).catch(err => {
-          ElMessage.warning(language.value == 0 ? '无可预订的时间' : 'No booking time available')
+          // ElMessage.warning(language.value == 0 ? '无可预订的时间' : 'No booking time available')
         })
         })
       })
       })
 
 

@@ -8,7 +8,7 @@ import { ElMessage } from "element-plus";
 import { useStorage } from "@vueuse/core/index";
 import { useStorage } from "@vueuse/core/index";
 const language = useStorage("language", 0);
 const language = useStorage("language", 0);
 
 
-const baseURL = "https://radv4.gitliuyi.top/ticket"; //"http://book.xiaojinyu.games"; // 这里填入你的基础 API URL
+const baseURL = "https://jijin.wtwuxicenter.com/ticket"; //"http://book.xiaojinyu.games"; // 这里填入你的基础 API URL
 const timeout = 15000; // 请求超时时间
 const timeout = 15000; // 请求超时时间
 
 
 const http = axios.create({
 const http = axios.create({