zz-shopify-components 0.7.0 → 0.9.0

package/blocks/zz-edu-form.liquid

@@ -227,47 +227,47 @@
   var EduErrorCodeConf = {
     201: {
       zh: "该教育邮箱已完成注册，无需重复认证",
-      en: "This educational email has been registered, no need to re-authenticate"
+      en: "This educational email has been registered, no need to re-authenticate."
     },
     400: {
       zh: "邮箱格式不符合教育邮箱规范，请检查后重试",
-      en: "Email format does not meet educational email standards, please check and try again"
+      en: "Email format does not meet educational email standards, please check and try again."
     },
     401: {
       zh: "认证方式与历史记录不一致，请使用相同认证方式",
-      en: "Authentication method inconsistent with historical records, please use the same authentication method"
+      en: "Authentication method inconsistent with historical records, please use the same authentication method."
     },
     402: {
       zh: "已有相同信息和资料的审核表单已在处理中，无需提交",
-      en: "A review form with the same information and materials is already being processed, no need to submit"
+      en: "A review form with the same information and materials is already being processed, no need to submit."
     },
     403: {
       zh: "申请拒绝次数已达上限(5次)，无法继续提交",
-      en: "Application rejection limit reached (5 times), cannot continue to submit"
+      en: "Application rejection limit reached (5 times), cannot continue to submit."
     },
     404: {
       zh: "审核资料未上传或上传格式不合要求",
-      en: "Application review materials not uploaded or upload format does not meet requirements"
+      en: "Application review materials not uploaded or upload format does not meet requirements."
     },
     405: {
       zh: "验证码格式错误，请输入正确的  位数字验证码",
-      en: "Verification code format is incorrect, please enter the correct six-digit verification code"
+      en: "Verification code format is incorrect, please enter the correct six-digit verification code."
     },
     406: {
       zh: "验证码已过期，请重新获取",
-      en: "Verification code has expired, please obtain a new one"
+      en: "Verification code has expired, please obtain a new one."
     },
     407: {
       zh: "验证码错误，请重新输入",
-      en: "Incorrect verification code, please try again"
+      en: "Incorrect verification code, please try again."
     },
     429: {
       zh: "验证码发送过于频繁，请 1 分钟后再试",
-      en: "Verification code sent too frequently, please try again in 1 minute"
+      en: "Verification code sent too frequently, please try again in 1 minute."
     },
     500: {
       zh: "系统繁忙，请稍后再试",
-      en: "System is busy, please try again later"
+      en: "System is busy, please try again later."
     }
   }
   document.addEventListener('DOMContentLoaded', function () {
@@ -320,24 +320,23 @@
           isValid = false;
         } else {
           fileInput.classList.remove('error');
+          if(!identityDocumentUrl) {
+            // 文件还在上传中，请等待文件上传成功
+            zzShowToast('File is still uploading, please wait for the file to be uploaded successfully')
+            return
+          }
         }
+        
       }
       
       
       // 验证邮箱格式
       const email = form.querySelector('[name="email"]');
-      let emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-      if (verifyType === 'email') {
-        emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]*(\.edu|\.ac|zerozero)(\.[a-zA-Z]{2,})?$/;
-      }
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
       if (email.value && !emailRegex.test(email.value)) {
         email.classList.add('error');
         isValid = false;
-        {% comment %} zzShowToast('Please fill in all required fields!'); {% endcomment %}
-         zzEduInfoDialog.showModal({
-          message: verifyType === 'email' ? 'Email format does not meet educational email standards, please check and try again' : 'Please enter a valid email address',
-          showInput: false
-         })
+        zzShowToast('Please enter a valid email address')
         return
       }
       
@@ -456,7 +455,8 @@
         // 显示文件预览
         showFilePreview(file);
         const fileName = await getFileMD5Name(file);
-        console.log('fileName', fileName)
+        const fileUploadLoading = block.querySelector('.zz-edu-form-file-upload-loading')
+        fileUploadLoading.classList.remove('tw-hidden')
 
         httpRequest
         .get(
@@ -477,26 +477,31 @@
                 stsToken: data.SecurityToken,
               });
               const result = await client.put(fileName || file.name, file);
-              console.log('result---------', result)
+              console.log('upload result---------', result)
               if(result.url) {
                 identityDocumentUrl = result.url
+                fileUploadLoading.classList.add('tw-hidden')
               } else {
                 removeEduVerifyFile()
+                fileUploadLoading.classList.add('tw-hidden')
                 zzShowToast('File upload failed, please try again.')
               }
               
             } catch (error) {
               removeEduVerifyFile()
+              fileUploadLoading.classList.add('tw-hidden')
               zzShowToast('File upload failed, please try again.')
             }
             
           } else {
             removeEduVerifyFile()
+            fileUploadLoading.classList.add('tw-hidden')
             zzShowToast('File upload failed, please try again.')
           }
 
         }).catch((err) => {
           zzShowToast(EduErrorCodeConf[500].en)
+          fileUploadLoading.classList.add('tw-hidden')
           removeEduVerifyFile()
         });
       }
@@ -534,6 +539,7 @@
             <span class="zz-edu-form-file-name">${fileName}</span>
             <span class="zz-edu-form-file-size">${fileSize} MB</span>
           </div>
+          <span class='zz-edu-form-file-upload-loading tw-hidden  tw-daisy-loading tw-daisy-loading-spinner ' ></span>
           <div class="zz-edu-form-file-remove-btn" onclick="removeEduVerifyFile{{ block.id }}()">
             <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
             <circle cx="12" cy="12" r="12" fill="#DD3B46"/>

package/blocks/zz-video-swiper-perview.liquid

@@ -202,7 +202,7 @@
       
     </span>
     <span class='max-lg:tw-hidden'>
-      {% render 'zz-prev-next-btn', type: 'prev', color_type: 'light' %}
+      {% render 'zz-prev-next-blur-icon', type: 'prev', color_type: 'light' %}
     </span>
   </div>
   <div class='swiper-button-next {% if block_size <= 1 %} tw-hidden {% endif %}'>
@@ -224,7 +224,7 @@
       
     </span>
     <span class='max-lg:tw-hidden'>
-      {% render 'zz-prev-next-btn', type: 'next', color_type: 'light' %}
+      {% render 'zz-prev-next-blur-icon', type: 'next', color_type: 'light' %}
     </span>
   </div>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zz-shopify-components",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "Reusable Shopify components for theme projects",
   "keywords": [
     "shopify",