會員註冊驗證碼加keyup.enter / (checkout 頁面)加入會員完成 / 攤位數必填權限判斷

FrontEnd/components/newComponent/modal/VerifyCodeModal.vue

@@ -15,7 +15,7 @@
       </div>
       <div class="tw-mb-[40px]">
         <div>
-          <input type="text" v-model="user_VerifyCode" placeholder="請輸入認證碼" :class="['tw-w-full tw-text-[18px] tw-p-[10px] tw-border tw-border-solid tw-mb-[10px] tw-rounded-[8px] md:tw-max-w-[360px]', validation ? 'tw-border-error-default' : 'tw-border-[ef5a5a]']" />
+          <input @keyup.enter="checkVerifyCode" type="text" v-model="user_VerifyCode" placeholder="請輸入認證碼" :class="['tw-w-full tw-text-[18px] tw-p-[10px] tw-border tw-border-solid tw-mb-[10px] tw-rounded-[8px] md:tw-max-w-[360px]', validation ? 'tw-border-error-default' : 'tw-border-[ef5a5a]']" />
         </div>
         <div :class="['md:tw-flex', validation ? 'md:tw-justify-between' : 'md:tw-justify-end']">
           <div :class="['tw-text-[14px] tw-text-error-default', validation ? 'tw-block tw-mb-[10px]' : 'tw-hidden']">

FrontEnd/components/service/content/selectExhibitionBooth.vue

@@ -27,6 +27,8 @@
         </button>
       </div>
     </div>
+
+    <div v-if="validation.length == false" style="font-size: 16px; color: #ef5a5a; margin-top: 10px; margin-left: 90px;">{{ $t("Required.") }}</div>
   </div>
 </template>
 <script>
@@ -50,10 +52,6 @@ export default {
   watch: {
     value: {
       handler: function () {
-        // if (this.value) {
-        //   console.log(this.value);
-        //   this.$emit('booth-select', this.value);
-        // }
 
         this.$emit('booth-select', this.value);
 

FrontEnd/pages/service/_id.vue

@@ -877,7 +877,8 @@ export default {
       }
     },
     bookNow() {
-      
+      //正常的service
+
       if(this.serviceID == false){
 
         let validators = this.$refs.ref_selectExhibition.validators();
@@ -903,6 +904,7 @@ export default {
         }
 
         let selectExhibitionData = this.$refs.ref_selectExhibition.formData;
+
         let selectExhibitionServiceData = [];
         if(this.selectExhibitionServiceList.length>0){
           for(let i=0;i<this.selectExhibitionServiceList.length;i++){
@@ -953,6 +955,8 @@ export default {
         });
 
       }
+
+      //高雄展
       else if (this.serviceID == true) {
 
         let validators = this.$refs.ref_selectExhibitionBooth.validators();
@@ -973,7 +977,8 @@ export default {
           }
         }
 
-        // let selectExhibitionData = this.$refs.ref_selectExhibition.formData;
+        let selectExhibitionData = this.selectExhibitionList;
+
         let selectExhibitionServiceData = [];
         if(this.selectExhibitionServiceList.length>0){
           for(let i=0;i<this.selectExhibitionServiceList.length;i++){
@@ -1012,7 +1017,7 @@ export default {
           path: this.localePath("/service/checkout/" + this.$route.params.id), 
           //携带需要传递的参数
           query: {
-            // selectExhibitionData: encodeURIComponent(JSON.stringify(selectExhibitionData)),
+            selectExhibitionData: encodeURIComponent(JSON.stringify(selectExhibitionData)),
             selectExhibitionServiceData: encodeURIComponent(JSON.stringify(selectExhibitionServiceData)),
             quantityData: encodeURIComponent(JSON.stringify(quantityData)),
             // pickupServiceData: encodeURIComponent(JSON.stringify(pickupServiceData)),
@@ -1085,8 +1090,6 @@ export default {
 
         });
 
-        console.table(selectExhibitionServiceData)
-
         for(let i=0;i<selectExhibitionServiceData.length;i++){
           let serviceTypeArr = selectExhibitionServiceData[i].selectServiceItems;
           // let arr = selectExhibitionServiceData[i].selectServiceItems;

FrontEnd/pages/service/checkout/_id.vue

@@ -348,11 +348,19 @@ export default {
       this.getOrderingPerson_validation();
 
     // if (this.$auth.loggedIn) {
+      
       let data = this.$route.query;
+
       this.serviceID = this.$route.params.id;
 
+      //思考可以如何優化
+      //高雄
       if(this.serviceID == "1c6e0001-e2dd-46b5-a617-4dac2f34894f"){
 
+        // let selectExhibitionData = data.selectExhibitionData;
+
+        // console.log('資料檢查', selectExhibitionData)
+
         let selectExhibitionServiceData = JSON.parse(decodeURIComponent(data.selectExhibitionServiceData));
         let quantityData = JSON.parse(decodeURIComponent(data.quantityData));
         this.currency = decodeURIComponent(data.currencyName);
@@ -406,10 +414,11 @@ export default {
         }
         this.order.order_item = orderItems;
         let title = this.order.title;
+
         this.order.title = title;
         this.order.service_name = title;
-        // this.order.selectExhibition = selectExhibitionData.selectPackape.name;
-        // this.order.selectExhibitionID = selectExhibitionData.selectPackape.id;
+        this.order.selectExhibition = title.slice(1, 19);
+        // this.order.selectExhibitionID = selectExhibitionData.ArgumentID;
       }
       else{