zz-shopify-components 0.6.0 → 0.8.0

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.8.0",
   "description": "Reusable Shopify components for theme projects",
   "keywords": [
     "shopify",

package/snippets/zz-buy-buttom.liquid

@@ -0,0 +1,35 @@
+{% comment %} Products {% endcomment %}
+{% assign is_edu_product = false %}
+{% if product.tags contains 'edu-product' %}
+  {% assign is_edu_product = true %}
+{% endif %}
+
+{% assign is_logged_in = false %}
+{% assign is_edu_verified = false %}
+{% if customer %}
+  {% assign is_logged_in = true %}
+  {% if customer.tags contains 'edu-verified' %}
+    {% assign is_edu_verified = true %}
+  {% endif %}
+{% endif %}
+
+<button class='tw-flex tw-items-center tw-justify-center tw-text-white tw-border-none tw-h-full tw-px-6 tw-py-4 tw-bg-[#FC6C0F] tw-rounded-full tw-font-semibold tw-text-[16px] {{ button_class }}'>
+  <span
+    class='buy-loading  tw-hidden tw-daisy-loading tw-daisy-loading-spinner '
+  ></span>
+  <span class='buy-bottom-bar-btn-text'>
+    {% if is_edu_product %}
+      {% if is_logged_in %}
+        {% if is_edu_verified %}
+          {{ btn }}
+        {% else %}
+          {{ bar_btn_edu_not_verified }}
+        {% endif %}
+      {% else %}
+        {{ bar_btn_edu_not_logged_in }}
+      {% endif %}
+    {% else %}
+      {{ btn }}
+    {% endif %}
+  </span>
+</button>