解決cookie和clickup的問題

FrontEnd/components/home/FocusExhibition1.vue

@@ -17,7 +17,7 @@
                   <template v-for="(item2, index2) in item.ExhibitionList">
                     <div v-if="index2<=2"  :key="index2" class="tw-py-[10px]">
                       <skeletonSlot>
-                        <focusExhibitionsCard :item="item2" ></focusExhibitionsCard>
+                          <focusExhibitionsCard :item="item2" ></focusExhibitionsCard>
                       </skeletonSlot>
                     </div>
                   </template>

FrontEnd/components/home/FocusExhibitionsCard.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tw-bg-neutrals-0 tw-rounded-[10px] tw-px-[6px] tw-py-[8px] md:tw-px-[11px] md:tw-py-[10px]">
+  <div @click="goToExhibition()" class="tw-bg-neutrals-0 tw-cursor-pointer tw-rounded-[10px] tw-px-[6px] tw-py-[8px] md:tw-px-[11px] md:tw-py-[10px]">
     <div
       class="remove-underline md:tw-grid md:tw-grid-cols-[1fr_3fr] md:tw-gap-[10px] md:tw-auto-row-1 xl:tw-grid-cols-[160px_auto]">
       <div
@@ -19,7 +19,7 @@
           </div>
         </div>
         <div class="md:tw-mt-[14px] md:tw-flex md:tw-justify-between md:tw-items-center">
-          <div class="time t12 tw-mt-[8px] md:t16  md:tw-font-medium md:tw-mt-0">
+          <div class="time te-text-[#ee9546] t12 tw-mt-[8px] md:t16  md:tw-font-medium md:tw-mt-0">
             {{ formatDate(item.StartDate) }}
             ~
             {{ formatDate(item.EndDate) }}
@@ -59,6 +59,9 @@ export default {
   methods: {
     formatDate,
     dateCountDown,
+    goToExhibition(){
+      this.$router.push(this.localePath(`/exhibition/${this.item.ExhibitionID}`));
+    }
   },
 };
 </script>

FrontEnd/components/service/Company.vue

@@ -6,7 +6,7 @@
           <td class="tw-pr-[20px]" style="white-space: nowrap;">
             <div class="tw-flex tw-items-center">
               <label class="tw-font-normal ">
-                <span>{{ $t("Company Name")}}</span>
+                <span>{{ $t("Company Name")}}</span><span class="required">*</span>
               </label>
             </div>
           </td>
@@ -28,7 +28,7 @@
           <td class="tw-pr-[20px]" style="white-space: nowrap;">
                   <div class="tw-flex tw-items-center">
                     <label class="tw-font-normal ">
-                      <span>{{ $t("Unified Number")}}</span>
+                      <span>{{ $t("Unified Number")}}</span><span class="required">*</span>
                     </label>
                   </div>
                 </td>
@@ -51,7 +51,7 @@
                 <td class="tw-pr-[20px]" style="white-space: nowrap;">
                   <div class="tw-flex tw-items-center">
                     <label class="tw-font-normal ">
-                      <span>{{ $t("Company Address")}}</span>
+                      <span>{{ $t("Company Address")}}</span><span class="required">*</span>
                     </label>
                   </div>
                 </td>
@@ -75,7 +75,7 @@
                 <td class="tw-pr-[20px]" style="white-space: nowrap;">
                   <div class="tw-flex tw-items-center">
                     <label class="tw-font-normal ">
-                      <span>{{ $t("Company City")}}</span>
+                      <span>{{ $t("Company City")}}</span><span class="required">*</span>
                     </label>
                   </div>
                 </td>
@@ -98,7 +98,7 @@
                 <td class="tw-pr-[20px]" style="white-space: nowrap;">
                   <div class="tw-flex tw-items-center">
                     <label class="tw-font-normal ">
-                      <span>{{ $t("State or Province")}}</span>
+                      <span>{{ $t("State or Province")}}</span><span class="required">*</span>
                     </label>
                   </div>
                 </td>
@@ -149,7 +149,7 @@
                 <td class="tw-pr-[20px]" style="white-space: nowrap;">
                   <div class="tw-flex tw-items-center">
                     <label class="tw-font-normal ">
-                      <span>{{ $t("Postal Code")}}</span>
+                      <span>{{ $t("Postal Code")}}</span><span class="required">*</span>
                     </label>
                   </div>
                 </td>
@@ -398,7 +398,8 @@ export default {
       return formData;
       // this.validators();
       // if (this.validators()) {
-      //   const patchData = JSON.parse(JSON.stringify(this.formData));
+        
+      //   // const patchData = JSON.parse(JSON.stringify(this.formData));
       //   // this.$axios
       //   //   .post(
       //   //     `/member/contacts?jwt=${
@@ -416,40 +417,53 @@ export default {
       //   //   .catch((err) => {
       //   //     console.log(err);
       //   //   });
+      // }else{
+      //   return null;
       // }
     },
     validators() {
-      // if (is.empty(this.formData.first_name)) {
-      //   this.validation.first_name = false;
-      // } else {
-      //   this.validation.first_name = true;
-      // }
-      // if (is.empty(this.formData.last_name)) {
-      //   this.validation.last_name = false;
-      // } else {
-      //   this.validation.last_name = true;
-      // }
-      // if (is.empty(this.formData.email) || is.not.email(this.formData.email)) {
-      //   this.validation.email = false;
-      // } else {
-      //   this.validation.email = true;
-      // }
-      // if (
-      //   is.empty(this.formData.phone_number) &&
-      //   is.number(this.formData.phone_number)
-      // ) {
-      //   this.validation.phone_number = false;
-      // } else {
-      //   this.validation.phone_number = true;
-      // }
-      // this.errors = Object.entries(this.validation).filter(
-      //   (e) => e[1] == false
-      // );
-      // if (this.errors.length > 0) {
-      //   return false;
-      // } else {
-      //   return true;
-      // }
+      if (is.empty(this.formData.company_name)) {
+        this.validation.company_name = false;
+      } else {
+        this.validation.company_name = true;
+      }
+      if (is.empty(this.formData.unified_number)) {
+        this.validation.unified_number = false;
+      } else {
+        this.validation.unified_number = true;
+      }
+      if (is.empty(this.formData.company_address)) {
+        this.validation.company_address = false;
+      } else {
+        this.validation.company_address = true;
+      }
+      
+      if (is.empty(this.formData.city_)) {
+        this.validation.city_ = false;
+      } else {
+        this.validation.city_ = true;
+      }
+
+      if (is.empty(this.formData.state_or_province)) {
+        this.validation.state_or_province = false;
+      } else {
+        this.validation.state_or_province = true;
+      }
+
+      if (is.empty(this.formData.postal_code)) {
+        this.validation.postal_code = false;
+      } else {
+        this.validation.postal_code = true;
+      }
+
+      this.errors = Object.entries(this.validation).filter(
+        (e) => e[1] == false
+      );
+      if (this.errors.length > 0) {
+        return false;
+      } else {
+        return true;
+      }
     },
   },
 };

FrontEnd/components/service/PurchaserInfo.vue

@@ -550,10 +550,13 @@ export default {
           break;
         case "Company":
           this.$emit("type", "Company");
-          this.Company = this.$refs.ref_company.getFormData();
-          this.$emit("company", this.Company);
-          this.purchaserValidation = true;
-          this.$emit("purchaserInfo_validation", this.purchaserValidation);
+          this.$refs.ref_company.validators();
+          if(this.$refs.ref_company.validators()){
+            this.Company = this.$refs.ref_company.getFormData();
+            this.$emit("company", this.Company);
+            this.purchaserValidation = true;
+            this.$emit("purchaserInfo_validation", this.purchaserValidation);
+          }
           break;
       }
       
@@ -563,7 +566,10 @@ export default {
             this.updateIndividual();
           }
         }
-        this.updateCompany();
+        if (this.$refs.ref_company.validators()) {
+          this.updateCompany();
+        }
+
       }
       
     },

FrontEnd/pages/service/_id.vue

@@ -915,6 +915,7 @@ export default {
     ChangeCosts(data){
       let totalPrice = 0;
       this.totalPrice = 0;
+      this.rulesShow = false;
       // let selectExhibitionData = this.$refs.ref_selectExhibition.formData;
       let selectExhibitionServiceData = [];
       if(this.selectExhibitionServiceList.length>0){

FrontEnd/plugins/storeCache.js

@@ -0,0 +1,14 @@
+export default function(ctx){
+    //离开页面 刷新前 将store中的数据存到session
+    window.addEventListener('beforeunload', ()=> {
+        sessionStorage.setItem("storeCache",JSON.stringify(ctx.store.state))
+    });
+    //页面加载完成  将session中的store数据
+    window.addEventListener('load', ()=> {
+        let storeCache = sessionStorage.getItem("storeCache")
+        if(storeCache){
+            // 将session中的store数据替换到store中
+            ctx.store.replaceState(JSON.parse(storeCache));
+        }
+    });
+}