页面修改

src/api/axios.ts

@@ -68,7 +68,7 @@ const getErrorCode2text = (response: AxiosResponse): string => {
  * @returns  {AxiosResponse} result
  * @tutorial see more:https://github.com/onlyling/some-demo/tree/master/typescript-width-axios
  * @example
- * service.get<{data: string; code: number}>('/test').then(({data}) => { console.log(data.code) })
+ * service.get<{data: string; code: number}>('/test').then(({data}) => { })
  */
 const service = Axios.create({
 	baseURL: process.env.BASE_APP_API,

src/api/axiosJava.ts

@@ -5,7 +5,7 @@ import * as OpenCC from 'opencc-js'
 import { ApiResult } from 'src/@types/enumHelper';
 import { dispatchAction } from 'src/store/utils';
 import { UserActionsType } from 'src/store/modules/user/actions';
-let {locale,t} =i18n.global
+let { locale, t } = i18n.global
 let converterTW = OpenCC.Converter({ from: 'cn', to: 'tw' }) //转繁
 let datas: AxiosResponse  // 接收需要转繁数据
 
@@ -63,7 +63,7 @@ const getErrorCode2text = (response: AxiosResponse): string => {
  * @returns  {AxiosResponse} result
  * @tutorial see more:https://github.com/onlyling/some-demo/tree/master/typescript-width-axios
  * @example
- * service.get<{data: string; code: number}>('/test').then(({data}) => { console.log(data.code) })
+ * service.get<{data: string; code: number}>('/test').then(({data}) => { })
  */
 const service = Axios.create({
 	baseURL: process.env.JAVA_URL_API,
@@ -119,15 +119,15 @@ service.interceptors.response.use(
 	/** 请求有响应 */
 	async (response: AxiosResponse) => {
 		if (response.status === 200) {
-      if(response.data.resultCode == ApiResult.TOKEN_ILLEGAL || response.data.resultCode == ApiResult.TOKEN_INVALID){
-        //router.push('/auth/login')
-        dispatchAction<UserActionsType>('user', 'setUserSignout', null)
-        window.location.reload()
-      }
-			if(locale.value=='zhTW'){
+			if (response.data.resultCode == ApiResult.TOKEN_ILLEGAL || response.data.resultCode == ApiResult.TOKEN_INVALID) {
+				//router.push('/auth/login')
+				dispatchAction<UserActionsType>('user', 'setUserSignout', null)
+				window.location.reload()
+			}
+			if (locale.value == 'zhTW') {
 				let stringifyData = converterTW(JSON.stringify(response))
 				datas = JSON.parse(stringifyData)
-			}else{
+			} else {
 				datas = response
 			}
 			return Promise.resolve(datas)

src/api/user.ts

@@ -172,44 +172,43 @@ class UserService {
 		})
 	}
 	//#endregion
-	static async login(params:any): Promise<HttpResponse> {
-		console.log(params)
-		return request("b2b_post_Login",params);
+	static async login(params: any): Promise<HttpResponse> {
+		return request("b2b_post_Login", params);
 	}
 
-	static sendVerify(data:any):Promise<HttpResponse>{
-		return request("b2b_post_send_verify",data);
+	static sendVerify(data: any): Promise<HttpResponse> {
+		return request("b2b_post_send_verify", data);
 	}
 
-	static resetPassword(certificate:string,password:string):Promise<HttpResponse>{
-		return request("b2b_post_reset_password",{certificate,password});
+	static resetPassword(certificate: string, password: string): Promise<HttpResponse> {
+		return request("b2b_post_reset_password", { certificate, password });
 	}
 
-  /**
-   * 用戶修改登錄密碼
-   * @param oldPassword 老密碼
-   * @param newPassword 新密碼
-   * @returns
-   */
-  static setNewPassword(oldPassword:string,newPassword:string):Promise<HttpResponse>{
-		return request("b2b_post_ModifyAccountPassowrd",{oldPassword,newPassword});
+	/**
+	 * 用戶修改登錄密碼
+	 * @param oldPassword 老密碼
+	 * @param newPassword 新密碼
+	 * @returns
+	 */
+	static setNewPassword(oldPassword: string, newPassword: string): Promise<HttpResponse> {
+		return request("b2b_post_ModifyAccountPassowrd", { oldPassword, newPassword });
 	}
 
-  /**
-   * 修改用戶頭像
-   * @param photo 頭像地址
-   * @returns
-   */
-  static setUserPhoto(photo:string):Promise<HttpResponse>{
-		return request("b2b_post_MdifyCustomerAccountPhoto",{photo});
+	/**
+	 * 修改用戶頭像
+	 * @param photo 頭像地址
+	 * @returns
+	 */
+	static setUserPhoto(photo: string): Promise<HttpResponse> {
+		return request("b2b_post_MdifyCustomerAccountPhoto", { photo });
 	}
 
-  /**
-   * 查詢用戶的基本資料
-   * @returns
-   */
-  static getCustomerInfo():Promise<HttpResponse>{
-		return request("b2b_get_GetCustomerManagerInfo",{});
+	/**
+	 * 查詢用戶的基本資料
+	 * @returns
+	 */
+	static getCustomerInfo(): Promise<HttpResponse> {
+		return request("b2b_get_GetCustomerManagerInfo", {});
 	}
 }
 

src/boot/i18n.ts

@@ -12,30 +12,29 @@ export type MessageSchema = typeof messages['enUS'];
 /* eslint-disable @typescript-eslint/no-empty-interface */
 declare module 'vue-i18n' {
   // define the locale messages schema
-  export interface DefineLocaleMessage extends MessageSchema {}
+  export interface DefineLocaleMessage extends MessageSchema { }
 
   // define the datetime format schema
-  export interface DefineDateTimeFormat {}
+  export interface DefineDateTimeFormat { }
 
   // define the number format schema
-  export interface DefineNumberFormat {}
+  export interface DefineNumberFormat { }
 }
 let Language
-if(getDomainName()){
+if (getDomainName()) {
   Language = localStorage.getItem('lanuage') ?? 'zhTW'
-}else{
+} else {
   Language = localStorage.getItem('lanuage') ?? 'zhSW'
 }
 const i18n = createI18n({
   locale: Language,
   legacy: false,
-  warnHtmlInMessage:false,
-  warnHtmlMessage:false,
+  warnHtmlInMessage: false,
+  warnHtmlMessage: false,
   globalInjection: true,
   messages
 })
 export default boot(({ app }) => {
-  console.log(app,i18n,messages)
   app.use(i18n)
 })
 export { i18n }

src/boot/permission.ts

@@ -13,7 +13,7 @@ LoadingBar.setDefaults({
 
 let loadAsyncRouter = false
 
-const whiteList = ['/auth/login','/auth/regist','/auth/forget','/auth/newpassword','/404']
+const whiteList = ['/auth/login', '/auth/regist', '/auth/forget', '/auth/newpassword', '/404']
 export default boot(({ router, store }) => {
   router.beforeEach((to, from, next) => {
     localStorage.setItem('routerBefore', from.path)
@@ -23,23 +23,21 @@ export default boot(({ router, store }) => {
       //debugger;
       if (to.path === '/auth/login' || to.path === '/') {
         next('/index')
-        //LoadingBar.stop()
       } else {
         if (!loadAsyncRouter) {
           // 判断当前用户是否获取权限
           loadAsyncRouter = true
-          const allAuth = getUserAllMenu()
-          console.log(allAuth)
+          const allAuth = getUserAllMenu();
           next({
             ...to,
             replace: true
           })
-          if(process.env.NODE_ENV=='development'){
+          if (process.env.NODE_ENV == 'development') {
             next({
               ...to,
               replace: true
             })
-          }else{
+          } else {
             if (allAuth != ResultType.EmptyArray) {
               //TODO: 动态生成并追加路由 //router.addRoutes(store.getters.addRouters);
               //   if (to.path === '/404') {
@@ -47,9 +45,8 @@ export default boot(({ router, store }) => {
               //     next(to.redirectedFrom || '/')
               //   } else {
               //检查是否有权限访问
-              
+
               const authMenu = allAuth.findIndex((x: AuthMenuType) => {
-                console.log(x.menuUrl,to.path)
                 return x.menuUrl == to.path
               })
               if (authMenu != -1) {
@@ -60,10 +57,8 @@ export default boot(({ router, store }) => {
               } else {
                 next('/404')
               }
-              //LoadingBar.stop()
             } else {
               next('/404')
-              //LoadingBar.stop()
             }
           }
         } else {
@@ -71,33 +66,19 @@ export default boot(({ router, store }) => {
         }
       }
     } else {
-      let urlPath=to.matched[0].path
-      if(urlPath.indexOf('/:')!=-1) urlPath=urlPath.substring(0,urlPath.indexOf('/:'))
+      let urlPath = to.matched[0].path
+      if (urlPath.indexOf('/:') != -1) urlPath = urlPath.substring(0, urlPath.indexOf('/:'))
       if (whiteList.indexOf(urlPath) !== -1) {
-        console.log(whiteList,to,'do something')
         next()
       } else {
         next(`/auth/login?redirect=${decodeURIComponent(to.path)}`) // 否则全部重定向到登录页
-        //LoadingBar.stop()
       }
     }
   })
-  
+
   router.afterEach(() => {
-    console.log('LoadingBar.stop',LoadingBar.isActive)
-    if(LoadingBar.isActive) LoadingBar.stop() // 结束Progress
-    console.log('LoadingBar.stop',LoadingBar.isActive)
+    if (LoadingBar.isActive) {
+      LoadingBar.stop() // 结束Progress
+    }
   })
-  
-  // router.onError(error => {
-    
-  //   // const pattern = /Loading chunk (\d)+ failed/g
-  //   // const isChunkLoadFailed = error.message.match(pattern)
-  //   // const targetPath = error.to
-  //   console.log('異常：',error)
-  //   // if (isChunkLoadFailed) {
-  //   //   router.replace(targetPath)
-  //   // }
-  // })
-  
 })

src/components/CharteredBus/order/CharteredBusOrderHeader.vue

@@ -276,7 +276,6 @@ export default defineComponent({
         realSearch.Name = search.Name;
         realSearch.ProductName = search.ProductName;
         realSearch.Mobile = search.Mobile;
-        console.log(realSearch);
       },
       setOrderStatus(statusId: number) {
         realSearch.OrderStatus = statusId;

src/components/common/ImagePreview.vue

@@ -60,7 +60,6 @@ export default defineComponent({
           data.scale-=0.25
         }
         data.scaleString=`scale(${data.scale})`
-        console.log(data.scale,data.scaleString)
       },
       rotateHandler(num:number){
         if(num==0){

src/components/common/verifyCode.vue

@@ -49,7 +49,6 @@ export default {
           myRef.value[index - 1].focus()
         }
       } else if (index < props.digit) {
-        console.log(cols[index])
         if (formatStyle.col[index] != '') {
           myRef.value[index + 1].focus()
         }

src/components/hotel/chosen/ChosenHeader.vue

@@ -106,7 +106,6 @@ export default defineComponent({
       },
       loadChilds(option: CascaderOption) {
         return new Promise<void>(resolve => {
-          console.log('innnnnnn', option)
           HotelService.GetDestination({ Id: option.ID })
             .then(r => {
               if (r.data.resultCode == ApiResult.SUCCESS) {

src/components/hotel/chosen/ChosenTable.vue

@@ -193,10 +193,8 @@ export default defineComponent({
           data.cols.push(`${date.formatDate(dateBegin, 'MM/DD')} (${getDayOfWeek(date.getDayOfWeek(dateBegin))})`)
           dateBegin = date.addToDate(dateBegin, { days: 1 })
         }
-        console.log(data.cols)
       },
       changePageHandler(n: any) {
-        console.log(n)
         data.pages.pageIndex = n
         methods.initHotels()
       },

src/components/hotel/list/ListHeader.vue

@@ -185,7 +185,6 @@ export default defineComponent({
       },
       loadChilds(option: CascaderOption) {
         return new Promise<void>(resolve => {
-          console.log('innnnnnn', option)
           HotelService.GetDestination({ Id: option.ID })
             .then(r => {
               if (r.data.resultCode == ApiResult.SUCCESS) {
@@ -229,7 +228,7 @@ export default defineComponent({
       },
       changeHotel() {
         setTimeout(() => {
-          console.log(search.HotelChooseArray)
+          //console.log(search.HotelChooseArray)
         }, 1000)
       },
       close() {

src/components/hotel/list/ListTable.vue

@@ -318,10 +318,8 @@ export default defineComponent({
           );
           dateBegin = date.addToDate(dateBegin, { days: 1 });
         }
-        console.log(data.cols);
       },
       changePageHandler(n: any) {
-        console.log(n);
         data.pages.pageIndex = n;
         methods.initHotels();
       },

src/components/hotel/list/TableOperation.vue

@@ -451,7 +451,6 @@ export default defineComponent({
           new Date(data.joinHouse.StartDate),
           "days"
         );
-        console.log(qDateProxyOpera);
         if (qDateProxyOpera.value) qDateProxyOpera.value.hide();
       },
       setDateRange() {

src/components/hotel/order/list/OrderList.vue

@@ -602,7 +602,6 @@ export default defineComponent({
                       data.rooms.find((r) => r.TypeId == z.RoomType) ?? data.rooms[0];
                     PeopleNum += z.PeopleNumber;
                   });
-                  console.log(PeopleNum);
                   y.PeopleNum = PeopleNum;
                   if (index < 2) {
                     dataLists.push(y);

src/components/hotel/order/list/OrderListHeader.vue

@@ -240,7 +240,6 @@ export default defineComponent({
         realSearch.TCNum = search.TCNum;
         realSearch.ContactName = search.ContactName;
         realSearch.ContactNumber = search.ContactName;
-        console.log(realSearch);
       },
       setOrderStatus(statusId: number) {
         realSearch.OrderStatus = statusId;

src/components/scattered/dida/DidaHeader.vue

@@ -303,7 +303,6 @@ export default defineComponent({
       //获取道旅餐食类型
       getdidaMealType() {
         DidaService.GetDidaMealType({}).then((res) => {
-          console.log("getdidaMealType", res);
           if (res.data.resultCode == 1) {
             data.HotelMealTypes = res.data.data;
           }
@@ -312,7 +311,6 @@ export default defineComponent({
       //获取道旅房型列表
       getdidaBedType() {
         DidaService.GetDidaBedType({}).then((res) => {
-          console.log("getdidaBedType", res);
           if (res.data.resultCode == 1) {
             data.HotelRoomTypes = res.data.data;
           }

src/components/scattered/dida/DidaListTable.vue

@@ -24,7 +24,9 @@
             @click="(pages.sort = index + 1), initHotels()"
           >
             {{
-              index + 1 == 1 ? $t("v101.scattered.anxingji") : $t("v101.scattered.anjiage")
+              index + 1 == 1
+                ? $t("v101.scattered.anxingji")
+                : $t("v101.scattered.anjiage")
             }}
           </q-btn>
         </div>
@@ -61,9 +63,8 @@
       <template v-slot:body-cell-lowrateBySetCurrency="props">
         <q-td :props="props">
           <span class="q-ml-xs text-orange text-weight-bold fz18">
-           
             <template v-if="props.row.type == 1">
-              {{ (props.row.lowrateBySetCurrency) }}
+              {{ props.row.lowrateBySetCurrency }}
             </template>
             <template v-else>
               {{ props.row.lowrateBySetCurrency }}
@@ -123,7 +124,9 @@
             @click="(pages.sort = index + 1), initHotels()"
           >
             {{
-              index + 1 == 1 ? $t("v101.scattered.anxingji") : $t("v101.scattered.anjiage")
+              index + 1 == 1
+                ? $t("v101.scattered.anxingji")
+                : $t("v101.scattered.anjiage")
             }}
           </q-btn>
         </div>
@@ -179,10 +182,10 @@
             <div class="">
               <span>
                 <template v-if="props.row.type == 1">
-               {{ getPrice(props.row.lowrateBySetCurrency) }}
+                  {{ getPrice(props.row.lowrateBySetCurrency) }}
                 </template>
                 <template v-else>
-                {{ props.row.lowrateBySetCurrency }}
+                  {{ props.row.lowrateBySetCurrency }}
                 </template>
               </span>
               <span class="q-pl-xs">{{ $t("v101.scattered.qi") }}</span>
@@ -222,8 +225,6 @@ export default defineComponent({
     const search = inject(DirtionmaryHelper.DiDaHOTEL_QUERY_PARAM) as any;
     const $router = useRouter();
     watch(search, (n, o) => {
-      //if (data.loading) return;
-      console.log("search change",search);
       data.pages.pageIndex = 1;
       methods.initHotels();
     });
@@ -260,12 +261,12 @@ export default defineComponent({
           align: "left",
         },
       ] as any,
-       pages: {
+      pages: {
         pageIndex: 1,
         pageSize: 10,
         pageCount: 0,
-        rowsPerPage:10,
-        sort:1,
+        rowsPerPage: 10,
+        sort: 1,
       },
       pageTitle: "" as string | undefined,
       mobileCols: [
@@ -305,12 +306,11 @@ export default defineComponent({
         let param = Object.assign(data.pages, search);
         DidaService.GetDidaHotelListV2(param)
           .then((r) => {
-            console.log("initHotels",r.data);
             if (r.data.data.pageData) {
               dataList = r.data.data.pageData;
-              data.pages.pageCount = r.data.data.pageCount
+              data.pages.pageCount = r.data.data.pageCount;
             }
-     
+
             if (dataList && dataList.length > 0) {
               //获取酒店坐标
               dataList.forEach((x) => {
@@ -326,7 +326,6 @@ export default defineComponent({
               });
             }
             data.hotels = dataList;
-            console.log("data.hotels",data.hotels);
             data.hotels.forEach((x) => {
               if (isNaN(x.reviewRating)) {
                 x.reviewRating = 0;
@@ -359,14 +358,14 @@ export default defineComponent({
         );
         return sortFun;
       },
-        //获取价格
+      //获取价格
       getPrice(price) {
         return price;
-       //return Math.ceil(price / data.JapanIncrease);
+        //return Math.ceil(price / data.JapanIncrease);
       },
       changePageHandler(n: any) {
-        data.pages.pageIndex = n
-        methods.initHotels()
+        data.pages.pageIndex = n;
+        methods.initHotels();
       },
       showHotelDetailHandler(hotelId: number) {
         data.showHotelDetailId = hotelId;

src/components/vehicle/vehiclePopover.vue

@@ -300,7 +300,6 @@ export default defineComponent({
                         }
                     }
                 }
-                // console.log('时间差2', details2)
             },
             // 关闭
             down() {

src/i18n/en-US/index.ts

@@ -1114,7 +1114,7 @@ export default {
 			d6: 'Expenses not included',
 			d7: 'Travel duration',
 			baochexinxi: 'Information',
-			order: 'Please complete the reservation before 23:00 the day before departure',
+			ordertip: 'Please complete the reservation before 23:00 the day before departure',
 			pt: 'Date',
 			tt: 'Select vehicle model',
 			jc: 'Choose airport',

src/module/user/registModule.ts

@@ -122,13 +122,13 @@ const useUserRegistModule = () => {
       let isError = false
       for (let i = 0; i < stateManager.validateRules.length; i++) {
         const mr = stateManager.validateRules[i] as any
-        if(mr){
+        if (mr) {
           mr.validate()
         }
       }
       for (let i = 0; i < stateManager.validateRules.length; i++) {
         const mr = stateManager.validateRules[i] as any
-        if (mr&&mr.hasError) {
+        if (mr && mr.hasError) {
           isError = true
           break
         }
@@ -155,13 +155,13 @@ const useUserRegistModule = () => {
       let isError = false
       for (let i = 0; i < stateManager.validateRules.length; i++) {
         const mr = stateManager.validateRules[i] as any
-        if(mr){
+        if (mr) {
           mr.validate()
         }
       }
       for (let i = 0; i < stateManager.validateRules.length; i++) {
         const mr = stateManager.validateRules[i] as any
-        if (mr&&mr.hasError) {
+        if (mr && mr.hasError) {
           isError = true
           break
         }
@@ -170,7 +170,6 @@ const useUserRegistModule = () => {
       if (isError) {
         stateManager.subRegist = false
       } else {
-        console.log(userModel)
         //TODO: 调用注册接口
         setTimeout(() => {
           //注册成功应该实现自动登录，让后跳转到首页

src/pages/auth/forget.vue

@@ -140,7 +140,6 @@ export default defineComponent({
       sendVerifyCode() {
         if (data.loading) return;
         const accountRefVal = accountRef as any;
-        console.log(accountRef.value);
         let domainStr = window.location.hostname;
         accountRefVal.value.validate();
         if (!accountRefVal.value.hasError) {
@@ -152,7 +151,6 @@ export default defineComponent({
             domain: domainStr,
           })
             .then((r) => {
-              console.log(r);
               data.loading = false;
               if (r.data.resultCode == ApiResult.SUCCESS) {
                 data.successModel = true;