zz-shopify-components 0.6.0 → 0.6.1-beta.0

package/assets/zz-modal.js

@@ -107,15 +107,25 @@
       all: unset;
       cursor: pointer;
       position: absolute;
-      top: 8px;
-      right: 8px;
+      top: 20px;
+      right: 20px;
       width: 32px;
       height: 32px;
       border-radius: 9999px;
       display: grid;
       place-items: center;
     }
-    .close-btn:focus-visible { outline: 2px solid #3b82f6; outline-offset: 2px; }
+    .close-btn-white {
+      color: white;
+      background-color: rgba(0,0,0,0.08);
+      backdrop-filter: blur(10px);
+    }
+    .close-btn-black {
+      color: white;
+      background-color: #333333;
+      /* backdrop-filter: blur(10px); */
+    }
+    .close-btn:focus-visible { outline: none; }
   `;
 
   const TEMPLATE = document.createElement('template');
@@ -151,6 +161,11 @@
       style.textContent = STYLE_TEXT;
       shadow.appendChild(style);
       shadow.appendChild(TEMPLATE.content.cloneNode(true));
+      const closeBtnColor = this.getAttribute('close-btn-color');
+      if (closeBtnColor) {
+        const closeBtn = shadow.querySelector('.close-btn');
+        closeBtn.classList.add(closeBtnColor);
+      }
 
       this._dialog = shadow.querySelector('dialog');
       this._panel = shadow.querySelector('.panel-inner');

package/blocks/zz-accessories-price-item.liquid

@@ -100,17 +100,6 @@
       "default": "#000000",
       "label": "标题颜色"
     },
-    {
-      "type": "richtext",
-      "id": "slide_content",
-      "label": "内容"
-    },
-    {
-      "type": "color",
-      "id": "slide_content_color",
-      "default": "#170B01",
-      "label": "内容颜色"
-    },
     {
       "type": "text",
       "id": "btn_text",

package/blocks/zz-edu-form.liquid

@@ -320,7 +320,13 @@
           isValid = false;
         } else {
           fileInput.classList.remove('error');
+          if(!identityDocumentUrl) {
+            // 文件还在上传中，请等待文件上传成功
+            zzShowToast('File is still uploading, please wait for the file to be uploaded successfully')
+            return
+          }
         }
+        
       }
       
       
@@ -456,7 +462,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 +484,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 +546,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zz-shopify-components",
-  "version": "0.6.0",
+  "version": "0.6.1-beta.0",
   "description": "Reusable Shopify components for theme projects",
   "keywords": [
     "shopify",

package/sections/zz-modal.liquid

@@ -15,7 +15,7 @@
     }
   </style>
 
-  <zz-modal {% if section.settings.sheet_on_mobile %} sheet-on-mobile {% endif %} {% if section.settings.no_backdrop_close %} no-backdrop-close {% endif %} id="{{ section.settings.modal_id }}"{% unless section.settings.show_header %} no-header{% endunless %}{% unless section.settings.show_footer %} no-footer{% endunless %}>
+  <zz-modal close-btn-color="close-btn-{{ section.settings.close_btn_color }}" {% if section.settings.sheet_on_mobile %} sheet-on-mobile {% endif %} {% if section.settings.no_backdrop_close %} no-backdrop-close {% endif %} id="{{ section.settings.modal_id }}"{% unless section.settings.show_header %} no-header{% endunless %}{% unless section.settings.show_footer %} no-footer{% endunless %}>
     {% if section.settings.show_header %}
     <div slot="header" class="tw-text-[24px] tw-font-semibold">{{ section.settings.header_text }}</div>
     {% endif %}
@@ -49,6 +49,16 @@
       "id": "modal_id",
       "label": "弹窗id （必填）",
       "default": "demo-modal"
+    },
+    {
+      "type": "select",
+      "id": "close_btn_color",
+      "label": "关闭按钮颜色",
+      "default": "white",
+      "options": [
+        { "value": "white", "label": "白色" },
+        { "value": "black", "label": "黑色" }
+      ],
     },
       {
         "type": "checkbox",