Merge branch 'dev' into 'master'

Dev See merge request !1

Merge branch 'dev' into 'master'
Dev See merge request !1
boyang
2 parents 66ed627c 4ec8c0af
Showing 4 changed files with 15 additions and 10 deletions
components/MobileProductDetail.vue
components/ProductDetail.vue
deploy/prod2.sh
pages/contact.vue
@@ -163,9 +163,9 @@
             </td>
             <td v-if="item.priceShow" class="td">
               <div style="color: #df3931">${{ item.price }}</div>
-              <s style="font-size: 13px; color: #757575">
-                ${{ item.originPrice }}</s
-              >
+<!--              <s style="font-size: 13px; color: #757575">-->
+<!--                ${{ item.originPrice }}</s-->
+<!--              >-->
             </td>
             <!-- <td class="td">
               <v-btn
@@ -158,9 +158,9 @@
                 <div style="color: #df3931">
                   {{ item.price + " " + item.priceUnit }}
                 </div>
-                <s style="font-size: 13px; color: #757575">{{
-                  item.originPrice + " " + item.priceUnit
-                }}</s>
+<!--                <s style="font-size: 13px; color: #757575">{{-->
+<!--                  item.originPrice + " " + item.priceUnit-->
+<!--                }}</s>-->
               </td>
               <td class="td">
                 <v-btn
 #!/bin/bash
 # 变量定义
-LAST_TAG="1.0.72"
-TAG="1.0.73"
+LAST_TAG="1.0.74"
+TAG="1.0.75"
 TARGET_PATH="/root/web/canrud-outside-nuxt-front"
 DOCKERFILE_PATH="/root/web/canrud-outside-nuxt-front/canrud-nuxt-front"
 IMAGE_NAME="canrud-outside-front"
@@ -254,7 +254,13 @@ const state = reactive({
 });
  
 const handleSubmit = async () => {
-  // Removed verification condition since recaptcha is commented out
+  // Directly check if any field is empty
+  if (!state.firstName || !state.lastName || !state.email || !state.text) {
+    // At least one field is empty, stop here
+    return;
+  }
+  
+  // All fields have values, proceed with form submission
   let { data } = await useAsyncData(
     "sendEmail",
     () =>
@@ -265,7 +271,6 @@ const handleSubmit = async () =&gt; {
           lastName: state.lastName,
           email: state.email,
           message: state.text,
-          subject: "",
         },
       }),
     {